From bdd309eb15543491d46d87e1aeadd6c2286b6f3f Mon Sep 17 00:00:00 2001 From: colin Date: Sun, 15 Jan 2023 07:36:04 +0000 Subject: [PATCH] flake: convert `path:nixpatches` -> `./nixpatches` to fix poor flake input invalidation --- flake.lock | 12 ++++++------ flake.nix | 5 ++--- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 529c76fd..3aa51ee5 100644 --- a/flake.lock +++ b/flake.lock @@ -61,22 +61,22 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-9froWbTkSKX7cYSb0wh58TsftbHL0bNHay1yAW0Wiws=", - "path": "nixpatches", + "narHash": "sha256-d3XSehPFkNwvwlOYy7gch0NLxOgdXuV7j5r/Qsn7kHc=", + "path": "/nix/store/wq6rmmnd7yhw9w44k54w4x5v63ah1psr-source/nixpatches", "type": "path" }, "original": { - "path": "nixpatches", + "path": "/nix/store/wq6rmmnd7yhw9w44k54w4x5v63ah1psr-source/nixpatches", "type": "path" } }, "nixpkgs-stable": { "locked": { - "lastModified": 1673612960, - "narHash": "sha256-DWR7hrbecJKmUJCswk9MXZta710mq+3jZwTvHU/UfyY=", + "lastModified": 1673704454, + "narHash": "sha256-5Wdj1MgdOgn3+dMFIBtg+IAYZApjF8JzwLWDPieg0C4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e285dd0ca97c264003867c7329f0d1f4f028739c", + "rev": "a83ed85c14fcf242653df6f4b0974b7e1c73c6c6", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 3a0f6f49..e8d4c192 100644 --- a/flake.nix +++ b/flake.nix @@ -24,10 +24,9 @@ # nixpkgs-unpatched.url = "github:nixos/nixpkgs?ref=nixos-unstable"; nixpkgs = { - url = "path:nixpatches"; + url = "./nixpatches"; inputs.nixpkgs.follows = "nixpkgs-unpatched"; - # XXX: `path:` urls have poor UX in that they still get "locked" and require manual updates as if they were remote. - # by linking back to ourselves here, we can update `nixpatches/list.nix` *without* having to run `nix flake update` afterward. + # TODO: remove this dependency injection: it's from when we used url = path:... inputs.patches.follows = ""; }; mobile-nixos = {