nixpkgs/pkgs/top-level
Vladimír Čunát 985d1ac425
Merge branch 'master' into staging-next
There were several more conflicts from name -> pname+version;
all auto-solved by kdiff3, hopefully OK.

Hydra nixpkgs: ?compare=1538611
2019-08-25 14:57:11 +02:00
..
aliases.nix Merge pull request #67214 from stefano-m/master 2019-08-23 16:43:52 -04:00
all-packages.nix Merge branch 'master' into staging-next 2019-08-25 14:57:11 +02:00
beam-packages.nix erlang: pin to openssl 1.0.2 for < R20 2019-08-21 23:21:55 +02:00
config.nix
coq-packages.nix coq: make version 8.9 the default one 2019-08-21 12:07:38 +00:00
darwin-packages.nix darwin-frameworks: replace cf-private and move it's setup-hook 2019-07-03 22:20:09 +02:00
default.nix
dotnet-packages.nix
emacs-packages.nix emacs-packages: Make org packages overrideable 2019-08-18 11:10:06 +01:00
emscripten-packages.nix
haskell-packages.nix
haxe-packages.nix
impure.nix
java-packages.nix
lua-packages.nix treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
make-tarball.nix make-tarball / lib-tests: reduce duplication 2019-07-11 18:02:05 +02:00
metrics.nix
ocaml-packages.nix ocamlPackages.uri-sexp: init at 3.0.0 2019-08-21 21:12:37 +00:00
perl-packages.nix Merge branch 'master' into staging-next 2019-08-24 08:55:37 +02:00
php-packages.nix phpPackages.phpstan: 0.11.12 -> 0.11.15 2019-08-23 14:50:00 +02:00
pure-packages.nix
python-packages.nix Merge branch 'master' into staging-next 2019-08-25 14:57:11 +02:00
release-cross.nix
release-lib.nix
release-python.nix
release-small.nix
release.nix
splice.nix
stage.nix
static.nix Merge pull request #65537 from Holo-Host/201907/extend-static 2019-08-13 12:47:03 -04:00
unix-tools.nix
wine-packages.nix