Merge master into staging-next

68 files changed, 479 insertions, 266 deletions

diff --git a/doc/languages-frameworks/php.section.md b/doc/languages-frameworks/php.section.md
index 763beeb59358..5977363323f1 100644
--- a/doc/languages-frameworks/php.section.md
+++ b/doc/languages-frameworks/php.section.md
@@ -135,3 +135,21 @@ Example of building `composer` with additional extensions:
   enabled ++ (with all; [ imagick redis ]))
 ).packages.composer
 ```
+
+### Overriding PHP packages {#ssec-php-user-guide-overriding-packages}
+
+`php-packages.nix` form a scope, allowing us to override the packages defined within. For example, to apply a patch to a `mysqlnd` extension, you can simply pass an overlay-style function to `php`’s `packageOverrides` argument:
+
+```nix
+php.override {
+  packageOverrides = final: prev: {
+    extensions = prev.extensions // {
+      mysqlnd = prev.extensions.mysqlnd.overrideAttrs (attrs: {
+        patches = attrs.patches or [] ++ [
+          …
+        ];
+      });
+    };
+  };
+}
+```
diff --git a/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix b/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix
index bef6cd2fb5a2..a5bc436be826 100644
--- a/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix
+++ b/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix
@@ -33,7 +33,7 @@
         kernel=u-boot-rpi3.bin
 
         # Boot in 64-bit mode.
-        arm_control=0x200
+        arm_64bit=1
 
         # U-Boot used to need this to work, regardless of whether UART is actually used or not.
         # TODO: check when/if this can be removed.
diff --git a/nixos/modules/services/x11/display-managers/sddm.nix b/nixos/modules/services/x11/display-managers/sddm.nix
index a39bb55b38c4..23b4d8ffb137 100644
--- a/nixos/modules/services/x11/display-managers/sddm.nix
+++ b/nixos/modules/services/x11/display-managers/sddm.nix
@@ -9,12 +9,7 @@ let
   cfg = dmcfg.sddm;
   xEnv = config.systemd.services.display-manager.environment;
 
-  sddm = if config.services.xserver.desktopManager.lxqt.enable then
-    # TODO: Move lxqt to libsForQt515
-    pkgs.libsForQt514.sddm
-  else
-    pkgs.libsForQt5.sddm
-  ;
+  sddm = pkgs.libsForQt5.sddm;
 
   xserverWrapper = pkgs.writeScript "xserver-wrapper" ''
     #!/bin/sh
diff --git a/nixos/tests/uwsgi.nix b/nixos/tests/uwsgi.nix
index 7f4945a88030..5c0b294e2d29 100644
--- a/nixos/tests/uwsgi.nix
+++ b/nixos/tests/uwsgi.nix
@@ -4,12 +4,13 @@ import ./make-test-python.nix ({ pkgs, ... }:
   meta = with pkgs.stdenv.lib.maintainers; {
     maintainers = [ lnl7 ];
   };
+
   machine = { pkgs, ... }: {
     services.uwsgi.enable = true;
-    services.uwsgi.plugins = [ "python3" ];
+    services.uwsgi.plugins = [ "python3" "php" ];
     services.uwsgi.instance = {
       type = "emperor";
-      vassals.hello = {
+      vassals.python = {
         type = "normal";
         master = true;
         workers = 2;
@@ -25,6 +26,17 @@ import ./make-test-python.nix ({ pkgs, ... }:
         '';
         pythonPackages = self: with self; [ flask ];
       };
+      vassals.php = {
+        type = "normal";
+        master = true;
+        workers = 2;
+        http-socket = ":8001";
+        http-socket-modifier1 = 14;
+        php-index = "index.php";
+        php-docroot = pkgs.writeTextDir "index.php" ''
+          <?php echo "Hello World\n"; ?>
+        '';
+      };
     };
   };
 
@@ -33,6 +45,8 @@ import ./make-test-python.nix ({ pkgs, ... }:
       machine.wait_for_unit("multi-user.target")
       machine.wait_for_unit("uwsgi.service")
       machine.wait_for_open_port(8000)
+      machine.wait_for_open_port(8001)
       assert "Hello World" in machine.succeed("curl -fv 127.0.0.1:8000")
+      assert "Hello World" in machine.succeed("curl -fv 127.0.0.1:8001")
     '';
 })
diff --git a/pkgs/applications/misc/mapproxy/default.nix b/pkgs/applications/misc/mapproxy/default.nix
index 41ae683548d0..48e2a3960ee7 100644
--- a/pkgs/applications/misc/mapproxy/default.nix
+++ b/pkgs/applications/misc/mapproxy/default.nix
@@ -1,38 +1,15 @@
 { lib
 , pkgs
-, python
+, python3
 }:
-let
-  py = python.override {
-    packageOverrides = self: super: {
-      pyproj = super.pyproj.overridePythonAttrs (oldAttrs: rec {
-      version = "1.9.6";
-      src = pkgs.fetchFromGitHub {
-        owner = "pyproj4";
-        repo = "pyproj";
-        rev = "v${version}rel";
-        sha256 = "18v4h7jx4mcc0x2xy8y7dfjq9bzsyxs8hdb6v67cabvlz2njziqy";
-      };
-      nativeBuildInputs = with python.pkgs; [ cython ];
-      patches = [ ];
-      checkPhase = ''
-        runHook preCheck
-        pushd unittest  # changing directory should ensure we're importing the global pyproj
-        ${python.interpreter} test.py && ${python.interpreter} -c "import doctest, pyproj, sys; sys.exit(doctest.testmod(pyproj)[0])"
-        popd
-        runHook postCheck
-      '';
-      });
-    };
-  };
-in
-with py.pkgs;
+
+with python3.pkgs;
 buildPythonApplication rec {
   pname = "MapProxy";
-  version = "1.12.0";
+  version = "1.13.0";
   src = fetchPypi {
   inherit pname version;
-  sha256 = "622e3a7796ef861ba21e42231b49c18d00d75f03eaf3f01a2b7687be7568e2ec";
+  sha256 = "0qi63ap8yi5g2cas33jv4jsmdrl6yv3qp6bh0zxrfpkb704lcng4";
   };
   prePatch = ''
     substituteInPlace mapproxy/util/ext/serving.py --replace "args = [sys.executable] + sys.argv" "args = sys.argv"
diff --git a/pkgs/applications/misc/polybar/default.nix b/pkgs/applications/misc/polybar/default.nix
index df08de7a4a22..940cd1cdc919 100644
--- a/pkgs/applications/misc/polybar/default.nix
+++ b/pkgs/applications/misc/polybar/default.nix
@@ -27,13 +27,13 @@ assert i3GapsSupport -> ! i3Support     && jsoncpp != null && i3-gaps != null;
 
 stdenv.mkDerivation rec {
     pname = "polybar";
-    version = "3.5.0";
+    version = "3.5.2";
 
     src = fetchFromGitHub {
       owner = pname;
       repo = pname;
       rev = version;
-      sha256 = "1kga98cgllsjcq692l27y01sgl8ii4wxp70kmdcwxkrliylg3dji";
+      sha256 = "1ir8fdnzrba9fkkjfvax5szx5h49lavwgl9pabjzrpbvif328g3x";
       fetchSubmodules = true;
     };
 
diff --git a/pkgs/applications/misc/ulauncher/default.nix b/pkgs/applications/misc/ulauncher/default.nix
index ba388e8038b7..d2522360a753 100644
--- a/pkgs/applications/misc/ulauncher/default.nix
+++ b/pkgs/applications/misc/ulauncher/default.nix
@@ -20,13 +20,13 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "ulauncher";
-  version = "5.8.1";
+  version = "5.9.0";
 
   disabled = python3Packages.isPy27;
 
   src = fetchurl {
     url = "https://github.com/Ulauncher/Ulauncher/releases/download/${version}/ulauncher_${version}.tar.gz";
-    sha256 = "1hgzfiwfk3dd50jmp184y754ydzmfv22qcv7z40gxj6pc67ahx3r";
+    sha256 = "sha256-jRCrkJcjUHDd3wF+Hkxg0QaW7YgIh7zM/KZ4TAH84/U=";
   };
 
   nativeBuildInputs = with python3Packages; [
diff --git a/pkgs/applications/networking/ids/zeek/default.nix b/pkgs/applications/networking/ids/zeek/default.nix
index 713156a66214..336e3be074dd 100644
--- a/pkgs/applications/networking/ids/zeek/default.nix
+++ b/pkgs/applications/networking/ids/zeek/default.nix
@@ -21,11 +21,11 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "zeek";
-  version = "3.2.2";
+  version = "3.2.3";
 
   src = fetchurl {
     url = "https://download.zeek.org/zeek-${version}.tar.gz";
-    sha256 = "00cxz7ad7p62s2glcagzcvwbnsivrv4bmz6rl1vij907jb24hmvc";
+    sha256 = "1in25clpbb2vdhms3iypj6r5sp8d1dxjcfn85c272sh7shnmqagr";
   };
 
   nativeBuildInputs = [ cmake flex bison file ];
@@ -56,6 +56,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "Powerful network analysis framework much different from a typical IDS";
     homepage = "https://www.zeek.org";
+    changelog = "https://github.com/zeek/zeek/blob/v${version}/CHANGES";
     license = licenses.bsd3;
     maintainers = with maintainers; [ pSub marsam tobim ];
     platforms = platforms.unix;
diff --git a/pkgs/build-support/emacs/wrapper.nix b/pkgs/build-support/emacs/wrapper.nix
index 6314c953b748..a3136839122d 100644
--- a/pkgs/build-support/emacs/wrapper.nix
+++ b/pkgs/build-support/emacs/wrapper.nix
@@ -103,7 +103,7 @@ runCommand
         }
         mkdir -p $out/bin
         mkdir -p $out/share/emacs/site-lisp
-        ${optionalString emacs.nativeComp ''
+        ${optionalString nativeComp ''
           mkdir -p $out/share/emacs/native-lisp
         ''}
 
diff --git a/pkgs/data/fonts/iosevka/bin.nix b/pkgs/data/fonts/iosevka/bin.nix
index 8b8e4f25fef2..5d9ef23d1c4e 100644
--- a/pkgs/data/fonts/iosevka/bin.nix
+++ b/pkgs/data/fonts/iosevka/bin.nix
@@ -10,7 +10,7 @@ let
     (builtins.attrNames (builtins.removeAttrs variantHashes [ "iosevka" ]));
 in stdenv.mkDerivation rec {
   pname = "${name}-bin";
-  version = "4.0.3";
+  version = "4.1.1";
 
   src = fetchurl {
     url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/ttc-${name}-${version}.zip";
diff --git a/pkgs/data/fonts/iosevka/variants.nix b/pkgs/data/fonts/iosevka/variants.nix
index 13fad48f900d..0cb7a0d0b64a 100644
--- a/pkgs/data/fonts/iosevka/variants.nix
+++ b/pkgs/data/fonts/iosevka/variants.nix
@@ -1,24 +1,24 @@
 # This file was autogenerated. DO NOT EDIT!
 {
-  iosevka = "1xc45rs09aj899wz9ghyizq6ddbgxpkqq5bl1jc89hls5laf7qjb";
-  iosevka-aile = "0n52lfn7awc28a4f5yh4my8q4ikzza705kp69chfw9jm2xx79npc";
-  iosevka-curly = "0m51r0bc25khllq8nsfgsldhwfs7kzl8kqasivjlm14mpv5080fn";
-  iosevka-curly-slab = "0ffiz2kg43kc2dxv48sjji33ra3kc6sy8vlard93c601fqjmrjws";
-  iosevka-etoile = "1fj8g7sjp9idjh14iqk4wsz3rdarlmq7amcdsr0dznwyivx8a9wx";
-  iosevka-slab = "0qpfzyi050zca0bwhb460nvcaarij4srhify0rb8sf9ygpzyvnjh";
-  iosevka-sparkle = "00dw894930xdikai8bcaimp0a3720diwi0r7ii52jwl4d70w53dx";
-  iosevka-ss01 = "1c6pfv792cjf5xqjnhjmpvcy36mzr7ymv6h0qwjl94mglw8qrhqs";
-  iosevka-ss02 = "1j05p2gky2z2bm5gajnm8mbbc7w1isg8m66lhd7mc42y6ygs0b2g";
-  iosevka-ss03 = "1kn9khfkk53my4mhpf43gl4ryd4ibw21f7jv553xlrnhm3vn8hxy";
-  iosevka-ss04 = "0bc4mqkxvjyvslrv43rwcmmpfyjiszpi77f6bng60h25ah3kdnqs";
-  iosevka-ss05 = "01m2z1vr5a404kxbzgcnavhsz0jj7hqda61bcvvir6xdqb881rp3";
-  iosevka-ss06 = "1qdlm9ky3rn6m9mgi2idwiy6jd3f0f74j87ms097khvnh6jg2wd7";
-  iosevka-ss07 = "14il043liricgxximsrklx36sfs4qa1a4dw017jaaqarr0gyar49";
-  iosevka-ss08 = "19la0b99msphhfbbw88fwkh0ni875q73976mdskvr5j63715cqx3";
-  iosevka-ss09 = "1m3rh42941r6nk5dq136vs8iaq8vhclcbl955f6zxcgk4aqdmp84";
-  iosevka-ss10 = "1kda7k8jqgpfajq1c6n656wpab7hh9icyiy31l21ilpmj0dzsxx6";
-  iosevka-ss11 = "1ch0c3i3063955ckp1af384ad70m6fiff6x6rxqk76s2vsywmxcf";
-  iosevka-ss12 = "01s16301rm8mr833zlairv19rb5aavb0lidhy9cr2p0d59p96b0h";
-  iosevka-ss13 = "0gnlmfka2hyr1g7a4gw97776aa6j7iz9zjhxliam0gh0iwnz5w41";
-  iosevka-ss14 = "1rar6cs8d4x9p0qnwvlkjcnfh1bhk6v7r05v1l68wlsmvrvriv17";
+  iosevka = "1k87kb2858hy8w7hwdv2cs37x590flm44rrf9ahpjnbzdf22c35y";
+  iosevka-aile = "0zlhkbxzi1bdfag0f6cfcpqb347qqbp8h1jr1166zwys5p92hm5n";
+  iosevka-curly = "18b6wjq1jr08zpzp1dq63n54cahjyli5ivk7q6gh5qrvc9qa613w";
+  iosevka-curly-slab = "0yf613nkpby501xxn4pwxm3c2lij5b98j5mnfa4phc43gls266fa";
+  iosevka-etoile = "0ysj6sjrkky79l3330mp0264shprdr0yrrkj1absijywy4dw2k03";
+  iosevka-slab = "04hg24iqc9x49m9i72a4pfx8vgyk03vyg9xbh9fnwm9dk58lv450";
+  iosevka-sparkle = "100fas1j4ws4plzbcnlfag1kd2xwr8pcikghd8fw648zkrwrrnw4";
+  iosevka-ss01 = "16qsb89z3c3n01l6xp813gs29dy81lmvfbmramm9amphrcx6y5n3";
+  iosevka-ss02 = "10qjvkhr9az52spax4b9x3d9cxa189j3yznxpiwsgz641mf4mj4k";
+  iosevka-ss03 = "028pzjisfqz4vlb2d8cwmmsxi2440vjayiwg13awllgzkpj3ibra";
+  iosevka-ss04 = "1xzxwa91yvv8wbz3p1pmb3x559xic8k3qz8vrfgqzmv9ymyw19q4";
+  iosevka-ss05 = "1bcdkydpzadb194nm4gmilj1rm46fblbwif4wcalcnypryfxlqgy";
+  iosevka-ss06 = "0r436ajlphqm7qjnzwq972wi5ccyvavw6p2vw75cvwc1s7ihwqkg";
+  iosevka-ss07 = "0fxwvwzkzc7xc0jhhppxjk9sm1gdr0qjvxa1szqf6nj2vy86cj73";
+  iosevka-ss08 = "0aw28i1r48qn42c6m3q900j3b4i6gnwxjxndc88ybak1fg43sf40";
+  iosevka-ss09 = "12nsjk9sxy7f0i0p6qjsc4z6d6w637fllabvsg83dblpkxw1yfac";
+  iosevka-ss10 = "12sz1nriq2g776kg70gx9lp0ma7rqgvnrkr15fp791wxkvgwqq5b";
+  iosevka-ss11 = "0yvcn9h7yxhp08rnl23j61agkb1p86rjgw8md23dkbxda600knqn";
+  iosevka-ss12 = "1vvbnqrmgx2krphf08rdlpn4f6zjypnh69m7yh8cakkbvvr4jnv1";
+  iosevka-ss13 = "09g3j713kssrkryb83kw803aa5dlnydvkqn80d666q0xyqv2xcfk";
+  iosevka-ss14 = "1psbqdscs223yxdlll7779xpdvkzh0al61jn1ka62by3qizmvl4b";
 }
diff --git a/pkgs/desktops/lxqt/compton-conf/default.nix b/pkgs/desktops/lxqt/compton-conf/default.nix
index b41d766c1adf..38dfd621848c 100644
--- a/pkgs/desktops/lxqt/compton-conf/default.nix
+++ b/pkgs/desktops/lxqt/compton-conf/default.nix
@@ -11,13 +11,13 @@
 
 mkDerivation rec {
   pname = "compton-conf";
-  version = "0.15.0";
+  version = "0.16.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = pname;
     rev = version;
-    sha256 = "1wqnajarkrpmc60jr1zw5w39lvlf9ii4ri9wgyn55hh1rkbzi7py";
+    sha256 = "0gcvyn7aabdz5yj0jzv14hlgjgbm8d9ib5r73i842f0hv4cv9m0q";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/desktops/lxqt/libfm-qt/default.nix b/pkgs/desktops/lxqt/libfm-qt/default.nix
index fc97906ab7d2..fb6b759db553 100644
--- a/pkgs/desktops/lxqt/libfm-qt/default.nix
+++ b/pkgs/desktops/lxqt/libfm-qt/default.nix
@@ -16,13 +16,13 @@
 
 mkDerivation rec {
   pname = "libfm-qt";
-  version = "0.15.1";
+  version = "0.16.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = "libfm-qt";
     rev = version;
-    sha256 = "1gjxml6c9m3xn094zbr9835sr4749dpxk4nc0ap9lg27qim63gx3";
+    sha256 = "0b52bczqvw4brxv5fszjrl1375yid6xzjm49ns9rx1jw71422w0p";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/desktops/lxqt/liblxqt/default.nix b/pkgs/desktops/lxqt/liblxqt/default.nix
index bd8181d57f6f..ee915491f857 100644
--- a/pkgs/desktops/lxqt/liblxqt/default.nix
+++ b/pkgs/desktops/lxqt/liblxqt/default.nix
@@ -15,13 +15,13 @@
 
 mkDerivation rec {
   pname = "liblxqt";
-  version = "0.15.1";
+  version = "0.16.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = pname;
     rev = version;
-    sha256 = "01vfy7r7h0c5axlwqwsxg3pzdlaicnf2474bcq3jwk12gipvj5sd";
+    sha256 = "1rp26g1ygzzy1cm7md326sv99zjz4y12pa402nlf2vrf2lzbwfmk";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/desktops/lxqt/libqtxdg/default.nix b/pkgs/desktops/lxqt/libqtxdg/default.nix
index f5da7a4b2356..f2d00a5869e4 100644
--- a/pkgs/desktops/lxqt/libqtxdg/default.nix
+++ b/pkgs/desktops/lxqt/libqtxdg/default.nix
@@ -10,13 +10,1