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
..
androidndk-pkgs
beam-modules
bower-modules/generic
chez-modules
compilers	Merge branch 'master' into staging-next	2021-09-07 08:21:02 +02:00
coq-modules
dhall-modules
dotnet-modules
em-modules/generic
embedded
gnuradio-modules
go-modules
go-packages
guile-modules
haskell-modules	haskellPackages: mark builds failing on hydra as broken	2021-09-07 09:11:50 +09:00
idris-modules
interpreters	Merge master into staging-next	2021-09-06 18:00:57 +00:00
java-modules
libraries	Merge branch 'master' into staging-next	2021-09-07 08:43:26 +02:00
lisp-modules
lua-modules
misc
mobile
node-packages	Merge branch 'master' into staging-next	2021-09-07 08:43:26 +02:00
ocaml-modules	Merge master into staging-next	2021-09-06 18:00:57 +00:00
octave-modules
perl-modules
pharo
php-packages
pure-modules
python-modules	Merge branch 'master' into staging-next	2021-09-07 08:43:26 +02:00
r-modules	rPackages.ssh: include missing libssh buildInput	2021-09-07 11:32:15 +10:00
ruby-modules
scheme-modules/scheme-bytestructures
tools	Merge branch 'master' into staging-next	2021-09-07 08:43:26 +02:00
web	Merge pull request #135148 from r-ryantm/auto-update/flyctl	2021-09-07 02:52:52 +01:00