From 1cd8006fdd9c67fb3717d491bd0796c34fe2f4cf Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Sun, 30 Jan 2022 03:03:46 +0100
Subject: [PATCH 01/20] networkmanager_dmenu: 1.6.0 -> 2.1.0

---
 .../tools/networking/networkmanager/dmenu/default.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/networking/networkmanager/dmenu/default.nix b/pkgs/tools/networking/networkmanager/dmenu/default.nix
index 9ea3dde19ab3..741c73494337 100644
--- a/pkgs/tools/networking/networkmanager/dmenu/default.nix
+++ b/pkgs/tools/networking/networkmanager/dmenu/default.nix
@@ -4,13 +4,13 @@
 let inherit (python3Packages) python pygobject3;
 in stdenv.mkDerivation rec {
   pname = "networkmanager_dmenu";
-  version = "1.6.0";
+  version = "2.1.0";
 
   src = fetchFromGitHub {
     owner = "firecat53";
     repo = "networkmanager-dmenu";
-    rev = version;
-    sha256 = "1liidqh8c33pxyb07qyj0jkd0fdak73g9r2iwiq62vfzrpik09k0";
+    rev = "v${version}";
+    sha256 = "sha256-btwiKxmb1xDtPSTOIvpHJDQ5SY1gnBWlKnYOzzSLDEY=";
   };
 
   buildInputs = [ glib python pygobject3 gobject-introspection networkmanager python3Packages.wrapPython ];
@@ -18,8 +18,11 @@ in stdenv.mkDerivation rec {
   dontBuild = true;
 
   installPhase = ''
-    mkdir -p $out/bin
+    mkdir -p $out/bin $out/share/applications $out/share/doc/$pname
     cp networkmanager_dmenu $out/bin/
+    cp networkmanager_dmenu.desktop $out/share/applications
+    cp README.md $out/share/doc/$pname/
+    cp config.ini.example $out/share/doc/$pname/
   '';
 
   postFixup = ''

From f63020259750bb2433ce9333009516ff20fb67fa Mon Sep 17 00:00:00 2001
From: Michal Sojka <michal.sojka@cvut.cz>
Date: Thu, 10 Mar 2022 23:28:46 +0100
Subject: [PATCH 02/20] libtracefs: 1.3.0 -> 1.3.1

trace-cmd 3.0 requires libtracefs 1.3.1.
---
 pkgs/os-specific/linux/libtracefs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/libtracefs/default.nix b/pkgs/os-specific/linux/libtracefs/default.nix
index 972a71d50390..c836fa4433ad 100644
--- a/pkgs/os-specific/linux/libtracefs/default.nix
+++ b/pkgs/os-specific/linux/libtracefs/default.nix
@@ -15,12 +15,12 @@
 
 stdenv.mkDerivation rec {
   pname = "libtracefs";
-  version = "1.3.0";
+  version = "1.3.1";
 
   src = fetchgit {
     url = "git://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git";
     rev = "libtracefs-${version}";
-    sha256 = "sha256-Kg1mPjTZ2UCeco18Fa8GqmLo2R35XvUE/q2J1HAmtEc=";
+    sha256 = "sha256-jwgDveDSXekHMvvxtK8LYVgeppeZLccSheevVusWYws=";
   };
 
   postPatch = ''

From 8d9773fec413cb7641306fa30a48f0988c45a734 Mon Sep 17 00:00:00 2001
From: Michal Sojka <michal.sojka@cvut.cz>
Date: Thu, 10 Mar 2022 23:49:46 +0100
Subject: [PATCH 03/20] libtraceevent: 1.5.1 -> 1.5.3

substituteInPlace was probably needed even in the older versions.
Without this, make prints:

    make[1]: /bin/pwd: No such file or directory
---
 pkgs/os-specific/linux/libtraceevent/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/libtraceevent/default.nix b/pkgs/os-specific/linux/libtraceevent/default.nix
index 7ec8ac35e62a..4e3fd1b2e07c 100644
--- a/pkgs/os-specific/linux/libtraceevent/default.nix
+++ b/pkgs/os-specific/linux/libtraceevent/default.nix
@@ -1,18 +1,19 @@
-{ lib, stdenv, fetchgit, pkg-config, asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl }:
+{ lib, stdenv, fetchgit, pkg-config, asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, coreutils }:
 
 stdenv.mkDerivation rec {
   pname = "libtraceevent";
-  version = "1.5.1";
+  version = "1.5.3";
 
   src = fetchgit {
     url = "git://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git";
     rev = "libtraceevent-${version}";
-    sha256 = "sha256-g4dB8QhCG6SgZVAU3TCtb70vYYh1KN7FrcldzTGAUnI=";
+    sha256 = "sha256-TaJOwunejEdJz84p3CkGvtR++jN+hXedyxxN+RoeXko=";
   };
 
   # Don't build and install html documentation
   postPatch = ''
     sed -i -e '/^all:/ s/html//' -e '/^install:/ s/install-html//' Documentation/Makefile
+    substituteInPlace scripts/utils.mk --replace /bin/pwd ${coreutils}/bin/pwd
   '';
 
   outputs = [ "out" "dev" "devman" ];

From 3a9bdc3f3e474627fa9e898887d0d543679431fe Mon Sep 17 00:00:00 2001
From: Michal Sojka <michal.sojka@cvut.cz>
Date: Thu, 10 Mar 2022 23:52:44 +0100
Subject: [PATCH 04/20] trace-cmd: 2.9.7 -> 3.0.3

---
 pkgs/os-specific/linux/trace-cmd/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/os-specific/linux/trace-cmd/default.nix b/pkgs/os-specific/linux/trace-cmd/default.nix
index a339c60e8dfa..f92ed2749027 100644
--- a/pkgs/os-specific/linux/trace-cmd/default.nix
+++ b/pkgs/os-specific/linux/trace-cmd/default.nix
@@ -1,12 +1,12 @@
-{ lib, stdenv, fetchgit, pkg-config, asciidoc, xmlto, docbook_xsl, libxslt, libtraceevent, libtracefs }:
+{ lib, stdenv, fetchgit, pkg-config, asciidoc, xmlto, docbook_xsl, docbook_xml_dtd_45, libxslt, libtraceevent, libtracefs, zstd, sourceHighlight }:
 stdenv.mkDerivation rec {
   pname = "trace-cmd";
-  version = "2.9.7";
+  version = "3.0.3";
 
   src = fetchgit {
     url    = "git://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/";
     rev    = "trace-cmd-v${version}";
-    sha256 = "sha256-04qsTlOVYh/jHVWxaGuqYj4DkUpcEYcpfUqnqhphIMg=";
+    sha256 = "sha256-28/XEtVlqgD/by0FmvYHAJHKdNi+JHhiM1xPMymuaIY=";
   };
 
   # Don't build and install html documentation
@@ -15,9 +15,9 @@ stdenv.mkDerivation rec {
        Documentation{,/trace-cmd,/libtracecmd}/Makefile
   '';
 
-  nativeBuildInputs = [ asciidoc libxslt pkg-config xmlto ];
+  nativeBuildInputs = [ asciidoc libxslt pkg-config xmlto docbook_xsl docbook_xml_dtd_45 sourceHighlight ];
 
-  buildInputs = [ libtraceevent libtracefs ];
+  buildInputs = [ libtraceevent libtracefs zstd ];
 
   outputs = [ "out" "lib" "dev" "man" ];
 

From 60c8c66d00b1b0b588b7ad79d12d13cb0949eb19 Mon Sep 17 00:00:00 2001
From: Michal Sojka <michal.sojka@cvut.cz>
Date: Sun, 19 Jun 2022 14:42:11 +0200
Subject: [PATCH 05/20] libtracefs: 1.3.1->1.4.1

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

diff --git a/pkgs/os-specific/linux/libtracefs/default.nix b/pkgs/os-specific/linux/libtracefs/default.nix
index c836fa4433ad..c4bec6629874 100644
--- a/pkgs/os-specific/linux/libtracefs/default.nix
+++ b/pkgs/os-specific/linux/libtracefs/default.nix
@@ -15,12 +15,12 @@
 
 stdenv.mkDerivation rec {
   pname = "libtracefs";
-  version = "1.3.1";
+  version = "1.4.1";
 
   src = fetchgit {
     url = "git://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git";
     rev = "libtracefs-${version}";
-    sha256 = "sha256-jwgDveDSXekHMvvxtK8LYVgeppeZLccSheevVusWYws=";
+    sha256 = "sha256-htif1Hty/AQkx6jALHUVMBF1wIpVwLmdINP8QUZmv/s=";
   };
 
   postPatch = ''

From 9786d883ac44fe0877c934e88e9f491fa49f9cc3 Mon Sep 17 00:00:00 2001
From: Michal Sojka <michal.sojka@cvut.cz>
Date: Sun, 19 Jun 2022 14:42:34 +0200
Subject: [PATCH 06/20] libtraceevent: 1.5.3->1.6.1

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

diff --git a/pkgs/os-specific/linux/libtraceevent/default.nix b/pkgs/os-specific/linux/libtraceevent/default.nix
index 4e3fd1b2e07c..7fc577d0ab0e 100644
--- a/pkgs/os-specific/linux/libtraceevent/default.nix
+++ b/pkgs/os-specific/linux/libtraceevent/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   pname = "libtraceevent";
-  version = "1.5.3";
+  version = "1.6.1";
 
   src = fetchgit {
     url = "git://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git";
     rev = "libtraceevent-${version}";
-    sha256 = "sha256-TaJOwunejEdJz84p3CkGvtR++jN+hXedyxxN+RoeXko=";
+    sha256 = "sha256-Yt7W+ouEZ/pJEKyY2Cgh+mYG0qz0lOIou5JufAD9Zd0=";
   };
 
   # Don't build and install html documentation

From 88223bcc015834ed93bf9ca3dcc8e51cd1f684ee Mon Sep 17 00:00:00 2001
From: Zane van Iperen <zane@zanevaniperen.com>
Date: Sun, 26 Jun 2022 12:49:34 +1000
Subject: [PATCH 07/20] libsForQt5.phonon-backend-gstreamer: backport fix for
 https://bugs.kde.org/show_bug.cgi?id=445196

---
 .../libraries/phonon/backends/gstreamer.nix      | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/phonon/backends/gstreamer.nix b/pkgs/development/libraries/phonon/backends/gstreamer.nix
index 3e21415b4c77..73c27e9d8c1b 100644
--- a/pkgs/development/libraries/phonon/backends/gstreamer.nix
+++ b/pkgs/development/libraries/phonon/backends/gstreamer.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, cmake, gst_all_1, phonon, pkg-config
+{ stdenv, lib, fetchurl, fetchpatch, cmake, gst_all_1, phonon, pkg-config
 , extra-cmake-modules, qttools, qtbase, qtx11extras
 , debug ? false
 }:
@@ -22,9 +22,17 @@ stdenv.mkDerivation rec {
     sha256 = "1wk1ip2w7fkh65zk6rilj314dna0hgsv2xhjmpr5w08xa8sii1y5";
   };
 
-  # Hardcode paths to useful plugins so the backend doesn't depend
-  # on system paths being set.
-  patches = [ ./gst-plugin-paths.patch ];
+  patches = [
+    # Hardcode paths to useful plugins so the backend doesn't depend
+    # on system paths being set.
+    ./gst-plugin-paths.patch
+
+    # Work around https://bugs.kde.org/show_bug.cgi?id=445196 until a new release.
+    (fetchpatch {
+      url = "https://invent.kde.org/libraries/phonon-gstreamer/-/commit/bbbb160f30a394655cff9398d17961142388b0f2.patch";
+      sha256 = "sha256-tNBqVt67LNb9SQogS9ol8/xYIZvVSoVUgXQahMfkFh8=";
+    })
+  ];
 
   dontWrapQtApps = true;
 

From de0d0a2fb0dd87320ce633378a5183dfb1a56b35 Mon Sep 17 00:00:00 2001
From: WeebSorceress <hello@weebsorceress.anonaddy.me>
Date: Sat, 2 Jul 2022 15:17:52 -0300
Subject: [PATCH 08/20] frece: init at 1.0.6

---
 pkgs/development/tools/frece/default.nix | 23 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix          |  2 ++
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/development/tools/frece/default.nix

diff --git a/pkgs/development/tools/frece/default.nix b/pkgs/development/tools/frece/default.nix
new file mode 100644
index 000000000000..2eebf2bcfbe9
--- /dev/null
+++ b/pkgs/development/tools/frece/default.nix
@@ -0,0 +1,23 @@
+{ lib, fetchFromGitHub, rustPlatform }:
+
+rustPlatform.buildRustPackage rec {
+  pname = "frece";
+  version = "1.0.6";
+
+  src = fetchFromGitHub {
+    owner = "YodaEmbedding";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "sha256-CAiIqT5KuzrqbV9FVK3nZUe8MDs2KDdsKplJMI7rN9w=";
+  };
+
+  cargoSha256 = "sha256-eLN917L6l0vUWlAn3ROKrRdtyqaaMKjBQD2tEGWECUU=";
+
+  meta = with lib; {
+    description = "Maintain a database sorted by frecency (frequency + recency)";
+    homepage = "https://github.com/YodaEmbedding/frece";
+    license = licenses.mit;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ WeebSorceress ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7b2d834436f5..0ffd5a15b933 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -414,6 +414,8 @@ with pkgs;
 
   firefly-desktop = callPackage ../applications/misc/firefly-desktop { };
 
+  frece = callPackage ../development/tools/frece { };
+
   frugal = callPackage ../development/tools/frugal { };
 
   glade = callPackage ../development/tools/glade { };

From a5ce71d4e8cbe1d3311aeddc86a8d847989d6099 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Mon, 4 Jul 2022 10:27:24 +0100
Subject: [PATCH 09/20] xmr-stak: drop gcc6 requrement (and cuda support)

    [ 86%] Building CXX object CMakeFiles/xmrstak_opencl_backend.dir/xmrstak/backend/amd/minethd.cpp.o
    nvcc fatal   : Unsupported gpu architecture 'compute_30'
    CMake Error at xmrstak_cuda_backend_generated_cuda_extra.cu.o.Release.cmake:220 (message):
      Error generating
      /build/source/build/CMakeFiles/xmrstak_cuda_backend.dir/xmrstak/backend/nvidia/nvcc_code/./xmrstak_cuda_backend_generated_cuda_extra.cu.o
    nvcc fatal   : Unsupported gpu architecture 'compute_30'
    make[2]: *** [CMakeFiles/xmrstak_cuda_backend.dir/build.make:84: CMakeFiles/xmrstak_cuda_backend.dir/xmrstak/backend/nvidia/nvcc_code/xmrstak_cuda_backend_generated_cuda_extra.cu.o] Error 1

CUDA support is broken for a while. Let's drop it along with gcc6 requirement.
---
 pkgs/applications/misc/xmr-stak/default.nix | 12 +++---------
 pkgs/top-level/all-packages.nix             |  4 +---
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/pkgs/applications/misc/xmr-stak/default.nix b/pkgs/applications/misc/xmr-stak/default.nix
index 91c8c69fe930..3dbf4467a3a8 100644
--- a/pkgs/applications/misc/xmr-stak/default.nix
+++ b/pkgs/applications/misc/xmr-stak/default.nix
@@ -1,16 +1,11 @@
 { stdenv, stdenvGcc6, lib
 , fetchFromGitHub, cmake, libmicrohttpd_0_9_70, openssl
-, opencl-headers, ocl-icd, hwloc, cudatoolkit
+, opencl-headers, ocl-icd, hwloc
 , devDonationLevel ? "0.0"
-, cudaSupport ? false
 , openclSupport ? true
 }:
 
-let
-  stdenv' = if cudaSupport then stdenvGcc6 else stdenv;
-in
-
-stdenv'.mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "xmr-stak";
   version = "2.10.8";
 
@@ -23,12 +18,11 @@ stdenv'.mkDerivation rec {
 
   NIX_CFLAGS_COMPILE = "-O3";
 
-  cmakeFlags = lib.optional (!cudaSupport) "-DCUDA_ENABLE=OFF"
+  cmakeFlags = [ "-DCUDA_ENABLE=OFF" ]
     ++ lib.optional (!openclSupport) "-DOpenCL_ENABLE=OFF";
 
   nativeBuildInputs = [ cmake ];
   buildInputs = [ libmicrohttpd_0_9_70 openssl hwloc ]
-    ++ lib.optional cudaSupport cudatoolkit
     ++ lib.optionals openclSupport [ opencl-headers ocl-icd ];
 
   postPatch = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ed03cb2a9aaa..b0a7d95a7052 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -28556,9 +28556,7 @@ with pkgs;
 
   mod-distortion = callPackage ../applications/audio/mod-distortion { };
 
-  xmr-stak = callPackage ../applications/misc/xmr-stak {
-    stdenvGcc6 = gcc6Stdenv;
-  };
+  xmr-stak = callPackage ../applications/misc/xmr-stak { };
 
   xmrig = callPackage ../applications/misc/xmrig { };
 

From df304cc7737dd27cb44861c853b74ad8f0c447d4 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Mon, 4 Jul 2022 18:27:14 +0100
Subject: [PATCH 10/20] vxl: 1.17.0-nix1 -> 3.3.2

While at it drop pin to gcc6 and outdated jpeg.
---
 pkgs/development/libraries/vxl/default.nix | 20 ++++----------------
 pkgs/top-level/all-packages.nix            |  5 +----
 2 files changed, 5 insertions(+), 20 deletions(-)

diff --git a/pkgs/development/libraries/vxl/default.nix b/pkgs/development/libraries/vxl/default.nix
index d87adabf56c6..878271b43178 100644
--- a/pkgs/development/libraries/vxl/default.nix
+++ b/pkgs/development/libraries/vxl/default.nix
@@ -1,30 +1,18 @@
 { lib, stdenv, fetchFromGitHub, unzip, cmake, libtiff, expat, zlib, libpng, libjpeg }:
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   pname = "vxl";
-  version = "1.17.0-nix1";
+  version = "3.3.2";
 
   src = fetchFromGitHub {
     owner = "vxl";
     repo = "vxl";
-    rev = "777c0beb7c8b30117400f6fc9a6d63bf8cb7c67a";
-    sha256 = "0xpkwwb93ka6c3da8zjhfg9jk5ssmh9ifdh1by54sz6c7mbp55m8";
+    rev = "v${version}";
+    sha256 = "0qmqrijl14xlsbd77jk9ygg44h3lqzpswia6yif1iia6smqccjsr";
   };
 
   nativeBuildInputs = [ cmake unzip ];
   buildInputs = [ libtiff expat zlib libpng libjpeg ];
 
-  cmakeFlags = [
-    # BUILD_OUL wants old linux headers for videodev.h, not available
-    # in stdenv linux headers
-    "-DBUILD_OUL=OFF"
-    # BUILD_BRL fails to find open()
-    "-DBUILD_BRL=OFF"
-    "-DBUILD_CONTRIB=OFF"
-  ] ++ lib.optionals (stdenv.hostPlatform.system == "x86_64-linux") [
-    "-DCMAKE_CXX_FLAGS=-fPIC"
-    "-DCMAKE_C_FLAGS=-fPIC"
-  ];
-
   meta = {
     description = "C++ Libraries for Computer Vision Research and Implementation";
     homepage = "http://vxl.sourceforge.net/";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ed03cb2a9aaa..1e2a95710c42 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21402,10 +21402,7 @@ with pkgs;
   vulkan-tools-lunarg = callPackage ../tools/graphics/vulkan-tools-lunarg { };
   vulkan-validation-layers = callPackage ../development/tools/vulkan-validation-layers { };
 
-  vxl = callPackage ../development/libraries/vxl {
-    libpng = libpng12;
-    stdenv = gcc6Stdenv; # upstream code incompatible with gcc7
-  };
+  vxl = callPackage ../development/libraries/vxl { };
 
   waffle = callPackage ../development/libraries/waffle { };
 

From c30f978f233f7adace4e8fffff12745486008751 Mon Sep 17 00:00:00 2001
From: Michal Sojka <michal.sojka@cvut.cz>
Date: Sun, 19 Jun 2022 14:44:40 +0200
Subject: [PATCH 11/20] trace-cmd: 3.0.3->3.1.1

---
 pkgs/os-specific/linux/trace-cmd/default.nix | 25 +++++++++++++-------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/pkgs/os-specific/linux/trace-cmd/default.nix b/pkgs/os-specific/linux/trace-cmd/default.nix
index f92ed2749027..0bf5a8e2adb0 100644
--- a/pkgs/os-specific/linux/trace-cmd/default.nix
+++ b/pkgs/os-specific/linux/trace-cmd/default.nix
@@ -1,12 +1,12 @@
 { lib, stdenv, fetchgit, pkg-config, asciidoc, xmlto, docbook_xsl, docbook_xml_dtd_45, libxslt, libtraceevent, libtracefs, zstd, sourceHighlight }:
 stdenv.mkDerivation rec {
   pname = "trace-cmd";
-  version = "3.0.3";
+  version = "3.1.1";
 
   src = fetchgit {
     url    = "git://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/";
     rev    = "trace-cmd-v${version}";
-    sha256 = "sha256-28/XEtVlqgD/by0FmvYHAJHKdNi+JHhiM1xPMymuaIY=";
+    sha256 = "sha256-zYw6DObwmroAU3ikUNo9XrwQeDlyLppe7E63WFjn44Q=";
   };
 
   # Don't build and install html documentation
@@ -27,19 +27,28 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
   makeFlags = [
-    "all" "libs" "doc"
     # The following values appear in the generated .pc file
     "prefix=${placeholder "lib"}"
-    "libdir=${placeholder "lib"}/lib"
-    "includedir=${placeholder "dev"}/include"
   ];
 
-  installTargets = [ "install_cmd" "install_libs" "install_doc" ];
+  # We do not mention targets (like "doc") explicitly in makeFlags
+  # because the Makefile would not print warnings about too old
+  # libraries (see "warning:" in the Makefile)
+  postBuild = ''
+    make libs doc -j$NIX_BUILD_CORES -l$NIX_BUILD_CORES
+  '';
+
+  installTargets = [
+    "install_cmd"
+    "install_libs"
+    "install_doc"
+  ];
   installFlags = [
+    "LDCONFIG=false"
     "bindir=${placeholder "out"}/bin"
-    "man_dir=${placeholder "man"}/share/man"
+    "mandir=${placeholder "man"}/share/man"
     "libdir=${placeholder "lib"}/lib"
-    "pkgconfig_dir=${placeholder "lib"}/lib/pkgconfig"
+    "pkgconfig_dir=${placeholder "dev"}/lib/pkgconfig"
     "includedir=${placeholder "dev"}/include"
     "BASH_COMPLETE_DIR=${placeholder "out"}/share/bash-completion/completions"
   ];

From 336cc1683a4199f25310f7a4b7a2c6b04f25cc89 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Tue, 5 Jul 2022 23:43:14 +0100
Subject: [PATCH 12/20] mars: fix build on gcc-10

Without the change build fails due to gcc-11/gcc-10 libstdc++ mix:

    [100%] Linking CXX executable ../../marsshooter
    ld: .../libsfml-graphics.so.2.5.1: undefined reference to `std::__throw_bad_array_new_length()@GLIBCXX_3.4.29'
    collect2: error: ld returned 1 exit status
---
 pkgs/top-level/all-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f631ef09a800..51d63e8f78a0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -32367,7 +32367,7 @@ with pkgs;
 
   manaplus = callPackage ../games/manaplus { };
 
-  mars = callPackage ../games/mars { stdenv = gcc10StdenvCompat; };
+  mars = callPackage ../games/mars { };
 
   megaglest = callPackage ../games/megaglest { };
 

From 17c42e33b087b652218a69defa60f692de445ace Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 6 Jul 2022 01:47:29 +0000
Subject: [PATCH 13/20] crlfsuite: 2.0 -> 2.1.1

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

diff --git a/pkgs/tools/security/crlfsuite/default.nix b/pkgs/tools/security/crlfsuite/default.nix
index 67ccacb2de74..79e69896e308 100644
--- a/pkgs/tools/security/crlfsuite/default.nix
+++ b/pkgs/tools/security/crlfsuite/default.nix
@@ -5,14 +5,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "crlfsuite";
-  version = "2.0";
+  version = "2.1.1";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "Nefcore";
     repo = "CRLFsuite";
-    rev = "v${version}";
-    sha256 = "sha256-V/EaOtGDPJQAMu9akOtZN5LKLFd3EQkjn79q7ubV0Mc=";
+    rev = "refs/tags/v${version}";
+    sha256 = "sha256-wWXqeQ6rq4yMG1V9f9JGE91Se8VuU8gpahmYyNTtkmo=";
   };
 
   propagatedBuildInputs = with python3.pkgs; [

From bf35d8018738ad3b4bf871dfd64f1ae7e83c5997 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 6 Jul 2022 03:19:05 +0000
Subject: [PATCH 14/20] python310Packages.skodaconnect: 1.1.20 -> 1.1.21

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

diff --git a/pkgs/development/python-modules/skodaconnect/default.nix b/pkgs/development/python-modules/skodaconnect/default.nix
index 1511d1940b03..292b40f4cbfb 100644
--- a/pkgs/development/python-modules/skodaconnect/default.nix
+++ b/pkgs/development/python-modules/skodaconnect/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "skodaconnect";
-  version = "1.1.20";
+  version = "1.1.21";
   format = "setuptools";
 
   disabled = pythonOlder "3.8";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "lendy007";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-VFbU4KbF/Z8/EiRYZIBXSIfByY5nc84y6YBSOuknqyg=";
+    hash = "sha256-4VM1bOiSkmzlDegtIRUh1O9FG2DPyK77MIQgQcGQ+ZM=";
   };
 
   SETUPTOOLS_SCM_PRETEND_VERSION = version;

From fef6723f9bea16c6530beefd20349e0e10a8d1ff Mon Sep 17 00:00:00 2001
From: Arthur Gautier <arthur.gautier@arista.com>
Date: Sat, 25 Jun 2022 19:30:07 -0700
Subject: [PATCH 15/20] qemu-utils: remove qemu dependency

qemu-utils was pulling qemu which is a 900MB dependency. By removing
reference to it (unneeded), we're saving space on our deployments.
qemu-utils is a dependency of cloud-utils
---
 pkgs/applications/virtualization/qemu/utils.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/virtualization/qemu/utils.nix b/pkgs/applications/virtualization/qemu/utils.nix
index d9a88bf545b3..f4acf9a534c9 100644
--- a/pkgs/applications/virtualization/qemu/utils.nix
+++ b/pkgs/applications/virtualization/qemu/utils.nix
@@ -1,4 +1,4 @@
-{ stdenv, installShellFiles, qemu }:
+{ stdenv, installShellFiles, qemu, removeReferencesTo }:
 
 stdenv.mkDerivation rec {
   pname = "qemu-utils";
@@ -13,6 +13,7 @@ stdenv.mkDerivation rec {
     cp "${qemu}/bin/qemu-img" "$out/bin/qemu-img"
     cp "${qemu}/bin/qemu-io"  "$out/bin/qemu-io"
     cp "${qemu}/bin/qemu-nbd" "$out/bin/qemu-nbd"
+    ${removeReferencesTo}/bin/remove-references-to -t ${qemu} $out/bin/*
 
     installManPage ${qemu}/share/man/man1/qemu-img.1.gz
     installManPage ${qemu}/share/man/man8/qemu-nbd.8.gz

From 934a622f7ecf9bc18940e799bdc5f2b7c0c213a5 Mon Sep 17 00:00:00 2001
From: Arthur Gautier <arthur.gautier@arista.com>
Date: Tue, 5 Jul 2022 09:22:24 -0700
Subject: [PATCH 16/20] qemu-utils: ensure we cut off qemu dependency

---
 pkgs/applications/virtualization/qemu/utils.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/virtualization/qemu/utils.nix b/pkgs/applications/virtualization/qemu/utils.nix
index f4acf9a534c9..f5998efea0e5 100644
--- a/pkgs/applications/virtualization/qemu/utils.nix
+++ b/pkgs/applications/virtualization/qemu/utils.nix
@@ -6,6 +6,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ installShellFiles ];
   buildInputs = [ qemu ];
+  disallowedRequisites = [ qemu ];
   unpackPhase = "true";
 
   installPhase = ''

From ed40dba171076f270b4958ca7c9e0b0570882fda Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Tue, 5 Jul 2022 15:40:57 +0000
Subject: [PATCH 17/20] python310Packages.jarowinkler: 1.0.5 -> 1.1.0

https://github.com/maxbachmann/JaroWinkler/releases/tag/v1.1.0
---
 .../python-modules/jarowinkler/default.nix          | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/jarowinkler/default.nix b/pkgs/development/python-modules/jarowinkler/default.nix
index 48b1385401d4..13b99050f020 100644
--- a/pkgs/development/python-modules/jarowinkler/default.nix
+++ b/pkgs/development/python-modules/jarowinkler/default.nix
@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "jarowinkler";
-  version = "1.0.5";
+  version = "1.1.0";
 
   disabled = pythonOlder "3.6";
 
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     owner = "maxbachmann";
     repo = "JaroWinkler";
     rev = "v${version}";
-    hash = "sha256-5LWJeNfQ0d8wiqjIha+CCcmBf+GU36VTYFqRlg4+6qA=";
+    hash = "sha256-ilkslDrTOaq6mgg+nYMMqxrjvZHXMIcipu25wvV3+Mk=";
   };
 
   nativeBuildInputs = [
@@ -41,6 +41,10 @@ buildPythonPackage rec {
     jarowinkler-cpp
   ];
 
+  preBuild = ''
+    export JAROWINKLER_BUILD_EXTENSION=1
+  '';
+
   dontUseCmakeConfigure = true;
 
   checkInputs = [
@@ -48,11 +52,6 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
-  preCheck = ''
-    # import from $out
-    rm -r jarowinkler
-  '';
-
   pythonImportsCheck = [ "jarowinkler" ];
 
   meta = with lib; {

From 07f1d6bab7586bbdf0e1e94ebdfe031b32946724 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Tue, 5 Jul 2022 15:42:14 +0000
Subject: [PATCH 18/20] python310Packages.rapidfuzz: 2.1.0 -> 2.1.2

https://github.com/maxbachmann/RapidFuzz/blob/v2.1.2/CHANGELOG.md
---
 .../python-modules/rapidfuzz/default.nix            | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/rapidfuzz/default.nix b/pkgs/development/python-modules/rapidfuzz/default.nix
index 5d718aadd6f0..ef76e2d8fa1e 100644
--- a/pkgs/development/python-modules/rapidfuzz/default.nix
+++ b/pkgs/development/python-modules/rapidfuzz/default.nix
@@ -20,7 +20,7 @@
 
 buildPythonPackage rec {
   pname = "rapidfuzz";
-  version = "2.1.0";
+  version = "2.1.2";
 
   disabled = pythonOlder "3.6";
 
@@ -30,7 +30,7 @@ buildPythonPackage rec {
     owner = "maxbachmann";
     repo = "RapidFuzz";
     rev = "v${version}";
-    hash = "sha256-bvuT31qxYj/agEtPIJf/6YAOe6CGpEmaKpfNocw4wYQ=";
+    hash = "sha256-7BP22Fon+7a3ZxTCS838uoLXABYdEexMEH2vZ0/KoRQ=";
   };
 
   nativeBuildInputs = [
@@ -50,6 +50,10 @@ buildPythonPackage rec {
     taskflow
   ];
 
+  preBuild = ''
+    export RAPIDFUZZ_BUILD_EXTENSION=1
+  '';
+
   propagatedBuildInputs = [
     jarowinkler
     numpy
@@ -61,11 +65,6 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
-  preCheck = ''
-    # import from $out
-    rm -r rapidfuzz
-  '';
-
   pythonImportsCheck = [
     "rapidfuzz.fuzz"
     "rapidfuzz.string_metric"

From ec9ce3c94bb763973bde1b860d217c1d16e3d5e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Tue, 5 Jul 2022 15:47:27 +0000
Subject: [PATCH 19/20] python310Packages.levenshtein: 0.18.1 -> 0.18.2

https://github.com/maxbachmann/Levenshtein/releases/tag/v0.18.2
---
 .../python-modules/levenshtein/default.nix            | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/levenshtein/default.nix b/pkgs/development/python-modules/levenshtein/default.nix
index ebc1c5113753..658e3c3d5cad 100644
--- a/pkgs/development/python-modules/levenshtein/default.nix
+++ b/pkgs/development/python-modules/levenshtein/default.nix
@@ -6,12 +6,13 @@
 , cython
 , pytestCheckHook
 , rapidfuzz
+, rapidfuzz-cpp
 , scikit-build
 }:
 
 buildPythonPackage rec {
   pname = "levenshtein";
-  version = "0.18.1";
+  version = "0.18.2";
   format = "pyproject";
 
   disabled = pythonOlder "3.6";
@@ -20,9 +21,7 @@ buildPythonPackage rec {
     owner = "maxbachmann";
     repo = "Levenshtein";
     rev = "v${version}";
-    # https://github.com/maxbachmann/Levenshtein/issues/22
-    fetchSubmodules = true;
-    sha256 = "sha256-WREYdD5MFOpCzH4BSceRpzQZdpi3Xxxn0DpMvDsNlGo=";
+    hash = "sha256-FmEB0i235rzK6S1MV189iDNB+CYpcBvcdVE+kdclwmE=";
   };
 
   nativeBuildInputs = [
@@ -33,6 +32,10 @@ buildPythonPackage rec {
 
   dontUseCmakeConfigure = true;
 
+  buildInputs = [
+    rapidfuzz-cpp
+  ];
+
   propagatedBuildInputs = [
     rapidfuzz
   ];

From 8ef7523c8e11da7fd23e6b87371e7aa1eab718bb Mon Sep 17 00:00:00 2001
From: rewine <1758075541@qq.com>
Date: Wed, 6 Jul 2022 17:28:26 +0800
Subject: [PATCH 20/20] pineapple-pictures: init at 0.6.1 (#178583)

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
---
 .../graphics/pineapple-pictures/default.nix   | 40 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 42 insertions(+)
 create mode 100644 pkgs/applications/graphics/pineapple-pictures/default.nix

diff --git a/pkgs/applications/graphics/pineapple-pictures/default.nix b/pkgs/applications/graphics/pineapple-pictures/default.nix
new file mode 100644
index 000000000000..7a730cbda93b
--- /dev/null
+++ b/pkgs/applications/graphics/pineapple-pictures/default.nix
@@ -0,0 +1,40 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, qtsvg
+, qttools
+, exiv2
+, wrapQtAppsHook
+, cmake
+}:
+
+stdenv.mkDerivation rec {
+  pname = "pineapple-pictures";
+  version = "0.6.1";
+
+  src = fetchFromGitHub {
+    owner = "BLumia";
+    repo = "pineapple-pictures";
+    rev = version;
+    sha256 = "sha256-KTYwe6fS/rUHBbC2B9OdK95mFm3zvgDdGODkg7VQ27M=";
+  };
+
+  nativeBuildInputs = [
+    cmake
+    qttools
+    wrapQtAppsHook
+  ];
+
+  buildInputs = [
+    qtsvg
+    exiv2.lib
+  ];
+
+  meta = with lib; {
+    description = "Homebrew lightweight image viewer";
+    homepage = "https://github.com/BLumia/pineapple-pictures";
+    license = licenses.mit;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ rewine ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 69a83341d4e2..83dba697c268 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -29446,6 +29446,8 @@ with pkgs;
     pythonPackages = python3Packages;
   };
 
+  pineapple-pictures = libsForQt5.callPackage ../applications/graphics/pineapple-pictures { };
+
   pinfo = callPackage ../applications/misc/pinfo { };
 
   pinpoint = callPackage ../applications/office/pinpoint { };