Commit graph

1372 commits

Author SHA1 Message Date
Robin Gloster
3b4765c9e5 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-02-28 16:32:57 +00:00
Michael Alan Dorman
3844206366 Make sure we use the older version of hjsonpointer 2016-02-28 11:34:59 +01:00
Michael Alan Dorman
08a02a84de Make sure an older version of hjsonpointer is included 2016-02-28 11:34:59 +01:00
Peter Simons
4ee5a8865d mwc-random: drop obsolete overrides 2016-02-28 11:34:59 +01:00
Peter Simons
6dd798f67f hackage-packages.nix: update Haskell package set
This update was generated by hackage2nix v20151217-12-g567601b using the following inputs:

  - Nixpkgs: 82be4306ae
  - Hackage: 300be01a10
  - LTS Haskell: 45f9a3dc16
  - Stackage Nightly: 18441cd11a
2016-02-28 11:34:59 +01:00
zimbatm
17348dc094 Remove all dots at end of descriptions
Specially crafted for @JagaJaga

    find pkgs -name "*.nix" -exec \
      sed -e 's|\(description.*\)\.";|\1";|g' -i {} \;
2016-02-27 17:30:29 +00:00
Robin Gloster
3477e662e6 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-02-27 00:08:08 +00:00
zimbatm
4ecb1ce679 Merge pull request #11274 from robgssp/ldap
ldap-client: don't break on test failures
2016-02-26 23:13:27 +00:00
Jude Taylor
bd9f128cc2 add darwin.libiconv to ghcjs packages 2016-02-24 13:33:16 -08:00
Peter Simons
e713765b53 hackage-packages.nix: update Haskell package set
This update was generated by hackage2nix v20151217-10-ga610b1b using the following inputs:

  - Nixpkgs: 096bee7aef
  - Hackage: 735e006a18
  - LTS Haskell: bbcada892f
  - Stackage Nightly: b41dbc58b2
2016-02-22 08:26:38 +01:00
Robin Gloster
bb2639aafc Merge branch 'curl-7.15-fixup' of https://github.com/zimbatm/nixpkgs into hardened-stdenv 2016-02-22 01:14:22 +00:00
John Ericson
f13eede7e5 haskell: Tiny refactor in generic-builder. No hashes/interfaces changed. 2016-02-21 10:16:13 -08:00
John Ericson
51b66ed4d9 haskell: Add notion of cross compiler and define nativeGhc with it
Tested to not change hashes
2016-02-21 10:16:13 -08:00
Robin Gloster
23b4e6e19d haskellPackages: remove unnecessary hardening handling 2016-02-21 11:41:04 +00:00
Robin Gloster
1eed9435d5 haskellPackages.glib: simplify 2016-02-21 11:40:16 +00:00
Robin Gloster
0102e69707 haskellPackages.c2hs: fix evaluation 2016-02-21 11:39:41 +00:00
Robin Gloster
bc21db3692 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-02-19 21:16:14 +00:00
Charles Strahan
516057ffa9 ghcjs: replace integer-simple with integer-gmp
GHCJS uses integer-gmp, but cabal2nix generates a dependency list that
includes integer-simple instead. This tweaks the stage2 generator to
replace any instance of integer-simple with integer-gmp.

Things currently still work without this change (assuming
integer-simple is defined as null), as ghcjs includes integer-gmp in
its stage1 packages - so it's always available.

However, this change makes things a bit more explicit, rather than
leaving things to chance. If at any point the stage1 packages are also
split up into separate derivations, the integer-gmp package will need to
be passed along to the packages that depend on it. This change should
prevent some confusion going forward.
2016-02-18 18:32:58 -05:00
Charles Strahan
e6e9970891 ghcjs: don't propagate Cabal to all packages
Previously, we were compiling Setup.hs with ghcjs (instead of  ghc),
and that required that Cabal be available, otherwise the Setup.hs would
fail to compile.

Now that we are compiling Setup.hs with ghc, it's no longer necessary
to add Cabal as a dependency to all ghcjs packages.
2016-02-18 15:00:34 -05:00
Charles Strahan
97d9071b95 ghcjs: use native ghc to build Setup.hs 2016-02-18 03:15:59 -05:00
Charles Strahan
bbce88302a ghcjs: fix building with cabal-install-1.22.8.0 2016-02-18 03:15:59 -05:00
Franz Pletz
41698c9efa Merge branch 'master' into hardened-stdenv 2016-02-15 20:05:29 +01:00
Peter Simons
2029027d88 haskell-binary: update older compilers to the latest version 2016-02-15 19:06:04 +01:00
Peter Simons
3906a32bda haskell-QuickCheck: drop obsolete override for ghc-8.0.x 2016-02-15 19:06:03 +01:00
Peter Simons
8d0219c6ef haskell-transformers-compat: drop obsolete override for ghc-8.0.x 2016-02-15 19:05:39 +01:00
Peter Simons
7c7b08add4 hackage-packages.nix: update Haskell package set
This update was generated by hackage2nix v20151217-10-ga610b1b using the following inputs:

  - Nixpkgs: 94492ca848
  - Hackage: b3a9ab4a60
  - LTS Haskell: e7c3629999
  - Stackage Nightly: b98e7e2d4f
2016-02-15 19:05:02 +01:00
Peter Simons
328d9967d3 haskell-pandoc: drop obsolete override 2016-02-12 21:14:03 +01:00
Peter Simons
e771dc4b06 haskell-hans: drop obsolete patch 2016-02-12 21:14:03 +01:00
Peter Simons
d6f38f5fd8 xmonad-contrib: drop obsolete overrides 2016-02-12 21:14:03 +01:00
Robin Gloster
5969a59052 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-02-09 16:28:44 +00:00
Robin Gloster
20d568aed5 haskellPackages.glib: turn off fortify hardening 2016-02-09 14:41:48 +00:00
Robin Gloster
f8963e2ea7 haskell builder: allow disabling fortify hardening 2016-02-09 14:41:11 +00:00
Peter Simons
23b747e38a hackage-packages.nix: update Haskell package set
This update was generated by hackage2nix v20151217-10-ga610b1b using the following inputs:

  - Nixpkgs: 45176e62ca
  - Hackage: 4eb7681703
  - LTS Haskell: e7c3629999
  - Stackage Nightly: a84b3a147a
2016-02-09 12:00:07 +01:00
Robin Gloster
9229e9c656 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-02-07 11:17:57 +00:00
Peter Simons
e389794857 haskell-binary: update use of 0.8.0.1 to 0.8.2.0 2016-02-03 18:51:53 +01:00
Peter Simons
9e06f6880c cabal-install: build with native Cabal library when compiling with GHC 8.0.x
Fixes https://github.com/NixOS/nixpkgs/issues/12726.
2016-02-03 18:51:53 +01:00
Peter Simons
0b2fded69c hackage-packages.nix: update Haskell package set
This update was generated by hackage2nix v20151217-10-ga610b1b using the following inputs:

  - Nixpkgs: e9a140b725
  - Hackage: 346d9f8466
  - LTS Haskell: 6661045692
  - Stackage Nightly: 0ad9eda835
2016-02-03 18:51:53 +01:00
Erik Rybakken
3333a9edab haskell-miniball: fix package by adding the missing pkgs.miniball dependency 2016-02-03 18:28:49 +01:00
Charles Strahan
fdd54a9434 ghcjs-ffiqq: init at rev da31b1858 (Oct 12, 2015) 2016-02-01 02:13:45 -05:00
Charles Strahan
142b417284 ghcWithHoogle: fix haddocks for GHCJS builtin libs 2016-02-01 00:10:45 -05:00
Charles Strahan
1a2d7c679a ghcWithHoogle: add support for ghcjs 2016-01-31 23:00:43 -05:00
Charles Strahan
c01eb06954 ghcjs: build with GHC 7.10.3 2016-01-31 20:44:49 -05:00
Robin Gloster
f6d3b7a2ae switch hardening flags 2016-01-30 16:36:57 +00:00
Franz Pletz
954e9903ad Use a hardened stdenv by default 2016-01-30 16:36:57 +00:00
Michael Alan Dorman
a9b0bfe3bb ghc-imported-from: builds again 2016-01-28 16:47:22 +01:00
Peter Simons
81c8babb38 hackage-packages.nix: update Haskell package set
This update was generated by hackage2nix v20151217-9-geddefc2 using the following inputs:

  - Nixpkgs: 34e1e2890f
  - Hackage: 152c587fd1
  - LTS Haskell: 9b9c0dc0e3
  - Stackage Nightly: 486fdffc71
2016-01-28 16:45:46 +01:00
Peter Simons
40b0b45fce jailbreak-cabal: use native Cabal library with GHC 8.0.x or later 2016-01-27 00:33:26 +01:00
Peter Simons
ffabca8f92 haskell-hspec-core: disable test suite when building with GHC 8.0.x. 2016-01-27 00:33:25 +01:00
Peter Simons
d487783174 haskell: update use of Cabal 1.18.1.6 to 1.18.1.7
This affects GHC versions 7.2.x and earlier, which cannot compile more
recent versions of Cabal.
2016-01-27 00:33:25 +01:00
Peter Simons
c68c8655f1 haskell: update use of Cabal 1.20.0.3 to 1.20.0.4
This affects mostly jailbreak-cabal, which uses the old version on most
platforms due to bugs introduced to Cabal in later releases.
2016-01-27 00:33:25 +01:00