From 2a68cb7caa0c22accf37ff0aab8e57373f17ffb0 Mon Sep 17 00:00:00 2001 From: Guillaume Bouchard Date: Mon, 28 Mar 2022 10:43:32 +0200 Subject: [PATCH] nix: bump nixpkgs and use GHC 9.2.2 I also renamed all configuratino from GHC-XYZ to GHC-XY to ease future transitions. --- ...on-ghc-901.nix => configuration-ghc-90.nix | 0 ...on-ghc-921.nix => configuration-ghc-92.nix | 2 - flake.lock | 50 +++++++++---------- flake.nix | 38 +++++++------- 4 files changed, 43 insertions(+), 47 deletions(-) rename configuration-ghc-901.nix => configuration-ghc-90.nix (100%) rename configuration-ghc-921.nix => configuration-ghc-92.nix (94%) diff --git a/configuration-ghc-901.nix b/configuration-ghc-90.nix similarity index 100% rename from configuration-ghc-901.nix rename to configuration-ghc-90.nix diff --git a/configuration-ghc-921.nix b/configuration-ghc-92.nix similarity index 94% rename from configuration-ghc-921.nix rename to configuration-ghc-92.nix index fbb3bee780..be58cd2d2d 100644 --- a/configuration-ghc-921.nix +++ b/configuration-ghc-92.nix @@ -20,14 +20,12 @@ let hlsDisabledPlugins = disabledPlugins; fourmolu = hself.callCabal2nix "fourmolu" inputs.fourmolu {}; - primitive-extras = hself.primitive-extras_0_10_1_2; ghc-exactprint = hself.callCabal2nix "ghc-exactprint" inputs.ghc-exactprint {}; constraints-extras = hself.callCabal2nix "constraints-extras" inputs.constraints-extras {}; retrie = hself.callCabal2nix "retrie" inputs.retrie {}; # Hlint is still broken hlint = doJailbreak (hself.callCabal2nix "hlint" inputs.hlint {}); - hiedb = hself.hiedb_0_4_1_0; # Re-generate HLS drv excluding some plugins haskell-language-server = diff --git a/flake.lock b/flake.lock index b1d15496c1..9706134632 100644 --- a/flake.lock +++ b/flake.lock @@ -15,11 +15,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1641205782, - "narHash": "sha256-4jY7RCWUoZ9cKD8co0/4tFARpWB+57+r1bLLvXNJliY=", + "lastModified": 1648199409, + "narHash": "sha256-JwPKdC2PoVBkG6E+eWw3j6BMR6sL3COpYWfif7RVb8Y=", "owner": "edolstra", "repo": "flake-compat", - "rev": "b7547d3eed6f32d06102ead8991ec52ab0a4f1a7", + "rev": "64a525ee38886ab9028e6f61790de0832aa3ef03", "type": "github" }, "original": { @@ -30,11 +30,11 @@ }, "flake-utils": { "locked": { - "lastModified": 1629481132, - "narHash": "sha256-JHgasjPR0/J1J3DRm4KxM4zTyAj4IOJY8vIl75v/kPI=", + "lastModified": 1649676176, + "narHash": "sha256-OWKJratjt2RW151VUlJPRALb7OU2S5s+f0vLj4o1bHM=", "owner": "numtide", "repo": "flake-utils", - "rev": "997f7efcb746a9c140ce1f13c72263189225f482", + "rev": "a4b154ebbdc88c8498a5c7b01589addc9e9cb678", "type": "github" }, "original": { @@ -45,11 +45,11 @@ }, "flake-utils_2": { "locked": { - "lastModified": 1638122382, - "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=", + "lastModified": 1644229661, + "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", "owner": "numtide", "repo": "flake-utils", - "rev": "74f7e4319258e287b0f9cb95426c9853b282730b", + "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797", "type": "github" }, "original": { @@ -85,11 +85,11 @@ "gitignore": { "flake": false, "locked": { - "lastModified": 1611672876, - "narHash": "sha256-qHu3uZ/o9jBHiA3MEKHJ06k7w4heOhA+4HCSIvflRxo=", + "lastModified": 1646480205, + "narHash": "sha256-kekOlTlu45vuK2L9nq8iVN17V3sB0WWPqTTW3a2SQG0=", "owner": "hercules-ci", "repo": "gitignore.nix", - "rev": "211907489e9f198594c0eb0ca9256a1949c9d412", + "rev": "bff2832ec341cf30acb3a4d3e2e7f1f7b590116a", "type": "github" }, "original": { @@ -101,13 +101,13 @@ "hie-bios": { "flake": false, "locked": { - "narHash": "sha256-nd+FfUQVZNxJfKZkAWA3dF0JwRgXntL+1gGvyNHDbKc=", + "narHash": "sha256-5RqspT27rb/tMBwrKr4VfSSbq0+c0LMNuaKlTun0Kkk=", "type": "tarball", - "url": "https://hackage.haskell.org/package/hie-bios-0.9.0/hie-bios-0.9.0.tar.gz" + "url": "https://hackage.haskell.org/package/hie-bios-0.9.1/hie-bios-0.9.1.tar.gz" }, "original": { "type": "tarball", - "url": "https://hackage.haskell.org/package/hie-bios-0.9.0/hie-bios-0.9.0.tar.gz" + "url": "https://hackage.haskell.org/package/hie-bios-0.9.1/hie-bios-0.9.1.tar.gz" } }, "hlint": { @@ -172,11 +172,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1639357775, - "narHash": "sha256-mJJFCPqZi1ZO3CvgEfN2nFAYv4uAJSRnTKzLFi61+WA=", + "lastModified": 1649961138, + "narHash": "sha256-8ZCPrazs+qd2V8Elw84lIWuk0kKfVQ8Ei/19gahURhM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c473cc8714710179df205b153f4e9fa007107ff9", + "rev": "d08394e7cd5c7431a1e8f53b7f581e74ee909548", "type": "github" }, "original": { @@ -188,11 +188,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1641016545, - "narHash": "sha256-JMNwvnBzG0RjGG3eH27Y5/GlJ9ryeCdGJfqGbqxnmZY=", - "owner": "NixOS", + "lastModified": 1645655918, + "narHash": "sha256-ZfbEFRW7o237+A1P7eTKhXje435FCAoe0blj2n20Was=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "6f05cfdb1e78d36c0337516df674560e4b51c79b", + "rev": "77a7a4197740213879b9a1d2e1788c6c8ade4274", "type": "github" }, "original": { @@ -206,11 +206,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1624971177, - "narHash": "sha256-Amf/nBj1E77RmbSSmV+hg6YOpR+rddCbbVgo5C7BS0I=", + "lastModified": 1649054408, + "narHash": "sha256-wz8AH7orqUE4Xog29WMTqOYBs0DMj2wFM8ulrTRVgz0=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "397f0713d007250a2c7a745e555fa16c5dc8cadb", + "rev": "e5e7b3b542e7f4f96967966a943d7e1c07558042", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 5676f5a5fc..d07c1b5202 100644 --- a/flake.nix +++ b/flake.nix @@ -114,8 +114,6 @@ github = overrideCabal hsuper.github (drv: { patches = []; }); # GHCIDE requires hie-bios ^>=0.9.1 hie-bios = hself.callCabal2nix "hie-bios" inputs.hie-bios {}; - # We need an older version - hiedb = hself.hiedb_0_4_1_0; lsp = hsuper.callCabal2nix "lsp" inputs.lsp {}; lsp-types = hsuper.callCabal2nix "lsp-types" inputs.lsp-types {}; @@ -206,17 +204,17 @@ }; }; - ghc901Config = (import ./configuration-ghc-901.nix) { inherit pkgs; }; - ghc921Config = (import ./configuration-ghc-921.nix) { inherit pkgs inputs; }; + ghc901Config = (import ./configuration-ghc-90.nix) { inherit pkgs; }; + ghc922Config = (import ./configuration-ghc-92.nix) { inherit pkgs inputs; }; # GHC versions ghcDefault = pkgs.hlsHpkgs ("ghc" + pkgs.lib.replaceStrings [ "." ] [ "" ] pkgs.haskellPackages.ghc.version); - ghc884 = pkgs.hlsHpkgs "ghc884"; - ghc8107 = pkgs.hlsHpkgs "ghc8107"; - ghc901 = ghc901Config.tweakHpkgs (pkgs.hlsHpkgs "ghc901"); - ghc921 = ghc921Config.tweakHpkgs (pkgs.hlsHpkgs "ghc921"); + ghc88 = pkgs.hlsHpkgs "ghc884"; + ghc810 = pkgs.hlsHpkgs "ghc8107"; + ghc90 = ghc901Config.tweakHpkgs (pkgs.hlsHpkgs "ghc901"); + ghc92 = ghc922Config.tweakHpkgs (pkgs.hlsHpkgs "ghc922"); # For markdown support myst-parser = pkgs.python3Packages.callPackage ./myst-parser.nix {}; @@ -334,27 +332,27 @@ # Developement shell with only compiler simpleDevShells = { haskell-language-server-dev = mkDevShell ghcDefault "cabal.project"; - haskell-language-server-884-dev = mkDevShell ghc884 "cabal.project"; - haskell-language-server-8107-dev = mkDevShell ghc8107 "cabal.project"; - haskell-language-server-901-dev = mkDevShell ghc901 "cabal-ghc90.project"; - haskell-language-server-921-dev = mkDevShell ghc921 "cabal-ghc921.project"; + haskell-language-server-88-dev = mkDevShell ghc884 "cabal.project"; + haskell-language-server-810-dev = mkDevShell ghc8107 "cabal.project"; + haskell-language-server-90-dev = mkDevShell ghc901 "cabal-ghc90.project"; + haskell-language-server-92-dev = mkDevShell ghc922 "cabal-ghc922.project"; }; # Developement shell, haskell packages are also provided by nix nixDevShells = { haskell-language-server-dev-nix = mkDevShellWithNixDeps ghcDefault "cabal.project"; - haskell-language-server-884-dev-nix = mkDevShellWithNixDeps ghc884 "cabal.project"; - haskell-language-server-8107-dev-nix = mkDevShellWithNixDeps ghc8107 "cabal.project"; - haskell-language-server-901-dev-nix = mkDevShellWithNixDeps ghc901 "cabal-ghc90.project"; - haskell-language-server-921-dev-nix = mkDevShellWithNixDeps ghc921 "cabal-ghc921.project"; + haskell-language-server-88-dev-nix = mkDevShellWithNixDeps ghc884 "cabal.project"; + haskell-language-server-810-dev-nix = mkDevShellWithNixDeps ghc8107 "cabal.project"; + haskell-language-server-90-dev-nix = mkDevShellWithNixDeps ghc901 "cabal-ghc90.project"; + haskell-language-server-92-dev-nix = mkDevShellWithNixDeps ghc922 "cabal-ghc92.project"; }; allPackages = { haskell-language-server = mkExe ghcDefault; - haskell-language-server-884 = mkExe ghc884; - haskell-language-server-8107 = mkExe ghc8107; - haskell-language-server-901 = mkExe ghc901; - haskell-language-server-921 = mkExe ghc921; + haskell-language-server-88 = mkExe ghc88; + haskell-language-server-810 = mkExe ghc810; + haskell-language-server-90 = mkExe ghc90; + haskell-language-server-92 = mkExe ghc92; }; devShells = simpleDevShells // nixDevShells;