Vladimír Čunát 26af997d41 Merge branch 'master' into stdenv-updates ... Conflicts (simple): pkgs/applications/networking/browsers/chromium/default.nix pkgs/development/libraries/libsoup/default.nix pkgs/os-specific/linux/kernel/manual-config.nix pkgs/os-specific/linux/qemu-kvm/default.nix		2013-03-02 10:41:53 +01:00
..
all-packages.nix	Merge branch 'master' into stdenv-updates	2013-03-02 10:41:53 +01:00
guile-2-test.nix	guile-2-test: Update to 2.0.	2011-02-22 13:39:56 +00:00
haskell-defaults.nix	haskell-defaults.nix: fix build of cabal2nix on GHC versions older than 6.12.x	2013-02-25 01:25:05 +01:00
haskell-packages.nix	haskell-zlib: add version 0.5.4.1	2013-03-01 10:41:43 +01:00
make-tarball.nix	Nixpkgs channel: Use XZ compression for nixexprs.tar	2013-01-30 12:52:07 +01:00
mingw.nix
node-packages.nix	upgrading uglify to 2.2.5, optimist to 0.3.5, upgrading source-map to 0.1.7, and adding amdefine	2013-02-26 09:45:43 -05:00
perl-packages.nix	Catalyst::Plugin::Captcha: Add	2013-02-27 14:35:56 +01:00
platforms.nix	Raspberrypi platform: make ext4 in kernel	2013-01-29 20:17:36 +01:00
python-packages.nix	Merge branch 'master' into stdenv-updates	2013-03-02 10:41:53 +01:00
release-cross.nix	Merge remote-tracking branch 'origin/master' into stdenv-updates	2013-02-15 13:36:34 +01:00
release-lib.nix	Merge remote-tracking branch 'upstream/master' into stdenv-updates	2013-01-20 16:53:21 +01:00
release-python.nix	Merge remote-tracking branch 'origin/master' into stdenv-updates	2013-02-15 13:36:34 +01:00
release-small.nix	pwdutils: Remove	2013-01-28 17:58:43 +01:00
release.nix	Merge remote-tracking branch 'origin/master' into stdenv-updates.	2013-02-24 19:27:08 +01:00