From f66efcb8baa912b700792c70b061736981b141ad Mon Sep 17 00:00:00 2001 From: Matthew Kenigsberg Date: Fri, 20 Dec 2024 09:46:16 -0700 Subject: [PATCH] Update flake MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Manually update nixpkgs and fenix to same revision as used in latest merge from upstream (adb4740) - Update naersk - Drop determinate input since we don't use it • Updated input 'fenix': 'github:nix-community/fenix/73124e1356bde9411b163d636b39fe4804b7ca45' (2024-05-01) → 'github:nix-community/fenix/a9d2e5fa8d77af05240230c9569bbbddd28ccfaf' (2024-10-01) • Updated input 'fenix/rust-analyzer-src': 'github:rust-lang/rust-analyzer/49e502b277a8126a9ad10c802d1aaa3ef1a280ef' (2024-04-30) → 'github:rust-lang/rust-analyzer/28830ff2f1158ee92f4852ef3ec35af0935d1562' (2024-09-30) • Updated input 'naersk': 'github:nix-community/naersk/3fb418eaf352498f6b6c30592e3beb63df42ef11' (2024-07-23) → 'github:nix-community/naersk/378614f37a6bee5a3f2ef4f825a73d948d3ae921' (2024-12-04) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/63c3a29ca82437c87573e4c6919b09a24ea61b0f' (2024-05-02) → 'github:NixOS/nixpkgs/06cf0e1da4208d3766d898b7fdab6513366d45b9' (2024-09-29) --- flake.lock | 94 ++++++++---------------------------------------------- flake.nix | 24 ++++---------- 2 files changed, 21 insertions(+), 97 deletions(-) diff --git a/flake.lock b/flake.lock index df8454f1a..8afc8460b 100644 --- a/flake.lock +++ b/flake.lock @@ -1,70 +1,5 @@ { "nodes": { - "determinate": { - "inputs": { - "determinate-nixd-aarch64-darwin": "determinate-nixd-aarch64-darwin", - "determinate-nixd-aarch64-linux": "determinate-nixd-aarch64-linux", - "determinate-nixd-x86_64-darwin": [ - "determinate", - "determinate-nixd-aarch64-darwin" - ], - "determinate-nixd-x86_64-linux": "determinate-nixd-x86_64-linux", - "nix": [ - "nix" - ], - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1729548094, - "narHash": "sha256-+jP+Zlg0prpcmBy5s7cPUa7nJr90Zm2m933aibrHBYw=", - "rev": "5babe9d6a9eb52ee001bf70ad607fd66522f781b", - "revCount": 145, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/determinate/0.1.145%2Brev-5babe9d6a9eb52ee001bf70ad607fd66522f781b/0192b11b-c96e-7199-ba89-8c923541fcce/source.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://flakehub.com/f/DeterminateSystems/determinate/0.1.tar.gz" - } - }, - "determinate-nixd-aarch64-darwin": { - "flake": false, - "locked": { - "narHash": "sha256-OhG8joS/uN3Kdw4h9w8F/6ZIVTFZ8J9Fb4NGn/KK5/s=", - "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/rev/51ecec5a3148baef87c2015536aa12dd18e4c4ad/macOS" - }, - "original": { - "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/rev/51ecec5a3148baef87c2015536aa12dd18e4c4ad/macOS" - } - }, - "determinate-nixd-aarch64-linux": { - "flake": false, - "locked": { - "narHash": "sha256-AGcHQSIdb+KEJlhJzMB4YyFxbjdLZEDDf6bv6Zi3wqM=", - "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/rev/51ecec5a3148baef87c2015536aa12dd18e4c4ad/aarch64-linux" - }, - "original": { - "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/rev/51ecec5a3148baef87c2015536aa12dd18e4c4ad/aarch64-linux" - } - }, - "determinate-nixd-x86_64-linux": { - "flake": false, - "locked": { - "narHash": "sha256-kU4dqHoYe3sFf4LDAUj4fyl9uGV8IHtE22+DdMeRN0s=", - "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/rev/51ecec5a3148baef87c2015536aa12dd18e4c4ad/x86_64-linux" - }, - "original": { - "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/rev/51ecec5a3148baef87c2015536aa12dd18e4c4ad/x86_64-linux" - } - }, "fenix": { "inputs": { "nixpkgs": [ @@ -73,17 +8,17 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1714544767, - "narHash": "sha256-kF1bX+YFMedf1g0PAJYwGUkzh22JmULtj8Rm4IXAQKs=", + "lastModified": 1727764514, + "narHash": "sha256-tvN9v5gTxLI5zOKsNvYl1aUxIitHm8Nj3vKdXNfJo50=", "owner": "nix-community", "repo": "fenix", - "rev": "73124e1356bde9411b163d636b39fe4804b7ca45", + "rev": "a9d2e5fa8d77af05240230c9569bbbddd28ccfaf", "type": "github" }, "original": { "owner": "nix-community", "repo": "fenix", - "rev": "73124e1356bde9411b163d636b39fe4804b7ca45", + "rev": "a9d2e5fa8d77af05240230c9569bbbddd28ccfaf", "type": "github" } }, @@ -195,11 +130,11 @@ ] }, "locked": { - "lastModified": 1721727458, - "narHash": "sha256-r/xppY958gmZ4oTfLiHN0ZGuQ+RSTijDblVgVLFi1mw=", + "lastModified": 1733346208, + "narHash": "sha256-a4WZp1xQkrnA4BbnKrzJNr+dYoQr5Xneh2syJoddFyE=", "owner": "nix-community", "repo": "naersk", - "rev": "3fb418eaf352498f6b6c30592e3beb63df42ef11", + "rev": "378614f37a6bee5a3f2ef4f825a73d948d3ae921", "type": "github" }, "original": { @@ -283,23 +218,22 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1714635257, - "narHash": "sha256-4cPymbty65RvF1DWQfc+Bc8B233A1BWxJnNULJKQ1EY=", + "lastModified": 1727634051, + "narHash": "sha256-S5kVU7U82LfpEukbn/ihcyNt2+EvG7Z5unsKW9H/yFA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "63c3a29ca82437c87573e4c6919b09a24ea61b0f", + "rev": "06cf0e1da4208d3766d898b7fdab6513366d45b9", "type": "github" }, "original": { "owner": "NixOS", "repo": "nixpkgs", - "rev": "63c3a29ca82437c87573e4c6919b09a24ea61b0f", + "rev": "06cf0e1da4208d3766d898b7fdab6513366d45b9", "type": "github" } }, "root": { "inputs": { - "determinate": "determinate", "fenix": "fenix", "flake-compat": "flake-compat", "naersk": "naersk", @@ -310,11 +244,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1714501997, - "narHash": "sha256-g31zfxwUFzkPgX0Q8sZLcrqGmOxwjEZ/iqJjNx4fEGo=", + "lastModified": 1727706011, + "narHash": "sha256-xxgUHwwJ+1xQQoUWvLDo807IZ0MDldkfr9N1G4fvNJU=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "49e502b277a8126a9ad10c802d1aaa3ef1a280ef", + "rev": "28830ff2f1158ee92f4852ef3ec35af0935d1562", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 9d44b4d2a..22f8da394 100644 --- a/flake.nix +++ b/flake.nix @@ -2,10 +2,14 @@ description = "Experimental Nix Installer"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/63c3a29ca82437c87573e4c6919b09a24ea61b0f"; + # I translated upstream versioning with + # git show $most_recently_merged_commit:flake.lock | jq '.nodes[.nodes.root.inputs.nixpkgs].locked.rev' + nixpkgs.url = "github:NixOS/nixpkgs/06cf0e1da4208d3766d898b7fdab6513366d45b9"; + # I translated upstream versioning with + # git show $most_recently_merged_commit:flake.lock | jq '.nodes[.nodes.root.inputs.fenix].locked.rev' fenix = { - url = "github:nix-community/fenix/73124e1356bde9411b163d636b39fe4804b7ca45"; + url = "github:nix-community/fenix/a9d2e5fa8d77af05240230c9569bbbddd28ccfaf"; inputs.nixpkgs.follows = "nixpkgs"; }; @@ -19,19 +23,6 @@ # Omitting `inputs.nixpkgs.follows = "nixpkgs";` on purpose }; - determinate = { - url = "https://flakehub.com/f/DeterminateSystems/determinate/0.1.tar.gz"; - - # We set the overrides below so the flake.lock has many fewer nodes. - # - # The `determinate` input is used to access the builds of `determinate-nixd`. - # Below, we access the `packages` outputs, which download static builds of `determinate-nixd` and makes them executable. - # The way we consume the determinate flake means the `nix` and `nixpkgs` inputs are not meaningfully used. - # This means `follows` won't cause surprisingly extensive rebuilds, just trivial `chmod +x` rebuilds. - inputs.nixpkgs.follows = "nixpkgs"; - inputs.nix.follows = "nix"; - }; - flake-compat.url = "github:edolstra/flake-compat/v1.0.0"; }; @@ -41,7 +32,6 @@ , fenix , naersk , nix - , determinate , ... } @ inputs: let @@ -73,7 +63,7 @@ inputs.nix.tarballs_direct.${system} or "${inputs.nix.checks."${system}".binaryTarball}/nix-${inputs.nix.packages."${system}".default.version}-${system}.tar.xz"); - optionalPathToDeterminateNixd = system: if builtins.elem system systemsSupportedByDeterminateNixd then "${inputs.determinate.packages.${system}.default}/bin/determinate-nixd" else null; + optionalPathToDeterminateNixd = system: null; in { overlays.default = final: prev: