nixpkgs/pkgs
Martin Weinelt 231c1145f2
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
- pkgs/development/python-modules/rflink/default.nix
2023-03-14 22:33:40 +01:00
..
applications Merge remote-tracking branch 'origin/master' into staging-next 2023-03-14 22:33:40 +01:00
build-support Merge remote-tracking branch 'origin/master' into staging-next 2023-03-14 22:33:40 +01:00
common-updater
data Merge remote-tracking branch 'origin/master' into staging-next 2023-03-14 08:14:26 +01:00
desktops Merge remote-tracking branch 'origin/master' into staging-next 2023-03-14 22:33:40 +01:00
development Merge remote-tracking branch 'origin/master' into staging-next 2023-03-14 22:33:40 +01:00
games Merge master into staging-next 2023-03-14 12:01:32 +00:00
misc Merge remote-tracking branch 'origin/master' into staging-next 2023-03-14 08:14:26 +01:00
os-specific Merge remote-tracking branch 'origin/master' into staging-next 2023-03-14 22:33:40 +01:00
pkgs-lib
servers Merge remote-tracking branch 'origin/master' into staging-next 2023-03-14 22:33:40 +01:00
shells Merge remote-tracking branch 'origin/master' into staging-next 2023-03-14 08:14:26 +01:00
stdenv
test Merge remote-tracking branch 'origin/master' into staging-next 2023-03-14 08:14:26 +01:00
tools Merge remote-tracking branch 'origin/master' into staging-next 2023-03-14 22:33:40 +01:00
top-level Merge remote-tracking branch 'origin/master' into staging-next 2023-03-14 22:33:40 +01:00