obadz 3de6e5be50 Merge branch 'master' into staging ... Conflicts: pkgs/applications/misc/navit/default.nix pkgs/applications/networking/mailreaders/alpine/default.nix pkgs/applications/networking/mailreaders/realpine/default.nix pkgs/development/compilers/ghc/head.nix pkgs/development/libraries/openssl/default.nix pkgs/games/liquidwar/default.nix pkgs/games/spring/springlobby.nix pkgs/os-specific/linux/kernel/perf.nix pkgs/servers/sip/freeswitch/default.nix pkgs/tools/archivers/cromfs/default.nix pkgs/tools/graphics/plotutils/default.nix		2016-08-27 23:54:54 +01:00
..
aliases.nix	foomatic-filters: align attrname with pkgname	2016-08-26 08:45:16 +02:00
all-packages.nix	Merge branch 'master' into staging	2016-08-27 23:54:54 +01:00
default.nix
dotnet-packages.nix	dotnetPackages.GitVersionTree: init at 2013-10-01	2016-08-19 18:28:03 +01:00
emacs-packages.nix	Revert "Merge pull request #17806 from matthewbauer/emacs-wrapper"	2016-08-19 15:09:41 -05:00
emscripten-packages.nix
guile-2-test.nix	Revert "lsh: remove last references"	2016-08-23 15:31:33 +00:00
haskell-packages.nix	haskell.compiler.ghcHEAD: update to latest upstream (20160826).	2016-08-26 21:15:04 +02:00
impure.nix
lua-packages.nix
make-tarball.nix
metrics.nix
node-packages-generated.nix
node-packages.json
node-packages.nix
perl-packages.nix	perl-Data-Validate-Domain: 0.12 -> 0.14	2016-08-26 19:32:16 +02:00
php-packages.nix	treewide: Make explicit that 'dev' output of imagemagick is used	2016-08-23 03:52:06 +03:00
platforms.nix
pure-packages.nix
python-packages.nix	Merge pull request #17906 from garbas/neovim-0.1.5-update	2016-08-27 17:44:34 +02:00
release-cross.nix
release-lib.nix
release-python.nix
release-small.nix	Revert "lsh: remove last references"	2016-08-23 15:31:33 +00:00
release.nix
rust-packages.nix	rust registry: 2016-08-10 -> 2016-08-23	2016-08-23 21:25:27 +02:00
stdenv.nix