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

35396 commits

Author SHA1 Message Date
Shea Levy cea0460d41 Missed file 2014-04-07 16:37:02 -04:00
Shea Levy c7899ae8ea haskell-libjenkins: fix build with new conduit 2014-04-07 16:35:26 -04:00
Shea Levy 08c7105503 haskell-scotty: fix build with new conduit 2014-04-07 16:35:12 -04:00
Alex Berg 7dff8a8aaf Bump Docker to v0.9.1. Tested pulling, committing, pushing. 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-04-07 15:08:07 -05:00
Austin Seipp 05ec851050 kernel: longterm updates 
- longterm: 3.4.85  -> 3.4.86
 - longterm: 3.10.35 -> 3.10.36
 - longterm: 3.12.15 -> 3.12.17

Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-04-07 13:56:50 -05:00
Domen Kožar 1140f06e0f openssl: 1.0.1f -> 1.0.1g 
CVE-2014-0160, CVE-2014-0076
 2014-04-07 20:33:38 +02:00
Austin Seipp 4dc15c087a musl: version 1.0.0 
NB: This currently doesn't add a working musl-wrapper around musl-gcc to
allow it to work properly (musl has its own dynamic linker as well as
libc too which must be accounted for). But at the moment it builds fine,
and I plan on working more on it in the future. So lets get it
integrated and building on Hydra.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-04-07 10:31:31 -05:00
Peter Simons a29b90b4c7 haskell-language-javascript: update to version 0.5.12 2014-04-07 17:06:37 +02:00
Peter Simons 017a8975e7 haskell-github: patch to fix build with recent versions of conduit 
Cc: @jwiegley
 2014-04-07 17:06:37 +02:00
Peter Simons 9ec3e833f7 hledger-web: patch to fix build with recent versions of conduit 
Cc: @simonmichael
 2014-04-07 17:06:37 +02:00
Peter Simons bdc3361515 haskell-keter: update to version 1.3.0 2014-04-07 17:06:37 +02:00
Peter Simons 6876e696b4 haskell-HaRe: update to version 0.7.2.2 2014-04-07 17:06:37 +02:00
Peter Simons 8673cef70d haskell-yesod-core: update to version 1.2.11 2014-04-07 17:06:36 +02:00
Peter Simons 180673ccec haskell-yesod-bin: update to version 1.2.8 2014-04-07 17:06:36 +02:00
Peter Simons aebf705dbf haskell-twitter-types: update to version 0.2.20140406 2014-04-07 17:06:36 +02:00
Peter Simons 9b15ca7178 haskell-temporary: update to version 1.2.0.2 2014-04-07 17:06:36 +02:00
Peter Simons 73411b90dd haskell-resourcet: update to version 1.1.1 2014-04-07 17:06:36 +02:00
Peter Simons cbe4a977de haskell-random-fu: update to version 0.2.5.0 2014-04-07 17:06:36 +02:00
Peter Simons 7e539c72ef haskell-quickcheck-io: update to version 0.1.1 2014-04-07 17:06:36 +02:00
Peter Simons 59f7f63792 haskell-hspec: update to version 1.9.2 2014-04-07 17:06:35 +02:00
Peter Simons 7f6404001d haskell-hspec-meta: update to version 1.9.2 2014-04-07 17:06:35 +02:00
Peter Simons afd7e3c1de haskell-hakyll: update to version 4.5.0.2 2014-04-07 17:06:35 +02:00
Peter Simons 1b32db652a haskell-fay: update to version 0.19.1.2 2014-04-07 17:06:35 +02:00
Peter Simons ec4e1295ca haskell-fay-base: update to version 0.19.1.1 2014-04-07 17:06:35 +02:00
Peter Simons 9e04637777 haskell-cryptohash-cryptoapi: update to version 0.1.3 2014-04-07 17:06:35 +02:00
Peter Simons 448d6458a6 haskell-crypto-conduit: update to version 0.5.3 2014-04-07 17:06:34 +02:00
Peter Simons b5ab38cd74 haskell-TypeCompose: update to version 0.9.10 2014-04-07 17:06:34 +02:00
Peter Simons e235f6b608 haskell-Hipmunk: update to version 5.2.0.13 2014-04-07 17:06:34 +02:00
Peter Simons 1acfe0a811 haskell-HStringTemplate: update to version 0.7.3 2014-04-07 17:06:34 +02:00
Peter Simons 6acbb0df12 haskell-DAV: update to version 0.6.2 2014-04-07 17:06:34 +02:00
Peter Simons ff49602b17 haskell-git-annex: update to version 5.20140405 2014-04-07 17:06:34 +02:00
Austin Seipp 5aa4495cb5 boolector: add version 1.5 and 1.6 
There are two versions here because beginning with 1.6.0, Boolector has
a more restrictive, unfree license which disallows commercial use.

As a result, Boolector 1.5 is the default 'boolector' expression.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-04-07 09:17:05 -05:00
Ricardo M. Correia 807fad571a grsecurity: Update stable and test patches 
stable: 3.0-3.2.56-201404012135 -> 3.0-3.2.56-201404062126
test:   3.0-3.13.8-201404011912 -> 3.0-3.13.9-201404062127
 2014-04-07 15:31:12 +02:00
Ricardo M. Correia c494289c12 linux: Update to 3.13.9 2014-04-07 15:31:12 +02:00
Eelco Dolstra 59ea2d7ba5 Apply patch for CVE-2014-0004 to udisks-1.0.4 
(cherry picked from commit 3b1f989961)
 2014-04-07 13:22:12 +02:00
Eelco Dolstra fa6b9baea9 Revert "udisks1: bump to fix CVE-2014-0004" 
This reverts commit 0194a44d63 because
it breaks udisks on 13.10 (e.g. running "udisks --enumerate" will
print "Unit udisks.service failed to load").

(cherry picked from commit d7daf1a47f)
 2014-04-07 13:22:12 +02:00
Peter Simons 53d7a1c882 haskell-criterion: downgrade to hastache 0.5.1 to fix the build 
Closes <https://github.com/NixOS/nixpkgs/pull/2133>.
 2014-04-07 11:54:57 +02:00
vi 3d3648f261 Added a derivation for Ozgun's's retry (Haskell.) 2014-04-07 12:15:33 +08:00
Domen Kožar 296dd89030 buildPythonPackage: don't return on shellHook 
Entering environment might not always be the desired effect.
 2014-04-07 00:43:50 +02:00
Shea Levy 9949d0255e Merge branch 'make-the-kernel-build-repeatable' of git://github.com/alexanderkjeldaas/nixpkgs 
Make the kernel build and initrd generation binary repeatable (#2128)
 2014-04-06 17:02:16 -04:00
Peter Simons 4b57acece1 haskell-http-client-conduit: there is no code in this module to generate documentation for 2014-04-06 21:54:46 +02:00
Peter Simons acd673be4b haskell-zlib-conduit: there is no code in this module to generate documentation for 2014-04-06 21:54:46 +02:00
Peter Simons 5fcc9d2b68 haskell-network-conduit: there is no code in this module to generate documentation for 2014-04-06 21:54:45 +02:00
Peter Simons ee7880993b haskell-attoparsec-conduit: there is no code in this module to generate documentation for 2014-04-06 21:54:45 +02:00
Peter Simons 2a0a12f333 Upgrade hashable to version 1.2.x. 
This change in the GHC 7.6.3 profile violates Haskell Platform, but it fixes
many builds that would not succeed otherwise (such as Trifecta). Overriding
hashable locally in an expression is out of question: the package is used
virtually everywhere.
 2014-04-06 21:54:45 +02:00
Peter Simons ea916f0b32 haskell-blaze-builder-conduit: there is no code in this module to generate documentation for 2014-04-06 21:54:03 +02:00
Peter Simons 5f45cc48c5 haskell-intervals: update to version 0.7 2014-04-06 21:54:02 +02:00
Peter Simons 0b3100322e haskell-exceptions: update to version 0.5 2014-04-06 21:54:02 +02:00
Peter Simons 8375a09cbb haskell-zlib-conduit: update to version 1.1.0 2014-04-06 21:53:23 +02:00
Peter Simons 3b9fff330c haskell-thyme: update to version 0.3.2.0 2014-04-06 21:53:23 +02:00
Peter Simons 30177a3c8f haskell-tagstream-conduit: update to version 0.5.5.1 2014-04-06 21:53:23 +02:00
Peter Simons 7f143d5646 haskell-stm-conduit: update to version 2.4.0 2014-04-06 21:53:23 +02:00
Peter Simons fe1584ef18 haskell-snap-loader-dynamic: update to version 0.10.0.1 2014-04-06 21:53:23 +02:00
Peter Simons ca00f844ae haskell-scotty-hastache: update to version 0.2.1 2014-04-06 21:53:23 +02:00
Peter Simons a9290ec05f haskell-resourcet: update to version 1.1.0.1 2014-04-06 21:53:22 +02:00
Peter Simons 5ef1beb6d2 haskell-process-conduit: update to version 1.1.0.0 2014-04-06 21:53:22 +02:00
Peter Simons 52eaa92c9f haskell-pool-conduit: update to version 0.1.2.3 2014-04-06 21:53:22 +02:00
Peter Simons c94833a157 haskell-pipes-safe: update to version 2.1.0 2014-04-06 21:53:22 +02:00
Peter Simons 78fc4f1083 haskell-network-conduit: update to version 1.1.0 2014-04-06 21:53:22 +02:00
Peter Simons 6bef23dd15 haskell-network-conduit-tls: update to version 1.1.0 2014-04-06 21:53:22 +02:00
Peter Simons d5f85b022a haskell-mime-mail: update to version 0.4.5.1 2014-04-06 21:53:22 +02:00
Peter Simons dbd66791a5 haskell-http-types: update to version 0.8.4 2014-04-06 21:53:21 +02:00
Peter Simons 7c5538a586 haskell-http-reverse-proxy: update to version 0.3.1.5 2014-04-06 21:53:21 +02:00
Peter Simons 837c45dc0a haskell-http-conduit: update to version 2.1.0 2014-04-06 21:53:21 +02:00
Peter Simons e97158dca2 haskell-http-client: update to version 0.3.0.2 2014-04-06 21:53:21 +02:00
Peter Simons ac9a4fc812 haskell-http-client-multipart: update to version 0.3.0.0 2014-04-06 21:53:20 +02:00
Peter Simons 77a6ba8e0b haskell-http-client-conduit: update to version 0.3.0 2014-04-06 21:53:19 +02:00
Peter Simons a0d08de0c6 haskell-ghc-mtl: update to version 1.2.0.0 2014-04-06 21:53:19 +02:00
Peter Simons 0fc2a8e025 haskell-esqueleto: update to version 1.3.9 2014-04-06 21:53:19 +02:00
Peter Simons 7ccdd41c27 haskell-distributive: update to version 0.4.3.1 2014-04-06 21:53:19 +02:00
Peter Simons c94198f13e haskell-diagrams-lib: update to version 1.1.0.4 2014-04-06 21:53:18 +02:00
Peter Simons 065e44f198 haskell-conduit: update to version 1.1.0 2014-04-06 21:53:18 +02:00
Peter Simons 940ba2cf76 haskell-conduit-extra: update to version 1.1.0 2014-04-06 21:53:18 +02:00
Peter Simons 5a5fe665f8 haskell-conduit-combinators: update to version 0.2.4 2014-04-06 21:53:18 +02:00
Peter Simons 005dad6f3a haskell-classy-prelude: update to version 0.8.3.1 2014-04-06 21:53:18 +02:00
Peter Simons 3c44347262 haskell-classy-prelude-conduit: update to version 0.8.1 2014-04-06 21:53:18 +02:00
Peter Simons 2b2ddb5165 haskell-checkers: update to version 0.3.2 2014-04-06 21:53:18 +02:00
Peter Simons b19cfe15ae haskell-blaze-builder-conduit: update to version 1.1.0 2014-04-06 21:53:18 +02:00
Peter Simons 5f8857d4f5 haskell-basic-prelude: update to version 0.3.8 2014-04-06 21:53:17 +02:00
Peter Simons 6a8decdf58 haskell-aws: update to version 0.8.6 2014-04-06 21:53:17 +02:00
Peter Simons 713bac5351 haskell-attoparsec-conduit: update to version 1.1.0 2014-04-06 21:53:17 +02:00
Peter Simons db1a390d9d haskell-hlint: update to version 1.8.60 2014-04-06 21:53:17 +02:00
Peter Simons bda2594998 haskell-language-ecmascript: update to version 0.16.1 2014-04-06 21:53:17 +02:00
Peter Simons 9b4cd56e99 haskell-hspec: update to version 1.9.1 2014-04-06 21:53:17 +02:00
Peter Simons 481df7e6cd haskell-hoogle: update to version 4.2.31 2014-04-06 21:53:17 +02:00
Peter Simons b605e51010 haskell-hint: update to version 0.4.1.0 2014-04-06 21:53:17 +02:00
Peter Simons 8c022626b2 haskell-hakyll: update to version 4.5.0.1 2014-04-06 21:53:16 +02:00
Peter Simons ee105b4a94 haskell-fb: update to version 1.0 2014-04-06 21:53:16 +02:00
Peter Simons 36ac60f757 haskell-dns: update to version 1.2.1 2014-04-06 21:53:16 +02:00
Peter Simons 9000db8b1e haskell-git-annex: update to version 5.20140402 2014-04-06 21:53:16 +02:00
Peter Simons 267a1692f3 haskell-fdo-notify: add version 0.3.1 2014-04-06 21:53:16 +02:00
Peter Simons 483e2d7d7d haskell-smtps-gmail: update to version 1.1.1 2014-04-06 21:53:16 +02:00
Peter Simons 070f071469 cosmetic: re-generate expressions with cabal2nix 2014-04-06 21:53:16 +02:00
Peter Simons 7863956686 haskell-trifecta: update to version 1.4.2 2014-04-06 21:53:15 +02:00
Austin Seipp ef903555fd gradm: learn of all accesses for /nix/store 
This is necessary for gradm's learning mode to work, as otherwise the
/nix/store directory is marked hidden, which causes the kernel to reject
the linker loading ld-linux.so

Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-04-06 21:51:35 +02:00
Austin Seipp 784062214c gradm: fix gradm_pam path 
We alredy rewrote /sbin/gradm, which technically matches
/sbin/gradm_pam, so this ends up working exactly as we want. Otherwise
we rewrite twice and gradm can't execute the PAM module with '-p'

Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-04-06 21:51:26 +02:00
Vladimír Čunát b4399324c1 cinnamon gschemas: fix wrong and pointless part 2014-04-06 21:40:55 +02:00
Vladimír Čunát 2b8002e44b cinnamon: fixup gschemas 2014-04-06 21:20:23 +02:00
Luca Bruno 43dc48845b gnome-system-log: remove duplicated preFixup attribute 2014-04-06 20:49:50 +02:00
Peter Simons a0d3aacd87 Merge pull request #2149 from thoughtpolice/spiped 
spiped: version 1.3.1
 2014-04-06 20:48:51 +02:00
Vladimír Čunát 447509adab Merge pull request #2148 from lethalman/gnome3-packages 
add gnome3 backgrounds, dictionary, grilo, totem

also fix evaluation
 2014-04-06 20:06:57 +02:00
Austin Seipp 8d3d50191d spiped: version 1.3.1 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-04-06 11:07:35 -05:00
Shea Levy 79c9d556e0 Add sproxy-web 2014-04-06 11:10:01 -04:00
Shea Levy 331d234ef6 Add sproxy 2014-04-06 10:54:44 -04:00
Luca Bruno 56709a0ac9 gnome-disk-utility: remove duplicated preFixup attribute 2014-04-06 15:23:12 +02:00
Luca Bruno 289d554bab totem: new package 
Movie player for the GNOME desktop based on GStreamer

https://wiki.gnome.org/Apps/Videos
 2014-04-06 15:23:12 +02:00
Luca Bruno 994a1ee4ef grilo: new package 
Framework that provides access to various sources of multimedia content, using a pluggable system

https://wiki.gnome.org/action/show/Projects/Grilo
 2014-04-06 15:23:12 +02:00
Luca Bruno eca21f1926 totem-pl-parser: new package 
Simple GObject-based library to parse and save a host of playlist formats

https://wiki.gnome.org/Apps/Videos
 2014-04-06 15:23:12 +02:00
Luca Bruno c70c038624 gnome-dictionary: new package 
Dictionary is the GNOME application to look up definitions

https://wiki.gnome.org/Apps/Dictionary
 2014-04-06 15:23:11 +02:00
Luca Bruno 5174e6db80 gnome-backgrounds: new package 2014-04-06 15:23:11 +02:00
Domen Kožar 29bc5feb1d Merge pull request #2139 from lethalman/gnome3 
Fix gsettings schemas usage for several packages due to #1901
 2014-04-06 13:59:46 +02:00
Shea Levy 0bab5319cc Merge branch 'pastebinit' of git://github.com/lethalman/nixpkgs 
pastebinit: new package
 2014-04-06 07:16:46 -04:00
Mathijs Kwik 6249cc729e add haskell-syntactic-1.11 2014-04-06 11:47:47 +02:00
Mathijs Kwik 773ce7aa32 add haskell-tree-view-0.4 2014-04-06 11:47:46 +02:00
Mathijs Kwik cdc4c7039d add haskell-data-hash-0.2.0.0 2014-04-06 11:47:46 +02:00
Mathijs Kwik b36f6ce3d4 ghc-mod: upgrade to 4.0.1 2014-04-06 11:47:46 +02:00
Mathijs Kwik 7f6a2f81b9 idris: upgrade to 0.9.12 2014-04-06 11:47:46 +02:00
Mathijs Kwik c01cc1a0e4 add haskell-cheapskate-0.1.0.1 (markdown processor) 2014-04-06 11:47:45 +02:00
Luca Bruno 1653c118bd pastebinit: new package 
A software that lets you send anything you want directly to a pastebin from the command line

https://launchpad.net/pastebinit
 2014-04-06 11:10:24 +02:00
Luca Bruno 35ccaa2e52 Fix gsettings schemas usage for several packages due to #1901 
Also add icons to epiphany
 2014-04-06 11:02:21 +02:00
Emery Hemingway 09cdc6edf5 f2fs-tools,ncdc: set platform and add myself to maintainers 2014-04-05 21:31:40 -04:00
Shea Levy 5441b1a98b Merge branch 'teamviewer-fix-upgrades' of git://github.com/bjornfor/nixpkgs 
teamviewer: fix brokenness after updates / GC
 2014-04-05 18:55:48 -04:00
Shea Levy d35619429a Merge branch 'cache.su' of git://github.com/wkennington/nixpkgs 
su: Make the su package a provider of only the su binary

Fixes #1877
 2014-04-05 18:49:30 -04:00
Shea Levy add2fafffb Merge branch 'master.nmap' of git://github.com/wkennington/nixpkgs 
nmap: Build the non-graphical version by default
 2014-04-05 18:40:18 -04:00
Shea Levy a68c12d35b git: Remove phony not-supported wrappers. 
Fixes #1751
 2014-04-05 18:39:53 -04:00
Bjørn Forsman 31ab1fd7ae teamviewer: fix brokenness after updates / GC 
Teamviewer puts symlinks to nix store paths in ~/.teamviewer. When those
paths become garbage collected, teamviewer crashes upon start because of
those broken symlinks. An easy workaround to this behaviour is simply to
delete all symlinks before we start teamviewer. Teamviewer will fixup
the symlinks, just like it did the first time the user ran it.
 2014-04-06 00:23:59 +02:00
William A. Kennington III 28ab3acb58 su: Make the su package a provider of only the su binary 
Additionally, provide su with the base system and remove su from the
util-linux package as it is now provided by shadow.
 2014-04-05 16:01:52 -05:00
Michael Raskin 9233723353 Temporary patch for Wireshark build 2014-04-06 00:57:35 +04:00
Shea Levy acb13c4b50 Merge branch 'make-cpufrequtils-pure' of git://github.com/alexanderkjeldaas/nixpkgs 
Make cpufrequtils compilation pure.
 2014-04-05 16:42:30 -04:00
William A. Kennington III 47f0f34fca nmap: Build the non-graphical version by default 2014-04-05 14:58:49 -05:00
Shea Levy 12c1321fa4 Merge branch 'master' of git://github.com/urv/nixpkgs 
calibre: upgrade from 1.25.0 to 1.31.0
 2014-04-05 15:56:55 -04:00
Shea Levy 9d544e633a mailutils is broken. 
#887
 2014-04-05 15:55:16 -04:00
Shea Levy 50a0b55a01 Merge branch 'oraclejdk' of git://github.com/nilcons/nixpkgs 
Update ffmpeg dependency to 0.10 in oraclejdk7
 2014-04-05 15:23:02 -04:00
Shea Levy bd1a95ee60 Remove superfluous newline 2014-04-05 15:01:05 -04:00
Shea Levy 0fda39ee3e Merge branch 'mtpfs' of git://github.com/qknight/nixpkgs 
added mtpfs to mount MTP devices via usb using FUSE
 2014-04-05 15:00:38 -04:00
Sander van der Burg dc614aff92 libresample: Add package 2014-04-05 20:54:47 +02:00
Shea Levy 63d91b75a1 Revert "Merge branch 'k3b' of git://github.com/ttuegel/nixpkgs" 
It turns out this doesn't work due to setuid issues. I had been under
the impression that it was partially broken, but it is in fact totally
broken.

This reverts commit 718466074f, reversing
changes made to ea9c8d6a13.
 2014-04-05 14:43:00 -04:00
Shea Levy 718466074f Merge branch 'k3b' of git://github.com/ttuegel/nixpkgs 
Wrap k3b with PATH to required tools
 2014-04-05 14:38:06 -04:00
Shea Levy ea9c8d6a13 Merge branch 'rippled' of git://github.com/ehmry/nixpkgs 
rippled: initial pkg and module expressions

Had to change the rippled uid.

Conflicts:
	nixos/modules/misc/ids.nix
 2014-04-05 14:23:29 -04:00
Jaka Hudoklin 413ebfb246 virt-manager: update to 1.0.1, fix & update dependencies, gtk3 support 
- Vte, add gtk3 support, enable introspection, update to 0.35.90
- Spice-gtk, add gtk3 support
- gtk-vnc, add gtk3 support
- Add libvirt-glib (thanks @bjornfor)
- Add usbredir
- qemu, enable usbredir
- spice-gtk, enable usbredir
- virt-manager, update to 1.0.1

[Bjørn:
* Set namePrefix = "" to preserve package name "virt-manager"
  (instead of "python2.7-virt-manager")
* Add dconf to GIO_EXTRA_MODULES to get persistent settings in
  virt-manager. Without it:
  GLib-GIO-Message: Using the 'memory' GSettings backend. Your settings will not be saved or shared with other applications.
* Add ${gtk3}/share to XDG_DATA_DIRS to unbreak "Take Screenshot"
  feature (fixes "Settings schema 'org.gtk.Settings.FileChooser' is not installed")
* gtk-vnc: don't pull "pkgs" attrset for optionalString, use stdenv.lib.optionalString instead.
]
 2014-04-05 18:37:05 +02:00
Vladimír Čunát 85b1ede2bf glib gschemas hook: fixup #1901 
- move frome $out to $out/share
- fix quoting that prevented globbing
- indent by spaces (as it is more common in nixpkgs; 4 spaces for shell)

More work is still needed for some individual packages.
 2014-04-05 13:01:51 +02:00
Alexander Kjeldaas 4aeb10b09a Make cpufrequtils compilation pure. 2014-04-05 09:08:05 +02:00
Alexander Kjeldaas f67015cae4 Make initrd and the kernel builds repeatable. 2014-04-05 08:41:06 +02:00
Alexander Kjeldaas c69eb7c2c1 Remove timestamp from the kernel. 2014-04-05 08:40:55 +02:00
Domen Kožar 13bef7f403 Merge pull request #2127 from lethalman/gnome3 
Gnome3 session changes, gnome-control-center icons
 2014-04-05 00:35:06 +02:00
Luca Bruno 750d5e4a83 gnome-control-center: show icons 2014-04-05 00:32:19 +02:00
Peter Simons 6df2b09015 haskell-ghc-mod: revert update to version 4.x 
flymake-mode no longer works in the new version. This needs further
testing before we can upgrade.
 2014-04-05 00:21:12 +02:00
Peter Simons 7b7d06f91e Merge pull request #2123 from jagajaga/haskell_add_pkgs 
Haskell add pkgs
 2014-04-04 23:52:13 +02:00
Vladimír Čunát 10147beecf Merge branch vcunat@NixOS:p/stdenv (close #1840) 
This branch contains a collection of stdenv-changing updates.
There's glibc 2.18 -> .19 bump and many non-intrusive PRs.

The grsecurity branch #1187 got removed at Eelco's request,
see https://github.com/NixOS/nixpkgs/issues/1840#issuecomment-39327023
 2014-04-04 21:33:55 +02:00
Vladimír Čunát 4ab58240a9 pidgin: adopt the orphan, as I use it daily 
CC #992.
 2014-04-04 20:29:49 +02:00