nixpkgs/pkgs
Vladimír Čunát d2eb7a7887
Merge branch 'staging' into staging-next
A few conflicts but relatively clear ones (I think).
2021-04-14 10:08:25 +02:00
..
applications Merge branch 'staging' into staging-next 2021-04-14 10:08:25 +02:00
build-support Merge remote-tracking branch 'upstream/staging-next' into down-integrate-staging 2021-04-12 18:49:01 +00:00
common-updater
data Merge remote-tracking branch 'upstream/staging-next' into down-integrate-staging 2021-04-12 18:49:01 +00:00
desktops Merge branch 'staging' into staging-next 2021-04-14 10:08:25 +02:00
development Merge branch 'staging' into staging-next 2021-04-14 10:08:25 +02:00
games Merge pull request #109146 from iblech/patch-sdlpop 2021-04-13 08:15:27 -03:00
misc Merge branch 'staging' into staging-next 2021-04-14 10:08:25 +02:00
os-specific Merge branch 'staging' into staging-next 2021-04-14 10:08:25 +02:00
pkgs-lib
servers Merge branch 'staging' into staging-next 2021-04-14 10:08:25 +02:00
shells oh-my-zsh: 2021-04-07 → 2021-04-11 2021-04-12 18:03:50 +00:00
stdenv Merge branch 'staging' into staging-next 2021-04-14 10:08:25 +02:00
test
tools Merge branch 'staging' into staging-next 2021-04-14 10:08:25 +02:00
top-level Merge branch 'staging' into staging-next 2021-04-14 10:08:25 +02:00