From f6a69e46eb0e84f8be388da07ef7c58fffe9af25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Enis=20Bayramo=C4=9Flu?= Date: Wed, 14 Feb 2024 09:31:18 +0100 Subject: [PATCH 1/3] Use ghc684 in nix --- flake.lock | 148 +++++++++++++++++++++++++++++++++++++++++++++-------- flake.nix | 4 +- 2 files changed, 129 insertions(+), 23 deletions(-) diff --git a/flake.lock b/flake.lock index 4b7fd5eef..b4f2dfd40 100644 --- a/flake.lock +++ b/flake.lock @@ -66,14 +66,33 @@ "type": "github" } }, + "ghc98X": { + "flake": false, + "locked": { + "lastModified": 1696643148, + "narHash": "sha256-E02DfgISH7EvvNAu0BHiPvl1E5FGMDi0pWdNZtIBC9I=", + "ref": "ghc-9.8", + "rev": "443e870d977b1ab6fc05f47a9a17bc49296adbd6", + "revCount": 61642, + "submodules": true, + "type": "git", + "url": "https://gitlab.haskell.org/ghc/ghc" + }, + "original": { + "ref": "ghc-9.8", + "submodules": true, + "type": "git", + "url": "https://gitlab.haskell.org/ghc/ghc" + } + }, "hackage": { "flake": false, "locked": { - "lastModified": 1696379114, - "narHash": "sha256-dtax/ci3JfYvR2lLsvpvC6b3NCoEGZLrDH21/2svTps=", + "lastModified": 1707870123, + "narHash": "sha256-pOvz6uuPYw3CiPgi63QhNYumoKeyzDh9JOkLDngGWsE=", "owner": "input-output-hk", "repo": "hackage.nix", - "rev": "21eae6f46c91831741496101e541e628aadecd98", + "rev": "75345eba5d4159e6f54cbdc38785d1e0d0e655e0", "type": "github" }, "original": { @@ -109,10 +128,7 @@ "hs-nix-infra", "empty" ], - "ghc980": [ - "hs-nix-infra", - "empty" - ], + "ghc98X": "ghc98X", "ghc99": [ "hs-nix-infra", "empty" @@ -134,6 +150,9 @@ "empty" ], "hls-2.3": "hls-2.3", + "hls-2.4": "hls-2.4", + "hls-2.5": "hls-2.5", + "hls-2.6": "hls-2.6", "hpc-coveralls": [ "hs-nix-infra", "empty" @@ -146,6 +165,7 @@ "hs-nix-infra", "empty" ], + "nix-tools-static": "nix-tools-static", "nixpkgs": [ "hs-nix-infra", "haskellNix", @@ -175,6 +195,7 @@ "hs-nix-infra", "empty" ], + "nixpkgs-2311": "nixpkgs-2311", "nixpkgs-unstable": "nixpkgs-unstable", "old-ghc-nix": [ "hs-nix-infra", @@ -186,11 +207,11 @@ ] }, "locked": { - "lastModified": 1697195891, - "narHash": "sha256-0L803S/wcHmVebEwFxObYCYOaB14ZtBAFCdg0aRgH70=", + "lastModified": 1707876653, + "narHash": "sha256-hsj9chw/cy9h8XuxQkxnfFR22Ek8xEm33aON2+TcUaI=", "owner": "input-output-hk", "repo": "haskell.nix", - "rev": "c6cb3ff56b001b211690da35f70827fab5bf3272", + "rev": "d1a608f84c9ed00ceca8571b253e79f67a1ae2d6", "type": "github" }, "original": { @@ -216,6 +237,57 @@ "type": "github" } }, + "hls-2.4": { + "flake": false, + "locked": { + "lastModified": 1699862708, + "narHash": "sha256-YHXSkdz53zd0fYGIYOgLt6HrA0eaRJi9mXVqDgmvrjk=", + "owner": "haskell", + "repo": "haskell-language-server", + "rev": "54507ef7e85fa8e9d0eb9a669832a3287ffccd57", + "type": "github" + }, + "original": { + "owner": "haskell", + "ref": "2.4.0.1", + "repo": "haskell-language-server", + "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" + } + }, "hs-nix-infra": { "inputs": { "empty": "empty", @@ -226,32 +298,66 @@ "nixpkgs-rec": "nixpkgs-rec" }, "locked": { - "lastModified": 1699970998, - "narHash": "sha256-NgvBCRIB+lvcxJWMpU8Mulx8PG8s5jtqSR8K/natoTA=", + "lastModified": 1707899132, + "narHash": "sha256-f9bmt2Dt67nHnqg1Q1SEISe51y0lpyiCzzZYCDsTbU4=", "owner": "kadena-io", "repo": "hs-nix-infra", - "rev": "a69071dafa3f0d12edf30ecc5a562aee1f7d138d", + "rev": "6025866f144f6256c19360c2e7802f4c5713c190", "type": "github" }, "original": { "owner": "kadena-io", + "ref": "chessai/update-1", "repo": "hs-nix-infra", "type": "github" } }, + "nix-tools-static": { + "flake": false, + "locked": { + "lastModified": 1706266250, + "narHash": "sha256-9t+GRk3eO9muCtKdNAwBtNBZ5dH1xHcnS17WaQyftwA=", + "owner": "input-output-hk", + "repo": "haskell-nix-example", + "rev": "580cb6db546a7777dad3b9c0fa487a366c045c4e", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "ref": "nix", + "repo": "haskell-nix-example", + "type": "github" + } + }, "nixpkgs": { "locked": { - "lastModified": 1669833724, - "narHash": "sha256-/HEZNyGbnQecrgJnfE8d0WC5c1xuPSD2LUpB6YXlg4c=", + "lastModified": 1694822471, + "narHash": "sha256-6fSDCj++lZVMZlyqOe9SIOL8tYSBz1bI8acwovRwoX8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4d2b37a84fad1091b9de401eb450aae66f1a741e", + "rev": "47585496bcb13fb72e4a90daeea2f434e2501998", "type": "github" }, "original": { "owner": "NixOS", "repo": "nixpkgs", - "rev": "4d2b37a84fad1091b9de401eb450aae66f1a741e", + "rev": "47585496bcb13fb72e4a90daeea2f434e2501998", + "type": "github" + } + }, + "nixpkgs-2311": { + "locked": { + "lastModified": 1701386440, + "narHash": "sha256-xI0uQ9E7JbmEy/v8kR9ZQan6389rHug+zOtZeZFiDJk=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "293822e55ec1872f715a66d0eda9e592dc14419f", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-23.11-darwin", + "repo": "nixpkgs", "type": "github" } }, @@ -273,17 +379,17 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1695318763, - "narHash": "sha256-FHVPDRP2AfvsxAdc+AsgFJevMz5VBmnZglFUMlxBkcY=", + "lastModified": 1694822471, + "narHash": "sha256-6fSDCj++lZVMZlyqOe9SIOL8tYSBz1bI8acwovRwoX8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e12483116b3b51a185a33a272bf351e357ba9a99", + "rev": "47585496bcb13fb72e4a90daeea2f434e2501998", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixpkgs-unstable", "repo": "nixpkgs", + "rev": "47585496bcb13fb72e4a90daeea2f434e2501998", "type": "github" } }, diff --git a/flake.nix b/flake.nix index 87324d690..9f9ad4ca0 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "Kadena's Pact smart contract language"; inputs = { - hs-nix-infra.url = "github:kadena-io/hs-nix-infra"; + hs-nix-infra.url = "github:kadena-io/hs-nix-infra/chessai/update-1"; flake-utils.url = "github:numtide/flake-utils"; }; @@ -25,7 +25,7 @@ pact = final.haskell-nix.project' { src = ./.; - compiler-nix-name = "ghc963"; + compiler-nix-name = "ghc964"; shell.tools = { cabal = {}; haskell-language-server = {}; From eff00e0010e3e81ea6d3a1e3ad4b934637c88464 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Enis=20Bayramo=C4=9Flu?= Date: Wed, 14 Feb 2024 09:46:44 +0100 Subject: [PATCH 2/3] Bump hs-nix-infra again --- flake.lock | 117 +++++++++++------------------------------------------ 1 file changed, 23 insertions(+), 94 deletions(-) diff --git a/flake.lock b/flake.lock index b4f2dfd40..5ffa1fc37 100644 --- a/flake.lock +++ b/flake.lock @@ -66,25 +66,6 @@ "type": "github" } }, - "ghc98X": { - "flake": false, - "locked": { - "lastModified": 1696643148, - "narHash": "sha256-E02DfgISH7EvvNAu0BHiPvl1E5FGMDi0pWdNZtIBC9I=", - "ref": "ghc-9.8", - "rev": "443e870d977b1ab6fc05f47a9a17bc49296adbd6", - "revCount": 61642, - "submodules": true, - "type": "git", - "url": "https://gitlab.haskell.org/ghc/ghc" - }, - "original": { - "ref": "ghc-9.8", - "submodules": true, - "type": "git", - "url": "https://gitlab.haskell.org/ghc/ghc" - } - }, "hackage": { "flake": false, "locked": { @@ -128,7 +109,10 @@ "hs-nix-infra", "empty" ], - "ghc98X": "ghc98X", + "ghc98X": [ + "hs-nix-infra", + "empty" + ], "ghc99": [ "hs-nix-infra", "empty" @@ -149,9 +133,18 @@ "hs-nix-infra", "empty" ], - "hls-2.3": "hls-2.3", - "hls-2.4": "hls-2.4", - "hls-2.5": "hls-2.5", + "hls-2.3": [ + "hs-nix-infra", + "empty" + ], + "hls-2.4": [ + "hs-nix-infra", + "empty" + ], + "hls-2.5": [ + "hs-nix-infra", + "empty" + ], "hls-2.6": "hls-2.6", "hpc-coveralls": [ "hs-nix-infra", @@ -195,7 +188,10 @@ "hs-nix-infra", "empty" ], - "nixpkgs-2311": "nixpkgs-2311", + "nixpkgs-2311": [ + "hs-nix-infra", + "empty" + ], "nixpkgs-unstable": "nixpkgs-unstable", "old-ghc-nix": [ "hs-nix-infra", @@ -220,57 +216,6 @@ "type": "github" } }, - "hls-2.3": { - "flake": false, - "locked": { - "lastModified": 1695910642, - "narHash": "sha256-tR58doOs3DncFehHwCLczJgntyG/zlsSd7DgDgMPOkI=", - "owner": "haskell", - "repo": "haskell-language-server", - "rev": "458ccdb55c9ea22cd5d13ec3051aaefb295321be", - "type": "github" - }, - "original": { - "owner": "haskell", - "ref": "2.3.0.0", - "repo": "haskell-language-server", - "type": "github" - } - }, - "hls-2.4": { - "flake": false, - "locked": { - "lastModified": 1699862708, - "narHash": "sha256-YHXSkdz53zd0fYGIYOgLt6HrA0eaRJi9mXVqDgmvrjk=", - "owner": "haskell", - "repo": "haskell-language-server", - "rev": "54507ef7e85fa8e9d0eb9a669832a3287ffccd57", - "type": "github" - }, - "original": { - "owner": "haskell", - "ref": "2.4.0.1", - "repo": "haskell-language-server", - "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": { @@ -298,11 +243,11 @@ "nixpkgs-rec": "nixpkgs-rec" }, "locked": { - "lastModified": 1707899132, - "narHash": "sha256-f9bmt2Dt67nHnqg1Q1SEISe51y0lpyiCzzZYCDsTbU4=", + "lastModified": 1707900356, + "narHash": "sha256-rWwE59SfmqXcVQL7GXovYvjbDPMsb4e1GgiNH+7tlrM=", "owner": "kadena-io", "repo": "hs-nix-infra", - "rev": "6025866f144f6256c19360c2e7802f4c5713c190", + "rev": "f40a56b9dbbad46dd749d1d4d12c586fa1d2ef78", "type": "github" }, "original": { @@ -345,22 +290,6 @@ "type": "github" } }, - "nixpkgs-2311": { - "locked": { - "lastModified": 1701386440, - "narHash": "sha256-xI0uQ9E7JbmEy/v8kR9ZQan6389rHug+zOtZeZFiDJk=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "293822e55ec1872f715a66d0eda9e592dc14419f", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-23.11-darwin", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs-rec": { "locked": { "lastModified": 1669833724, From 3123d73d65bd716b22f9fe528379ca092505d5e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Enis=20Bayramo=C4=9Flu?= Date: Wed, 14 Feb 2024 10:00:15 +0100 Subject: [PATCH 3/3] Avoid the pkgconfig alias Which seems to be unsupported as of now --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 9f9ad4ca0..d0419fe88 100644 --- a/flake.nix +++ b/flake.nix @@ -34,7 +34,7 @@ shell.buildInputs = with pkgs; [ zlib z3_4_11 - pkgconfig + pkg-config (python3.withPackages (ps: [ps.sphinx ps.sphinx_rtd_theme])) pandoc perl ];