nixpkgs/pkgs
Martin Weinelt 5abe72f0b2 Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
- pkgs/development/python-modules/mdutils/default.nix
2023-03-12 15:59:15 +01:00
..
applications Merge remote-tracking branch 'origin/master' into staging-next 2023-03-12 15:59:15 +01:00
build-support Merge branch 'master' into staging-next 2023-03-12 09:06:28 +01:00
common-updater
data Merge master into staging-next 2023-03-12 12:01:31 +00:00
desktops Merge master into staging-next 2023-03-12 12:01:31 +00:00
development Merge remote-tracking branch 'origin/master' into staging-next 2023-03-12 15:59:15 +01:00
games Merge branch 'master' into staging-next 2023-03-12 09:06:28 +01:00
misc Merge master into staging-next 2023-03-11 12:01:11 +00:00
os-specific Merge remote-tracking branch 'origin/master' into staging-next 2023-03-12 15:59:15 +01:00
pkgs-lib
servers Merge remote-tracking branch 'origin/master' into staging-next 2023-03-12 15:59:15 +01:00
shells Merge branch 'master' into staging-next 2023-03-12 09:06:28 +01:00
stdenv
test Merge branch 'master' into staging-next 2023-03-12 09:06:28 +01:00
tools Merge remote-tracking branch 'origin/master' into staging-next 2023-03-12 15:59:15 +01:00
top-level Merge remote-tracking branch 'origin/master' into staging-next 2023-03-12 15:59:15 +01:00