From 6a144364cc1fa4f9c37f9cea1c13e355f9dc71b6 Mon Sep 17 00:00:00 2001
From: "Markus S. Wamser" <github-dev@mail2013.wamser.eu>
Date: Tue, 28 Sep 2021 08:36:26 +0200
Subject: [PATCH 01/49] firefox-bin: fix locale selection

---
 .../browsers/firefox-bin/default.nix          |   5 +-
 .../browsers/firefox-bin/locales.nix          | 412 ++++++++++++++++++
 2 files changed, 415 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/applications/networking/browsers/firefox-bin/locales.nix

diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix
index 54763b801817..d0690bc39344 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/default.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix
@@ -50,12 +50,13 @@
 , ffmpeg
 , runtimeShell
 , mesa # firefox wants gbm for drm+dmabuf
-, systemLocale ? config.i18n.defaultLocale or "en-US"
+, systemLocale ? config.i18n.defaultLocale or "en_US"
 }:
 
 let
 
   inherit (generated) version sources;
+  mozLocale = (import ./locales.nix { lib = lib; }).mozLocale;
 
   mozillaPlatforms = {
     i686-linux = "linux-i686";
@@ -78,7 +79,7 @@ let
 
   defaultSource = lib.findFirst (sourceMatches "en-US") {} sources;
 
-  source = lib.findFirst (sourceMatches systemLocale) defaultSource sources;
+  source = lib.findFirst (sourceMatches (mozLocale systemLocale)) defaultSource sources;
 
   pname = "firefox-${channel}-bin-unwrapped";
 
diff --git a/pkgs/applications/networking/browsers/firefox-bin/locales.nix b/pkgs/applications/networking/browsers/firefox-bin/locales.nix
new file mode 100644
index 000000000000..4e7b8bf115ee
--- /dev/null
+++ b/pkgs/applications/networking/browsers/firefox-bin/locales.nix
@@ -0,0 +1,412 @@
+# map from a system locale to a locale supported by Mozilla Firefox using prefix matching
+
+{ lib }:
+let
+  localeMap = [
+    {
+      sys = "ach";
+      moz = "ach";
+    }
+    {
+      sys = "af";
+      moz = "af";
+    }
+    {
+      sys = "an";
+      moz = "an";
+    }
+    {
+      sys = "ar";
+      moz = "ar";
+    }
+    {
+      sys = "ast";
+      moz = "ast";
+    }
+    {
+      sys = "az";
+      moz = "az";
+    }
+    {
+      sys = "be";
+      moz = "be";
+    }
+    {
+      sys = "bg";
+      moz = "bg";
+    }
+    {
+      sys = "bn";
+      moz = "bn";
+    }
+    {
+      sys = "br";
+      moz = "br";
+    }
+    {
+      sys = "bs";
+      moz = "bs";
+    }
+    {
+      sys = "ca_ES@valencia";
+      moz = "ca-valencia";
+    }
+    {
+      sys = "ca";
+      moz = "ca";
+    }
+    {
+      sys = "cak";
+      moz = "cak";
+    }
+    {
+      sys = "cs";
+      moz = "cs";
+    }
+    {
+      sys = "cy";
+      moz = "cy";
+    }
+    {
+      sys = "da";
+      moz = "da";
+    }
+    {
+      sys = "de";
+      moz = "de";
+    }
+    {
+      sys = "dsb";
+      moz = "dsb";
+    }
+    {
+      sys = "el";
+      moz = "el";
+    }
+    {
+      sys = "en_CA";
+      moz = "en-CA";
+    }
+    {
+      sys = "en_GB";
+      moz = "en-GB";
+    }
+    {
+      sys = "en_US";
+      moz = "en-US";
+    }
+    {
+      sys = "eo";
+      moz = "eo";
+    }
+    {
+      sys = "es_AR";
+      moz = "es-AR";
+    }
+    {
+      sys = "es_CL";
+      moz = "es-CL";
+    }
+    {
+      sys = "es_ES";
+      moz = "es-ES";
+    }
+    {
+      sys = "es_MX";
+      moz = "es-MX";
+    }
+    {
+      sys = "et";
+      moz = "et";
+    }
+    {
+      sys = "eu";
+      moz = "eu";
+    }
+    {
+      sys = "fa";
+      moz = "fa";
+    }
+    {
+      sys = "ff";
+      moz = "ff";
+    }
+    {
+      sys = "fi";
+      moz = "fi";
+    }
+    {
+      sys = "fr";
+      moz = "fr";
+    }
+    {
+      sys = "fy_NL";
+      moz = "fy-NL";
+    }
+    {
+      sys = "ga_IE";
+      moz = "ga-IE";
+    }
+    {
+      sys = "gd";
+      moz = "gd";
+    }
+    {
+      sys = "gl";
+      moz = "gl";
+    }
+    {
+      sys = "gn";
+      moz = "gn";
+    }
+    {
+      sys = "gu_IN";
+      moz = "gu-IN";
+    }
+    {
+      sys = "he";
+      moz = "he";
+    }
+    {
+      sys = "hi_IN";
+      moz = "hi-IN";
+    }
+    {
+      sys = "hr";
+      moz = "hr";
+    }
+    {
+      sys = "hsb";
+      moz = "hsb";
+    }
+    {
+      sys = "hu";
+      moz = "hu";
+    }
+    {
+      sys = "hy_AM";
+      moz = "hy-AM";
+    }
+    {
+      sys = "ia";
+      moz = "ia";
+    }
+    {
+      sys = "id";
+      moz = "id";
+    }
+    {
+      sys = "is";
+      moz = "is";
+    }
+    {
+      sys = "it";
+      moz = "it";
+    }
+    {
+      sys = "ja";
+      moz = "ja";
+    }
+    {
+      sys = "ka";
+      moz = "ka";
+    }
+    {
+      sys = "kab";
+      moz = "kab";
+    }
+    {
+      sys = "kk";
+      moz = "kk";
+    }
+    {
+      sys = "km";
+      moz = "km";
+    }
+    {
+      sys = "kn";
+      moz = "kn";
+    }
+    {
+      sys = "ko";
+      moz = "ko";
+    }
+    {
+      sys = "lij";
+      moz = "lij";
+    }
+    {
+      sys = "lt";
+      moz = "lt";
+    }
+    {
+      sys = "lv";
+      moz = "lv";
+    }
+    {
+      sys = "mk";
+      moz = "mk";
+    }
+    {
+      sys = "mr";
+      moz = "mr";
+    }
+    {
+      sys = "ms";
+      moz = "ms";
+    }
+    {
+      sys = "my";
+      moz = "my";
+    }
+    {
+      sys = "nb_NO";
+      moz = "nb-NO";
+    }
+    {
+      sys = "ne_NP";
+      moz = "ne-NP";
+    }
+    {
+      sys = "nl";
+      moz = "nl";
+    }
+    {
+      sys = "nn_NO";
+      moz = "nn-NO";
+    }
+    {
+      sys = "oc";
+      moz = "oc";
+    }
+    {
+      sys = "pa_IN";
+      moz = "pa-IN";
+    }
+    {
+      sys = "pl";
+      moz = "pl";
+    }
+    {
+      sys = "pt_BR";
+      moz = "pt-BR";
+    }
+    {
+      sys = "pt_PT";
+      moz = "pt-PT";
+    }
+    {
+      sys = "rm";
+      moz = "rm";
+    }
+    {
+      sys = "ro";
+      moz = "ro";
+    }
+    {
+      sys = "ru";
+      moz = "ru";
+    }
+    {
+      sys = "sco";
+      moz = "sco";
+    }
+    {
+      sys = "si";
+      moz = "si";
+    }
+    {
+      sys = "sk";
+      moz = "sk";
+    }
+    {
+      sys = "sl";
+      moz = "sl";
+    }
+    {
+      sys = "son";
+      moz = "son";
+    }
+    {
+      sys = "sq";
+      moz = "sq";
+    }
+    {
+      sys = "sr";
+      moz = "sr";
+    }
+    {
+      sys = "sv_SE";
+      moz = "sv-SE";
+    }
+    {
+      sys = "szl";
+      moz = "szl";
+    }
+    {
+      sys = "ta";
+      moz = "ta";
+    }
+    {
+      sys = "te";
+      moz = "te";
+    }
+    {
+      sys = "th";
+      moz = "th";
+    }
+    {
+      sys = "tl";
+      moz = "tl";
+    }
+    {
+      sys = "tr";
+      moz = "tr";
+    }
+    {
+      sys = "trs";
+      moz = "trs";
+    }
+    {
+      sys = "uk";
+      moz = "uk";
+    }
+    {
+      sys = "ur";
+      moz = "ur";
+    }
+    {
+      sys = "uz";
+      moz = "uz";
+    }
+    {
+      sys = "vi";
+      moz = "vi";
+    }
+    {
+      sys = "xh";
+      moz = "xh";
+    }
+    {
+      sys = "xpi";
+      moz = "xpi";
+    }
+    {
+      sys = "zh_CN";
+      moz = "zh-CN";
+    }
+    {
+      sys = "zh_TW";
+      moz = "zh-TW";
+    }
+  ];
+
+  isPrefixOf = prefix: string:
+    builtins.substring 0 (builtins.stringLength prefix) string == prefix;
+
+  localeMatches = locale: source: (isPrefixOf source.sys locale);
+
+in {
+  mozLocale = sysLocale:
+    (lib.findFirst (localeMatches sysLocale) { moz = "en_US"; } localeMap).moz;
+}

From f85782360ceeb21ab578974fc42290fe0858eab8 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Tue, 19 Oct 2021 21:08:12 -0500
Subject: [PATCH 02/49] nsq: 0.3.5 -> 1.2.1

---
 pkgs/servers/nsq/default.nix | 28 +++++++-----
 pkgs/servers/nsq/deps.nix    | 83 ------------------------------------
 2 files changed, 18 insertions(+), 93 deletions(-)
 delete mode 100644 pkgs/servers/nsq/deps.nix

diff --git a/pkgs/servers/nsq/default.nix b/pkgs/servers/nsq/default.nix
index 19352984712a..dd948b8b1c48 100644
--- a/pkgs/servers/nsq/default.nix
+++ b/pkgs/servers/nsq/default.nix
@@ -1,18 +1,26 @@
-{ buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
-buildGoPackage rec {
+buildGoModule rec {
   pname = "nsq";
-  version = "0.3.5";
-  rev = "v${version}";
-
-  goPackagePath = "github.com/bitly/nsq";
+  version = "1.2.1";
 
   src = fetchFromGitHub {
-    inherit rev;
-    owner = "bitly";
+    owner = "nsqio";
     repo = "nsq";
-    sha256 = "1r7jgplzn6bgwhd4vn8045n6cmm4iqbzssbjgj7j1c28zbficy2f";
+    rev = "v${version}";
+    sha256 = "0ajqjwfn06zsmz21z9mkl4cblarypaf20228pqcd1293zl6y3ry8";
   };
 
-  goDeps = ./deps.nix;
+  vendorSha256 = "11sx96zshaciqrm8rqmhz1sf6nd4lczqwiha031xyyifvmpp2hsa";
+
+  excludedPackages = [ "bench" ];
+
+  ldflags = [ "-s" "-w" ];
+
+  meta = with lib; {
+    homepage = "https://nsq.io/";
+    description = "A realtime distributed messaging platform";
+    changelog = "https://github.com/nsqio/nsq/raw/v${version}/ChangeLog.md";
+    license = licenses.mit;
+  };
 }
diff --git a/pkgs/servers/nsq/deps.nix b/pkgs/servers/nsq/deps.nix
deleted file mode 100644
index 751a18ca92d7..000000000000
--- a/pkgs/servers/nsq/deps.nix
+++ /dev/null
@@ -1,83 +0,0 @@
-[
-  {
-    goPackagePath = "github.com/mreiferson/go-snappystream";
-    fetch = {
-      type = "git";
-      url = "https://github.com/mreiferson/go-snappystream";
-      rev = "028eae7ab5c4c9e2d1cb4c4ca1e53259bbe7e504";
-      sha256 = "0jdd5whp74nvg35d9hzydsi3shnb1vrnd7shi9qz4wxap7gcrid6";
-    };
-  }
-  {
-    goPackagePath = "github.com/bitly/go-nsq";
-    fetch = {
-      type = "git";
-      url = "https://github.com/bitly/go-nsq";
-      rev = "22a8bd48c443ec23bb559675b6df8284bbbdab29";
-      sha256 = "06hrkwk84w8rshkanvfgmgbiml7n06ybv192dvibhwgk2wz2dl46";
-    };
-  }
-  {
-    goPackagePath = "github.com/bitly/go-simplejson";
-    fetch = {
-      type = "git";
-      url = "https://github.com/bitly/go-simplejson";
-      rev = "18db6e68d8fd9cbf2e8ebe4c81a78b96fd9bf05a";
-      sha256 = "0lj9cxyncchlw6p35j0yym5q5waiz0giw6ri41qdwm8y3dghwwiy";
-    };
-  }
-  {
-    goPackagePath = "github.com/blang/semver";
-    fetch = {
-      type = "git";
-      url = "https://github.com/blang/semver";
-      rev = "9bf7bff48b0388cb75991e58c6df7d13e982f1f2";
-      sha256 = "11sinbf942dpyc9wdpidkhmqn438cfp5n8x3xqnmq9aszkld9hy7";
-    };
-  }
-  {
-    goPackagePath = "github.com/bmizerany/perks";
-    fetch = {
-      type = "git";
-      url = "https://github.com/bmizerany/perks";
-      rev = "6cb9d9d729303ee2628580d9aec5db968da3a607";
-      sha256 = "0cdh84hmn21is6hvv6dy9qjdcg9w3l2k8avlk0881a8cqm09s90j";
-    };
-  }
-  {
-    goPackagePath = "github.com/BurntSushi/toml";
-    fetch = {
-      type = "git";
-      url = "https://github.com/BurntSushi/toml";
-      rev = "056c9bc7be7190eaa7715723883caffa5f8fa3e4";
-      sha256 = "0gkgkw04ndr5y7hrdy0r4v2drs5srwfcw2bs1gyas066hwl84xyw";
-    };
-  }
-  {
-    goPackagePath = "github.com/bitly/go-hostpool";
-    fetch = {
-      type = "git";
-      url = "https://github.com/bitly/go-hostpool";
-      rev = "d0e59c22a56e8dadfed24f74f452cea5a52722d2";
-      sha256 = "14ph12krn5zlg00vh9g6g08lkfjxnpw46nzadrfb718yl1hgyk3g";
-    };
-  }
-  {
-    goPackagePath = "github.com/bitly/timer_metrics";
-    fetch = {
-      type = "git";
-      url = "https://github.com/bitly/timer_metrics";
-      rev = "afad1794bb13e2a094720aeb27c088aa64564895";
-      sha256 = "1b717vkwj63qb5kan4b92kx4rg6253l5mdb3lxpxrspy56a6rl0c";
-    };
-  }
-  {
-    goPackagePath = "github.com/mreiferson/go-options";
-    fetch = {
-      type = "git";
-      url = "https://github.com/mreiferson/go-options";
-      rev = "7c174072188d0cfbe6f01bb457626abb22bdff52";
-      sha256 = "0ksyi2cb4k6r2fxamljg42qbz5hdcb9kv5i7y6cx4ajjy0xznwgm";
-    };
-  }
-]

From 2be1c9eae1fa33cc1e4c8c6b9ccee44a8d3f474d Mon Sep 17 00:00:00 2001
From: Ryan Burns <rtburns@protonmail.com>
Date: Fri, 22 Oct 2021 14:02:26 -0700
Subject: [PATCH 03/49] navidrome: remove toplevel system attr

---
 pkgs/servers/misc/navidrome/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/misc/navidrome/default.nix b/pkgs/servers/misc/navidrome/default.nix
index f81a2c4d9ab6..19a89bbbf1cb 100644
--- a/pkgs/servers/misc/navidrome/default.nix
+++ b/pkgs/servers/misc/navidrome/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, pkgs, fetchurl, ffmpeg, ffmpegSupport ? true, makeWrapper, nixosTests }:
+{ lib, stdenv, fetchurl, ffmpeg, ffmpegSupport ? true, makeWrapper, nixosTests }:
 
 with lib;
 
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   version = "0.45.1";
 
 
-  src = fetchurl (if pkgs.system == "x86_64-linux"
+  src = fetchurl (if stdenv.hostPlatform.system == "x86_64-linux"
   then {
     url = "https://github.com/deluan/navidrome/releases/download/v${version}/navidrome_${version}_Linux_x86_64.tar.gz";
     sha256 = "sha256-TZcXq51sKoeLPmcRpv4VILDmS6dsS7lxlJzTDH0tEWM=";

From 54aa92a5425bb34e6765b8f57acf13dd6652e48b Mon Sep 17 00:00:00 2001
From: Ryan Burns <rtburns@protonmail.com>
Date: Fri, 22 Oct 2021 14:03:01 -0700
Subject: [PATCH 04/49] fx_cast: remove toplevel system attr

---
 pkgs/tools/misc/fx_cast/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/fx_cast/default.nix b/pkgs/tools/misc/fx_cast/default.nix
index e3458ccfe5cf..b94b16d7bf54 100644
--- a/pkgs/tools/misc/fx_cast/default.nix
+++ b/pkgs/tools/misc/fx_cast/default.nix
@@ -8,7 +8,7 @@
 # nix run nixpkgs.nodePackages.node2nix -c node2nix -l package-lock.json -d
 # cp -v node-*.nix package*.json ~/p/nixpkgs/pkgs/tools/misc/fx_cast/app
 # ```
-{ pkgs, stdenv, system }: let
+{ pkgs, stdenv }: let
   nodeEnv = import ./node-env.nix {
     inherit (pkgs) nodejs stdenv lib python2 runCommand writeTextFile;
     inherit pkgs;

From 2bbc2eaed34175505f8c864bd7b10579a156bce9 Mon Sep 17 00:00:00 2001
From: Ryan Burns <rtburns@protonmail.com>
Date: Fri, 22 Oct 2021 14:03:17 -0700
Subject: [PATCH 05/49] bookstack: remove toplevel system attr

---
 pkgs/servers/web-apps/bookstack/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/web-apps/bookstack/default.nix b/pkgs/servers/web-apps/bookstack/default.nix
index f7a02b5c13dd..724ff4c95c65 100644
--- a/pkgs/servers/web-apps/bookstack/default.nix
+++ b/pkgs/servers/web-apps/bookstack/default.nix
@@ -1,8 +1,9 @@
-{ pkgs, system, lib, fetchFromGitHub, dataDir ? "/var/lib/bookstack" }:
+{ pkgs, stdenv, lib, fetchFromGitHub, dataDir ? "/var/lib/bookstack" }:
 
 let
   package = (import ./composition.nix {
-    inherit pkgs system;
+    inherit pkgs;
+    inherit (stdenv.hostPlatform) system;
     noDev = true; # Disable development dependencies
   }).overrideAttrs (attrs : {
     installPhase = attrs.installPhase + ''

From 4423c7ecbcf0cdb3810c09df8a962ea7197edff9 Mon Sep 17 00:00:00 2001
From: Ryan Burns <rtburns@protonmail.com>
Date: Fri, 22 Oct 2021 14:03:38 -0700
Subject: [PATCH 06/49] crun: remove toplevel system attr

---
 pkgs/applications/virtualization/crun/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/applications/virtualization/crun/default.nix b/pkgs/applications/virtualization/crun/default.nix
index 1788c970f298..c91bf3d142ab 100644
--- a/pkgs/applications/virtualization/crun/default.nix
+++ b/pkgs/applications/virtualization/crun/default.nix
@@ -11,7 +11,6 @@
 , yajl
 , nixosTests
 , criu
-, system
 }:
 
 let
@@ -52,7 +51,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ libcap libseccomp systemd yajl ]
     # Criu currently only builds on x86_64-linux
-    ++ lib.optional (lib.elem system criu.meta.platforms) criu;
+    ++ lib.optional (lib.elem stdenv.hostPlatform.system criu.meta.platforms) criu;
 
   enableParallelBuilding = true;
 

From aed6bb336ecf85d85acfd79f21054eb4ec288de7 Mon Sep 17 00:00:00 2001
From: Ryan Burns <rtburns@protonmail.com>
Date: Fri, 22 Oct 2021 14:04:05 -0700
Subject: [PATCH 07/49] build-support/docker: remove toplevel system attr

---
 pkgs/build-support/docker/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix
index a42b025bc7f2..dcfa5ec593d1 100644
--- a/pkgs/build-support/docker/default.nix
+++ b/pkgs/build-support/docker/default.nix
@@ -31,8 +31,6 @@
 , writeText
 , writeTextDir
 , writePython3
-, system
-, # Note: This is the cross system we're compiling for
 }:
 
 let

From b7d06138c88bc19dbf1e41a4b3ec9450ca950d5a Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Sat, 23 Oct 2021 14:38:49 +0900
Subject: [PATCH 08/49] firefox-bin: simplify locale selection

---
 .../browsers/firefox-bin/default.nix          |   8 +-
 .../browsers/firefox-bin/locales.nix          | 412 ------------------
 2 files changed, 6 insertions(+), 414 deletions(-)
 delete mode 100644 pkgs/applications/networking/browsers/firefox-bin/locales.nix

diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix
index d0690bc39344..4ab427505e34 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/default.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix
@@ -56,7 +56,6 @@
 let
 
   inherit (generated) version sources;
-  mozLocale = (import ./locales.nix { lib = lib; }).mozLocale;
 
   mozillaPlatforms = {
     i686-linux = "linux-i686";
@@ -79,7 +78,12 @@ let
 
   defaultSource = lib.findFirst (sourceMatches "en-US") {} sources;
 
-  source = lib.findFirst (sourceMatches (mozLocale systemLocale)) defaultSource sources;
+  mozLocale =
+    if systemLocale == "ca_ES@valencia"
+    then "ca-valencia"
+    else lib.replaceStrings ["_"] ["-"] systemLocale;
+
+  source = lib.findFirst (sourceMatches mozLocale) defaultSource sources;
 
   pname = "firefox-${channel}-bin-unwrapped";
 
diff --git a/pkgs/applications/networking/browsers/firefox-bin/locales.nix b/pkgs/applications/networking/browsers/firefox-bin/locales.nix
deleted file mode 100644
index 4e7b8bf115ee..000000000000
--- a/pkgs/applications/networking/browsers/firefox-bin/locales.nix
+++ /dev/null
@@ -1,412 +0,0 @@
-# map from a system locale to a locale supported by Mozilla Firefox using prefix matching
-
-{ lib }:
-let
-  localeMap = [
-    {
-      sys = "ach";
-      moz = "ach";
-    }
-    {
-      sys = "af";
-      moz = "af";
-    }
-    {
-      sys = "an";
-      moz = "an";
-    }
-    {
-      sys = "ar";
-      moz = "ar";
-    }
-    {
-      sys = "ast";
-      moz = "ast";
-    }
-    {
-      sys = "az";
-      moz = "az";
-    }
-    {
-      sys = "be";
-      moz = "be";
-    }
-    {
-      sys = "bg";
-      moz = "bg";
-    }
-    {
-      sys = "bn";
-      moz = "bn";
-    }
-    {
-      sys = "br";
-      moz = "br";
-    }
-    {
-      sys = "bs";
-      moz = "bs";
-    }
-    {
-      sys = "ca_ES@valencia";
-      moz = "ca-valencia";
-    }
-    {
-      sys = "ca";
-      moz = "ca";
-    }
-    {
-      sys = "cak";
-      moz = "cak";
-    }
-    {
-      sys = "cs";
-      moz = "cs";
-    }
-    {
-      sys = "cy";
-      moz = "cy";
-    }
-    {
-      sys = "da";
-      moz = "da";
-    }
-    {
-      sys = "de";
-      moz = "de";
-    }
-    {
-      sys = "dsb";
-      moz = "dsb";
-    }
-    {
-      sys = "el";
-      moz = "el";
-    }
-    {
-      sys = "en_CA";
-      moz = "en-CA";
-    }
-    {
-      sys = "en_GB";
-      moz = "en-GB";
-    }
-    {
-      sys = "en_US";
-      moz = "en-US";
-    }
-    {
-      sys = "eo";
-      moz = "eo";
-    }
-    {
-      sys = "es_AR";
-      moz = "es-AR";
-    }
-    {
-      sys = "es_CL";
-      moz = "es-CL";
-    }
-    {
-      sys = "es_ES";
-      moz = "es-ES";
-    }
-    {
-      sys = "es_MX";
-      moz = "es-MX";
-    }
-    {
-      sys = "et";
-      moz = "et";
-    }
-    {
-      sys = "eu";
-      moz = "eu";
-    }
-    {
-      sys = "fa";
-      moz = "fa";
-    }
-    {
-      sys = "ff";
-      moz = "ff";
-    }
-    {
-      sys = "fi";
-      moz = "fi";
-    }
-    {
-      sys = "fr";
-      moz = "fr";
-    }
-    {
-      sys = "fy_NL";
-      moz = "fy-NL";
-    }
-    {
-      sys = "ga_IE";
-      moz = "ga-IE";
-    }
-    {
-      sys = "gd";
-      moz = "gd";
-    }
-    {
-      sys = "gl";
-      moz = "gl";
-    }
-    {
-      sys = "gn";
-      moz = "gn";
-    }
-    {
-      sys = "gu_IN";
-      moz = "gu-IN";
-    }
-    {
-      sys = "he";
-      moz = "he";
-    }
-    {
-      sys = "hi_IN";
-      moz = "hi-IN";
-    }
-    {
-      sys = "hr";
-      moz = "hr";
-    }
-    {
-      sys = "hsb";
-      moz = "hsb";
-    }
-    {
-      sys = "hu";
-      moz = "hu";
-    }
-    {
-      sys = "hy_AM";
-      moz = "hy-AM";
-    }
-    {
-      sys = "ia";
-      moz = "ia";
-    }
-    {
-      sys = "id";
-      moz = "id";
-    }
-    {
-      sys = "is";
-      moz = "is";
-    }
-    {
-      sys = "it";
-      moz = "it";
-    }
-    {
-      sys = "ja";
-      moz = "ja";
-    }
-    {
-      sys = "ka";
-      moz = "ka";
-    }
-    {
-      sys = "kab";
-      moz = "kab";
-    }
-    {
-      sys = "kk";
-      moz = "kk";
-    }
-    {
-      sys = "km";
-      moz = "km";
-    }
-    {
-      sys = "kn";
-      moz = "kn";
-    }
-    {
-      sys = "ko";
-      moz = "ko";
-    }
-    {
-      sys = "lij";
-      moz = "lij";
-    }
-    {
-      sys = "lt";
-      moz = "lt";
-    }
-    {
-      sys = "lv";
-      moz = "lv";
-    }
-    {
-      sys = "mk";
-      moz = "mk";
-    }
-    {
-      sys = "mr";
-      moz = "mr";
-    }
-    {
-      sys = "ms";
-      moz = "ms";
-    }
-    {
-      sys = "my";
-      moz = "my";
-    }
-    {
-      sys = "nb_NO";
-      moz = "nb-NO";
-    }
-    {
-      sys = "ne_NP";
-      moz = "ne-NP";
-    }
-    {
-      sys = "nl";
-      moz = "nl";
-    }
-    {
-      sys = "nn_NO";
-      moz = "nn-NO";
-    }
-    {
-      sys = "oc";
-      moz = "oc";
-    }
-    {
-      sys = "pa_IN";
-      moz = "pa-IN";
-    }
-    {
-      sys = "pl";
-      moz = "pl";
-    }
-    {
-      sys = "pt_BR";
-      moz = "pt-BR";
-    }
-    {
-      sys = "pt_PT";
-      moz = "pt-PT";
-    }
-    {
-      sys = "rm";
-      moz = "rm";
-    }
-    {
-      sys = "ro";
-      moz = "ro";
-    }
-    {
-      sys = "ru";
-      moz = "ru";
-    }
-    {
-      sys = "sco";
-      moz = "sco";
-    }
-    {
-      sys = "si";
-      moz = "si";
-    }
-    {
-      sys = "sk";
-      moz = "sk";
-    }
-    {
-      sys = "sl";
-      moz = "sl";
-    }
-    {
-      sys = "son";
-      moz = "son";
-    }
-    {
-      sys = "sq";
-      moz = "sq";
-    }
-    {
-      sys = "sr";
-      moz = "sr";
-    }
-    {
-      sys = "sv_SE";
-      moz = "sv-SE";
-    }
-    {
-      sys = "szl";
-      moz = "szl";
-    }
-    {
-      sys = "ta";
-      moz = "ta";
-    }
-    {
-      sys = "te";
-      moz = "te";
-    }
-    {
-      sys = "th";
-      moz = "th";
-    }
-    {
-      sys = "tl";
-      moz = "tl";
-    }
-    {
-      sys = "tr";
-      moz = "tr";
-    }
-    {
-      sys = "trs";
-      moz = "trs";
-    }
-    {
-      sys = "uk";
-      moz = "uk";
-    }
-    {
-      sys = "ur";
-      moz = "ur";
-    }
-    {
-      sys = "uz";
-      moz = "uz";
-    }
-    {
-      sys = "vi";
-      moz = "vi";
-    }
-    {
-      sys = "xh";
-      moz = "xh";
-    }
-    {
-      sys = "xpi";
-      moz = "xpi";
-    }
-    {
-      sys = "zh_CN";
-      moz = "zh-CN";
-    }
-    {
-      sys = "zh_TW";
-      moz = "zh-TW";
-    }
-  ];
-
-  isPrefixOf = prefix: string:
-    builtins.substring 0 (builtins.stringLength prefix) string == prefix;
-
-  localeMatches = locale: source: (isPrefixOf source.sys locale);
-
-in {
-  mozLocale = sysLocale:
-    (lib.findFirst (localeMatches sysLocale) { moz = "en_US"; } localeMap).moz;
-}

From 0b918edc99a66cbd0a4db819ff2e730dc58847a8 Mon Sep 17 00:00:00 2001
From: Ryan Burns <rtburns@protonmail.com>
Date: Fri, 22 Oct 2021 14:04:49 -0700
Subject: [PATCH 09/49] adguardhome: remove toplevel system attr

Note that targetPlatform was incorrect when cross-compiling,
and should be hostPlatform
---
 pkgs/servers/adguardhome/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/adguardhome/default.nix b/pkgs/servers/adguardhome/default.nix
index 34f64edc6ba3..848e259256b9 100644
--- a/pkgs/servers/adguardhome/default.nix
+++ b/pkgs/servers/adguardhome/default.nix
@@ -1,10 +1,10 @@
-{ lib, stdenv, fetchurl, fetchzip, system ? stdenv.targetPlatform }:
+{ lib, stdenv, fetchurl, fetchzip }:
 
 stdenv.mkDerivation rec {
   pname = "adguardhome";
   version = "0.106.3";
 
-  src = (import ./bins.nix { inherit fetchurl fetchzip; }).${system};
+  src = (import ./bins.nix { inherit fetchurl fetchzip; }).${stdenv.hostPlatform.system};
 
   installPhase = ''
     install -m755 -D ./AdGuardHome $out/bin/adguardhome

From 3a3c1e94fba46e9da61f42721dec989b15afe84c Mon Sep 17 00:00:00 2001
From: Ryan Burns <rtburns@protonmail.com>
Date: Fri, 22 Oct 2021 14:17:50 -0700
Subject: [PATCH 10/49] zigbee2mqtt: remove toplevel system attr

---
 pkgs/servers/zigbee2mqtt/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/zigbee2mqtt/default.nix b/pkgs/servers/zigbee2mqtt/default.nix
index 2a7c31a47a0f..7f561c493e66 100644
--- a/pkgs/servers/zigbee2mqtt/default.nix
+++ b/pkgs/servers/zigbee2mqtt/default.nix
@@ -1,6 +1,6 @@
-{ pkgs, system, dataDir ? "/opt/zigbee2mqtt/data", nixosTests }:
+{ pkgs, stdenv, dataDir ? "/opt/zigbee2mqtt/data", nixosTests }:
 let
-  package = (import ./node.nix { inherit pkgs system; }).package;
+  package = (import ./node.nix { inherit pkgs; inherit (stdenv.hostPlatform) system; }).package;
 in
 package.override rec {
   # don't upgrade! Newer versions cause stack overflows and fail trunk-combined

From ea8f2f937c221428e184b830d7d61d9e9524e29e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Xaver=20H=C3=B6rl?= <hoe.dom@gmx.de>
Date: Tue, 26 Oct 2021 09:01:11 +0200
Subject: [PATCH 11/49] treewide: allow eval with no-url-literals

---
 pkgs/tools/package-management/nix/default.nix |  2 +-
 pkgs/top-level/perl-packages.nix              | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index 2302e14b1aaa..db9b2c9465fa 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -208,7 +208,7 @@ common =
     patches = (drv.patches or []) ++ [
       # Part of the GC solution in https://github.com/NixOS/nix/pull/4944
       (fetchpatch {
-        url = https://github.com/hercules-ci/nix/raw/5c58d84a76d96f269e3ff1e72c9c9ba5f68576af/boehmgc-coroutine-sp-fallback.diff;
+        url = "https://github.com/hercules-ci/nix/raw/5c58d84a76d96f269e3ff1e72c9c9ba5f68576af/boehmgc-coroutine-sp-fallback.diff";
         sha256 = "sha256-JvnWVTlkltmQUs/0qApv/LPZ690UX1/2hEP+LYRwKbI=";
       })
     ];
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 2cc19753271a..99d2e16d434f 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -229,7 +229,7 @@ let
     buildInputs = [ Test2Suite ];
     propagatedBuildInputs = [ AlienBuild ArchiveExtract CaptureTiny Filechdir PathTiny ShellConfigGenerate ShellGuess SortVersions URI ];
     meta = {
-      homepage = https://metacpan.org/pod/Alien::Base::ModuleBuild;
+      homepage = "https://metacpan.org/pod/Alien::Base::ModuleBuild";
       description = "A Module::Build subclass for building Alien:: modules and their libraries";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
     };
@@ -9987,7 +9987,7 @@ let
     };
     propagatedBuildInputs = [ IPCRun URI constant-defer ];
     meta = {
-      homepage = http://user42.tuxfamily.org/html-formatexternal/index.html;
+      homepage = "http://user42.tuxfamily.org/html-formatexternal/index.html";
       description = "HTML to text formatting using external programs";
       license = lib.licenses.gpl3Plus;
     };
@@ -15032,7 +15032,7 @@ let
     makeMakerFlags = "POSTGRES_HOME=${pkgs.postgresql}";
 
     meta = {
-      homepage = https://github.com/TJC/Test-postgresql;
+      homepage = "https://github.com/TJC/Test-postgresql";
       description = "PostgreSQL runner for tests";
       license = with lib.licenses; [ artistic2 ];
     };
@@ -17378,7 +17378,7 @@ let
     buildInputs = [ ModuleBuildTiny TestFatal ];
     propagatedBuildInputs = [ Moo MooXTypeTiny TryTiny TypeTiny ];
     meta = {
-      homepage = https://github.com/karenetheridge/Path-Dispatcher;
+      homepage = "https://github.com/karenetheridge/Path-Dispatcher";
       description = "Flexible and extensible dispatch";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
     };
@@ -20093,7 +20093,7 @@ let
     buildInputs = [ Test2Suite ];
     propagatedBuildInputs = [ ShellGuess ];
     meta = {
-      homepage = https://metacpan.org/pod/Shell::Config::Generate;
+      homepage = "https://metacpan.org/pod/Shell::Config::Generate";
       description = "Portably generate config for any shell";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
     };
@@ -20107,7 +20107,7 @@ let
       sha256 = "4069fa2637e443118ed956d710231d166823d23b2a64eb87b8a46872e865a12b";
     };
     meta = {
-      homepage = https://metacpan.org/pod/Shell::Guess;
+      homepage = "https://metacpan.org/pod/Shell::Guess";
       description = "Make an educated guess about the shell in use";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
     };
@@ -23366,7 +23366,7 @@ let
     };
     propagatedBuildInputs = [ AlgorithmDiff HTMLParser ];
     meta = {
-      homepage = https://metacpan.org/release/Text-WordDiff;
+      homepage = "https://metacpan.org/release/Text-WordDiff";
       description = "Track changes between documents";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
     };
@@ -25121,7 +25121,7 @@ let
     buildInputs = [ NetHTTP TestFailWarnings TestFatal ];
     propagatedBuildInputs = [ HTTPHeadersActionPack HTTPMessage HashMultiValue IOHandleUtil ModuleRuntime Plack SubExporter TryTiny ];
     meta = {
-      homepage = http://metacpan.org/release/Web-Machine;
+      homepage = "http://metacpan.org/release/Web-Machine";
       description = "A Perl port of Webmachine";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
     };

From f53cd2e3ec0712503f598cb8ff8466d6358079ff Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@protonmail.com>
Date: Tue, 26 Oct 2021 15:40:49 -0300
Subject: [PATCH 12/49] "treewide" moving Arcan packages to directories

It can be useful for future modifications, patches and helper scripts.
---
 pkgs/desktops/arcan/{arcan.nix => arcan/default.nix}  |  0
 pkgs/desktops/arcan/default.nix                       | 11 ++++++-----
 .../desktops/arcan/{durden.nix => durden/default.nix} |  0
 .../arcan/{pipeworld.nix => pipeworld/default.nix}    |  0
 pkgs/desktops/arcan/{prio.nix => prio/default.nix}    |  0
 .../desktops/arcan/{xarcan.nix => xarcan/default.nix} |  0
 6 files changed, 6 insertions(+), 5 deletions(-)
 rename pkgs/desktops/arcan/{arcan.nix => arcan/default.nix} (100%)
 rename pkgs/desktops/arcan/{durden.nix => durden/default.nix} (100%)
 rename pkgs/desktops/arcan/{pipeworld.nix => pipeworld/default.nix} (100%)
 rename pkgs/desktops/arcan/{prio.nix => prio/default.nix} (100%)
 rename pkgs/desktops/arcan/{xarcan.nix => xarcan/default.nix} (100%)

diff --git a/pkgs/desktops/arcan/arcan.nix b/pkgs/desktops/arcan/arcan/default.nix
similarity index 100%
rename from pkgs/desktops/arcan/arcan.nix
rename to pkgs/desktops/arcan/arcan/default.nix
diff --git a/pkgs/desktops/arcan/default.nix b/pkgs/desktops/arcan/default.nix
index 39d3e489c592..9d9f28a79538 100644
--- a/pkgs/desktops/arcan/default.nix
+++ b/pkgs/desktops/arcan/default.nix
@@ -9,25 +9,26 @@ rec {
 
   # Arcan
 
-  arcan = callPackage ./arcan.nix { };
+  arcan = callPackage ./arcan { };
   arcan-wrapped = callPackage ./wrapper.nix { };
-  xarcan = callPackage ./xarcan.nix { };
+  xarcan = callPackage ./xarcan { };
 
   # Appls
 
-  durden = callPackage ./durden.nix { };
+  durden = callPackage ./durden { };
   durden-wrapped = callPackage ./wrapper.nix {
     name = "durden-wrapped";
     appls = [ durden ];
   };
 
-  pipeworld = callPackage ./pipeworld.nix { };
+  pipeworld = callPackage ./pipeworld { };
   pipeworld-wrapped = callPackage ./wrapper.nix {
     name = "pipeworld-wrapped";
     appls = [ pipeworld ];
   };
 
-  prio = callPackage ./prio.nix { };
+  # Warning: prio is deprecated; however it works and is useful for testing
+  prio = callPackage ./prio { };
   prio-wrapped = callPackage ./wrapper.nix {
     name = "prio-wrapped";
     appls = [ prio ];
diff --git a/pkgs/desktops/arcan/durden.nix b/pkgs/desktops/arcan/durden/default.nix
similarity index 100%
rename from pkgs/desktops/arcan/durden.nix
rename to pkgs/desktops/arcan/durden/default.nix
diff --git a/pkgs/desktops/arcan/pipeworld.nix b/pkgs/desktops/arcan/pipeworld/default.nix
similarity index 100%
rename from pkgs/desktops/arcan/pipeworld.nix
rename to pkgs/desktops/arcan/pipeworld/default.nix
diff --git a/pkgs/desktops/arcan/prio.nix b/pkgs/desktops/arcan/prio/default.nix
similarity index 100%
rename from pkgs/desktops/arcan/prio.nix
rename to pkgs/desktops/arcan/prio/default.nix
diff --git a/pkgs/desktops/arcan/xarcan.nix b/pkgs/desktops/arcan/xarcan/default.nix
similarity index 100%
rename from pkgs/desktops/arcan/xarcan.nix
rename to pkgs/desktops/arcan/xarcan/default.nix

From cf87b5af96f22064b61656ea1e94158dcf260812 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@protonmail.com>
Date: Tue, 26 Oct 2021 15:56:52 -0300
Subject: [PATCH 13/49] Better wording on a small comment

---
 pkgs/desktops/arcan/wrapper.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/desktops/arcan/wrapper.nix b/pkgs/desktops/arcan/wrapper.nix
index e394e2e08976..b61c5a5becd8 100644
--- a/pkgs/desktops/arcan/wrapper.nix
+++ b/pkgs/desktops/arcan/wrapper.nix
@@ -24,6 +24,6 @@ symlinkJoin rec {
     done
   '';
 }
-# TODO: set ARCAN_FONTPATH to a set of fonts that can be provided in a parameter
 # TODO: set ARCAN_STATEBASEPATH to $HOME/.arcan/resources/savestates/ - possibly
 # via a suitable script
+# TODO: set ARCAN_FONTPATH to a set of default-but-configurable fontset

From 0c475957edde0464c16cdd2b6fb7a19402f098e5 Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Tue, 26 Oct 2021 14:05:15 -0400
Subject: [PATCH 14/49] eww: init at 0.2.0

---
 .../window-managers/eww/default.nix           | 43 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  5 +++
 2 files changed, 48 insertions(+)
 create mode 100644 pkgs/applications/window-managers/eww/default.nix

diff --git a/pkgs/applications/window-managers/eww/default.nix b/pkgs/applications/window-managers/eww/default.nix
new file mode 100644
index 000000000000..c96ddcbaf21e
--- /dev/null
+++ b/pkgs/applications/window-managers/eww/default.nix
@@ -0,0 +1,43 @@
+{ lib
+, rustPlatform
+, fetchFromGitHub
+, pkg-config
+, gtk3
+, withWayland ? false
+, gtk-layer-shell
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "eww";
+  version = "0.2.0";
+
+  src = fetchFromGitHub {
+    owner = "elkowar";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "050zc3w1z9f2vg6sz86mdxf345gd3s3jf09gf4y8y1mqkzs86b8x";
+  };
+
+  cargoSha256 = "sha256-LejnTVv9rhL9CVW1fgj2gFv4amHQeziu5uaH2ae8AAw=";
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [ gtk3 ] ++ lib.optional withWayland gtk-layer-shell;
+
+  cargoBuildFlags = [ "--bin" "eww" ] ++ lib.optionals withWayland [
+    "--no-default-features"
+    "--features=wayland"
+  ];
+
+  cargoTestFlags = cargoBuildFlags;
+
+  # requires unstable rust features
+  RUSTC_BOOTSTRAP = 1;
+
+  meta = with lib; {
+    description = "ElKowars wacky widgets";
+    homepage = "https://github.com/elkowar/eww";
+    license = licenses.mit;
+    maintainers = with maintainers; [ figsoda ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 29b44acfc8a0..ee7696160b1e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -24565,6 +24565,11 @@ with pkgs;
 
   evilpixie = libsForQt5.callPackage ../applications/graphics/evilpixie { };
 
+  eww = callPackage ../applications/window-managers/eww { };
+  eww-wayland = callPackage ../applications/window-managers/eww {
+    withWayland = true;
+  };
+
   exaile = callPackage ../applications/audio/exaile { };
 
   exercism = callPackage ../applications/misc/exercism { };

From 99cdb84b4b74e557f0acb984ba099752223d7f34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= <mkg20001@gmail.com>
Date: Tue, 26 Oct 2021 23:08:07 +0200
Subject: [PATCH 15/49] nginxQuic: 404de224517e -> 6d1488b62dc5

---
 pkgs/servers/http/nginx/quic.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/http/nginx/quic.nix b/pkgs/servers/http/nginx/quic.nix
index a6efda3bed7a..5874d3dd6794 100644
--- a/pkgs/servers/http/nginx/quic.nix
+++ b/pkgs/servers/http/nginx/quic.nix
@@ -6,8 +6,8 @@
 callPackage ./generic.nix args {
   src = fetchhg {
     url = "https://hg.nginx.org/nginx-quic";
-    rev = "404de224517e"; # branch=quic
-    sha256 = "00x8djp3hqnq60jzpddfrj0v23j2fbl27jyw609ha3wqkkbxrip9";
+    rev = "6d1488b62dc5"; # branch=quic
+    sha256 = "18xrkzzi4cxl4zi7clikwww9ad9l7vilrfs67hhzx7898jkws5fi";
   };
 
   preConfigure = ''

From 65e85478f3c87fbf17f9e119bf2b120687965009 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@protonmail.com>
Date: Tue, 26 Oct 2021 15:57:13 -0300
Subject: [PATCH 16/49] arcan.arcan: 0.6.1pre1+unstable=2021-09-05 ->
 0.6.1pre1+unstable=2021-10-16

---
 pkgs/desktops/arcan/arcan/default.nix | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/pkgs/desktops/arcan/arcan/default.nix b/pkgs/desktops/arcan/arcan/default.nix
index a0d037725ed0..48d4f9a54813 100644
--- a/pkgs/desktops/arcan/arcan/default.nix
+++ b/pkgs/desktops/arcan/arcan/default.nix
@@ -36,7 +36,7 @@
 , xcbutil
 , xcbutilwm
 , xz
-, buildManPages ? true, ruby
+, buildManpages ? true, ruby
 }:
 
 let
@@ -52,21 +52,21 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "arcan";
-  version = "0.6.1pre1+unstable=2021-09-05";
+  version = "0.6.1pre1+unstable=2021-10-16";
 
   src = fetchFromGitHub {
     owner = "letoram";
     repo = "arcan";
-    rev = "525521177e4458199d7a57f8e6d37d41c04a988d";
-    hash = "sha256-RsvTHPIvF9TeOfjPGcArptIiF9g42BfZkVMCbjJcXnE=";
+    rev = "e0182b944152fbcb49f5c16932d38c05a9fb2680";
+    hash = "sha256-4FodFuO51ehvyjH4YaF/xBY9dwA6cP/e6/BvEsH4w7U=";
   };
 
   postUnpack = ''
-    (
-     cd $sourceRoot/external/git/
-     cp -a ${letoram-openal-src}/ openal/
-     chmod --recursive 744 openal/
-    )
+    pushd .
+    cd $sourceRoot/external/git/
+    cp -a ${letoram-openal-src}/ openal/
+    chmod --recursive 744 openal/
+    popd
   '';
 
   # TODO: work with upstream in order to get rid of these hardcoded paths
@@ -82,7 +82,7 @@ stdenv.mkDerivation rec {
     cmake
     makeWrapper
     pkg-config
-  ] ++ lib.optionals buildManPages [
+  ] ++ lib.optionals buildManpages [
     ruby
   ];
 
@@ -123,8 +123,11 @@ stdenv.mkDerivation rec {
 
   # INFO: According to the source code, the manpages need to be generated before
   # the configure phase
-  preConfigure = lib.optionalString buildManPages ''
-    (cd doc; ruby docgen.rb mangen)
+  preConfigure = lib.optionalString buildManpages ''
+    pushd .
+    cd doc
+    ruby docgen.rb mangen
+    popd
   '';
 
   cmakeFlags = [

From 134191380c7de09d3eb425ec4305ecb0c1f13e78 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@protonmail.com>
Date: Tue, 26 Oct 2021 16:43:00 -0300
Subject: [PATCH 17/49] arcan.durden: 0.6.1+unstable=2021-07-11 ->
 0.6.1+unstable=2021-10-15

---
 pkgs/desktops/arcan/durden/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/arcan/durden/default.nix b/pkgs/desktops/arcan/durden/default.nix
index f6837f96fb6b..69aae1d216a3 100644
--- a/pkgs/desktops/arcan/durden/default.nix
+++ b/pkgs/desktops/arcan/durden/default.nix
@@ -5,13 +5,13 @@
 
 stdenv.mkDerivation rec {
   pname = "durden";
-  version = "0.6.1+unstable=2021-07-11";
+  version = "0.6.1+unstable=2021-10-15";
 
   src = fetchFromGitHub {
     owner = "letoram";
     repo = pname;
-    rev = "8e0a5c07cade9ad9f606781615c9ebae7b28b6d5";
-    hash = "sha256-4cGuCAeYmmr4ACWt2akVQu2cPqqyE6p+XFaKWcFf3t0=";
+    rev = "ab6cdaf19e87b74895a9ab5e1d005a07ea9396a6";
+    hash = "sha256-FxqY1TUgbD/PjQjTZZerb7ngn5nkcqmVwqPvbRAYaqo=";
   };
 
   installPhase = ''

From d561156d719ff0e28084af815ef63e55cc627613 Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Tue, 26 Oct 2021 19:50:46 -0400
Subject: [PATCH 18/49] eww: add legendofmiracles as a maintainer

Co-authored-by: legendofmiracles <30902201+legendofmiracles@users.noreply.github.com>
---
 pkgs/applications/window-managers/eww/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/window-managers/eww/default.nix b/pkgs/applications/window-managers/eww/default.nix
index c96ddcbaf21e..08160690dcbc 100644
--- a/pkgs/applications/window-managers/eww/default.nix
+++ b/pkgs/applications/window-managers/eww/default.nix
@@ -38,6 +38,6 @@ rustPlatform.buildRustPackage rec {
     description = "ElKowars wacky widgets";
     homepage = "https://github.com/elkowar/eww";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = with maintainers; [ figsoda legendofmiracles ];
   };
 }

From 8516190dca71f70213fe0eed2fb16c8bbc0eb314 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Wed, 27 Oct 2021 00:31:21 -0500
Subject: [PATCH 19/49] gallery-dl: 1.19.0 -> 1.19.1

---
 pkgs/applications/misc/gallery-dl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/gallery-dl/default.nix b/pkgs/applications/misc/gallery-dl/default.nix
index 461d27a32c31..656a5f3bea48 100644
--- a/pkgs/applications/misc/gallery-dl/default.nix
+++ b/pkgs/applications/misc/gallery-dl/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonApplication rec {
   pname = "gallery_dl";
-  version = "1.19.0";
+  version = "1.19.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "ceffaa5022d76132165ca9004c1e57d7400b56c9ab3866e3bd139e2ffe38cb72";
+    sha256 = "ea1a7bf908507a87edffde6d6be93b8859ab0832ca788b61690a13aa5dd52216";
   };
 
   propagatedBuildInputs = [ requests ];

From 20e62a2b01f41a2ead0408c8c65b02edfcce95d9 Mon Sep 17 00:00:00 2001
From: TredwellGit <tredwell@tutanota.com>
Date: Wed, 27 Oct 2021 09:52:14 +0000
Subject: [PATCH 20/49] linux: 4.14.252 -> 4.14.253

---
 pkgs/os-specific/linux/kernel/linux-4.14.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix
index 9ab5f2683bae..5fc975b8c6f0 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.14.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix
@@ -3,7 +3,7 @@
 with lib;
 
 buildLinux (args // rec {
-  version = "4.14.252";
+  version = "4.14.253";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "022rw51s8fzz6wcxa9xq6h60fglfx0hq7bmqgs5dlrci6plv4fwk";
+    sha256 = "1mgl55c8fa2ry4qp0phkdkzjhwfnkbhvi266n348kyjyqnjl234f";
   };
 } // (args.argsOverride or {}))

From b7efb90537964cee5fb6c350d14d89b477e58912 Mon Sep 17 00:00:00 2001
From: TredwellGit <tredwell@tutanota.com>
Date: Wed, 27 Oct 2021 09:52:20 +0000
Subject: [PATCH 21/49] linux: 4.19.213 -> 4.19.214

---
 pkgs/os-specific/linux/kernel/linux-4.19.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix
index c4b05e148243..afd34eaf9020 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.19.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix
@@ -3,7 +3,7 @@
 with lib;
 
 buildLinux (args // rec {
-  version = "4.19.213";
+  version = "4.19.214";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "162f5y3jplql3ca5xy889mq6izjinryx2kx16zp582yvsqf8rwiq";
+    sha256 = "0i08np4gxiks7chp6j328pdqb02apbba53mj4zvxb9v37qpxzqgz";
   };
 } // (args.argsOverride or {}))

From 3a69f006d9418de7ee58d16e1b32ec55dd0eca85 Mon Sep 17 00:00:00 2001
From: TredwellGit <tredwell@tutanota.com>
Date: Wed, 27 Oct 2021 09:52:24 +0000
Subject: [PATCH 22/49] linux: 4.4.289 -> 4.4.290

---
 pkgs/os-specific/linux/kernel/linux-4.4.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix
index a0d6115a856b..e5672de557ac 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix
@@ -1,12 +1,12 @@
 { buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args:
 
 buildLinux (args // rec {
-  version = "4.4.289";
+  version = "4.4.290";
   extraMeta.branch = "4.4";
   extraMeta.broken = stdenv.isAarch64;
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1g77kf0yzwvpdxs3kw7wdvb07mmk3zm6ydjcw5dnsza8q2inl69k";
+    sha256 = "1dcx58nmzkcc5nz2b5b7mgw4w7y28v3s9wd8h78czdqfa0kxrl20";
   };
 } // (args.argsOverride or {}))

From 19735ff28026c7d3bb6f7ec2b30f30d392c95eab Mon Sep 17 00:00:00 2001
From: TredwellGit <tredwell@tutanota.com>
Date: Wed, 27 Oct 2021 09:52:29 +0000
Subject: [PATCH 23/49] linux: 4.9.287 -> 4.9.288

---
 pkgs/os-specific/linux/kernel/linux-4.9.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix
index b4952dcb9277..b929e930eb03 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.9.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix
@@ -1,12 +1,12 @@
 { buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args:
 
 buildLinux (args // rec {
-  version = "4.9.287";
+  version = "4.9.288";
   extraMeta.branch = "4.9";
   extraMeta.broken = stdenv.isAarch64;
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1hlpxnlz0y5vxcmkavsirk2kfb2l34fcvmhlcb99slh28xkjhhfl";
+    sha256 = "0v5592v565bl924c23m1n7p5zddr0w7zn8m97pmikk6p7cyhjq9n";
   };
 } // (args.argsOverride or {}))

From 4bd2c087e06419ffb266cd8f39d4a755437bf845 Mon Sep 17 00:00:00 2001
From: TredwellGit <tredwell@tutanota.com>
Date: Wed, 27 Oct 2021 09:52:34 +0000
Subject: [PATCH 24/49] linux: 5.10.75 -> 5.10.76

---
 pkgs/os-specific/linux/kernel/linux-5.10.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-5.10.nix b/pkgs/os-specific/linux/kernel/linux-5.10.nix
index 5531a49f1cef..3376f30212a7 100644
--- a/pkgs/os-specific/linux/kernel/linux-5.10.nix
+++ b/pkgs/os-specific/linux/kernel/linux-5.10.nix
@@ -3,7 +3,7 @@
 with lib;
 
 buildLinux (args // rec {
-  version = "5.10.75";
+  version = "5.10.76";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
-    sha256 = "0jrhhk89587caw54nhnwms93kq33qdm75x5f18cp61xrxxgjyaqa";
+    sha256 = "140qkvs88b5zh6mxxzpf36z1r8bbvyh3yigripqjz1k236x0j2j8";
   };
 } // (args.argsOverride or {}))

From 0719e92d1b84200d990ace44c039b3f001997c7d Mon Sep 17 00:00:00 2001
From: TredwellGit <tredwell@tutanota.com>
Date: Wed, 27 Oct 2021 09:52:41 +0000
Subject: [PATCH 25/49] linux: 5.14.14 -> 5.14.15

---
 pkgs/os-specific/linux/kernel/linux-5.14.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-5.14.nix b/pkgs/os-specific/linux/kernel/linux-5.14.nix
index 337ef105d7c7..e9d10e5d4683 100644
--- a/pkgs/os-specific/linux/kernel/linux-5.14.nix
+++ b/pkgs/os-specific/linux/kernel/linux-5.14.nix
@@ -3,7 +3,7 @@
 with lib;
 
 buildLinux (args // rec {
-  version = "5.14.14";
+  version = "5.14.15";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
-    sha256 = "0snh17ah49wmfmazy6x42rhvl484h657y0iq4l09a885sjb4xzsd";
+    sha256 = "01m4qw1z7xn3ngsbm1bvcvikqpkjjr9n8585556wkmz9d469mwvl";
   };
 } // (args.argsOverride or { }))

From 67e5b8b626c12d575e10a82e88644bbf257eac86 Mon Sep 17 00:00:00 2001
From: TredwellGit <tredwell@tutanota.com>
Date: Wed, 27 Oct 2021 09:52:46 +0000
Subject: [PATCH 26/49] linux: 5.4.155 -> 5.4.156

---
 pkgs/os-specific/linux/kernel/linux-5.4.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix
index d34ada307b29..3c19d6314388 100644
--- a/pkgs/os-specific/linux/kernel/linux-5.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix
@@ -3,7 +3,7 @@
 with lib;
 
 buildLinux (args // rec {
-  version = "5.4.155";
+  version = "5.4.156";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
-    sha256 = "0f2hfz76rnhmv99zhbh7n1z48316ilxrxrnh4b5m3lj84y80y36c";
+    sha256 = "1zkpqfhrc5n0yiij3jzvzywgabva53c8668f1ly1pkrzcbj77zh6";
   };
 } // (args.argsOverride or {}))

From 55af4f5da2bf6d1c28aca5c98ecbc31504de01ea Mon Sep 17 00:00:00 2001
From: TredwellGit <tredwell@tutanota.com>
Date: Wed, 27 Oct 2021 09:53:20 +0000
Subject: [PATCH 27/49] linux-rt_5_4: 5.4.143-rt64 -> 5.4.154-rt65

---
 pkgs/os-specific/linux/kernel/linux-rt-5.4.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix b/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix
index 7be45dc3e683..c299cd2a27d7 100644
--- a/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix
@@ -6,7 +6,7 @@
 , ... } @ args:
 
 let
-  version = "5.4.143-rt64"; # updated by ./update-rt.sh
+  version = "5.4.154-rt65"; # updated by ./update-rt.sh
   branch = lib.versions.majorMinor version;
   kversion = builtins.elemAt (lib.splitString "-" version) 0;
 in buildLinux (args // {
@@ -14,14 +14,14 @@ in buildLinux (args // {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz";
-    sha256 = "090x087p8hxnc1daf2xwj7vg8hg1jhz5i4andkbhdy550l5nalq9";
+    sha256 = "01iwbz1ncakw90yykdw3cx04wnclwf1qa8nmlis08svbcvs99285";
   };
 
   kernelPatches = let rt-patch = {
     name = "rt";
     patch = fetchurl {
       url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
-      sha256 = "0prfrvk2ds20sclikizzgg5qf4mfcyaymp9r272d5nj35293622n";
+      sha256 = "0vbcmwg91hzcxiwq9dj550bw24k8r7lk61j06nwcnwmjg9a3g449";
     };
   }; in [ rt-patch ] ++ kernelPatches;
 

From 748cc6042768547201a9f6c4365cda6ed3d7dbd4 Mon Sep 17 00:00:00 2001
From: TredwellGit <tredwell@tutanota.com>
Date: Wed, 27 Oct 2021 09:53:28 +0000
Subject: [PATCH 28/49] linux_latest-libre: 18380 -> 18413

---
 pkgs/os-specific/linux/kernel/linux-libre.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-libre.nix b/pkgs/os-specific/linux/kernel/linux-libre.nix
index 8ee8c663b3b5..9153b9232493 100644
--- a/pkgs/os-specific/linux/kernel/linux-libre.nix
+++ b/pkgs/os-specific/linux/kernel/linux-libre.nix
@@ -1,8 +1,8 @@
 { stdenv, lib, fetchsvn, linux
 , scripts ? fetchsvn {
     url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/";
-    rev = "18380";
-    sha256 = "0sg7mnxqzc5zdnl8l7gfy1kc52w7c85fdhywvdbjgs7inx2bb1qd";
+    rev = "18413";
+    sha256 = "1s0nr3pnczr1ijv86307mfhmkk7xn5ah46wx6jrx857agcd73fzq";
   }
 , ...
 }:

From 5f482ff344dc5150d94c278644fe67ca4904816a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 27 Oct 2021 10:10:38 +0000
Subject: [PATCH 29/49] lagrange: 1.7.2 -> 1.7.3

---
 pkgs/applications/networking/browsers/lagrange/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/lagrange/default.nix b/pkgs/applications/networking/browsers/lagrange/default.nix
index c0542014b7e5..6217862eb156 100644
--- a/pkgs/applications/networking/browsers/lagrange/default.nix
+++ b/pkgs/applications/networking/browsers/lagrange/default.nix
@@ -18,13 +18,13 @@
 
 stdenv.mkDerivation rec {
   pname = "lagrange";
-  version = "1.7.2";
+  version = "1.7.3";
 
   src = fetchFromGitHub {
     owner = "skyjake";
     repo = "lagrange";
     rev = "v${version}";
-    sha256 = "sha256-iJ6+tc5nls8E/9/Jp5OS9gfJo8SJ5bN+Im/JzEYEAfI=";
+    sha256 = "sha256-peBdmz/aucrKO5Vsj8WkHkpGpLm4inQHee133Zph3MM=";
     fetchSubmodules = true;
   };
 

From 12908d7a486bb800f7d484ecfbdb61a2339dfe31 Mon Sep 17 00:00:00 2001
From: Mrinal Purohit <github@mrinalpurohit.in>
Date: Wed, 27 Oct 2021 15:43:30 +0530
Subject: [PATCH 30/49] gh: 2.1.0 -> 2.2.0

---
 .../version-management/git-and-tools/gh/default.nix         | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/gh/default.nix b/pkgs/applications/version-management/git-and-tools/gh/default.nix
index 9fa8e6e6253a..17484ea31398 100644
--- a/pkgs/applications/version-management/git-and-tools/gh/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/gh/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "gh";
-  version = "2.1.0";
+  version = "2.2.0";
 
   src = fetchFromGitHub {
     owner = "cli";
     repo = "cli";
     rev = "v${version}";
-    sha256 = "sha256-70FmFN76azRqnAZ9SLgr/V8moqkWoBbDB6IdSXM7Vmg=";
+    sha256 = "sha256-/czexUqpdsFQAteZ75ur2SFibrtZWffHpPBEPlLQXSY=";
   };
 
-  vendorSha256 = "sha256-004TspNwjCWnrD86HEf5wGpt8OCP5qIrTwlGWSRNUmg=";
+  vendorSha256 = "sha256-slMl5dCyyVNBgDbpYECfYUbpJJ7sWuSGSutYR3rTzj0=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From 28de4f69f98f22e65e3ffac500fbd4aa5596d2c8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 27 Oct 2021 10:19:05 +0000
Subject: [PATCH 31/49] libsidplayfp: 2.2.2 -> 2.3.0

---
 pkgs/development/libraries/libsidplayfp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libsidplayfp/default.nix b/pkgs/development/libraries/libsidplayfp/default.nix
index f8a39f815c2d..fe902bfdd306 100644
--- a/pkgs/development/libraries/libsidplayfp/default.nix
+++ b/pkgs/development/libraries/libsidplayfp/default.nix
@@ -16,14 +16,14 @@
 
 stdenv.mkDerivation rec {
   pname = "libsidplayfp";
-  version = "2.2.2";
+  version = "2.3.0";
 
   src = fetchFromGitHub {
     owner = "libsidplayfp";
     repo = "libsidplayfp";
     rev = "v${version}";
     fetchSubmodules = true;
-    sha256 = "sha256-RiglS0aqLRDOfwxhVE95NaKpRy94xfeul18o3NB5L3I=";
+    sha256 = "sha256-NtT6NaNs43gp8sgPNkRj85PBbpaG7hdUctDF564nZIk=";
   };
 
   postPatch = ''

From 29fedf210f6eb7aae585946e36654e50be52e317 Mon Sep 17 00:00:00 2001
From: bb010g <me@bb010g.com>
Date: Thu, 18 Apr 2019 20:50:47 -0700
Subject: [PATCH 32/49] canonicalize-jars-hook: add

A build hook to run functions previously only implemented privately in
`pkgs/build-support/release/functions.sh`.
---
 pkgs/build-support/java/canonicalize-jar.nix  |  9 ++++++
 pkgs/build-support/java/canonicalize-jar.sh   | 29 +++++++++++++++++++
 .../setup-hooks/canonicalize-jars.sh          | 17 +++++++++++
 pkgs/top-level/all-packages.nix               |  6 ++++
 4 files changed, 61 insertions(+)
 create mode 100644 pkgs/build-support/java/canonicalize-jar.nix
 create mode 100644 pkgs/build-support/java/canonicalize-jar.sh
 create mode 100644 pkgs/build-support/setup-hooks/canonicalize-jars.sh

diff --git a/pkgs/build-support/java/canonicalize-jar.nix b/pkgs/build-support/java/canonicalize-jar.nix
new file mode 100644
index 000000000000..1edd9a6e0d20
--- /dev/null
+++ b/pkgs/build-support/java/canonicalize-jar.nix
@@ -0,0 +1,9 @@
+{ substituteAll, unzip, zip }:
+
+substituteAll {
+  name = "canonicalize-jar";
+  src = ./canonicalize-jar.sh;
+
+  unzip = "${unzip}/bin/unzip";
+  zip = "${zip}/bin/zip";
+}
diff --git a/pkgs/build-support/java/canonicalize-jar.sh b/pkgs/build-support/java/canonicalize-jar.sh
new file mode 100644
index 000000000000..af010bcd2b26
--- /dev/null
+++ b/pkgs/build-support/java/canonicalize-jar.sh
@@ -0,0 +1,29 @@
+# Canonicalize the manifest & repack with deterministic timestamps.
+canonicalizeJar() {
+    local input='' outer=''
+    input="$(realpath -sm -- "$1")"
+    outer="$(pwd)"
+    # -qq: even quieter
+    @unzip@ -qq "$input" -d "$input-tmp"
+    canonicalizeJarManifest "$input-tmp/META-INF/MANIFEST.MF"
+    # Sets all timestamps to Jan 1 1980, the earliest mtime zips support.
+    find -- "$input-tmp" -exec touch -t 198001010000.00 {} +
+    rm "$input"
+    pushd "$input-tmp" 2>/dev/null
+    # -q|--quiet, -r|--recurse-paths
+    # -o|--latest-time: canonicalizes overall archive mtime
+    # -X|--no-extra: don't store platform-specific extra file attribute fields
+    @zip@ -qroX "$outer/tmp-out.jar" . 2> /dev/null
+    popd 2>/dev/null
+    rm -rf "$input-tmp"
+    mv "$outer/tmp-out.jar" "$input"
+}
+
+# See also the Java specification's JAR requirements:
+# https://docs.oracle.com/javase/8/docs/technotes/guides/jar/jar.html#Notes_on_Manifest_and_Signature_Files
+canonicalizeJarManifest() {
+    local input=''
+    input="$(realpath -sm -- "$1")"
+    (head -n 1 "$input" && tail -n +2 "$input" | sort | grep -v '^\s*$') > "$input-tmp"
+    mv "$input-tmp" "$input"
+}
diff --git a/pkgs/build-support/setup-hooks/canonicalize-jars.sh b/pkgs/build-support/setup-hooks/canonicalize-jars.sh
new file mode 100644
index 000000000000..8c55810748ea
--- /dev/null
+++ b/pkgs/build-support/setup-hooks/canonicalize-jars.sh
@@ -0,0 +1,17 @@
+# This setup hook causes the fixup phase to repack all JAR files in a
+# canonical & deterministic fashion, e.g. resetting mtimes (like with normal
+# store files) and avoiding impure metadata.
+
+fixupOutputHooks+=('if [ -z "$dontCanonicalizeJars" -a -e "$prefix" ]; then canonicalizeJarsIn "$prefix"; fi')
+
+canonicalizeJarsIn() {
+  local dir="$1"
+  header "canonicalizing jars in $dir"
+  dir="$(realpath -sm -- "$dir")"
+  while IFS= read -rd '' f; do
+    canonicalizeJar "$f"
+  done < <(find -- "$dir" -type f -name '*.jar' -print0)
+  stopNest
+}
+
+source @canonicalize_jar@
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 65f6d2273884..66e0023475a3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -153,6 +153,12 @@ with pkgs;
 
   appindicator-sharp = callPackage ../development/libraries/appindicator-sharp { };
 
+  canonicalize-jar = callPackage ../build-support/java/canonicalize-jar.nix { };
+  canonicalize-jars-hook = makeSetupHook {
+    name = "canonicalize-jars-hook";
+    substitutions = { canonicalize_jar = canonicalize-jar; };
+  } ../build-support/setup-hooks/canonicalize-jars.sh;
+
   ensureNewerSourcesHook = { year }: makeSetupHook {}
     (writeScript "ensure-newer-sources-hook.sh" ''
       postUnpackHooks+=(_ensureNewerSources)

From a1ed62e586a5c9c09d1f39c78282395becd8e7a9 Mon Sep 17 00:00:00 2001
From: bb010g <me@bb010g.com>
Date: Thu, 18 Apr 2019 20:50:47 -0700
Subject: [PATCH 33/49] releaseTools.antBuild: remove

The sole consumer in Nixpkgs of `releaseTools.antBuild` is
`pkgs/development/libraries/junit`, which has been broken since
2015-09-08. The sole consumer in Nixpkgs of `junit` is
`pkgs/development/libraries/junixsocket`, which hasn't built due to
`junit` since 2015-09-08. All three are removed due to their obvious
lack of use.

All other packages in Nixpkgs depending on junit consume
`pkgs/development/java-modules/junit`, which is not broken.

Any downstreams that have kept using these `junit` or `junixsocket`
packages since 2015-09-08 have basically already vendored the packages
via patching them, so no aliases are provided.
---
 pkgs/build-support/release/ant-build.nix      | 123 ------------------
 pkgs/build-support/release/default.nix        |   4 -
 pkgs/build-support/release/functions.sh       |  23 ----
 .../libraries/java/junit/default.nix          |  28 ----
 .../libraries/java/junixsocket/darwin.patch   |  20 ---
 .../libraries/java/junixsocket/default.nix    |  42 ------
 pkgs/top-level/all-packages.nix               |   4 -
 7 files changed, 244 deletions(-)
 delete mode 100644 pkgs/build-support/release/ant-build.nix
 delete mode 100644 pkgs/development/libraries/java/junit/default.nix
 delete mode 100644 pkgs/development/libraries/java/junixsocket/darwin.patch
 delete mode 100644 pkgs/development/libraries/java/junixsocket/default.nix

diff --git a/pkgs/build-support/release/ant-build.nix b/pkgs/build-support/release/ant-build.nix
deleted file mode 100644
index 6b59241e01ed..000000000000
--- a/pkgs/build-support/release/ant-build.nix
+++ /dev/null
@@ -1,123 +0,0 @@
-{ src
-, pkgs
-, lib
-, stdenv ? pkgs.stdenv
-, name
-, antTargets ? []
-, jars ? []
-, jarWrappers ? []
-, antProperties ? []
-, antBuildInputs ? []
-, buildfile ? "build.xml"
-, ant ? pkgs.ant
-, jre ? pkgs.jdk
-, hydraAntLogger ? pkgs.hydraAntLogger
-, zip ? pkgs.zip
-, unzip ? pkgs.unzip
-, ... } @ args:
-
-let
-  antFlags = "-f ${buildfile} " + lib.concatMapStrings ({name, value}: "-D${name}=${value} " ) antProperties ;
-in
-stdenv.mkDerivation (
-
-  {
-    inherit jre ant;
-    showBuildStats = true;
-
-    postPhases =
-      ["generateWrappersPhase" "finalPhase"];
-
-    prePhases =
-      ["antSetupPhase"];
-
-    antSetupPhase = with lib; ''
-      if test "$hydraAntLogger" != "" ; then
-        export ANT_ARGS="-logger org.hydra.ant.HydraLogger -lib `ls $hydraAntLogger/share/java/*.jar | head -1`"
-      fi
-      for abi in ${concatStringsSep " " (map (f: "`find ${f} -name '*.jar'`") antBuildInputs)}; do
-        export ANT_ARGS="$ANT_ARGS -lib $abi"
-      done
-    '';
-
-    installPhase = ''
-      runHook preInstall
-
-      mkdir -p $out/share/java
-      ${ if jars == [] then ''
-           find . -name "*.jar" | xargs -I{} cp -v {} $out/share/java
-         '' else lib.concatMapStrings (j: ''
-           cp -v ${j} $out/share/java
-         '') jars }
-
-      . ${./functions.sh}
-      for j in $out/share/java/*.jar ; do
-        canonicalizeJar $j
-        echo file jar $j >> $out/nix-support/hydra-build-products
-      done
-
-      runHook postInstall
-    '';
-
-    generateWrappersPhase =
-      let
-        cp = w: "-cp '${lib.optionalString (w ? classPath) w.classPath}${lib.optionalString (w ? mainClass) ":$out/share/java/*"}'";
-      in
-      ''
-      header "Generating jar wrappers"
-    '' + (lib.concatMapStrings (w: ''
-
-      mkdir -p $out/bin
-      cat >> $out/bin/${w.name} <<EOF
-      #!${pkgs.runtimeShell}
-      export JAVA_HOME=$jre
-      $jre/bin/java ${cp w} ${if w ? mainClass then w.mainClass else "-jar ${w.jar}"} \$@
-      EOF
-
-      chmod a+x $out/bin/${w.name} || exit 1
-    '') jarWrappers) + ''
-      closeNest
-    '';
-
-    buildPhase = ''
-      runHook preBuild
-    '' + (if antTargets == [] then ''
-      header "Building default ant target"
-      ant ${antFlags}
-      closeNest
-    '' else lib.concatMapStrings (t: ''
-      header "Building '${t}' target"
-      ant ${antFlags} ${t}
-      closeNest
-    '') antTargets) + ''
-      runHook postBuild
-    '';
-
-    finalPhase =
-      ''
-        # Propagate the release name of the source tarball.  This is
-        # to get nice package names in channels.
-        if test -e $origSrc/nix-support/hydra-release-name; then
-          cp $origSrc/nix-support/hydra-release-name $out/nix-support/hydra-release-name
-        fi
-      '';
-  }
-
-  // removeAttrs args ["antProperties" "buildInputs" "pkgs" "lib" "jarWrappers"] //
-
-  {
-    name = name + (if src ? version then "-" + src.version else "");
-
-    nativeBuildInputs = [ unzip ];
-    buildInputs = [ant jre zip] ++ lib.optional (args ? buildInputs) args.buildInputs ;
-
-    postHook = ''
-      mkdir -p $out/nix-support
-      echo "$system" > $out/nix-support/system
-      . ${./functions.sh}
-
-      origSrc=$src
-      src=$(findTarball $src)
-    '';
-  }
-)
diff --git a/pkgs/build-support/release/default.nix b/pkgs/build-support/release/default.nix
index 83f755b2bece..d593ec81197e 100644
--- a/pkgs/build-support/release/default.nix
+++ b/pkgs/build-support/release/default.nix
@@ -14,10 +14,6 @@ rec {
     { inherit stdenv;
     } // args);
 
-  antBuild = args: import ./ant-build.nix (
-    { inherit lib pkgs;
-    } // args);
-
   mvnBuild = args: import ./maven-build.nix (
     { inherit stdenv;
     } // args);
diff --git a/pkgs/build-support/release/functions.sh b/pkgs/build-support/release/functions.sh
index 120d19685427..0c4b81edf822 100644
--- a/pkgs/build-support/release/functions.sh
+++ b/pkgs/build-support/release/functions.sh
@@ -11,29 +11,6 @@ findTarball() {
     fi
 }
 
-canonicalizeJarManifest() {
-    local input=$1
-    # http://docs.oracle.com/javase/7/docs/technotes/guides/jar/jar.html#Notes_on_Manifest_and_Signature_Files
-    (head -n 1 $input && tail -n +2 $input | sort | grep -v '^\s*$') > $input-tmp
-    mv $input-tmp $input
-}
-
-# Post-process a jar file to contain canonical timestamps and metadata ordering
-canonicalizeJar() {
-    local input=$1
-    local outer=$(pwd)
-    unzip -qq $input -d $input-tmp
-    canonicalizeJarManifest $input-tmp/META-INF/MANIFEST.MF
-    # Set all timestamps to Jan 1 1980, which is the earliest date the zip format supports...
-    find $input-tmp -exec touch -t 198001010000.00 {} +
-    rm $input
-    pushd $input-tmp
-    zip -q -r -o -X $outer/tmp-out.jar . 2> /dev/null
-    popd
-    rm -rf $input-tmp
-    mv $outer/tmp-out.jar $input
-}
-
 propagateImageName() {
     mkdir -p $out/nix-support
     cat "$diskImage"/nix-support/full-name > $out/nix-support/full-name
diff --git a/pkgs/development/libraries/java/junit/default.nix b/pkgs/development/libraries/java/junit/default.nix
deleted file mode 100644
index 5a1079851772..000000000000
--- a/pkgs/development/libraries/java/junit/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ lib, antBuild, fetchgit, perl }:
-
-let
-  version = "4.11";
-in antBuild {
-  name = "junit-${version}";
-
-  # I think this is only used to generate the docs, and will likely disappear
-  # with the next release of junit since its build system completely changes.
-  buildInputs = [perl];
-
-  src = fetchgit {
-    url = "https://github.com/junit-team/junit.git";
-    sha256 = "1cn5dhs6vpbfbcmnm2vb1212n0kblv8cxrvnwmksjxd6bzlkac1k";
-    rev = "c2e4d911fadfbd64444fb285342a8f1b72336169";
-  };
-
-  antProperties = [
-    { name = "version"; value = version; }
-  ];
-
-  meta = {
-    homepage = "http://www.junit.org/";
-    description = "A framework for repeatable tests in Java";
-    license = lib.licenses.epl10;
-    broken = true;
-  };
-}
diff --git a/pkgs/development/libraries/java/junixsocket/darwin.patch b/pkgs/development/libraries/java/junixsocket/darwin.patch
deleted file mode 100644
index 97fd42d0b81b..000000000000
--- a/pkgs/development/libraries/java/junixsocket/darwin.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -rc junixsocket-1.3/src/main/org/newsclub/net/unix/NativeUnixSocket.java junixsocket-1.3-new/src/main/org/newsclub/net/unix/NativeUnixSocket.java
-*** junixsocket-1.3/src/main/org/newsclub/net/unix/NativeUnixSocket.java        Tue Jul 20 14:59:41 2010
---- junixsocket-1.3-new/src/main/org/newsclub/net/unix/NativeUnixSocket.java    Sun May 27 22:26:15 2012
-***************
-*** 43,49 ****
-              String prefix = "lib";
-              String suffix = ".so";
-              String os = osName.replaceAll("[^A-Za-z0-9]", "").toLowerCase();
-!             if ("macosx".equals(os)) {
-                  suffix = ".dylib";
-              } else if ("linux".equals(os) || "freebsd".equals(os)
-                      || "sunos".equals(os)) {
---- 43,49 ----
-              String prefix = "lib";
-              String suffix = ".so";
-              String os = osName.replaceAll("[^A-Za-z0-9]", "").toLowerCase();
-!             if ("macosx".equals(os) || "darwin".equals(os)) {
-                  suffix = ".dylib";
-              } else if ("linux".equals(os) || "freebsd".equals(os)
-                      || "sunos".equals(os)) {
diff --git a/pkgs/development/libraries/java/junixsocket/default.nix b/pkgs/development/libraries/java/junixsocket/default.nix
deleted file mode 100644
index 0484f4c59ba6..000000000000
--- a/pkgs/development/libraries/java/junixsocket/default.nix
+++ /dev/null
@@ -1,42 +0,0 @@
-{ lib, stdenv, fetchurl, ant, jdk, junit }:
-
-stdenv.mkDerivation rec {
-  name = "junixsocket-1.3";
-
-  src = fetchurl {
-    url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/junixsocket/${name}-src.tar.bz2";
-    sha256 = "0c6p8vmiv5nk8i6g1hgivnl3mpb2k3lhjjz0ss9dlirisfrxf1ym";
-  };
-
-  patches = [ ./darwin.patch ];
-
-  buildInputs = [ ant jdk junit ];
-
-  preConfigure =
-    ''
-      substituteInPlace src/main/org/newsclub/net/unix/NativeUnixSocketConfig.java \
-        --replace /opt/newsclub/lib-native $out/lib
-    '';
-
-  buildPhase = "ant";
-
-  ANT_ARGS =
-    # Note that our OpenJDK on Darwin is currently 32-bit, so we have to build a 32-bit dylib.
-    (if stdenv.is64bit then [ "-Dskip32=true" ] else [ "-Dskip64=true" ])
-    ++ [ "-Dgcc=${stdenv.cc.targetPrefix}cc" "-Dant.build.javac.source=1.6" ]
-    ++ lib.optional stdenv.isDarwin "-DisMac=true";
-
-  installPhase =
-    ''
-      mkdir -p $out/share/java $out/lib
-      cp -v dist/*.jar $out/share/java
-      cp -v lib-native/*.so lib-native/*.dylib $out/lib/
-    '';
-
-  meta = {
-    description = "A Java/JNI library for using Unix Domain Sockets from Java";
-    homepage = "https://github.com/kohlschutter/junixsocket";
-    license = lib.licenses.asl20;
-    platforms = lib.platforms.linux ++ lib.platforms.darwin;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 66e0023475a3..fc6a4f361c20 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20159,10 +20159,6 @@ with pkgs;
 
   jflex = callPackage ../development/libraries/java/jflex { };
 
-  junit = callPackage ../development/libraries/java/junit { antBuild = releaseTools.antBuild; };
-
-  junixsocket = callPackage ../development/libraries/java/junixsocket { };
-
   lombok = callPackage ../development/libraries/java/lombok { };
 
   lucene = callPackage ../development/libraries/java/lucene { };

From 20ccd74a3620fe0a5a9632522c8dcd46eda9dbd7 Mon Sep 17 00:00:00 2001
From: bb010g <me@bb010g.com>
Date: Thu, 18 Apr 2019 20:51:16 -0700
Subject: [PATCH 34/49] swt: make reproducible

---
 .../libraries/java/swt/default.nix            | 26 ++++++++++++++-----
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/java/swt/default.nix b/pkgs/development/libraries/java/swt/default.nix
index bf35490f9a88..9e56fdf45252 100644
--- a/pkgs/development/libraries/java/swt/default.nix
+++ b/pkgs/development/libraries/java/swt/default.nix
@@ -1,6 +1,7 @@
-{ stdenv, lib, fetchurl, unzip, jdk, pkg-config, gtk2
-, libXt, libXtst, libXi, libGLU, libGL, webkitgtk, libsoup, xorg
-, pango, gdk-pixbuf, glib
+{ lib, stdenv, fetchurl, canonicalize-jars-hook
+, gtk2, jdk, libGL, libGLU, libXi, libXt, libXtst, libsoup, webkitgtk
+, gdk-pixbuf, glib, pango, xorg
+, unzip, pkg-config
 }:
 
 let
@@ -35,11 +36,22 @@ in stdenv.mkDerivation rec {
 
   sourceRoot = ".";
 
-  nativeBuildInputs = [ unzip pkg-config ];
-  buildInputs = [ jdk gtk2 libXt libXtst libXi libGLU libGL webkitgtk libsoup ];
+  nativeBuildInputs = [ canonicalize-jars-hook unzip pkg-config ];
+  buildInputs = [
+    gtk2
+    jdk
+    libGL
+    libGLU
+    libXi
+    libXt
+    libXtst
+    libsoup
+    webkitgtk
+  ];
 
-  NIX_LFLAGS = toString (map (x: "-L${lib.getLib x}/lib") [ xorg.libX11 pango gdk-pixbuf glib ]) +
-    " -lX11 -lpango-1.0 -lgdk_pixbuf-2.0 -lglib-2.0";
+  NIX_LFLAGS = toString
+    ((map (x: "-L${lib.getLib x}/lib") [ xorg.libX11 pango gdk-pixbuf glib ]) ++
+      [ "-lX11" "-lpango-1.0" "-lgdk_pixbuf-2.0" "-lglib-2.0" ]);
 
   buildPhase = ''
     unzip src.zip -d src

From 076a4b662cd7369d1732ad58f69d97ddf44b532d Mon Sep 17 00:00:00 2001
From: bb010g <me@bb010g.com>
Date: Sun, 21 Apr 2019 13:12:28 -0700
Subject: [PATCH 35/49] swt: less arbitrary LFLAGS & cleanup

Cleaner nested unpacking, as well as general robustness improvements.
Turns out the LFLAGS stuff was from upstream not trusting pkg-config on
their boxes, but it works great for us. (Or rather, it works great after
fixing some of their pkg-config invocations.)

Assisted by the diffoscope ( https://diffoscope.org/ ) and readelf
grepping based on its output.
---
 .../libraries/java/swt/awt-libs.patch         |   8 +
 .../libraries/java/swt/default.nix            | 147 +++++++++++++-----
 .../libraries/java/swt/gtk-libs.patch         |  14 ++
 3 files changed, 132 insertions(+), 37 deletions(-)
 create mode 100644 pkgs/development/libraries/java/swt/awt-libs.patch
 create mode 100644 pkgs/development/libraries/java/swt/gtk-libs.patch

diff --git a/pkgs/development/libraries/java/swt/awt-libs.patch b/pkgs/development/libraries/java/swt/awt-libs.patch
new file mode 100644
index 000000000000..6c3ff53b7983
--- /dev/null
+++ b/pkgs/development/libraries/java/swt/awt-libs.patch
@@ -0,0 +1,8 @@
+--- a/make_linux.mak
++++ b/make_linux.mak
+@@ -63,4 +63,4 @@
+
+ AWT_LFLAGS = -shared ${SWT_LFLAGS}
+-AWT_LIBS = -L$(AWT_LIB_PATH) -ljawt
++AWT_LIBS = `pkg-config --libs x11` -L$(AWT_LIB_PATH) -ljawt
+
diff --git a/pkgs/development/libraries/java/swt/default.nix b/pkgs/development/libraries/java/swt/default.nix
index 9e56fdf45252..b85b348a9640 100644
--- a/pkgs/development/libraries/java/swt/default.nix
+++ b/pkgs/development/libraries/java/swt/default.nix
@@ -1,85 +1,158 @@
-{ lib, stdenv, fetchurl, canonicalize-jars-hook
-, gtk2, jdk, libGL, libGLU, libXi, libXt, libXtst, libsoup, webkitgtk
-, gdk-pixbuf, glib, pango, xorg
-, unzip, pkg-config
+{ lib
+, stdenv
+, canonicalize-jars-hook
+, fetchzip
+, pkg-config
+, atk
+, glib
+, gtk2
+, jdk
+, libGL
+, libGLU
+, libXt
+, libXtst
+, gnome2
 }:
 
 let
   platformMap = {
     x86_64-linux =
       { platform = "gtk-linux-x86_64";
-        sha256 = "1qq0pjll6030v4ml0hifcaaik7sx3fl7ghybfdw95vsvxafwp2ff"; };
+        sha256 = "17frac2nsx22hfa72264as31rn35hfh9gfgy0n6wvc3knl5d2716"; };
     i686-linux =
       { platform = "gtk-linux-x86";
-        sha256 = "03mhzraikcs4fsz7d3h5af9pw1bbcfd6dglsvbk2ciwimy9zj30q"; };
+        sha256 = "13ca17rga9yvdshqvh0sfzarmdcl4wv4pid0ls7v35v4844zbc8b"; };
     x86_64-darwin =
       { platform = "cocoa-macosx-x86_64";
-        sha256 = "00k1mfbncvyh8klgmk0891w8jwnd5niqb16j1j8yacrm2smmlb05"; };
+        sha256 = "0wjyxlw7i9zd2m8syd6k1q85fj8pzhxlfsrl8fpgsj37p698bd0a"; };
   };
 
-  metadata = assert platformMap ? ${stdenv.hostPlatform.system}; platformMap.${stdenv.hostPlatform.system};
-
+  metadata = assert platformMap ? ${stdenv.hostPlatform.system};
+    platformMap.${stdenv.hostPlatform.system};
 in stdenv.mkDerivation rec {
+  pname = "swt";
   version = "4.5";
   fullVersion = "${version}-201506032000";
-  pname = "swt";
 
   hardeningDisable = [ "format" ];
 
   # Alas, the Eclipse Project apparently doesn't produce source-only
   # releases of SWT.  So we just grab a binary release and extract
   # "src.zip" from that.
-  src = fetchurl {
-    url = "http://archive.eclipse.org/eclipse/downloads/drops4/R-${fullVersion}/${pname}-${version}-${metadata.platform}.zip";
-    sha256 = metadata.sha256;
+  src = fetchzip {
+    url = "https://archive.eclipse.org/eclipse/downloads/drops4/" +
+      "R-${fullVersion}/${pname}-${version}-${metadata.platform}.zip";
+    inherit (metadata) sha256;
+    stripRoot = false;
+    extraPostFetch = ''
+      mkdir "$unpackDir"
+      cd "$unpackDir"
+
+      renamed="$TMPDIR/src.zip"
+      mv "$out/src.zip" "$renamed"
+      unpackFile "$renamed"
+      rm -r "$out"
+
+      mv "$unpackDir" "$out"
+    '';
   };
 
-  sourceRoot = ".";
-
-  nativeBuildInputs = [ canonicalize-jars-hook unzip pkg-config ];
+  nativeBuildInputs = [
+    canonicalize-jars-hook
+    pkg-config
+  ];
   buildInputs = [
+    atk
     gtk2
     jdk
     libGL
     libGLU
-    libXi
-    libXt
     libXtst
-    libsoup
-    webkitgtk
+    gnome2.gnome_vfs
+    gnome2.libgnome
+    gnome2.libgnomeui
+  ] ++ lib.optionals (lib.hasPrefix "8u" jdk.version) [
+    libXt
   ];
 
-  NIX_LFLAGS = toString
-    ((map (x: "-L${lib.getLib x}/lib") [ xorg.libX11 pango gdk-pixbuf glib ]) ++
-      [ "-lX11" "-lpango-1.0" "-lgdk_pixbuf-2.0" "-lglib-2.0" ]);
+  patches = [ ./awt-libs.patch ./gtk-libs.patch ];
+
+  prePatch = ''
+    # clear whitespace from makefiles (since we match on EOL later)
+    sed -i 's/ \+$//' ./*.mak
+  '';
+
+  postPatch = let makefile-sed = builtins.toFile "swt-makefile.sed" (''
+    # fix pkg-config invocations in CFLAGS/LIBS pairs.
+    #
+    # change:
+    #     FOOCFLAGS = `pkg-config --cflags `foo bar`
+    #     FOOLIBS = `pkg-config --libs-only-L foo` -lbaz
+    # into:
+    #     FOOCFLAGS = `pkg-config --cflags foo bar`
+    #     FOOLIBS = `pkg-config --libs foo bar`
+    #
+    # the latter works more consistently.
+    /^[A-Z0-9_]\+CFLAGS = `pkg-config --cflags [^`]\+`$/ {
+      N
+      s'' +
+        "/" + ''
+          ^\([A-Z0-9_]\+\)CFLAGS = `pkg-config --cflags \(.\+\)`\
+          \1LIBS = `pkg-config --libs-only-L .\+$'' +
+        "/" + ''
+          \1CFLAGS = `pkg-config --cflags \2`\
+          \1LIBS = `pkg-config --libs \2`'' +
+        "/\n" + ''
+    }
+    # fix WebKit libs not being there
+    s/\$(WEBKIT_LIB) \$(WEBKIT_OBJECTS)$/\0 `pkg-config --libs glib-2.0`/g
+  ''); in ''
+    declare -a makefiles=(./*.mak)
+    sed -i -f ${makefile-sed} "''${makefiles[@]}"
+    # assign Makefile variables eagerly & change backticks to `$(shell …)`
+    sed -i -e 's/ = `\([^`]\+\)`/ := $(shell \1)/' \
+      -e 's/`\([^`]\+\)`/$(shell \1)/' \
+      "''${makefiles[@]}"
+  '';
 
   buildPhase = ''
-    unzip src.zip -d src
+    runHook preBuild
 
-    cd src
-    sed -i "s#^LFLAGS =#LFLAGS = $NIX_LFLAGS #g"  *.mak
     export JAVA_HOME=${jdk}
 
-    sh ./build.sh
+    ./build.sh
 
     mkdir out
-    javac -d out/ $(find org/ -name "*.java")
+    find org/ -name '*.java' -type f -exec javac -d out/ {} +
+
+    runHook postBuild
   '';
 
   installPhase = ''
-    mkdir -p $out/lib
-    cp *.so $out/lib
+    runHook preInstall
 
-    mkdir -p $out/jars
-    cp version.txt out/
-    cd out && jar -c * > $out/jars/swt.jar
+    if [ -n "$prefix" ]; then
+      mkdir -p "$prefix"
+    fi
+
+    mkdir -p "$out/lib"
+    cp -t "$out/lib" ./*.so
+
+    mkdir -p "$out/jars"
+    cp -t out/ version.txt
+    (cd out && jar -c *) > "$out/jars/swt.jar"
+
+    runHook postInstall
   '';
 
   meta = with lib; {
-    homepage = "http://www.eclipse.org/swt/";
-    description = "An widget toolkit for Java to access the user-interface facilities of the operating systems on which it is implemented";
+    homepage = "https://www.eclipse.org/swt/";
+    description = ''
+      A widget toolkit for Java to access the user-interface facilities of
+      the operating systems on which it is implemented.
+    '';
     license = licenses.epl10;
-    maintainers = with maintainers; [ pSub ];
-    platforms = with platforms; linux;
+    maintainers = with maintainers; [ bb010g ];
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/java/swt/gtk-libs.patch b/pkgs/development/libraries/java/swt/gtk-libs.patch
new file mode 100644
index 000000000000..cd13082b5df7
--- /dev/null
+++ b/pkgs/development/libraries/java/swt/gtk-libs.patch
@@ -0,0 +1,14 @@
+--- a/make_linux.mak
++++ b/make_linux.mak
+@@ -53,9 +53,4 @@
+
+-# Do not use pkg-config to get libs because it includes unnecessary dependencies (i.e. pangoxft-1.0)
+-GTKCFLAGS = `pkg-config --cflags gtk+-$(GTK_VERSION) gtk+-unix-print-$(GTK_VERSION)`
++GTKCFLAGS = `pkg-config --cflags gtk+-$(GTK_VERSION) gthread-2.0 gtk+-unix-print-$(GTK_VERSION) x11 xtst`
++GTKLIBS = `pkg-config --libs gtk+-$(GTK_VERSION) gthread-2.0 gtk+-unix-print-$(GTK_VERSION) x11 xtst`
+-ifeq ($(GTK_VERSION), 3.0)
+-GTKLIBS = `pkg-config --libs-only-L gtk+-$(GTK_VERSION) gthread-2.0` $(XLIB64) -L/usr/X11R6/lib -lgtk-3 -lgdk-3 -lcairo -lgthread-2.0 -lXtst
+-else
+-GTKLIBS = `pkg-config --libs-only-L gtk+-$(GTK_VERSION) gthread-2.0` $(XLIB64) -L/usr/X11R6/lib -lgtk-x11-$(GTK_VERSION) -lgthread-2.0 -lXtst
+-endif
+

From 0ed0c3ceeb03073a8955bcb63219ed034f9c44ee Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Wed, 27 Oct 2021 13:59:53 +0300
Subject: [PATCH 36/49] areca: Mark as broken

---
 pkgs/applications/backup/areca/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/backup/areca/default.nix b/pkgs/applications/backup/areca/default.nix
index b50ebdd4a87b..d16fc0f85c55 100644
--- a/pkgs/applications/backup/areca/default.nix
+++ b/pkgs/applications/backup/areca/default.nix
@@ -47,6 +47,8 @@ stdenv.mkDerivation {
   meta = with lib; {
     homepage = "http://www.areca-backup.org/";
     description = "An Open Source personal backup solution";
+    # Builds fine but fails to launch.
+    broken = true;
     license = licenses.gpl2;
     maintainers = with maintainers; [ pSub ];
     platforms = with platforms; linux;

From 16aa9f2ca7cbb7e8c82bbae6f8e3147c650af56e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 27 Oct 2021 11:10:33 +0000
Subject: [PATCH 37/49] mpdevil: 1.3.0 -> 1.4.0

---
 pkgs/applications/audio/mpdevil/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/mpdevil/default.nix b/pkgs/applications/audio/mpdevil/default.nix
index b55cf9be3518..e355cfb86de0 100644
--- a/pkgs/applications/audio/mpdevil/default.nix
+++ b/pkgs/applications/audio/mpdevil/default.nix
@@ -7,13 +7,13 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "mpdevil";
-  version = "1.3.0";
+  version = "1.4.0";
 
   src = fetchFromGitHub {
     owner = "SoongNoonien";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1wa5wkkv8kvzlxrhqmmhjmrzcm5v2dij516dk4vlpv9sazc6gzkm";
+    sha256 = "1zx129zl6bjb0j3f81yx2641nsj6ck04q5f0v0g8f08xgdwsyv3b";
   };
 
   nativeBuildInputs = [

From 9d969b84af3a7f3c2e205862a4990efd75bd140d Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@gmail.com>
Date: Wed, 27 Oct 2021 14:18:17 +0300
Subject: [PATCH 38/49] =?UTF-8?q?qbe:=202021-06-17=20=E2=86=92=202021-10-2?=
 =?UTF-8?q?6,=20fix=20on=20darwin?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/development/compilers/qbe/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/qbe/default.nix b/pkgs/development/compilers/qbe/default.nix
index e2e0c92a162d..8f6ea0825fa0 100644
--- a/pkgs/development/compilers/qbe/default.nix
+++ b/pkgs/development/compilers/qbe/default.nix
@@ -6,12 +6,12 @@
 
 stdenv.mkDerivation rec {
   pname = "qbe";
-  version = "unstable-2021-06-17";
+  version = "unstable-2021-10-26";
 
   src = fetchgit {
     url = "git://c9x.me/qbe.git";
-    rev = "6d9ee1389572ae985f6a39bb99dbd10cdf42c123";
-    sha256 = "NaURS5Eu8NBd92wGQcyFEXCALU9Z93nNQeZ8afq4KMw=";
+    rev = "900805a8fe5cfa799966c4ef221524e967c44ca5";
+    sha256 = "sha256-ahUpG2JH3Ee6FUGfTYZZ2TLk5tF6ovvMxbsjZjVug2o=";
   };
 
   makeFlags = [ "PREFIX=$(out)" ];

From b46055e928426e825681b6583a6cd59740bd06e3 Mon Sep 17 00:00:00 2001
From: Cyril Cohen <cohen@crans.org>
Date: Wed, 27 Oct 2021 13:19:57 +0200
Subject: [PATCH 39/49] coqPackages.coq-elpi: 1.10 -> 1.11

---
 pkgs/development/coq-modules/coq-elpi/default.nix      | 10 +++++++---
 .../coq-modules/hierarchy-builder/default.nix          |  4 ++++
 pkgs/development/ocaml-modules/elpi/default.nix        |  3 ++-
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/coq-modules/coq-elpi/default.nix b/pkgs/development/coq-modules/coq-elpi/default.nix
index 5bf0cd8f8351..9adcbaaa8c75 100644
--- a/pkgs/development/coq-modules/coq-elpi/default.nix
+++ b/pkgs/development/coq-modules/coq-elpi/default.nix
@@ -4,7 +4,8 @@ with builtins; with lib; let
   elpi = coq.ocamlPackages.elpi.override (lib.switch coq.coq-version [
     { case = "8.11"; out = { version = "1.11.4"; };}
     { case = "8.12"; out = { version = "1.12.0"; };}
-    { case = "8.13"; out = { version = "1.13.5"; };}
+    { case = "8.13"; out = { version = "1.13.7"; };}
+    { case = "8.14"; out = { version = "1.13.7"; };}
   ] {});
 in mkCoqDerivation {
   pname = "elpi";
@@ -12,11 +13,14 @@ in mkCoqDerivation {
   owner = "LPCIC";
   inherit version;
   defaultVersion = lib.switch coq.coq-version [
-    { case = "8.13"; out = "1.10.1"; }
+    { case = "8.14"; out = "1.11.2"; }
+    { case = "8.13"; out = "1.11.1"; }
     { case = "8.12"; out = "1.8.3_8.12"; }
     { case = "8.11"; out = "1.6.3_8.11"; }
   ] null;
-  release."1.10.1".sha256      = "1zsyx26dvj7pznfd2msl2w7zbw51q1nsdw0bdvdha6dga7ijf7xk";
+  release."1.11.2".sha256     = "0qk5cfh15y2zrja7267629dybd3irvxk1raz7z8qfir25a81ckd4";
+  release."1.11.1".sha256     = "10j076vc2hdcbm15m6s7b6xdzibgfcbzlkgjnlkr2vv9k13qf8kc";
+  release."1.10.1".sha256     = "1zsyx26dvj7pznfd2msl2w7zbw51q1nsdw0bdvdha6dga7ijf7xk";
   release."1.9.7".sha256      = "0rvn12h9dpk9s4pxy32p8j0a1h7ib7kg98iv1cbrdg25y5vs85n1";
   release."1.9.5".sha256      = "0gjdwmb6bvb5gh0a6ra48bz5fb3pr5kpxijb7a8mfydvar5i9qr6";
   release."1.9.4".sha256      = "0nii7238mya74f9g6147qmpg6gv6ic9b54x5v85nb6q60d9jh0jq";
diff --git a/pkgs/development/coq-modules/hierarchy-builder/default.nix b/pkgs/development/coq-modules/hierarchy-builder/default.nix
index aff3bc30b5b0..1feb873908a7 100644
--- a/pkgs/development/coq-modules/hierarchy-builder/default.nix
+++ b/pkgs/development/coq-modules/hierarchy-builder/default.nix
@@ -5,9 +5,11 @@ with lib; mkCoqDerivation {
   owner = "math-comp";
   inherit version;
   defaultVersion = with versions; switch coq.coq-version [
+    { case = range "8.13" "8.14"; out = "1.2.0"; }
     { case = range "8.12" "8.13"; out = "1.1.0"; }
     { case = isEq "8.11";         out = "0.10.0"; }
   ] null;
+  release."1.2.0".sha256  = "0sk01rvvk652d86aibc8rik2m8iz7jn6mw9hh6xkbxlsvh50719d";
   release."1.1.0".sha256  = "sha256-spno5ty4kU4WWiOfzoqbXF8lWlNSlySWcRReR3zE/4Q=";
   release."1.0.0".sha256  = "0yykygs0z6fby6vkiaiv3azy1i9yx4rqg8xdlgkwnf2284hffzpp";
   release."0.10.0".sha256 = "1a3vry9nzavrlrdlq3cys3f8kpq3bz447q8c4c7lh2qal61wb32h";
@@ -19,6 +21,8 @@ with lib; mkCoqDerivation {
 
   mlPlugin = true;
 
+  buildPhase = "make build";
+
   installFlags = [ "DESTDIR=$(out)" "COQMF_COQLIB=lib/coq/${coq.coq-version}" ];
   extraInstallFlags = [ "VFILES=structures.v" ];
 
diff --git a/pkgs/development/ocaml-modules/elpi/default.nix b/pkgs/development/ocaml-modules/elpi/default.nix
index 642a249e4937..f04c3b1fe253 100644
--- a/pkgs/development/ocaml-modules/elpi/default.nix
+++ b/pkgs/development/ocaml-modules/elpi/default.nix
@@ -1,10 +1,11 @@
 { stdenv, lib, fetchzip, buildDunePackage, camlp5
 , ppxlib, ppx_deriving, re, perl, ncurses
-, version ? "1.13.5"
+, version ? "1.13.7"
 }:
 with lib;
 let fetched = import ../../../build-support/coq/meta-fetch/default.nix
   {inherit lib stdenv fetchzip; } ({
+    release."1.13.7".sha256 = "10fnwz30bsvj7ii1vg4l1li5pd7n0qqmwj18snkdr5j9gk0apc1r";
     release."1.13.5".sha256 = "02a6r23mximrdvs6kgv6rp0r2dgk7zynbs99nn7lphw2c4189kka";
     release."1.13.1".sha256 = "12a9nbdvg9gybpw63lx3nw5wnxfznpraprb0wj3l68v1w43xq044";
     release."1.13.0".sha256 = "0dmzy058m1mkndv90byjaik6lzzfk3aaac7v84mpmkv6my23bygr";

From 1bbbd8166e37d57877b2551ae6e23ba3bc32e3ee Mon Sep 17 00:00:00 2001
From: Mrinal Purohit <github@mrinalpurohit.in>
Date: Wed, 27 Oct 2021 17:17:53 +0530
Subject: [PATCH 40/49] broot: 1.6.2 -> 1.6.6

---
 pkgs/tools/misc/broot/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/broot/default.nix b/pkgs/tools/misc/broot/default.nix
index 9193e18d116a..96788f8c7319 100644
--- a/pkgs/tools/misc/broot/default.nix
+++ b/pkgs/tools/misc/broot/default.nix
@@ -14,14 +14,14 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "broot";
-  version = "1.6.2";
+  version = "1.6.6";
 
   src = fetchCrate {
     inherit pname version;
-    sha256 = "sha256-SjfTMBGby2jzmeNEtBVYqumLExhXW8nqxpbaeeaRM3w=";
+    sha256 = "sha256-Aezi005CKhGwCRZ2HwxFRRORBvVoZEzljTcKQZ8b8XI=";
   };
 
-  cargoHash = "sha256-BdSqTzXu7Glhr0fQGmnkg5BXYgdQS6jgfH3A9hPpECY=";
+  cargoHash = "sha256-d06lvS5ajXPY/AwmE2rkya82mAOeEv04EtBElDvX2+I=";
 
   nativeBuildInputs = [
     installShellFiles

From b59803b96d4f794994e64587ccaf95e3d5225cf8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 27 Oct 2021 12:13:51 +0000
Subject: [PATCH 41/49] nodejs-16_x: 16.12.0 -> 16.13.0

---
 pkgs/development/web/nodejs/v16.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/web/nodejs/v16.nix b/pkgs/development/web/nodejs/v16.nix
index 9cbe093c7a39..a1b0f1ea8c42 100644
--- a/pkgs/development/web/nodejs/v16.nix
+++ b/pkgs/development/web/nodejs/v16.nix
@@ -8,7 +8,7 @@ let
 in
   buildNodejs {
     inherit enableNpm;
-    version = "16.12.0";
-    sha256 = "1b3bschfa7946jwyqp3nmbdv7ap3rl4p7h50b9bac08981m0lqjz";
+    version = "16.13.0";
+    sha256 = "1k6bgs83s5iaawi63dcc826g23lfqr13phwbbzwx0pllqcyln49j";
     patches = [ ./disable-darwin-v8-system-instrumentation.patch ];
   }

From d8bd500bac2373c0f3ac8d1f329748795d7e83d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Xaver=20H=C3=B6rl?= <hoe.dom@gmx.de>
Date: Wed, 27 Oct 2021 13:55:07 +0200
Subject: [PATCH 42/49] dunst: patch to fix double free / avoid core dump

---
 pkgs/applications/misc/dunst/default.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/dunst/default.nix b/pkgs/applications/misc/dunst/default.nix
index 35e5d59171a5..67753b6e3710 100644
--- a/pkgs/applications/misc/dunst/default.nix
+++ b/pkgs/applications/misc/dunst/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, makeWrapper
+{ stdenv, lib, fetchFromGitHub, makeWrapper, fetchpatch
 , pkg-config, which, perl, libXrandr
 , cairo, dbus, systemd, gdk-pixbuf, glib, libX11, libXScrnSaver
 , wayland, wayland-protocols
@@ -16,6 +16,14 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-BWbvGetXXCXbfPRY+u6gEfzBmX8PLSnI6a5vfCByiC0=";
   };
 
+  patches = [
+    (fetchpatch {
+      # fixes double free (https://github.com/dunst-project/dunst/issues/957)
+      url = "https://github.com/dunst-project/dunst/commit/dc8efbbaff0e9ba881fa187a01bfe5c033fbdcf9.patch";
+      sha256 = "sha256-xuODOFDP9Eqr3g8OtNnaMmTihhurfj2NLeZPr0TF4vY=";
+    })
+  ];
+
   nativeBuildInputs = [ perl pkg-config which systemd makeWrapper ];
 
   buildInputs = [

From 3911dfc40d4dd5f4fe905b9168313fe224865e57 Mon Sep 17 00:00:00 2001
From: Mrinal <github@mrinalpurohit.in>
Date: Wed, 27 Oct 2021 18:23:43 +0530
Subject: [PATCH 43/49] gping: 1.2.1 -> 1.2.6 (#143124)

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
---
 pkgs/tools/networking/gping/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/networking/gping/default.nix b/pkgs/tools/networking/gping/default.nix
index a6ace183df67..a08c02806e7d 100644
--- a/pkgs/tools/networking/gping/default.nix
+++ b/pkgs/tools/networking/gping/default.nix
@@ -7,16 +7,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "gping";
-  version = "1.2.1";
+  version = "1.2.6";
 
   src = fetchFromGitHub {
     owner = "orf";
     repo = "gping";
-    rev = "v${version}";
-    sha256 = "sha256-lApm1JLXNjDKLj6zj25OaZDVp7lLW3qyrDsvJrudl8I=";
+    rev = "gping-v${version}";
+    sha256 = "sha256-Sxmwuf+iTBTlpfMFCEUp6JyEaoHgmLIKB/gws2KY/xc=";
   };
 
-  cargoSha256 = "sha256-d1NjPwT3YDp1U9JWeUejpWDbJonFlt5lYbUf7p3jVT0=";
+  cargoSha256 = "sha256-xEASs6r5zxYJXS+at6aX5n0whGp5qwuNwq6Jh0GM+/4=";
 
   buildInputs = lib.optional stdenv.isDarwin libiconv;
 

From fff46a0fd9167e60873d58e07890e58f1b837892 Mon Sep 17 00:00:00 2001
From: Clemens Lutz <lutzcle@cml.li>
Date: Wed, 27 Oct 2021 15:30:58 +0200
Subject: [PATCH 44/49] zoom-us: 5.8.0.16 -> 5.8.3.145

---
 .../networking/instant-messengers/zoom-us/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
index 03a34a69a72c..d04f2d18f97a 100644
--- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
+++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
@@ -28,11 +28,11 @@
 }:
 
 let
-  version = "5.8.0.16";
+  version = "5.8.3.145";
   srcs = {
     x86_64-linux = fetchurl {
       url = "https://zoom.us/client/${version}/zoom_x86_64.pkg.tar.xz";
-      sha256 = "1axnh81bf3ab5gzxxqm172wpqlpfbj9a2h3cry3kyxzmrihzbwdm";
+      sha256 = "1p4agpbcpk95r04m775dr17fmlm18vxq9mb65pyfbhvsd1ypw6kr";
     };
   };
 

From 708d430aff4c50f8acd5b6ddde559ef84153bd30 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 27 Oct 2021 13:44:20 +0000
Subject: [PATCH 45/49] python38Packages.trimesh: 3.9.32 -> 3.9.34

---
 pkgs/development/python-modules/trimesh/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/trimesh/default.nix b/pkgs/development/python-modules/trimesh/default.nix
index 79d25ccc3c50..129317be9c02 100644
--- a/pkgs/development/python-modules/trimesh/default.nix
+++ b/pkgs/development/python-modules/trimesh/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "trimesh";
-  version = "3.9.32";
+  version = "3.9.34";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "4e60f5230a4fd0cda5731f236c370d8e1950894b7dbe7a3222cd4051d3d4bb88";
+    sha256 = "5bdef3efae82eaee902541376561f74b143f228f5de45ca3f6a883af3bb7d1e1";
   };
 
   propagatedBuildInputs = [ numpy ];

From e8abcc673b0a0cd584f12ca81787f4f6beee587b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 27 Oct 2021 13:52:42 +0000
Subject: [PATCH 46/49] plexRaw: 1.24.4.5081-e362dc1ee -> 1.24.5.5173-8dcc73a59

---
 pkgs/servers/plex/raw.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/plex/raw.nix b/pkgs/servers/plex/raw.nix
index 47198243cbce..fae6366994ee 100644
--- a/pkgs/servers/plex/raw.nix
+++ b/pkgs/servers/plex/raw.nix
@@ -12,16 +12,16 @@
 # server, and the FHS userenv and corresponding NixOS module should
 # automatically pick up the changes.
 stdenv.mkDerivation rec {
-  version = "1.24.4.5081-e362dc1ee";
+  version = "1.24.5.5173-8dcc73a59";
   pname = "plexmediaserver";
 
   # Fetch the source
   src = if stdenv.hostPlatform.system == "aarch64-linux" then fetchurl {
     url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_arm64.deb";
-    sha256 = "0q3s1qcr65rx2jbf9k0i38w5xvnzw1wcy13gvm0150ad2hqw358b";
+    sha256 = "0yjnqvy2maym7dmfabj0zjd1gwjnnjwqxzk7j24a1vhwyy0dmjcf";
   } else fetchurl {
     url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb";
-    sha256 = "17igy0lq7mjmrw5xq92b57np422x8hj6m8qzjri493yc6fw1cl1m";
+    sha256 = "1k2plcqlklch2k8akj8m411i3cm0jvzj02f5x43yhjgjpmwww95z";
   };
 
   outputs = [ "out" "basedb" ];

From 59593b443e24f8d715f9a2291df9865d63907e3a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= <fabianhjr@protonmail.com>
Date: Sun, 24 Oct 2021 21:52:52 -0500
Subject: [PATCH 47/49] =?UTF-8?q?android-studio-canary:=202021.2.1.1=20?=
 =?UTF-8?q?=E2=86=92=202021.2.1.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/applications/editors/android-studio/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix
index af4fc5c997cc..55dc516ce6ea 100644
--- a/pkgs/applications/editors/android-studio/default.nix
+++ b/pkgs/applications/editors/android-studio/default.nix
@@ -17,8 +17,8 @@ let
     sha256Hash = "1j1fxl4vzq3bln2z9ycxn9imjgy55yd1nbl7ycmsi90bdp96pzj0";
   };
   latestVersion = { # canary & dev
-    version = "2021.2.1.1"; # "Android Studio Chipmunk (2021.2.1) Canary 1"
-    sha256Hash = "1fn0jv6ybgdhgpwhamw16fjqbg2961ir9jhbjzanysi7y3935nbv";
+    version = "2021.2.1.2"; # "Android Studio Chipmunk (2021.2.1) Canary 2"
+    sha256Hash = "0xvn9zgn4cc9lhjynhiavmvx8bdzg4kcllmhg7xv18kp6wz4lh6z";
   };
 in {
   # Attributes are named by their corresponding release channels

From a64b27c5f36eaad9f0268ace0ef0ac59604fe731 Mon Sep 17 00:00:00 2001
From: rowanG077 <goemansrowan@gmail.com>
Date: Wed, 27 Oct 2021 16:08:16 +0200
Subject: [PATCH 48/49] cloudcompare: Cleanup/fix comments

---
 pkgs/applications/graphics/cloudcompare/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/applications/graphics/cloudcompare/default.nix b/pkgs/applications/graphics/cloudcompare/default.nix
index c120ece8cb4f..cd3f026dfa09 100644
--- a/pkgs/applications/graphics/cloudcompare/default.nix
+++ b/pkgs/applications/graphics/cloudcompare/default.nix
@@ -1,7 +1,6 @@
 { lib
 , mkDerivation
 , fetchFromGitHub
-, fetchpatch
 , cmake
 , dxflib
 , eigen
@@ -20,9 +19,7 @@
 
 mkDerivation rec {
   pname = "cloudcompare";
-  # Released version doesn't work with packaged PCL
-  # because it's too new. Considering that a release
-  # is a year ago it's unreasonable to wait for it.
+  # Released version(v2.11.3) doesn't work with packaged PCL.
   version = "unstable-2021-10-14";
 
   src = fetchFromGitHub {

From 4246d6ce21d2d8d33e2d30f42b3d9d446c5dc143 Mon Sep 17 00:00:00 2001
From: Ryan Burns <rtburns@protonmail.com>
Date: Fri, 22 Oct 2021 16:38:55 -0700
Subject: [PATCH 49/49] aliases: add pkgs.system

This is an old compat definition for stdenv.hostPlatform.system
---
 pkgs/top-level/aliases.nix | 2 ++
 pkgs/top-level/stage.nix   | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index e28d75c84211..69633ad76028 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1246,4 +1246,6 @@ mapAliases ({
     targetLlvmLibraries = targetPackages.llvmPackages_git.libraries;
   });
 
+  inherit (stdenv.hostPlatform) system; # added 2021-10-22
+
 })
diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix
index a990c5ed70cb..7db79276d899 100644
--- a/pkgs/top-level/stage.nix
+++ b/pkgs/top-level/stage.nix
@@ -116,7 +116,6 @@ let
     inherit (super.stdenv) buildPlatform hostPlatform targetPlatform;
   in {
     inherit buildPlatform hostPlatform targetPlatform;
-    inherit (hostPlatform) system;
   };
 
   splice = self: super: import ./splice.nix lib self (adjacentPackages != null);