3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

4365 commits

Author SHA1 Message Date
Vladimír Čunát 217cf982c7
Merge branch 'master' into staging-next 2019-09-27 22:13:02 +02:00
Peter Simons 5fe9452e11 haskell-liquidhaskell: drop obsolete overrides 2019-09-27 11:04:52 +02:00
Dmitry Kalinkin c455adcc42
Merge branch 'master' into staging-next
Fixes eval on darwin after #69072

Resolved conflict in pkgs/tools/security/thc-hydra/default.nix
Basically had to revert a1c0e10564 which
adapts #69210 to master that doesn't yet have
329a88efa7

Tested using maintainers/scripts/eval-release.sh before and after to see
that the fix works
2019-09-25 19:21:46 -04:00
Peter Simons 4f31c024d1 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.15.0 from Hackage revision
a1a41a1b56.
2019-09-25 15:29:47 +02:00
Peter Simons 933c885761 cabal2nix: add override to keep the ghc-8.6.x version compiling 2019-09-25 15:29:46 +02:00
Peter Simons e234266c38 haskell-bencode: mark the package broken with ghc-8.8.x 2019-09-25 15:29:46 +02:00
Peter Simons ab64a69b54 haskell-src: mark the package broken with ghc-8.8.x 2019-09-25 15:29:46 +02:00
Peter Simons 4485fc595d haskell-memory: use the latest version when compiling with ghc-8.8.1 2019-09-25 15:29:46 +02:00
Peter Simons 7321582c7d haskell-microlens: use the latest version when compiling with ghc-8.8.1 2019-09-25 15:29:46 +02:00
Peter Simons ba0b08074c haskell-shelly: use the latest version when compiling with ghc-8.8.1 2019-09-25 15:28:40 +02:00
Peter Simons 17c3cfd9f0 haskell-hackage-db: use the latest version when compiling with ghc-8.8.1 2019-09-25 15:28:40 +02:00
Peter Simons e49df9257c haskell-string-qq: use the latest version when compiling with ghc-8.8.1 2019-09-25 15:28:40 +02:00
Peter Simons b2c43483b0 haskell-hpack: patch the build to make it succeed with ghc-8.8.1 2019-09-25 15:28:40 +02:00
Olli Helenius 21977c055d haskellPackages.hadolint: fix build by disabling static linking 2019-09-25 15:28:40 +02:00
Guillaume Bouchard 50d128e16c haskellPackages.MemoTrie: remove dontCheck and dontHaddock overrides.
It works fine with (at least):
  - haskellPackages.MemoTrie
  - haskellPackages.ghc844.MemoTrie
2019-09-25 15:28:40 +02:00
Guillaume Bouchard efb4f4817a haskellPackages.PyF: remove broken status
PyF builds perfectly with `haskellPackages.PyF`
2019-09-25 15:28:40 +02:00
Peter Simons 087e8fcf41 LTS Haskell 14.7 2019-09-25 15:28:40 +02:00
Vladimír Čunát eab41878ac
Merge branch 'master' into staging-next 2019-09-24 08:14:34 +02:00
Jörg Thalheim bfed455de3
Merge pull request #68946 from volth/escape
treewide: fix string escapes
2019-09-24 04:19:12 +01:00
Jan Tojnar 11c2b06dd2
Merge branch 'master' into staging-next 2019-09-22 16:39:12 +02:00
Peter Simons 38a0df1867 haskell-easytest: mark the build as broken when compiling with ghc-8.8.x 2019-09-22 13:43:10 +02:00
Peter Simons ad9d8b7aad hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.14.4-12-gd19721c from Hackage revision
c0f0a4b290.
2019-09-22 13:43:10 +02:00
Peter Simons 666dac71ac haskell-string-qq: patch the build to succeed when compiling with ghc-8.8.x 2019-09-22 13:43:09 +02:00
Peter Simons 7832aefa80 haskell-monad-par: disable the test suite when building with ghc-8.8.x 2019-09-22 13:43:09 +02:00
Peter Simons 373796c411 haskell-shakespeare: drop obsolete patch to fix the build with ghc-8.8.x 2019-09-22 13:43:09 +02:00
Peter Simons 9b4cd7c36b haskell-csv: patch the build to succeed when compiling with ghc-8.8.x 2019-09-22 13:43:09 +02:00
Peter Simons a62a68e125 haskell-hpack: mark the build as broken when compiling with ghc-8.8.x 2019-09-22 13:43:09 +02:00
Peter Simons 4f21e87fbe haskell-aeson-diff: jailbreak when building with ghc-8.8.x 2019-09-22 13:43:09 +02:00
Peter Simons cab7cea53c haskell-cassava: use the latest version when building with ghc-8.8.x 2019-09-22 13:43:09 +02:00
Peter Simons a0ac8c8784 haskell-xmonad-contrib: use the latest version when building with ghc-8.8.x 2019-09-22 13:43:09 +02:00
Peter Simons c464e35b69 haskell-lens: use the latest version when building with ghc-8.8.x 2019-09-22 13:43:09 +02:00
Peter Simons e3488760a1 hackage2nix: disable broken builds that cause evaluation errors on Hydra 2019-09-22 13:43:09 +02:00
Peter Simons ec49ae6fe1 haskell-HStringTemplate: drop obsolete override 2019-09-22 13:43:09 +02:00
Peter Simons fbd700b128 haskell-X11: patch the build to succeed with ghc-8.8.x 2019-09-22 13:43:09 +02:00
Peter Simons da2e9d26ef haskell-HStringTemplate: jailbreak when building with ghc-8.8.x 2019-09-22 13:43:09 +02:00
Benjamin Esham 27d01d7712 haskellPackages.pinboard-notes-backup: mark not broken 2019-09-22 13:43:08 +02:00
Justin Humm d383a4cd91 Revert "haskell-hakyll: patch Cabal file from upstream"
This reverts commit fe366d43e8.
2019-09-22 13:43:08 +02:00
Luke Clifton b5344ae807 haskellPackages.shh: mark not broken 2019-09-22 13:43:08 +02:00
Jean-Baptiste Giraudeau 6ceb7a1285 haskellPackages: unbreak amazonka (and other packages that use it)
Closes https://github.com/NixOS/nixpkgs/pull/68944.
2019-09-22 13:43:08 +02:00
Vladimír Čunát 22a216849b
Re-Revert "Merge branch 'staging-next'"
This reverts commit f8a8fc6c7c.
2019-09-22 09:38:09 +02:00
Vladimír Čunát f8a8fc6c7c
Revert "Merge branch 'staging-next'"
This reverts commit 41af38f372, reversing
changes made to f0fec244ca.

Let's delay this.  We have some serious regressions.
2019-09-21 20:05:09 +02:00
Frederik Rietdijk 0b12d44c06 Merge master into staging-next 2019-09-19 16:59:42 +02:00
Peter Simons b08ced9110 haskell-cabal-plan: add override to fix the build 2019-09-19 13:46:20 +02:00
Peter Simons 742348dff5 git-annex: update sha256 hash for new release 7.20190912 2019-09-19 12:33:05 +02:00
Peter Simons 0d67be0416 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.14.4-9-g449ad2b from Hackage revision
ed250ead25.
2019-09-19 12:33:00 +02:00
Peter Simons e405fe40cc hackage2nix: disable builds that break evaluation on Hydra 2019-09-18 19:36:58 +02:00
Luc Tielen de051787bf ghc881 - alex: simplify override 2019-09-18 19:36:58 +02:00
Luc Tielen 5ea256fe5f ghc881 - alex: try only applying relevant patch 2019-09-18 19:36:58 +02:00
Luc Tielen 6facf5b594 ghc881 - alex: point directly to working commit 2019-09-18 19:36:58 +02:00
Luc Tielen fc06be9341 Remove unneeded code 2019-09-18 19:36:58 +02:00