diff --git a/flake.lock b/flake.lock index 3aa51ee5..5705d477 100644 --- a/flake.lock +++ b/flake.lock @@ -56,17 +56,16 @@ "inputs": { "nixpkgs": [ "nixpkgs-unpatched" - ], - "patches": [] + ] }, "locked": { "lastModified": 1, - "narHash": "sha256-d3XSehPFkNwvwlOYy7gch0NLxOgdXuV7j5r/Qsn7kHc=", - "path": "/nix/store/wq6rmmnd7yhw9w44k54w4x5v63ah1psr-source/nixpatches", + "narHash": "sha256-ERkw+xJQ2mZMztI8hzWjilnvHQtKHslNyuG9TXM/lCI=", + "path": "/nix/store/zy5rd2m4ww1wwllfq8sgwvdslganf1ks-source/nixpatches", "type": "path" }, "original": { - "path": "/nix/store/wq6rmmnd7yhw9w44k54w4x5v63ah1psr-source/nixpatches", + "path": "/nix/store/zy5rd2m4ww1wwllfq8sgwvdslganf1ks-source/nixpatches", "type": "path" } }, diff --git a/flake.nix b/flake.nix index aea981c5..099fbc3b 100644 --- a/flake.nix +++ b/flake.nix @@ -26,8 +26,6 @@ nixpkgs = { url = "./nixpatches"; inputs.nixpkgs.follows = "nixpkgs-unpatched"; - # TODO: remove this dependency injection: it's from when we used url = path:... - inputs.patches.follows = ""; }; mobile-nixos = { # @@ -187,9 +185,6 @@ description = "python environment for data processing"; }; }; - - # unofficial output; used by inputs.nixpatches - nixpatches = import ./nixpatches/list.nix; }; } diff --git a/nixpatches/flake.nix b/nixpatches/flake.nix index 09957df6..7d27f1c2 100644 --- a/nixpatches/flake.nix +++ b/nixpatches/flake.nix @@ -1,14 +1,13 @@ { inputs = { nixpkgs = {}; - patches = {}; }; - outputs = { self, nixpkgs, patches }@inputs: + outputs = { self, nixpkgs }@inputs: let patchedPkgsFor = system: nixpkgs.legacyPackages.${system}.applyPatches { name = "nixpkgs-patched-uninsane"; src = nixpkgs; - patches = inputs.patches.nixpatches { + patches = import ./list.nix { inherit (nixpkgs.legacyPackages.${system}) fetchpatch; inherit (nixpkgs.lib) fakeHash; };