Jonathan Ringer f7500b6f57 python3Packages.hydra: fix bad merge conflict resolution		2022-01-07 11:21:35 -08:00
..
androidndk-pkgs
beam-modules
bower-modules/generic
chez-modules
compilers	Merge remote-tracking branch 'origin/master' into staging-next	2022-01-07 10:31:29 -08:00
coq-modules	coqPackages.CoLoR: update homepage	2022-01-07 16:45:54 +07:00
dhall-modules
dotnet-modules
em-modules/generic
embedded
gnuradio-modules
go-modules	buildGoModule: use proxyVendor instead of runVend	2022-01-06 14:00:58 +10:00
go-packages
guile-modules
haskell-modules
idris-modules
interpreters	Merge master into staging-next	2022-01-06 00:02:03 +00:00
java-modules
libraries	Merge remote-tracking branch 'origin/master' into staging-next	2022-01-07 10:31:29 -08:00
lisp-modules
lua-modules
misc	treewide: replace http://github.com with https://github.com	2022-01-07 09:58:36 +07:00
mobile
nim-packages	nimPackages.pixie: 1.1.3 -> 3.1.2	2022-01-07 12:44:22 +01:00
node-packages
ocaml-modules	ocamlPackages.ca-certs-nss: 3.71.0.1 -> 3.74	2022-01-07 18:40:52 +01:00
octave-modules
perl-modules
pharo
php-packages
pure-modules
python-modules	python3Packages.hydra: fix bad merge conflict resolution	2022-01-07 11:21:35 -08:00
quickemu
r-modules
ruby-modules
scheme-modules/scheme-bytestructures
tools	Merge remote-tracking branch 'origin/master' into staging-next	2022-01-07 10:31:29 -08:00
web	Merge master into staging-next	2022-01-07 06:01:27 +00:00