alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity
57871 commits 217 branches 121 tags 4.5 GiB
Commit graph

57871 commits

This branch
This branch
All branches
Author SHA1 Message Date
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 cd417206f9)
 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
Vincent Laporte cbc58da3f0 ocaml-sqlite3: update from 2.0.8 to 2.0.9 2015-02-13 06:46:23 +01:00
Domen Kožar 5a4614dc1f Add hid_lenovo to initrd kernel modules 2015-02-13 01:42:13 +01:00
Domen Kožar b2d17156bb Merge pull request #6324 from codyopel/x265br 
X265br
 2015-02-13 01:22:16 +01:00
William A. Kennington III 4dfd6cdfb7 Merge pull request #6323 from codyopel/libvpxbr 
libvpx-git: bump commit & disable high bitdepth builds on i686
 2015-02-12 14:58:33 -08:00
John Wiegley b39d5ea309 contacts: New expression for darwin 2015-02-12 16:58:22 -06:00
codyopel 3f22fdf7b0 x265: refactor & add optionals 2015-02-12 17:55:23 -05:00
codyopel b60f5a004a x265-hg: bump commit 2015-02-12 17:53:48 -05:00
codyopel 90ea935252 x265: 1.4 -> 1.5 2015-02-12 17:53:07 -05:00
Jaka Hudoklin 2f2d638d38 Merge pull request #6317 from offlinehacker/nixos/consul/alerts 
nixos/consul: add consul-alerts service
 2015-02-12 21:39:09 +00:00
codyopel 3269e202b1 libvpx-git: bump commit & disable high bitdepth builds on i686 2015-02-12 16:08:33 -05:00
John Wiegley 68c6ca44e6 sbcl_1_2_0: port over joelteon's change to 1.2.8 2015-02-12 15:05:37 -06:00
koral 25cc033426 impressive: 0.10.3 -> 0.10.5 (close #6228) 2015-02-12 21:55:45 +01:00
John Wiegley 1dea4e5297 Merge pull request #6321 from joelteon/sbcl 
Linker flags for sbcl on Darwin
 2015-02-12 15:54:05 -05:00
Joel Taylor b43fc565f1 linker flags for sbcl 2015-02-12 12:14:35 -08:00