3
0
Fork 0
forked from mirrors/nixpkgs
nixpkgs/pkgs
sternenseemann 1a1e32f023 Merge remote-tracking branch 'origin/master' into staging-next
Conflicts were caused by 2043dbb6fa
interacting with b2767b69dd.
2021-11-13 12:35:55 +01:00
..
applications Merge remote-tracking branch 'origin/master' into staging-next 2021-11-13 12:35:55 +01:00
build-support Merge remote-tracking branch 'origin/master' into staging-next 2021-11-13 12:35:55 +01:00
common-updater
data flat-remix-gnome: 20211028 -> 20211113 2021-11-13 18:50:47 +08:00
desktops
development Merge remote-tracking branch 'origin/master' into staging-next 2021-11-13 12:35:55 +01:00
games Merge master into staging-next 2021-11-12 18:01:08 +00:00
misc Merge remote-tracking branch 'origin/master' into staging-next 2021-11-13 12:35:55 +01:00
os-specific Merge remote-tracking branch 'origin/master' into staging-next 2021-11-13 12:35:55 +01:00
pkgs-lib
servers Merge remote-tracking branch 'origin/master' into staging-next 2021-11-13 12:35:55 +01:00
shells
stdenv
test
tools Merge remote-tracking branch 'origin/master' into staging-next 2021-11-13 12:35:55 +01:00
top-level Merge remote-tracking branch 'origin/master' into staging-next 2021-11-13 12:35:55 +01:00