From 31fda20387647ea9d90e4c621b5f101d800205c2 Mon Sep 17 00:00:00 2001
From: ppenguin <hieronymusv@gmail.com>
Date: Fri, 18 Mar 2022 18:34:47 +0100
Subject: [PATCH 01/49] add self to maintainers

---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index e26d693c39c..914c75902b6 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -9904,6 +9904,12 @@
       fingerprint = "48AD DE10 F27B AFB4 7BB0  CCAF 2D25 95A0 0D08 ACE0";
     }];
   };
+  ppenguin = {
+    name = "Jeroen Versteeg";
+    email = "hieronymusv@gmail.com";
+    github = "ppenguin";
+    githubId = 17690377;
+  };
   ppom = {
     name = "Paco Pompeani";
     email = "paco@ecomail.io";

From 1155186a2b72dd8df1d701f40fedf8c84766061a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Tue, 12 Apr 2022 01:03:39 +0000
Subject: [PATCH 02/49] python3Packages.graphviz: 0.19.1 -> 0.19.2

https://github.com/xflr6/graphviz/blob/0.19.2/CHANGES.rst
---
 pkgs/development/python-modules/graphviz/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/graphviz/default.nix b/pkgs/development/python-modules/graphviz/default.nix
index 46a541fe504..b90ba9a6c73 100644
--- a/pkgs/development/python-modules/graphviz/default.nix
+++ b/pkgs/development/python-modules/graphviz/default.nix
@@ -16,16 +16,16 @@
 
 buildPythonPackage rec {
   pname = "graphviz";
-  version = "0.19.1";
+  version = "0.19.2";
 
-  disabled = pythonOlder "3.6";
+  disabled = pythonOlder "3.7";
 
   # patch does not apply to PyPI tarball due to different line endings
   src = fetchFromGitHub {
     owner = "xflr6";
     repo = "graphviz";
     rev = version;
-    sha256 = "sha256-pE1lsx/r/BjvW5W2niDx/UeRXxx4kvCyHzAUAG3bdGc=";
+    hash = "sha256-LxXi0Es6ZJT/nSS6SjGg/3stmR25T4R7TZC34mbT+EA=";
   };
 
   patches = [
@@ -65,6 +65,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Simple Python interface for Graphviz";
     homepage = "https://github.com/xflr6/graphviz";
+    changelog = "https://github.com/xflr6/graphviz/blob/${src.rev}/CHANGES.rst";
     license = licenses.mit;
     maintainers = with maintainers; [ dotlambda ];
   };

From 773162442af358717b5885b29ea0c0b6f7be1fad Mon Sep 17 00:00:00 2001
From: Armeen Mahdian <mahdianarmeen@gmail.com>
Date: Sun, 24 Apr 2022 15:58:50 -0500
Subject: [PATCH 03/49] xtreemfs: switch to python3

---
 pkgs/tools/filesystems/xtreemfs/default.nix | 23 +++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/filesystems/xtreemfs/default.nix b/pkgs/tools/filesystems/xtreemfs/default.nix
index 5f942c92507..e8f283b096c 100644
--- a/pkgs/tools/filesystems/xtreemfs/default.nix
+++ b/pkgs/tools/filesystems/xtreemfs/default.nix
@@ -1,5 +1,20 @@
-{ stdenv, boost, fuse, openssl, cmake, attr, jdk, ant, which, file, python2
-, lib, valgrind, makeWrapper, fetchFromGitHub, fetchpatch }:
+{ stdenv
+, lib
+, fetchFromGitHub
+, fetchpatch
+, makeWrapper
+, ant
+, attr
+, boost
+, cmake
+, file
+, fuse
+, jdk
+, openssl
+, python3
+, valgrind
+, which
+}:
 
 stdenv.mkDerivation {
   src = fetchFromGitHub {
@@ -13,8 +28,8 @@ stdenv.mkDerivation {
   pname = "XtreemFS";
   version = "1.5.1.81";
 
-  nativeBuildInputs = [ makeWrapper ];
-  buildInputs = [ which attr python2 ];
+  nativeBuildInputs = [ makeWrapper python3 ];
+  buildInputs = [ which attr ];
 
   patches = [
     (fetchpatch {

From eae04234f312738173768a880a7c7acc77fe34c9 Mon Sep 17 00:00:00 2001
From: Andrea Scarpino <andrea@scarpino.dev>
Date: Thu, 28 Apr 2022 14:01:18 +0200
Subject: [PATCH 04/49] 3llo: 0.3.0 -> 1.3.1

---
 pkgs/tools/misc/3llo/Gemfile      |  2 +-
 pkgs/tools/misc/3llo/Gemfile.lock | 32 ++++++++++----------
 pkgs/tools/misc/3llo/default.nix  | 20 ++-----------
 pkgs/tools/misc/3llo/gemset.nix   | 49 ++++++++++++++++---------------
 4 files changed, 45 insertions(+), 58 deletions(-)

diff --git a/pkgs/tools/misc/3llo/Gemfile b/pkgs/tools/misc/3llo/Gemfile
index 17a1086d78f..7ad7c5aab15 100644
--- a/pkgs/tools/misc/3llo/Gemfile
+++ b/pkgs/tools/misc/3llo/Gemfile
@@ -1,2 +1,2 @@
 source 'https://rubygems.org'
-gem '3llo', '0.3.0'
+gem '3llo', '1.3.1'
diff --git a/pkgs/tools/misc/3llo/Gemfile.lock b/pkgs/tools/misc/3llo/Gemfile.lock
index 45a37b5e1ca..76926d648af 100644
--- a/pkgs/tools/misc/3llo/Gemfile.lock
+++ b/pkgs/tools/misc/3llo/Gemfile.lock
@@ -1,27 +1,27 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    3llo (0.3.0)
-      tty-prompt (~> 0.12.0)
-    equatable (0.6.1)
-    necromancer (0.4.0)
-    pastel (0.7.3)
-      equatable (~> 0.6)
+    3llo (1.3.1)
+      tty-prompt (~> 0.20)
+    pastel (0.8.0)
       tty-color (~> 0.5)
-    tty-color (0.5.0)
-    tty-cursor (0.4.0)
-    tty-prompt (0.12.0)
-      necromancer (~> 0.4.0)
-      pastel (~> 0.7.0)
-      tty-cursor (~> 0.4.0)
-      wisper (~> 1.6.1)
-    wisper (1.6.1)
+    tty-color (0.6.0)
+    tty-cursor (0.7.1)
+    tty-prompt (0.23.1)
+      pastel (~> 0.8)
+      tty-reader (~> 0.8)
+    tty-reader (0.9.0)
+      tty-cursor (~> 0.7)
+      tty-screen (~> 0.8)
+      wisper (~> 2.0)
+    tty-screen (0.8.1)
+    wisper (2.0.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  3llo (= 0.3.0)
+  3llo (= 1.3.1)
 
 BUNDLED WITH
-   2.1.4
+   2.2.33
diff --git a/pkgs/tools/misc/3llo/default.nix b/pkgs/tools/misc/3llo/default.nix
index 75dc8f772c1..3053af18cde 100644
--- a/pkgs/tools/misc/3llo/default.nix
+++ b/pkgs/tools/misc/3llo/default.nix
@@ -1,24 +1,10 @@
-{ lib, ruby, bundlerApp, fetchpatch }:
+{ lib, ruby_3_0, bundlerApp, fetchpatch }:
 
 bundlerApp {
   pname = "3llo";
+  ruby = ruby_3_0;
 
-  gemfile = ./Gemfile;
-  lockfile = ./Gemfile.lock;
-
-  gemset = lib.recursiveUpdate (import ./gemset.nix) ({
-    "3llo" = {
-      dontBuild = false;
-      patches = [
-        (fetchpatch {
-          url = "https://github.com/qcam/3llo/commit/7667c67fdc975bac315da027a3c69f49e7c06a2e.patch";
-          sha256 = "0ahp19igj77x23b2j9zk3znlmm7q7nija7mjgsmgqkgfbz2r1y7v";
-        })
-      ];
-    };
-  });
-
-  inherit ruby;
+  gemdir  = ./.;
 
   exes = [ "3llo" ];
 
diff --git a/pkgs/tools/misc/3llo/gemset.nix b/pkgs/tools/misc/3llo/gemset.nix
index c6e60d4b668..4de7651dbce 100644
--- a/pkgs/tools/misc/3llo/gemset.nix
+++ b/pkgs/tools/misc/3llo/gemset.nix
@@ -5,81 +5,82 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "082g42lkkynnb2piz37ih696zm2ms63mz2q9rnfzjsd149ig39yy";
+      sha256 = "1w327skga2lpq9rbqqxy6w1r6k9k1l8prk5wmzrycvydn1wp7jk2";
       type = "gem";
     };
-    version = "0.3.0";
+    version = "1.3.1";
   };
-  equatable = {
+  pastel = {
+    dependencies = ["tty-color"];
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0fzx2ishipnp6c124ka6fiw5wk42s7c7gxid2c4c1mb55b30dglf";
+      sha256 = "0xash2gj08dfjvq4hy6l1z22s5v30fhizwgs10d6nviggpxsj7a8";
       type = "gem";
     };
-    version = "0.6.1";
+    version = "0.8.0";
   };
-  necromancer = {
+  tty-color = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0v9nhdkv6zrp7cn48xv7n2vjhsbslpvs0ha36mfkcd56cp27pavz";
+      sha256 = "0aik4kmhwwrmkysha7qibi2nyzb4c8kp42bd5vxnf8sf7b53g73g";
       type = "gem";
     };
-    version = "0.4.0";
+    version = "0.6.0";
   };
-  pastel = {
-    dependencies = ["equatable" "tty-color"];
+  tty-cursor = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0m43wk7gswwkl6lfxwlliqc9v1qp8arfygihyz91jc9icf270xzm";
+      sha256 = "0j5zw041jgkmn605ya1zc151bxgxl6v192v2i26qhxx7ws2l2lvr";
       type = "gem";
     };
-    version = "0.7.3";
+    version = "0.7.1";
   };
-  tty-color = {
+  tty-prompt = {
+    dependencies = ["pastel" "tty-reader"];
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1zpp6zixkkchrc2lqnabrsy24pxikz2px87ggz5ph6355fs803da";
+      sha256 = "1j4y8ik82azjxshgd4i1v4wwhsv3g9cngpygxqkkz69qaa8cxnzw";
       type = "gem";
     };
-    version = "0.5.0";
+    version = "0.23.1";
   };
-  tty-cursor = {
+  tty-reader = {
+    dependencies = ["tty-cursor" "tty-screen" "wisper"];
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "07whfm8mnp7l49s2cm2qy1snhsqq3a90sqwb71gvym4hm2kx822a";
+      sha256 = "1cf2k7w7d84hshg4kzrjvk9pkyc2g1m3nx2n1rpmdcf0hp4p4af6";
       type = "gem";
     };
-    version = "0.4.0";
+    version = "0.9.0";
   };
-  tty-prompt = {
-    dependencies = ["necromancer" "pastel" "tty-cursor" "wisper"];
+  tty-screen = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1026nyqhgmgxi2nmk8xk3hca07gy5rpisjs8y6w00wnw4f01kpv0";
+      sha256 = "18jr6s1cg8yb26wzkqa6874q0z93rq0y5aw092kdqazk71y6a235";
       type = "gem";
     };
-    version = "0.12.0";
+    version = "0.8.1";
   };
   wisper = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "19bw0z1qw1dhv7gn9lad25hgbgpb1bkw8d599744xdfam158ms2s";
+      sha256 = "1rpsi0ziy78cj82sbyyywby4d0aw0a5q84v65qd28vqn79fbq5yf";
       type = "gem";
     };
-    version = "1.6.1";
+    version = "2.0.1";
   };
 }

From b3613dd8d79940947f649b88e54cda420c7399e1 Mon Sep 17 00:00:00 2001
From: Shamrock Lee <44064051+ShamrockLee@users.noreply.github.com>
Date: Sat, 30 Oct 2021 22:42:58 +0000
Subject: [PATCH 05/49] gtkd: add possibility to use different D compilers

Specify the D compiler to use with argument `dcompiler`

Move the specification to all-packages.nix

Passthru the `dcompiler` attribute to make it discoverable by reverse deps
---
 pkgs/development/libraries/gtkd/default.nix | 8 ++++++--
 pkgs/top-level/all-packages.nix             | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/gtkd/default.nix b/pkgs/development/libraries/gtkd/default.nix
index ed432652700..18fedb2c17d 100644
--- a/pkgs/development/libraries/gtkd/default.nix
+++ b/pkgs/development/libraries/gtkd/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchzip, fetchpatch, atk, cairo, ldc, gdk-pixbuf, gnome, gst_all_1, librsvg
+{ lib, stdenv, fetchzip, fetchpatch, atk, cairo, dcompiler, gdk-pixbuf, gnome, gst_all_1, librsvg
 , glib, gtk3, gtksourceview4, libgda, libpeas, pango, pkg-config, which, vte }:
 
 let
@@ -15,7 +15,7 @@ in stdenv.mkDerivation rec {
     stripRoot = false;
   };
 
-  nativeBuildInputs = [ ldc pkg-config which ];
+  nativeBuildInputs = [ dcompiler pkg-config which ];
   propagatedBuildInputs = [
     atk cairo gdk-pixbuf glib gstreamer gst-plugins-base gtk3 gtksourceview4
     libgda libpeas librsvg pango vte
@@ -134,6 +134,10 @@ in stdenv.mkDerivation rec {
     done
   '';
 
+  passthru = {
+    inherit dcompiler;
+  };
+
   meta = with lib; {
     description = "D binding and OO wrapper for GTK";
     homepage = "https://gtkd.org";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e665d0bdc23..85ae3447371 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6703,7 +6703,7 @@ with pkgs;
 
   gtdialog = callPackage ../development/libraries/gtdialog {};
 
-  gtkd = callPackage ../development/libraries/gtkd { };
+  gtkd = callPackage ../development/libraries/gtkd { dcompiler = ldc; };
 
   gtkgnutella = callPackage ../tools/networking/p2p/gtk-gnutella { };
 

From 36c879d18cb3f4e2f6dcdd5e7d646c69138187c1 Mon Sep 17 00:00:00 2001
From: Jeroen Versteeg <jv@1nnovat.io>
Date: Fri, 6 May 2022 18:23:47 +0200
Subject: [PATCH 06/49] python3Packages.pandoc-xnos: init at 2.5.0

---
 .../python-modules/pandoc-xnos/default.nix    | 32 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 34 insertions(+)
 create mode 100644 pkgs/development/python-modules/pandoc-xnos/default.nix

diff --git a/pkgs/development/python-modules/pandoc-xnos/default.nix b/pkgs/development/python-modules/pandoc-xnos/default.nix
new file mode 100644
index 00000000000..28044d4bc24
--- /dev/null
+++ b/pkgs/development/python-modules/pandoc-xnos/default.nix
@@ -0,0 +1,32 @@
+{ buildPythonPackage
+, fetchFromGitHub
+, lib
+, pandocfilters
+, psutil
+}:
+
+buildPythonPackage rec {
+  pname = "pandoc-xnos";
+  version = "2.5.0";
+  format = "pyproject";
+
+  src = fetchFromGitHub {
+    owner = "tomduck";
+    repo = pname;
+    rev = version;
+    sha256 = "sha256-beiGvN0DS6s8wFjcDKozDuwAM2OApX3lTRaUDRUqLeU=";
+  };
+
+  propagatedBuildInputs = [ pandocfilters psutil ];
+
+  doCheck = true;
+
+  pythonImportsCheck = [ "pandocxnos" ];
+
+  meta = with lib; {
+    description = "Pandoc filter suite providing facilities for cross-referencing in markdown documents";
+    homepage = "https://github.com/tomduck/pandoc-xnos";
+    license = licenses.gpl3Only;
+    maintainers = with maintainers; [ ppenguin ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 720f463312f..8317673110f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5886,6 +5886,8 @@ in {
 
   pandoc-attributes = callPackage ../development/python-modules/pandoc-attributes { };
 
+  pandoc-xnos = callPackage ../development/python-modules/pandoc-xnos { };
+
   pandocfilters = callPackage ../development/python-modules/pandocfilters { };
 
   panel = callPackage ../development/python-modules/panel { };

From 5466f3931f5041b8cc91cf534c512a97fdaa9fb7 Mon Sep 17 00:00:00 2001
From: Jeroen Versteeg <jv@1nnovat.io>
Date: Fri, 6 May 2022 18:24:51 +0200
Subject: [PATCH 07/49] pandoc-eqnos: init at 2.5.0

---
 pkgs/tools/misc/pandoc-eqnos/default.nix | 30 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix          |  3 ++-
 2 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/tools/misc/pandoc-eqnos/default.nix

diff --git a/pkgs/tools/misc/pandoc-eqnos/default.nix b/pkgs/tools/misc/pandoc-eqnos/default.nix
new file mode 100644
index 00000000000..310826c35b0
--- /dev/null
+++ b/pkgs/tools/misc/pandoc-eqnos/default.nix
@@ -0,0 +1,30 @@
+{ buildPythonApplication
+, fetchFromGitHub
+, lib
+, pandoc-xnos
+}:
+
+buildPythonApplication rec {
+  pname = "pandoc-eqnos";
+  version = "2.5.0";
+  format = "pyproject";
+
+  src = fetchFromGitHub {
+    owner = "tomduck";
+    repo = pname;
+    rev = version;
+    sha256 = "sha256-7GQdfGHhtQs6LZK+ZyMmcPSkoFfBWmATTMejMiFcS7Y=";
+  };
+
+  propagatedBuildInputs = [ pandoc-xnos ];
+
+  # Different pandoc executables are not available
+  doCheck = false;
+
+  meta = with lib; {
+    description = "Standalone pandoc filter from the pandoc-xnos suite for numbering equations and equation references";
+    homepage = "https://github.com/tomduck/pandoc-eqnos";
+    license = licenses.gpl3Only;
+    maintainers = with maintainers; [ ppenguin ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f1584e5c0d9..9c86a2ffdb9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8332,7 +8332,8 @@ with pkgs;
 
   pandoc-plantuml-filter = python3Packages.callPackage ../tools/misc/pandoc-plantuml-filter { };
 
-  panicparse = callPackage ../tools/misc/panicparse { };
+  # pandoc-*nos is a filter suite, where pandoc-xnos has all functionality and the others are used for only specific functionality
+  pandoc-eqnos = python3Packages.callPackage ../tools/misc/pandoc-eqnos { };
 
   patray = callPackage ../tools/audio/patray { };
 

From 2e563123bf6ed58fa85626686a27208a9c96348d Mon Sep 17 00:00:00 2001
From: Jeroen Versteeg <jv@1nnovat.io>
Date: Fri, 6 May 2022 18:25:55 +0200
Subject: [PATCH 08/49] pandoc-fignos: init at 2.4.0

---
 pkgs/tools/misc/pandoc-fignos/default.nix | 30 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix           |  1 +
 2 files changed, 31 insertions(+)
 create mode 100644 pkgs/tools/misc/pandoc-fignos/default.nix

diff --git a/pkgs/tools/misc/pandoc-fignos/default.nix b/pkgs/tools/misc/pandoc-fignos/default.nix
new file mode 100644
index 00000000000..846d1abe8d7
--- /dev/null
+++ b/pkgs/tools/misc/pandoc-fignos/default.nix
@@ -0,0 +1,30 @@
+{ buildPythonApplication
+, fetchFromGitHub
+, lib
+, pandoc-xnos
+}:
+
+buildPythonApplication rec {
+  pname = "pandoc-fignos";
+  version = "2.4.0";
+  format = "pyproject";
+
+  src = fetchFromGitHub {
+    owner = "tomduck";
+    repo = pname;
+    rev = version;
+    sha256 = "sha256-eDwAW0nLB4YqrWT3Ajt9bmX1A43wl+tOPm2St5VpCLk=";
+  };
+
+  propagatedBuildInputs = [ pandoc-xnos ];
+
+  # Different pandoc executables are not available
+  doCheck = false;
+
+  meta = with lib; {
+    description = "Standalone pandoc filter from the pandoc-xnos suite for numbering figures and figure references";
+    homepage = "https://github.com/tomduck/pandoc-fignos";
+    license = licenses.gpl3Only;
+    maintainers = with maintainers; [ ppenguin ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9c86a2ffdb9..bb626f1de8d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8334,6 +8334,7 @@ with pkgs;
 
   # pandoc-*nos is a filter suite, where pandoc-xnos has all functionality and the others are used for only specific functionality
   pandoc-eqnos = python3Packages.callPackage ../tools/misc/pandoc-eqnos { };
+  pandoc-fignos = python3Packages.callPackage ../tools/misc/pandoc-fignos { };
 
   patray = callPackage ../tools/audio/patray { };
 

From 62511c6de31dd81c2ea07a4cd37e38cb6dee5b29 Mon Sep 17 00:00:00 2001
From: Jeroen Versteeg <jv@1nnovat.io>
Date: Fri, 6 May 2022 18:27:00 +0200
Subject: [PATCH 09/49] pandoc-secnos: init at 2.2.2

---
 pkgs/tools/misc/pandoc-secnos/default.nix     | 34 ++++++++++++++++
 .../pandoc-secnos/patch/fix-manifest.patch    | 39 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  1 +
 3 files changed, 74 insertions(+)
 create mode 100644 pkgs/tools/misc/pandoc-secnos/default.nix
 create mode 100644 pkgs/tools/misc/pandoc-secnos/patch/fix-manifest.patch

diff --git a/pkgs/tools/misc/pandoc-secnos/default.nix b/pkgs/tools/misc/pandoc-secnos/default.nix
new file mode 100644
index 00000000000..95c67dde0ec
--- /dev/null
+++ b/pkgs/tools/misc/pandoc-secnos/default.nix
@@ -0,0 +1,34 @@
+{ buildPythonApplication
+, fetchFromGitHub
+, lib
+, pandoc-xnos
+}:
+
+buildPythonApplication rec {
+  pname = "pandoc-secnos";
+  version = "2.2.2";
+  format = "pyproject";
+
+  src = fetchFromGitHub {
+    owner = "tomduck";
+    repo = pname;
+    rev = version;
+    sha256 = "sha256-J9KLZvioYM3Pl2UXjrEgd4PuLTwCLYy9SsJIzgw5/jU=";
+  };
+
+  propagatedBuildInputs = [ pandoc-xnos ];
+
+  patches = [
+    ./patch/fix-manifest.patch
+  ];
+
+  # Different pandoc executables are not available
+  doCheck = false;
+
+  meta = with lib; {
+    description = "Standalone pandoc filter from the pandoc-xnos suite for numbering sections and section references";
+    homepage = "https://github.com/tomduck/pandoc-secnos";
+    license = licenses.gpl3Only;
+    maintainers = with maintainers; [ ppenguin ];
+  };
+}
diff --git a/pkgs/tools/misc/pandoc-secnos/patch/fix-manifest.patch b/pkgs/tools/misc/pandoc-secnos/patch/fix-manifest.patch
new file mode 100644
index 00000000000..782e5b5e07c
--- /dev/null
+++ b/pkgs/tools/misc/pandoc-secnos/patch/fix-manifest.patch
@@ -0,0 +1,39 @@
+From 165ee1f4c1208636254392335d34934dc50d273e Mon Sep 17 00:00:00 2001
+From: ppenguin <hieronymusv@gmail.com>
+Date: Tue, 15 Mar 2022 23:15:07 +0100
+Subject: [PATCH] fix setup.py to work in nixpkgs
+
+---
+ setup.py | 13 ++-----------
+ 1 file changed, 2 insertions(+), 11 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index d705846..d7345a2 100644
+--- a/setup.py
++++ b/setup.py
+@@ -42,10 +42,10 @@
+ 
+     author='Thomas J. Duck',
+     author_email='tomduck@tomduck.ca',
+-    description='Equation number filter for pandoc',
++    description='Section number filter for pandoc',
+     long_description=DESCRIPTION,
+     license='GPL',
+-    keywords='pandoc equation numbers filter',
++    keywords='pandoc section numbers filter',
+     url='https://github.com/tomduck/pandoc-secnos',
+     download_url='https://github.com/tomduck/pandoc-secnos/tarball/' + \
+                  __version__,
+@@ -63,12 +63,3 @@
+         'Programming Language :: Python'
+         ]
+ )
+-
+-# Check that the pandoc-secnos script is on the PATH
+-if not shutil.which('pandoc-secnos'):
+-    msg = """
+-          ERROR: `pandoc-secnos` script not found. This will need to 
+-          be corrected.  If you need help, please file an Issue at
+-          https://github.com/tomduck/pandoc-secnos/issues.\n"""
+-    print(textwrap.dedent(msg))
+-    sys.exit(-1)
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bb626f1de8d..865c13b933b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8335,6 +8335,7 @@ with pkgs;
   # pandoc-*nos is a filter suite, where pandoc-xnos has all functionality and the others are used for only specific functionality
   pandoc-eqnos = python3Packages.callPackage ../tools/misc/pandoc-eqnos { };
   pandoc-fignos = python3Packages.callPackage ../tools/misc/pandoc-fignos { };
+  pandoc-secnos = python3Packages.callPackage ../tools/misc/pandoc-secnos { };
 
   patray = callPackage ../tools/audio/patray { };
 

From 0a6a3c0b3375e4d3cdd58c20bc8650b361f81116 Mon Sep 17 00:00:00 2001
From: Jeroen Versteeg <jv@1nnovat.io>
Date: Fri, 6 May 2022 18:27:40 +0200
Subject: [PATCH 10/49] pandoc-tablenos: init at 2.3.0

---
 pkgs/tools/misc/pandoc-tablenos/default.nix | 30 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  1 +
 2 files changed, 31 insertions(+)
 create mode 100644 pkgs/tools/misc/pandoc-tablenos/default.nix

diff --git a/pkgs/tools/misc/pandoc-tablenos/default.nix b/pkgs/tools/misc/pandoc-tablenos/default.nix
new file mode 100644
index 00000000000..f3d67826a45
--- /dev/null
+++ b/pkgs/tools/misc/pandoc-tablenos/default.nix
@@ -0,0 +1,30 @@
+{ buildPythonApplication
+, fetchFromGitHub
+, lib
+, pandoc-xnos
+}:
+
+buildPythonApplication rec {
+  pname = "pandoc-tablenos";
+  version = "2.3.0";
+  format = "pyproject";
+
+  src = fetchFromGitHub {
+    owner = "tomduck";
+    repo = pname;
+    rev = version;
+    sha256 = "sha256-FwzsRziY3PoySo9hIFuLw6tOO9oQij6oQEyoY8HgnII=";
+  };
+
+  propagatedBuildInputs = [ pandoc-xnos ];
+
+  # Different pandoc executables are not available
+  doCheck = false;
+
+  meta = with lib; {
+    description = "Standalone pandoc filter from the pandoc-xnos suite for numbering tables and table references";
+    homepage = "https://github.com/tomduck/pandoc-tablenos";
+    license = licenses.gpl3Only;
+    maintainers = with maintainers; [ ppenguin ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 865c13b933b..67acc8a0197 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8336,6 +8336,7 @@ with pkgs;
   pandoc-eqnos = python3Packages.callPackage ../tools/misc/pandoc-eqnos { };
   pandoc-fignos = python3Packages.callPackage ../tools/misc/pandoc-fignos { };
   pandoc-secnos = python3Packages.callPackage ../tools/misc/pandoc-secnos { };
+  pandoc-tablenos = python3Packages.callPackage ../tools/misc/pandoc-tablenos { };
 
   patray = callPackage ../tools/audio/patray { };
 

From b45b15cddd1fa636aaf61d58954f3b8981cd794c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= <fabianhjr@protonmail.com>
Date: Fri, 6 May 2022 13:38:43 -0500
Subject: [PATCH 11/49] =?UTF-8?q?metals:=200.11.4=20=E2=86=92=200.11.5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/development/tools/metals/default.nix b/pkgs/development/tools/metals/default.nix
index b7e8eca1b83..4281a1d9e39 100644
--- a/pkgs/development/tools/metals/default.nix
+++ b/pkgs/development/tools/metals/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   pname = "metals";
-  version = "0.11.4";
+  version = "0.11.5";
 
   deps = stdenv.mkDerivation {
     name = "${pname}-deps-${version}";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     '';
     outputHashMode = "recursive";
     outputHashAlgo = "sha256";
-    outputHash     = "sha256-ZHl+uqYTSMEMR1CSo0btxEn/NQz7MNwh4JISm2L5B3Y=";
+    outputHash     = "sha256-kw+8688E1b7XjEb7AqOExSVu88NqPprKaCuINWqL2wk=";
   };
 
   nativeBuildInputs = [ makeWrapper setJavaClassPath ];

From 218a48c8491968735af9bb2cd87475206a6310e1 Mon Sep 17 00:00:00 2001
From: Arnout Engelen <arnout@bzzt.net>
Date: Sun, 8 May 2022 17:34:45 +0200
Subject: [PATCH 12/49] qemu: stabilize USB EHCI

This patch fixes a problem that caused the NixOS tests that tested booting
from USB to fail periodically.

Fixes #15690, fixes #104642, fixes #170803

Also submitted upstream at https://lists.nongnu.org/archive/html/qemu-devel/2022-05/msg01484.html
---
 pkgs/applications/virtualization/qemu/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix
index ac661ea330c..9f9b0389ced 100644
--- a/pkgs/applications/virtualization/qemu/default.nix
+++ b/pkgs/applications/virtualization/qemu/default.nix
@@ -103,6 +103,12 @@ stdenv.mkDerivation rec {
       sha256 = "sha256-gTRf9XENAfbFB3asYCXnw4OV4Af6VE1W56K2xpYDhgM=";
       revert = true;
     })
+    # make nixos tests that boot from USB more stable
+    # https://lists.nongnu.org/archive/html/qemu-devel/2022-05/msg01484.html
+    (fetchpatch {
+      url = "https://gitlab.com/raboof/qemu/-/commit/3fb5e8fe4434130b1167a995b2a01c077cca2cd5.patch";
+      sha256 = "sha256-evzrN3i4ntc/AFG0C0rezQpQbWcnx74nXO+5DLErX8o=";
+    })
   ]
     ++ lib.optional nixosTestRunner ./force-uid0-on-9p.patch;
 

From bb0210e327fb5e7023aefb886f8eb7aa153078fb Mon Sep 17 00:00:00 2001
From: Euan Kemp <euank@euank.com>
Date: Sun, 8 May 2022 16:42:13 -0700
Subject: [PATCH 13/49] ena: 2.5.0 -> 2.7.1

This update is supposed to give us support for the 5.17 kernel according to the
2.7.0 release notes here: https://github.com/amzn/amzn-drivers/releases/tag/ena_linux_2.7.0

Unfortunately, in practice, it does not build with `linuxPackages_5_17`,
so I left that marked as broken.

It does work for 5.15 though, so we can use that, woo!
---
 pkgs/os-specific/linux/ena/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/ena/default.nix b/pkgs/os-specific/linux/ena/default.nix
index 9f2f8682078..b8128c83c0c 100644
--- a/pkgs/os-specific/linux/ena/default.nix
+++ b/pkgs/os-specific/linux/ena/default.nix
@@ -1,14 +1,14 @@
 { lib, stdenv, fetchFromGitHub, kernel }:
 
 stdenv.mkDerivation rec {
-  version = "2.5.0";
+  version = "2.7.1";
   name = "ena-${version}-${kernel.version}";
 
   src = fetchFromGitHub {
     owner = "amzn";
     repo = "amzn-drivers";
     rev = "ena_linux_${version}";
-    sha256 = "sha256-uOf/1624UtjaZtrk7XyQpeUGdTNVDnzZJZMgU86i+SM=";
+    sha256 = "sha256-JkGzmmsAmLvL9e+bg58H79GNHgsqydK/79VoWEq5/Mc=";
   };
 
   hardeningDisable = [ "pic" ];
@@ -42,6 +42,6 @@ stdenv.mkDerivation rec {
     license = licenses.gpl2Only;
     maintainers = [ maintainers.eelco ];
     platforms = platforms.linux;
-    broken = kernel.kernelAtLeast "5.15";
+    broken = kernel.kernelAtLeast "5.17";
   };
 }

From 35cfe2c29c96d93b4430c59983361c61aaf002ae Mon Sep 17 00:00:00 2001
From: Euan Kemp <euank@euank.com>
Date: Sun, 8 May 2022 16:48:49 -0700
Subject: [PATCH 14/49] nixos/amazon-image: default to 5.15 kernel

Previously, it was held back due to the ENA driver not building on the
current default (5.15). The previous commit bumps the ENA driver, which
allows 5.15 to work.
---
 nixos/modules/virtualisation/amazon-image.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/virtualisation/amazon-image.nix b/nixos/modules/virtualisation/amazon-image.nix
index 9a56b695015..12fe6fa4447 100644
--- a/nixos/modules/virtualisation/amazon-image.nix
+++ b/nixos/modules/virtualisation/amazon-image.nix
@@ -37,13 +37,11 @@ in
       { assertion = cfg.efi -> cfg.hvm;
         message = "EC2 instances using EFI must be HVM instances.";
       }
-      { assertion = versionOlder config.boot.kernelPackages.kernel.version "5.15";
-        message = "ENA driver fails to build with kernel >= 5.15";
+      { assertion = versionOlder config.boot.kernelPackages.kernel.version "5.17";
+        message = "ENA driver fails to build with kernel >= 5.17";
       }
     ];
 
-    boot.kernelPackages = pkgs.linuxKernel.packages.linux_5_10;
-
     boot.growPartition = cfg.hvm;
 
     fileSystems."/" = mkIf (!cfg.zfs.enable) {

From f4fc992f1f8f104660d4204ddb181f0b845ee970 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Mon, 9 May 2022 09:02:17 +0200
Subject: [PATCH 15/49] transmission-gtk: fixup build on darwin

Hopefully the explicit linker flag isn't really needed (anymore?)
---
 pkgs/applications/networking/p2p/transmission/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/applications/networking/p2p/transmission/default.nix b/pkgs/applications/networking/p2p/transmission/default.nix
index 7f48ad2d3b4..f5a8188334c 100644
--- a/pkgs/applications/networking/p2p/transmission/default.nix
+++ b/pkgs/applications/networking/p2p/transmission/default.nix
@@ -86,8 +86,6 @@ in stdenv.mkDerivation {
   ++ lib.optionals stdenv.isLinux [ inotify-tools ]
   ;
 
-  NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-framework CoreFoundation";
-
   postInstall = ''
     mkdir $apparmor
     cat >$apparmor/bin.transmission-daemon <<EOF

From 3459c4053d0e3e44be463e7dabe03679717ffd78 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 9 May 2022 08:10:26 +0000
Subject: [PATCH 16/49] python310Packages.simplisafe-python: 2022.05.0 ->
 2022.05.1

---
 .../python-modules/simplisafe-python/default.nix            | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/simplisafe-python/default.nix b/pkgs/development/python-modules/simplisafe-python/default.nix
index cb3446156bf..720129a13fa 100644
--- a/pkgs/development/python-modules/simplisafe-python/default.nix
+++ b/pkgs/development/python-modules/simplisafe-python/default.nix
@@ -20,7 +20,7 @@
 
 buildPythonPackage rec {
   pname = "simplisafe-python";
-  version = "2022.05.0";
+  version = "2022.05.1";
   format = "pyproject";
 
   disabled = pythonOlder "3.8";
@@ -28,8 +28,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "bachya";
     repo = pname;
-    rev = version;
-    sha256 = "sha256-NXEhjj8L7MPAdQwjqe6u+L9vi/mIIA8TxDpM5q4uUrU=";
+    rev = "refs/tags/${version}";
+    sha256 = "sha256-tYExqOIJPJN8Lss6y0oelkrDuQCpNtFrsFRCxnbUNvU=";
   };
 
   nativeBuildInputs = [

From fb3d02563a31396dee1b3ada8e610ab3557cee81 Mon Sep 17 00:00:00 2001
From: Dmitry Bogatov <git#v1@kaction.cc>
Date: Sun, 8 May 2022 18:44:05 -0400
Subject: [PATCH 17/49] crossplane: init at 0.5.7

---
 .../python-modules/crossplane/default.nix     | 24 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 pkgs/top-level/python-packages.nix            |  2 ++
 3 files changed, 28 insertions(+)
 create mode 100644 pkgs/development/python-modules/crossplane/default.nix

diff --git a/pkgs/development/python-modules/crossplane/default.nix b/pkgs/development/python-modules/crossplane/default.nix
new file mode 100644
index 00000000000..14e153cd8b2
--- /dev/null
+++ b/pkgs/development/python-modules/crossplane/default.nix
@@ -0,0 +1,24 @@
+{ lib, buildPythonPackage, pytestCheckHook, fetchFromGitHub }:
+
+buildPythonPackage rec {
+  pname = "crossplane";
+  version = "0.5.7";
+
+  src = fetchFromGitHub {
+    owner = "nginxinc";
+    repo = "crossplane";
+    rev = "v${version}";
+    sha256 = "0lv3frfvnvz5wjxwh3mwy8nbypv4i62v4bvy5fv7vd6kmbxy1q9l";
+  };
+
+  checkInputs = [ pytestCheckHook ];
+
+  pythonImportsCheck = [ "crossplane" ];
+
+  meta = with lib; {
+    homepage = "https://github.com/nginxinc/crossplane";
+    description = "NGINX configuration file parser and builder";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ kaction ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bb1c7cf3985..d0dfd8049d3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3164,6 +3164,8 @@ with pkgs;
 
   crosvm = callPackage ../applications/virtualization/crosvm { };
 
+  crossplane = with python3Packages; toPythonApplication crossplane;
+
   crunch = callPackage ../tools/security/crunch { };
 
   crudini = callPackage ../tools/misc/crudini { };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ae681e3c946..dae2d0ee03b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1938,6 +1938,8 @@ in {
 
   croniter = callPackage ../development/python-modules/croniter { };
 
+  crossplane = callPackage ../development/python-modules/crossplane { };
+
   crownstone-cloud = callPackage ../development/python-modules/crownstone-cloud { };
 
   crownstone-core = callPackage ../development/python-modules/crownstone-core { };

From 470c724f83fa850a1588b89926df86d6f4a0b10f Mon Sep 17 00:00:00 2001
From: Karim Elatov <elatov@users.noreply.github.com>
Date: Sat, 7 May 2022 18:53:19 +0000
Subject: [PATCH 18/49] fwbuilder: add wayland support

---
 pkgs/tools/security/fwbuilder/default.nix | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/security/fwbuilder/default.nix b/pkgs/tools/security/fwbuilder/default.nix
index 398e552ffe4..15b67932c55 100644
--- a/pkgs/tools/security/fwbuilder/default.nix
+++ b/pkgs/tools/security/fwbuilder/default.nix
@@ -1,4 +1,13 @@
-{ stdenv, lib, fetchFromGitHub, cmake, qtbase, wrapQtAppsHook }:
+{ lib
+, stdenv
+, fetchFromGitHub
+, cmake
+, qtbase
+, wrapQtAppsHook
+, wayland
+, wayland-protocols
+, qtwayland
+}:
 
 stdenv.mkDerivation rec {
   pname = "fwbuilder";
@@ -16,6 +25,12 @@ stdenv.mkDerivation rec {
     wrapQtAppsHook
   ];
 
+  buildInputs = [
+    wayland
+    wayland-protocols
+    qtwayland
+  ];
+
   NIX_CFLAGS_COMPILE = [
     "-Wno-error=misleading-indentation"
   ];

From 66d86c7f3e8c479eea12a5963dbe609c39becf30 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 10 May 2022 01:24:42 +0000
Subject: [PATCH 19/49] cudatext: 1.163.0 -> 1.164.0

---
 pkgs/applications/editors/cudatext/default.nix |  4 ++--
 pkgs/applications/editors/cudatext/deps.json   | 16 ++++++++--------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/editors/cudatext/default.nix b/pkgs/applications/editors/cudatext/default.nix
index 3c16347a29e..9a872c91c95 100644
--- a/pkgs/applications/editors/cudatext/default.nix
+++ b/pkgs/applications/editors/cudatext/default.nix
@@ -38,13 +38,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "cudatext";
-  version = "1.163.0";
+  version = "1.164.0";
 
   src = fetchFromGitHub {
     owner = "Alexey-T";
     repo = "CudaText";
     rev = version;
-    sha256 = "sha256-4jGLyAE202GAjaypubKGW1edyKqOti/yTwstC/R94iE=";
+    sha256 = "sha256-LKLWZiA3Ya8xI2QvNW2f+5akndBloj5pQ7QNaVMoYSI=";
   };
 
   postPatch = ''
diff --git a/pkgs/applications/editors/cudatext/deps.json b/pkgs/applications/editors/cudatext/deps.json
index 9d3629645f8..0eac7839371 100644
--- a/pkgs/applications/editors/cudatext/deps.json
+++ b/pkgs/applications/editors/cudatext/deps.json
@@ -11,13 +11,13 @@
   },
   "ATFlatControls": {
     "owner": "Alexey-T",
-    "rev": "2022.04.18",
-    "sha256": "sha256-Bp/pkbTPLiVaDSstzTaNjKb+msPw8Tuny75n/aYBpUc="
+    "rev": "2022.05.06",
+    "sha256": "sha256-mYZ3mgtUpQ8sry5WmdluHca/CR7RqR9GRrxIoeZFLes="
   },
   "ATSynEdit": {
     "owner": "Alexey-T",
-    "rev": "2022.04.26",
-    "sha256": "sha256-aItWkjnFqxeyEywELEBkuvMH1zfI4jJFL10CexSktxU="
+    "rev": "2022.05.09",
+    "sha256": "sha256-bzBO9Uf8Zkt/kFouQuiPagL7e+86ezH/mOpDCuInJlE="
   },
   "ATSynEdit_Cmp": {
     "owner": "Alexey-T",
@@ -26,13 +26,13 @@
   },
   "EControl": {
     "owner": "Alexey-T",
-    "rev": "2022.04.21",
-    "sha256": "sha256-le6ulGFUNjeipYQKzVFezFb9u/0IcQcu5BMxFaIZdyw="
+    "rev": "2022.05.06",
+    "sha256": "sha256-ppm8Wuxhi5N3Er0f0h9d+v2spwEMr7ksf9tz4vI42+M="
   },
   "ATSynEdit_Ex": {
     "owner": "Alexey-T",
-    "rev": "2022.04.11",
-    "sha256": "sha256-wzE6lNhrXsBOP+Zx+qAcj6Hhf87qqDaqKf9up7I3ZUo="
+    "rev": "2022.05.08",
+    "sha256": "sha256-mAxqJ3PO1BCOYNctKfw/4fKbJsI7Ckb5PVcKdALZu0Q="
   },
   "Python-for-Lazarus": {
     "owner": "Alexey-T",

From 89120cda741c71ca626b383332f8d5e7c31f838a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 10 May 2022 05:32:30 +0000
Subject: [PATCH 20/49] jitsi-meet: 1.0.6091 -> 1.0.6155

---
 pkgs/servers/web-apps/jitsi-meet/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/web-apps/jitsi-meet/default.nix b/pkgs/servers/web-apps/jitsi-meet/default.nix
index e31327927fa..7be8ac57333 100644
--- a/pkgs/servers/web-apps/jitsi-meet/default.nix
+++ b/pkgs/servers/web-apps/jitsi-meet/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "jitsi-meet";
-  version = "1.0.6091";
+  version = "1.0.6155";
 
   src = fetchurl {
     url = "https://download.jitsi.org/jitsi-meet/src/jitsi-meet-${version}.tar.bz2";
-    sha256 = "lYQGrH7D2xsRdwDC0yXB+tt4nOawEkq9A5tDIwl6pRk=";
+    sha256 = "baCRVYe1z2uH3vSb5KbWs0y4KyQYO3JpTyoGFZIZQqo=";
   };
 
   dontBuild = true;

From b1571265b512febdcc862e8ecf2fb56598648d58 Mon Sep 17 00:00:00 2001
From: squalus <squalus@squalus.net>
Date: Tue, 10 May 2022 00:10:21 -0700
Subject: [PATCH 21/49] librewolf: move out of firefox directory

Simplifies Firefox maintenance. See #160520

- make the firefox common.nix available from the top level as
  buildMozillaMach
- use new buildMozillaMach function in librewolf expressions
- minor changes to update script
---
 .../networking/browsers/firefox/packages.nix  | 36 ++-----------------
 .../networking/browsers/librewolf/default.nix | 31 ++++++++++++++++
 .../default.nix => librewolf/librewolf.nix}   |  2 +-
 .../browsers/{firefox => }/librewolf/src.json |  0
 .../browsers/{firefox => }/librewolf/src.nix  |  0
 .../{firefox => }/librewolf/update.nix        |  2 +-
 pkgs/top-level/all-packages.nix               | 10 +++---
 7 files changed, 42 insertions(+), 39 deletions(-)
 create mode 100644 pkgs/applications/networking/browsers/librewolf/default.nix
 rename pkgs/applications/networking/browsers/{firefox/librewolf/default.nix => librewolf/librewolf.nix} (98%)
 rename pkgs/applications/networking/browsers/{firefox => }/librewolf/src.json (100%)
 rename pkgs/applications/networking/browsers/{firefox => }/librewolf/src.nix (100%)
 rename pkgs/applications/networking/browsers/{firefox => }/librewolf/update.nix (96%)

diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix
index e34120de9c0..10249aea4ee 100644
--- a/pkgs/applications/networking/browsers/firefox/packages.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages.nix
@@ -1,11 +1,7 @@
-{ stdenv, lib, callPackage, fetchurl, fetchpatch, nixosTests }:
-
-let
-  common = opts: callPackage (import ./common.nix opts) {};
-in
+{ stdenv, lib, callPackage, fetchurl, fetchpatch, nixosTests, buildMozillaMach }:
 
 rec {
-  firefox = common rec {
+  firefox = buildMozillaMach rec {
     pname = "firefox";
     version = "100.0";
     src = fetchurl {
@@ -30,7 +26,7 @@ rec {
     };
   };
 
-  firefox-esr-91 = common rec {
+  firefox-esr-91 = buildMozillaMach rec {
     pname = "firefox-esr";
     version = "91.9.0esr";
     src = fetchurl {
@@ -54,30 +50,4 @@ rec {
       versionSuffix = "esr";
     };
   };
-
-  librewolf =
-  let
-    librewolf-src = callPackage ./librewolf { };
-  in
-  (common rec {
-    pname = "librewolf";
-    binaryName = "librewolf";
-    version = librewolf-src.packageVersion;
-    src = librewolf-src.firefox;
-    inherit (librewolf-src) extraConfigureFlags extraPostPatch extraPassthru;
-
-    meta = {
-      description = "A fork of Firefox, focused on privacy, security and freedom";
-      homepage = "https://librewolf.net/";
-      maintainers = with lib.maintainers; [ squalus ];
-      inherit (firefox.meta) platforms badPlatforms broken maxSilent license;
-    };
-    updateScript = callPackage ./librewolf/update.nix {
-      attrPath = "librewolf-unwrapped";
-    };
-  }).override {
-    crashreporterSupport = false;
-    enableOfficialBranding = false;
-    pgoSupport = false; # Profiling gets stuck and doesn't terminate.
-  };
 }
diff --git a/pkgs/applications/networking/browsers/librewolf/default.nix b/pkgs/applications/networking/browsers/librewolf/default.nix
new file mode 100644
index 00000000000..8f3100de970
--- /dev/null
+++ b/pkgs/applications/networking/browsers/librewolf/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, lib, callPackage, buildMozillaMach }:
+
+let
+  librewolf-src = callPackage ./librewolf.nix { };
+in
+(buildMozillaMach rec {
+  pname = "librewolf";
+  binaryName = "librewolf";
+  version = librewolf-src.packageVersion;
+  src = librewolf-src.firefox;
+  inherit (librewolf-src) extraConfigureFlags extraPostPatch extraPassthru;
+
+  meta = {
+    description = "A fork of Firefox, focused on privacy, security and freedom";
+    homepage = "https://librewolf.net/";
+    maintainers = with lib.maintainers; [ squalus ];
+    platforms = lib.platforms.unix;
+    badPlatforms = lib.platforms.darwin;
+    broken = stdenv.buildPlatform.is32bit; # since Firefox 60, build on 32-bit platforms fails with "out of memory".
+                                           # not in `badPlatforms` because cross-compilation on 64-bit machine might work.
+    maxSilent = 14400; # 4h, double the default of 7200s (c.f. #129212, #129115)
+    license = lib.licenses.mpl20;
+  };
+  updateScript = callPackage ./update.nix {
+    attrPath = "librewolf-unwrapped";
+  };
+}).override {
+  crashreporterSupport = false;
+  enableOfficialBranding = false;
+  pgoSupport = false; # Profiling gets stuck and doesn't terminate.
+}
diff --git a/pkgs/applications/networking/browsers/firefox/librewolf/default.nix b/pkgs/applications/networking/browsers/librewolf/librewolf.nix
similarity index 98%
rename from pkgs/applications/networking/browsers/firefox/librewolf/default.nix
rename to pkgs/applications/networking/browsers/librewolf/librewolf.nix
index 10b65e8825c..68ed776e91c 100644
--- a/pkgs/applications/networking/browsers/firefox/librewolf/default.nix
+++ b/pkgs/applications/networking/browsers/librewolf/librewolf.nix
@@ -1,4 +1,4 @@
-{ callPackage, git }:
+{ callPackage }:
 let
   src = callPackage ./src.nix { };
 in
diff --git a/pkgs/applications/networking/browsers/firefox/librewolf/src.json b/pkgs/applications/networking/browsers/librewolf/src.json
similarity index 100%
rename from pkgs/applications/networking/browsers/firefox/librewolf/src.json
rename to pkgs/applications/networking/browsers/librewolf/src.json
diff --git a/pkgs/applications/networking/browsers/firefox/librewolf/src.nix b/pkgs/applications/networking/browsers/librewolf/src.nix
similarity index 100%
rename from pkgs/applications/networking/browsers/firefox/librewolf/src.nix
rename to pkgs/applications/networking/browsers/librewolf/src.nix
diff --git a/pkgs/applications/networking/browsers/firefox/librewolf/update.nix b/pkgs/applications/networking/browsers/librewolf/update.nix
similarity index 96%
rename from pkgs/applications/networking/browsers/firefox/librewolf/update.nix
rename to pkgs/applications/networking/browsers/librewolf/update.nix
index 5cb5c6168f7..b8bc64afafe 100644
--- a/pkgs/applications/networking/browsers/firefox/librewolf/update.nix
+++ b/pkgs/applications/networking/browsers/librewolf/update.nix
@@ -20,7 +20,7 @@ writeScript "update-librewolf" ''
   latestTag=$(curl https://gitlab.com/api/v4/projects/librewolf-community%2Fbrowser%2Fsource/repository/tags?per_page=1 | jq -r .[0].name)
   echo "latestTag=$latestTag"
 
-  srcJson=pkgs/applications/networking/browsers/firefox/librewolf/src.json
+  srcJson=pkgs/applications/networking/browsers/librewolf/src.json
   localRev=$(jq -r .source.rev < $srcJson)
   echo "localRev=$localRev"
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c82544ce55b..6707930edd4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -26404,11 +26404,13 @@ with pkgs;
 
   filezilla = callPackage ../applications/networking/ftp/filezilla { };
 
-  firefoxPackages = recurseIntoAttrs (callPackage ../applications/networking/browsers/firefox/packages.nix {
-    callPackage = newScope {
+  buildMozillaMach =
+    let callPackage = newScope {
       inherit (rustPackages) cargo rustc;
     };
-  });
+    in opts: callPackage (import ../applications/networking/browsers/firefox/common.nix opts) {};
+
+  firefoxPackages = recurseIntoAttrs (callPackage ../applications/networking/browsers/firefox/packages.nix {});
 
   firefox-unwrapped = firefoxPackages.firefox;
   firefox-esr-91-unwrapped = firefoxPackages.firefox-esr-91;
@@ -26453,7 +26455,7 @@ with pkgs;
     desktopName = "Firefox DevEdition";
   };
 
-  librewolf-unwrapped = firefoxPackages.librewolf;
+  librewolf-unwrapped = callPackage ../applications/networking/browsers/librewolf {};
 
   librewolf = wrapFirefox librewolf-unwrapped {
     inherit (librewolf-unwrapped) extraPrefsFiles extraPoliciesFiles;

From c209577626a62f1e8ab6fcb48d903f736fa9c443 Mon Sep 17 00:00:00 2001
From: amesgen <amesgen@amesgen.de>
Date: Tue, 10 May 2022 19:52:34 +0200
Subject: [PATCH 22/49] svt-av1: 0.9.1 -> 1.0.0

---
 pkgs/tools/video/svt-av1/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/video/svt-av1/default.nix b/pkgs/tools/video/svt-av1/default.nix
index 3c45f2608eb..7522bb042ed 100644
--- a/pkgs/tools/video/svt-av1/default.nix
+++ b/pkgs/tools/video/svt-av1/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "svt-av1";
-  version = "0.9.1";
+  version = "1.0.0";
 
   src = fetchFromGitLab {
     owner = "AOMediaCodec";
     repo = "SVT-AV1";
     rev = "v${version}";
-    sha256 = "sha256-PIr2bCEKj1dXKiGWloZv2v+ed6JdHK3z+p11ugWGzAk=";
+    sha256 = "sha256-M5ErWB/klVijsF+GysR0b3m180h+O+10weKr1pTh8ow=";
   };
 
   nativeBuildInputs = [ cmake nasm ];

From 63f82810d1518f0410684e116f8ccba8449a8729 Mon Sep 17 00:00:00 2001
From: amesgen <amesgen@amesgen.de>
Date: Tue, 10 May 2022 19:52:34 +0200
Subject: [PATCH 23/49] svt-av1: remove BSD-2 from licenses

Quoting from the README:

> Up to v0.8.7, SVT-AV1 is licensed under the BSD-2-clause license and
> the Alliance for Open Media Patent License 1.0. See LICENSE and
> PATENTS for details. Starting from v0.9, SVT-AV1 is licensed under
> the BSD-3-clause clear license and the Alliance for Open Media
> Patent License 1.0. See LICENSE and PATENTS for details.
---
 pkgs/tools/video/svt-av1/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/tools/video/svt-av1/default.nix b/pkgs/tools/video/svt-av1/default.nix
index 7522bb042ed..dc57cf11609 100644
--- a/pkgs/tools/video/svt-av1/default.nix
+++ b/pkgs/tools/video/svt-av1/default.nix
@@ -27,7 +27,6 @@ stdenv.mkDerivation rec {
     changelog = "https://gitlab.com/AOMediaCodec/SVT-AV1/-/blob/v${version}/CHANGELOG.md";
     license = with licenses; [
       aom
-      bsd2
       bsd3
     ];
     platforms = platforms.unix;

From 913460372c58ae7e202ddbf490b2b26db7c1ff63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Wed, 11 May 2022 03:19:27 +0000
Subject: [PATCH 24/49] python3Packages.graphviz: 0.19.2 -> 0.20

https://github.com/xflr6/graphviz/blob/0.20/CHANGES.rst
---
 pkgs/development/python-modules/graphviz/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/graphviz/default.nix b/pkgs/development/python-modules/graphviz/default.nix
index b90ba9a6c73..2fa10120c18 100644
--- a/pkgs/development/python-modules/graphviz/default.nix
+++ b/pkgs/development/python-modules/graphviz/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "graphviz";
-  version = "0.19.2";
+  version = "0.20";
 
   disabled = pythonOlder "3.7";
 
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     owner = "xflr6";
     repo = "graphviz";
     rev = version;
-    hash = "sha256-LxXi0Es6ZJT/nSS6SjGg/3stmR25T4R7TZC34mbT+EA=";
+    hash = "sha256-QyZwXxRbcMushxh/Ypy+v4FOTM4H1u5b7IZMSVgLyEs=";
   };
 
   patches = [

From 03cecc226724dda5672ef8591499f21c9c87df04 Mon Sep 17 00:00:00 2001
From: Florian Brandes <florian.brandes@posteo.de>
Date: Mon, 9 May 2022 14:02:44 +0200
Subject: [PATCH 25/49] python3Packages.sentry-sdk: fix build,
 python3Packages.weasyprint: exclude tests

Signed-off-by: Florian Brandes <florian.brandes@posteo.de>
---
 pkgs/development/python-modules/sentry-sdk/default.nix | 2 ++
 pkgs/development/python-modules/weasyprint/default.nix | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/pkgs/development/python-modules/sentry-sdk/default.nix b/pkgs/development/python-modules/sentry-sdk/default.nix
index e764cd912a0..b368db45bf7 100644
--- a/pkgs/development/python-modules/sentry-sdk/default.nix
+++ b/pkgs/development/python-modules/sentry-sdk/default.nix
@@ -37,6 +37,7 @@
 , trytond
 , urllib3
 , werkzeug
+, multidict
 }:
 
 buildPythonPackage rec {
@@ -88,6 +89,7 @@ buildPythonPackage rec {
     tornado
     trytond
     werkzeug
+    multidict
   ];
 
   doCheck = !stdenv.isDarwin;
diff --git a/pkgs/development/python-modules/weasyprint/default.nix b/pkgs/development/python-modules/weasyprint/default.nix
index a1a7470b8b5..e35ef36011f 100644
--- a/pkgs/development/python-modules/weasyprint/default.nix
+++ b/pkgs/development/python-modules/weasyprint/default.nix
@@ -80,6 +80,8 @@ buildPythonPackage rec {
     # sensitive to sandbox environments
     "test_tab_size"
     "test_tabulation_character"
+    "test_linear_gradients_5"
+    "test_linear_gradients_12"
   ];
 
   FONTCONFIG_FILE = "${fontconfig.out}/etc/fonts/fonts.conf";

From 69f7c987501cad5311a615f6fa0bf3d3b975a967 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 11 May 2022 11:35:59 +0200
Subject: [PATCH 26/49] python310Packages.pkginfo2: init at 30.0.0

---
 .../python-modules/pkginfo2/default.nix       | 35 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 37 insertions(+)
 create mode 100644 pkgs/development/python-modules/pkginfo2/default.nix

diff --git a/pkgs/development/python-modules/pkginfo2/default.nix b/pkgs/development/python-modules/pkginfo2/default.nix
new file mode 100644
index 00000000000..25b9b053748
--- /dev/null
+++ b/pkgs/development/python-modules/pkginfo2/default.nix
@@ -0,0 +1,35 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pytestCheckHook
+, pythonOlder
+}:
+
+buildPythonPackage rec {
+  pname = "pkginfo2";
+  version = "30.0.0";
+
+  disabled = pythonOlder "3.7";
+
+  src = fetchFromGitHub {
+    owner = "nexB";
+    repo = "pkginfo2";
+    rev = "v${version}";
+    hash = "sha256-E9EyaN3ncf/34vvvhRe0rwV28VrjqJo79YFgXq2lKWU=";
+  };
+
+  checkInputs = [
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [
+    "pkginfo2"
+  ];
+
+  meta = with lib; {
+    description = "Query metadatdata from sdists, bdists or installed packages";
+    homepage = "https://github.com/nexB/pkginfo2";
+    license = licenses.mit;
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 8ebd87e812a..a734ab2b360 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6355,6 +6355,8 @@ in {
 
   pkginfo = callPackage ../development/python-modules/pkginfo { };
 
+  pkginfo2 = callPackage ../development/python-modules/pkginfo2 { };
+
   pkuseg = callPackage ../development/python-modules/pkuseg { };
 
   pmsensor = callPackage ../development/python-modules/pmsensor { };

From a76ef494589dcf8cdaa9f1d42ab45ea427203332 Mon Sep 17 00:00:00 2001
From: 06kellyjac <dev@j-k.io>
Date: Wed, 11 May 2022 11:53:36 +0100
Subject: [PATCH 27/49] open-policy-agent: fix darwin build issues

---
 pkgs/development/tools/open-policy-agent/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/open-policy-agent/default.nix b/pkgs/development/tools/open-policy-agent/default.nix
index 7fe4b10f2d2..bd13a697c0c 100644
--- a/pkgs/development/tools/open-policy-agent/default.nix
+++ b/pkgs/development/tools/open-policy-agent/default.nix
@@ -43,8 +43,8 @@ buildGoModule rec {
       go list ./... | grep -v -e e2e ${lib.optionalString stdenv.isDarwin "-e wasm"}
     }
     '' + lib.optionalString stdenv.isDarwin ''
-    # resolve "too many open files" errors during the tests on darwin
-    ulimit -n 1024
+    # remove tests that have "too many open files"/"no space left on device" issues on darwin in hydra
+    rm server/server_test.go
   '';
 
   postInstall = ''

From 9a0ff61993e02bb9db5860d383866dc7537de148 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Wed, 11 May 2022 12:54:13 +0200
Subject: [PATCH 28/49] chromium: 101.0.4951.54 -> 101.0.4951.64

https://chromereleases.googleblog.com/2022/05/stable-channel-update-for-desktop_10.html

This update includes 13 security fixes.

CVEs:
CVE-2022-1633 CVE-2022-1634 CVE-2022-1635 CVE-2022-1636 CVE-2022-1637
CVE-2022-1638 CVE-2022-1639 CVE-2022-1640 CVE-2022-1641
---
 .../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 02292a8c61e..f73f171b750 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": "101.0.4951.54",
-    "sha256": "1d808a7mvg0nd0mm20c1ny5kdvb2xvrs8vz4nnk456ix8pywcv62",
-    "sha256bin64": "1m6s6xf2wvz535w6jskk3pnibvsjpzmbxvd9rlxmqr08y219gp5y",
+    "version": "101.0.4951.64",
+    "sha256": "1xyqm32y9v1hn8ji6qfw6maynqgg3266j58dq4x4aqsm2gj9cn4w",
+    "sha256bin64": "14ijrj7h2y72ppyysz6jv40c01lbnan7z69cl24asch2zjlgwv8v",
     "deps": {
       "gn": {
         "version": "2022-03-14",

From b573c0d93b01edcbd12784f8484bf06523d79ab3 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 11 May 2022 13:03:40 +0200
Subject: [PATCH 29/49] python310Packages.container-inspector: init at 31.0.0

---
 .../container-inspector/default.nix           | 54 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 56 insertions(+)
 create mode 100644 pkgs/development/python-modules/container-inspector/default.nix

diff --git a/pkgs/development/python-modules/container-inspector/default.nix b/pkgs/development/python-modules/container-inspector/default.nix
new file mode 100644
index 00000000000..d8acd1160a8
--- /dev/null
+++ b/pkgs/development/python-modules/container-inspector/default.nix
@@ -0,0 +1,54 @@
+{ lib
+, attrs
+, buildPythonPackage
+, click
+, commoncode
+, dockerfile-parse
+, fetchFromGitHub
+, pytestCheckHook
+, pythonOlder
+, setuptools-scm
+}:
+
+buildPythonPackage rec {
+  pname = "container-inspector";
+  version = "31.0.0";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.6";
+
+  src = fetchFromGitHub {
+    owner = "nexB";
+    repo = pname;
+    rev = "v${version}";
+    hash = "sha256-YwtyNZsTMb8iFXo/rojvjkKUbMNRCXVamzFykpwYCOk=";
+  };
+
+  dontConfigure = true;
+
+  nativeBuildInputs = [
+    setuptools-scm
+  ];
+
+  propagatedBuildInputs = [
+    attrs
+    click
+    dockerfile-parse
+    commoncode
+  ];
+
+  checkInputs = [
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [
+    "container_inspector"
+  ];
+
+  meta = with lib; {
+    description = "Suite of analysis utilities and command line tools for container images";
+    homepage = "https://github.com/nexB/container-inspector";
+    license = with licenses; [ asl20 ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3fd57e228de..f3fb2524974 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1871,6 +1871,8 @@ in {
 
   consul = callPackage ../development/python-modules/consul { };
 
+  container-inspector = callPackage ../development/python-modules/container-inspector { };
+
   contexter = callPackage ../development/python-modules/contexter { };
 
   contextlib2 = callPackage ../development/python-modules/contextlib2 { };

From c2e73ebc70f9318f45fe5063eed0969773af35a7 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 11 May 2022 13:22:40 +0200
Subject: [PATCH 30/49] python310Packages.pip-requirements-parser: init at
 31.2.0

---
 .../pip-requirements-parser/default.nix       | 48 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 50 insertions(+)
 create mode 100644 pkgs/development/python-modules/pip-requirements-parser/default.nix

diff --git a/pkgs/development/python-modules/pip-requirements-parser/default.nix b/pkgs/development/python-modules/pip-requirements-parser/default.nix
new file mode 100644
index 00000000000..d4246d302a2
--- /dev/null
+++ b/pkgs/development/python-modules/pip-requirements-parser/default.nix
@@ -0,0 +1,48 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, packaging
+, pytestCheckHook
+, pythonOlder
+, setuptools-scm
+}:
+
+buildPythonPackage rec {
+  pname = "pip-requirements-parser";
+  version = "31.2.0";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.6";
+
+  src = fetchFromGitHub {
+    owner = "nexB";
+    repo = pname;
+    rev = "v${version}";
+    hash = "sha256-i4hw3tS4i2ek2JzcDiGo5aFFJ9J2JJ9MB5vxDhOilb0=";
+  };
+
+  dontConfigure = true;
+
+  nativeBuildInputs = [
+    setuptools-scm
+  ];
+
+  propagatedBuildInputs = [
+    packaging
+  ];
+
+  checkInputs = [
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [
+    "pip_requirements_parser"
+  ];
+
+  meta = with lib; {
+    description = "Module to parse pip requirements";
+    homepage = "https://github.com/nexB/pip-requirements-parser";
+    license = licenses.mit;
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 8ebd87e812a..e1bd721657b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6340,6 +6340,8 @@ in {
 
   pip-tools = callPackage ../development/python-modules/pip-tools { };
 
+  pip-requirements-parser = callPackage ../development/python-modules/pip-requirements-parser { };
+
   pipx = callPackage ../development/python-modules/pipx { };
 
   pivy = callPackage ../development/python-modules/pivy {

From ef38006a31d5cbf616e91942c1fcd7ce76d525d0 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Wed, 11 May 2022 22:50:50 +1000
Subject: [PATCH 31/49] shfmt: 3.4.3 -> 3.5.0

https://github.com/mvdan/sh/releases/tag/v3.5.0
---
 pkgs/tools/text/shfmt/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/text/shfmt/default.nix b/pkgs/tools/text/shfmt/default.nix
index 061e1f709eb..e23e79473b1 100644
--- a/pkgs/tools/text/shfmt/default.nix
+++ b/pkgs/tools/text/shfmt/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "shfmt";
-  version = "3.4.3";
+  version = "3.5.0";
 
   src = fetchFromGitHub {
     owner = "mvdan";
     repo = "sh";
     rev = "v${version}";
-    sha256 = "sha256-tE7U/hE1Z/9VZTYt2jU0IE11cS01l6wTPVFuXH36sM4=";
+    sha256 = "sha256-ZhuOOZ+Lttan7R5YgpiM5okGNkSH0NRUj4hHd1ELbLI=";
   };
 
-  vendorSha256 = "sha256-ZYsQ+wE+G7xNrBN29npSxxPCz9+Wb/RsBzM5uwJkhO8=";
+  vendorSha256 = "sha256-3eao9bORPTsyCFpafp89mcL2Y7HNBlDfUsTull7qnYs=";
 
   subPackages = [ "cmd/shfmt" ];
 

From 0825d9ad8842ed5d5507109f470bebf946c6827d Mon Sep 17 00:00:00 2001
From: 06kellyjac <dev@j-k.io>
Date: Wed, 11 May 2022 14:58:10 +0100
Subject: [PATCH 32/49] terragrunt: 0.36.11 -> 0.37.0

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

diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix
index 502b2bf41ef..57cd5e11df8 100644
--- a/pkgs/applications/networking/cluster/terragrunt/default.nix
+++ b/pkgs/applications/networking/cluster/terragrunt/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "terragrunt";
-  version = "0.36.11";
+  version = "0.37.0";
 
   src = fetchFromGitHub {
     owner = "gruntwork-io";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-kXa3iG94WTH6KpQksl2r0yXyr4KuLY2AZdZtZ6zWYUA=";
+    sha256 = "sha256-7nil/T6q1crZh9ARTP615UzfjKcgsclpIt2N1ifABBk=";
   };
 
   vendorSha256 = "sha256-7SUf4r+6r6dkBoBZFg2AUK114QEl0+1lwRA4ymYArFs=";

From 96a514a232c866ffc044c88214390ee30bd6804b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 11 May 2022 14:51:37 +0200
Subject: [PATCH 33/49] python3.pkgs.ldaptor: disable checks, remove broken

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

diff --git a/pkgs/development/python-modules/ldaptor/default.nix b/pkgs/development/python-modules/ldaptor/default.nix
index 1f6975ff255..55725fb49c9 100644
--- a/pkgs/development/python-modules/ldaptor/default.nix
+++ b/pkgs/development/python-modules/ldaptor/default.nix
@@ -33,6 +33,11 @@ buildPythonPackage rec {
     twisted
   ];
 
+  # Test creates an excessive amount of temporary files (order of millions).
+  # Cleaning up those files already took over 15 hours already on my zfs
+  # filesystem and is not finished yet.
+  doCheck = false;
+
   checkPhase = ''
     trial -j$NIX_BUILD_CORES ldaptor
   '';
@@ -42,7 +47,5 @@ buildPythonPackage rec {
     homepage = "https://github.com/twisted/ldaptor";
     license = licenses.mit;
     maintainers = with maintainers; [ SuperSandro2000 ];
-    # tests hang or fail with "no space left on device"
-    broken = true;
   };
 }

From 464db0cb7839c6c699eb8e903d9d7b86df3e02bc Mon Sep 17 00:00:00 2001
From: Shamrock Lee <44064051+ShamrockLee@users.noreply.github.com>
Date: Sun, 1 May 2022 00:17:46 +0800
Subject: [PATCH 34/49] gtkd: 3.9.0 -> 3.10.0

---
 pkgs/development/libraries/gtkd/default.nix | 21 ++++-----------------
 1 file changed, 4 insertions(+), 17 deletions(-)

diff --git a/pkgs/development/libraries/gtkd/default.nix b/pkgs/development/libraries/gtkd/default.nix
index 18fedb2c17d..8666a531f16 100644
--- a/pkgs/development/libraries/gtkd/default.nix
+++ b/pkgs/development/libraries/gtkd/default.nix
@@ -1,17 +1,17 @@
-{ lib, stdenv, fetchzip, fetchpatch, atk, cairo, dcompiler, gdk-pixbuf, gnome, gst_all_1, librsvg
+{ lib, stdenv, fetchzip, atk, cairo, dcompiler, gdk-pixbuf, gnome, gst_all_1, librsvg
 , glib, gtk3, gtksourceview4, libgda, libpeas, pango, pkg-config, which, vte }:
 
 let
   inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-bad;
 in stdenv.mkDerivation rec {
   pname = "gtkd";
-  version = "3.9.0";
+  version = "3.10.0";
 
   outputs = [ "out" "dev" ];
 
   src = fetchzip {
     url = "https://gtkd.org/Downloads/sources/GtkD-${version}.zip";
-    sha256 = "12kc4s5gp6gn456d8pzhww1ggi9qbxldmcpp6855297g2x8xxy5p";
+    sha256 = "DEKVDexGyg/T3SdnnvRjaHq1LbDo8ekNslxKROpMCCE=";
     stripRoot = false;
   };
 
@@ -21,20 +21,7 @@ in stdenv.mkDerivation rec {
     libgda libpeas librsvg pango vte
   ];
 
-  patches = [
-    # Fix makefile not installing .pc's
-    (fetchpatch {
-      url = "https://github.com/gtkd-developers/GtkD/commit/a9db09117ab27127ca4c3b8d2f308fae483a9199.patch";
-      sha256 = "0ngyqifw1kandc1vk01kms3z65pcisfd75q7z09rml96glhfzjd6";
-    })
-    # Fix breakage with dmd ldc 1.26 and newer
-    (fetchpatch {
-      url = "https://github.com/gtkd-developers/GtkD/commit/323ff96c648882eaca2faee170bd9e90c6e1e9c3.patch";
-      sha256 = "1rhyi0isl6fl5i6fgsinvgq6v72xq7c6sajrxcsnmrzpvw91il3d";
-    })
-  ];
-
-  prePatch = ''
+  postPatch = ''
     substituteAll ${./paths.d} generated/gtkd/gtkd/paths.d
 
     substituteInPlace generated/gstreamer/gst/app/c/functions.d \

From 945365017ae592a63c23685e5257893b6963d138 Mon Sep 17 00:00:00 2001
From: Shamrock Lee <44064051+ShamrockLee@users.noreply.github.com>
Date: Sun, 1 May 2022 01:19:17 +0800
Subject: [PATCH 35/49] gtkd: remove the dev output to resolve cycle dependency

---
 pkgs/development/libraries/gtkd/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/development/libraries/gtkd/default.nix b/pkgs/development/libraries/gtkd/default.nix
index 8666a531f16..d773434b832 100644
--- a/pkgs/development/libraries/gtkd/default.nix
+++ b/pkgs/development/libraries/gtkd/default.nix
@@ -7,8 +7,6 @@ in stdenv.mkDerivation rec {
   pname = "gtkd";
   version = "3.10.0";
 
-  outputs = [ "out" "dev" ];
-
   src = fetchzip {
     url = "https://gtkd.org/Downloads/sources/GtkD-${version}.zip";
     sha256 = "DEKVDexGyg/T3SdnnvRjaHq1LbDo8ekNslxKROpMCCE=";

From 9d39485d5863644100c622ae0ad55b6fb0429051 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Wed, 11 May 2022 16:00:59 +0000
Subject: [PATCH 36/49] python3Packages.diagrams: relax version constraints

---
 pkgs/development/python-modules/diagrams/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/diagrams/default.nix b/pkgs/development/python-modules/diagrams/default.nix
index 84d98d09135..5708a17d6f0 100644
--- a/pkgs/development/python-modules/diagrams/default.nix
+++ b/pkgs/development/python-modules/diagrams/default.nix
@@ -27,8 +27,7 @@ buildPythonPackage rec {
 
   postPatch = ''
     substituteInPlace pyproject.toml \
-      --replace 'jinja2 = "^2.10"' 'jinja2 = "*"' \
-      --replace 'graphviz = ">=0.13.2,<0.17.0"' 'graphviz = "*"'
+      --replace 'graphviz = ">=0.13.2,<0.20.0"' 'graphviz = "*"'
   '';
 
   preConfigure = ''

From 77e956ef7685ed489bcb1e775065af7610e4354d Mon Sep 17 00:00:00 2001
From: ppenguin <hieronymusv@gmail.com>
Date: Wed, 11 May 2022 18:55:12 +0200
Subject: [PATCH 37/49] Update
 pkgs/development/python-modules/pandoc-xnos/default.nix

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
---
 pkgs/development/python-modules/pandoc-xnos/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/development/python-modules/pandoc-xnos/default.nix b/pkgs/development/python-modules/pandoc-xnos/default.nix
index 28044d4bc24..ce365708b35 100644
--- a/pkgs/development/python-modules/pandoc-xnos/default.nix
+++ b/pkgs/development/python-modules/pandoc-xnos/default.nix
@@ -19,8 +19,6 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ pandocfilters psutil ];
 
-  doCheck = true;
-
   pythonImportsCheck = [ "pandocxnos" ];
 
   meta = with lib; {

From d86c6050269100d5384ad4db293f08e7d6bdc4d9 Mon Sep 17 00:00:00 2001
From: Phillip Cloud <417981+cpcloud@users.noreply.github.com>
Date: Tue, 10 May 2022 08:26:59 -0400
Subject: [PATCH 38/49] libnvidia-container: 1.5.0 -> 1.9.0

---
 .../libnvidia-container/default.nix           | 81 +++++++++++++------
 .../libnvidia-container/inline-c-struct.patch | 14 ++++
 .../libnvidia-container/modprobe.patch        | 12 +--
 3 files changed, 76 insertions(+), 31 deletions(-)
 create mode 100644 pkgs/applications/virtualization/libnvidia-container/inline-c-struct.patch

diff --git a/pkgs/applications/virtualization/libnvidia-container/default.nix b/pkgs/applications/virtualization/libnvidia-container/default.nix
index c7743bf44fc..c74416ac33b 100644
--- a/pkgs/applications/virtualization/libnvidia-container/default.nix
+++ b/pkgs/applications/virtualization/libnvidia-container/default.nix
@@ -1,5 +1,6 @@
 { stdenv
 , lib
+, addOpenGLRunpath
 , fetchFromGitHub
 , pkg-config
 , libelf
@@ -8,25 +9,31 @@
 , rpcsvc-proto
 , libtirpc
 , makeWrapper
+, substituteAll
+, go
 }:
 let
-  modp-ver = "450.57";
+  modprobeVersion = "495.44";
   nvidia-modprobe = fetchFromGitHub {
     owner = "NVIDIA";
     repo = "nvidia-modprobe";
-    rev = modp-ver;
-    sha256 = "0r4f6lpbbqqs9932xd2mr7bxn6a3xdalcwq332fc1amrrkgzfyv7";
+    rev = modprobeVersion;
+    sha256 = "sha256-Y3ZOfge/EcmhqI19yWO7UfPqkvY1CHHvFC5l9vYyGuU=";
+  };
+  modprobePatch = substituteAll {
+    src = ./modprobe.patch;
+    inherit modprobeVersion;
   };
 in
 stdenv.mkDerivation rec {
   pname = "libnvidia-container";
-  version = "1.5.0";
+  version = "1.9.0";
 
   src = fetchFromGitHub {
     owner = "NVIDIA";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-b9yQ1mEo1EkjXMguV0t98OvFEQO4h76EVu154MsB2II=";
+    sha256 = "sha256-7OTawWwjeKU8wIa8I/+aSvAJli4kEua94nJSNyCajpE=";
   };
 
   patches = [
@@ -36,18 +43,8 @@ stdenv.mkDerivation rec {
     # path.
     ./libnvc-ldconfig-and-path-fixes.patch
 
-    # the libnvidia-container Makefile wants to build and install static
-    # libtirpc libraries; this patch prevents that from happening
-    ./avoid-static-libtirpc-build.patch
-  ];
-
-  makeFlags = [
-    "WITH_LIBELF=yes"
-    "prefix=$(out)"
-    # we can't use the WITH_TIRPC=yes flag that exists in the Makefile for the
-    # same reason we patch out the static library use of libtirpc so we set the
-    # define in CFLAGS
-    "CFLAGS=-DWITH_TIRPC"
+    # fix bogus struct declaration
+    ./inline-c-struct.patch
   ];
 
   postPatch = ''
@@ -56,27 +53,61 @@ stdenv.mkDerivation rec {
       -e 's/^COMPILER :=.*/COMPILER = $(CC)/' \
       mk/common.mk
 
-    mkdir -p deps/src/nvidia-modprobe-${modp-ver}
-    cp -r ${nvidia-modprobe}/* deps/src/nvidia-modprobe-${modp-ver}
+    mkdir -p deps/src/nvidia-modprobe-${modprobeVersion}
+    cp -r ${nvidia-modprobe}/* deps/src/nvidia-modprobe-${modprobeVersion}
     chmod -R u+w deps/src
     pushd deps/src
-    patch -p0 < ${./modprobe.patch}
-    touch nvidia-modprobe-${modp-ver}/.download_stamp
+
+    patch -p0 < ${modprobePatch}
+    touch nvidia-modprobe-${modprobeVersion}/.download_stamp
     popd
+
+    # 1. replace DESTDIR=$(DEPS_DIR) with empty strings to prevent copying
+    #    things into deps/src/nix/store
+    # 2. similarly, remove any paths prefixed with DEPS_DIR
+    # 3. prevent building static libraries because we don't build static
+    #    libtirpc (for now)
+    # 4. prevent installation of static libraries because of step 3
+    # 5. prevent installation of libnvidia-container-go.so twice
+    sed -i Makefile \
+      -e 's#DESTDIR=\$(DEPS_DIR)#DESTDIR=""#g' \
+      -e 's#\$(DEPS_DIR)\$#\$#g' \
+      -e 's#all: shared static tools#all: shared tools#g' \
+      -e '/$(INSTALL) -m 644 $(LIB_STATIC) $(DESTDIR)$(libdir)/d' \
+      -e '/$(INSTALL) -m 755 $(libdir)\/$(LIBGO_SHARED) $(DESTDIR)$(libdir)/d'
   '';
 
-  postInstall = ''
-    wrapProgram $out/bin/nvidia-container-cli \
-      --prefix LD_LIBRARY_PATH : /run/opengl-driver/lib:/run/opengl-driver-32/lib
+  enableParallelBuilding = true;
+
+  preBuild = ''
+    HOME="$(mktemp -d)"
   '';
 
   NIX_CFLAGS_COMPILE = [ "-I${libtirpc.dev}/include/tirpc" ];
   NIX_LDFLAGS = [ "-L${libtirpc.dev}/lib" "-ltirpc" ];
 
-  nativeBuildInputs = [ pkg-config rpcsvc-proto makeWrapper ];
+  nativeBuildInputs = [ pkg-config go rpcsvc-proto makeWrapper ];
 
   buildInputs = [ libelf libcap libseccomp libtirpc ];
 
+  makeFlags = [
+    "WITH_LIBELF=yes"
+    "prefix=$(out)"
+    # we can't use the WITH_TIRPC=yes flag that exists in the Makefile for the
+    # same reason we patch out the static library use of libtirpc so we set the
+    # define in CFLAGS
+    "CFLAGS=-DWITH_TIRPC"
+  ];
+
+  postInstall =
+    let
+      inherit (addOpenGLRunpath) driverLink;
+      libraryPath = lib.makeLibraryPath [ "$out" driverLink "${driverLink}-32" ];
+    in
+    ''
+      wrapProgram $out/bin/nvidia-container-cli --prefix LD_LIBRARY_PATH : ${libraryPath}
+    '';
+
   meta = with lib; {
     homepage = "https://github.com/NVIDIA/libnvidia-container";
     description = "NVIDIA container runtime library";
diff --git a/pkgs/applications/virtualization/libnvidia-container/inline-c-struct.patch b/pkgs/applications/virtualization/libnvidia-container/inline-c-struct.patch
new file mode 100644
index 00000000000..dab574e5839
--- /dev/null
+++ b/pkgs/applications/virtualization/libnvidia-container/inline-c-struct.patch
@@ -0,0 +1,14 @@
+diff --git a/src/nvcgo.c b/src/nvcgo.c
+index 98789a3..47ad02b 100644
+--- a/src/nvcgo.c
++++ b/src/nvcgo.c
+@@ -33,7 +33,8 @@
+ void nvcgo_program_1(struct svc_req *, register SVCXPRT *);
+ 
+ static struct nvcgo_ext {
+-        struct nvcgo;
++        struct rpc rpc;
++        struct libnvcgo api;
+         bool initialized;
+         void *dl_handle;
+ } global_nvcgo_context;
diff --git a/pkgs/applications/virtualization/libnvidia-container/modprobe.patch b/pkgs/applications/virtualization/libnvidia-container/modprobe.patch
index 8e7b0a723ec..c28b6bad291 100644
--- a/pkgs/applications/virtualization/libnvidia-container/modprobe.patch
+++ b/pkgs/applications/virtualization/libnvidia-container/modprobe.patch
@@ -1,6 +1,6 @@
-diff -ruN nvidia-modprobe-450.57/modprobe-utils/nvidia-modprobe-utils.c nvidia-modprobe-450.57/modprobe-utils/nvidia-modprobe-utils.c
---- nvidia-modprobe-450.57/modprobe-utils/nvidia-modprobe-utils.c	2020-07-09 17:06:05.000000000 +0000
-+++ nvidia-modprobe-450.57/modprobe-utils/nvidia-modprobe-utils.c	2020-08-18 12:43:03.223871514 +0000
+diff -ruN nvidia-modprobe-@modprobeVersion@/modprobe-utils/nvidia-modprobe-utils.c nvidia-modprobe-@modprobeVersion@/modprobe-utils/nvidia-modprobe-utils.c
+--- nvidia-modprobe-@modprobeVersion@/modprobe-utils/nvidia-modprobe-utils.c	2020-07-09 17:06:05.000000000 +0000
++++ nvidia-modprobe-@modprobeVersion@/modprobe-utils/nvidia-modprobe-utils.c	2020-08-18 12:43:03.223871514 +0000
 @@ -840,10 +840,10 @@
      return mknod_helper(major, minor_num, vgpu_dev_name, NV_PROC_REGISTRY_PATH);
  }
@@ -16,9 +16,9 @@ diff -ruN nvidia-modprobe-450.57/modprobe-utils/nvidia-modprobe-utils.c nvidia-m
  {
      char field[32];
      FILE *fp;
-diff -ruN nvidia-modprobe-450.57/modprobe-utils/nvidia-modprobe-utils.h nvidia-modprobe-450.57/modprobe-utils/nvidia-modprobe-utils.h
---- nvidia-modprobe-450.57/modprobe-utils/nvidia-modprobe-utils.h	2020-07-09 17:06:05.000000000 +0000
-+++ nvidia-modprobe-450.57/modprobe-utils/nvidia-modprobe-utils.h	2020-08-18 12:43:44.227745050 +0000
+diff -ruN nvidia-modprobe-@modprobeVersion@/modprobe-utils/nvidia-modprobe-utils.h nvidia-modprobe-@modprobeVersion@/modprobe-utils/nvidia-modprobe-utils.h
+--- nvidia-modprobe-@modprobeVersion@/modprobe-utils/nvidia-modprobe-utils.h	2020-07-09 17:06:05.000000000 +0000
++++ nvidia-modprobe-@modprobeVersion@/modprobe-utils/nvidia-modprobe-utils.h	2020-08-18 12:43:44.227745050 +0000
 @@ -81,6 +81,7 @@
  int nvidia_nvswitch_get_file_state(int minor);
  int nvidia_cap_mknod(const char* cap_file_path, int *minor);

From a7677322d36fc9de29beaf74756624fbe502309a Mon Sep 17 00:00:00 2001
From: Azat Bahawi <azat@bahawi.net>
Date: Wed, 11 May 2022 20:43:02 +0300
Subject: [PATCH 39/49] werf: 1.2.91 -> 1.2.99

---
 pkgs/applications/networking/cluster/werf/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/werf/default.nix b/pkgs/applications/networking/cluster/werf/default.nix
index 6ff362bb0e0..65e057b69fd 100644
--- a/pkgs/applications/networking/cluster/werf/default.nix
+++ b/pkgs/applications/networking/cluster/werf/default.nix
@@ -12,15 +12,15 @@
 
 buildGoModule rec {
   pname = "werf";
-  version = "1.2.91";
+  version = "1.2.99";
 
   src = fetchFromGitHub {
     owner = "werf";
     repo = "werf";
     rev = "v${version}";
-    sha256 = "sha256-ZafIG4D5TvAbXbo07gFajt8orTsju1GfF9a1OR0t1Oo=";
+    sha256 = "sha256-D9NwVZGB0UV0tRe927GpxHzdvAeqcRJOYfocbbj6BRM=";
   };
-  vendorSha256 = "sha256-U4eVQR/ExAENOg2XEYM+mFXANk+basdMLEcqSHuTsh4=";
+  vendorSha256 = "sha256-ZMSTl9WFTF5x+tiQZ37ihVrOuLS0W5PjyXbbzyHJNsI=";
   proxyVendor = true;
 
   nativeBuildInputs = [ installShellFiles pkg-config ];

From 5b447f98e18e87f346b2ac6bcae7af7ec9cf7e3e Mon Sep 17 00:00:00 2001
From: mdarocha <git@mdarocha.pl>
Date: Wed, 11 May 2022 19:55:45 +0200
Subject: [PATCH 40/49] ArchiSteamFarm: fix aarch64 build

---
 pkgs/applications/misc/ArchiSteamFarm/deps-aarch64-linux.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/ArchiSteamFarm/deps-aarch64-linux.nix b/pkgs/applications/misc/ArchiSteamFarm/deps-aarch64-linux.nix
index 7b0148457fa..51ed1def41d 100644
--- a/pkgs/applications/misc/ArchiSteamFarm/deps-aarch64-linux.nix
+++ b/pkgs/applications/misc/ArchiSteamFarm/deps-aarch64-linux.nix
@@ -76,7 +76,7 @@
   (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "5.0.0"; sha256 = "0swqcknyh87ns82w539z1mvy804pfwhgzs97cr3nwqk6g5s42gd6"; })
   (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.0.0"; sha256 = "0bknyf5kig5icwjxls7pcn51x2b2qf91dz9qv67fl70v6cczaz2r"; })
   (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "6.0.4"; sha256 = "1zm9q9yvglsn5w786c9cjdfj1a8z4sipmvn9rhg3ps23rllxwmcc"; })
-  (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "6.0.4"; sha256 = "0g1vw0wr88zlfpdg2gz8c0mriasci1kzvjia4nj19j7b0zaga7f0"; })
+  (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "6.0.4"; sha256 = "1x1g3jhd57z1w3js7f6qa72vwvvjayvxzc2xxcqyscm9xy1fb3d4"; })
   (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "6.0.4"; sha256 = "08mrvb71kldzla2j7v10ifxrc6bwsrd4bms2rqfb7rmx00qs6yj0"; })
   (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "6.0.4"; sha256 = "0vgjwpy55mf6x22a634cdidckyq5hi941i9p10jqyrbnc637frv2"; })
   (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "6.0.4"; sha256 = "1qasm6j25lmcc4xn7f7s3jli1pypz1kfnj7j9dkjlx9mc8r356zp"; })

From 08594d7a7e1e2ad4ab65dd0adcf26598cb2461bd Mon Sep 17 00:00:00 2001
From: be7a <git@be7a.de>
Date: Wed, 11 May 2022 19:26:38 +0200
Subject: [PATCH 41/49] factorio: 1.1.57 -> 1.1.59

---
 pkgs/games/factorio/versions.json | 48 +++++++++++++++----------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/pkgs/games/factorio/versions.json b/pkgs/games/factorio/versions.json
index 8dc902ea099..e3673edd4ac 100644
--- a/pkgs/games/factorio/versions.json
+++ b/pkgs/games/factorio/versions.json
@@ -2,56 +2,56 @@
   "x86_64-linux": {
     "alpha": {
       "experimental": {
-        "name": "factorio_alpha_x64-1.1.57.tar.xz",
+        "name": "factorio_alpha_x64-1.1.59.tar.xz",
         "needsAuth": true,
-        "sha256": "0sazpljdkknv74dqhrv5gxi7s50bfccynqk7xhsr4awl2gdkys0v",
+        "sha256": "0qwq3mjsmhb119pvbfznpncw898z4zs2if4fd7p6rqfz0wip93qk",
         "tarDirectory": "x64",
-        "url": "https://factorio.com/get-download/1.1.57/alpha/linux64",
-        "version": "1.1.57"
+        "url": "https://factorio.com/get-download/1.1.59/alpha/linux64",
+        "version": "1.1.59"
       },
       "stable": {
-        "name": "factorio_alpha_x64-1.1.57.tar.xz",
+        "name": "factorio_alpha_x64-1.1.59.tar.xz",
         "needsAuth": true,
-        "sha256": "0sazpljdkknv74dqhrv5gxi7s50bfccynqk7xhsr4awl2gdkys0v",
+        "sha256": "0qwq3mjsmhb119pvbfznpncw898z4zs2if4fd7p6rqfz0wip93qk",
         "tarDirectory": "x64",
-        "url": "https://factorio.com/get-download/1.1.57/alpha/linux64",
-        "version": "1.1.57"
+        "url": "https://factorio.com/get-download/1.1.59/alpha/linux64",
+        "version": "1.1.59"
       }
     },
     "demo": {
       "experimental": {
-        "name": "factorio_demo_x64-1.1.57.tar.xz",
+        "name": "factorio_demo_x64-1.1.59.tar.xz",
         "needsAuth": false,
-        "sha256": "1lwrz0ix7iycampjh87ki8vg3pkk753873vmrfiyrmh3hchvbj34",
+        "sha256": "1nddk8184kgq4ni0y9j2l8sa3szvcbsq9l90b35l9jb6sqflgki0",
         "tarDirectory": "x64",
-        "url": "https://factorio.com/get-download/1.1.57/demo/linux64",
-        "version": "1.1.57"
+        "url": "https://factorio.com/get-download/1.1.59/demo/linux64",
+        "version": "1.1.59"
       },
       "stable": {
-        "name": "factorio_demo_x64-1.1.57.tar.xz",
+        "name": "factorio_demo_x64-1.1.59.tar.xz",
         "needsAuth": false,
-        "sha256": "1lwrz0ix7iycampjh87ki8vg3pkk753873vmrfiyrmh3hchvbj34",
+        "sha256": "1nddk8184kgq4ni0y9j2l8sa3szvcbsq9l90b35l9jb6sqflgki0",
         "tarDirectory": "x64",
-        "url": "https://factorio.com/get-download/1.1.57/demo/linux64",
-        "version": "1.1.57"
+        "url": "https://factorio.com/get-download/1.1.59/demo/linux64",
+        "version": "1.1.59"
       }
     },
     "headless": {
       "experimental": {
-        "name": "factorio_headless_x64-1.1.57.tar.xz",
+        "name": "factorio_headless_x64-1.1.59.tar.xz",
         "needsAuth": false,
-        "sha256": "1y65wppfzfpad6g6kvdd8srd9sq71dh1dpqia5b3x6pnwk5xsqdm",
+        "sha256": "1p5wyki6wxnvnp7zqjjw9yggiy0p78rx49wmq3q7kq0mxfz054dg",
         "tarDirectory": "x64",
-        "url": "https://factorio.com/get-download/1.1.57/headless/linux64",
-        "version": "1.1.57"
+        "url": "https://factorio.com/get-download/1.1.59/headless/linux64",
+        "version": "1.1.59"
       },
       "stable": {
-        "name": "factorio_headless_x64-1.1.57.tar.xz",
+        "name": "factorio_headless_x64-1.1.59.tar.xz",
         "needsAuth": false,
-        "sha256": "1y65wppfzfpad6g6kvdd8srd9sq71dh1dpqia5b3x6pnwk5xsqdm",
+        "sha256": "1p5wyki6wxnvnp7zqjjw9yggiy0p78rx49wmq3q7kq0mxfz054dg",
         "tarDirectory": "x64",
-        "url": "https://factorio.com/get-download/1.1.57/headless/linux64",
-        "version": "1.1.57"
+        "url": "https://factorio.com/get-download/1.1.59/headless/linux64",
+        "version": "1.1.59"
       }
     }
   }

From fd33656e3d31f83bb40cb7e2ad4238a5dda74d55 Mon Sep 17 00:00:00 2001
From: Arjan Schrijver <github@anymore.nl>
Date: Thu, 5 May 2022 12:48:32 +0200
Subject: [PATCH 42/49] pls: init at 4.0.3

---
 pkgs/tools/misc/pls/default.nix | 38 +++++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix |  2 ++
 2 files changed, 40 insertions(+)
 create mode 100644 pkgs/tools/misc/pls/default.nix

diff --git a/pkgs/tools/misc/pls/default.nix b/pkgs/tools/misc/pls/default.nix
new file mode 100644
index 00000000000..c9cb7e98bc0
--- /dev/null
+++ b/pkgs/tools/misc/pls/default.nix
@@ -0,0 +1,38 @@
+{ lib, python3, fetchFromGitHub }:
+
+python3.pkgs.buildPythonApplication rec {
+  pname = "pls";
+  version = "4.0.3";
+  format = "pyproject";
+
+  src = fetchFromGitHub {
+    owner = "dhruvkb";
+    repo = "pls";
+    rev = version;
+    sha256 = "sha256-cVTIWSOx3FwF3QPak3eIIIgQ1O9JF5e5ILpcHQ4qI6k=";
+  };
+
+  nativeBuildInputs = [ python3.pkgs.poetry-core ];
+
+  propagatedBuildInputs = with python3.pkgs; [
+    pyyaml
+    rich
+  ];
+
+  checkInputs = with python3.pkgs; [
+    freezegun
+    jsonschema
+    pytestCheckHook
+  ];
+
+  pytestFlagsArray = [ "tests/" "--ignore=tests/e2e" ];
+
+  pythonImportsCheck = [ "pls" ];
+
+  meta = with lib; {
+    homepage = "https://dhruvkb.github.io/pls/";
+    description = "Prettier and powerful ls";
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ arjan-s ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 377656e0d2f..e1c2d0cab37 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9401,6 +9401,8 @@ with pkgs;
 
   plowshare = callPackage ../tools/misc/plowshare { };
 
+  pls = callPackage ../tools/misc/pls { };
+
   pm2 = nodePackages.pm2;
 
   pngcheck = callPackage ../tools/graphics/pngcheck { };

From d7af2fb8571e983b501601f9af0cb1f06cdbaf3b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 11 May 2022 15:12:22 +0000
Subject: [PATCH 43/49] python310Packages.zimports: 0.5.0 -> 0.6.0

---
 pkgs/development/python-modules/zimports/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/zimports/default.nix b/pkgs/development/python-modules/zimports/default.nix
index dc9a6189240..6df2b47be9d 100644
--- a/pkgs/development/python-modules/zimports/default.nix
+++ b/pkgs/development/python-modules/zimports/default.nix
@@ -11,13 +11,13 @@
 
 buildPythonPackage rec {
   pname = "zimports";
-  version = "0.5.0";
+  version = "0.6.0";
 
   src = fetchFromGitHub {
     owner = "sqlalchemyorg";
     repo = "zimports";
-    rev = "v${version}";
-    sha256 = "sha256-O8MHUt9yswL9fK9pEddkvnNS2E4vWA/S1BTs1OD1VbU=";
+    rev = "refs/tags/v${version}";
+    sha256 = "sha256-qm5mA8pCSLbkupGBo+ppHSW6uy1j/FfV3idvGQGhjqU=";
   };
 
   disabled = !isPy3k;

From c6cf01e66fe90e3684376f281da1b3334650e227 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 11 May 2022 19:20:40 +0200
Subject: [PATCH 44/49] python310Packages.zimports: enable tests

---
 .../python-modules/zimports/default.nix       | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/python-modules/zimports/default.nix b/pkgs/development/python-modules/zimports/default.nix
index 6df2b47be9d..20e23afcfc0 100644
--- a/pkgs/development/python-modules/zimports/default.nix
+++ b/pkgs/development/python-modules/zimports/default.nix
@@ -6,22 +6,24 @@
 , pyflakes
 , tomli
 , setuptools
-, mock
+, pytestCheckHook
+, pythonOlder
 }:
 
 buildPythonPackage rec {
   pname = "zimports";
   version = "0.6.0";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
     owner = "sqlalchemyorg";
     repo = "zimports";
     rev = "refs/tags/v${version}";
-    sha256 = "sha256-qm5mA8pCSLbkupGBo+ppHSW6uy1j/FfV3idvGQGhjqU=";
+    hash = "sha256-qm5mA8pCSLbkupGBo+ppHSW6uy1j/FfV3idvGQGhjqU=";
   };
 
-  disabled = !isPy3k;
-
   propagatedBuildInputs = [
     flake8-import-order
     pyflakes
@@ -30,14 +32,12 @@ buildPythonPackage rec {
   ];
 
   checkInputs = [
-    mock
+    pytestCheckHook
   ];
 
-  checkPhase = ''
-    runHook preInstallCheck
-    PYTHONPATH= $out/bin/zimports --help >/dev/null
-    runHook postInstallCheck
-  '';
+  pythonImportsCheck = [
+    "zimports"
+  ];
 
   meta = with lib; {
     description = "Python import rewriter";

From 9e7978f75f126c2bce9b6f289657d539ba2ec272 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 11 May 2022 19:37:42 +0200
Subject: [PATCH 45/49] python310Packages.yalexs: 1.1.24 -> 1.1.25

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

diff --git a/pkgs/development/python-modules/yalexs/default.nix b/pkgs/development/python-modules/yalexs/default.nix
index 948ca6c6b88..3e93a01b57b 100644
--- a/pkgs/development/python-modules/yalexs/default.nix
+++ b/pkgs/development/python-modules/yalexs/default.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "yalexs";
-  version = "1.1.24";
+  version = "1.1.25";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     owner = "bdraco";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-6wuTY1nH7btGEktH5UmTV2rMbsap5M55tJx3fljsnlY=";
+    sha256 = "sha256-O7M9Shh8jp2fTaVQPM8mgh1pkv75wn22PFpxJVenbAo=";
   };
 
   propagatedBuildInputs = [

From caf95ff50940e3e120e0879312870cdcff8d8fa7 Mon Sep 17 00:00:00 2001
From: Rick van Schijndel <rol3517@gmail.com>
Date: Wed, 11 May 2022 21:04:28 +0200
Subject: [PATCH 46/49] CODEOWNERS: rename Gabriel439 to Gabriella439
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

See https://github.com/Gabriel439:

Hi, there! 👋🏼

I renamed my GitHub account from @Gabriel439 to @Gabriella439, so if you got here from an old profile link you can visit my new profile here:

    @Gabriella439

I created this placeholder account so that:

    … people who visit old links to my profile can find my new profile
    … other people cannot impersonate my old handle
    … GitHub continues to redirect old links to my repositories indefinitely
---
 .github/CODEOWNERS | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 28bfe7c1fd5..00c8dabe918 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -192,8 +192,8 @@
 /nixos/tests/knot.nix @mweinelt
 
 # Dhall
-/pkgs/development/dhall-modules      @Gabriel439 @Profpatsch @ehmry
-/pkgs/development/interpreters/dhall @Gabriel439 @Profpatsch @ehmry
+/pkgs/development/dhall-modules      @Gabriella439 @Profpatsch @ehmry
+/pkgs/development/interpreters/dhall @Gabriella439 @Profpatsch @ehmry
 
 # Idris
 /pkgs/development/idris-modules @Infinisil

From 7bf12fe3b5a88016834e3693184e6375cbf4a645 Mon Sep 17 00:00:00 2001
From: Daniel Poelzleithner <poelzleithner@b1-systems.de>
Date: Wed, 11 May 2022 22:48:28 +0200
Subject: [PATCH 47/49] kgpg: update description to reflect gnupg

---
 pkgs/applications/kde/kgpg.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/kde/kgpg.nix b/pkgs/applications/kde/kgpg.nix
index 1590887575b..3db757b497d 100644
--- a/pkgs/applications/kde/kgpg.nix
+++ b/pkgs/applications/kde/kgpg.nix
@@ -19,7 +19,7 @@ mkDerivation {
   '';
   meta = {
     homepage = "https://apps.kde.org/kgpg/";
-    description = "Encryption tool";
+    description = "A KDE based interface for GnuPG, a powerful encryption utility";
     license = [ lib.licenses.gpl2 ];
     maintainers = [ lib.maintainers.ttuegel ];
   };

From ced8e41eefd174f4b8f2f8d4e9b82365dd404191 Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@disroot.org>
Date: Wed, 11 May 2022 02:10:13 +0300
Subject: [PATCH 48/49] =?UTF-8?q?crow-translate:=202.9.2=20=E2=86=92=202.9?=
 =?UTF-8?q?.5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../misc/crow-translate/default.nix           | 60 +++--------------
 .../dont-fetch-external-libs.patch            | 65 -------------------
 2 files changed, 8 insertions(+), 117 deletions(-)
 delete mode 100644 pkgs/applications/misc/crow-translate/dont-fetch-external-libs.patch

diff --git a/pkgs/applications/misc/crow-translate/default.nix b/pkgs/applications/misc/crow-translate/default.nix
index 8505c97e1bc..09a7595765d 100644
--- a/pkgs/applications/misc/crow-translate/default.nix
+++ b/pkgs/applications/misc/crow-translate/default.nix
@@ -1,5 +1,5 @@
 { lib
-, mkDerivation
+, stdenv
 , nix-update-script
 , fetchFromGitHub
 , substituteAll
@@ -11,61 +11,22 @@
 , qtmultimedia
 , qtx11extras
 , qttranslations
+, wrapQtAppsHook
 }:
-let
-  singleapplication = fetchFromGitHub {
-    owner = "itay-grudev";
-    repo = "SingleApplication";
-    rev = "v3.2.0";
-    sha256 = "0w3z97dcqcz3bf7w6fja4smkafmx9kvhzb9px4k2nfmmyxh4yfma";
-  };
-  qtaskbarcontrol = fetchFromGitHub {
-    owner = "Skycoder42";
-    repo = "QTaskbarControl";
-    rev = "2.0.2";
-    sha256 = "0iymcvq3pv07fs9l4kh6hi1igqr7957iqndhsmg9fqkalf8nqyad";
-  };
-  qhotkey = fetchFromGitHub {
-    owner = "Skycoder42";
-    repo = "QHotkey";
-    rev = "1.4.2";
-    sha256 = "0391fkqrxqmzpvms4rk06aq05l308k6sadp6y3czq0gx2kng8mn9";
-  };
-  qonlinetranslator = fetchFromGitHub {
-    owner = "crow-translate";
-    repo = "QOnlineTranslator";
-    rev = "1.5.3";
-    sha256 = "sha256-L8y4vazbWD5SC7itxQOjEcX10w0laewxTOGz+Yd+kVM=";
-  };
-  circleflags = fetchFromGitHub {
-    owner = "HatScripts";
-    repo = "circle-flags";
-    rev = "v2.3.0";
-    sha256 = "sha256-KabmewF1Xf/1JQuzolrlRyLJR8O5j+/iT+29/QtOQVE=";
-  };
-  fluent = fetchFromGitHub {
-    owner = "vinceliuice";
-    repo = "Fluent-icon-theme";
-    rev = "2021-08-15";
-    sha256 = "sha256-uBu0vbKfhhnPKGwrnSBjPwS9ncH1iAlmeefAcpckOm4=";
-  };
-in
-mkDerivation rec {
+
+stdenv.mkDerivation rec {
   pname = "crow-translate";
-  version = "2.9.2";
+  version = "2.9.5";
 
   src = fetchFromGitHub {
     owner = "crow-translate";
     repo = pname;
     rev = version;
-    sha256 = "sha256-cxfBdoqGVmtCaXyw6QzXj2V44wKyVal/uqsddwIdvjw=";
+    sha256 = "sha256-AzwJJ85vxXsc0+W3QM8citN5f0AD6APQVd9628cfLgI=";
+    fetchSubmodules = true;
   };
 
   patches = [
-    (substituteAll {
-      src = ./dont-fetch-external-libs.patch;
-      inherit singleapplication qtaskbarcontrol qhotkey qonlinetranslator circleflags fluent;
-    })
     (substituteAll {
       # See https://github.com/NixOS/nixpkgs/issues/86054
       src = ./fix-qttranslations-path.patch;
@@ -73,12 +34,7 @@ mkDerivation rec {
     })
   ];
 
-  postPatch = ''
-    cp -r ${circleflags}/flags/* data/icons
-    cp -r ${fluent}/src/* data/icons
-  '';
-
-  nativeBuildInputs = [ cmake extra-cmake-modules qttools ];
+  nativeBuildInputs = [ cmake extra-cmake-modules qttools wrapQtAppsHook ];
 
   buildInputs = [ leptonica tesseract4 qtmultimedia qtx11extras ];
 
diff --git a/pkgs/applications/misc/crow-translate/dont-fetch-external-libs.patch b/pkgs/applications/misc/crow-translate/dont-fetch-external-libs.patch
deleted file mode 100644
index 0bfdc9ef2f7..00000000000
--- a/pkgs/applications/misc/crow-translate/dont-fetch-external-libs.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-diff --git i/CMakeLists.txt w/CMakeLists.txt
-index 375b17c..106efa9 100644
---- i/CMakeLists.txt
-+++ w/CMakeLists.txt
-@@ -114,13 +114,11 @@ qt5_add_translation(QM_FILES
- )
- 
- configure_file(src/cmake.h.in cmake.h)
--configure_file(data/icons/flags.qrc ${CircleFlags_SOURCE_DIR}/flags/flags.qrc COPYONLY)
--configure_file(data/icons/fluent-icon-theme.qrc ${FluentIconTheme_SOURCE_DIR}/src/fluent-icon-theme.qrc COPYONLY)
- 
- add_executable(${PROJECT_NAME}
--    ${CircleFlags_SOURCE_DIR}/flags/flags.qrc
-+    data/icons/flags.qrc
-     ${QM_FILES}
--    ${FluentIconTheme_SOURCE_DIR}/src/fluent-icon-theme.qrc
-+    data/icons/fluent-icon-theme.qrc
-     data/icons/engines/engines.qrc
-     src/addlanguagedialog.cpp
-     src/addlanguagedialog.ui
-diff --git i/cmake/ExternalLibraries.cmake w/cmake/ExternalLibraries.cmake
-index c92e745..f265f03 100644
---- i/cmake/ExternalLibraries.cmake
-+++ w/cmake/ExternalLibraries.cmake
-@@ -2,34 +2,28 @@ include(FetchContent)
- 
- set(QAPPLICATION_CLASS QApplication)
- FetchContent_Declare(SingleApplication
--    GIT_REPOSITORY https://github.com/itay-grudev/SingleApplication
--    GIT_TAG v3.2.0
-+    SOURCE_DIR @singleapplication@
- )
- 
- FetchContent_Declare(QTaskbarControl
--    GIT_REPOSITORY https://github.com/Skycoder42/QTaskbarControl
--    GIT_TAG 2.0.2
-+    SOURCE_DIR @qtaskbarcontrol@
- )
- 
- option(QHOTKEY_INSTALL OFF)
- FetchContent_Declare(QHotkey
--    GIT_REPOSITORY https://github.com/Skycoder42/QHotkey
--    GIT_TAG 1.4.2
-+    SOURCE_DIR @qhotkey@
- )
- 
- FetchContent_Declare(QOnlineTranslator
--    GIT_REPOSITORY https://github.com/crow-translate/QOnlineTranslator
--    GIT_TAG 1.5.3
-+    SOURCE_DIR @qonlinetranslator@
- )
- 
- FetchContent_Declare(CircleFlags
--    GIT_REPOSITORY https://github.com/HatScripts/circle-flags
--    GIT_TAG v2.3.0
-+    SOURCE_DIR @circleflags@
- )
- 
- FetchContent_Declare(FluentIconTheme
--    GIT_REPOSITORY https://github.com/vinceliuice/Fluent-icon-theme
--    GIT_TAG 2021-08-15
-+    SOURCE_DIR @fluent@
- )
- 
- FetchContent_MakeAvailable(SingleApplication QTaskbarControl QHotkey QOnlineTranslator CircleFlags FluentIconTheme)

From bad52402a5387df45dc98968d95a6506bbc09c5d Mon Sep 17 00:00:00 2001
From: Dmitry Bogatov <github-v1@kaction.cc>
Date: Wed, 11 May 2022 19:00:52 -0400
Subject: [PATCH 49/49] python3.pkgs.sphinx-better-theme: init at 0.1.5
 (#171595)

* python3.pkgs.sphinx-better-theme: init at 0.1.5

* Update pkgs/development/python-modules/sphinx-better-theme/default.nix

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>

* Update pkgs/development/python-modules/sphinx-better-theme/default.nix

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>

Co-authored-by: Dmitry Bogatov <git#v1@kaction.cc>
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
---
 .../sphinx-better-theme/default.nix           | 45 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 47 insertions(+)
 create mode 100644 pkgs/development/python-modules/sphinx-better-theme/default.nix

diff --git a/pkgs/development/python-modules/sphinx-better-theme/default.nix b/pkgs/development/python-modules/sphinx-better-theme/default.nix
new file mode 100644
index 00000000000..8227eca47d8
--- /dev/null
+++ b/pkgs/development/python-modules/sphinx-better-theme/default.nix
@@ -0,0 +1,45 @@
+{ lib, buildPythonPackage, fetchFromGitHub, sphinxHook }:
+
+buildPythonPackage rec {
+  pname = "sphinx-better-theme";
+  version = "0.1.5";
+  outputs = [ "out" "doc" ];
+
+  src = fetchFromGitHub {
+    owner = "irskep";
+    repo = "sphinx-better-theme";
+    rev = "v${version}";
+    sha256 = "07lhfmsjcfzcchsjzh6kxdq5s47j2a6lb5wv3m1kmv2hcm3gvddh";
+  };
+
+  nativeBuildInputs = [ sphinxHook ];
+
+  pythonImportsCheck = [ "better" ];
+
+  meta = with lib; {
+    homepage = "https://github.com/irskep/sphinx-better-theme";
+    description = "Better Sphinx Theme";
+    longDescription = ''
+      This is a modified version of the default Sphinx theme with the following
+      goals:
+
+      1. Remove frivolous colors, especially hard-coded ones
+      2. Improve readability by limiting width and using more whitespace
+      3. Encourage visual customization through CSS, not themeconf
+      4. Use semantic markup
+
+      v0.1 meets goals one and two. Goal three is partially complete; it's simple to
+      add your own CSS file without creating a whole new theme.
+      you'd like something changed.
+
+      To use the theme, set ``html_theme_path`` to contain
+      ``better.better_theme_path``, and set ``html_theme`` to ``'better'``::
+
+          from better import better_theme_path
+          html_theme_path = [better_theme_path]
+          html_theme = 'better'
+    '';
+    license = licenses.bsd2;
+    maintainers = with maintainers; [ kaction ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 807ad190323..44f7328c6f9 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9721,6 +9721,8 @@ in {
 
   spinners = callPackage ../development/python-modules/spinners { };
 
+  sphinx-better-theme = callPackage ../development/python-modules/sphinx-better-theme { };
+
   sphinxcontrib-actdiag = callPackage ../development/python-modules/sphinxcontrib-actdiag { };
 
   sphinxcontrib-apidoc = callPackage ../development/python-modules/sphinxcontrib-apidoc { };