From 8c7118298d3832fef6fbc4ad83588cd29a2e1007 Mon Sep 17 00:00:00 2001 From: David Arnold Date: Mon, 29 Nov 2021 17:38:35 -0500 Subject: [PATCH] test: fix downstream to compatible synthetic commit - downstream used `patchedNix`. - fix hm compatibility --- examples/downstream | 2 +- flake.lock | 27 ++++++++++++++------------- flake.nix | 4 ++-- 3 files changed, 17 insertions(+), 16 deletions(-) diff --git a/examples/downstream b/examples/downstream index 5060792..d21b380 160000 --- a/examples/downstream +++ b/examples/downstream @@ -1 +1 @@ -Subproject commit 506079201d113b66aab4c4fa20b2fc397ea890e9 +Subproject commit d21b380999af3e5b97690ec523c44dbc97f57127 diff --git a/flake.lock b/flake.lock index b3a789f..0b24a3f 100644 --- a/flake.lock +++ b/flake.lock @@ -72,11 +72,11 @@ }, "flake-utils": { "locked": { - "lastModified": 1637014545, - "narHash": "sha256-26IZAc5yzlD9FlDT54io1oqG/bBoyka+FJk5guaX4x4=", + "lastModified": 1638122382, + "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=", "owner": "numtide", "repo": "flake-utils", - "rev": "bba5dcc8e0b20ab664967ad83d24d64cb64ec4f4", + "rev": "74f7e4319258e287b0f9cb95426c9853b282730b", "type": "github" }, "original": { @@ -108,30 +108,31 @@ "home-manager": { "inputs": { "nixpkgs": [ - "nixlib" + "nixpkgs" ] }, "locked": { - "lastModified": 1637721183, - "narHash": "sha256-4CAKKxrt9l0Hbl57Uypo7ol93Ko+5Yn+7xWWCMUyHQ8=", + "lastModified": 1637917557, + "narHash": "sha256-3u5bLyGn5NUG3RJA7/v1Bqa/QCFGqp/01Bh/4REf9m4=", "owner": "nix-community", "repo": "home-manager", - "rev": "df931a59a5864d6ff0c5d83598135816f8593647", + "rev": "4daff26495ca9ac67476cba8cf15c3e36d91ab18", "type": "github" }, "original": { "owner": "nix-community", + "ref": "release-21.11", "repo": "home-manager", "type": "github" } }, "latest": { "locked": { - "lastModified": 1637595801, - "narHash": "sha256-LkIMwVFKCuEqidaUdg8uxwpESAXjsPo4oCz3eJ7RaRw=", + "lastModified": 1638198142, + "narHash": "sha256-plU9b8r4St6q4U7VHtG9V7oF8k9fIpfXl/KDaZLuY9k=", "owner": "nixos", "repo": "nixpkgs", - "rev": "263ef4cc4146c9fab808085487438c625d4426a9", + "rev": "8a308775674e178495767df90c419425474582a1", "type": "github" }, "original": { @@ -166,11 +167,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1637913129, - "narHash": "sha256-m3KTNPSdKK9E6cVvXwA/Wl2kULUjh32sAl3tLmMBgBE=", + "lastModified": 1638222206, + "narHash": "sha256-Zds9H5WB+hBjWhag5yWWDDfYOtsAZKa+Hj23bjrmbZI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b34d0163e67e425395b4998278bc5f2195c69d48", + "rev": "b1cd9a32c2d877d3ae8f17203cc7895272eec688", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index fe676ea..35bf3fe 100644 --- a/flake.nix +++ b/flake.nix @@ -15,8 +15,8 @@ deploy.inputs.nixpkgs.follows = "latest"; # deploy.inputs.utils.follows = "utils/flake-utils"; - home-manager.url = "github:nix-community/home-manager"; - home-manager.inputs.nixpkgs.follows = "nixlib"; + home-manager.url = "github:nix-community/home-manager/release-21.11"; + home-manager.inputs.nixpkgs.follows = "nixpkgs"; devshell.url = "github:numtide/devshell"; # fork with urgent fixes that can't be added quickly upstream in respect of upstream user base