Kim Lindberger 0039b0b5a8 Merge pull request #144564 from jtojnar/php-overridable ... php: Implement overrideAttrs that composes with buildEnv/withExtensions		2021-11-15 18:12:44 +01:00
..
applications	Merge pull request #146162 from Kha/elan-wrap-lld	2021-11-15 18:07:14 +01:00
build-support	Merge master into staging-next	2021-11-13 18:01:11 +00:00
common-updater
data	tela-icon-theme: remove darwin from platforms (#145997)	2021-11-14 16:29:49 -05:00
desktops	Merge pull request #144960 from newAM/dash-to-panel	2021-11-14 13:13:55 +01:00
development	Merge pull request #144564 from jtojnar/php-overridable	2021-11-15 18:12:44 +01:00
games	Merge remote-tracking branch 'origin/master' into staging-next	2021-11-14 16:26:44 +01:00
misc	Merge master into staging-next	2021-11-14 18:01:14 +00:00
os-specific	Merge pull request #146114 from fabaff/bump-cpuid	2021-11-15 09:08:36 -03:00
pkgs-lib
servers	Merge pull request #145823 from prusnak/rocksdb_6_23	2021-11-15 15:41:45 +01:00
shells	nix-zsh-completions: Lower priority to avoid collisions with nix	2021-11-14 22:06:45 +01:00
stdenv
test	Merge pull request #144564 from jtojnar/php-overridable	2021-11-15 18:12:44 +01:00
tools	Merge pull request #144511 from arbourd/cloud-sql-proxy	2021-11-15 11:50:32 -05:00
top-level	Merge pull request #141090 from fabaff/bump-libwebsockets	2021-11-15 17:43:44 +01:00