From 72d323ca0410a08abc2d981b812c5cd0fd3338bf Mon Sep 17 00:00:00 2001 From: Simon Bruder Date: Wed, 1 Dec 2021 20:59:48 +0100 Subject: [PATCH] x264-unstable: drop It has been updated in nixpkgs. --- default.nix | 2 -- flake.nix | 3 +-- x264-unstable/default.nix | 18 ------------------ 3 files changed, 1 insertion(+), 22 deletions(-) delete mode 100644 x264-unstable/default.nix diff --git a/default.nix b/default.nix index d42ca77..18d2fdc 100644 --- a/default.nix +++ b/default.nix @@ -48,6 +48,4 @@ in vgmstream = callPackage ./vgmstream { }; VisiCut = callPackage ./VisiCut { }; - - x264-unstable = prev.x264.overrideAttrs (callPackage ./x264-unstable { }); } diff --git a/flake.nix b/flake.nix index d6a62e6..5755c2f 100644 --- a/flake.nix +++ b/flake.nix @@ -59,8 +59,7 @@ snownews textidote unxwb - vgmstream - x264-unstable; + vgmstream; mpvScripts = lib.recurseIntoAttrs { inherit (pkgs.mpvScripts) diff --git a/x264-unstable/default.nix b/x264-unstable/default.nix deleted file mode 100644 index 07e0e54..0000000 --- a/x264-unstable/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ lib, fetchFromGitLab }: - -o: o // rec { - version = "unstable-2021-04-19"; - - src = fetchFromGitLab { - domain = "code.videolan.org"; - owner = "videolan"; - repo = o.pname; - rev = "b684ebe04a6f80f8207a57940a1fa00e25274f81"; - sha256 = "06r6m1v88m532wbhk6al9imrsn1inwdjzrpmp97wrbdg6b2naygd"; - }; - - meta = with lib; o.meta // { - description = "${o.meta.description} (unstable version)"; - maintainers = with maintainers; [ sbruder ]; - }; -}