From 3369b350317f0be0b9b75846a84ef69463dfcdaa Mon Sep 17 00:00:00 2001 From: Dhruv Dang Date: Sun, 23 Aug 2020 22:21:24 -0700 Subject: [PATCH 1/4] #84563 #95931 fix ghcjs 8.6 so it builds --- .../development/compilers/ghcjs-ng/8.6/dep-overrides.nix | 9 ++++++--- pkgs/development/compilers/ghcjs-ng/default.nix | 3 +-- .../haskell-modules/configuration-ghc-8.6.x.nix | 8 ++++++++ 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/pkgs/development/compilers/ghcjs-ng/8.6/dep-overrides.nix b/pkgs/development/compilers/ghcjs-ng/8.6/dep-overrides.nix index c54c782fafa..c2f2cb3b81a 100644 --- a/pkgs/development/compilers/ghcjs-ng/8.6/dep-overrides.nix +++ b/pkgs/development/compilers/ghcjs-ng/8.6/dep-overrides.nix @@ -1,11 +1,14 @@ -{ haskellLib }: +{ lib, haskellLib, fetchFromGitHub }: -let inherit (haskellLib) doJailbreak dontHaddock; +let inherit (haskellLib) doJailbreak dontHaddock dontCheck; in self: super: { + ghcjs = super.ghcjs.override { + shelly = super.shelly_1_8_1; + }; ghc-api-ghcjs = super.ghc-api-ghcjs.override { happy = self.happy_1_19_5; }; - haddock-library-ghcjs = doJailbreak super.haddock-library-ghcjs; + haddock-library-ghcjs = doJailbreak (dontCheck super.haddock-library-ghcjs); haddock-api-ghcjs = doJailbreak (dontHaddock super.haddock-api-ghcjs); } diff --git a/pkgs/development/compilers/ghcjs-ng/default.nix b/pkgs/development/compilers/ghcjs-ng/default.nix index 6d56c410aab..7b6fbc460a9 100644 --- a/pkgs/development/compilers/ghcjs-ng/default.nix +++ b/pkgs/development/compilers/ghcjs-ng/default.nix @@ -102,7 +102,6 @@ in stdenv.mkDerivation { inherit passthru; - meta.broken = true; # build does not succeed - meta.platforms = lib.platforms.none; # passthru.bootPkgs.ghc.meta.platforms; + meta.platforms = passthru.bootPkgs.ghc.meta.platforms; meta.maintainers = [lib.maintainers.elvishjerricco]; } diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix index 339fda5d6fb..f68eec94200 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix @@ -94,4 +94,12 @@ self: super: { # Only 0.6 is compatible with ghc 8.6 https://hackage.haskell.org/package/apply-refact/changelog apply-refact = super.apply-refact_0_6_0_0; + + # ghcjs 8.6.x relies on shelly < 1.9.0 (default is 1.9.0 in current package set, adding 1.8.1). + shelly_1_8_1 = super.callCabal2nix "shelly" (pkgs.fetchFromGitHub { + owner = "gregwebs"; + repo = "Shelly.hs"; + rev = "d0a185c7dee96820fc3652e7603d81a28276d76c"; + sha256 = "173msjlq6yxpvd3900ajmd8znyg9kfg5csbxbiz4m7hvxkg8kbkn"; + }) {}; } From 871e0ddca7841e5ec2b7f34ee23893da40c3f3c4 Mon Sep 17 00:00:00 2001 From: Dhruv Dang Date: Mon, 24 Aug 2020 10:29:58 -0700 Subject: [PATCH 2/4] move shelly 1.8.1 from configuration-ghc-8.6.x.nix to configuration-hackage2nix.yaml --- .../haskell-modules/configuration-ghc-8.6.x.nix | 8 -------- .../haskell-modules/configuration-hackage2nix.yaml | 3 ++- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix index f68eec94200..339fda5d6fb 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix @@ -94,12 +94,4 @@ self: super: { # Only 0.6 is compatible with ghc 8.6 https://hackage.haskell.org/package/apply-refact/changelog apply-refact = super.apply-refact_0_6_0_0; - - # ghcjs 8.6.x relies on shelly < 1.9.0 (default is 1.9.0 in current package set, adding 1.8.1). - shelly_1_8_1 = super.callCabal2nix "shelly" (pkgs.fetchFromGitHub { - owner = "gregwebs"; - repo = "Shelly.hs"; - rev = "d0a185c7dee96820fc3652e7603d81a28276d76c"; - sha256 = "173msjlq6yxpvd3900ajmd8znyg9kfg5csbxbiz4m7hvxkg8kbkn"; - }) {}; } diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index a9b0b88eaef..86f0e8e640e 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -64,7 +64,7 @@ core-packages: # # WARNING: This list is generated semiautomatically based on the most recent # LTS package set. If you want to add entries to it, you must do so before the -# comment saying "# LTS Haskell x.y". Any changes after that commend will be +# comment saying "# LTS Haskell x.y". Any changes after that comment will be # lost the next time `update-stackage.sh` runs. default-package-overrides: # This was only intended for ghc-7.0.4, and has very old deps, one hidden behind a flag @@ -72,6 +72,7 @@ default-package-overrides: # gi-gdkx11-4.x requires gtk-4.x, which is still under development and # not yet available in Nixpkgs - gi-gdkx11 < 4 + - shelly ==1.8.1 # LTS Haskell 16.10 - abstract-deque ==0.3 - abstract-par ==0.3.3 From a6ac08e37c439b4d1ab364189fa7d2fb267c71b1 Mon Sep 17 00:00:00 2001 From: Dhruv Dang Date: Mon, 24 Aug 2020 10:41:11 -0700 Subject: [PATCH 3/4] remove unnecessary imports in ghcjs-ng/8.6/dep-overrides.nix --- pkgs/development/compilers/ghcjs-ng/8.6/dep-overrides.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/ghcjs-ng/8.6/dep-overrides.nix b/pkgs/development/compilers/ghcjs-ng/8.6/dep-overrides.nix index c2f2cb3b81a..bbf8a579919 100644 --- a/pkgs/development/compilers/ghcjs-ng/8.6/dep-overrides.nix +++ b/pkgs/development/compilers/ghcjs-ng/8.6/dep-overrides.nix @@ -1,4 +1,4 @@ -{ lib, haskellLib, fetchFromGitHub }: +{ haskellLib }: let inherit (haskellLib) doJailbreak dontHaddock dontCheck; in self: super: { From 991527b16970d0caf9ca0c08dfb00543d1350fdd Mon Sep 17 00:00:00 2001 From: Dhruv Dang Date: Tue, 25 Aug 2020 11:25:16 -0700 Subject: [PATCH 4/4] move shelly dependency to extra-packages section of configuration-hackage2nix.yaml --- pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 86f0e8e640e..efafdb8dd24 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -72,7 +72,6 @@ default-package-overrides: # gi-gdkx11-4.x requires gtk-4.x, which is still under development and # not yet available in Nixpkgs - gi-gdkx11 < 4 - - shelly ==1.8.1 # LTS Haskell 16.10 - abstract-deque ==0.3 - abstract-par ==0.3.3 @@ -2605,6 +2604,7 @@ extra-packages: - resourcet ==1.1.* # pre-lts-11.x versions neeed by git-annex 6.20180227 - seqid < 0.2 # newer versions depend on transformers 0.4.x which we cannot provide in GHC 7.8.x - seqid-streams < 0.2 # newer versions depend on transformers 0.4.x which we cannot provide in GHC 7.8.x + - shelly ==1.8.1 # ghcjs depends on shelly < 1.9 - split < 0.2 # newer versions don't work with GHC 6.12.3 - tar < 0.4.2.0 # later versions don't work with GHC < 7.6.x - transformers == 0.4.3.* # the latest version isn't supported by mtl yet