From 545a1d6942ee307a26a1b4e7f8462c648acd4419 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 11 Mar 2021 00:44:17 +0000
Subject: [PATCH 01/49] kapp: 0.35.0 -> 0.36.0

---
 pkgs/tools/networking/kapp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/kapp/default.nix b/pkgs/tools/networking/kapp/default.nix
index 130763385291..dfb641348714 100644
--- a/pkgs/tools/networking/kapp/default.nix
+++ b/pkgs/tools/networking/kapp/default.nix
@@ -1,13 +1,13 @@
 { lib, buildGoModule, fetchFromGitHub }:
 buildGoModule rec {
   pname = "kapp";
-  version = "0.35.0";
+  version = "0.36.0";
 
   src = fetchFromGitHub {
     owner = "vmware-tanzu";
     repo = "carvel-kapp";
     rev = "v${version}";
-    sha256 = "1i4hpqpbwqb0yg3rx4z733zfslq3svmahfr39ss1ydylsipl02mg";
+    sha256 = "sha256-hYKRfAnpHw8hHT70sOQSGlDj0dgzU0wlZpXA5f2BBfg=";
   };
 
   vendorSha256 = null;

From 1324625c7433a8f669eb5d463404d74b0aba78ef Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 11 Mar 2021 09:14:26 +0000
Subject: [PATCH 02/49] eksctl: 0.39.0 -> 0.40.0

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

diff --git a/pkgs/tools/admin/eksctl/default.nix b/pkgs/tools/admin/eksctl/default.nix
index 6e1da0b591e3..db6b1de456f7 100644
--- a/pkgs/tools/admin/eksctl/default.nix
+++ b/pkgs/tools/admin/eksctl/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "eksctl";
-  version = "0.39.0";
+  version = "0.40.0";
 
   src = fetchFromGitHub {
     owner = "weaveworks";
     repo = pname;
     rev = version;
-    sha256 = "sha256-mq1/e9FW0jP6dY6zCBlPz5dBidKLS6IROBKESfHDvPI=";
+    sha256 = "sha256-2kxJcQ0kzIbXUSecDR5CRlgp0y59wftFPUwU1MSHOn0=";
   };
 
-  vendorSha256 = "sha256-ANOeU3cFSwLcpdbpApM+j4r296ZGj/tuDV8oiMA7kMo=";
+  vendorSha256 = "sha256-m+qldNgY3+DKTFjxwKo4Sbi0F7y4xomiIuR+apek61Q=";
 
   doCheck = false;
 

From 2476dace955b75636ad9f7bf1722aa62b09aaa6e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 11 Mar 2021 11:41:44 +0000
Subject: [PATCH 03/49] fio: 3.25 -> 3.26

---
 pkgs/tools/system/fio/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/system/fio/default.nix b/pkgs/tools/system/fio/default.nix
index a71bef4809c0..d34f0d4b737c 100644
--- a/pkgs/tools/system/fio/default.nix
+++ b/pkgs/tools/system/fio/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   pname = "fio";
-  version = "3.25";
+  version = "3.26";
 
   src = fetchFromGitHub {
     owner  = "axboe";
     repo   = "fio";
     rev    = "fio-${version}";
-    sha256 = "1f20ihynwnz8jqqlr73i5glr8ziplz4mmcjgk340mj2yqqcnsqag";
+    sha256 = "sha256-/Si0McndJ6Xp3ifDr+BStv89LmZyAgof95QkHGT8MGQ=";
   };
 
   buildInputs = [ python zlib ]

From 2c8898e1591895b9221288970d1fb647a8559f27 Mon Sep 17 00:00:00 2001
From: Ben Siraphob <bensiraphob@gmail.com>
Date: Fri, 12 Mar 2021 00:36:45 +0700
Subject: [PATCH 04/49] clucene-core: expand platforms to unix

---
 pkgs/development/libraries/clucene-core/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/clucene-core/default.nix b/pkgs/development/libraries/clucene-core/default.nix
index 20b0a3b547ca..8d5b389150a4 100644
--- a/pkgs/development/libraries/clucene-core/default.nix
+++ b/pkgs/development/libraries/clucene-core/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
       CLucene is a port of the very popular Java Lucene text search engine API.
     '';
     homepage = "http://clucene.sourceforge.net";
-    platforms = platforms.linux;
+    platforms = platforms.unix;
     license = with licenses; [ asl20 lgpl2 ];
   };
 }

From 3029c47d196ad9cec450ea423f097163a5cf0f2a Mon Sep 17 00:00:00 2001
From: Ben Siraphob <bensiraphob@gmail.com>
Date: Fri, 12 Mar 2021 12:15:20 +0700
Subject: [PATCH 05/49] coan: expand platforms to all

---
 pkgs/development/tools/analysis/coan/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/analysis/coan/default.nix b/pkgs/development/tools/analysis/coan/default.nix
index 1e0b79e0daa5..3ef6c2b84590 100644
--- a/pkgs/development/tools/analysis/coan/default.nix
+++ b/pkgs/development/tools/analysis/coan/default.nix
@@ -28,6 +28,6 @@ stdenv.mkDerivation rec {
     '';
     homepage = "http://coan2.sourceforge.net/";
     license = licenses.bsd3;
-    platforms = platforms.linux;
+    platforms = platforms.all;
   };
 }

From 4bc8ecf07abce521a17edd004348d634addb12cd Mon Sep 17 00:00:00 2001
From: Ben Siraphob <bensiraphob@gmail.com>
Date: Fri, 12 Mar 2021 01:04:34 +0700
Subject: [PATCH 06/49] gtkdatabox: expand platforms to unix

---
 pkgs/development/libraries/gtkdatabox/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/gtkdatabox/default.nix b/pkgs/development/libraries/gtkdatabox/default.nix
index d7cca43841e4..ddab0046b660 100644
--- a/pkgs/development/libraries/gtkdatabox/default.nix
+++ b/pkgs/development/libraries/gtkdatabox/default.nix
@@ -17,6 +17,6 @@ stdenv.mkDerivation rec {
 
     license = lib.licenses.lgpl2;
 
-    platforms = lib.platforms.linux;
+    platforms = lib.platforms.unix;
   };
 }

From f0f899ce10015af74d9377bec60e9f935fd8b371 Mon Sep 17 00:00:00 2001
From: Ben Siraphob <bensiraphob@gmail.com>
Date: Fri, 12 Mar 2021 00:36:00 +0700
Subject: [PATCH 07/49] guile-opengl: expand platforms to unix

---
 pkgs/development/guile-modules/guile-opengl/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/guile-modules/guile-opengl/default.nix b/pkgs/development/guile-modules/guile-opengl/default.nix
index effa651b99c8..5ada5d41c7d9 100644
--- a/pkgs/development/guile-modules/guile-opengl/default.nix
+++ b/pkgs/development/guile-modules/guile-opengl/default.nix
@@ -18,6 +18,6 @@ in stdenv.mkDerivation {
     homepage = "https://www.gnu.org/software/guile-opengl/";
     license = licenses.gpl3Plus;
     maintainers = with maintainers; [ vyp ];
-    platforms = platforms.linux;
+    platforms = platforms.unix;
   };
 }

From d97968e29f1eb04620e1d80de17cb1a1a3e07ed3 Mon Sep 17 00:00:00 2001
From: Ben Siraphob <bensiraphob@gmail.com>
Date: Fri, 12 Mar 2021 01:41:17 +0700
Subject: [PATCH 08/49] htmlcxx: fix darwin build

---
 pkgs/development/libraries/htmlcxx/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/htmlcxx/default.nix b/pkgs/development/libraries/htmlcxx/default.nix
index 286834112f27..d9072e46e407 100644
--- a/pkgs/development/libraries/htmlcxx/default.nix
+++ b/pkgs/development/libraries/htmlcxx/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl }:
+{ lib, stdenv, fetchurl, libiconv }:
 
 stdenv.mkDerivation rec {
   pname = "htmlcxx";
@@ -9,12 +9,13 @@ stdenv.mkDerivation rec {
     sha256 = "1hgmyiad3qgbpf2dvv2jygzj6jpz4dl3n8ds4nql68a4l9g2nm07";
   };
 
+  buildInputs = [ libiconv ];
   patches = [ ./ptrdiff.patch ];
 
   meta = with lib; {
     homepage = "http://htmlcxx.sourceforge.net/";
     description = "A simple non-validating css1 and html parser for C++";
     license = licenses.lgpl2;
-    platforms = platforms.linux;
+    platforms = platforms.all;
   };
 }

From 076c9dbef27ce682c00fc5484a134843c88ca07c Mon Sep 17 00:00:00 2001
From: Ben Siraphob <bensiraphob@gmail.com>
Date: Fri, 12 Mar 2021 01:49:28 +0700
Subject: [PATCH 09/49] kissfft: fix darwin build

---
 pkgs/development/libraries/kissfft/default.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/kissfft/default.nix b/pkgs/development/libraries/kissfft/default.nix
index 5395ac4ab9c1..fe52adfa20d7 100644
--- a/pkgs/development/libraries/kissfft/default.nix
+++ b/pkgs/development/libraries/kissfft/default.nix
@@ -30,6 +30,11 @@ stdenv.mkDerivation rec {
     })
   ];
 
+  postPatch = ''
+    substituteInPlace Makefile \
+      --replace "gcc" "${stdenv.cc.targetPrefix}cc" \
+      --replace "ar" "${stdenv.cc.targetPrefix}ar"
+  '';
   makeFlags = [
     "PREFIX=${placeholder "out"}"
     "DATATYPE=double"
@@ -40,6 +45,6 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/mborgerding/kissfft";
     license = licenses.bsd3;
     maintainers = [ maintainers.goibhniu ];
-    platforms = platforms.linux;
+    platforms = platforms.all;
   };
 }

From fc348a5c6debb709e7d1584d0a10b8a9aba63c0b Mon Sep 17 00:00:00 2001
From: Ben Siraphob <bensiraphob@gmail.com>
Date: Fri, 12 Mar 2021 01:49:46 +0700
Subject: [PATCH 10/49] levmar: fix darwin build

---
 pkgs/development/libraries/levmar/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/levmar/default.nix b/pkgs/development/libraries/levmar/default.nix
index c5d6877a8446..ed945d9e5a08 100644
--- a/pkgs/development/libraries/levmar/default.nix
+++ b/pkgs/development/libraries/levmar/default.nix
@@ -9,8 +9,9 @@ stdenv.mkDerivation rec {
   };
 
   patchPhase = ''
-    sed -i 's/define HAVE_LAPACK/undef HAVE_LAPACK/' levmar.h
+    substituteInPlace levmar.h --replace "define HAVE_LAPACK" "undef HAVE_LAPACK"
     sed -i 's/LAPACKLIBS=.*/LAPACKLIBS=/' Makefile
+    substituteInPlace Makefile --replace "gcc" "${stdenv.cc.targetPrefix}cc"
   '';
 
   installPhase = ''
@@ -23,6 +24,6 @@ stdenv.mkDerivation rec {
     description = "ANSI C implementations of Levenberg-Marquardt, usable also from C++";
     homepage = "https://www.ics.forth.gr/~lourakis/levmar/";
     license = lib.licenses.gpl2Plus;
-    platforms = lib.platforms.linux;
+    platforms = lib.platforms.all;
   };
 }

From c29546f2e03b8089e09677586dfb2035858ee64a Mon Sep 17 00:00:00 2001
From: Ben Siraphob <bensiraphob@gmail.com>
Date: Fri, 12 Mar 2021 01:42:04 +0700
Subject: [PATCH 11/49] libcli: fix darwin build

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

diff --git a/pkgs/development/libraries/libcli/default.nix b/pkgs/development/libraries/libcli/default.nix
index ceb0338e5cc1..8aa06bfb19bc 100644
--- a/pkgs/development/libraries/libcli/default.nix
+++ b/pkgs/development/libraries/libcli/default.nix
@@ -20,12 +20,12 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  makeFlags = [ "PREFIX=$(out)" ];
+  makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" "AR=${stdenv.cc.targetPrefix}ar" "PREFIX=$(out)" ];
 
   meta = with lib; {
     description = "Emulate a Cisco-style telnet command-line interface";
     homepage = "http://sites.dparrish.com/libcli";
     license = licenses.lgpl21Plus;
-    platforms = platforms.linux;
+    platforms = platforms.all;
   };
 }

From ead72e396fb86447b0abba68664b3de93726787c Mon Sep 17 00:00:00 2001
From: Ben Siraphob <bensiraphob@gmail.com>
Date: Fri, 12 Mar 2021 00:37:03 +0700
Subject: [PATCH 12/49] libcredis: expand platforms to all

---
 pkgs/development/libraries/libcredis/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/libcredis/default.nix b/pkgs/development/libraries/libcredis/default.nix
index 902f5a6ee26f..247d341bce97 100644
--- a/pkgs/development/libraries/libcredis/default.nix
+++ b/pkgs/development/libraries/libcredis/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
     description = "C client library for Redis (key-value database)";
     homepage = "https://code.google.com/archive/p/credis/";
     license = licenses.bsd3; # from homepage
-    platforms = platforms.linux;
+    platforms = platforms.all;
     maintainers = [ maintainers.bjornfor ];
   };
 }

From d440a94c0497d7a00b8cfa110911b2d6b9723193 Mon Sep 17 00:00:00 2001
From: Ben Siraphob <bensiraphob@gmail.com>
Date: Fri, 12 Mar 2021 01:03:44 +0700
Subject: [PATCH 13/49] libcsptr: expand platforms to all

---
 pkgs/development/libraries/libcsptr/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/libcsptr/default.nix b/pkgs/development/libraries/libcsptr/default.nix
index e30165054aa0..a8f33deda36c 100644
--- a/pkgs/development/libraries/libcsptr/default.nix
+++ b/pkgs/development/libraries/libcsptr/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
     description = "Smart pointer constructs for the (GNU) C programming language";
     homepage = "https://github.com/Snaipe/libcsptr";
     license = licenses.mit;
-    platforms = [ "i686-linux" "x86_64-linux" ];
+    platforms = platforms.all;
     maintainers = [ maintainers.fragamus ];
   };
 }

From e5cfd956d8fe11156a2feabfda1925992f68360d Mon Sep 17 00:00:00 2001
From: Ben Siraphob <bensiraphob@gmail.com>
Date: Fri, 12 Mar 2021 01:04:59 +0700
Subject: [PATCH 14/49] liblcf: expand platforms to all

---
 pkgs/development/libraries/liblcf/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/liblcf/default.nix b/pkgs/development/libraries/liblcf/default.nix
index 2c7f09892820..1e6f57368b78 100644
--- a/pkgs/development/libraries/liblcf/default.nix
+++ b/pkgs/development/libraries/liblcf/default.nix
@@ -19,6 +19,6 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/EasyRPG/liblcf";
     license = licenses.mit;
     maintainers = with maintainers; [ yegortimoshenko ];
-    platforms = platforms.linux;
+    platforms = platforms.all;
   };
 }

From e8ddcf9db42d2e4ad66cbc819804e9abc36575ea Mon Sep 17 00:00:00 2001
From: Ben Siraphob <bensiraphob@gmail.com>
Date: Fri, 12 Mar 2021 01:42:22 +0700
Subject: [PATCH 15/49] libnatpmp: fix darwin build

---
 pkgs/development/libraries/libnatpmp/default.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/libnatpmp/default.nix b/pkgs/development/libraries/libnatpmp/default.nix
index dd902c0021dd..11b8d66b4a8f 100644
--- a/pkgs/development/libraries/libnatpmp/default.nix
+++ b/pkgs/development/libraries/libnatpmp/default.nix
@@ -10,6 +10,12 @@ stdenv.mkDerivation rec {
     sha256 = "1c1n8n7mp0amsd6vkz32n8zj3vnsckv308bb7na0dg0r8969rap1";
   };
 
+  postPatch = ''
+    substituteInPlace Makefile \
+      --replace "gcc" "${stdenv.cc.targetPrefix}cc" \
+      --replace "ar" "${stdenv.cc.targetPrefix}ar"
+  '';
+
   makeFlags = [ "INSTALLPREFIX=$(out)" ];
 
   meta = with lib; {
@@ -17,6 +23,6 @@ stdenv.mkDerivation rec {
     description = "NAT-PMP client";
     license = licenses.bsd3;
     maintainers = with maintainers; [ orivej ];
-    platforms = platforms.linux;
+    platforms = platforms.all;
   };
 }

From 5f808e1251abe842ab3e9395a87bb893846864e0 Mon Sep 17 00:00:00 2001
From: Ben Siraphob <bensiraphob@gmail.com>
Date: Fri, 12 Mar 2021 01:03:23 +0700
Subject: [PATCH 16/49] libnest2d: expand platforms to all

---
 pkgs/development/libraries/libnest2d/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/libnest2d/default.nix b/pkgs/development/libraries/libnest2d/default.nix
index 567598500d61..1e666758f816 100644
--- a/pkgs/development/libraries/libnest2d/default.nix
+++ b/pkgs/development/libraries/libnest2d/default.nix
@@ -25,6 +25,6 @@ stdenv.mkDerivation rec {
       "2D irregular bin packaging and nesting library written in modern C++";
     homepage = "https://github.com/Ultimaker/libnest2d";
     license = licenses.lgpl3;
-    platforms = platforms.linux;
+    platforms = platforms.all;
   };
 }

From db02458ebb256f4ab391b7aad000f15d51bfe60a Mon Sep 17 00:00:00 2001
From: Ben Siraphob <bensiraphob@gmail.com>
Date: Fri, 12 Mar 2021 01:02:42 +0700
Subject: [PATCH 17/49] liboauth: expand platforms to all

---
 pkgs/development/libraries/liboauth/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/liboauth/default.nix b/pkgs/development/libraries/liboauth/default.nix
index caab0a83fcf6..5fe5ba86bea3 100644
--- a/pkgs/development/libraries/liboauth/default.nix
+++ b/pkgs/development/libraries/liboauth/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with lib; {
-    platforms = platforms.linux;
+    platforms = platforms.all;
     description = "C library implementing the OAuth secure authentication protocol";
     homepage = "http://liboauth.sourceforge.net/";
     repositories.git = "https://github.com/x42/liboauth.git";

From e02d375471a8774f296097106258da6416d516c3 Mon Sep 17 00:00:00 2001
From: Ben Siraphob <bensiraphob@gmail.com>
Date: Fri, 12 Mar 2021 12:19:17 +0700
Subject: [PATCH 18/49] libosip: expand platforms to all

---
 pkgs/development/libraries/osip/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/osip/default.nix b/pkgs/development/libraries/osip/default.nix
index 322ed30a8476..b7cfc5da9d3b 100644
--- a/pkgs/development/libraries/osip/default.nix
+++ b/pkgs/development/libraries/osip/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
     homepage = "https://www.gnu.org/software/osip/";
     description = "The GNU oSIP library, an implementation of the Session Initiation Protocol (SIP)";
     maintainers = with lib.maintainers; [ raskin ];
-    platforms = lib.platforms.linux;
+    platforms = lib.platforms.all;
     inherit version;
   };
 }

From 9139e83f6baad17d8da0ef00002fb4a10249c412 Mon Sep 17 00:00:00 2001
From: Ben Siraphob <bensiraphob@gmail.com>
Date: Fri, 12 Mar 2021 12:19:37 +0700
Subject: [PATCH 19/49] libxmi: expand platforms to unix

---
 pkgs/development/libraries/libxmi/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/libxmi/default.nix b/pkgs/development/libraries/libxmi/default.nix
index 037e7036f499..b9a2b6de3cc3 100644
--- a/pkgs/development/libraries/libxmi/default.nix
+++ b/pkgs/development/libraries/libxmi/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
     description = "Library for rasterizing 2-D vector graphics";
     homepage = "https://www.gnu.org/software/libxmi/";
     license = lib.licenses.gpl2Plus;
-    platforms = lib.platforms.gnu ++ lib.platforms.linux;  # arbitrary choice
+    platforms = lib.platforms.unix;
     maintainers = [ ];
   };
 }

From fe4574d67ce3f259b9b0573867fdc49849e53e60 Mon Sep 17 00:00:00 2001
From: Ben Siraphob <bensiraphob@gmail.com>
Date: Fri, 12 Mar 2021 12:19:49 +0700
Subject: [PATCH 20/49] lightning: expand platforms to all

---
 pkgs/development/libraries/lightning/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/lightning/default.nix b/pkgs/development/libraries/lightning/default.nix
index 5fdc06bce012..5f8c71fa6aa3 100644
--- a/pkgs/development/libraries/lightning/default.nix
+++ b/pkgs/development/libraries/lightning/default.nix
@@ -27,6 +27,6 @@ stdenv.mkDerivation rec {
     '';
     maintainers = [ maintainers.AndersonTorres ];
     license = licenses.lgpl3Plus;
-    platforms = lib.platforms.linux;
+    platforms = lib.platforms.all;
   };
 }

From 27f00d3e08637b373760cca4af282aab36decb71 Mon Sep 17 00:00:00 2001
From: Ben Siraphob <bensiraphob@gmail.com>
Date: Fri, 12 Mar 2021 12:20:22 +0700
Subject: [PATCH 21/49] libxmp: expand platforms to all

---
 pkgs/development/libraries/libxmp/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/libxmp/default.nix b/pkgs/development/libraries/libxmp/default.nix
index 0b953f95d7eb..31a14ff6ae43 100644
--- a/pkgs/development/libraries/libxmp/default.nix
+++ b/pkgs/development/libraries/libxmp/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
       Scream Tracker 3 (S3M), Fast Tracker II (XM), and Impulse Tracker (IT).
     '';
     license     = licenses.lgpl21Plus;
-    platforms   = platforms.linux;
+    platforms   = platforms.all;
   };
 
   src = fetchurl {

From 3389afa59676154b8f21b85cce75ad561bb30ae0 Mon Sep 17 00:00:00 2001
From: Ben Siraphob <bensiraphob@gmail.com>
Date: Fri, 12 Mar 2021 12:20:04 +0700
Subject: [PATCH 22/49] loudmouth: expand platforms to all

---
 pkgs/development/libraries/loudmouth/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/loudmouth/default.nix b/pkgs/development/libraries/loudmouth/default.nix
index 0245417bbf9b..a8d9b23cc84c 100644
--- a/pkgs/development/libraries/loudmouth/default.nix
+++ b/pkgs/development/libraries/loudmouth/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     description = "A lightweight C library for the Jabber protocol";
-    platforms = platforms.linux;
+    platforms = platforms.all;
     downloadPage = "http://mcabber.com/files/loudmouth/";
     downloadURLRegexp = "loudmouth-[0-9.]+[.]tar[.]bz2$";
     updateWalker = true;

From 53afdd0c80799883dcea893c48aaeabde499a60c Mon Sep 17 00:00:00 2001
From: Ben Siraphob <bensiraphob@gmail.com>
Date: Fri, 12 Mar 2021 12:18:50 +0700
Subject: [PATCH 23/49] lrdf: expand platforms to unix

---
 pkgs/development/libraries/lrdf/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/lrdf/default.nix b/pkgs/development/libraries/lrdf/default.nix
index 51b2635b89e0..bd78a4329a59 100644
--- a/pkgs/development/libraries/lrdf/default.nix
+++ b/pkgs/development/libraries/lrdf/default.nix
@@ -31,6 +31,6 @@ stdenv.mkDerivation rec {
     homepage = "https://sourceforge.net/projects/lrdf/";
     license = lib.licenses.gpl2;
     maintainers = [ lib.maintainers.marcweber ];
-    platforms = lib.platforms.linux;
+    platforms = lib.platforms.unix;
   };
 }

From 597d1c65109a20b38c8221aa9a944ecb2e74b446 Mon Sep 17 00:00:00 2001
From: Ben Siraphob <bensiraphob@gmail.com>
Date: Fri, 12 Mar 2021 12:24:31 +0700
Subject: [PATCH 24/49] metal: expand platforms to all

---
 pkgs/development/libraries/metal/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/metal/default.nix b/pkgs/development/libraries/metal/default.nix
index b98ae8e217c7..2f43485e05e0 100644
--- a/pkgs/development/libraries/metal/default.nix
+++ b/pkgs/development/libraries/metal/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/brunocodutra/metal";
     license = licenses.mit;
     maintainers = with maintainers; [ pmiddend ];
-    platforms = platforms.linux;
+    platforms = platforms.all;
   };
 
 }

From 24c065773b9b2f01f3576ef070536ef404b80c75 Mon Sep 17 00:00:00 2001
From: Ben Siraphob <bensiraphob@gmail.com>
Date: Fri, 12 Mar 2021 12:22:41 +0700
Subject: [PATCH 25/49] minixml: expand platforms to all

---
 pkgs/development/libraries/minixml/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/minixml/default.nix b/pkgs/development/libraries/minixml/default.nix
index 93c03b31a8a7..9bf5235db824 100644
--- a/pkgs/development/libraries/minixml/default.nix
+++ b/pkgs/development/libraries/minixml/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
     description = "A small XML library";
     homepage = "https://www.msweet.org/mxml/";
     license = licenses.asl20;
-    platforms = platforms.linux;
+    platforms = platforms.all;
     maintainers = [ maintainers.goibhniu ];
   };
 }

From 503d637bab85ef73ebc1a0d9c94ff9562437ecdf Mon Sep 17 00:00:00 2001
From: Ben Siraphob <bensiraphob@gmail.com>
Date: Fri, 12 Mar 2021 12:20:36 +0700
Subject: [PATCH 26/49] msgpuck: expand platforms to all

---
 pkgs/development/libraries/msgpuck/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/msgpuck/default.nix b/pkgs/development/libraries/msgpuck/default.nix
index 53fb3bec908c..cc7b056bb988 100644
--- a/pkgs/development/libraries/msgpuck/default.nix
+++ b/pkgs/development/libraries/msgpuck/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
      description = "A simple and efficient MsgPack binary serialization library in a self-contained header file";
      homepage = "https://github.com/rtsisyk/msgpuck";
      license = licenses.bsd2;
-     platforms = platforms.linux;
+     platforms = platforms.all;
      maintainers = with maintainers; [ izorkin ];
  };
 }

From dca4490738d06e46ca20e96270804570d755be5e Mon Sep 17 00:00:00 2001
From: Ben Siraphob <bensiraphob@gmail.com>
Date: Fri, 12 Mar 2021 01:41:30 +0700
Subject: [PATCH 27/49] p8-platform: expand platforms to all

---
 pkgs/development/libraries/libcec/platform.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/libcec/platform.nix b/pkgs/development/libraries/libcec/platform.nix
index 15972272a187..61eccf1f40ea 100644
--- a/pkgs/development/libraries/libcec/platform.nix
+++ b/pkgs/development/libraries/libcec/platform.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
     homepage = "https://github.com/Pulse-Eight/platform";
     repositories.git = "https://github.com/Pulse-Eight/platform.git";
     license = lib.licenses.gpl2Plus;
-    platforms = platforms.linux;
+    platforms = platforms.all;
     maintainers = [ maintainers.titanous ];
   };
 }

From 5c9cb64b4362929e077c39112d8e17e413bad938 Mon Sep 17 00:00:00 2001
From: Ben Siraphob <bensiraphob@gmail.com>
Date: Fri, 12 Mar 2021 12:23:08 +0700
Subject: [PATCH 28/49] pwndbg: expand platforms to all

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

diff --git a/pkgs/development/tools/misc/pwndbg/default.nix b/pkgs/development/tools/misc/pwndbg/default.nix
index 69ed17ab4b9e..764fa6677345 100644
--- a/pkgs/development/tools/misc/pwndbg/default.nix
+++ b/pkgs/development/tools/misc/pwndbg/default.nix
@@ -46,7 +46,7 @@ in stdenv.mkDerivation rec {
     description = "Exploit Development and Reverse Engineering with GDB Made Easy";
     homepage = "https://github.com/pwndbg/pwndbg";
     license = licenses.mit;
-    platforms = platforms.linux;
+    platforms = platforms.all;
     maintainers = with maintainers; [ mic92 ];
   };
 }

From 7c5efd446a7bf88791e99bf5c1f094405541daea Mon Sep 17 00:00:00 2001
From: Ben Siraphob <bensiraphob@gmail.com>
Date: Fri, 12 Mar 2021 12:23:42 +0700
Subject: [PATCH 29/49] pxlib: expand platforms to all

---
 pkgs/development/libraries/pxlib/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/pxlib/default.nix b/pkgs/development/libraries/pxlib/default.nix
index 3acaf8bac157..4b6b9ada7ab7 100644
--- a/pkgs/development/libraries/pxlib/default.nix
+++ b/pkgs/development/libraries/pxlib/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
     description = "Library to read and write Paradox files";
     homepage = "http://pxlib.sourceforge.net/";
     license = licenses.gpl2;
-    platforms = platforms.linux;
+    platforms = platforms.all;
     maintainers = [ maintainers.winpat ];
   };
 }

From 413fbf5b9f43fc87be32361d6dcae0540533fcbb Mon Sep 17 00:00:00 2001
From: Ben Siraphob <bensiraphob@gmail.com>
Date: Fri, 12 Mar 2021 12:21:58 +0700
Subject: [PATCH 30/49] safefile: expand platforms to all

---
 pkgs/development/libraries/safefile/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/safefile/default.nix b/pkgs/development/libraries/safefile/default.nix
index db18621d8e43..293a13dbddc4 100644
--- a/pkgs/development/libraries/safefile/default.nix
+++ b/pkgs/development/libraries/safefile/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     description = "File open routines to safely open a file when in the presence of an attack";
     license = lib.licenses.asl20 ;
     maintainers = [lib.maintainers.raskin];
-    platforms = lib.platforms.linux;
+    platforms = lib.platforms.all;
     homepage = "https://research.cs.wisc.edu/mist/safefile/";
     updateWalker = true;
   };

From 5eeece814a50716a212f5c0c7be6938918956a2c Mon Sep 17 00:00:00 2001
From: Ben Siraphob <bensiraphob@gmail.com>
Date: Fri, 12 Mar 2021 13:03:18 +0700
Subject: [PATCH 31/49] shhmsg: fix darwin build

---
 pkgs/development/libraries/shhmsg/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/shhmsg/default.nix b/pkgs/development/libraries/shhmsg/default.nix
index 0c736e4cb911..704df3dc5eff 100644
--- a/pkgs/development/libraries/shhmsg/default.nix
+++ b/pkgs/development/libraries/shhmsg/default.nix
@@ -8,13 +8,16 @@ stdenv.mkDerivation rec {
     sha256 = "0ax02fzqpaxr7d30l5xbndy1s5vgg1ag643c7zwiw2wj1czrxil8";
   };
 
+  postPatch = ''
+    substituteInPlace Makefile --replace "gcc" "${stdenv.cc.targetPrefix}cc"
+  '';
+
   installFlags = [ "INSTBASEDIR=$(out)" ];
 
   meta = with lib; {
     description = "A library for displaying messages";
     homepage = "https://shh.thathost.com/pub-unix/";
     license = licenses.artistic1;
-    platforms = platforms.linux;
+    platforms = platforms.all;
   };
 }
-

From 82a0379d9c954d3e27620277db9204916a040077 Mon Sep 17 00:00:00 2001
From: Ben Siraphob <bensiraphob@gmail.com>
Date: Fri, 12 Mar 2021 13:03:03 +0700
Subject: [PATCH 32/49] shhopt: fix darwin build

---
 pkgs/development/libraries/shhopt/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/shhopt/default.nix b/pkgs/development/libraries/shhopt/default.nix
index da1b820fcd54..0657b13e5579 100644
--- a/pkgs/development/libraries/shhopt/default.nix
+++ b/pkgs/development/libraries/shhopt/default.nix
@@ -8,12 +8,16 @@ stdenv.mkDerivation rec {
     sha256 = "0yd6bl6qw675sxa81nxw6plhpjf9d2ywlm8a5z66zyjf28sl7sds";
   };
 
+  postPatch = ''
+    substituteInPlace Makefile --replace "gcc" "${stdenv.cc.targetPrefix}cc"
+  '';
+
   installFlags = [ "INSTBASEDIR=$(out)" ];
 
   meta = with lib; {
     description = "A library for parsing command line options";
     homepage = "https://shh.thathost.com/pub-unix/";
     license = licenses.artistic1;
-    platforms = platforms.linux;
+    platforms = platforms.all;
   };
 }

From 73b93f6b9be3b12fe881409918f3ca6798d2ce6a Mon Sep 17 00:00:00 2001
From: Ben Siraphob <bensiraphob@gmail.com>
Date: Fri, 12 Mar 2021 12:22:10 +0700
Subject: [PATCH 33/49] spglib: expand platforms to all

---
 pkgs/development/libraries/spglib/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/spglib/default.nix b/pkgs/development/libraries/spglib/default.nix
index 12d696b65a8e..3d1236a03dbb 100644
--- a/pkgs/development/libraries/spglib/default.nix
+++ b/pkgs/development/libraries/spglib/default.nix
@@ -21,6 +21,6 @@ stdenv.mkDerivation rec {
     homepage = "https://atztogo.github.io/spglib/";
     license = licenses.bsd3;
     maintainers = [ maintainers.markuskowa ];
-    platforms = platforms.linux;
+    platforms = platforms.all;
   };
 }

From 87975ef4330be6536ae2caa6c85442db195bd89f Mon Sep 17 00:00:00 2001
From: Ben Siraphob <bensiraphob@gmail.com>
Date: Fri, 12 Mar 2021 12:22:20 +0700
Subject: [PATCH 34/49] spice-protocol: expand platforms to all

---
 pkgs/development/libraries/spice-protocol/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/spice-protocol/default.nix b/pkgs/development/libraries/spice-protocol/default.nix
index 07b670a2718f..1eaa3398e402 100644
--- a/pkgs/development/libraries/spice-protocol/default.nix
+++ b/pkgs/development/libraries/spice-protocol/default.nix
@@ -19,6 +19,6 @@ stdenv.mkDerivation rec {
     homepage = "https://www.spice-space.org/";
     license = licenses.bsd3;
     maintainers = with maintainers; [ bluescreen303 ];
-    platforms = platforms.linux;
+    platforms = platforms.all;
   };
 }

From 773c4b840f0b9d35ede20ba9aa36c66613c4564d Mon Sep 17 00:00:00 2001
From: Ben Siraphob <bensiraphob@gmail.com>
Date: Fri, 12 Mar 2021 12:21:05 +0700
Subject: [PATCH 35/49] tidyp: expand platforms to all

---
 pkgs/development/libraries/tidyp/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/tidyp/default.nix b/pkgs/development/libraries/tidyp/default.nix
index 5c0ad8463b4a..f4c24a126e5b 100644
--- a/pkgs/development/libraries/tidyp/default.nix
+++ b/pkgs/development/libraries/tidyp/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     description = "A program that can validate your HTML, as well as modify it to be more clean and standard";
     homepage = "http://tidyp.com/";
-    platforms = platforms.linux;
+    platforms = platforms.all;
     maintainers = with maintainers; [ pSub ];
     license = licenses.bsd3;
   };

From 9706a8d8d195390118a1ac7092471b6835a00869 Mon Sep 17 00:00:00 2001
From: Ben Siraphob <bensiraphob@gmail.com>
Date: Fri, 12 Mar 2021 12:21:42 +0700
Subject: [PATCH 36/49] vassal: expand platforms to unix

---
 pkgs/games/vassal/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/games/vassal/default.nix b/pkgs/games/vassal/default.nix
index 2a916094af41..cc9e9bd98562 100644
--- a/pkgs/games/vassal/default.nix
+++ b/pkgs/games/vassal/default.nix
@@ -31,6 +31,6 @@ stdenv.mkDerivation rec {
       homepage = "http://www.vassalengine.org/";
       license = licenses.lgpl21Only;
       maintainers = with maintainers; [ tvestelind ];
-      platforms = platforms.linux;
+      platforms = platforms.unix;
   };
 }

From 509028ab983f2a5aa3ccac46a00a6f0271208dd2 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 12 Mar 2021 11:57:31 +0000
Subject: [PATCH 37/49] powerline: 2.8.1 -> 2.8.2

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

diff --git a/pkgs/development/python-modules/powerline/default.nix b/pkgs/development/python-modules/powerline/default.nix
index 63f5feada595..292c44cf58fa 100644
--- a/pkgs/development/python-modules/powerline/default.nix
+++ b/pkgs/development/python-modules/powerline/default.nix
@@ -13,14 +13,14 @@
 # TODO: bzr support is missing because nixpkgs switched to `breezy`
 
 buildPythonPackage rec {
-  version  = "2.8.1";
+  version  = "2.8.2";
   pname = "powerline";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
     rev = version;
-    sha256 = "0xscckcbw75pbcl4546ndrjs4682pn2sqqrd6qvqm0s6zswg7a0y";
+    sha256 = "sha256-6V8ozl5KJQvytfflBmKJlIZQ5m3hkpCzMBtWZ2SzcQ0=";
   };
 
   propagatedBuildInputs = [

From 81237434553d66f2bac77e9e28b4c882862116fd Mon Sep 17 00:00:00 2001
From: ShrykeWindgrace <shryke.windgrace@gmail.com>
Date: Fri, 12 Mar 2021 16:22:02 +0100
Subject: [PATCH 38/49]  powershell: 7.1.0 -> 7.1.3

---
 pkgs/shells/powershell/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/shells/powershell/default.nix b/pkgs/shells/powershell/default.nix
index 3f9d7130811a..dfc4f94e12b6 100644
--- a/pkgs/shells/powershell/default.nix
+++ b/pkgs/shells/powershell/default.nix
@@ -4,8 +4,8 @@
 let platformString = if stdenv.isDarwin then "osx"
                      else if stdenv.isLinux then "linux"
                      else throw "unsupported platform";
-    platformSha = if stdenv.isDarwin then "0zv02h3njphrs8kgmicy7w40mmhmigdfl38f2dpwrs6z67f8vrm2"
-                     else if stdenv.isLinux then "0dka2q8ijg3ryzwmxapf8aq55d0sgaj6jj0rzj2738in9g4w2hbh"
+    platformSha = if stdenv.isDarwin then "0w44ws8b6zfixf7xz93hmplqsx18279n9x8j77y4rbzs13fldvsn"
+                     else if stdenv.isLinux then "0xm7l49zhkz2fly3d751kjd5cy3ws9zji9i0061lkd06dvkch7jy"
                      else throw "unsupported platform";
     platformLdLibraryPath = if stdenv.isDarwin then "DYLD_FALLBACK_LIBRARY_PATH"
                      else if stdenv.isLinux then "LD_LIBRARY_PATH"
@@ -15,7 +15,7 @@ let platformString = if stdenv.isDarwin then "osx"
 in
 stdenv.mkDerivation rec {
   pname = "powershell";
-  version = "7.1.0";
+  version = "7.1.3";
 
   src = fetchzip {
     url = "https://github.com/PowerShell/PowerShell/releases/download/v${version}/powershell-${version}-${platformString}-x64.tar.gz";

From bc1f7c5d7f9660d8198760196ae6ac65bd3539e6 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Fri, 12 Mar 2021 15:25:08 +0000
Subject: [PATCH 39/49] mcfgthreads: 9570e5ca -> 10y2x3x6

The latest version non longer has `-Werror` (at our request; thanks!) so
we no longer need to patch it out.
---
 pkgs/os-specific/windows/mcfgthreads/default.nix | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/pkgs/os-specific/windows/mcfgthreads/default.nix b/pkgs/os-specific/windows/mcfgthreads/default.nix
index 122848a4e6ca..45c80ab89796 100644
--- a/pkgs/os-specific/windows/mcfgthreads/default.nix
+++ b/pkgs/os-specific/windows/mcfgthreads/default.nix
@@ -7,8 +7,8 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "lhmouse";
     repo = "mcfgthread";
-    rev = "9570e5ca7b98002d707c502c919d951bf256b9c6";
-    sha256 = "10y2x3x601a7c1hkd6zlr3xpfsnlr05xl28v23clf619756a5755";
+    rev = "c446cf4fcdc262fc899a188a4bb7136284c34222";
+    sha256 = "1ib90lrd4dz8irq4yvzwhxqa86i5vxl2q2z3z04sf1i8hw427p2f";
   };
 
   outputs = [ "out" "dev" ];
@@ -18,10 +18,6 @@ stdenv.mkDerivation {
     rm -r "$sourceRoot/debug" "$sourceRoot/release"
   '';
 
-  postPatch = ''
-    substituteInPlace Makefile.am --replace '-Werror' ""
-  '';
-
   nativeBuildInputs = [
     autoreconfHook
   ];

From 51011985ef009bf950e3bfd76c1994c05fe7a361 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Fri, 12 Mar 2021 16:22:27 +0000
Subject: [PATCH 40/49] zstd: Remove no-pthread patch used for building with
 `mcfgthreads`

Evidentially upstream has improved their feature detection so we no
longer need this patch.

CC @lhmouse
---
 pkgs/tools/compression/zstd/default.nix             |  4 +---
 .../compression/zstd/mcfgthreads-no-pthread.patch   | 13 -------------
 2 files changed, 1 insertion(+), 16 deletions(-)
 delete mode 100644 pkgs/tools/compression/zstd/mcfgthreads-no-pthread.patch

diff --git a/pkgs/tools/compression/zstd/default.nix b/pkgs/tools/compression/zstd/default.nix
index e1437e3843db..2da5a725e71c 100644
--- a/pkgs/tools/compression/zstd/default.nix
+++ b/pkgs/tools/compression/zstd/default.nix
@@ -22,9 +22,7 @@ stdenv.mkDerivation rec {
 
   patches = [
     ./playtests-darwin.patch
-  ] # This I didn't upstream because if you use posix threads with MinGW it will
-    # work fine, and I'm not sure how to write the condition.
-    ++ lib.optional stdenv.hostPlatform.isWindows ./mcfgthreads-no-pthread.patch;
+  ];
 
   postPatch = lib.optionalString (!static) ''
     substituteInPlace build/cmake/CMakeLists.txt \
diff --git a/pkgs/tools/compression/zstd/mcfgthreads-no-pthread.patch b/pkgs/tools/compression/zstd/mcfgthreads-no-pthread.patch
deleted file mode 100644
index 69921c0c7bad..000000000000
--- a/pkgs/tools/compression/zstd/mcfgthreads-no-pthread.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/programs/Makefile b/programs/Makefile
-index 7882fe8c..1e8237bb 100644
---- a/programs/Makefile
-+++ b/programs/Makefile
-@@ -107,7 +107,7 @@ HAVE_THREAD := $(shell [ "$(HAVE_PTHREAD)" -eq "1" -o -n "$(filter Windows%,$(OS
- ifeq ($(HAVE_THREAD), 1)
- THREAD_MSG := ==> building with threading support
- THREAD_CPP := -DZSTD_MULTITHREAD
--THREAD_LD := -pthread
-+THREAD_LD :=
- else
- THREAD_MSG := $(NO_THREAD_MSG)
- endif

From b819ab8a89f22d631a0a36deacdaa0aaa2118986 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 13 Mar 2021 04:46:53 +0000
Subject: [PATCH 41/49] fatrace: 0.16.1 -> 0.16.2

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

diff --git a/pkgs/os-specific/linux/fatrace/default.nix b/pkgs/os-specific/linux/fatrace/default.nix
index a7f754a53ab5..61044526e44a 100644
--- a/pkgs/os-specific/linux/fatrace/default.nix
+++ b/pkgs/os-specific/linux/fatrace/default.nix
@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation rec {
   pname = "fatrace";
-  version = "0.16.1";
+  version = "0.16.2";
 
   src = fetchFromGitHub {
     owner = "martinpitt";
     repo = pname;
     rev = version;
-    sha256 = "0lxfqin2bw9235yah8ylb4p8lc3755050sjg30z3gy7bab0lfyg9";
+    sha256 = "sha256-1daYCVGz8Zd42j2QMFL5EAULKkmBnbE828i5NV9Kcb8=";
   };
 
   buildInputs = [ python3 which ];

From 94098f9d493adb8941fa10e8631bada986ec3db2 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 13 Mar 2021 10:24:21 +0000
Subject: [PATCH 42/49] orcania: 2.1.1 -> 2.2.0

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

diff --git a/pkgs/development/libraries/orcania/default.nix b/pkgs/development/libraries/orcania/default.nix
index 5c9c2c8da7f2..157769c7772f 100644
--- a/pkgs/development/libraries/orcania/default.nix
+++ b/pkgs/development/libraries/orcania/default.nix
@@ -1,13 +1,13 @@
 { lib, stdenv, fetchFromGitHub, cmake, check, subunit }:
 stdenv.mkDerivation rec {
   pname = "orcania";
-  version = "2.1.1";
+  version = "2.2.0";
 
   src = fetchFromGitHub {
     owner = "babelouest";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0l035zbzyv623h5186rk6iq1097rxx64iwnk4s2c7l9gzv9wyapp";
+    sha256 = "sha256-tArXiXmoWHd42IGBZKtc4QJIBy3USPlSeW+Dv5xl1EU=";
   };
 
   nativeBuildInputs = [ cmake ];

From 5f8b95113983c8f31d635c0930d9a6681e929bdb Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Sat, 13 Mar 2021 12:12:30 +0100
Subject: [PATCH 43/49] chromium: 89.0.4389.82 -> 89.0.4389.90

https://chromereleases.googleblog.com/2021/03/stable-channel-update-for-desktop_12.html

This update includes 5 security fixes. Google is aware of reports that
an exploit for CVE-2021-21193 exists in the wild.

CVEs:
CVE-2021-21191 CVE-2021-21192 CVE-2021-21193 CVE-2021-21193
---
 .../networking/browsers/chromium/upstream-info.json         | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json
index 6d94e30d95e9..8caa446b0464 100644
--- a/pkgs/applications/networking/browsers/chromium/upstream-info.json
+++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json
@@ -1,8 +1,8 @@
 {
   "stable": {
-    "version": "89.0.4389.82",
-    "sha256": "0yg33d6zldz3j1jghhdci63fn46i10dkz3nb95jdrbv8gd018jfz",
-    "sha256bin64": "1sqzzillq38qyh85449ncz8bni93mjxb6r4z8y5h8k2w3j38jc0q",
+    "version": "89.0.4389.90",
+    "sha256": "16i7bgk2jbcqs2p28nk5mlf0k6wah594pcsfm8b154nxbyf0iihi",
+    "sha256bin64": "1hgpx7isp9krarj7jpbhs97ym4i9j9a1srywv9pdfzbhw6cid2pk",
     "deps": {
       "gn": {
         "version": "2021-01-07",

From 0e3fb2ae42ade19ad5a034aee8f5573dabe1b80a Mon Sep 17 00:00:00 2001
From: Kid <44045911+kidonng@users.noreply.github.com>
Date: Sun, 14 Mar 2021 01:04:08 +0800
Subject: [PATCH 44/49] fzf: 0.25.1 -> 0.26.0

https://github.com/junegunn/fzf/releases/tag/0.26.0
---
 pkgs/tools/misc/fzf/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix
index 25542543d658..035b6f65517e 100644
--- a/pkgs/tools/misc/fzf/default.nix
+++ b/pkgs/tools/misc/fzf/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "fzf";
-  version = "0.25.1";
+  version = "0.26.0";
 
   src = fetchFromGitHub {
     owner = "junegunn";
     repo = pname;
     rev = version;
-    sha256 = "085apa4msw8v8f57942xh7wfw3dkavrl9d58yj6i3yr75l3vg05r";
+    sha256 = "0p9hslaawnqnnf1s6hj3vdh11ncq7mrb4w4i933mdkychw5jav38";
   };
 
   vendorSha256 = "0dd0qm1fxp3jnlrhfaas8fw87cj7rygaac35a9nk3xh2xsk7q35p";

From c30a9fd9460edbc8a0f3e8b91dca05e4a13d25ad Mon Sep 17 00:00:00 2001
From: Eric Bailey <eric@ericb.me>
Date: Wed, 10 Mar 2021 17:16:31 -0600
Subject: [PATCH 45/49] renderizer: 2.0.9 -> 2.0.12

Also enable tests, and fix the version output.
---
 pkgs/development/tools/renderizer/default.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/tools/renderizer/default.nix b/pkgs/development/tools/renderizer/default.nix
index 22bf5fbe904a..ccf1d4a37d6c 100644
--- a/pkgs/development/tools/renderizer/default.nix
+++ b/pkgs/development/tools/renderizer/default.nix
@@ -2,18 +2,20 @@
 
 buildGoModule rec {
   pname = "renderizer";
-  version = "2.0.9";
+  version = "2.0.12";
 
   src = fetchFromGitHub {
     owner = "gomatic";
     repo = pname;
-    rev = version;
-    sha256 = "1bip12pcn8bqgph7vd7bzzadwbyqh80fx7gqciv9fchycwsj04rf";
+    rev = "v${version}";
+    sha256 = "sha256-Ji+wTTXLp17EYRIjUiVgd33ZeBdT8K2O8R2Ejq2Ll5I=";
   };
 
-  vendorSha256 = "13z357ww4j5bmmy8ag6d6gd5b2dib8kby73q8317pqnqzaxrrbcj";
+  buildFlagsArray = [
+    "-ldflags=-s -w -X main.version=${version} -X main.commitHash=${src.rev} -X main.date=19700101T000000"
+  ];
 
-  doCheck = false;
+  vendorSha256 = null;
 
   meta = with lib; {
     description = "CLI to render Go template text files";

From 09481d065e653b7e228e36af1190002cd4ab46dc Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 13 Mar 2021 14:57:41 +0000
Subject: [PATCH 46/49] syncthingtray: 1.1.2 -> 1.1.3

Move cmake-extra-modules to `nativeBuildInputs`.
---
 pkgs/applications/misc/syncthingtray/default.nix | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/misc/syncthingtray/default.nix b/pkgs/applications/misc/syncthingtray/default.nix
index 2a395a227ba6..dc4569c6fca3 100644
--- a/pkgs/applications/misc/syncthingtray/default.nix
+++ b/pkgs/applications/misc/syncthingtray/default.nix
@@ -19,24 +19,29 @@
 }:
 
 mkDerivation rec {
-  version = "1.1.2";
+  version = "1.1.3";
   pname = "syncthingtray";
 
   src = fetchFromGitHub {
     owner = "Martchus";
     repo = "syncthingtray";
     rev = "v${version}";
-    sha256 = "sha256-I5QhnYp4ga3ERJ3w4qjh5gFFU+S1Htw26vHK/2M8j5s=";
+    sha256 = "sha256-ovit2XSkxSjcbpqQUv8IzMqfsfItbtXLbx0/Vy0+J0Y=";
   };
 
   buildInputs = [ qtbase cpp-utilities qtutilities ]
     ++ lib.optionals webviewSupport [ qtwebengine ]
     ++ lib.optionals jsSupport [ qtdeclarative ]
     ++ lib.optionals kioPluginSupport [ kio ]
-    ++ lib.optionals plasmoidSupport [ extra-cmake-modules plasma-framework ]
+    ++ lib.optionals plasmoidSupport [ plasma-framework ]
   ;
 
-  nativeBuildInputs = [ cmake qttools ];
+  nativeBuildInputs = [
+    cmake
+    qttools
+  ]
+    ++ lib.optionals plasmoidSupport [ extra-cmake-modules ]
+  ;
 
   # No tests are available by upstream, but we test --help anyway
   doInstallCheck = true;
@@ -56,7 +61,7 @@ mkDerivation rec {
   meta = with lib; {
     homepage = "https://github.com/Martchus/syncthingtray";
     description = "Tray application and Dolphin/Plasma integration for Syncthing";
-    license = licenses.gpl2;
+    license = licenses.gpl2Plus;
     maintainers = with maintainers; [ doronbehar ];
     platforms = platforms.linux;
   };

From e27a6e16cf4bc3e2573ce1521193413539f4bea4 Mon Sep 17 00:00:00 2001
From: Pacman99 <pachum99@gmail.com>
Date: Sat, 13 Mar 2021 10:35:08 -0800
Subject: [PATCH 47/49] deadd-notification-center: 1.7.3 -> 2021-03-10

---
 .../misc/deadd-notification-center/default.nix             | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/misc/deadd-notification-center/default.nix b/pkgs/applications/misc/deadd-notification-center/default.nix
index 35627b28d154..0f87fe82d56e 100644
--- a/pkgs/applications/misc/deadd-notification-center/default.nix
+++ b/pkgs/applications/misc/deadd-notification-center/default.nix
@@ -10,16 +10,15 @@
 }:
 stdenv.mkDerivation rec {
   pname = "deadd-notification-center";
-  version = "1.7.3";
+  version = "2021-03-10";
 
   src = fetchFromGitHub {
     owner = "phuhl";
     repo = "linux_notification_center";
-    rev = version;
-    sha256 = "QaOLrtlhQyhMOirk6JO1yMGRrgycHmF9FAdKNbN2TRk=";
+    rev = "640ce0f";
+    sha256 = "12ldr8vppylr90849g3mpjphmnr4lp0vsdkj01a5f4bv4ksx35fm";
   };
 
-  dontUnpack = true;
 
   nativeBuildInputs = [
     autoPatchelfHook

From 02fa7b8edfed004aaf9f03b9071e00142ddf3b59 Mon Sep 17 00:00:00 2001
From: Pacman99 <pachum99@gmail.com>
Date: Sat, 13 Mar 2021 10:36:14 -0800
Subject: [PATCH 48/49] deadd-notification-center: use make to install and fix
 issues with service files

---
 .../deadd-notification-center/default.nix     | 26 +++++++++++++------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/misc/deadd-notification-center/default.nix b/pkgs/applications/misc/deadd-notification-center/default.nix
index 0f87fe82d56e..5d77f301c821 100644
--- a/pkgs/applications/misc/deadd-notification-center/default.nix
+++ b/pkgs/applications/misc/deadd-notification-center/default.nix
@@ -7,6 +7,7 @@
 , gtk3
 , gobject-introspection
 , libxml2
+, fetchpatch
 }:
 stdenv.mkDerivation rec {
   pname = "deadd-notification-center";
@@ -19,6 +20,12 @@ stdenv.mkDerivation rec {
     sha256 = "12ldr8vppylr90849g3mpjphmnr4lp0vsdkj01a5f4bv4ksx35fm";
   };
 
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/phuhl/linux_notification_center/commit/5244e1498574983322be97925e1ff7ebe456d974.patch";
+      sha256 = "sha256-hbqbgBmuewOhtx0na2tmFa5W128ZrBvDcyPme/mRzlI=";
+    })
+  ];
 
   nativeBuildInputs = [
     autoPatchelfHook
@@ -32,15 +39,18 @@ stdenv.mkDerivation rec {
     hicolor-icon-theme
   ];
 
-  installPhase = ''
-    mkdir -p $out/bin $out/share/dbus-1/services
+  buildFlags = [
+    # Exclude stack from `make all` to use the prebuilt binary from .out/
+    "service"
+  ];
 
-    cp $src/.out/${pname} $out/bin/
-    chmod +x $out/bin/${pname}
-
-    sed "s|##PREFIX##|$out|g" $src/${pname}.service.in > \
-      $out/share/dbus-1/services/com.ph-uhl.deadd.notification.service
-  '';
+  makeFlags = [
+    "PREFIX=${placeholder "out"}"
+    "SERVICEDIR_SYSTEMD=${placeholder "out"}/etc/systemd/user"
+    "SERVICEDIR_DBUS=${placeholder "out"}/share/dbus-1/services"
+    # Override systemd auto-detection.
+    "SYSTEMD=1"
+  ];
 
   meta = with lib; {
     description = "A haskell-written notification center for users that like a desktop with style";

From 3f109f6f275016eb3d93a59be134302f5a27f1ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <dev@schuetz-co.de>
Date: Sat, 13 Mar 2021 22:29:18 +0100
Subject: [PATCH 49/49] zulip-term: 0.5.2 -> 0.6.0

---
 .../networking/instant-messengers/zulip-term/default.nix  | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/zulip-term/default.nix b/pkgs/applications/networking/instant-messengers/zulip-term/default.nix
index 8f4b2200cc55..77935b30f06d 100644
--- a/pkgs/applications/networking/instant-messengers/zulip-term/default.nix
+++ b/pkgs/applications/networking/instant-messengers/zulip-term/default.nix
@@ -6,14 +6,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "zulip-term";
-  version = "0.5.2";
+  version = "0.6.0";
 
   # no tests on PyPI
   src = fetchFromGitHub {
     owner = "zulip";
     repo = "zulip-terminal";
     rev = version;
-    sha256 = "1xhhy3v4wck74a83avil0rnmsi2grrh03cww19n5mv80p2q1cjmf";
+    sha256 = "sha256-nlvZaGMVRRCu8PZHxPWjNSxkqhZs0T/tE1js/3pDUFk=";
   };
 
   patches = [
@@ -26,7 +26,9 @@ python3.pkgs.buildPythonApplication rec {
     urwid-readline
     beautifulsoup4
     lxml
-    mypy-extensions
+    typing-extensions
+    python-dateutil
+    tzlocal
   ];
 
   checkInputs = [