JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
62,425 Commits 2 Branches 0 Tags 13 GiB
c13f189b19
Commit Graph

714 Commits

Author SHA1 Message Date
Domen Kožar
bb4d658f64 Merge branch 'master' into staging 
Conflicts:
	nixos/doc/manual/release-notes/rl-unstable.xml
	nixos/modules/services/printing/cupsd.nix
	pkgs/applications/misc/calibre/default.nix
	pkgs/development/haskell-modules/hackage-packages.nix
	pkgs/development/libraries/libsodium/default.nix
	pkgs/misc/emulators/wine/unstable.nix
	pkgs/top-level/all-packages.nix
 2015-05-11 10:05:23 +02:00
Charles Strahan
e3696ed37f ghcjs: bump ghcjs-prim 
closes #7768
 2015-05-11 00:52:52 -04:00
Peter Simons
eafd67b45e haskell-wreq has been fixed upstream 2015-05-10 22:14:46 +02:00
Peter Simons
e9e07667b2 haskell-cryptol: override is no longer necessary 2015-05-10 22:14:46 +02:00
Peter Simons
c2c724bcaf haskell-stm-queue-extras: override is no longer necessary 2015-05-10 22:14:46 +02:00
Peter Simons
7f76150662 haskell-call: build should be fixed, but the dependency audiovisual is still broken 2015-05-10 22:14:46 +02:00
Peter Simons
7b49289c74 hackage-packages.nix: update to 4f492cbdcc with hackage2nix revision 4c63d4ad559c7c9569df1ea07557f92a1cfb5a3e 2015-05-10 22:14:42 +02:00
Benno Fünfstück
2818017347 Merge pull request #7791 from vandenoever/elm 
Fix compilation of language-glsl.
 2015-05-10 19:02:30 +02:00
Jos van den Oever
d8b93eb1cd Fix compilation of language-glsl. 
The issue / patch https://github.com/noteed/language-glsl/pull/10 fixes
a compilation problem with language-glsl.
The packages pretty and prettyclass conflicted when compiled with GHC 7.10.
 2015-05-10 18:50:07 +02:00
codyopel
c250cf6f53 libsodium: refactor & remove duplicate 2015-05-10 13:46:29 +02:00
Peter Simons
535cbdbf73 haskell-email-validate: disable test suite to fix the build 
Reported in https://github.com/Porges/email-validate-hs/issues/12.
 2015-05-10 13:46:01 +02:00
Peter Simons
c65e48ca96 haskell-sandi: jailbreak restriction on "base == 4.8.*" so that we can build git-annex and hledger 
Reported in https://github.com/magthe/sandi/issues/7.
 2015-05-10 13:46:01 +02:00
Peter Simons
d484328619 hackage-packages.nix: update to 7424fa13db with hackage2nix revision 5e6df99a29c3e80bb071af288038312b19baf022 2015-05-10 13:46:01 +02:00
Peter Simons
60d405f573 haskell-smaoin has been fixed upstream. 2015-05-10 13:46:00 +02:00
Peter Simons
132e0fed79 hackage-packages.nix: update to 533fd30acc with hackage2nix revision f8474108eabeb513175d845709f749070ffdd8ba 2015-05-10 13:46:00 +02:00
Richard Wallace
2b45d39720 no longer need to patch reactive-banana, latest version has all the necessary instances 2015-05-10 13:46:00 +02:00
Renzo Carbonara
9130b8d877 Haskell: explicit reflex-dom dependencies for GHCJS 
When building `reflex-dom` for GHCJS, the following dependencies are not
needed and will fail to build: glib, gtk3, webkitgtk3,
webkitgtk3-javascriptcore. Now we explicitely need the dependencies
needed for building for GHCJS.
 2015-05-10 13:45:59 +02:00
Charles Strahan
f6f6156625 ghcjs: set NIX_GHCJS_* variables in env. 2015-05-10 13:45:59 +02:00
Charles Strahan
4e04fdce86 ghcjs: properly wrap binaries in environment 
This also:

 1  Builds Setup.hs with ghcjs, which (among other things) defines
    __GHCJS__ and ghcjs_HOST_OS during pre-processing.
 2  Fixes ghc-paths to point at ghcjs and use NIX_GHCJS_* env-vars.
 3  Boots ghcjs into $prefix/lib/$compiler.
 2015-05-10 13:45:59 +02:00
codyopel
7a794e1797 libsodium: refactor & remove duplicate 2015-05-09 18:20:06 -04:00
Peter Simons
c4bc6fc243 haskell-email-validate: disable test suite to fix the build 
Reported in https://github.com/Porges/email-validate-hs/issues/12.
 2015-05-09 14:16:47 +02:00
Peter Simons
1d119271e7 haskell-sandi: jailbreak restriction on "base == 4.8.*" so that we can build git-annex and hledger 
Reported in https://github.com/magthe/sandi/issues/7.
 2015-05-09 14:16:47 +02:00
Peter Simons
31b330828c hackage-packages.nix: update to 7424fa13db with hackage2nix revision 5e6df99a29c3e80bb071af288038312b19baf022 2015-05-09 14:16:43 +02:00
Peter Simons
e11306a366 haskell-smaoin has been fixed upstream. 2015-05-09 11:39:38 +02:00
Peter Simons
d9411d53e9 hackage-packages.nix: update to 533fd30acc with hackage2nix revision f8474108eabeb513175d845709f749070ffdd8ba 2015-05-09 11:26:09 +02:00
Richard Wallace
b5f2fd7220 no longer need to patch reactive-banana, latest version has all the necessary instances 2015-05-08 23:17:47 -07:00
Renzo Carbonara
9d03afa429 Haskell: explicit reflex-dom dependencies for GHCJS 
When building `reflex-dom` for GHCJS, the following dependencies are not
needed and will fail to build: glib, gtk3, webkitgtk3,
webkitgtk3-javascriptcore. Now we explicitely need the dependencies
needed for building for GHCJS.
 2015-05-08 16:54:07 -03:00
Peter Simons
7fd7cf69af Merge pull request #7734 from cstrahan/ghcjs-improvements 
ghcjs: properly wrap binaries in environment
 2015-05-08 18:26:07 +02:00
Charles Strahan
31dde16881 ghcjs: set NIX_GHCJS_* variables in env. 2015-05-08 11:53:28 -04:00
Charles Strahan
929dc4199a ghcjs: properly wrap binaries in environment 
This also:

 1  Builds Setup.hs with ghcjs, which (among other things) defines
    __GHCJS__ and ghcjs_HOST_OS during pre-processing.
 2  Fixes ghc-paths to point at ghcjs and use NIX_GHCJS_* env-vars.
 3  Boots ghcjs into $prefix/lib/$compiler.
 2015-05-08 11:33:44 -04:00
William A. Kennington III
c9395e1e92 Merge branch 'master' into staging 2015-05-08 05:59:50 -07:00
Peter Simons
dbdba8e0c4 haskell-bitcoin-api-extra depends on broken wreq library 2015-05-08 14:10:16 +02:00
Peter Simons
300edc44f8 haskell-edit-distance has been fixed upstream 2015-05-08 14:10:16 +02:00
Peter Simons
60cee4e995 haskell-text: trigger re-build to mitigate non-deterministic library ID bug 2015-05-08 14:10:16 +02:00
Peter Simons
ad0140e780 haskell-Yampa has been fixed upstream. 2015-05-08 14:10:16 +02:00
Peter Simons
0dc150ffbc haskell-cabal-lenses: trigger re-build to fix broken Hydra package 2015-05-08 14:10:16 +02:00
Peter Simons
677ab5d03c haskell-samoin: fix build by disabling the test suite 2015-05-08 14:10:16 +02:00
Peter Simons
4dba3fa2e0 Fix bogus references to cabal-install 1.18.x. 2015-05-08 14:10:16 +02:00
Peter Simons
e930cf057e hackage-packages.nix: update to d338756e7c with hackage2nix revision f8474108eabeb513175d845709f749070ffdd8ba 2015-05-08 14:10:15 +02:00
William A. Kennington III
074c4a7f78 Merge remote-tracking branch 'upstream/master' into staging 2015-05-07 01:44:49 -07:00
Peter Simons
06255562b6 hackage-packages.nix: update to a194932779 with hackage2nix revision db53ac3a644eebda581c9f036ccd55a19ff3c629 2015-05-05 21:44:48 +02:00
Peter Simons
a2f6ca40e3 haskell-timerep test suite crashes ghc-7.10.x 2015-05-05 21:44:48 +02:00
Peter Simons
857ddfc2f5 haskell-sdr fails its test suite. 2015-05-05 21:44:48 +02:00
Peter Simons
539e8eb7f1 haskell-Yampa fails its test suite. 2015-05-05 21:44:48 +02:00
Peter Simons
4cf188b376 We can't build cabal-install with ghc-6.12.x. 2015-05-05 21:44:48 +02:00
Peter Simons
ea9e11db9a haskell-monad-par: fix build with ghc-7.4.x 2015-05-05 21:44:48 +02:00
Peter Simons
b5c368cbe4 haskell-unix-time: fix build with ghc-7.4.x 2015-05-05 21:44:47 +02:00
Peter Simons
e36427857d Fix cabal-install builds with ghc 7.0.x and 7.2.x. 2015-05-05 21:44:47 +02:00
Peter Simons
01ba9d0dec hackage-packages.nix: update to 69ffcf7c20 with hackage2nix revision 936f7d1dd81cf86df3d79e4e38d17dc68e2a561e 2015-05-05 21:44:47 +02:00
Peter Simons
e9631f289f haskell-clash-lib depends on broken singletons library. 2015-05-05 21:44:47 +02:00