From 0bb2cb5f8981501f84bdc16681f07a725aebc7f9 Mon Sep 17 00:00:00 2001 From: Auto Update Bot Date: Thu, 24 Oct 2024 21:07:05 +0000 Subject: [PATCH 1/7] update nix-tools-static.nix --- nix-tools-static.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/nix-tools-static.nix b/nix-tools-static.nix index 9ab307a25f..7274ecf8ba 100644 --- a/nix-tools-static.nix +++ b/nix-tools-static.nix @@ -1,22 +1,22 @@ -pkgs: let baseurl = "https://github.com/input-output-hk/haskell.nix/releases/download/nix-tools-0.2.6/"; in { +pkgs: let baseurl = "https://github.com/input-output-hk/haskell.nix/releases/download/nix-tools-0.2.8/"; in { aarch64-darwin = pkgs.fetchurl { name = "aarch64-darwin-nix-tools-static"; url = "${baseurl}aarch64-darwin-nix-tools-static.zip"; - sha256 = "sha256-9WpTIWlpUvG3pI+tcbAMh6sMH0QO/coZrxDYWD43iq0="; + sha256 = "sha256-XzVWGDDJUd4SAKREkdN1k3EId3Gs2ji3J2LA0hLalOk="; }; x86_64-darwin = pkgs.fetchurl { name = "x86_64-darwin-nix-tools-static"; url = "${baseurl}x86_64-darwin-nix-tools-static.zip"; - sha256 = "sha256-UUr9bo2OpLPsvHRSeO2B6DKVDVTsHepRlTqN6UZoZ2M="; + sha256 = "sha256-sz9x8U/N0OfkyTltxJbbVaZvW0jemDAfcov3X2xtFmY="; }; aarch64-linux = pkgs.fetchurl { name = "aarch64-linux-nix-tools-static"; url = "${baseurl}aarch64-linux-nix-tools-static.zip"; - sha256 = "sha256-96s6RXN8st0JK0eYSOkTJvnlTxYVdE81+ZUGJEsC46A="; + sha256 = "sha256-gBpNfqtvbQvZzOKhk68+6jw+VUl5ORi3QzPgwyXiKVA="; }; x86_64-linux = pkgs.fetchurl { name = "x86_64-linux-nix-tools-static"; url = "${baseurl}x86_64-linux-nix-tools-static.zip"; - sha256 = "sha256-LMFVUKNycjVFBb3ChZsPbRNgab50zOHl7nMBrDdeTrQ="; + sha256 = "sha256-aZn6D/Cc7anLJvXiKnJpKlizh5jHSYhEwVen/atE97o="; }; } From 16c20d8f14d13dd6df2d46573ef89898f8a8e6df Mon Sep 17 00:00:00 2001 From: Andrea Bedini Date: Thu, 31 Oct 2024 10:25:34 +0800 Subject: [PATCH 2/7] Bump Cabal-syntax-json --- nix-tools/cabal.project | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nix-tools/cabal.project b/nix-tools/cabal.project index 902e02ba31..83a2062ba4 100644 --- a/nix-tools/cabal.project +++ b/nix-tools/cabal.project @@ -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: 4778c12bc06670afb7cf36473a3f9dd3d7104c5e + --sha256: sha256-PhqMSvHgTBJ7XzVOrfCpBFV07zegtOMBnivH4Jkq6Kc= From e6faa83e79573cff1ac132fca767fc608020161f Mon Sep 17 00:00:00 2001 From: Hamish Mackenzie Date: Fri, 8 Nov 2024 15:21:37 +1300 Subject: [PATCH 3/7] Revert "update nix-tools-static.nix" This reverts commit 0bb2cb5f8981501f84bdc16681f07a725aebc7f9. --- nix-tools-static.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/nix-tools-static.nix b/nix-tools-static.nix index 7274ecf8ba..9ab307a25f 100644 --- a/nix-tools-static.nix +++ b/nix-tools-static.nix @@ -1,22 +1,22 @@ -pkgs: let baseurl = "https://github.com/input-output-hk/haskell.nix/releases/download/nix-tools-0.2.8/"; in { +pkgs: let baseurl = "https://github.com/input-output-hk/haskell.nix/releases/download/nix-tools-0.2.6/"; in { aarch64-darwin = pkgs.fetchurl { name = "aarch64-darwin-nix-tools-static"; url = "${baseurl}aarch64-darwin-nix-tools-static.zip"; - sha256 = "sha256-XzVWGDDJUd4SAKREkdN1k3EId3Gs2ji3J2LA0hLalOk="; + sha256 = "sha256-9WpTIWlpUvG3pI+tcbAMh6sMH0QO/coZrxDYWD43iq0="; }; x86_64-darwin = pkgs.fetchurl { name = "x86_64-darwin-nix-tools-static"; url = "${baseurl}x86_64-darwin-nix-tools-static.zip"; - sha256 = "sha256-sz9x8U/N0OfkyTltxJbbVaZvW0jemDAfcov3X2xtFmY="; + sha256 = "sha256-UUr9bo2OpLPsvHRSeO2B6DKVDVTsHepRlTqN6UZoZ2M="; }; aarch64-linux = pkgs.fetchurl { name = "aarch64-linux-nix-tools-static"; url = "${baseurl}aarch64-linux-nix-tools-static.zip"; - sha256 = "sha256-gBpNfqtvbQvZzOKhk68+6jw+VUl5ORi3QzPgwyXiKVA="; + sha256 = "sha256-96s6RXN8st0JK0eYSOkTJvnlTxYVdE81+ZUGJEsC46A="; }; x86_64-linux = pkgs.fetchurl { name = "x86_64-linux-nix-tools-static"; url = "${baseurl}x86_64-linux-nix-tools-static.zip"; - sha256 = "sha256-aZn6D/Cc7anLJvXiKnJpKlizh5jHSYhEwVen/atE97o="; + sha256 = "sha256-LMFVUKNycjVFBb3ChZsPbRNgab50zOHl7nMBrDdeTrQ="; }; } From f563837cef1895ea7755caee536eb957749701a8 Mon Sep 17 00:00:00 2001 From: Hamish Mackenzie Date: Wed, 11 Dec 2024 21:29:26 +1300 Subject: [PATCH 4/7] Use latest haskellNix and Cabal-syntax-json in nix-tools --- nix-tools/cabal.project | 6 +++--- nix-tools/flake.lock | 30 +++++++++++++++--------------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/nix-tools/cabal.project b/nix-tools/cabal.project index 83a2062ba4..b96576a97a 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-11T00: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: 4778c12bc06670afb7cf36473a3f9dd3d7104c5e - --sha256: sha256-PhqMSvHgTBJ7XzVOrfCpBFV07zegtOMBnivH4Jkq6Kc= + tag: c6c01db076117c309f8ec2e0b8f58b105479f391 + --sha256: sha256-Vj66Sdeq3lizcZxSBJ8QQhPVJ7QDXRdpvDX65RF51oY= 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": { From 985efa88693aaa8fec0cb874aec1f60b131714a4 Mon Sep 17 00:00:00 2001 From: Hamish Mackenzie Date: Wed, 11 Dec 2024 23:43:42 +1300 Subject: [PATCH 5/7] Use GHC 9.6.6 --- nix-tools/cabal.project | 2 +- nix-tools/static/project.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nix-tools/cabal.project b/nix-tools/cabal.project index b96576a97a..e960f8a0a1 100644 --- a/nix-tools/cabal.project +++ b/nix-tools/cabal.project @@ -1,4 +1,4 @@ -index-state: 2024-12-11T00:00:00Z +index-state: 2024-12-10T00:00:00Z packages: nix-tools 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 = ../.; From 7ce0cbc91a2478bf73e466657aecf1cbd591a783 Mon Sep 17 00:00:00 2001 From: Hamish Mackenzie Date: Thu, 12 Dec 2024 20:20:44 +1300 Subject: [PATCH 6/7] Try to fix waiting for hydra --- .github/workflows/upload-artifacts.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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: | From 6679442c331792f999bafc456558c3aa9143728f Mon Sep 17 00:00:00 2001 From: Auto Update Bot Date: Thu, 12 Dec 2024 09:30:18 +0000 Subject: [PATCH 7/7] update nix-tools-static.nix --- nix-tools-static.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/nix-tools-static.nix b/nix-tools-static.nix index 9ab307a25f..9f482e67bf 100644 --- a/nix-tools-static.nix +++ b/nix-tools-static.nix @@ -1,22 +1,22 @@ -pkgs: let baseurl = "https://github.com/input-output-hk/haskell.nix/releases/download/nix-tools-0.2.6/"; in { +pkgs: let baseurl = "https://github.com/input-output-hk/haskell.nix/releases/download/nix-tools-0.2.9/"; in { aarch64-darwin = pkgs.fetchurl { name = "aarch64-darwin-nix-tools-static"; url = "${baseurl}aarch64-darwin-nix-tools-static.zip"; - sha256 = "sha256-9WpTIWlpUvG3pI+tcbAMh6sMH0QO/coZrxDYWD43iq0="; + sha256 = "sha256-cXfdL4jgKYetMoOkNAis6dj7Fyy1llxNgKQtRJTwjhQ="; }; x86_64-darwin = pkgs.fetchurl { name = "x86_64-darwin-nix-tools-static"; url = "${baseurl}x86_64-darwin-nix-tools-static.zip"; - sha256 = "sha256-UUr9bo2OpLPsvHRSeO2B6DKVDVTsHepRlTqN6UZoZ2M="; + sha256 = "sha256-D4Dpiigr2IfsSIFqVEt1syBVCQbPdP7bX5fnhFCGZe0="; }; aarch64-linux = pkgs.fetchurl { name = "aarch64-linux-nix-tools-static"; url = "${baseurl}aarch64-linux-nix-tools-static.zip"; - sha256 = "sha256-96s6RXN8st0JK0eYSOkTJvnlTxYVdE81+ZUGJEsC46A="; + sha256 = "sha256-nVaz5VXhB5ZBT46FucisZCRrE+B1MlONO+4CEWKpwPY="; }; x86_64-linux = pkgs.fetchurl { name = "x86_64-linux-nix-tools-static"; url = "${baseurl}x86_64-linux-nix-tools-static.zip"; - sha256 = "sha256-LMFVUKNycjVFBb3ChZsPbRNgab50zOHl7nMBrDdeTrQ="; + sha256 = "sha256-W0ZCDTV800dhMY/HgAeiyWnCW7f1kqFadYo6R6GadqI="; }; }