1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-19 04:02:10 +00:00
nixpkgs/pkgs
Alyssa Ross 926765c5e3
Merge remote-tracking branch 'nixpkgs/staging-next' into staging
Conflicts:
	pkgs/servers/http/apache-httpd/2.4.nix
2021-06-11 02:05:00 +00:00
..
applications Merge remote-tracking branch 'nixpkgs/staging-next' into staging 2021-06-11 02:05:00 +00:00
build-support Merge remote-tracking branch 'nixpkgs/staging-next' into staging 2021-06-11 02:05:00 +00:00
common-updater
data Merge remote-tracking branch 'nixpkgs/staging-next' into staging 2021-06-11 02:05:00 +00:00
desktops gnomeExtensions.night-theme-switcher: 40 -> 50 (#125725) 2021-06-10 18:42:08 +02:00
development Merge remote-tracking branch 'nixpkgs/staging-next' into staging 2021-06-11 02:05:00 +00:00
games Merge remote-tracking branch 'nixpkgs/staging-next' into staging 2021-06-11 02:05:00 +00:00
misc proton-caller: 2.2.3 -> 2.3.0 (#126501) 2021-06-10 21:13:24 +02:00
os-specific Merge remote-tracking branch 'nixpkgs/staging-next' into staging 2021-06-11 02:05:00 +00:00
pkgs-lib
servers Merge remote-tracking branch 'nixpkgs/staging-next' into staging 2021-06-11 02:05:00 +00:00
shells Merge pull request #126376 from michaeladler/update-zsh-fast-syntax-highlighting 2021-06-10 20:36:20 +02:00
stdenv
test Merge staging-next into staging 2021-06-10 00:06:44 +00:00
tools Merge remote-tracking branch 'nixpkgs/staging-next' into staging 2021-06-11 02:05:00 +00:00
top-level Merge remote-tracking branch 'nixpkgs/staging-next' into staging 2021-06-11 02:05:00 +00:00