diff --git a/.github/workflows/upload-artifacts.yml b/.github/workflows/upload-artifacts.yml index ddc923800f..5d5772f62e 100644 --- a/.github/workflows/upload-artifacts.yml +++ b/.github/workflows/upload-artifacts.yml @@ -39,7 +39,7 @@ jobs: - name: Wait for nix-tools meta job uses: input-output-hk/actions/wait-for-hydra@angerman/support-prs with: - status: 'ci/hydra-build:nix-tools' + check: 'ci/hydra-build:nix-tools' - name: "Pull nix-tools" run: | diff --git a/nix-tools/cabal.project b/nix-tools/cabal.project index 902e02ba31..1018fd72ef 100644 --- a/nix-tools/cabal.project +++ b/nix-tools/cabal.project @@ -1,4 +1,4 @@ -index-state: 2024-10-15T20:31:31Z +index-state: 2024-12-10T00:00:00Z packages: nix-tools @@ -36,5 +36,5 @@ source-repository-package source-repository-package type: git location: https://github.com/andreabedini/Cabal-syntax-json.git - tag: b7192832f730d9181a013ef7c77f2ad0b30cca43 - --sha256: sha256-Yw2HQOCmjOvfKHi3xWbSniAZfyrshOvsgmUbqFmDDpU= + tag: 7a80221047fb5dd66a091f4a7248e0afa3bcc248 + --sha256: sha256-R55nljZMnc6s+Apc4uaZal9ExDauxYq/pV7RxQHwzVc= diff --git a/nix-tools/flake.lock b/nix-tools/flake.lock index 06581f1296..dee1d1ba2f 100644 --- a/nix-tools/flake.lock +++ b/nix-tools/flake.lock @@ -120,11 +120,11 @@ "hackage": { "flake": false, "locked": { - "lastModified": 1729124899, - "narHash": "sha256-cmb4iMcgk5+jUGMiZGNMzPCAnG17Kz9J6WIitYM17Fc=", + "lastModified": 1733877006, + "narHash": "sha256-rNpSFS/ziUQBPgo6iAbKgU00yRpeCngv215TW0D+kCo=", "owner": "input-output-hk", "repo": "hackage.nix", - "rev": "138edf81c8bcc4209e9706966f7feece70c37a96", + "rev": "583f569545854160b6bc5606374bf5006a9f6929", "type": "github" }, "original": { @@ -173,11 +173,11 @@ "stackage": "stackage" }, "locked": { - "lastModified": 1729126246, - "narHash": "sha256-OXGwQF3AMERYaVdImhGLlvJgOE8Zr0yURef4J7zlp6k=", + "lastModified": 1733878317, + "narHash": "sha256-Bbr5dUxCH+s1BXfZ5BNxmOOnLZqZUdjeZVWN0KEak/Q=", "owner": "input-output-hk", "repo": "haskell.nix", - "rev": "c2070f089bf688571c14af77744982c86f0c2e21", + "rev": "fa511ea6fd05774bbf97f187fd560658067ff7f7", "type": "github" }, "original": { @@ -579,11 +579,11 @@ }, "nixpkgs-2405": { "locked": { - "lastModified": 1726447378, - "narHash": "sha256-2yV8nmYE1p9lfmLHhOCbYwQC/W8WYfGQABoGzJOb1JQ=", + "lastModified": 1729242558, + "narHash": "sha256-VgcLDu4igNT0eYua6OAl9pWCI0cYXhDbR+pWP44tte0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "086b448a5d54fd117f4dc2dee55c9f0ff461bdc1", + "rev": "4a3f2d3195b60d07530574988df92e049372c10e", "type": "github" }, "original": { @@ -611,11 +611,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1726583932, - "narHash": "sha256-zACxiQx8knB3F8+Ze+1BpiYrI+CbhxyWpcSID9kVhkQ=", + "lastModified": 1729980323, + "narHash": "sha256-eWPRZAlhf446bKSmzw6x7RWEE4IuZgAp8NW3eXZwRAY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "658e7223191d2598641d50ee4e898126768fe847", + "rev": "86e78d3d2084ff87688da662cf78c2af085d8e73", "type": "github" }, "original": { @@ -654,11 +654,11 @@ "stackage": { "flake": false, "locked": { - "lastModified": 1729039017, - "narHash": "sha256-fGExfgG+7UNSOV8YfOrWPpOHWrCjA02gQkeSBhaAzjQ=", + "lastModified": 1733789551, + "narHash": "sha256-0tSxhYw3RqNEHYFYIwJZ99mFDpGr8Dekf+p2ZCEygYY=", "owner": "input-output-hk", "repo": "stackage.nix", - "rev": "df1d8f0960407551fea7af7af75a9c2f9e18de97", + "rev": "db7b3e7ae59867ce0ba21df45f57ea38f57710ab", "type": "github" }, "original": { diff --git a/nix-tools/static/project.nix b/nix-tools/static/project.nix index e7ed7832e7..c494d320d8 100644 --- a/nix-tools/static/project.nix +++ b/nix-tools/static/project.nix @@ -64,7 +64,7 @@ let static-nix-tools-project = pkgs.haskell-nix.project' { - compiler-nix-name = "ghc928"; + compiler-nix-name = "ghc966"; src = ../.;