diff --git a/.github/workflows/merge.yaml b/.github/workflows/merge.yaml index b0d082e1..1dae85eb 100644 --- a/.github/workflows/merge.yaml +++ b/.github/workflows/merge.yaml @@ -53,7 +53,7 @@ jobs: - architecture: x86_64-darwin runner: macos-13 name: Binary ${{ matrix.binary.architecture }} - needs: + needs: - delete-artifacts uses: ./.github/workflows/build-binaries.yaml with: diff --git a/flake.lock b/flake.lock index a42353b4..41c49ae0 100644 --- a/flake.lock +++ b/flake.lock @@ -44,11 +44,11 @@ ] }, "locked": { - "lastModified": 1730504689, - "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=", + "lastModified": 1733312601, + "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "506278e768c2a08bec68eb62932193e341f55c90", + "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", "type": "github" }, "original": { @@ -113,16 +113,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1732749044, - "narHash": "sha256-T38FQOg0BV5M8FN1712fovzNakSOENEYs+CSkg31C9Y=", + "lastModified": 1733390178, + "narHash": "sha256-iY7JH8YywPkH4ickWWQbija3vYBgeCBhH/jWrmyMmWY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0c5b4ecbed5b155b705336aa96d878e55acd8685", + "rev": "b18c14d8bbd42f6681e6f4b862f7fe3dd0f57b75", "type": "github" }, "original": { "owner": "NixOS", - "ref": "release-24.05", + "ref": "release-24.11", "repo": "nixpkgs", "type": "github" } @@ -139,11 +139,11 @@ ] }, "locked": { - "lastModified": 1732021966, - "narHash": "sha256-mnTbjpdqF0luOkou8ZFi2asa1N3AA2CchR/RqCNmsGE=", + "lastModified": 1733318908, + "narHash": "sha256-SVQVsbafSM1dJ4fpgyBqLZ+Lft+jcQuMtEL3lQWx2Sk=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "3308484d1a443fc5bc92012435d79e80458fe43c", + "rev": "6f4e2a2112050951a314d2733a994fbab94864c6", "type": "github" }, "original": { @@ -171,11 +171,11 @@ ] }, "locked": { - "lastModified": 1732761189, - "narHash": "sha256-A2a4Cw66421Wojv1uqSGkD1XW960uJ7wHuwmvGCUJ8s=", + "lastModified": 1733366051, + "narHash": "sha256-Zlas3LFqrW8bVVrZYgkzS4VNkZgtZ/hsbYhO0GtKLys=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "fd0e3bf854b937632c92819d55d4ff8a130d5658", + "rev": "ba5ed0362eaae83fe8925a2d5cfcf356ff22f70f", "type": "github" }, "original": { @@ -207,11 +207,11 @@ ] }, "locked": { - "lastModified": 1732643199, - "narHash": "sha256-uI7TXEb231o8dkwB5AUCecx3AQtosRmL6hKgnckvjps=", + "lastModified": 1733222881, + "narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "84637a7ab04179bdc42aa8fd0af1909fba76ad0c", + "rev": "49717b5af6f80172275d47a418c9719a31a78b53", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 78b86928..7f269e91 100644 --- a/flake.nix +++ b/flake.nix @@ -4,7 +4,7 @@ inputs = { flake-utils.url = github:numtide/flake-utils; flake-parts.url = github:hercules-ci/flake-parts; - nixpkgs.url = github:NixOS/nixpkgs/release-24.05; + nixpkgs.url = github:NixOS/nixpkgs/release-24.11; rust-overlay.url = github:oxalica/rust-overlay/master; # using a fork with an added source filter crane.url = github:hoprnet/crane/tb/20240117-find-filter;