From cff22b8678f97f1d9553a210f1933b882470b9c4 Mon Sep 17 00:00:00 2001
From: NullBite <me@nullbite.com>
Date: Tue, 29 Oct 2024 21:04:51 +0100
Subject: [PATCH] Remove yt-dlp mitigation
---
flake.lock | 17 -----------------
flake.nix | 2 --
overlays/mitigations.nix | 6 ------
3 files changed, 25 deletions(-)
diff --git a/flake.lock b/flake.lock
index fc202ec..178829c 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1005,22 +1005,6 @@
"type": "github"
}
},
- "nixpkgs-yt-dlp-2024": {
- "locked": {
- "lastModified": 1716813593,
- "narHash": "sha256-862V4NORGlvQ6g8Y5ZSBrtosqYep2lXGsywTcV6OvHw=",
- "owner": "NixOS",
- "repo": "nixpkgs",
- "rev": "528db5fa94041f0b4909a855d8b9fb9b44fa4f5d",
- "type": "github"
- },
- "original": {
- "owner": "NixOS",
- "repo": "nixpkgs",
- "rev": "528db5fa94041f0b4909a855d8b9fb9b44fa4f5d",
- "type": "github"
- }
- },
"nixpkgs_2": {
"locked": {
"lastModified": 1729449015,
@@ -1106,7 +1090,6 @@
"nixpkgs": "nixpkgs_2",
"nixpkgs-nix-du": "nixpkgs-nix-du",
"nixpkgs-unstable": "nixpkgs-unstable",
- "nixpkgs-yt-dlp-2024": "nixpkgs-yt-dlp-2024",
"rust-overlay": "rust-overlay_2",
"stylix": "stylix",
"systems": "systems_9"
diff --git a/flake.nix b/flake.nix
index 689f382..49285cd 100644
--- a/flake.nix
+++ b/flake.nix
@@ -6,8 +6,6 @@
# ^^^^^^^^^^^^^ this part is optional
nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
- nixpkgs-yt-dlp-2024.url = "github:NixOS/nixpkgs/528db5fa94041f0b4909a855d8b9fb9b44fa4f5d";
-
nixpkgs-nix-du.url = "github:NixOS/nixpkgs/c933cf4698e5189b35dd83bf4d7a81aef16d464a";
# this seems to be a popular way to declare systems
diff --git a/overlays/mitigations.nix b/overlays/mitigations.nix
index 4f51004..f2cf592 100644
--- a/overlays/mitigations.nix
+++ b/overlays/mitigations.nix
@@ -37,12 +37,6 @@ in {
gimp-with-plugins = gimp-with-plugins-good;
- yt-dlp = let
- pkgs-y = (import nixfiles.inputs.nixpkgs-yt-dlp-2024.outPath) { inherit (prev) system;};
- in if ((builtins.compareVersions "2024.5.27" prev.yt-dlp.version) == 1)
- then (final.python3Packages.toPythonApplication pkgs-y.python3Packages.yt-dlp)
- else prev.yt-dlp;
-
easyeffects = let
stable = pkgsStable.easyeffects;
unstable = prev.easyeffects;