diff --git a/overlays/default.nix b/overlays/default.nix index 24e5592..7616c1f 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -1,4 +1,4 @@ -final: prev: +_: prev: let myPackages = @@ -17,7 +17,6 @@ let ]; myPython = prev.python312.withPackages myPackages; - is2405 = prev.lib.versionAtLeast prev.lib.version "24"; in rec { @@ -40,26 +39,10 @@ rec { enwiki-dump = prev.callPackage ./enwiki-dump.nix { }; # Overrides of packages - copier = ( - if is2405 then - prev.copier.overridePythonAttrs (_: { - version = "9.1.0"; - src = final.fetchFromGitHub { - owner = "copier-org"; - repo = "copier"; - rev = "v9.1.0"; - hash = "sha256-x5r7Xv4lAOMkR+UIEeSY7LvbYMLpTWYuICYe9ygz1tA="; - postFetch = "rm $out/tests/demo/doc/ma*ana.txt"; - }; - }) - else - prev.copier - ); libbluray-custom = prev.libbluray.override { withAACS = true; withBDplus = true; }; - template = prev.callPackage ./template.nix { }; handbrake = prev.handbrake.override { libbluray = libbluray-custom; }; libvirt-greg = prev.libvirt.overrideAttrs { postInstall = prev.libvirt.postInstall + "rm -r $out/lib/systemd/system/libvirtd.service"; diff --git a/overlays/template.nix b/overlays/template.nix deleted file mode 100644 index e71e2fe..0000000 --- a/overlays/template.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ stdenv, jinja2-cli }: - -name: vars: template: -(stdenv.mkDerivation { - inherit name; - - passAsFile = [ "varsData" ]; - varsData = builtins.toJSON vars; - - nativeBuildInputs = [ jinja2-cli ]; - phases = [ "buildPhase" "installPhase" ]; - - buildPhase = ''${jinja2-cli}/bin/jinja2 --format=json ${template} $varsDataPath > result''; - installPhase = "cp result $out"; -})