Tuomas Tynkkynen aba0b45b86 Merge remote-tracking branch 'upstream/master' into staging ... Conflicts: pkgs/development/libraries/qt-5/5.7/qtbase/default.nix		2017-03-14 00:49:22 +02:00
..
aliases.nix	libjson-rpc-cpp: 0.6.0 -> 0.7.0, fix build	2017-02-28 17:15:04 +01:00
all-packages.nix	Merge remote-tracking branch 'upstream/master' into staging	2017-03-14 00:49:22 +02:00
default.nix
dotnet-packages.nix
emacs-packages.nix
emscripten-packages.nix
haskell-packages.nix	Init HaLVM at 2.4.0	2017-03-10 19:31:12 -06:00
impure.nix	Allow directories with a default.nix to be imported as an overlay. Closes #23016.	2017-02-25 02:32:04 +01:00
java-packages.nix
lua-packages.nix	luaPackages.mpack: enable darwin platform	2017-03-10 11:58:42 +00:00
make-tarball.nix
metrics.nix
node-packages-generated.nix
node-packages.json
node-packages.nix
ocaml-packages.nix	ocamlPackages.cpuid: init at 0.1.0	2017-03-13 20:58:51 +00:00
perl-packages.nix	perl-Log-Log4perl: 1.48 -> 1.49	2017-03-01 20:12:24 +01:00
php-packages.nix	phpPackages.redis22: not supported with php >= 7	2017-02-28 18:35:40 +01:00
platforms.nix	platforms.nix: Remove unnecessary kernelExtraConfig for ARMv7	2017-02-20 15:22:14 +02:00
pure-packages.nix
python-packages.nix	Merge pull request #23801 from zimbatm/pip-tools	2017-03-13 22:32:07 +01:00
release-cross.nix
release-lib.nix	nixpkgs: add aarch64-linux to release-lib	2017-03-08 17:13:34 +01:00
release-python.nix
release-small.nix
release.nix	release.nix: Fix another typo	2017-03-09 03:38:04 +02:00
rust-packages.nix	rustPackages: update to latest	2017-02-19 00:50:05 +02:00
splice.nix
stage.nix