mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-25 07:00:43 +00:00
Code Issues Wiki Activity
106823 commits 234 branches 124 tags 7.1 GiB
Commit graph

2206 commits

Author SHA1 Message Date
Peter Simons 033f2a6ca5 Merge pull request #25405 from obsidiansystems/gi-javascriptcore-fix3 
gi-webkit2: fix gi-javascriptcore dependency
 2017-05-02 09:04:14 +02:00
Peter Simons 7b17f00f2f Merge pull request #25400 from ljli/hse-simple-no-conf 
haskell: haskell-src-exts-simple: Remove configuration
 2017-05-02 08:59:09 +02:00
Peter Simons c609aecede Merge pull request #25389 from roberth/fix-haskell-tasty-discover 
haskellPackages.tasty-discover: bootstrap itself using an untested build
 2017-05-02 08:44:43 +02:00
Shea Levy 9f2bbf65af haskellSrc2nix: preferLocalBuild and use unwrapped cabal2nix. 
No need to download bazaar etc...
 2017-05-01 18:21:42 -04:00
Ryan Trinkle 1927361e44 gi-webkit2: fix gi-javascriptcore dependency 2017-05-01 15:21:57 -04:00
Leon Isenberg 299fdf7441 haskell: haskell-src-exts-simple: Remove configuration 2017-05-01 19:07:50 +02:00
Robert Hensing 14244d0f33 haskellPackages.tasty-discover: bootstrap itself using an untested build 
The tasty-discover test suite depends on tasty-discover in $PATH during
test-suite compilation. Adding an untested build of itself to build
tools fixes the problem, without putting the untested version in
the package set.
 2017-05-01 17:28:45 +02:00
Shea Levy 99c28df9e5 hackage-packages.nix: automatic Haskell package set update 
This update was generated by hackage2nix v2.1.1-8-g19ebdb9 from Hackage revision
3fcb79c182.
 2017-04-29 21:31:34 -04:00
Pascal Wittmann 959fadb86e yesod-auth-oauth2: jailbreak because of outdated dependencies 2017-04-28 14:40:26 +02:00
Peter Simons cd4d91eb11 Merge pull request #25254 from nh2/generic-stack-builder-no-stack-setup-lts-8.3 
generic Haskell builder: Don't call `stack setup`.
 2017-04-27 10:44:56 +02:00
Niklas Hambüchen 139b1377d4 generic Haskell builder: Don't call stack setup. 
`stack setup` should not be called inside `nix-build` because
that makes stack download a GHC instead of using nix's one
(the one provided `generic-stack-builder.nix` as the `ghc` argument),
which will not work.
Further evidence for this is that the `stack --nix` support
intentionally uses `--system-ghc` for the same purpose.
 2017-04-26 20:20:36 +02:00
Benno Fünfstück 6b36d26a24 haskell: add more callPackageWithScope docs 2017-04-25 16:08:44 +02:00
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 
26623240e9 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