From d7dce44057ab4205f837587c7acae1b42d9d8603 Mon Sep 17 00:00:00 2001
From: TredwellGit <tredwell@tutanota.com>
Date: Thu, 10 Jun 2021 23:22:45 +0000
Subject: [PATCH 01/12] glibc: 2.32-46 -> 2.32-48

https://sourceware.org/bugzilla/show_bug.cgi?id=27896
https://nvd.nist.gov/vuln/detail/CVE-2021-33574
(cherry picked from commit e58564267b173d51157847eb5453bfa735268604)
---
 .../libraries/glibc/2.32-master.patch.gz      | Bin 65492 -> 66850 bytes
 pkgs/development/libraries/glibc/common.nix   |   4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/glibc/2.32-master.patch.gz b/pkgs/development/libraries/glibc/2.32-master.patch.gz
index 2fda4294130a8676fc706ce7adb4b8cbe8878aab..8ea998b5bea2cb66113573133190ff3a75fd51d6 100644
GIT binary patch
delta 1406
zcmccepLtOi%Z45Q>y-*Tgi_QP{%d-EcwOk2s+gi681{Af(wVcRqNSEBn;8`)At@at
zB|Te8ZP~2Z%(oYxJT~pw$z^N@)M_SaGB7aw|Gy?SH~+Soz`r?vxD@A4J6NXi`m9k~
zV&p@<yxlBo+r^v>Ii`3VoAq?MN0@N^iTe9@Cr;8-b)K}=LCA2LPvDdKy)WNAyt^dy
z?{sO#qIE@LH$U|)Kd`Oj535N*t$j@U<WT<Y8`n6#l%G@BvV+%t-mk#LUyh&AsP*|j
zS;e|W_o33kNAEb({yELvyU#b_&W!z!+qdj13|QDEmc(2x+Q6!?<WAtG4aYv2)yi@o
zwZ8o&zw1NZ#o66@8GOZUGx>|-0>bM{Roi3Urdlqsol+Tk^;4?XeR*#Ej=c@6dfX8+
z{FJ8eoY|#R;inopZIw<}<g{;7|6P4^nn^`Xu7@Y=L(Q3TW}a<*J10GENR9N*y!<rk
zT2S!vbIYE5s3;JWey`J`E+n^Y!JMa3!GVH4O3O>$9uk>%@69XQol7hIZa?wTG-&E=
zs9%w~Zo?v@Lu^Jj!@B1E|F!#dt6k`)rDh*C=J}{C6WrX$d~AB&@goTi{RwO#Me)4`
zizhtZ^V3FJNs*`Vky5?a@BF^icc=BZ{b}49vNu&JMP;4Hudn86yKRy<1b7!H|2g+>
zgYxA(!~eP8W^SvB$=ah-ZZb7N-Q8(n<V6D(MN#*9wWnT+(upo>qIwP5#reW=1s^$m
zyz|SA*{5OU_M_X=vNYouxf$*#EuS@g|1n{)|4$QMHajJ)Y+gBe?WL4|g<hcx?q6Se
z;^3;doP&9%&ZgSB)~{%}6Ds~yZU6E5eX#=1W48n^|N8fHxa1`6yC%Mk$DQj<g6uw5
zE^B!;UAw|D->v@l{s&%M+pFc?{%>sN+peFwadK+XjcXj$0>^siM{9?8do9_cQ~aaN
zbHlRgd^^{Rm7gwLTczc&??PPGj1Pe)-|vfy{cl+RJN?tMU%&p=Oskm@dvJGyw_b7a
zv&%f$w~~)Z@Xj;s4816{&}6l?h{evEd}$}=?z@p0^l{FN+M5;(HuaTtJeTYH|8Z7j
zcKbIvHosk1f4r=|;`!zF;|f_dZ<mzRTLlR|NNV(4@pY@}<m=ma<cj?}m6dR(viH>K
z{1bVlbz5d`Og^@KvBfopBEL0X+;c;i@3C!~``4hEubsbs+3cB)s>e@m<T@&;k(oZ}
zTUgQS<yX$HexDxhY@9i>z$?S9-o))apPIyx%*l#Aw-5VBA4yi;{r~=#dD~7j)Z`1?
zV&418qG{Qyt^<~Lr?rcPEpop1M9aq@{2-U`-v`~(9Njh-H+R=HHCP>ZB0eEeJ=pR8
z5$E*pjdBcuNv~IPB-=lmR4nFuNujUyU8P({sNhEfVaFp(f*#?nYY%?fc4M05eT(||
zlznWXUncKb?8cs(y4dIbRq5ld?~@+*)qbD2u}LAA`RJc~v(v%%ozj)`#9l7F7UjH@
z*@{0STtCh^<5sX!OTcusDLn`LE*MWcYV?0PqtksML#d2t<vq#HasqGI-&d&!^8U?v
zXIW8|x;l0DQQN7@yjQQeu#$7(>wAu?uemN<T>r#?fl*%jhwBv%8)l`R)qe|k{{)`C
zP$lr?QpkGKZCfsueT%yM=}g&|5{K&bMU}SfcZwIAh}^W8x5IHp*OX2H4XZYJf457_
zv-qYYZTx-0_siU=|LvVaepFR?F6*4ecI@P_PPZ-V{wRua?yzIL|HbJ)S8LQ#+hb`w
zOl-~JVg-jv@_N)ya&3`Sy=swNJmG!A**6s@6ulLEXPr3xOCh{k;p)#NS3=q*%<A%b
z%aF0bvCO^l*UySyJCCuuvsqjJ`qALiBDHRD!V+fV$h8)t*R<8P_FYz8*XKNkkx!WA
et-F(o&X>9QTt}`|aqY;mWq7#n?W7O4m>B@qw6K5x

delta 38
ucmZ3~#d768^M)P&Wt0m%gi_QP{%d-EcwOk2s+gi6$PnoIyfFPVGXnrcv=2Q1

diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix
index 3597dd70f2c..049688cf74d 100644
--- a/pkgs/development/libraries/glibc/common.nix
+++ b/pkgs/development/libraries/glibc/common.nix
@@ -42,7 +42,7 @@
 
 let
   version = "2.32";
-  patchSuffix = "-46";
+  patchSuffix = "-48";
   sha256 = "0di848ibffrnwq7g2dvgqrnn4xqhj3h96csn69q4da51ymafl9qn";
 in
 
@@ -61,7 +61,7 @@ stdenv.mkDerivation ({
     [
       /* No tarballs for stable upstream branch, only https://sourceware.org/git/glibc.git and using git would complicate bootstrapping.
           $ git fetch --all -p && git checkout origin/release/2.32/master && git describe
-          glibc-2.32-46-g1799ac8eab
+          glibc-2.32-48-g16949aeaa0
           $ git show --minimal --reverse glibc-2.32.. | gzip -9n --rsyncable - > 2.32-master.patch.gz
 
          To compare the archive contents zdiff can be used.

From 757e57a0a23ccfb2d428e11b7ab3f43e3c96606e Mon Sep 17 00:00:00 2001
From: Kerstin Humm <kerstin@erictapen.name>
Date: Mon, 31 May 2021 20:58:33 +0200
Subject: [PATCH 02/12] imagemagick: 7.0.11-13 -> 7.0.11-14

(cherry picked from commit 31a8c0e5c4d9f63a17054ea30d7b963c48f5790e)
---
 pkgs/applications/graphics/ImageMagick/7.0.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix
index 1eb2e4320d6..d16537a75e5 100644
--- a/pkgs/applications/graphics/ImageMagick/7.0.nix
+++ b/pkgs/applications/graphics/ImageMagick/7.0.nix
@@ -18,13 +18,13 @@ in
 
 stdenv.mkDerivation rec {
   pname = "imagemagick";
-  version = "7.0.11-13";
+  version = "7.0.11-14";
 
   src = fetchFromGitHub {
     owner = "ImageMagick";
     repo = "ImageMagick";
     rev = version;
-    sha256 = "sha256-6dYc636m1OeRqIPv5NFz/K8OUvl6sgEQKjfvTngR2Ms=";
+    sha256 = "sha256-s/+xwi/taPoDMckF4tX37/BPg9o1sqsipOoDERbK0ZA=";
   };
 
   outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big

From bc3694b59c9f0a4295a10f0b9e16af35e2236203 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <dev@schuetz-co.de>
Date: Sun, 13 Jun 2021 17:53:07 +0200
Subject: [PATCH 03/12] imagemagick: 7.0.11-14 -> 7.1.0-0

(cherry picked from commit 50967b77c0051ee7a5ca8d974d3cc43bf5069a5a)
---
 pkgs/applications/graphics/ImageMagick/7.0.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix
index d16537a75e5..e36d38192b2 100644
--- a/pkgs/applications/graphics/ImageMagick/7.0.nix
+++ b/pkgs/applications/graphics/ImageMagick/7.0.nix
@@ -18,13 +18,13 @@ in
 
 stdenv.mkDerivation rec {
   pname = "imagemagick";
-  version = "7.0.11-14";
+  version = "7.1.0-0";
 
   src = fetchFromGitHub {
     owner = "ImageMagick";
     repo = "ImageMagick";
     rev = version;
-    sha256 = "sha256-s/+xwi/taPoDMckF4tX37/BPg9o1sqsipOoDERbK0ZA=";
+    sha256 = "sha256-TmyJMzj5tHMrVm6xRguZmXIg7c6mHmqusMMdJAHNqNg=";
   };
 
   outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big

From 9a84eb7ec89bbb89e39183bf52393429033f9592 Mon Sep 17 00:00:00 2001
From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Date: Tue, 1 Jun 2021 23:52:19 +0200
Subject: [PATCH 04/12] haskell.compiler.*: pull in unwrapped bintools for
 darwin

GHC calls otool on darwin which is contained in the
stdenv.cc.bintools.bintools derivation and thus needs adding to the
runtime PATH of GHC. Since this is toolchain specific technically, we
check for cctools instead of darwin (although I don't know if GHC
or nixpkgs work on macOS without cctools).

This fixes usage of GHC in an environment where otool is not available
and more specifically in stdenvNoCC which is used by writers.writeHaskell.
Resolves #123228.

(cherry picked from commit 118b28a127c79dbae8c513742fbb17f300407a4b)
---
 pkgs/development/compilers/ghc/8.10.4.nix | 11 ++++++++++-
 pkgs/development/compilers/ghc/8.8.4.nix  | 11 ++++++++++-
 pkgs/development/compilers/ghc/9.0.1.nix  | 11 ++++++++++-
 pkgs/development/compilers/ghc/head.nix   | 11 ++++++++++-
 4 files changed, 40 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/compilers/ghc/8.10.4.nix b/pkgs/development/compilers/ghc/8.10.4.nix
index da957f93520..9c514efc282 100644
--- a/pkgs/development/compilers/ghc/8.10.4.nix
+++ b/pkgs/development/compilers/ghc/8.10.4.nix
@@ -93,6 +93,15 @@ let
   # see #84670 and #49071 for more background.
   useLdGold = targetPlatform.isLinux && !(targetPlatform.useLLVM or false) && !targetPlatform.isMusl;
 
+  runtimeDeps = [
+    targetPackages.stdenv.cc.bintools
+    coreutils
+  ]
+  # On darwin, we need unwrapped bintools as well (for otool)
+  ++ lib.optionals (stdenv.targetPlatform.linker == "cctools") [
+    targetPackages.stdenv.cc.bintools.bintools
+  ];
+
 in
 stdenv.mkDerivation (rec {
   version = "8.10.4";
@@ -235,7 +244,7 @@ stdenv.mkDerivation (rec {
     for i in "$out/bin/"*; do
       test ! -h $i || continue
       egrep --quiet '^#!' <(head -n 1 $i) || continue
-      sed -i -e '2i export PATH="$PATH:${lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i
+      sed -i -e '2i export PATH="$PATH:${lib.makeBinPath runtimeDeps}"' $i
     done
   '';
 
diff --git a/pkgs/development/compilers/ghc/8.8.4.nix b/pkgs/development/compilers/ghc/8.8.4.nix
index b0336ad3992..fcb7db617d0 100644
--- a/pkgs/development/compilers/ghc/8.8.4.nix
+++ b/pkgs/development/compilers/ghc/8.8.4.nix
@@ -102,6 +102,15 @@ let
   # see #84670 and #49071 for more background.
   useLdGold = targetPlatform.isLinux && !(targetPlatform.useLLVM or false) && !targetPlatform.isMusl;
 
+  runtimeDeps = [
+    targetPackages.stdenv.cc.bintools
+    coreutils
+  ]
+  # On darwin, we need unwrapped bintools as well (for otool)
+  ++ lib.optionals (stdenv.targetPlatform.linker == "cctools") [
+    targetPackages.stdenv.cc.bintools.bintools
+  ];
+
 in
 stdenv.mkDerivation (rec {
   version = "8.8.4";
@@ -242,7 +251,7 @@ stdenv.mkDerivation (rec {
     for i in "$out/bin/"*; do
       test ! -h $i || continue
       egrep --quiet '^#!' <(head -n 1 $i) || continue
-      sed -i -e '2i export PATH="$PATH:${lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i
+      sed -i -e '2i export PATH="$PATH:${lib.makeBinPath runtimeDeps}"' $i
     done
   '';
 
diff --git a/pkgs/development/compilers/ghc/9.0.1.nix b/pkgs/development/compilers/ghc/9.0.1.nix
index 58beef5d688..a110d587874 100644
--- a/pkgs/development/compilers/ghc/9.0.1.nix
+++ b/pkgs/development/compilers/ghc/9.0.1.nix
@@ -94,6 +94,15 @@ let
   # see #84670 and #49071 for more background.
   useLdGold = targetPlatform.isLinux && !(targetPlatform.useLLVM or false) && !targetPlatform.isMusl;
 
+  runtimeDeps = [
+    targetPackages.stdenv.cc.bintools
+    coreutils
+  ]
+  # On darwin, we need unwrapped bintools as well (for otool)
+  ++ lib.optionals (stdenv.targetPlatform.linker == "cctools") [
+    targetPackages.stdenv.cc.bintools.bintools
+  ];
+
 in
 stdenv.mkDerivation (rec {
   version = "9.0.1";
@@ -225,7 +234,7 @@ stdenv.mkDerivation (rec {
     for i in "$out/bin/"*; do
       test ! -h $i || continue
       egrep --quiet '^#!' <(head -n 1 $i) || continue
-      sed -i -e '2i export PATH="$PATH:${lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i
+      sed -i -e '2i export PATH="$PATH:${lib.makeBinPath runtimeDeps}"' $i
     done
   '';
 
diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix
index a0ca13270a2..e1c1cdf8dc5 100644
--- a/pkgs/development/compilers/ghc/head.nix
+++ b/pkgs/development/compilers/ghc/head.nix
@@ -104,6 +104,15 @@ let
   # see #84670 and #49071 for more background.
   useLdGold = targetPlatform.isLinux && !(targetPlatform.useLLVM or false) && !targetPlatform.isMusl;
 
+  runtimeDeps = [
+    targetPackages.stdenv.cc.bintools
+    coreutils
+  ]
+  # On darwin, we need unwrapped bintools as well (for otool)
+  ++ lib.optionals (stdenv.targetPlatform.linker == "cctools") [
+    targetPackages.stdenv.cc.bintools.bintools
+  ];
+
 in
 stdenv.mkDerivation (rec {
   inherit version;
@@ -242,7 +251,7 @@ stdenv.mkDerivation (rec {
     for i in "$out/bin/"*; do
       test ! -h $i || continue
       egrep --quiet '^#!' <(head -n 1 $i) || continue
-      sed -i -e '2i export PATH="$PATH:${lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i
+      sed -i -e '2i export PATH="$PATH:${lib.makeBinPath runtimeDeps}"' $i
     done
   '';
 

From 95bb2c374ff88c0ddf4ab03f8a088c70da928db6 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@fysik.su.se>
Date: Tue, 25 May 2021 10:22:25 +0200
Subject: [PATCH 05/12] openblas: disable AVX512, make optional

This effectly reverts 383075f38b94b25ff30ec68a1bb19b35dc9ce4e8.

Some AVX512 optimized kernels seem to be broken in openblas.
See https://github.com/NixOS/nixpkgs/issues/124250.

(cherry picked from commit 5946bc724fe4f7f37ba907ae01d851f070fc97e0)
---
 .../development/libraries/science/math/openblas/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix
index f464a755f6e..fe7f088a411 100644
--- a/pkgs/development/libraries/science/math/openblas/default.nix
+++ b/pkgs/development/libraries/science/math/openblas/default.nix
@@ -17,6 +17,10 @@
 , target ? null
 # Select whether DYNAMIC_ARCH is enabled or not.
 , dynamicArch ? null
+# enable AVX512 optimized kernels.
+# These kernels have been a source of trouble in the past.
+# Use with caution.
+, enableAVX512 ? false
 , enableStatic ? stdenv.hostPlatform.isStatic
 , enableShared ? !stdenv.hostPlatform.isStatic
 }:
@@ -71,6 +75,7 @@ let
       BINARY = 64;
       TARGET = setTarget "ATHLON";
       DYNAMIC_ARCH = setDynamicArch true;
+      NO_AVX512 = !enableAVX512;
       USE_OPENMP = false;
       MACOSX_DEPLOYMENT_TARGET = "10.7";
     };
@@ -79,6 +84,7 @@ let
       BINARY = 64;
       TARGET = setTarget "ATHLON";
       DYNAMIC_ARCH = setDynamicArch true;
+      NO_AVX512 = !enableAVX512;
       USE_OPENMP = !stdenv.hostPlatform.isMusl;
     };
 

From 6a5755d960f1003351679023cc45b82b46fe9925 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 2 Jun 2021 01:43:08 +0200
Subject: [PATCH 06/12] spidermonkey_78: 78.8.0 -> 78.11.0

(cherry picked from commit c0a0f6ceee47dffb1e9a16f48a6cf758745c841b)
---
 pkgs/development/interpreters/spidermonkey/78.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/spidermonkey/78.nix b/pkgs/development/interpreters/spidermonkey/78.nix
index 23f24ca8ba4..c1cc53ea6c6 100644
--- a/pkgs/development/interpreters/spidermonkey/78.nix
+++ b/pkgs/development/interpreters/spidermonkey/78.nix
@@ -20,11 +20,11 @@
 
 stdenv.mkDerivation rec {
   pname = "spidermonkey";
-  version = "78.8.0";
+  version = "78.11.0";
 
   src = fetchurl {
     url = "mirror://mozilla/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz";
-    sha256 = "0451hhjrj9hb6limxim7sbhvw4gs6dd2gmnfxjjx07z3wbgdzwhw";
+    sha256 = "0zjpzkxx3wc2840d7q4b9lnkj1kwk1qps29s9c83jf5y6xclnf9q";
   };
 
   outputs = [ "out" "dev" ];

From fb93bad76c5a5b371132224bcfcb66b6d6df1b51 Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Thu, 10 Jun 2021 20:12:54 +0200
Subject: [PATCH 07/12] dhcp: 4.4.2 -> 4.4.2-P1

Fixes CVE-2021-25217.
https://kb.isc.org/docs/cve-2021-25217

(cherry picked from commit efc86b71a4541e5901be42159a53aeaf34d66f26)
---
 pkgs/tools/networking/dhcp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/dhcp/default.nix b/pkgs/tools/networking/dhcp/default.nix
index 08b3543c5c0..5d71f9641fd 100644
--- a/pkgs/tools/networking/dhcp/default.nix
+++ b/pkgs/tools/networking/dhcp/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   pname = "dhcp";
-  version = "4.4.2";
+  version = "4.4.2-P1";
 
   src = fetchurl {
     url = "https://ftp.isc.org/isc/dhcp/${version}/${pname}-${version}.tar.gz";
-    sha256 = "08a5003zdxgl41b29zjkxa92h2i40zyjgxg0npvnhpkfl5jcsz0s";
+    sha256 = "06jsr0cg5rsmyibshrpcb9za0qgwvqccashdma7mlm1rflrh8pmh";
   };
 
   patches =

From b867767ba1a80ad79b0210d269b46dbd1a17677b Mon Sep 17 00:00:00 2001
From: Kerstin Humm <kerstin@erictapen.name>
Date: Tue, 22 Jun 2021 11:45:57 +0200
Subject: [PATCH 08/12] imagemagick: 7.1.0-0 -> 7.1.0-1

(cherry picked from commit 1688ff519bb0cca4b63fa9da7fd173a945ffb918)
---
 pkgs/applications/graphics/ImageMagick/7.0.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix
index e36d38192b2..53e8db4e0e0 100644
--- a/pkgs/applications/graphics/ImageMagick/7.0.nix
+++ b/pkgs/applications/graphics/ImageMagick/7.0.nix
@@ -18,13 +18,13 @@ in
 
 stdenv.mkDerivation rec {
   pname = "imagemagick";
-  version = "7.1.0-0";
+  version = "7.1.0-1";
 
   src = fetchFromGitHub {
     owner = "ImageMagick";
     repo = "ImageMagick";
     rev = version;
-    sha256 = "sha256-TmyJMzj5tHMrVm6xRguZmXIg7c6mHmqusMMdJAHNqNg=";
+    sha256 = "sha256-hDysFOkq+UKP0wYcYfUCq/oIscwK5s7qIT4vtiPM1PE=";
   };
 
   outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big

From ac674814294f620c3ab724fd112255293ac93e52 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Tue, 8 Jun 2021 17:40:34 +0100
Subject: [PATCH 09/12] nettle: 3.7.2 -> 3.7.3

See https://lists.gnu.org/archive/html/info-gnu/2021-06/msg00002.html
for release information.

(cherry picked from commit be77650f3c4c72d32718acbc63be98340b9f795a)
---
 pkgs/development/libraries/nettle/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/nettle/default.nix b/pkgs/development/libraries/nettle/default.nix
index 3eec9c97ff1..0e3c18c0ac3 100644
--- a/pkgs/development/libraries/nettle/default.nix
+++ b/pkgs/development/libraries/nettle/default.nix
@@ -1,10 +1,10 @@
 { callPackage, fetchurl }:
 
 callPackage ./generic.nix rec {
-  version = "3.7.2";
+  version = "3.7.3";
 
   src = fetchurl {
     url = "mirror://gnu/nettle/nettle-${version}.tar.gz";
-    sha256 = "0qpi1qp3bcvqdsaxy2pzg530db95x8qjahkynxgwvr6dy5760ald";
+    sha256 = "1w5wwc3q0r97d2ifhx77cw7y8s20bm8x52is9j93p2h47yq5w7v6";
   };
 }

From 64946bc3c25b3db27fc6c5664c068eff168e7dc8 Mon Sep 17 00:00:00 2001
From: TredwellGit <tredwell@tutanota.com>
Date: Wed, 19 May 2021 04:10:17 +0000
Subject: [PATCH 10/12] xorg.libX11: 1.7.0 -> 1.7.1

https://lists.x.org/archives/xorg-announce/2021-May/003089.html
https://lists.x.org/archives/xorg-announce/2021-May/003088.html
(cherry picked from commit fa8d1b336de1603a8babb713fdbe57f8413df617)
---
 pkgs/servers/x11/xorg/default.nix   | 6 +++---
 pkgs/servers/x11/xorg/tarballs.list | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 441d8834e08..706e292732b 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -703,11 +703,11 @@ lib.makeScope newScope (self: with self; {
   }) {};
 
   libX11 = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libxcb, xtrans }: stdenv.mkDerivation {
-    name = "libX11-1.7.0";
+    name = "libX11-1.7.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = "mirror://xorg/individual/lib/libX11-1.7.0.tar.bz2";
-      sha256 = "0m6bfwllr3pq2c00l51y62yiq15kphc8dw69zf67qhwmclxzkj1n";
+      url = "mirror://xorg/individual/lib/libX11-1.7.1.tar.bz2";
+      sha256 = "0isxad59hvdwggbxqqjjjg3zmih9xiq4d9mdsnqbyb2nmbg46kp6";
     };
     hardeningDisable = [ "bindnow" "relro" ];
     nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index 093aba26f63..139dd60eb3f 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -175,7 +175,7 @@ mirror://xorg/individual/lib/libICE-1.0.10.tar.bz2
 mirror://xorg/individual/lib/libpciaccess-0.16.tar.bz2
 mirror://xorg/individual/lib/libSM-1.2.3.tar.bz2
 mirror://xorg/individual/lib/libWindowsWM-1.0.1.tar.bz2
-mirror://xorg/individual/lib/libX11-1.7.0.tar.bz2
+mirror://xorg/individual/lib/libX11-1.7.1.tar.bz2
 mirror://xorg/individual/lib/libXau-1.0.9.tar.bz2
 mirror://xorg/individual/lib/libXaw-1.0.14.tar.bz2
 mirror://xorg/individual/lib/libXaw3d-1.6.3.tar.bz2

From 0ad342052e7ec5047791b5ba3e4709f02545847f Mon Sep 17 00:00:00 2001
From: TredwellGit <tredwell@tutanota.com>
Date: Sun, 6 Jun 2021 19:19:44 +0000
Subject: [PATCH 11/12] xorg.libX11: 1.7.1 -> 1.7.2

https://lists.x.org/archives/xorg-announce/2021-June/003092.html
(cherry picked from commit e46a6ab222e5073df1cb6497a60e3aa7a613feba)
---
 pkgs/servers/x11/xorg/default.nix   | 6 +++---
 pkgs/servers/x11/xorg/tarballs.list | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 706e292732b..a7d52d0ff37 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -703,11 +703,11 @@ lib.makeScope newScope (self: with self; {
   }) {};
 
   libX11 = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libxcb, xtrans }: stdenv.mkDerivation {
-    name = "libX11-1.7.1";
+    name = "libX11-1.7.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = "mirror://xorg/individual/lib/libX11-1.7.1.tar.bz2";
-      sha256 = "0isxad59hvdwggbxqqjjjg3zmih9xiq4d9mdsnqbyb2nmbg46kp6";
+      url = "mirror://xorg/individual/lib/libX11-1.7.2.tar.bz2";
+      sha256 = "0v7aj8q3rlchdyfwdna7n7vgpyzyir391dlv5rwy9fxagbikbyhw";
     };
     hardeningDisable = [ "bindnow" "relro" ];
     nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index 139dd60eb3f..1a04dbf476e 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -175,7 +175,7 @@ mirror://xorg/individual/lib/libICE-1.0.10.tar.bz2
 mirror://xorg/individual/lib/libpciaccess-0.16.tar.bz2
 mirror://xorg/individual/lib/libSM-1.2.3.tar.bz2
 mirror://xorg/individual/lib/libWindowsWM-1.0.1.tar.bz2
-mirror://xorg/individual/lib/libX11-1.7.1.tar.bz2
+mirror://xorg/individual/lib/libX11-1.7.2.tar.bz2
 mirror://xorg/individual/lib/libXau-1.0.9.tar.bz2
 mirror://xorg/individual/lib/libXaw-1.0.14.tar.bz2
 mirror://xorg/individual/lib/libXaw3d-1.6.3.tar.bz2

From aa41a0df6808a7e48ac96fd9b81ea5b04d92fac5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <dev@schuetz-co.de>
Date: Sat, 26 Jun 2021 11:32:57 +0200
Subject: [PATCH 12/12] imagemagick7: 7.1.0-1 -> 7.1.0-2

(cherry picked from commit 1eef635d2376c7539b8b69d1058e0ae1a753d6fb)
---
 pkgs/applications/graphics/ImageMagick/7.0.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix
index 53e8db4e0e0..e9aaaa32101 100644
--- a/pkgs/applications/graphics/ImageMagick/7.0.nix
+++ b/pkgs/applications/graphics/ImageMagick/7.0.nix
@@ -18,13 +18,13 @@ in
 
 stdenv.mkDerivation rec {
   pname = "imagemagick";
-  version = "7.1.0-1";
+  version = "7.1.0-2";
 
   src = fetchFromGitHub {
     owner = "ImageMagick";
     repo = "ImageMagick";
     rev = version;
-    sha256 = "sha256-hDysFOkq+UKP0wYcYfUCq/oIscwK5s7qIT4vtiPM1PE=";
+    sha256 = "sha256-0nTz9UBspROrNj72amyZmFYK/y9Xg4+qNt4raZiK3AI=";
   };
 
   outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big
@@ -84,7 +84,7 @@ stdenv.mkDerivation rec {
     homepage = "http://www.imagemagick.org/";
     description = "A software suite to create, edit, compose, or convert bitmap images";
     platforms = platforms.linux ++ platforms.darwin;
-    maintainers = with maintainers; [ erictapen ];
+    maintainers = with maintainers; [ erictapen dotlambda ];
     license = licenses.asl20;
     mainProgram = "magick";
   };