diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2019-02-06 14:24:46 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2019-02-06 14:24:46 +0100 |
| commit | ff101946a846bff067ee3d1f4c18fa2c8a9e7f79 (patch) | |
| tree | 01fffd5f6fa291f1d80b6ca024d5c62a2b96653e /pkgs/development/haskell-modules/configuration-common.nix | |
| parent | 72f8f89849ebe341c697486f63df7fbac35f6b5c (diff) | |
| parent | dbc771f2e107fa364493c968796a8772d569e4a8 (diff) | |
| download | nixlib-ff101946a846bff067ee3d1f4c18fa2c8a9e7f79.tar nixlib-ff101946a846bff067ee3d1f4c18fa2c8a9e7f79.tar.gz nixlib-ff101946a846bff067ee3d1f4c18fa2c8a9e7f79.tar.bz2 nixlib-ff101946a846bff067ee3d1f4c18fa2c8a9e7f79.tar.lz nixlib-ff101946a846bff067ee3d1f4c18fa2c8a9e7f79.tar.xz nixlib-ff101946a846bff067ee3d1f4c18fa2c8a9e7f79.tar.zst nixlib-ff101946a846bff067ee3d1f4c18fa2c8a9e7f79.zip | |
Merge branch 'master' into staging-next
Hydra nixpkgs: ?compare=1503899
Diffstat (limited to 'pkgs/development/haskell-modules/configuration-common.nix')
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-common.nix | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 4943935fbe41..475aa31a7a60 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1189,6 +1189,7 @@ self: super: { # Jailbreak tasty < 1.2: https://github.com/phadej/tdigest/issues/30 tdigest = doJailbreak super.tdigest; # until tdigest > 0.2.1 + these = doJailbreak super.these; # until these >= 0.7.6 # These patches contain fixes for 8.6 that should be safe for # earlier versions, but we need the relaxed version bounds in GHC @@ -1199,4 +1200,11 @@ self: super: { beam-migrate = appendPatch super.beam-migrate ./patches/beam-migrate-fix-ghc-8.6.x-build.patch; beam-postgres = appendPatch super.beam-postgres ./patches/beam-postgres-fix-ghc-8.6.x-build.patch; beam-sqlite = appendPatch super.beam-sqlite ./patches/beam-sqlite-fix-ghc-8.6.x-build.patch; + + # https://github.com/sighingnow/computations/pull/1 + primesieve = appendPatch super.primesieve (pkgs.fetchpatch { + url = "https://github.com/sighingnow/computations/commit/1f96788367c879b999afe733e2fe28d919d17702.patch"; + sha256 = "0lrcmcrxp9imj9rfaq7mb0fn9mxms4gq4sz95n4san3dpd0qmj9x"; + stripLen = 1; + }); } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super |