jolheiser/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
108,185 Commits 266 Branches 122 Tags 5.3 GiB
21e3b2ff55
Commit Graph

2244 Commits

Author SHA1 Message Date
Benno Fünfstück
731e0fa742 haskell: preserve overrideScope on override 
We want code such as `(pkg.override {}).overrideScope (self: super: {})` to
work. This didn't work before, since `override` will call the original package
again, and the attribute `overideScope`, which `callPackageWithScope` added,
wasn't added again. The fix for this is to modify the package function itself
to include the `callPackageWithScope` attribute, so it'll be re-added whenever
the function is overriden for with arguments.

There is a small problem here though: since callPackage uses some magic
(`builtins.functionArgs`) to determine the auto-arguments of a function, we
can't just write `callPackageWith scope drvScope`, since
`builtins.functionArgs drvScope` will be `{}`. To fix this, we implement our own
`callPackageWith`.

Fixes https://github.com/NixOS/nixpkgs/issues/7953.
Closes https://github.com/NixOS/nixpkgs/pull/9336.
 2017-04-25 16:08:43 +02:00
Michael Alan Dorman
9b74549c0b purescript: remove overrides 
It now supports recent versions of various dependencies.
 2017-04-25 16:08:43 +02:00
Peter Simons
9fa927f106 hackage-packages.nix: automatic Haskell package set update 
This update was generated by hackage2nix v2.1.1-8-g19ebdb9 from Hackage revision
14048552ae.
 2017-04-25 16:08:38 +02:00
Peter Simons
2a34188f2c hackage2nix: update list of broken packages 2017-04-25 16:08:37 +02:00
Peter Simons
0f104177ad LTS Haskell 8.12 2017-04-25 16:08:00 +02:00
Peter Simons
4c0098f1dc haskell-old-time: fix build with GHC HEAD 2017-04-21 16:25:54 +02:00
Peter Simons
7462c7d2f7 haskell-utf8-string: fix build with GHC HEAD 2017-04-21 16:25:53 +02:00
Peter Simons
25a1ef369b haskell-hsdns: fix build with GHC 7.0.x and 7.2.x 2017-04-21 16:25:53 +02:00
Peter Simons
f4ed1f98d1 haskell-gtksourceview: clean up overrides for versions 2 and 3 of the package 2017-04-21 16:25:53 +02:00
Benno Fünfstück
5f33eb493f haskell-packages: factor package set construction in new file 
Closes https://github.com/NixOS/nixpkgs/pull/24850.
 2017-04-21 16:25:53 +02:00
Peter Simons
9a7ba4e7a9 haskell-stack: fix build by passing an old version of "store" 2017-04-21 16:25:53 +02:00
Peter Simons
87ec7bb087 haskell-dbus: drop semicolons.patch; this change appears to have been included upstream 2017-04-21 16:25:52 +02:00
Peter Simons
4c8056a8d9 hackage-packages.nix: automatic Haskell package set update 
This update was generated by hackage2nix v2.1.1-8-g19ebdb9 from Hackage revision
0d6c9d1b64.
 2017-04-21 16:25:45 +02:00
Peter Simons
7cfb6509ed hackage2nix: provide old versions of "store" so that we can build stack 2017-04-21 16:24:54 +02:00
Peter Simons
6c36c19f7d LTS Haskell 8.11 2017-04-21 16:24:54 +02:00
Benno Fünfstück
eb1e63505a wai-app-file-cgi: remove outdated overrides 2017-04-18 18:52:06 +02:00
Jörg Thalheim
26f5fa8f97 Merge pull request #24922 from phunehehe/haskell-shell-hook 
haskell-modules: fix shell hook
 2017-04-15 12:34:41 +02:00
Hoang Xuan Phu
2fde20e271 haskell-modules: fix shell hook 
26623240e93f8454ac69f66a3a025d98a7e94b71 lacks a newline
 2017-04-15 16:33:07 +08:00
John Ericson
eec35cb6bd Merge pull request #24889 from formaltech/halvm-bump 
Remove hardening at HaLVM 2.4.0
 2017-04-14 12:58:46 -04:00
David Johnson
6f69681dad Add hardening, bump hash to HaLVM 2017-04-14 00:34:02 -05:00
Peter Simons
282bc88093 Merge pull request #24754 from shlevy/haskell-overrideSrc 
haskell-lib: Add overrideSrc helper
 2017-04-09 17:55:23 +02:00
Shea Levy
a6c39ed207 haskell-lib: Add overrideSrc helper 2017-04-08 16:21:57 -04:00
Leon Isenberg
55e191d844 haskell: Correct dependencies for haskell-tools-*_0_6_0_0 2017-04-08 14:51:43 +02:00
Aristid Breitkreuz
a0eabfbcbd Merge pull request #24715 from ljli/ghcjs-dep-cycle 
haskell: ghcjs packages: Break dependency cycle less invasive
 2017-04-08 12:25:54 +02:00
Aristid Breitkreuz
e893646494 Merge pull request #24692 from LumiGuide/haskell-link-with-gold 
haskell: add the linkWithGold function to link packages with ld.gold
 2017-04-08 12:01:05 +02:00
Leon Isenberg
60e9371738 haskell: ghcjs packages: Remove ghcjs-prim 
It is wired into ghcjs now.
 2017-04-07 21:41:01 +02:00
Leon Isenberg
7a08e57b9e haskell: ghcjs packages: Break dependency cycle less invasive 
Between cabal and hscolour.
 2017-04-07 19:02:52 +02:00
Bas van Dijk
c865b8e35e haskell: add the linkWithGold function to link packages with ld.gold 
Also support linking the double-conversion package with ld.gold.
 2017-04-07 09:44:11 +02:00
Shea Levy
5e984362f6 haskell generic builder: Use ghcjs's hsc2hs. 
This is required when using ghcjs to compile Setup.hs, which we do since #23614.

See comments on c35350a212
 2017-04-06 03:16:00 -04:00
Luke Clifton
5ffece7de1 llvm-hs: Point llvm-hs to llvm_4 2017-04-05 16:51:45 +08:00
Peter Simons
fa365c2b9d haskell-language-nix: fix build with GHC 7.6.3 2017-04-04 16:29:12 +02:00
Peter Simons
046c5c57d0 haskell-binary: update 0.8.x branch to latest version 2017-04-04 16:29:12 +02:00
Peter Simons
b232d2f4e4 hackage-packages.nix: automatic Haskell package set update 
This update was generated by hackage2nix v2.1.1 from Hackage revision
f68bd69837.
 2017-04-04 16:29:06 +02:00
Peter Simons
4f62f342f6 hackage2nix: disable Hydra builds for accelerate-* packages with unfree license 2017-04-04 16:29:04 +02:00
Peter Simons
e0160f70da LTS Haskell 8.8 2017-04-04 16:29:04 +02:00
Shea Levy
1feca4cae3 haskellPackages: Export haskellSrc2nix and hackage2nix 
Allows using a different haskell package set to generate the nix
expressions (during eval time) than the one used to actually build the
package (at build time).
 2017-04-03 08:13:07 -04:00
Rickard Nilsson
37847f263c haskellPackages.tailfile-hinotify: Disable test suite 2017-03-31 11:15:17 +02:00
Peter Simons
b6c93177e7 hackage-packages.nix: automatic Haskell package set update 
This update was generated by hackage2nix v2.1.1 from Hackage revision
16a802d4af.
 2017-03-30 19:30:30 +02:00
Peter Simons
4753a00caa haskell-QuickCheck: fix build with GHC 7.4.x 2017-03-29 20:30:29 +02:00
Peter Simons
a4ce475b61 haskell-void: fix build with GHC 7.8.x 2017-03-29 20:30:29 +02:00
Peter Simons
f79cb54cee haskell-extra: disable failing test suite on GHC 7.8.x 2017-03-29 20:30:28 +02:00
Peter Simons
a77e74d409 haskell-QuickCheck: fix build with GHC 7.8.x 2017-03-29 20:30:28 +02:00
Leon Isenberg
2553ceb982 haskell: use GHCJS to build Setup.hs for GHCJS packages 
Closes https://github.com/NixOS/nixpkgs/pull/23614.
 2017-03-29 20:30:28 +02:00
Peter Simons
80a52e22b3 haskell-haddock-library: enable test suite again 2017-03-29 20:30:28 +02:00
Peter Simons
4c9306f4aa haskell-haddock-api: drop obsolete patches 2017-03-29 20:30:28 +02:00
Peter Simons
c8375914ad haskell-arithmoi: re-enable test suite 2017-03-29 20:30:27 +02:00
Peter Simons
b0136d38f6 hackage-packages.nix: automatic Haskell package set update 
This update was generated by hackage2nix v2.1-8-geba56da from Hackage revision
976e3524ee.
 2017-03-29 20:30:22 +02:00
Peter Simons
c356cd69c8 hackage2nix: disable broken builds 2017-03-29 20:30:21 +02:00
Peter Simons
2ab1c0611f LTS Haskell 8.6 2017-03-29 20:30:21 +02:00
Robert Hensing
39af068aba mysql-haskell: dontCheck because check requires running server 2017-03-27 09:34:37 +02:00
Peter Simons
50cce50143 callCabal2nix: Revert "Don't rebuild unchanged cabal file" 
This reverts commit 24b47526ce38e3ccb073c776b32c0ea220f3c0f2 since it broke
callCabal2nix, apparently. See https://github.com/NixOS/nixpkgs/issues/24245
for details.
 2017-03-27 09:00:06 +02:00
Peter Simons
24a69286e9 Merge pull request #23610 from ljli/hs-ghcjs-pkgs-inherit 
haskellPackages: apply GHC specific overrides before GHCJS
 2017-03-24 23:15:41 +01:00
Robin Gloster
693d0e7fea
haskellPackages.yi-keymap-vim: dontCheck 
Tries to access path outside of sandbox.
 2017-03-22 01:26:40 +01:00
Peter Simons
659ea1e24a Merge pull request #24099 from jerith666/friday-juicypixels-test 
friday-juicypixels: disable tests
 2017-03-20 17:39:31 +01:00
Matt McHenry
cd426e66b8 friday-juicypixels: disable tests 
the tarball from
https://hackage.haskell.org/package/friday-juicypixels-0.1.2/friday-juicypixels-0.1.2.tar.gz
does not include the test/rgba8.png file, which causes the test
code to fail
 2017-03-20 12:19:02 -04:00
Peter Simons
d59fe189fd haskell-configuration-nix: drop obsolete webkit-related overrides 2017-03-20 10:24:58 +01:00
Michael Alan Dorman
6236cd4716 pointfree: patch is no longer needed 2017-03-20 10:24:58 +01:00
Peter Simons
8f45ea6175 hackage-packages.nix: automatic Haskell package set update 
This update was generated by hackage2nix v2.1-7-g490c7d5 from Hackage revision
abc129b4f1.
 2017-03-20 10:24:58 +01:00
Peter Simons
c3b0cb1ace hackage2nix: keep binary 0.8.x around 2017-03-20 10:24:57 +01:00
Peter Simons
d3028ba6b5 LTS Haskell 8.5 2017-03-20 10:24:57 +01:00
Peter Simons
8c00f3432a Merge pull request #23982 from ElvishJerricco/callCabal2nix-dont-rebuild-cabalfile 
callCabal2nix: Fixed indentation
 2017-03-17 13:23:11 +01:00
Will Fancher
934c8c7a93 callCabal2nix: Fixed indentation 2017-03-17 04:32:34 -04:00
Domen Kožar
a17e8e7e72
servant-auth-server, servant-swagger: enable hydra build 2017-03-16 15:13:04 +01:00
Peter Simons
e916236130 Merge pull request #23615 from ljli/ghcjs-dom-jsffi-fix 
haskell: ghcjs packages: fix ghcjs-dom-jsffi with newer Cabal
 2017-03-14 16:09:37 +01:00
Will Fancher
24b47526ce callCabal2nix: Don't rebuild unchanged cabal file 
It can be quite annoying that callCabal2nix will build a new derivation
if anything in the source has changed, even if the cabal file hasn't.
 2017-03-13 22:20:56 -04:00
Domen Kožar
609f2fefce Merge pull request #23836 from expipiplus1/jailbreak-strict-io 
Haskell Packages: jailbreak strict-io
 2017-03-13 13:27:37 +01:00
Joe Hermaszewski
0867ac9963 Haskell Packages: jailbreak strict-io 2017-03-13 11:27:08 +00:00
Benno Fünfstück
6c99f88eec fix typo in comment 2017-03-12 22:47:28 +01:00
Benno Fünfstück
039c6a6dfa haskell: comment about configuration-nix.nix's intersectAttrs 2017-03-12 22:45:19 +01:00
Jörg Thalheim
d0922896be Merge pull request #23097 from dmjio/halvm 
Initial commit of HaLVM support
 2017-03-12 18:31:29 +01:00
Vladimír Čunát
69448187a4
haskellPackages.llvm-general-darwin: fix #23794 
by hiding under llvm-general.  There seems no use in a separately named
attribute.  The derivations are unchanged.
 2017-03-12 18:19:35 +01:00
David Johnson
26623240e9 Init HaLVM at 2.4.0 2017-03-10 19:31:12 -06:00
Rickard Nilsson
fb5369dbe9 haskellPackages.streaming-eversion: dontCheck 2017-03-08 17:18:18 +01:00
Leon Isenberg
07905c8f93 haskell: ghcjs packages: fix ghcjs-dom-jsffi with newer Cabal 2017-03-08 16:28:54 +01:00
Michael Alan Dorman
763e21e982 haskell-gi-base: propagate gobjectIntrospection dependency 
So the thinking is: anything that needs `haskell-gi-base` is going to
need `gobjectIntrospection` in order to work correctly; by adding this
one `buildDepends` (which therefore gets propagated), we put ourselves
in a position to simplify away a bunch of code in `cabal2nix`.
 2017-03-08 15:17:39 +01:00
Michael Alan Dorman
d7496b560e gi-webkit2: fix gi-javascriptcore dependency 
This actually depends on the specially-versioned gi-javascriptcore
package.
 2017-03-08 15:17:39 +01:00
Peter Simons
c71d1e72b2 LTS Haskell 8.4 2017-03-08 15:17:39 +01:00
Peter Simons
9d9cc7ba5f hackage-packages.nix: automatic Haskell package set update 
This update was generated by hackage2nix v2.1-2-g3de0b84 from Hackage revision
e5e1058cde.
 2017-03-08 15:17:39 +01:00
Leon Isenberg
b9c7d291bc haskellPackages: apply GHC specific overrides before GHCJS 
GHCJS is effectively a backend for GHC, so all the GHC version specific package set overrides should in
general apply to the GHCJS package sets, too.
 2017-03-08 13:10:28 +01:00
Peter Simons
060f7cb94d haskell-generic-builder: remove unused nodePackages argument 2017-03-08 09:38:12 +01:00
Peter Simons
f641e9022e Merge pull request #23609 from ljli/hs-lens-pkg-conf 
haskell: ghc710x packages: remove superflous configuration for lens
 2017-03-08 09:22:17 +01:00
Leon Isenberg
032de64e0f haskell: ghc710x packages: remove superflous configuration for lens 2017-03-07 20:21:27 +01:00
Domen Kožar
db23fe1581
haskell: add justStaticExecutables combinator 2017-03-07 18:13:59 +01:00
Peter Simons
e0908699ff haskell-QuickCheck: fix build with ghc-7.6.x 2017-03-07 15:43:19 +01:00
Peter Simons
85a06d6b8d haskell-shelly: drop obsolete overrides 2017-03-06 14:35:21 +01:00
Peter Simons
1329368d82 hackage-packages.nix: automatic Haskell package set update 
This update was generated by hackage2nix v2.1-2-g3de0b84 from Hackage revision
ea0774dfde.
 2017-03-06 14:35:21 +01:00
Peter Simons
fb5b6ddab6 hackage2nix: revert to old version of store 2017-03-06 14:35:21 +01:00
Peter Simons
dd20fbe5d1 hackage2nix: disable failing builds 2017-03-06 14:35:21 +01:00
Tom Hunger
6e5eaf58a3 purescript: pin dependencies. 2017-03-06 14:35:21 +01:00
Leon Isenberg
2b174d5114 haskell: ghc710x packages: fix dependent-map 2017-03-05 18:31:55 +01:00
Leon Isenberg
691b3bcd77 haskellPackages: fix dangling references 
haskeline_0_7_2_1 -> haskline_0_7_3_1
terminfo_0_4_0_1 -> terminfo_0_4_0_2
 2017-03-05 16:45:31 +01:00
Shea Levy
ef5986e03c haskellSrc2nix: Change sha arg when sha256 is null. 
Otherwise it just fails due to no nix-prefetch-url
 2017-03-04 13:18:14 -05:00
Peter Simons
e47a0ae767 haskell-arithmoi: test suite fails on i686 
(cherry picked from commit cb1af9fd4f2d9c850a3d643133e72277371d3427)
 2017-03-04 14:11:55 +01:00
Peter Simons
7a9881de61 haskell-diagrams-lib: test suite fails on i686 
(cherry picked from commit 3e3dfdd085f17fec5e94d29a63e4bc898a4c4a79)
 2017-03-04 14:06:22 +01:00
Domen Kožar
a32a00eb81
haskellPackages.http-api-data: dontCheck 
(cherry picked from commit 2f4003b56163ebf4b9f0b1ea6ed3c0a974a3fcd7)
Signed-off-by: Domen Kožar <domen@dev.si>
 2017-03-03 11:46:09 +01:00
Peter Simons
b923fd5253 git-annex 6.20170301.1 tarballs are no longer available anywhere; now we must use fetchgit 2017-03-02 22:11:58 +01:00
Peter Simons
090921fa5f hackage-packages.nix: automatic Haskell package set update 
This update was generated by hackage2nix v2.1-2-g3de0b84 from Hackage revision
163561eab9.
 2017-03-02 22:11:48 +01:00
Peter Simons
197236af88 hackage2nix: disable broken builds 2017-03-02 22:11:46 +01:00
Nikolay Amiantov
86a0a1eced haskellPackages.lambdabot-haskell-plugins: remove overrides 2017-03-02 21:41:25 +03:00
Peter Simons
027ffb6429 Merge pull request #23252 from ljli/ghc7103-pkgs-fixes 
haskell ghc710x packages fixes
 2017-03-02 19:07:12 +01:00