Vladimír Čunát 09f5763784 Merge branch 'master' into staging-next ... Conflicts: - pkgs/development/python-modules/pathspec/default.nix The hashes are equivalent, so it's not a real conflict. - pkgs/top-level/static.nix I can't see a solution, deffered redoing this to the later PR: https://github.com/NixOS/nixpkgs/pull/136849		2021-09-07 08:43:26 +02:00
..
agda-packages.nix
aliases.nix	Merge master into staging-next	2021-09-07 00:01:32 +00:00
all-packages.nix	Merge branch 'master' into staging-next	2021-09-07 08:43:26 +02:00
beam-packages.nix	beamPackages: Deduplicate default package set	2021-08-23 16:06:41 +02:00
config.nix
coq-packages.nix	coqPackages.serapi: init at multiple versions	2021-08-17 16:45:04 +02:00
darwin-packages.nix
default.nix
dhall-packages.nix
dotnet-packages.nix
emacs-packages.nix
emscripten-packages.nix	emscriptenPackages.json_c: fix build	2021-08-21 10:10:08 +02:00
gnuradio-packages.nix
haskell-packages.nix	ghc: 8.10.5-binary -> 8.10.7-binary	2021-08-29 15:29:27 +02:00
haxe-packages.nix
impure.nix
java-packages.nix
kodi-packages.nix
linux-kernels.nix	Merge remote-tracking branch 'nixpkgs/master' into staging-next	2021-09-01 07:47:01 +00:00
lua-packages.nix	update-luarocks-packages: support in-repo rockspecs	2021-08-29 19:39:42 +02:00
make-tarball.nix
metrics.nix
nixpkgs-basic-release-checks.nix	nixpkgs-basic-release-checks: Check without aliases	2021-08-15 17:52:55 +02:00
ocaml-packages.nix	ocamlPackages.pp: init at 1.1.2	2021-08-27 13:38:37 +02:00
octave-packages.nix
packages-config.nix
perl-packages.nix	Merge pull request #136907 from heph2/perl/CursesUIGrid	2021-09-06 19:41:44 +02:00
php-packages.nix
pure-packages.nix
python-aliases.nix	python39Packages.backports-entry-points-selectable: init at 1.1.0	2021-09-05 14:59:02 +02:00
python-packages.nix	Merge branch 'master' into staging-next	2021-09-07 08:43:26 +02:00
python2-packages.nix	python2Packages.decorator: reinit at 4.4.2	2021-09-05 15:00:35 +02:00
qt5-packages.nix
release-alternatives.nix
release-cross.nix
release-haskell.nix	ghc: 8.10.6 -> 8.10.7	2021-08-27 00:42:51 +02:00
release-lib.nix
release-python.nix
release-small.nix
release.nix
ruby-packages.nix	rubyPackages: update	2021-08-22 12:26:44 -05:00
splice.nix
stage.nix	Merge remote-tracking branch 'nixpkgs/master' into staging-next	2021-09-01 07:47:01 +00:00
unixtools.nix
wine-packages.nix