Commit graph

58039 commits

Author SHA1 Message Date
codyopel
fc27383909 gsm: seperate phases & fix shared library 2015-02-13 21:04:03 -05:00
William A. Kennington III
23e1b46f17 nixos/tests/installer: Add all bootloaders to the store 2015-02-13 14:41:11 -08:00
William A. Kennington III
1f133ab6b4 parted: Fix patch 2015-02-13 14:40:58 -08:00
William A. Kennington III
1fddcd1e83 grub: Don't remove zfs support if contained in the default binary 2015-02-13 14:40:41 -08:00
William A. Kennington III
69a277e2cc iwlegacy: Remove since it is already in linux-firmware-nonfree 2015-02-13 14:27:47 -08:00
William A. Kennington III
8e62c497ca grub2: Update git revision 2015-02-13 13:42:20 -08:00
William A. Kennington III
58a04a9359 kernel: 3.14.32 -> 3.14.33 2015-02-13 13:42:20 -08:00
William A. Kennington III
b41222e5c6 kernel: 3.10.68 -> 3.10.69 2015-02-13 13:42:20 -08:00
William A. Kennington III
a15f149f74 kernel: 3.18.6 -> 3.18.7 2015-02-13 13:42:19 -08:00
Peter Simons
9db348d7f9 ghc-7.10.x: compile Setup.hs with -threaded to avoid hanging test suites
Closes https://github.com/NixOS/nixpkgs/issues/6259.
2015-02-13 22:24:32 +01:00
Peter Simons
4e82b03f29 haskell-mtl-compat: broken with ghc-7.8.x 2015-02-13 22:24:32 +01:00
Peter Simons
26faa326cd hackage-packages.nix: re-generate from Hackage 2015-02-13T12:48:35+0100 2015-02-13 22:24:32 +01:00
Peter Simons
ef6b18c0ec Merge pull request #5855 from peti/dont-use-special-gmp-variant-for-haskell
Enable static libraries in "gmp" to allow static linking of Haskell programs.
2015-02-13 22:19:44 +01:00
Peter Simons
f2a376f52a Enable static libraries in "gmp" to allow static linking of Haskell programs.
Haskell programs depend on gmp to implement the unbounded Integer type. Without
static variants of gmp we cannot build statically linked Haskell programs, what
some users have found desirable in the past. So far, we've used an override to
derive our own copy of gmp in the Haskell ecosystem, but this patch ends the
dichotomy between Haskell and the rest of Nixpkgs by enabling static gmp
libraries in the default build default.
2015-02-13 22:18:27 +01:00
Peter Simons
600135bba5 Merge remote-tracking branch 'master' into staging. 2015-02-13 22:17:12 +01:00
Peter Simons
54ce1a1810 Merge remote-tracking branch 'origin/master' into staging.
Conflicts:
      pkgs/development/compilers/ghc/head.nix
      pkgs/top-level/haskell-ng.nix
2015-02-13 22:13:25 +01:00
vbgl
bc4ffd6ad6 Merge pull request #6331 from bobvanderlinden/gnumeric-gio-extra-modules
gnumeric: make use of GIO_EXTRA_MODULES in wrapper
2015-02-13 18:08:03 +01:00
Lluís Batlle i Rossell
569a02b725 Updating weka to 3.6.12.
(cherry picked from commit cd417206f93be49dd848ce1b3633e335faed941f)
2015-02-13 16:22:39 +01:00
Peter Simons
c6ed2aa203 Merge pull request #5968 from jkarni/jkarni/servant-server-0.2.3
I'll merge blindly, assuming that those changes have been tested by the submitter. If these updates cause any trouble, please don't hesitate to revoke if necessary.
2015-02-13 15:39:32 +01:00
Peter Simons
bf279ecec2 Merge pull request #5976 from jkarni/jkarni/update-resourcet
I'll merge blindly, assuming that those changes have been tested by the submitter. If these updates cause any trouble, please don't hesitate to revoke if necessary.
2015-02-13 15:39:12 +01:00
Peter Simons
afaa01c957 Merge pull request #6009 from nkaretnikov/yesod-1.4.1.4
I'll merge blindly, assuming that those changes have been tested by the submitter. If these updates cause any trouble, please don't hesitate to revoke if necessary.
2015-02-13 15:38:41 +01:00
Bob van der Linden
3f7917ed8a gnumeric: make use of GIO_EXTRA_MODULES in wrapper 2015-02-13 15:33:55 +01:00
Rickard Nilsson
da6abad31a vimb: Update from 2.8 to 2.9 2015-02-13 15:06:46 +01:00
Domen Kožar
d67a792a83 taskw: 0.8.6 -> 1.0.2 2015-02-13 14:33:11 +01:00
Pascal Wittmann
f393521630 libasr: fixed description 2015-02-13 14:29:11 +01:00
Pascal Wittmann
d7b01c8526 Merge pull request #6325 from k0ral/opensmtpd
opensmtpd: 5.4.2p1 -> 5.4.4p1
2015-02-13 13:28:04 +00:00
Domen Kožar
c6252250d8 Merge pull request #6329 from DamienCassou/vobject-not-compatible-with-pypy
Make sure vobject is not built by pypy
2015-02-13 14:21:39 +01:00
Eelco Dolstra
e783edc72e Merge pull request #6296 from nckx/add-kernel-config
Enable kernel configuration option FANOTIFY
2015-02-13 13:32:48 +01:00
Eelco Dolstra
970d57a598 Merge pull request #6327 from hvdijk/master
stage-1-init: fix PID 1 shell
2015-02-13 13:31:29 +01:00
Damien Cassou
b1e0124cd9 Merge pull request #6328 from DamienCassou/pharo-launcher-0.2.4
Pharo launcher 0.2.1 --> 0.2.4
2015-02-13 12:54:36 +01:00
Damien Cassou
1dfab1cd9b Make sure vobject is not built by pypy
http://hydra.nixos.org/build/19521419
2015-02-13 12:51:08 +01:00
Damien Cassou
120cc5a65a Pharo launcher 0.2.1 --> 0.2.4 2015-02-13 12:48:32 +01:00
koral
3bc7dfdf22 opensmtpd: 5.4.2p1 -> 5.4.4p1 2015-02-13 12:38:21 +01:00
Harald van Dijk
0fe9d58e4e stage-1-init: fix PID 1 shell
The PID 1 shell is executed as the last command in a sh invocation. Some
shells implicitly use exec for that, but the current busybox ash does not,
so the shell gets a wrong PID. Spell out the exec.
2015-02-13 10:20:29 +00:00
Pascal Wittmann
92f3ec3ba5 pngnq: update from 1.0 to 1.1 2015-02-13 11:02:27 +01:00
Peter Simons
7e07916f91 haskell-clac: disable builds with ghc-7.8.x 2015-02-13 10:37:47 +01:00
Peter Simons
a04e2e06f9 haskell-gstreamer: fix dependencies 2015-02-13 10:37:47 +01:00
Joel Taylor
2a5dacbf6b patch shebangs in boot script 2015-02-13 10:37:47 +01:00
Joel Taylor
dcafdf47ea Revert "Revert "Build GHC HEAD from git checkout"."
This reverts commit 15416dd2ec.
2015-02-13 10:37:47 +01:00
Peter Simons
95814c7ef1 haskell-file-location: test suite is now fixed 2015-02-13 10:37:47 +01:00
Peter Simons
5d707670a5 hackage-packages.nix: re-generate from Hackage 2015-02-12T23:09:28+0100 2015-02-13 10:37:47 +01:00
Peter Simons
8b64ee52f8 haskell-file-location: test suite doesn't compile 2015-02-13 10:37:47 +01:00
Peter Simons
d51a083896 haskell-blaze-builder: downgrade to version < 0.4
Many builds can't deal with the new version yet.
2015-02-13 10:37:47 +01:00
Peter Simons
8c0d54e46a haskell-bloomfilter: disable broken 32 bit build
Fixes https://github.com/NixOS/nixpkgs/issues/6292.
2015-02-13 10:37:46 +01:00
Peter Simons
095a7f8cd6 haskell-blaze-markup: disable failing test suite 2015-02-13 10:37:46 +01:00
Peter Simons
60cb74e6d6 haskell-CHXHtml: disable Hydra builds because of excessive build time 2015-02-13 10:37:46 +01:00
Peter Simons
27b57469e8 python-generic: cosmetic 2015-02-13 10:37:46 +01:00
Peter Simons
6c3e44c040 haskell-rasterific: the broken test suite has been removed 2015-02-13 10:37:46 +01:00
Peter Simons
e4037ae913 hackage-packages.nix: re-generate from Hackage 2015-02-12T20:00:15+0100 2015-02-13 10:37:46 +01:00
lethalman
51a7277fac Merge pull request #6312 from k0ral/sslh
sslh: added libwrap support + improved nixos module.
2015-02-13 10:03:48 +01:00