From f047b8817de8437de1d5bd33dae52b602eab3dd1 Mon Sep 17 00:00:00 2001 From: Flake Update Bot Date: Mon, 7 Oct 2024 02:03:52 +0000 Subject: [PATCH 1/2] Automatically update flake.lock to the latest version hackage 5153fdaef0 (2024-07-08) -> afc0936807 (2024-10-07) haskell-nix 34946405e8 (2024-06-21) -> ed955c92e9 (2024-08-07) nixpkgs fe065f84d7 (2024-07-01) -> 4fc18e4ca8 (2024-09-18) stackage c84e07a4e0 (2024-07-06) -> 681e49db5e (2024-10-07) --- flake.lock | 118 ++++++++++++++++++++++++++--------------------------- 1 file changed, 57 insertions(+), 61 deletions(-) diff --git a/flake.lock b/flake.lock index b2f3b17..0f24ac6 100644 --- a/flake.lock +++ b/flake.lock @@ -211,43 +211,6 @@ "type": "github" } }, - "ghc910X": { - "flake": false, - "locked": { - "lastModified": 1714520650, - "narHash": "sha256-4uz6RA1hRr0RheGNDM49a/B3jszqNNU8iHIow4mSyso=", - "ref": "ghc-9.10", - "rev": "2c6375b9a804ac7fca1e82eb6fcfc8594c67c5f5", - "revCount": 62663, - "submodules": true, - "type": "git", - "url": "https://gitlab.haskell.org/ghc/ghc" - }, - "original": { - "ref": "ghc-9.10", - "submodules": true, - "type": "git", - "url": "https://gitlab.haskell.org/ghc/ghc" - } - }, - "ghc911": { - "flake": false, - "locked": { - "lastModified": 1714817013, - "narHash": "sha256-m2je4UvWfkgepMeUIiXHMwE6W+iVfUY38VDGkMzjCcc=", - "ref": "refs/heads/master", - "rev": "fc24c5cf6c62ca9e3c8d236656e139676df65034", - "revCount": 62816, - "submodules": true, - "type": "git", - "url": "https://gitlab.haskell.org/ghc/ghc" - }, - "original": { - "submodules": true, - "type": "git", - "url": "https://gitlab.haskell.org/ghc/ghc" - } - }, "gitignore-nix": { "flake": false, "locked": { @@ -267,11 +230,11 @@ "hackage": { "flake": false, "locked": { - "lastModified": 1720399158, - "narHash": "sha256-WNSc9h/Ci3HpnM6HdgdDsOOiARjIIhlpD+G0r3+WceM=", + "lastModified": 1728260941, + "narHash": "sha256-Y9Rj7OH/iwkx26l0X0+06IBHCb9StYWIY1i+nSs2vrg=", "owner": "input-output-hk", "repo": "hackage.nix", - "rev": "5153fdaef0f7d332cbac319a33b7ed1ecee80a36", + "rev": "afc093680796bf75671750f20b6eaa3c71cc3bfb", "type": "github" }, "original": { @@ -288,8 +251,6 @@ "cardano-shell": "cardano-shell", "flake-compat": "flake-compat_2", "ghc-8.6.5-iohk": "ghc-8.6.5-iohk", - "ghc910X": "ghc910X", - "ghc911": "ghc911", "hackage": [ "hackage" ], @@ -302,6 +263,7 @@ "hls-2.6": "hls-2.6", "hls-2.7": "hls-2.7", "hls-2.8": "hls-2.8", + "hls-2.9": "hls-2.9", "hpc-coveralls": "hpc-coveralls", "hydra": "hydra", "iserv-proxy": "iserv-proxy", @@ -316,6 +278,7 @@ "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": [ @@ -323,11 +286,11 @@ ] }, "locked": { - "lastModified": 1718931026, - "narHash": "sha256-jc+F58pb9Zh860XjeLZiQH8+fylDse5yczdkvt4SKvY=", + "lastModified": 1722991826, + "narHash": "sha256-iCUh65fJZq9XbEUNTWrpOeC07kYR8rSboD9hg9CIhFE=", "owner": "input-output-hk", "repo": "haskell.nix", - "rev": "34946405e89825c757aca192ab13a31313ccef8e", + "rev": "ed955c92e9bc2240b3d402ff1c9c8479e3fa1e4a", "type": "github" }, "original": { @@ -488,6 +451,23 @@ "type": "github" } }, + "hls-2.9": { + "flake": false, + "locked": { + "lastModified": 1718469202, + "narHash": "sha256-THXSz+iwB1yQQsr/PY151+2GvtoJnTIB2pIQ4OzfjD4=", + "owner": "haskell", + "repo": "haskell-language-server", + "rev": "40891bccb235ebacce020b598b083eab9dda80f1", + "type": "github" + }, + "original": { + "owner": "haskell", + "ref": "2.9.0.0", + "repo": "haskell-language-server", + "type": "github" + } + }, "hpc-coveralls": { "flake": false, "locked": { @@ -713,11 +693,11 @@ }, "nixpkgs-2305": { "locked": { - "lastModified": 1701362232, - "narHash": "sha256-GVdzxL0lhEadqs3hfRLuj+L1OJFGiL/L7gCcelgBlsw=", + "lastModified": 1705033721, + "narHash": "sha256-K5eJHmL1/kev6WuqyqqbS1cdNnSidIZ3jeqJ7GbrYnQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d2332963662edffacfddfad59ff4f709dde80ffe", + "rev": "a1982c92d8980a0114372973cbdfe0a307f1bdea", "type": "github" }, "original": { @@ -729,11 +709,11 @@ }, "nixpkgs-2311": { "locked": { - "lastModified": 1701386440, - "narHash": "sha256-xI0uQ9E7JbmEy/v8kR9ZQan6389rHug+zOtZeZFiDJk=", + "lastModified": 1719957072, + "narHash": "sha256-gvFhEf5nszouwLAkT9nWsDzocUTqLWHuL++dvNjMp9I=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "293822e55ec1872f715a66d0eda9e592dc14419f", + "rev": "7144d6241f02d171d25fba3edeaf15e0f2592105", "type": "github" }, "original": { @@ -743,6 +723,22 @@ "type": "github" } }, + "nixpkgs-2405": { + "locked": { + "lastModified": 1720122915, + "narHash": "sha256-Nby8WWxj0elBu1xuRaUcRjPi/rU3xVbkAt2kj4QwX2U=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "835cf2d3f37989c5db6585a28de967a667a75fb1", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-24.05-darwin", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs-regression": { "locked": { "lastModified": 1643052045, @@ -761,27 +757,27 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1694822471, - "narHash": "sha256-6fSDCj++lZVMZlyqOe9SIOL8tYSBz1bI8acwovRwoX8=", + "lastModified": 1720181791, + "narHash": "sha256-i4vJL12/AdyuQuviMMd1Hk2tsGt02hDNhA0Zj1m16N8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "47585496bcb13fb72e4a90daeea2f434e2501998", + "rev": "4284c2b73c8bce4b46a6adf23e16d9e2ec8da4bb", "type": "github" }, "original": { "owner": "NixOS", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", - "rev": "47585496bcb13fb72e4a90daeea2f434e2501998", "type": "github" } }, "nixpkgs_2": { "locked": { - "lastModified": 1719840997, - "narHash": "sha256-Qcz4H+7u5xu+81el88at+8lGHyEZ7pNwk6nAcyzdkts=", + "lastModified": 1726646111, + "narHash": "sha256-/3AvN4QMz/tajuU5rA2MBecUQ51Qgo73KTQT+skS1uE=", "owner": "serokell", "repo": "nixpkgs", - "rev": "fe065f84d7faf5aec1ba29bfcc8b7993bf2dcf8a", + "rev": "4fc18e4ca848c9a5b402e48d4b30155965cfce60", "type": "github" }, "original": { @@ -887,11 +883,11 @@ "stackage": { "flake": false, "locked": { - "lastModified": 1720225382, - "narHash": "sha256-VThVHFjBiGCRuRh8LR2bkUacLICc+fiDZ0TloK50A0c=", + "lastModified": 1728259897, + "narHash": "sha256-mwopeDSr1FFlfzfAXUfRitqEYVes0Jt5GeJBijk7lh0=", "owner": "input-output-hk", "repo": "stackage.nix", - "rev": "c84e07a4e0f39f8ddaaa5ea7b2f92aa39e37c9e5", + "rev": "681e49db5efad4a607d0f6ac5568458276af3336", "type": "github" }, "original": { From 23bd2d47ee3acb077c66b7fb863253a1a6b20718 Mon Sep 17 00:00:00 2001 From: Roman Melnikov Date: Mon, 7 Oct 2024 09:48:15 +0200 Subject: [PATCH 2/2] [Chore] Update GHC versions tested by CI 9.6.3 to 9.6.6, and 9.8.1 to 9.8.2. --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index e975d5e..1052617 100644 --- a/flake.nix +++ b/flake.nix @@ -38,7 +38,7 @@ hs-package-name = "with-utf8"; - ghc-versions = [ "8107" "902" "928" "948" "963" "981" "9101" ]; + ghc-versions = [ "8107" "902" "928" "948" "966" "982" "9101" ]; # invoke haskell.nix for each ghc version listed in ghc-versions pkgs-per-ghc = lib.genAttrs (map (v: "ghc${v}") ghc-versions)