3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

2319 commits

Author SHA1 Message Date
Domen Kožar 0eb4f6fd25
Merge commit 'a889454869e4f7d5ba6067ebcc0ba7fcd26e4417'
Merge staging. It includes fixes for cc-wrapper parsing speed and
some other minor things.

http://hydra.nixos.org/eval/1375094
2017-07-14 11:55:41 +02:00
Peter Simons 85c884278e haskell-lens: use latest version when compiling with ghc-8.2.x 2017-07-13 08:47:01 +02:00
Peter Simons 559b1b7647 haskell-semigroupoids: use latest version when compiling with ghc-8.2.x 2017-07-13 08:47:01 +02:00
Peter Simons c6ccfcd01a haskell-base-orphans: use latest version when compiling with ghc-8.2.x 2017-07-13 08:47:01 +02:00
Peter Simons bde4ef2234 haskell-hashable: jailbreak to fix build with ghc-8.2.x 2017-07-13 08:44:18 +02:00
Peter Simons 2180d2c118 haskell-jailbreak-cabal: use stable version from ghc-8.0.x in ghc-8.2.x package set
The version compiled with Cabal 2.x breaks many packages, like doctest and
hashable. This needs further investigation.
2017-07-13 08:44:18 +02:00
Peter Simons 26762f1e1e haskell-base-orphans: disable test suite to avoid build failures with ghc-8.2.x 2017-07-13 08:44:18 +02:00
Peter Simons 0ee5424ebf haskell-doctest: remove obsolete jailbreak; ghc-8.2.x can build this package now 2017-07-13 08:44:18 +02:00
Peter Simons f980dbec97 haskell-ChasingBottoms: jailbreak to fix build with ghc-8.2.x 2017-07-13 08:44:17 +02:00
Peter Simons e59c532c23 haskell-hspec-meta: use latest version when compiling with ghc-8.2.x
Fixes https://github.com/hspec/hspec/issues/323.
2017-07-13 08:44:17 +02:00
David Johnson 51edf3bf88 miso: init at 0.2.0.0 2017-07-12 18:47:18 +00:00
John Ericson a889454869 Merge pull request #27284 from obsidiansystems/prop-lines
stdenv: Store one package per line in nix-support/propagated-*
2017-07-11 14:33:23 -04:00
John Ericson 3cb745d5a6 stdenv: Store one package per line in nix-support/propagated-*
This makes those files a bit easier to read. Also, for what it's worth,
it brings us one baby step closer to handling spaces in store paths.

Also, I optimized handling of many transitive deps with read. Probably,
not very beneficial, but nice to enforce the pkg-per-line structure.
Doing so let me find much dubious code and fix it.

Two misc notes:

 - `propagated-user-env-packages` also needed to be adjusted as
   sometimes it is copied to/from the propagated input files.

 - `local fd` should ensure that file descriptors aren't clobbered
   during recursion.
2017-07-10 13:32:13 -04:00
Sarah Brofeldt 05c2d80025 haskellPackages.inline-java: Add jdk build dependency 2017-07-10 03:08:26 +02:00
Peter Simons ab8af93b26 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.3.1-4-gaa50929-dirty from Hackage revision
da393a1dae.
2017-07-06 15:28:20 +02:00
Peter Simons 7e31862657 haskell-tinc: use default versions of cabal-install and cabal2nix 2017-07-04 15:50:27 +02:00
Peter Simons 3d03ec8d2e haskell-vector: use newer version to compile with ghc-8.2.x 2017-07-04 15:50:26 +02:00
Peter Simons 26271d0811 haskell-doctest: jailbreak to fix build with ghc-8.2.x 2017-07-04 15:50:26 +02:00
Peter Simons f8f9fccd32 haskell-syb: use newer version to compile with ghc-8.2.x 2017-07-04 15:50:26 +02:00
Peter Simons 1fb109090e haskell-primitive: use newer version to compile with ghc-8.2.x 2017-07-04 15:50:25 +02:00
Peter Simons 55545d1b76 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.3.1-4-gaa50929 from Hackage revision
82bc7a9031.
2017-07-04 15:50:25 +02:00
Peter Simons 641bd6e0ca hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.2.1-13-g5c18fb5 from Hackage revision
b275173e92.
2017-07-01 09:46:20 +02:00
RFish ⚓ be23568daa hackage2nix: use older version of apply-refact with ghc-8.0.x
Version 0.4 of apply-refact doesn't compile with GHC 8.0.x. This patch
updates configurations-ghc-8.0.x to use apply-refact version 0.3.0.1.

Closes https://github.com/NixOS/nixpkgs/pull/26896.
Fixes https://github.com/NixOS/nixpkgs/issues/26895.
2017-07-01 09:46:02 +02:00
Peter Simons 7d8adcab38 LTS Haskell 8.21 2017-07-01 09:45:31 +02:00
Peter Simons ad6c235857 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.2.1-13-g5c18fb5 from Hackage revision
68ba901b90.
2017-06-29 17:35:45 +02:00
Peter Simons 46fe4bd8f3 ghc-syb-utils: disable test suite for GHC 8.x or later
The test suite fails when compiling with GHC 8.x. This seems to be a known issue.

Cc: https://github.com/nominolo/ghc-syb/issues/20, https://github.com/NixOS/nixpkgs/issues/26689
2017-06-29 17:35:44 +02:00
Peter Simons 78377ae5cf haskell: fix builds of hledger-iadd, opencv-extra, and logging-facade-syslog 2017-06-29 17:35:44 +02:00
Peter Simons 298c3bdac0 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.2.1-11-gb2cb3cb from Hackage revision
8860e9a322.
2017-06-28 15:37:53 +02:00
Peter Simons 668c2c348b hackage2nix: disable broken hydra builds 2017-06-28 15:37:52 +02:00
Peter Simons b5729a2571 LTS Haskell 8.20 2017-06-28 15:37:52 +02:00
Frederik Rietdijk 8a62a9b064 Merge pull request #26125 from volth/webkitgtk-naming
rename webkitgtk24x⇒webkitgtk24x-gtk3; webkitgtk2⇒webkitgtk24x-gtk2
2017-06-28 13:54:38 +02:00
Peter Simons c43a2d392f git-annex: the overrideScope must be applied first to avoid bug https://github.com/NixOS/nixpkgs/issues/26852 2017-06-25 21:24:22 +02:00
Peter Simons b4973a5bbb hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.2.1-11-gb2cb3cb from Hackage revision
ec9f3d302b.
2017-06-25 12:21:55 +02:00
Peter Simons 9721c54592 git-annex: replacing optparse-applicative needs a deep override
| Warning: This package indirectly depends on multiple versions of the same
 | package. This is highly likely to cause a compile failure.
 | package wai-app-static-3.1.6.1 requires optparse-applicative-0.13.2.0
 | package tasty-rerun-1.1.6 requires optparse-applicative-0.13.2.0
 | package tasty-0.11.2.1 requires optparse-applicative-0.13.2.0
 | package git-annex-6.20170520 requires optparse-applicative-0.14.0.0
2017-06-25 12:21:55 +02:00
Gleb Peregud 0123200dee stdenv: add stawman docs for makeOverridable
Also fix a typo in docs in haskell-modules.
2017-06-24 12:47:57 +02:00
Peter Simons e31b99c187 haskell-network: use older version to compile with GHC 7.4.x and before
Recent versions of network no longer support base libraries that old.
2017-06-23 12:49:37 +02:00
Peter Simons 6b6cf6942c haskell-optparse-applicative: fix build with pre-8.0.x versions of GHC 2017-06-23 12:49:37 +02:00
Peter Simons 8ddaef6ddf haskell: fix logic error in generic builder introduced in 00892b7e4e
Closes https://github.com/NixOS/nixpkgs/issues/26760.
2017-06-23 12:49:36 +02:00
Peter Simons d83fb640db haskell-opencv: ensure that the underlying C++ library has contrib code enabled
0335b93284 (commitcomment-22638850)
2017-06-23 12:49:36 +02:00
Peter Simons bc20886345 git-annex: enable shell completions for zsh and fish
The latest optparse-applicative version can do that.
2017-06-23 12:49:36 +02:00
Peter Simons 5148757e8c haskell-hspec-core: break infinity dependency cycle
Test suite dependencies silently and temporary depend on hspec-core in their
test suites.
2017-06-23 12:49:36 +02:00
Peter Simons 7673cd0cd4 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.2.1-11-gb2cb3cb from Hackage revision
e0fa80e591.
2017-06-23 12:49:29 +02:00
Peter Simons 167b27b6a7 LTS Haskell 8.19 2017-06-23 12:48:44 +02:00
Domen Kožar bb9e23837a
haskellPackages: make configuration-{nix,common}.nix configurable
The motivation is to be able to get rid of common configuration
when initial packages differs since common configuration assumes
a very specific version set.

cc @jmitchell @peti
2017-06-22 13:25:53 +02:00
Peter Simons 534a8efe17 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.2.1-11-gb2cb3cb from Hackage revision
da66240a00.
2017-06-19 22:42:48 +02:00
Peter Simons bb394afa25 haskell-ghc-syb-utils: force update to latest version
We need 0.2.3.2 to build successfully. LTS 8.x will catch up, eventually, but
until then we force the update.

Closes https://github.com/NixOS/nixpkgs/issues/26689.
2017-06-19 22:42:47 +02:00
Peter Simons cb6a99d878 haskell-test-framework-quickcheck2: force update to latest version
We need 0.3.0.4 to build successfully. LTS 8.x will catch up, eventually, but
until then we force the update.
2017-06-19 22:42:47 +02:00
John Ericson 8a8f0408cd generic-builder: use buildInputs for Haskell dependencies
This actually will matter when I (soon) land cross-compilation support,
and native deps are compiled for the build, instead of host, platform.
But even now, it's good style do this, and one less thing to review
later.

The use of `$nativePkgs` is unfortunate, as it will need to be
swapped out for `$crossPkgs` for build != host builds. This will just a
temporarily cause pain, however, as eventually I will change stdenv to
use a `$runPkgs` (or moral equivalent) in both case.

Closes https://github.com/NixOS/nixpkgs/pull/26480.
2017-06-16 20:18:38 +02:00
Peter Simons 7bcfdc1c11 stack: build with hpack version 0.17.x 2017-06-16 20:18:38 +02:00
Peter Simons 35762f6ce3 git-annex: update hash for new version 2017-06-16 20:18:38 +02:00