From 962390e4f0476b0dc01578e799474166eec7a91b Mon Sep 17 00:00:00 2001 From: zeme Date: Tue, 2 Jul 2024 09:53:20 +0200 Subject: [PATCH 1/5] Add support for ghc910 in hydra --- nix/outputs.nix | 7 +++++++ nix/project.nix | 1 + 2 files changed, 8 insertions(+) diff --git a/nix/outputs.nix b/nix/outputs.nix index 1083c410f8d..53b135980a4 100644 --- a/nix/outputs.nix +++ b/nix/outputs.nix @@ -9,6 +9,7 @@ let ghc96-profiled = project.variants.ghc96-profiled; ghc98 = project.variants.ghc98; ghc810 = project.variants.ghc810; + ghc910 = project.variants.ghc910; in @@ -21,6 +22,7 @@ in devShells.ghc96 = ghc96.devShell; devShells.ghc810 = ghc810.devShell; devShells.ghc98 = ghc98.devShell; + devShells.ghc910 = ghc910.devShell; packages = ghc96.packages; apps = ghc96.apps; @@ -43,6 +45,7 @@ in hydraJobs.ghc96 = ghc96.hydraJobs; hydraJobs.ghc810 = ghc810.hydraJobs; hydraJobs.ghc98 = ghc98.hydraJobs; + hydraJobs.ghc910 = ghc910.hydraJobs; }) (lib.optionalAttrs (system == "x86_64-linux") @@ -67,6 +70,7 @@ in hydraJobs.ghc810.devShell = ghc810.devShell; hydraJobs.ghc96.devShell = ghc96.devShell; hydraJobs.ghc98.devShell = ghc98.devShell; + hydraJobs.ghc910.devShell = ghc910.devShell; hydraJobs.ghc810.roots = ghc810.hydraJobs.roots; hydraJobs.ghc810.plan-nix = ghc810.hydraJobs.plan-nix; @@ -76,5 +80,8 @@ in hydraJobs.ghc98.roots = ghc98.hydraJobs.roots; hydraJobs.ghc98.plan-nix = ghc98.hydraJobs.plan-nix; + + hydraJobs.ghc910.roots = ghc910.hydraJobs.roots; + hydraJobs.ghc910.plan-nix = ghc910.hydraJobs.plan-nix; }) ] diff --git a/nix/project.nix b/nix/project.nix index b43199b5a5a..847fac8039d 100644 --- a/nix/project.nix +++ b/nix/project.nix @@ -31,6 +31,7 @@ let }]; ghc810.compiler-nix-name = "ghc810"; ghc98.compiler-nix-name = "ghc98"; + ghc910.compiler-nix-name = "ghc910"; }; inputMap = { "https://chap.intersectmbo.org/" = inputs.iogx.inputs.CHaP; }; From 84e3e6b61f8b6c8b0b89a8ed6a03ef6fb7ed5d27 Mon Sep 17 00:00:00 2001 From: zeme Date: Fri, 5 Jul 2024 17:43:51 +0200 Subject: [PATCH 2/5] Updated iogx --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index 3ca3e5340cf..96654c23a00 100644 --- a/flake.lock +++ b/flake.lock @@ -600,11 +600,11 @@ "sphinxcontrib-haddock": "sphinxcontrib-haddock" }, "locked": { - "lastModified": 1716957774, - "narHash": "sha256-DbaK6wx8va7HfUxqcgoI5FUq5HCHxOC/9JIyseC9ShE=", + "lastModified": 1720186867, + "narHash": "sha256-E1WYB1hEwth5oCT9vD1bmRmq+964EMc3l0WApLResw4=", "owner": "input-output-hk", "repo": "iogx", - "rev": "da35819d80a6eb3d8d1ea109fb3d4434dde513e6", + "rev": "0d28b4334b8845f05a8c55a0d2dabdbb964431bb", "type": "github" }, "original": { @@ -624,11 +624,11 @@ "sodium": "sodium" }, "locked": { - "lastModified": 1715898223, - "narHash": "sha256-G1LFsvP53twrqaC1FVard/6rjJJ3oitnpJ1E+mTZDGM=", + "lastModified": 1719443312, + "narHash": "sha256-JNDuUSmV/o5ck1CfnBtX8GJE/Pli4zYE73LZZ7u0E2Q=", "owner": "input-output-hk", "repo": "iohk-nix", - "rev": "29f19cd41dc593cf17bbc24194e34e7c20889fc9", + "rev": "b4025c38b609c6fb99762e2a6201e4e3488a39d3", "type": "github" }, "original": { @@ -872,11 +872,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1710695816, - "narHash": "sha256-3Eh7fhEID17pv9ZxrPwCLfqXnYP006RKzSs0JptsN84=", + "lastModified": 1718811006, + "narHash": "sha256-0Y8IrGhRmBmT7HHXlxxepg2t8j1X90++qRN3lukGaIk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "614b4613980a522ba49f0d194531beddbb7220d3", + "rev": "03d771e513ce90147b65fe922d87d3a0356fc125", "type": "github" }, "original": { @@ -919,11 +919,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1710765496, - "narHash": "sha256-p7ryWEeQfMwTB6E0wIUd5V2cFTgq+DRRBz2hYGnJZyA=", + "lastModified": 1719082008, + "narHash": "sha256-jHJSUH619zBQ6WdC21fFAlDxHErKVDJ5fpN0Hgx4sjs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e367f7a1fb93137af22a3908f00b9a35e2d286a7", + "rev": "9693852a2070b398ee123a329e68f0dab5526681", "type": "github" }, "original": { @@ -958,11 +958,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1715870890, - "narHash": "sha256-nacSOeXtUEM77Gn0G4bTdEOeFIrkCBXiyyFZtdGwuH0=", + "lastModified": 1719259945, + "narHash": "sha256-F1h+XIsGKT9TkGO3omxDLEb/9jOOsI6NnzsXFsZhry4=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "fa606cccd7b0ccebe2880051208e4a0f61bfc8c1", + "rev": "0ff4381bbb8f7a52ca4a851660fc7a437a4c6e07", "type": "github" }, "original": { From 50af11e9629079789b2f2c43aedc574aa6fb619d Mon Sep 17 00:00:00 2001 From: zeme Date: Fri, 5 Jul 2024 19:51:52 +0200 Subject: [PATCH 3/5] Update flake inputs --- flake.lock | 87 +++++++++++++++++++++--------------------------------- 1 file changed, 33 insertions(+), 54 deletions(-) diff --git a/flake.lock b/flake.lock index 96654c23a00..b54f4c0dcb6 100644 --- a/flake.lock +++ b/flake.lock @@ -3,11 +3,11 @@ "CHaP": { "flake": false, "locked": { - "lastModified": 1718922031, - "narHash": "sha256-4bxsEKCjp+ylLy0tQyM1PoHqlZCbfT9/Dp7Ihq+mODE=", + "lastModified": 1720157709, + "narHash": "sha256-9GZS2x9ZcaMncOAdVtHi+bXIi3amdOOgGCFjRZuO9sw=", "owner": "IntersectMBO", "repo": "cardano-haskell-packages", - "rev": "ee6185d77cebb5a70a349c9d8e3627fa5f79c301", + "rev": "2bfd58f7293b0c66eafeab9b905ba5e680aeab41", "type": "github" }, "original": { @@ -254,43 +254,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": { "inputs": { "nixpkgs": [ @@ -316,11 +279,11 @@ "hackage": { "flake": false, "locked": { - "lastModified": 1719103200, - "narHash": "sha256-8LyFlI8divWRyROjLcqSkjQx8eiuNaO6Fx/wRysMiwg=", + "lastModified": 1720139837, + "narHash": "sha256-sHzBEROaMR3fpBcajRh44FiaQf8F5+frPfgUMmslUkQ=", "owner": "input-output-hk", "repo": "hackage.nix", - "rev": "65f65bd4dd41f82bab07ae7d85ff9e90ddf34b20", + "rev": "b7a8cc3e5e94cd79ac8b52e46f85b4279e4d6c33", "type": "github" }, "original": { @@ -338,8 +301,6 @@ "cardano-shell": "cardano-shell", "flake-compat": "flake-compat", "ghc-8.6.5-iohk": "ghc-8.6.5-iohk", - "ghc910X": "ghc910X", - "ghc911": "ghc911", "hackage": [ "hackage" ], @@ -352,6 +313,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", @@ -371,11 +333,11 @@ "stackage": "stackage" }, "locked": { - "lastModified": 1716857427, - "narHash": "sha256-DgRcCf+hoW530vjdxF4LAqWKY0s6Et3WEzvQgzlowq0=", + "lastModified": 1720140618, + "narHash": "sha256-NUOHsXOoB+JBopuQpTTfn0zGfbfg49i3f5VlQIU0ATQ=", "owner": "input-output-hk", "repo": "haskell.nix", - "rev": "c1382b31f1ba8440acf409babf78f3139f415318", + "rev": "eb6200ccc683803154f8d8226a12f26857275f2e", "type": "github" }, "original": { @@ -537,6 +499,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": { @@ -640,11 +619,11 @@ "iserv-proxy": { "flake": false, "locked": { - "lastModified": 1710581758, - "narHash": "sha256-UNUXGiKLGUv1TuQumV70rfjCJERP4w8KZEDxsMG0RHc=", + "lastModified": 1717479972, + "narHash": "sha256-7vE3RQycHI1YT9LHJ1/fUaeln2vIpYm6Mmn8FTpYeVo=", "owner": "stable-haskell", "repo": "iserv-proxy", - "rev": "50ea210590ab0519149bfd163d5ba199be925fb6", + "rev": "2ed34002247213fc435d0062350b91bab920626e", "type": "github" }, "original": { @@ -1036,11 +1015,11 @@ "stackage": { "flake": false, "locked": { - "lastModified": 1716855611, - "narHash": "sha256-Fif+fJir0LYjPUnpKbJakPxfNgjlDkwJYOInwEQXjSI=", + "lastModified": 1720138986, + "narHash": "sha256-+A0QV5ttTNRhlLD/o2l8VjVYE6Xk3X+I2r9b9mlrgw8=", "owner": "input-output-hk", "repo": "stackage.nix", - "rev": "d460e0c7a0bde606713eb984e242248bf412a334", + "rev": "0cfa5e0a9804966c8feb8227d57149348ff79f2c", "type": "github" }, "original": { From cfab69676fc53a962bbbb0e14fb3ed89b3daf8be Mon Sep 17 00:00:00 2001 From: zeme Date: Sat, 6 Jul 2024 07:22:41 +0200 Subject: [PATCH 4/5] Flake lock update --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index b54f4c0dcb6..0f587d0852f 100644 --- a/flake.lock +++ b/flake.lock @@ -579,11 +579,11 @@ "sphinxcontrib-haddock": "sphinxcontrib-haddock" }, "locked": { - "lastModified": 1720186867, - "narHash": "sha256-E1WYB1hEwth5oCT9vD1bmRmq+964EMc3l0WApLResw4=", + "lastModified": 1720207747, + "narHash": "sha256-ISZAoaeRMrTYmhkH96w2Ua/5SsVY+ja2MpW0ZKkHbWo=", "owner": "input-output-hk", "repo": "iogx", - "rev": "0d28b4334b8845f05a8c55a0d2dabdbb964431bb", + "rev": "a6ad5dc3a956cb17b0cbee308d5b1788eb42f431", "type": "github" }, "original": { From 2493038b755b48a9f76d5b425e35cd72aaa1c418 Mon Sep 17 00:00:00 2001 From: zeme Date: Sun, 7 Jul 2024 00:06:01 +0200 Subject: [PATCH 5/5] wip --- nix/outputs.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nix/outputs.nix b/nix/outputs.nix index 53b135980a4..cba8352d379 100644 --- a/nix/outputs.nix +++ b/nix/outputs.nix @@ -10,7 +10,6 @@ let ghc98 = project.variants.ghc98; ghc810 = project.variants.ghc810; ghc910 = project.variants.ghc910; - in [