diff --git a/.github/workflows/build-publish.yml b/.github/workflows/build-publish.yml index 872b33cf9..58d950f39 100644 --- a/.github/workflows/build-publish.yml +++ b/.github/workflows/build-publish.yml @@ -24,7 +24,7 @@ jobs: set -eux # Ensure all the checks can be built without internet - nix flake check --all-systems --max-jobs 0 + nix flake check --all-systems nix build .#tarballs_json cat result @@ -63,7 +63,7 @@ jobs: set -eux # Ensure all the checks can be built without internet - nix flake check --all-systems --max-jobs 0 + nix flake check --all-systems nix build .#tarballs_json cat result diff --git a/flake.nix b/flake.nix index f657b9770..37d831b53 100644 --- a/flake.nix +++ b/flake.nix @@ -1,7 +1,7 @@ { description = "Determinate Nix"; inputs = { - nix.url = "https://flakehub.com/f/NixOS/nix/=2.25.3"; + nix.url = "https://flakehub.com/f/NixOS/nix/=2.26.0"; nixpkgs.url = "https://flakehub.com/f/NixOS/nixpkgs/*"; }; @@ -26,12 +26,12 @@ in { closures = forAllSystems ({ system, ... }: nix.packages."${system}".default); - tarballs_indirect = forAllSystems ({ system, ... }: nix.checks."${system}".binaryTarball); - tarballs_direct = forAllSystems ({ system, ... }: "${nix.checks."${system}".binaryTarball}/nix-${nix.packages."${system}".default.version}-${system}.tar.xz"); + tarballs_indirect = forAllSystems ({ system, ... }: nix.packages."${system}".binaryTarball); + tarballs_direct = forAllSystems ({ system, ... }: "${nix.packages."${system}".binaryTarball}/nix-${nix.packages."${system}".default.version}-${system}.tar.xz"); checks = forAllSystems ({ system, ... }: { closure = nix.packages."${system}".default; - tarball = nix.checks."${system}".binaryTarball; + tarball = nix.packages."${system}".binaryTarball; }); packages = forAllSystems ({ system, pkgs, ... }: { diff --git a/tests/flake.lock b/tests/flake.lock index 8edf1859e..61f8fec53 100644 --- a/tests/flake.lock +++ b/tests/flake.lock @@ -3,11 +3,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", "owner": "edolstra", "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", "type": "github" }, "original": { @@ -25,11 +25,11 @@ ] }, "locked": { - "lastModified": 1712014858, - "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=", + "lastModified": 1719994518, + "narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d", + "rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7", "type": "github" }, "original": { @@ -38,18 +38,38 @@ "type": "github" } }, - "flake-utils": { + "git-hooks-nix": { + "inputs": { + "flake-compat": [ + "nix", + "nix" + ], + "gitignore": [ + "nix", + "nix" + ], + "nixpkgs": [ + "nix", + "nix", + "nixpkgs" + ], + "nixpkgs-stable": [ + "nix", + "nix", + "nixpkgs" + ] + }, "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "lastModified": 1721042469, + "narHash": "sha256-6FPUl7HVtvRHCCBQne7Ylp4p+dpP3P/OYuzjztZ4s70=", + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "f451c19376071a90d8c58ab1a953c6e9840527fd", "type": "github" }, "original": { - "owner": "numtide", - "repo": "flake-utils", + "owner": "cachix", + "repo": "git-hooks.nix", "type": "github" } }, @@ -60,11 +80,11 @@ ] }, "locked": { - "lastModified": 1720042825, - "narHash": "sha256-A0vrUB6x82/jvf17qPCpxaM+ulJnD8YZwH9Ci0BsAzE=", + "lastModified": 1726989464, + "narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=", "owner": "nix-community", "repo": "home-manager", - "rev": "e1391fb22e18a36f57e6999c7a9f966dc80ac073", + "rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176", "type": "github" }, "original": { @@ -74,22 +94,6 @@ "type": "github" } }, - "libgit2": { - "flake": false, - "locked": { - "lastModified": 1697646580, - "narHash": "sha256-oX4Z3S9WtJlwvj0uH9HlYcWv+x1hqp8mhXl7HsLu2f0=", - "owner": "libgit2", - "repo": "libgit2", - "rev": "45fd9ed7ae1a9b74b957ef4f337bc3c8b3df01b5", - "type": "github" - }, - "original": { - "owner": "libgit2", - "repo": "libgit2", - "type": "github" - } - }, "nix": { "inputs": { "nix": "nix_2", @@ -97,7 +101,7 @@ }, "locked": { "lastModified": 0, - "narHash": "sha256-IRsuPsGi6ZCyd7nW5K4tXV/sA8/p2Qs6keteKTm1s3M=", + "narHash": "sha256-IxDtbJ8W7Tu5tE+4PoUQ6z6QQGxggCxc9T28HtglCzU=", "path": "../", "type": "path" }, @@ -113,11 +117,11 @@ ] }, "locked": { - "lastModified": 1721719500, - "narHash": "sha256-nnkqjv4Y37Hydjh6HE9wW4kSkV5Q7q4iIXlL5lwUFOw=", + "lastModified": 1737504076, + "narHash": "sha256-/B4XJnzYU/6K1ZZOBIgsa3K4pqDJrnC2579c44c+4rI=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "884f3fe6d9bf056ba0017c132c39c1f0d07d4fec", + "rev": "65cc1fa8e36ceff067daf6cfb142331f02f524d3", "type": "github" }, "original": { @@ -130,37 +134,53 @@ "inputs": { "flake-compat": "flake-compat", "flake-parts": "flake-parts", - "libgit2": "libgit2", + "git-hooks-nix": "git-hooks-nix", "nixpkgs": "nixpkgs", - "nixpkgs-regression": "nixpkgs-regression", - "pre-commit-hooks": "pre-commit-hooks" + "nixpkgs-23-11": "nixpkgs-23-11", + "nixpkgs-regression": "nixpkgs-regression" }, "locked": { - "lastModified": 1720213208, - "narHash": "sha256-lAoLGVIhRFrfgv7wcyduEkyc83QKrtsfsq4of+WrBeg=", - "rev": "f1deb42176cadfb412eb6f92315e6aeef7f2ad75", - "revCount": 17415, + "lastModified": 1737544604, + "narHash": "sha256-0lFNh54gkDsdHOriOEHK6lr1rGRiP1mhNaCNm+6QspE=", + "rev": "28752fe28868f2c1a4d3c8a86a1ada94b99cce35", + "revCount": 19134, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/NixOS/nix/2.23.3/0190936a-a531-7743-88ed-025ecd4d0835/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/NixOS/nix/2.26.0/01948df9-0aab-77c0-bd82-a2471b41414f/source.tar.gz" }, "original": { "type": "tarball", - "url": "https://flakehub.com/f/NixOS/nix/%3D2.23.3" + "url": "https://flakehub.com/f/NixOS/nix/%3D2.26.0" } }, "nixpkgs": { "locked": { - "lastModified": 1709083642, - "narHash": "sha256-7kkJQd4rZ+vFrzWu8sTRtta5D1kBG0LSRYAfhtmMlSo=", + "lastModified": 1737545261, + "narHash": "sha256-Oa91e3B0/T1E4iL3HRO2ZOIxBxZGkCjHYY8VpFHOrwQ=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "9b6cdf829fdef63efed466cf537c838dc685da41", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "release-24.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-23-11": { + "locked": { + "lastModified": 1717159533, + "narHash": "sha256-oamiKNfr2MS6yH64rUn99mIZjc45nGJlj9eGth/3Xuw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b550fe4b4776908ac2a861124307045f8e717c8e", + "rev": "a62e6edd6d5e1fa0329b8653c801147986f8d446", "type": "github" }, "original": { "owner": "NixOS", - "ref": "release-23.11", "repo": "nixpkgs", + "rev": "a62e6edd6d5e1fa0329b8653c801147986f8d446", "type": "github" } }, @@ -182,54 +202,18 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1717952948, - "narHash": "sha256-mJi4/gjiwQlSaxjA6AusXBN/6rQRaPCycR7bd8fydnQ=", - "rev": "2819fffa7fa42156680f0d282c60d81e8fb185b7", - "revCount": 631440, + "lastModified": 1733120037, + "narHash": "sha256-En+gSoVJ3iQKPDU1FHrR6zIxSLXKjzKY+pnh9tt+Yts=", + "rev": "f9f0d5c5380be0a599b1fb54641fa99af8281539", + "revCount": 710194, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.2405.631440%2Brev-2819fffa7fa42156680f0d282c60d81e8fb185b7/0190034c-678d-7039-b45c-fa38168f2500/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.2411.710194%2Brev-f9f0d5c5380be0a599b1fb54641fa99af8281539/01938be8-64ce-75c6-94d4-dbc2e4d547fe/source.tar.gz" }, "original": { "type": "tarball", "url": "https://flakehub.com/f/NixOS/nixpkgs/%2A" } }, - "pre-commit-hooks": { - "inputs": { - "flake-compat": [ - "nix", - "nix" - ], - "flake-utils": "flake-utils", - "gitignore": [ - "nix", - "nix" - ], - "nixpkgs": [ - "nix", - "nix", - "nixpkgs" - ], - "nixpkgs-stable": [ - "nix", - "nix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1712897695, - "narHash": "sha256-nMirxrGteNAl9sWiOhoN5tIHyjBbVi5e2tgZUgZlK3Y=", - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "rev": "40e6053ecb65fcbf12863338a6dcefb3f55f1bf8", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "type": "github" - } - }, "root": { "inputs": { "home-manager": "home-manager",