From 516906a03b48cfa8d6b967f71426e2d6b58f8a12 Mon Sep 17 00:00:00 2001 From: Ivan Gromakovskii Date: Mon, 8 Jul 2024 13:50:28 +0200 Subject: [PATCH 1/3] [Chore] Update GHC versions tested by CI Problem: we've recently supported ghc-9.10.1, but it's not tested by CI. Also we're still testing ghc-8.8.4, which is rather old and causes some troubles when updating Nix dependencies. Solution: add 9.10.1 to tested GHC versions, remove 8.8.4. --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index ddb9fe6..e975d5e 100644 --- a/flake.nix +++ b/flake.nix @@ -38,7 +38,7 @@ hs-package-name = "with-utf8"; - ghc-versions = [ "884" "8107" "902" "928" "948" "963" "981" ]; + ghc-versions = [ "8107" "902" "928" "948" "963" "981" "9101" ]; # invoke haskell.nix for each ghc version listed in ghc-versions pkgs-per-ghc = lib.genAttrs (map (v: "ghc${v}") ghc-versions) From 6edacff35c9c63effb32f1d70489c50f7d2b8938 Mon Sep 17 00:00:00 2001 From: Flake Update Bot Date: Mon, 8 Jul 2024 02:03:23 +0000 Subject: [PATCH 2/3] Automatically update flake.lock to the latest version hackage a62dac66a9 (2024-05-13) -> 5153fdaef0 (2024-07-08) haskell-nix 28fceff2ef (2024-01-10) -> 34946405e8 (2024-06-21) nixpkgs sha256-dd/ (1970-01-01) -> fe065f84d7 (2024-07-01) stackage 207b7104d5 (2024-05-12) -> c84e07a4e0 (2024-07-06) --- flake.lock | 148 +++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 111 insertions(+), 37 deletions(-) diff --git a/flake.lock b/flake.lock index cbb8228..b2f3b17 100644 --- a/flake.lock +++ b/flake.lock @@ -211,33 +211,33 @@ "type": "github" } }, - "ghc98X": { + "ghc910X": { "flake": false, "locked": { - "lastModified": 1696643148, - "narHash": "sha256-E02DfgISH7EvvNAu0BHiPvl1E5FGMDi0pWdNZtIBC9I=", - "ref": "ghc-9.8", - "rev": "443e870d977b1ab6fc05f47a9a17bc49296adbd6", - "revCount": 61642, + "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.8", + "ref": "ghc-9.10", "submodules": true, "type": "git", "url": "https://gitlab.haskell.org/ghc/ghc" } }, - "ghc99": { + "ghc911": { "flake": false, "locked": { - "lastModified": 1701580282, - "narHash": "sha256-drA01r3JrXnkKyzI+owMZGxX0JameMzjK0W5jJE/+V4=", + "lastModified": 1714817013, + "narHash": "sha256-m2je4UvWfkgepMeUIiXHMwE6W+iVfUY38VDGkMzjCcc=", "ref": "refs/heads/master", - "rev": "f5eb0f2982e9cf27515e892c4bdf634bcfb28459", - "revCount": 62197, + "rev": "fc24c5cf6c62ca9e3c8d236656e139676df65034", + "revCount": 62816, "submodules": true, "type": "git", "url": "https://gitlab.haskell.org/ghc/ghc" @@ -267,11 +267,11 @@ "hackage": { "flake": false, "locked": { - "lastModified": 1715560494, - "narHash": "sha256-JAPXpr+I48XosjkYiXDyRRV1K8UJwEn7ypSR30Q812U=", + "lastModified": 1720399158, + "narHash": "sha256-WNSc9h/Ci3HpnM6HdgdDsOOiARjIIhlpD+G0r3+WceM=", "owner": "input-output-hk", "repo": "hackage.nix", - "rev": "a62dac66a95f2fb407c824592c6f325b8f7d0b60", + "rev": "5153fdaef0f7d332cbac319a33b7ed1ecee80a36", "type": "github" }, "original": { @@ -288,8 +288,8 @@ "cardano-shell": "cardano-shell", "flake-compat": "flake-compat_2", "ghc-8.6.5-iohk": "ghc-8.6.5-iohk", - "ghc98X": "ghc98X", - "ghc99": "ghc99", + "ghc910X": "ghc910X", + "ghc911": "ghc911", "hackage": [ "hackage" ], @@ -298,6 +298,10 @@ "hls-2.2": "hls-2.2", "hls-2.3": "hls-2.3", "hls-2.4": "hls-2.4", + "hls-2.5": "hls-2.5", + "hls-2.6": "hls-2.6", + "hls-2.7": "hls-2.7", + "hls-2.8": "hls-2.8", "hpc-coveralls": "hpc-coveralls", "hydra": "hydra", "iserv-proxy": "iserv-proxy", @@ -319,11 +323,11 @@ ] }, "locked": { - "lastModified": 1704847818, - "narHash": "sha256-LQzIY21CkCirSSR+7fB5uQjlFGBzCvjA0x/TuPXT3V8=", + "lastModified": 1718931026, + "narHash": "sha256-jc+F58pb9Zh860XjeLZiQH8+fylDse5yczdkvt4SKvY=", "owner": "input-output-hk", "repo": "haskell.nix", - "rev": "28fceff2ef63b5bd0717371df5500a58ace98ee6", + "rev": "34946405e89825c757aca192ab13a31313ccef8e", "type": "github" }, "original": { @@ -416,6 +420,74 @@ "type": "github" } }, + "hls-2.5": { + "flake": false, + "locked": { + "lastModified": 1701080174, + "narHash": "sha256-fyiR9TaHGJIIR0UmcCb73Xv9TJq3ht2ioxQ2mT7kVdc=", + "owner": "haskell", + "repo": "haskell-language-server", + "rev": "27f8c3d3892e38edaef5bea3870161815c4d014c", + "type": "github" + }, + "original": { + "owner": "haskell", + "ref": "2.5.0.0", + "repo": "haskell-language-server", + "type": "github" + } + }, + "hls-2.6": { + "flake": false, + "locked": { + "lastModified": 1705325287, + "narHash": "sha256-+P87oLdlPyMw8Mgoul7HMWdEvWP/fNlo8jyNtwME8E8=", + "owner": "haskell", + "repo": "haskell-language-server", + "rev": "6e0b342fa0327e628610f2711f8c3e4eaaa08b1e", + "type": "github" + }, + "original": { + "owner": "haskell", + "ref": "2.6.0.0", + "repo": "haskell-language-server", + "type": "github" + } + }, + "hls-2.7": { + "flake": false, + "locked": { + "lastModified": 1708965829, + "narHash": "sha256-LfJ+TBcBFq/XKoiNI7pc4VoHg4WmuzsFxYJ3Fu+Jf+M=", + "owner": "haskell", + "repo": "haskell-language-server", + "rev": "50322b0a4aefb27adc5ec42f5055aaa8f8e38001", + "type": "github" + }, + "original": { + "owner": "haskell", + "ref": "2.7.0.0", + "repo": "haskell-language-server", + "type": "github" + } + }, + "hls-2.8": { + "flake": false, + "locked": { + "lastModified": 1715153580, + "narHash": "sha256-Vi/iUt2pWyUJlo9VrYgTcbRviWE0cFO6rmGi9rmALw0=", + "owner": "haskell", + "repo": "haskell-language-server", + "rev": "dd1be1beb16700de59e0d6801957290bcf956a0a", + "type": "github" + }, + "original": { + "owner": "haskell", + "ref": "2.8.0.0", + "repo": "haskell-language-server", + "type": "github" + } + }, "hpc-coveralls": { "flake": false, "locked": { @@ -458,18 +530,18 @@ "iserv-proxy": { "flake": false, "locked": { - "lastModified": 1691634696, - "narHash": "sha256-MZH2NznKC/gbgBu8NgIibtSUZeJ00HTLJ0PlWKCBHb0=", - "ref": "hkm/remote-iserv", - "rev": "43a979272d9addc29fbffc2e8542c5d96e993d73", - "revCount": 14, - "type": "git", - "url": "https://gitlab.haskell.org/hamishmack/iserv-proxy.git" + "lastModified": 1717479972, + "narHash": "sha256-7vE3RQycHI1YT9LHJ1/fUaeln2vIpYm6Mmn8FTpYeVo=", + "owner": "stable-haskell", + "repo": "iserv-proxy", + "rev": "2ed34002247213fc435d0062350b91bab920626e", + "type": "github" }, "original": { - "ref": "hkm/remote-iserv", - "type": "git", - "url": "https://gitlab.haskell.org/hamishmack/iserv-proxy.git" + "owner": "stable-haskell", + "ref": "iserv-syms", + "repo": "iserv-proxy", + "type": "github" } }, "lowdown-src": { @@ -705,10 +777,12 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 0, - "narHash": "sha256-dd/N4mTzE8tT1vHeOdAhiyXNHgtrfIqAUC0zz6yp8QM=", - "path": "/nix/store/b4vjszbzi7fnnkhdynja9f3js6s4sfjm-source", - "type": "path" + "lastModified": 1719840997, + "narHash": "sha256-Qcz4H+7u5xu+81el88at+8lGHyEZ7pNwk6nAcyzdkts=", + "owner": "serokell", + "repo": "nixpkgs", + "rev": "fe065f84d7faf5aec1ba29bfcc8b7993bf2dcf8a", + "type": "github" }, "original": { "id": "nixpkgs", @@ -813,11 +887,11 @@ "stackage": { "flake": false, "locked": { - "lastModified": 1715473225, - "narHash": "sha256-uAD2qephrnRmMdLiLNqbGXfgc0BGHveiHbRhm19cNs0=", + "lastModified": 1720225382, + "narHash": "sha256-VThVHFjBiGCRuRh8LR2bkUacLICc+fiDZ0TloK50A0c=", "owner": "input-output-hk", "repo": "stackage.nix", - "rev": "207b7104d536df29d264047c37500a224dde97bc", + "rev": "c84e07a4e0f39f8ddaaa5ea7b2f92aa39e37c9e5", "type": "github" }, "original": { From 6902102355cdba8d198cedd71f4638fca07f43ee Mon Sep 17 00:00:00 2001 From: Ivan Gromakovskii Date: Mon, 8 Jul 2024 13:55:48 +0200 Subject: [PATCH 3/3] Trigger CI on push to master and on PR Problem: CI is triggered only on push, so it won't work in case of PRs from forks. Solution: trigger it on PRs as well. Trigger on push only when the branch is master. If you want to run on push to your feature branch, you can edit check.yml in your branch. --- .github/workflows/check.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index dd402da..31a2e8d 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -2,7 +2,10 @@ # # SPDX-License-Identifier: MPL-2.0 name: Nix flake check -on: push +on: + pull_request: + push: + branches: master jobs: validate: