Commit Graph

3808 Commits

Author SHA1 Message Date
Matthew Bauer 8505e710e7 Revert "darwin 10.12 commits"
Reverts commits bumping to macOS stuff to 10.12:

commit ec1f78d1cb.
commit d0dc91d24f.
commit a1d297374d.
commit 425112151d.
commit e6f7f2928f.
2019-01-03 15:20:26 -06:00
Frederik Rietdijk 092e3b50a8 Merge master into staging-next 2019-01-02 21:08:27 +01:00
Jan Tojnar b2b921bdca
Merge pull request #53149 from jtojnar/qrencode-cleanup
qrencode: merge with libqrencode
2019-01-02 02:18:22 +01:00
Ryan Mulligan 3820041ffd
Merge pull request #53137 from puffnfresh/package/djinn
haskellPackages.djinn: apply patch for GHC 8.4
2019-01-01 10:12:20 -08:00
Jan Tojnar c5c2ac4f45
qrencode: merge with libqrencode 2019-01-01 17:19:07 +01:00
Bas van Dijk 559916f648 haskellPackages.inline-c-cpp: disable test-suite on darwin to fix the build 2019-01-01 16:51:24 +01:00
Brian McKenna 61cefaf7dd haskellPackages.djinn: apply patch for GHC 8.4 2019-01-01 12:29:49 +05:30
Frederik Rietdijk 070290bda7 Merge master into staging-next 2018-12-31 12:00:36 +01:00
Domen Kožar 45f5453359
haskell packages: RSA test suite doesn't compile on GHC 8.6 2018-12-29 10:54:04 +00:00
Frederik Rietdijk 10afccf145 Merge staging-next into staging 2018-12-27 18:11:34 +01:00
Jan Tojnar cb5bc310d3
haskellPackages.Frames: unbreak
vinyl ≥ 0.10 is in the LTS.
2018-12-26 15:19:10 +01:00
Jan Tojnar a6b74907f7
haskellPackages.yi-core: unbreak
yi-language ≥ 0.18 is in the LTS now
2018-12-26 15:03:15 +01:00
Jan Tojnar f4b4dc2d0b
haskellPackages.safe-money-aeson: unbreak
The following fix is no longer necessary after a Stackage update:

https://github.com/NixOS/nixpkgs/issues/46467
2018-12-26 14:53:21 +01:00
Peter Simons 4f4b151ae2 haskell-scalendar: drop obsolete override 2018-12-26 14:03:50 +01:00
Peter Simons 08ca69a513 haskell-hoopl: drop obsolete override 2018-12-26 14:02:07 +01:00
Peter Simons 4f4313046e Comment out some obsolete Haskell overrides to fix evaluation. 2018-12-26 13:46:12 +01:00
Peter Simons 1131244889 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.13-1-gda47f40 from Hackage revision
752c180edc.
2018-12-26 13:46:12 +01:00
Peter Simons 91ec96d77d LTS Haskell 13.0 (updates to ghc-8.6.3) 2018-12-26 13:46:11 +01:00
Jan Tojnar ef935fa101
Merge branch 'master' into staging 2018-12-24 15:02:29 +01:00
Peter Simons 195f8ac5ac haskell-JuicyPixels: update overrides for the new version 2018-12-21 14:02:57 +01:00
Peter Simons a220b2f370 haskell-appar: drop obsolete override 2018-12-21 14:02:57 +01:00
Peter Simons e6d726e5aa hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.12-11-gaf7cf68 from Hackage revision
6694c4746f.
2018-12-21 14:02:57 +01:00
Peter Simons 7f85bfd70d hackage2nix: prefer alsa-mixer 0.2.x by default
Fixes https://github.com/NixOS/nixpkgs/issues/52516.
2018-12-21 14:02:56 +01:00
Peter Simons 2018654322 LTS Haskell 12.23 2018-12-21 14:02:56 +01:00
Frederik Rietdijk 9ab61ab8e2 Merge staging-next into staging 2018-12-19 09:00:36 +01:00
John Ericson a0d4a4c9bc
Merge pull request #52499 from obsidiansystems/haskell-servant-cross
servant: Sphinx is a build-time dependency
2018-12-18 17:44:49 -05:00
Vaibhav Sagar b513231dc6 servant: Sphinx is a build-time dependency 2018-12-18 21:58:30 +00:00
Matthew Bauer d1dfc92187
Merge pull request #47678 from matthewbauer/landmarks
Update macOS frameworks to 10.12
2018-12-18 09:59:44 -06:00
Matthew Bauer e6f7f2928f darwin: 10.11 → 10.12
Lots of stuff has gotten moved around. Many security libraries have been merged
into the Security monorepo. I’ve cleared them out for now, we will
need to modify Security to build them!

This also moves some things around to more clearly separate
bootstrapping the stdenv from everything else. We want the “normal”
mode to be the non-bootstrapped version. When you ask for “Security”,
you want the actual built software, not a crippled one.

- Add TARGET_OS_OSX to darwin.libSystem. Looks like something
  introduced in 10.12. TARGET_OS_MAC is only set when building for
  desktop (iOS will have TARGET_OS_MAC set)
- Bump darwin.dtrace
- Bump darwin.libpthread
- Remove SmartCardServices, libsecurity*, etc.
- Install some more headers for darling.
2018-12-17 00:07:09 -06:00
Shea Levy 30fb5b0dcf
haskell generic builder: Add flag to allow inconsistent dependencies. 2018-12-15 13:31:08 -05:00
Peter Simons 8d937208fa hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.12-9-g89ccf08 from Hackage revision
7882a52a63.
2018-12-14 20:29:17 +01:00
Peter Simons 76e284fc60 haskell-hoogle: override haskell-src-exts to the latest version (as required) 2018-12-14 19:44:19 +01:00
Peter Simons f0f3cb75de haskell-hlint: override haskell-src-exts to the latest version (as required) 2018-12-14 19:44:19 +01:00
Peter Simons d7dcb9c291 haskell-appar: update to latest version to fix test suite failures in iproute 2018-12-14 19:44:19 +01:00
Peter Simons ea45e771a1 haskell-cryptonite: disable test suite to avoid transient errors 2018-12-14 19:44:19 +01:00
Peter Simons 89ed58dbea git-annex: update sha256 for new 7.20181211 version 2018-12-14 19:44:15 +01:00
Peter Simons 578a5f6588 haskell-brick: update override for the new version 2018-12-14 19:44:09 +01:00
Peter Simons ef7433ebdf hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.12-8-g7b07d27 from Hackage revision
9e2fca7940.
2018-12-14 19:44:08 +01:00
Peter Simons 31e4345dbd hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.12-8-g7b07d27 from Hackage revision
6b2a686eeb.
2018-12-14 19:44:08 +01:00
Peter Simons 3ab58ceaab hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.12-8-g7b07d27 from Hackage revision
574fb20f4c.
2018-12-14 19:44:08 +01:00
Peter Simons 19f8bedb02 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.12-8-g7b07d27 from Hackage revision
ae41ad7ac3.
2018-12-14 19:44:08 +01:00
Peter Simons 4e7fdb3fa6 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.12-5-g7b287a8 from Hackage revision
ce1988e297.
2018-12-14 19:44:08 +01:00
Peter Simons 1fb0890f21 hackage2nix: drop unused Cabal 1.x versions 2018-12-14 19:44:05 +01:00
Peter Simons d793f16da4 hackage2nix: allow updates of 'base-compat-batteries' again
I assume that the build issues that prevented us from using versions beyond
0.10.1 have been fixed by now.
2018-12-14 19:42:18 +01:00
Peter Simons b73074071b LTS Haskell 12.22 2018-12-14 19:42:18 +01:00
Guillaume Maudoux 9a104494ec haskellPackages.modular-arithmetic: disable tests 2018-12-13 16:46:22 +01:00
MarcFontaine 186ec58e1a haskellPackages.binary-parsers : disable tests 2018-12-08 22:30:54 +01:00
Frederik Rietdijk 5f554279ec Merge master into staging-next 2018-12-07 15:22:35 +01:00
Peter Simons db6aeeae56 haskell-json-autotype: disable the test suite to fix the build 2018-12-05 21:38:14 +01:00
Peter Simons 8e11a25d5f haskell-brick: update override for the new version 2018-12-05 21:38:14 +01:00