From 7aa4bd25426b42a31e6c0dcbc961e39f722daf26 Mon Sep 17 00:00:00 2001 From: Moritz Angermann Date: Wed, 16 Oct 2024 11:35:28 +0900 Subject: [PATCH] revert haskell.nix update --- flake.lock | 56 +++++++++++++++++++----------------------------------- flake.nix | 3 ++- 2 files changed, 22 insertions(+), 37 deletions(-) diff --git a/flake.lock b/flake.lock index 084e62b02..9b5619f42 100644 --- a/flake.lock +++ b/flake.lock @@ -226,11 +226,11 @@ "hackage": { "flake": false, "locked": { - "lastModified": 1728520067, - "narHash": "sha256-hM44JtZhnSKRzf6rJkZLPyAYHFMmysdZz1gLA+0Kctk=", + "lastModified": 1720744653, + "narHash": "sha256-VYvpinub+qxzlBlBkAbklSkGBLQ2iuirTklmAH3IV5M=", "owner": "input-output-hk", "repo": "hackage.nix", - "rev": "06fc3131daf5fcd3db12429d0c62e6c1db97eb5a", + "rev": "7801e84a1058ede079daa3aa4e11b154c3166c20", "type": "github" }, "original": { @@ -273,21 +273,21 @@ "nixpkgs-2211": "nixpkgs-2211", "nixpkgs-2305": "nixpkgs-2305", "nixpkgs-2311": "nixpkgs-2311", - "nixpkgs-2405": "nixpkgs-2405", "nixpkgs-unstable": "nixpkgs-unstable", "old-ghc-nix": "old-ghc-nix", "stackage": "stackage" }, "locked": { - "lastModified": 1725411053, - "narHash": "sha256-cW999pULNLOZHlV9sqBFIrWTkSxuVAVR6xJR7GndHdQ=", + "lastModified": 1720745421, + "narHash": "sha256-xbUN9ejUafCGxrQZ0kTJAn6Lz3BfEJt2dqICllUireM=", "owner": "input-output-hk", "repo": "haskell.nix", - "rev": "63783ecc949e99b2396ca821275cee26385adaba", + "rev": "fbebee6c8afd92f2e3b283872656957c647250c3", "type": "github" }, "original": { "owner": "input-output-hk", + "ref": "fbebee6c8afd92f2e3b283872656957c647250c3", "repo": "haskell.nix", "type": "github" } @@ -674,11 +674,11 @@ }, "nixpkgs-2305": { "locked": { - "lastModified": 1705033721, - "narHash": "sha256-K5eJHmL1/kev6WuqyqqbS1cdNnSidIZ3jeqJ7GbrYnQ=", + "lastModified": 1701362232, + "narHash": "sha256-GVdzxL0lhEadqs3hfRLuj+L1OJFGiL/L7gCcelgBlsw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a1982c92d8980a0114372973cbdfe0a307f1bdea", + "rev": "d2332963662edffacfddfad59ff4f709dde80ffe", "type": "github" }, "original": { @@ -690,11 +690,11 @@ }, "nixpkgs-2311": { "locked": { - "lastModified": 1719957072, - "narHash": "sha256-gvFhEf5nszouwLAkT9nWsDzocUTqLWHuL++dvNjMp9I=", + "lastModified": 1701386440, + "narHash": "sha256-xI0uQ9E7JbmEy/v8kR9ZQan6389rHug+zOtZeZFiDJk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7144d6241f02d171d25fba3edeaf15e0f2592105", + "rev": "293822e55ec1872f715a66d0eda9e592dc14419f", "type": "github" }, "original": { @@ -704,22 +704,6 @@ "type": "github" } }, - "nixpkgs-2405": { - "locked": { - "lastModified": 1726447378, - "narHash": "sha256-2yV8nmYE1p9lfmLHhOCbYwQC/W8WYfGQABoGzJOb1JQ=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "086b448a5d54fd117f4dc2dee55c9f0ff461bdc1", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-24.05-darwin", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs-regression": { "locked": { "lastModified": 1643052045, @@ -754,17 +738,17 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1726583932, - "narHash": "sha256-zACxiQx8knB3F8+Ze+1BpiYrI+CbhxyWpcSID9kVhkQ=", + "lastModified": 1694822471, + "narHash": "sha256-6fSDCj++lZVMZlyqOe9SIOL8tYSBz1bI8acwovRwoX8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "658e7223191d2598641d50ee4e898126768fe847", + "rev": "47585496bcb13fb72e4a90daeea2f434e2501998", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixpkgs-unstable", "repo": "nixpkgs", + "rev": "47585496bcb13fb72e4a90daeea2f434e2501998", "type": "github" } }, @@ -889,11 +873,11 @@ "stackage": { "flake": false, "locked": { - "lastModified": 1728519053, - "narHash": "sha256-eLqU1oYOInJgc0bVzPhkYzFZ3C/naHTY8C6gzgGz3Jo=", + "lastModified": 1720743780, + "narHash": "sha256-iyYvtZm+QqkXnxueZ0Lcbt5jwH+w3o8FwInC72X5c0o=", "owner": "input-output-hk", "repo": "stackage.nix", - "rev": "fbf28874c9c0e75d99f97e81057097f018d37574", + "rev": "ff834187e768e8dfec5328cf46ce7b99ee69b238", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index daf50598c..f7312659f 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,8 @@ description = "cardano-base"; inputs = { - haskellNix.url = "github:input-output-hk/haskell.nix"; + # freeze haskell.nix prior to the nixpkgs update that broken 8.10 cross-windows + haskellNix.url = "github:input-output-hk/haskell.nix?ref=fbebee6c8afd92f2e3b283872656957c647250c3"; nixpkgs.follows = "haskellNix/nixpkgs-unstable"; iohkNix.url = "github:input-output-hk/iohk-nix"; flake-utils.url = "github:hamishmack/flake-utils/hkm/nested-hydraJobs";