swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-10-21 05:01:06 +02:00
Code Issues Packages Projects Releases Wiki Activity
143666 commits 5 branches 0 tags 31 GiB
Commit graph

3320 commits

Author SHA1 Message Date
Peter Simons 2495f07222 haskell-cryptohash-sha256: avoid jailbreak, which breaks the Cabal file 2018-05-30 03:46:16 +02:00
Peter Simons 85c5e8d651 haskell-parsec: drop obsolete jailbreak 2018-05-30 03:46:16 +02:00
Peter Simons b825481578 haskell-jailbreak-cabal: build with native Cabal version in ghc-8.4.x package set 2018-05-30 03:46:16 +02:00
Peter Simons 5b73d202ab haskell-jailbreak-cabal: build with Cabal 2.2.x in ghc-8.2.x package set 2018-05-30 03:46:16 +02:00
Peter Simons 852e9dc448 haskell-brick: update override for ghc 8.4.x 2018-05-30 03:46:16 +02:00
Peter Simons 9ef8d70d23 haskell-graphviz: override dependency versions to fix the build 
Closes https://github.com/ivan-m/graphviz/issues/34.
 2018-05-30 03:46:16 +02:00
Peter Simons 60d8e82558 hackage-packages.nix: automatic Haskell package set update 
This update was generated by hackage2nix v2.9.2-17-g580e4ea from Hackage revision
ae1b1485e2.
 2018-05-30 03:46:16 +02:00
Peter Simons 28ca28296f LTS Haskell 11.11 2018-05-30 03:45:54 +02:00
Orivej Desh e4df80a69b haskellPackages.hlibgit2: fix build after #28029 2018-05-29 23:57:23 +00:00
Ryan Mulligan e8c5d867a1 use https for default Hackage homepage 2018-05-28 12:48:16 -07:00
Profpatsch ac404fd9e7 haskellPackages: mark yarn2nix broken w/ message 2018-05-28 17:28:53 +02:00
Jan Malakhovski ad35019501 Merge branch 'master' into staging 
Fixed conflicts:
- lib/systems/for-meta.nix: in favor of staging
- pkgs/os-specific/darwin/xcode/default.nix: in favor of master
 2018-05-26 00:20:17 +00:00
John Ericson 2e70a75b12 haskell generic-builder: Limit usage of --extra-framework-dirs for compat 2018-05-25 14:52:58 -04:00
John Ericson ce0180dfd5
Merge pull request #40996 from obsidiansystems/cross-ghc 
ghc, haskell-infra: #40929 take 2
 2018-05-25 11:09:07 -04:00
John Ericson d7144e708b Merge remote-tracking branch 'upstream/master' into staging 2018-05-23 16:00:04 -04:00
Peter Simons 9c2b4e53fa hackage-packages.nix: automatic Haskell package set update 
This update was generated by hackage2nix v2.9.2-13-gd8bc043 from Hackage revision
9866f7be16.
 2018-05-23 18:21:13 +02:00
Peter Simons f9524a48f3 LTS Haskell 11.10 2018-05-23 18:21:13 +02:00
Peter Simons ba47d40db9 hackage-packages.nix: automatic Haskell package set update 
This update was generated by hackage2nix v2.9.2-13-gd8bc043 from Hackage revision
4e1741ad6f.
 2018-05-23 18:21:13 +02:00
Peter Simons e7abee1939 hackage2nix: disable failing builds on Hydra 2018-05-23 18:21:12 +02:00
Moritz Angermann 63e5b3ce71 used stdenv.targetPlatform.isDarwin and not stdenv.isDarwin. 2018-05-23 10:27:42 -04:00
Moritz Angermann 87afa66a63 haskell infra: Adds buildFlags logic 2018-05-23 10:27:42 -04:00
Moritz Angermann affeb0cb80 haskell generic builder: Do the links dance only if shared is enabled. 2018-05-23 10:27:41 -04:00
Moritz Angermann a4d5dbd45d haskell generic builder: Disable static libs on Windows because no -staticlib 
The reason why this does not work is not that we can't built static
objects, we can, but we can't use `-staticlib` on GHC on windows.
`-staticlib` rolls all dependencies into a combined archive. While this
would work on windows if we used gnu ar and MRI script, GHC can't rely
on GNU ar, and as such has a quick archive concatenation module for GNU
and BSD archives only.
 2018-05-23 10:27:41 -04:00
Moritz Angermann 38fbdcc726 haskell generic builder: Use setup package database for setup-depends 
Adapted from b69f420121 by @Ericson2314
 2018-05-23 10:27:41 -04:00
John Ericson e1b9419dec haskell generic builder: setupHaskellDepends should be `nativeBuildInputs 
This is because they are just for Setup.hs, so they are just used at build time
and completely isolated from the normal components' dependencies.

This was previous implemented in 8a8f0408cd, but
reverted in e69c7f5641 because it broken
setup-depends non-cross in haskell shell environments (custom Setup.hs in cross
shell environments has never worked). This version adds a special native
exception to avoid that breakage.
 2018-05-23 10:27:39 -04:00
John Ericson 513cd3de0e haskell-generic-builder: Add extra framework dirs 
Just like with the other `--extra-*` flags, cc/ld-wrapper already handles
this, but we need to make Cabal aware so that the haskell builds have
the correct metadata.
 2018-05-23 10:26:57 -04:00
John Ericson 3394c96655 haskell generic-builder: Tiny changes that preserve hases 
These bring us closer to staging at no cost
 2018-05-23 10:23:06 -04:00
John Ericson 446cb32ea1 haskell generic-builder: Remove merge conflict 
I forgot this in 17316643fd
 2018-05-23 10:11:03 -04:00
John Ericson 18742471af Merge remote-tracking branch 'upstream/master' into staging 
Use newer vagrant from master
 2018-05-23 09:40:37 -04:00
Peter Simons 8f96324584 haskell-lambdabot-core: apply patch from @int-e to fix GHC 8.4.x build 2018-05-23 12:24:31 +02:00
Peter Simons 5db3a9df5e
Revert "ghc, haskell infra: #40642 direct to master" 2018-05-23 09:36:16 +02:00
Peter Simons 0e35858252
Merge pull request #40929 from obsidiansystems/cross-ghc-for-master 
ghc, haskell infra: #40642 direct to master
 2018-05-22 20:37:45 +02:00
Tuomas Tynkkynen f9feacfc7c Merge remote-tracking branch 'upstream/master' into staging 2018-05-22 17:48:29 +03:00
Peter Simons 07a045922d
Merge pull request #40710 from ElvishJerricco/overrideCabal-getHaskellBuildInputs 
Make getHaskellBuildInputs / shellFor work with overrideCabal (Fixes #40266)
 2018-05-22 10:37:26 +02:00
Peter Simons e9d991a938 hackage-packages.nix: automatic Haskell package set update 
This update was generated by hackage2nix v2.9.2-13-gd8bc043 from Hackage revision
a5d0811a16.
 2018-05-22 10:32:09 +02:00
Peter Simons 3e2a3b4f12 hackage2nix: keep haddock-library 1.5.x around 2018-05-22 10:31:39 +02:00
John Ericson db4d77779c Merge remote-tracking branch 'upstream/master' into staging 2018-05-21 20:21:48 -04:00
John Ericson d6ecbbe921
Merge branch 'staging' into feature/clean-ghc 2018-05-21 17:43:30 -04:00
Moritz Angermann f914fdd960 used stdenv.targetPlatform.isDarwin and not stdenv.isDarwin. 2018-05-21 15:11:11 -04:00
Moritz Angermann 82a847a04b haskell infra: Adds buildFlags logic 2018-05-21 15:11:11 -04:00
Moritz Angermann 5e589a4049 haskell generic builder: Do the links dance only if shared is enabled. 2018-05-21 15:11:11 -04:00
Moritz Angermann 4ea33def46 haskell generic builder: Disable static libs on Windows because no -staticlib 
The reason why this does not work is not that we can't built static
objects, we can, but we can't use `-staticlib` on GHC on windows.
`-staticlib` rolls all dependencies into a combined archive. While this
would work on windows if we used gnu ar and MRI script, GHC can't rely
on GNU ar, and as such has a quick archive concatenation module for GNU
and BSD archives only.
 2018-05-21 15:11:11 -04:00
Moritz Angermann 15759df660 haskell generic builder: Use setup package database for setup-depends 
Adapted from b69f420121 by @Ericson2314
 2018-05-21 15:11:10 -04:00
John Ericson 900862ea3b haskell generic builder: setupHaskellDepends should be `nativeBuildInputs 
This is because they are just for Setup.hs, so they are just used at build time
and completely isolated from the normal components' dependencies.

This was previous implemented in 8a8f0408cd, but
reverted in e69c7f5641 because it broken
setup-depends non-cross in haskell shell environments (custom Setup.hs in cross
shell environments has never worked). This version adds a special native
exception to avoid that breakage.
 2018-05-21 15:09:51 -04:00
Will Fancher 1f348e41a4 Dont test enclosed exceptions 2018-05-20 13:24:28 -04:00
Vladimír Čunát 392e6de7d0
Merge branch 'master' into staging 2018-05-20 13:20:53 +02:00
Peter Simons 49fc5f0044 git-annex: update sha256 hash for the new version 2018-05-19 22:24:31 +02:00
Peter Simons c2dd77c440 haskell-vector-sized: update override for the latest version 2018-05-19 22:24:30 +02:00
Peter Simons b558e43753 haskell-hspec: use version 2.5.1 for ghc-8.4.x 2018-05-19 22:24:30 +02:00
Peter Simons d83d20c11b haskell-pandoc: update override for ghc-8.4.x 2018-05-19 22:24:30 +02:00
Peter Simons 02834ba458 hackage-packages.nix: automatic Haskell package set update 
This update was generated by hackage2nix v2.9.2-13-gd8bc043 from Hackage revision
a6208828bf.
 2018-05-19 22:24:21 +02:00
Peter Simons 9cd1702502 LTS Haskell 11.9 2018-05-19 22:24:18 +02:00
John Ericson 2241dedbe6
Merge pull request #40442 from obsidiansystems/cabal-frameworks 
haskell-generic-builder: Add extra framework dirs
 2018-05-18 18:08:20 -04:00
John Ericson c6f742b770 haskell-generic-builder: Add extra framework dirs 
Just like with the other `--extra-*` flags, cc/ld-wrapper already handles
this, but we need to make Cabal aware so that the haskell builds have
the correct metadata.
 2018-05-18 17:49:41 -04:00
John Ericson 5ccb99e372 Merge remote-tracking branch 'upstream/master' into staging 2018-05-18 17:48:37 -04:00
John Wiegley d33322d449
haskellPackages.developPackage: Add a defaulted provideDrv argument 
The purpose of this argument is to allow you to get at the derivation (rather
than it's env) even when in the evaluation context of a nix-shell invocation.
 2018-05-18 13:04:18 -07:00
Tuomas Tynkkynen 003473613a Merge remote-tracking branch 'upstream/master' into staging 
Conflicts:
	pkgs/top-level/all-packages.nix
 2018-05-18 03:54:38 +03:00
Will Fancher 5523ec8f3c Make getHaskellBuildInputs / shellFor work with overrideCabal 2018-05-17 20:35:53 -04:00
Peter Simons b5cef2ea66
Merge pull request #40392 from ElvishJerricco/ghcjs-8.2 
Ghcjs 8.2 & 8.4
 2018-05-17 17:55:59 +02:00
John Ericson f2017c40ae Merge remote-tracking branch 'upstream/master' into staging 2018-05-14 22:53:10 -04:00
Profpatsch 669f9453dc haskellPackages.hnix: jailbreak & fix tests 
Some of the new tests need the `nix` executable on `PATH`.
One also needs `hpack`, but we really don’t want to embiggen (heh) the closure
because of that.
 2018-05-15 04:03:28 +02:00
Will Fancher 64df9b6b89 GHCJS 8.4 2018-05-12 17:48:30 -04:00
John Ericson 42f6e7c4e4 Merge remote-tracking branch 'upstream/master' into staging 2018-05-10 12:04:17 -04:00
Peter Simons 07dc607a8d
Merge pull request #40250 from LumiGuide/fix-base-compat-batteries 
haskell: fix build of base-compat-batteries
 2018-05-10 15:09:36 +02:00
Frederik Rietdijk 64c8c6dcb3 Merge master into staging 2018-05-10 09:30:56 +02:00
Matthew Justin Bauer 1682353805
generic-stack-builder: also support nix-build 
We need to add the STACK_IN_NIX_EXTRA_ARGS hook in configurePhase also to ensure we get the right args when calling ```nix-build``` (as opposed to nix-shell).
 2018-05-09 18:12:13 -05:00
Bas van Dijk 53d6997e5d haskell: fix build of base-compat-batteries 2018-05-09 22:59:54 +02:00
Matthew Bauer 527abe59cf generic-stack-builder: attempt to add propagation 
Fixes #40039

This adds a shellHook to handle propagated dependencies like that seen
in #40039 where gpgme needed libgpg-error.
 2018-05-09 15:46:48 -05:00
Peter Simons a9577da115 haskell-brick: update override for ghc-8.4.x to the latest version 2018-05-09 20:41:33 +02:00
Peter Simons 77fbd14d85 haskell-gi: apply upstream patch to fix the doctest suite 2018-05-09 20:41:33 +02:00
Peter Simons 5c26dd3195 hackage-packages.nix: automatic Haskell package set update 
This update was generated by hackage2nix v2.9.2-13-gd8bc043 from Hackage revision
6ab957cb81.
 2018-05-09 20:41:28 +02:00
Frederik Rietdijk a18b493e02 Merge master into staging 2018-05-09 10:48:01 +02:00
Jack Kelly 33bc4a7b3b haskellPackages.blank-canvas_0_6_2: dontCheck 
Same reason as 2d01bb7f6a, but for the
specific-version package.
 2018-05-09 12:05:26 +10:00
Peter Simons c5338e5acb haskell-gi: remember the URL to the PR that explains why the override is necessary 2018-05-08 17:47:12 +02:00
Peter Simons 26e961c1fb hackage-packages.nix: automatic Haskell package set update 
This update was generated by hackage2nix v2.9.2-11-ga2d666d from Hackage revision
7b40a148a0.
 2018-05-08 17:46:45 +02:00
Peter Simons 277ca33bee LTS Haskell 11.8 2018-05-08 17:46:24 +02:00
Matthew Bauer 6748534d83 Merge remote-tracking branch 'upstream/master' into staging 2018-05-08 09:36:00 -05:00
Peter Simons d3784373ad haskell-dbus-hslogger & status-notifier-item: use latest dbus despite lts-11.x 2018-05-07 14:29:15 +02:00
Peter Simons 8b11e30b84 github-backup: jailbreak to fix the build 2018-05-07 14:29:15 +02:00
Peter Simons 394d0f2ed9 haskell-gi-gdkx11: drop obsolete override 
Closes https://github.com/NixOS/nixpkgs/issues/37724.
 2018-05-07 14:29:15 +02:00
Peter Simons 253ea95d28 hackage-packages.nix: automatic Haskell package set update 
This update was generated by hackage2nix v2.9.2-11-ga2d666d from Hackage revision
f60ac8c0ef.
 2018-05-07 14:29:15 +02:00
Peter Simons 127de7480e haskell-attoparsec-varword: fix infinite recursion in test dependencies 2018-05-06 19:31:04 +02:00
Michael Alan Dorman 4764a6e2e9 haskell-gi, gi-gdkx11: fix builds 
The `haskell-gi` build fails its doctests because of a missing
library; I'm not 100% convinced that setting it to `dontCheck` is the
right thing to do, but I don't have a better idea at the moment.

The `gi-gdkx11` build fails because, surprise, Gdk-X11 isn't found; by
looking around in my store, I found that that that library seems to
live in gtk3 these days; this override is just a stop-gap, though,
I've also submitted the change to cabal2nix that I believe will fix
the automatic generation of the package in the future.
 2018-05-06 19:31:04 +02:00
Peter Simons fe95c5c64f hackage-packages.nix: automatic Haskell package set update 
This update was generated by hackage2nix v2.9.2-9-g07ca643 from Hackage revision
d2c0010bab.
 2018-05-06 19:31:04 +02:00
Peter Simons 11096b2cfe hackage2nix: disable failing Hydra builds 
@gebner: hledger-diff no longer compiles
 2018-05-06 19:31:03 +02:00
Peter Simons f2b581394c
Merge pull request #39903 from endgame/hold-blank-canvas 
haskellPackages.blank-canvas: 0.6.3 -> 0.6.2
 2018-05-04 13:26:41 +02:00
John Ericson cf06e42d1c Merge remote-tracking branch 'upstream/master' into staging 2018-05-03 16:35:36 -04:00
Peter Simons 6ff00acd67 haskell-wl-pprint-text: drop obsolete override for ghc-8.4.x 2018-05-03 14:50:45 +02:00
Peter Simons 988ad012f6 haskell-hashtables: drop obsolete override for ghc-8.4.x 2018-05-03 14:50:44 +02:00
Peter Simons cdca787899 haskell-dhall: jailbreak version 1.13.0 to fix the build with ansi-terminal 0.8.x 
Ping: @Gabriel439
 2018-05-03 14:50:44 +02:00
Peter Simons 4519076421 haskell-dhall: update override for ghc-8.4.x to use the latest version 2018-05-03 14:50:44 +02:00
Peter Simons 1d79794c79 haskell-gtk2hs-buildtools: drop obsolete override for ghc-8.4.x 2018-05-03 14:50:44 +02:00
Peter Simons 0fe2007963 haskell-simple-reflect: drop obsolete override for ghc-8.4.x 2018-05-03 14:50:44 +02:00
Peter Simons 756e386e41 haskell-gi-base: drop obsolete override for ghc-8.4.x 2018-05-03 14:50:43 +02:00
Peter Simons ce6402dc79 haskell-gi: drop obsolete override for ghc-8.4.x 2018-05-03 14:50:43 +02:00
Peter Simons 92256a9453 haskell-tar: drop obsolete override for ghc-8.4.x 2018-05-03 14:50:43 +02:00
Peter Simons b33d1d6481 hackage-packages.nix: automatic Haskell package set update 
This update was generated by hackage2nix v2.9.2-9-g07ca643 from Hackage revision
bb0c3bef04.
 2018-05-03 14:50:30 +02:00
Jack Kelly 4680fe67db haskellPackages.blank-canvas: 0.6.3 -> 0.6.2 
blank-canvas-0.6.3 depends on base-compat-batteries-0.10, which
depends on base-compat-0.10. This conflicts with the rest of the LTS
set, which uses base-compat-0.9. No base-compat-batteries-0.9 exists.

blank-canvas-0.6.2 only depends on base-compat >= 0.8 && < 0.10.
 2018-05-03 12:12:48 +10:00
Matthew Justin Bauer eeb016e8f0
Merge branch 'staging' into fix-ncurses-darwin-extensions 2018-05-02 15:40:38 -05:00
Peter Simons 59490ae472 haskell-brick: update override for ghc 8.4.x 2018-05-01 09:30:23 +02:00