From 1b21d870d0ccb07c4b884b62344bbb804540683a Mon Sep 17 00:00:00 2001 From: Alexey Khudyakov Date: Thu, 10 Dec 2020 18:32:12 +0300 Subject: [PATCH] Support for GHC8.10 Unable to create shell. See https://github.com/NixOS/nixpkgs/pull/85446 --- nix/derivations/ghc810/lens.nix | 41 +++++++++++++++++++++++++++++++++ nix/overrides.nix | 16 ++++++++++++- nix/release.nix | 9 ++++---- 3 files changed, 61 insertions(+), 5 deletions(-) create mode 100644 nix/derivations/ghc810/lens.nix diff --git a/nix/derivations/ghc810/lens.nix b/nix/derivations/ghc810/lens.nix new file mode 100644 index 00000000..f13f54d0 --- /dev/null +++ b/nix/derivations/ghc810/lens.nix @@ -0,0 +1,41 @@ +{ mkDerivation, array, base, base-compat, base-orphans, bifunctors +, bytestring, Cabal, cabal-doctest, call-stack, comonad, containers +, contravariant, criterion, deepseq, directory, distributive +, doctest, exceptions, filepath, free, generic-deriving, ghc-prim +, hashable, HUnit, kan-extensions, mtl, nats, parallel, profunctors +, QuickCheck, reflection, semigroupoids, semigroups, simple-reflect +, stdenv, tagged, template-haskell, test-framework +, test-framework-hunit, test-framework-quickcheck2, text +, th-abstraction, transformers, transformers-compat +, unordered-containers, vector +}: +mkDerivation { + pname = "lens"; + version = "4.19.2"; + sha256 = "52f858ae3971a5104cdba5e81a27d154fda11fe65a54a4ac328c85904bdec23b"; + revision = "2"; + editedCabalFile = "1bp6s0ifwdmzv946krxgxqakw02iriqmzvvcypwrgcynrn9wkn9y"; + setupHaskellDepends = [ base Cabal cabal-doctest filepath ]; + libraryHaskellDepends = [ + array base base-orphans bifunctors bytestring call-stack comonad + containers contravariant distributive exceptions filepath free + ghc-prim hashable kan-extensions mtl parallel profunctors + reflection semigroupoids tagged template-haskell text + th-abstraction transformers transformers-compat + unordered-containers vector + ]; + testHaskellDepends = [ + base bytestring containers deepseq directory doctest filepath + generic-deriving HUnit mtl nats parallel QuickCheck semigroups + simple-reflect test-framework test-framework-hunit + test-framework-quickcheck2 text transformers unordered-containers + vector + ]; + benchmarkHaskellDepends = [ + base base-compat bytestring comonad containers criterion deepseq + generic-deriving transformers unordered-containers vector + ]; + homepage = "http://github.com/ekmett/lens/"; + description = "Lenses, Folds and Traversals"; + license = stdenv.lib.licenses.bsd2; +} diff --git a/nix/overrides.nix b/nix/overrides.nix index 50954048..c43e9d73 100644 --- a/nix/overrides.nix +++ b/nix/overrides.nix @@ -1,12 +1,13 @@ { # List of GHC versions for which we apply overrides - versions = ["ghc844" "ghc865" "ghc883" "ghcjs"]; + versions = ["ghc844" "ghc865" "ghc883" "ghc8101" "ghcjs"]; # List of packages with custom overrides derivations = { haskell = ./derivations/haskell; ghc844 = ./derivations/ghc84; ghc865 = ./derivations/ghc86; ghc883 = ./derivations/ghc88; + ghc8101 = ./derivations/ghc810; }; # Common overrides for librarise haskell = { @@ -24,6 +25,19 @@ }; ghc883 = { }; + ghc8101 = { + generic-lens = { check = false; }; + monad-par = { check = false; }; + http-media = { jailbreak = true; }; + cborg = { jailbreak = true; }; + serialise = { jailbreak = true; }; + microlens-th = { jailbreak = true; }; + retry = { jailbreak = true; }; + safe-exceptions = { jailbreak = true; }; + vault = { jailbreak = true; }; + servant = { jailbreak = true; check = false; }; + servant-server = { jailbreak = true; check = false; }; + }; ghcjs = { SHA = { check = false; }; cborg = { check = false; }; diff --git a/nix/release.nix b/nix/release.nix index 4af9f76d..0436520e 100644 --- a/nix/release.nix +++ b/nix/release.nix @@ -86,9 +86,10 @@ let in { inherit pkgs; - ghc844 = hschainPkgAll; - ghc865 = hschainPkgAll; - ghc883 = hschainPkgAll; - ghcjs = hschainPkgJs; + ghc844 = hschainPkgAll; + ghc865 = hschainPkgAll; + ghc883 = hschainPkgAll; + ghc8101 = hschainPkgAll; + ghcjs = hschainPkgJs; }; in release