Vladimír Čunát dbae4f109f Merge branch 'master' into staging ...

Conflicts (relatively simple):
	pkgs/applications/audio/spotify/default.nix
	pkgs/build-support/cc-wrapper/default.nix
	pkgs/development/compilers/cryptol/1.8.x.nix

2015-01-31 19:34:57 +01:00

..

all-packages.nix

Merge branch 'master' into staging

2015-01-31 19:34:57 +01:00

guile-2-test.nix

…

haskell-defaults.nix

haskell-defaults.nix: "xhtml" is a core library in GHC 7.8.x

2015-01-28 12:43:46 +01:00

haskell-ng.nix

Add a package set for GHC 7.10.1-rc1 and bump GHC HEAD to 7.11.x.

2015-01-19 13:55:31 +01:00

haskell-packages.nix

Merge pull request #5686 from dbeecham/master

2015-01-26 08:29:13 +01:00

lua-packages.nix

Some lua and awesome improvements

2014-12-17 15:08:21 +01:00

make-tarball.nix

Nixpkgs manual: Add a Nix expression to build

2014-08-24 11:03:55 +02:00

node-packages-generated.nix

nodePackages: fix evaluation by fixing npm2nix

2015-01-25 01:42:50 +01:00

node-packages.json

nodePackages: fix evaluation by fixing npm2nix

2015-01-25 01:42:50 +01:00

node-packages.nix

nodePackages.bip-pod: fix package

2015-01-26 02:09:04 +01:00

perl-packages.nix

perl-packages: update Gtk2 1.2494 -> 1.2495

2015-01-29 13:49:04 +01:00

php-packages.nix

php: add geoip-1.1.0 module

2015-01-09 13:55:08 +00:00

platforms.nix

…

python-packages-generated.nix

Turn more licenses into lib.licenses style

2014-11-06 00:48:16 +00:00

python-packages.json

python-html2text: add package

2015-01-26 10:36:30 +00:00

python-packages.nix

Merge pull request #6059 from joelmo/python-graph-tool

2015-01-30 13:33:49 +01:00

release-cross.nix

…

release-lib.nix

Tweak

2015-01-06 11:55:47 +01:00

release-python.nix

Adds a new package: cherrytree - A hierarchical note taking application

2015-01-31 02:17:00 +01:00

release-small.nix

nfs-utils: align attrname with pkgname

2014-12-06 17:01:05 +01:00

release.nix

pkgs/top-level/release.nix: build all versions of GHC on their supported platforms

2015-01-16 23:23:23 +01:00