Vladimír Čunát 0a58b512cb Merge master into stdenv-updates ... Conflicts (simple): pkgs/development/compilers/gcc/4.8/default.nix pkgs/development/compilers/llvm/default.nix pkgs/development/libraries/gmp/5.1.1.nix pkgs/development/libraries/gmp/5.1.3.nix pkgs/development/libraries/gmp/5.1.x.nix pkgs/top-level/all-packages.nix		2014-01-18 14:46:20 +01:00
..
all-packages.nix	Merge master into stdenv-updates	2014-01-18 14:46:20 +01:00
guile-2-test.nix
haskell-defaults.nix	haskell-terminfo: update to version 0.4.0.0	2014-01-15 16:38:18 +01:00
haskell-packages.nix	Add http-common haskell package.	2014-01-16 10:08:40 -05:00
make-tarball.nix
mingw.nix
node-packages-generated.nix	Added titanium nodejs package	2014-01-13 13:24:39 +01:00
node-packages.json	Added titanium nodejs package	2014-01-13 13:24:39 +01:00
node-packages.nix	add node-protobuf + binary dep	2013-12-23 11:29:16 +01:00
perl-packages.nix	Remove "v" prefix from package versions to make them machine-readable	2014-01-10 10:16:41 +02:00
platforms.nix	platforms.nix: Separate 32-bit and 64-bit PCs	2013-12-31 21:34:44 -05:00
python-packages-generated.nix
python-packages.json
python-packages.nix	virt-manager: Fix error: 'ImportError: No module named libvirt'	2014-01-11 22:01:52 +01:00
r-packages.nix	Remove uses of __overrides feature	2013-12-30 11:04:45 -05:00
release-cross.nix	platforms.nix: Separate 32-bit and 64-bit PCs	2013-12-31 21:34:44 -05:00
release-lib.nix
release-python.nix	Merge master into stdenv-updates	2014-01-18 14:46:20 +01:00
release-small.nix
release.nix	Merge master into stdenv-updates	2014-01-04 18:34:53 +01:00