Martin Weinelt 9b79a05ae1 Merge remote-tracking branch 'origin/master' into staging-next ... Conflicts: - pkgs/development/python-modules/flexcache/default.nix - pkgs/development/python-modules/flexparser/default.nix - pkgs/development/python-modules/odp-amsterdam/default.nix - pkgs/development/python-modules/pint/default.nix - pkgs/development/python-modules/uncertainties/default.nix - pkgs/top-level/python-packages.nix		2024-07-01 01:07:21 +02:00
..
ada-modules
androidndk-pkgs
beam-modules
bower-modules/generic
chez-modules
compilers	Merge remote-tracking branch 'origin/master' into staging-next	2024-07-01 01:07:21 +02:00
coq-modules
cuda-modules
dhall-modules
em-modules/generic
embedded
gnuradio-modules
guile-modules
hare-third-party
haskell-modules
idris-modules
interpreters	Merge remote-tracking branch 'origin/master' into staging-next	2024-07-01 01:07:21 +02:00
java-modules
julia-modules
libraries	Merge remote-tracking branch 'origin/master' into staging-next	2024-07-01 01:07:21 +02:00
lisp-modules
lua-modules	Merge remote-tracking branch 'origin/master' into staging-next	2024-07-01 01:07:21 +02:00
misc
mobile
node-packages	fixjson: move out of node-packages	2024-06-30 16:23:19 -04:00
ocaml-modules	Merge remote-tracking branch 'origin/master' into staging-next	2024-07-01 01:07:21 +02:00
octave-modules
perl-modules
php-packages
python2-modules
python-modules	Merge remote-tracking branch 'origin/master' into staging-next	2024-07-01 01:07:21 +02:00
r-modules
rocm-modules
ruby-modules
scheme-modules/scheme-bytestructures
skaware-packages
tools	Merge remote-tracking branch 'origin/master' into staging-next	2024-07-01 01:07:21 +02:00
web	Merge remote-tracking branch 'origin/master' into staging-next	2024-07-01 01:07:21 +02:00