From 4f88a62f148aa77e1cc39b93f2e37eb2f0012e8c Mon Sep 17 00:00:00 2001 From: teutat3s <10206665+teutat3s@users.noreply.github.com> Date: Wed, 24 Nov 2021 15:00:16 +0100 Subject: [PATCH] chore: update inputs, switch early to nixStable 2.4 from nixos-unstable, please read https://discourse.nixos.org/t/nix-2-4-released/15822 --- flake.lock | 75 ++++++++++------------------------------ flake.nix | 5 +-- overlays/nix-patched.nix | 4 +-- shell.nix | 8 ++--- 4 files changed, 25 insertions(+), 67 deletions(-) diff --git a/flake.lock b/flake.lock index eb11b08..073a4a5 100644 --- a/flake.lock +++ b/flake.lock @@ -41,11 +41,11 @@ }, "devshell": { "locked": { - "lastModified": 1632436039, - "narHash": "sha256-OtITeVWcKXn1SpVEnImpTGH91FycCskGBPqmlxiykv4=", + "lastModified": 1637575296, + "narHash": "sha256-ZY8YR5u8aglZPe27+AJMnPTG6645WuavB+w0xmhTarw=", "owner": "numtide", "repo": "devshell", - "rev": "7a7a7aa0adebe5488e5abaec688fd9ae0f8ea9c6", + "rev": "0e56ef21ba1a717169953122c7415fa6a8cd2618", "type": "github" }, "original": { @@ -72,11 +72,11 @@ }, "flake-utils": { "locked": { - "lastModified": 1623875721, - "narHash": "sha256-A8BU7bjS5GirpAUv4QA+QnJ4CceLHkcXdRp4xITDB0s=", + "lastModified": 1637014545, + "narHash": "sha256-26IZAc5yzlD9FlDT54io1oqG/bBoyka+FJk5guaX4x4=", "owner": "numtide", "repo": "flake-utils", - "rev": "f7e004a55b120c02ecb6219596820fcd32ca8772", + "rev": "bba5dcc8e0b20ab664967ad83d24d64cb64ec4f4", "type": "github" }, "original": { @@ -112,11 +112,11 @@ ] }, "locked": { - "lastModified": 1629347633, - "narHash": "sha256-FGZJ7lmTAMIkjdrh6dIPck5HuB4KMT2GgDV5ZjiCWoc=", + "lastModified": 1637721183, + "narHash": "sha256-4CAKKxrt9l0Hbl57Uypo7ol93Ko+5Yn+7xWWCMUyHQ8=", "owner": "nix-community", "repo": "home-manager", - "rev": "bf6b85136b47ab1a76df4a90ea4850871147494a", + "rev": "df931a59a5864d6ff0c5d83598135816f8593647", "type": "github" }, "original": { @@ -127,11 +127,11 @@ }, "latest": { "locked": { - "lastModified": 1632660378, - "narHash": "sha256-sjA8eQlnyDjDLyAyq3XlJmN0nqW0ftl/pb7VnMg86L0=", + "lastModified": 1637595801, + "narHash": "sha256-LkIMwVFKCuEqidaUdg8uxwpESAXjsPo4oCz3eJ7RaRw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "31ffc50c571e6683e9ecc9dbcbd4a8e9914b4497", + "rev": "263ef4cc4146c9fab808085487438c625d4426a9", "type": "github" }, "original": { @@ -141,44 +141,6 @@ "type": "github" } }, - "lowdown-src": { - "flake": false, - "locked": { - "lastModified": 1617481909, - "narHash": "sha256-SqnfOFuLuVRRNeVJr1yeEPJue/qWoCp5N6o5Kr///p4=", - "owner": "kristapsdz", - "repo": "lowdown", - "rev": "148f9b2f586c41b7e36e73009db43ea68c7a1a4d", - "type": "github" - }, - "original": { - "owner": "kristapsdz", - "ref": "VERSION_0_8_4", - "repo": "lowdown", - "type": "github" - } - }, - "nix": { - "inputs": { - "lowdown-src": "lowdown-src", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1630335771, - "narHash": "sha256-eljjEPJdLK3aDskF7qX4YM/6KCq+w9nr+IKhrKW/AIQ=", - "owner": "nixos", - "repo": "nix", - "rev": "50a35860ee9237d341948437c5f70a7f0987d393", - "type": "github" - }, - "original": { - "owner": "nixos", - "repo": "nix", - "type": "github" - } - }, "nixos-generators": { "inputs": { "nixlib": [ @@ -189,11 +151,11 @@ ] }, "locked": { - "lastModified": 1624973746, - "narHash": "sha256-11JbJRduNwyf556gndGErR5/12ceyHOHBfEuha5Vws4=", + "lastModified": 1637655461, + "narHash": "sha256-kXZPbclN3gKwjhp2/RYFDFpAsSBwzX1iLF4EcnHZsPQ=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "022ef440af8dc237ab1f59fa363cb1e25783ec3e", + "rev": "05a3eb158a9c7746a5d463726d7f7cccf07500e4", "type": "github" }, "original": { @@ -204,11 +166,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1628203131, - "narHash": "sha256-jQgXeJ9NQQS0Eobb/qQOvS+RRULkqRikAeXkkFKOPDA=", + "lastModified": 1637763956, + "narHash": "sha256-mNGdllMuZ53Fk7nTPOAhAbX6sGId1kE+xCOSMCOWYZQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "178da37860823d35e801c7df2f73d7866d3d598a", + "rev": "7066ed7b1f6f7c191b44f435ea4acb9d4c2b879c", "type": "github" }, "original": { @@ -227,7 +189,6 @@ "flake-utils-plus": "flake-utils-plus", "home-manager": "home-manager", "latest": "latest", - "nix": "nix", "nixlib": [ "nixpkgs" ], diff --git a/flake.nix b/flake.nix index 57819a6..2d80c50 100644 --- a/flake.nix +++ b/flake.nix @@ -21,8 +21,6 @@ devshell.url = "github:numtide/devshell"; # fork with urgent fixes that can't be added quickly upstream in respect of upstream user base flake-utils-plus.url = "github:divnix/flake-utils-plus"; - nix.url = "github:nixos/nix"; - nix.inputs.nixpkgs.follows = "nixpkgs"; nixos-generators.url = "github:nix-community/nixos-generators"; nixos-generators.inputs.nixpkgs.follows = "blank"; @@ -49,7 +47,6 @@ , flake-utils-plus , nixos-generators , home-manager - , nix , ... }@inputs: let @@ -94,7 +91,7 @@ # Dependency Groups - Style checksInputs = { inherit nixpkgs; digga = self; }; jobsInputs = { inherit nixpkgs; digga = self; }; - devShellInputs = { inherit nixpkgs devshell nix; }; + devShellInputs = { inherit nixpkgs latest devshell; }; # .. we hope you like this style. # .. it's adopted by a growing number of projects. diff --git a/overlays/nix-patched.nix b/overlays/nix-patched.nix index bb168c6..5429abd 100644 --- a/overlays/nix-patched.nix +++ b/overlays/nix-patched.nix @@ -6,10 +6,10 @@ final: prev: { # Use pinned version to guarantee reproducability # with this fast moving target. Flipside: not store # efficient. - nixUnstable = inputs.nix.packages.${prev.system}.nix; + nixStable = inputs.latest.legacyPackages.${prev.system}.nixStable; nixos-rebuild = prev.nixos-rebuild.override { - nix = final.nixUnstable; + nix = final.nixStable; }; # check if we need to override more stuff ourthe patched nix diff --git a/shell.nix b/shell.nix index aede507..1e20caf 100644 --- a/shell.nix +++ b/shell.nix @@ -82,9 +82,9 @@ let digga_fixture test -f flake.lock && lockfile_present=$? || true - ${pkgs.nixUnstable}/bin/nix flake lock --update-input digga "$@"; lockfile_updated=$?; - ${pkgs.nixUnstable}/bin/nix flake show "$@" - ${pkgs.nixUnstable}/bin/nix flake check "$@" + ${pkgs.nixStable}/bin/nix flake lock --update-input digga "$@"; lockfile_updated=$?; + ${pkgs.nixStable}/bin/nix flake show "$@" + ${pkgs.nixStable}/bin/nix flake check "$@" cleanup ''; @@ -96,7 +96,7 @@ devshell.mkShell { packages = with pkgs; [ fd nixpkgs-fmt - nixUnstable + nixStable ]; env = [