Vladimír Čunát e740b565cf Merge master into stdenv-updates ... Conflicts (easy): pkgs/development/compilers/llvm/default.nix pkgs/development/compilers/openjdk/default.nix pkgs/development/libraries/icu/default.nix pkgs/development/libraries/libssh/default.nix pkgs/development/libraries/libxslt/default.nix pkgs/development/tools/parsing/bison/3.x.nix		2013-12-29 10:01:22 +01:00
..
all-packages.nix	Merge master into stdenv-updates	2013-12-29 10:01:22 +01:00
guile-2-test.nix
haskell-defaults.nix	haskell-quickcheck-io: override versions of HUnit and QuickCheck on older versions of Haskell Platform	2013-12-15 22:37:42 +01:00
haskell-packages.nix	Merge pull request #1401 from monocell/haskore	2013-12-23 09:13:05 -08:00
make-tarball.nix	Tarball: Match the NixOS version	2013-10-11 13:36:09 +02:00
mingw.nix
node-packages-generated.nix	Update node packages to npm2nix-5.4.2 to fix tarball	2013-12-26 06:43:21 -05:00
node-packages.json	add node rethinkdb driver	2013-12-23 11:29:16 +01:00
node-packages.nix	add node-protobuf + binary dep	2013-12-23 11:29:16 +01:00
perl-packages.nix	Merge remote-tracking branch 'origin/glibc-2.18'	2013-12-26 14:49:19 +01:00
platforms.nix
python-packages-generated.nix	Update python packages	2013-10-13 15:19:46 +02:00
python-packages.json	Revert "pythonPackage.psycopg2: fix"	2013-10-11 10:44:18 +02:00
python-packages.nix	Add targetcli-fb as well as necessary dependencies	2013-12-26 10:58:15 +01:00
r-packages.nix	Wrapped R's package system similarly to perlPackages	2013-09-28 13:19:43 +02:00
release-cross.nix
release-lib.nix	Only show/build a package on the platforms listed in meta.platforms	2013-11-05 00:06:10 +01:00
release-python.nix	Merge master into stdenv-updates	2013-12-29 10:01:22 +01:00
release-small.nix	Remove broken and obsolete versions of gcj and ghdl	2013-11-04 21:11:00 +01:00
release.nix	Merge remote-tracking branch 'origin/master' into stdenv-updates.	2013-12-10 00:25:54 +01:00