From 5c14005e00044516c3005d9a4775480bfb5c24ab Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 25 Feb 2023 22:15:16 +0100
Subject: [PATCH 01/77] python310Packages.pytest-aio: 1.4.1 -> 1.5.0

Diff: https://github.com/klen/pytest-aio/compare/1.4.1...1.5.0
---
 pkgs/development/python-modules/pytest-aio/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pytest-aio/default.nix b/pkgs/development/python-modules/pytest-aio/default.nix
index a37a8cd67089..bc3e8078479b 100644
--- a/pkgs/development/python-modules/pytest-aio/default.nix
+++ b/pkgs/development/python-modules/pytest-aio/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "pytest-aio";
-  version = "1.4.1";
+  version = "1.5.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "klen";
     repo = "pytest-aio";
     rev = version;
-    sha256 = "pLH0yXe/KS9ohI8+hWSprP1OA3Qjki2BPqeApMPMGDs=";
+    sha256 = "sha256-BIVorMRWyboKFZCiELoBh/1oxSpdV263zfLce1fNVhU=";
   };
 
   postPatch = ''

From b782e77de006e0683b9c9805a209a119eb854448 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 25 Feb 2023 22:19:12 +0100
Subject: [PATCH 02/77] python310Packages.pytest-aio: add changelog to meta

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

diff --git a/pkgs/development/python-modules/pytest-aio/default.nix b/pkgs/development/python-modules/pytest-aio/default.nix
index bc3e8078479b..322de9c8746f 100644
--- a/pkgs/development/python-modules/pytest-aio/default.nix
+++ b/pkgs/development/python-modules/pytest-aio/default.nix
@@ -22,8 +22,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "klen";
     repo = "pytest-aio";
-    rev = version;
-    sha256 = "sha256-BIVorMRWyboKFZCiELoBh/1oxSpdV263zfLce1fNVhU=";
+    rev = "refs/tags/${version}";
+    hash = "sha256-BIVorMRWyboKFZCiELoBh/1oxSpdV263zfLce1fNVhU=";
   };
 
   postPatch = ''

From 3c78f8bbaf49e7b926c4eb2866f926725d1135ac Mon Sep 17 00:00:00 2001
From: Jente Hidskes Ankarberg <jente@griffin.sh>
Date: Wed, 1 Feb 2023 10:58:21 +0100
Subject: [PATCH 03/77] foundationdb: remove unused branch parameter to
 cmakeBuild

---
 pkgs/servers/foundationdb/cmake.nix   | 1 -
 pkgs/servers/foundationdb/default.nix | 1 -
 2 files changed, 2 deletions(-)

diff --git a/pkgs/servers/foundationdb/cmake.nix b/pkgs/servers/foundationdb/cmake.nix
index cdf8267c6abf..e321440b910c 100644
--- a/pkgs/servers/foundationdb/cmake.nix
+++ b/pkgs/servers/foundationdb/cmake.nix
@@ -16,7 +16,6 @@ let
 
   makeFdb =
     { version
-    , branch # unused
     , sha256
     , rev ? "refs/tags/${version}"
     , officialRelease ? true
diff --git a/pkgs/servers/foundationdb/default.nix b/pkgs/servers/foundationdb/default.nix
index 69e4ad9bd018..3ca15ee6cc6e 100644
--- a/pkgs/servers/foundationdb/default.nix
+++ b/pkgs/servers/foundationdb/default.nix
@@ -79,7 +79,6 @@ in with builtins; {
 
   foundationdb61 = cmakeBuild {
     version = "6.1.13";
-    branch  = "release-6.1";
     sha256  = "10vd694dcnh2pp91mri1m80kfbwjanhiy50c53c5ncqfa6pwvk00";
 
     patches = [

From f5f5051d816e6d2e9523ca47649de4e37e0cabe7 Mon Sep 17 00:00:00 2001
From: Jente Hidskes Ankarberg <jente@griffin.sh>
Date: Wed, 1 Feb 2023 16:12:50 +0100
Subject: [PATCH 04/77] foundationdb: don't set CMAKE_BUILD_TYPE

It's set to Release by our cmake builder already
---
 pkgs/servers/foundationdb/cmake.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/servers/foundationdb/cmake.nix b/pkgs/servers/foundationdb/cmake.nix
index e321440b910c..e381ab467651 100644
--- a/pkgs/servers/foundationdb/cmake.nix
+++ b/pkgs/servers/foundationdb/cmake.nix
@@ -38,8 +38,7 @@ let
         dontFixCmake = true;
 
         cmakeFlags =
-          [ "-DCMAKE_BUILD_TYPE=Release"
-            (lib.optionalString officialRelease "-DFDB_RELEASE=TRUE")
+          [ (lib.optionalString officialRelease "-DFDB_RELEASE=TRUE")
 
             # FIXME: why can't libressl be found automatically?
             "-DLIBRESSL_USE_STATIC_LIBS=FALSE"

From 2f3759f4ff06ae7c7df8f465c3fef28537081f14 Mon Sep 17 00:00:00 2001
From: Jente Hidskes Ankarberg <jente@griffin.sh>
Date: Wed, 1 Feb 2023 16:54:58 +0100
Subject: [PATCH 05/77] foundationdb: remove unused with builtins

---
 pkgs/servers/foundationdb/cmake.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/servers/foundationdb/cmake.nix b/pkgs/servers/foundationdb/cmake.nix
index e381ab467651..dc4df269eb5a 100644
--- a/pkgs/servers/foundationdb/cmake.nix
+++ b/pkgs/servers/foundationdb/cmake.nix
@@ -11,8 +11,7 @@
 let
   stdenv = if useClang then llvmPackages.libcxxStdenv else gccStdenv;
 
-  tests = with builtins;
-    builtins.replaceStrings [ "\n" ] [ " " ] (lib.fileContents ./test-list.txt);
+  tests = builtins.replaceStrings [ "\n" ] [ " " ] (lib.fileContents ./test-list.txt);
 
   makeFdb =
     { version

From b9a6bd815a5f2d8db82d0995086d7b4523b39e16 Mon Sep 17 00:00:00 2001
From: Jente Hidskes Ankarberg <jente@griffin.sh>
Date: Wed, 1 Feb 2023 16:58:21 +0100
Subject: [PATCH 06/77] foundationdb: remove seemingly no longer needed
 patching of fdb_install

---
 pkgs/servers/foundationdb/cmake.nix | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/pkgs/servers/foundationdb/cmake.nix b/pkgs/servers/foundationdb/cmake.nix
index dc4df269eb5a..3d1ef3678759 100644
--- a/pkgs/servers/foundationdb/cmake.nix
+++ b/pkgs/servers/foundationdb/cmake.nix
@@ -64,14 +64,6 @@ let
 
         inherit patches;
 
-        # fix up the use of the very weird and custom 'fdb_install' command by just
-        # replacing it with cmake's ordinary version.
-        postPatch = ''
-          for x in bindings/c/CMakeLists.txt fdbserver/CMakeLists.txt fdbmonitor/CMakeLists.txt fdbbackup/CMakeLists.txt fdbcli/CMakeLists.txt; do
-            substituteInPlace $x --replace 'fdb_install' 'install'
-          done
-        '';
-
         # the install phase for cmake is pretty wonky right now since it's not designed to
         # coherently install packages as most linux distros expect -- it's designed to build
         # packaged artifacts that are shipped in RPMs, etc. we need to add some extra code to

From 79c547bb97e9b5a2d2565c0549d821c50b358156 Mon Sep 17 00:00:00 2001
From: Jente Hidskes Ankarberg <jente@griffin.sh>
Date: Tue, 7 Feb 2023 16:37:13 +0100
Subject: [PATCH 07/77] foundationdb: add pkg-config to help find libraries

---
 pkgs/servers/foundationdb/cmake.nix   | 3 ++-
 pkgs/servers/foundationdb/default.nix | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/foundationdb/cmake.nix b/pkgs/servers/foundationdb/cmake.nix
index 3d1ef3678759..c989f6668989 100644
--- a/pkgs/servers/foundationdb/cmake.nix
+++ b/pkgs/servers/foundationdb/cmake.nix
@@ -2,6 +2,7 @@
 
 { lib, fetchFromGitHub
 , cmake, ninja, boost, python3, openjdk, mono, libressl
+, pkg-config
 
 , gccStdenv, llvmPackages
 , useClang ? false
@@ -30,7 +31,7 @@ let
         };
 
         buildInputs = [ libressl boost ];
-        nativeBuildInputs = [ cmake ninja python3 openjdk mono ]
+        nativeBuildInputs = [ pkg-config cmake ninja python3 openjdk mono ]
           ++ lib.optionals useClang [ llvmPackages.lld ];
 
         separateDebugInfo = true;
diff --git a/pkgs/servers/foundationdb/default.nix b/pkgs/servers/foundationdb/default.nix
index 3ca15ee6cc6e..383efee182c3 100644
--- a/pkgs/servers/foundationdb/default.nix
+++ b/pkgs/servers/foundationdb/default.nix
@@ -3,6 +3,7 @@
 
 , cmake, ninja, which, findutils, m4, gawk
 , python2, python3, openjdk, mono, libressl, boost168
+, pkg-config
 }@args:
 
 let

From 6fc2ba036ab77c647ea897b2aa26d38d540c4046 Mon Sep 17 00:00:00 2001
From: Jente Hidskes Ankarberg <dev@hjdskes.nl>
Date: Wed, 8 Feb 2023 13:57:07 +0100
Subject: [PATCH 08/77] foundationdb: add 7.1.26

---
 .../poetry2nix/overrides/build-systems.json   |   3 +
 pkgs/servers/foundationdb/cmake.nix           |  63 +++++----
 pkgs/servers/foundationdb/default.nix         |  25 +++-
 .../patches/disable-flowbench.patch           |  15 ++
 .../don-t-run-tests-requiring-doctest.patch   | 128 ++++++++++++++++++
 .../patches/don-t-use-static-boost-libs.patch |  27 ++++
 .../patches/fix-open-with-O_CREAT.patch       |  25 ++++
 pkgs/top-level/all-packages.nix               |   1 +
 pkgs/top-level/python-packages.nix            |   1 +
 9 files changed, 257 insertions(+), 31 deletions(-)
 create mode 100644 pkgs/servers/foundationdb/patches/disable-flowbench.patch
 create mode 100644 pkgs/servers/foundationdb/patches/don-t-run-tests-requiring-doctest.patch
 create mode 100644 pkgs/servers/foundationdb/patches/don-t-use-static-boost-libs.patch
 create mode 100644 pkgs/servers/foundationdb/patches/fix-open-with-O_CREAT.patch

diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/overrides/build-systems.json b/pkgs/development/tools/poetry2nix/poetry2nix/overrides/build-systems.json
index 82908ddaf332..d2f289e227fb 100644
--- a/pkgs/development/tools/poetry2nix/poetry2nix/overrides/build-systems.json
+++ b/pkgs/development/tools/poetry2nix/poetry2nix/overrides/build-systems.json
@@ -5767,6 +5767,9 @@
   "foundationdb61": [
     "setuptools"
   ],
+  "foundationdb71": [
+    "setuptools"
+  ],
   "fountains": [
     "setuptools"
   ],
diff --git a/pkgs/servers/foundationdb/cmake.nix b/pkgs/servers/foundationdb/cmake.nix
index c989f6668989..dcaa9f3e6f8e 100644
--- a/pkgs/servers/foundationdb/cmake.nix
+++ b/pkgs/servers/foundationdb/cmake.nix
@@ -1,8 +1,8 @@
 # This builder is for FoundationDB CMake build system.
 
 { lib, fetchFromGitHub
-, cmake, ninja, boost, python3, openjdk, mono, libressl
-, pkg-config
+, cmake, ninja, python3, openjdk, mono, pkg-config
+, msgpack, toml11
 
 , gccStdenv, llvmPackages
 , useClang ? false
@@ -20,6 +20,8 @@ let
     , rev ? "refs/tags/${version}"
     , officialRelease ? true
     , patches ? []
+    , boost
+    , ssl
     }: stdenv.mkDerivation {
         pname = "foundationdb";
         inherit version;
@@ -30,7 +32,9 @@ let
           inherit rev sha256;
         };
 
-        buildInputs = [ libressl boost ];
+        buildInputs = [ ssl boost ]
+          ++ lib.optionals (lib.versionAtLeast version "7.1.0") [ msgpack toml11 ];
+
         nativeBuildInputs = [ pkg-config cmake ninja python3 openjdk mono ]
           ++ lib.optionals useClang [ llvmPackages.lld ];
 
@@ -40,12 +44,16 @@ let
         cmakeFlags =
           [ (lib.optionalString officialRelease "-DFDB_RELEASE=TRUE")
 
-            # FIXME: why can't libressl be found automatically?
-            "-DLIBRESSL_USE_STATIC_LIBS=FALSE"
-            "-DLIBRESSL_INCLUDE_DIR=${libressl.dev}"
-            "-DLIBRESSL_CRYPTO_LIBRARY=${libressl.out}/lib/libcrypto.so"
-            "-DLIBRESSL_SSL_LIBRARY=${libressl.out}/lib/libssl.so"
-            "-DLIBRESSL_TLS_LIBRARY=${libressl.out}/lib/libtls.so"
+            # Disable CMake warnings for project developers.
+            "-Wno-dev"
+
+            # CMake Error at fdbserver/CMakeLists.txt:332 (find_library):
+            # >   Could not find lz4_STATIC_LIBRARIES using the following names: liblz4.a
+            "-DSSD_ROCKSDB_EXPERIMENTAL=FALSE"
+
+            # FoundationDB's CMake is hardcoded to pull in jemalloc as an external
+            # project at build time.
+            "-DUSE_JEMALLOC=FALSE"
 
             # LTO brings up overall build time, but results in much smaller
             # binaries for all users and the cache.
@@ -56,6 +64,18 @@ let
             # Same with LLD when Clang is available.
             (lib.optionalString useClang    "-DUSE_LD=LLD")
             (lib.optionalString (!useClang) "-DUSE_LD=GOLD")
+          ] ++ lib.optionals (lib.versionOlder version "7.0.0")
+          [ # FIXME: why can't libressl be found automatically?
+            "-DLIBRESSL_USE_STATIC_LIBS=FALSE"
+            "-DLIBRESSL_INCLUDE_DIR=${ssl.dev}"
+            "-DLIBRESSL_CRYPTO_LIBRARY=${ssl.out}/lib/libcrypto.so"
+            "-DLIBRESSL_SSL_LIBRARY=${ssl.out}/lib/libssl.so"
+            "-DLIBRESSL_TLS_LIBRARY=${ssl.out}/lib/libtls.so"
+          ] ++ lib.optionals (lib.versionAtLeast version "7.1.0" && lib.versionOlder version "7.2.0")
+          [ # FIXME: why can't openssl be found automatically?
+            "-DOPENSSL_USE_STATIC_LIBS=FALSE"
+            "-DOPENSSL_CRYPTO_LIBRARY=${ssl.out}/lib/libcrypto.so"
+            "-DOPENSSL_SSL_LIBRARY=${ssl.out}/lib/libssl.so"
           ];
 
         env.NIX_CFLAGS_COMPILE = toString [
@@ -69,19 +89,20 @@ let
         # coherently install packages as most linux distros expect -- it's designed to build
         # packaged artifacts that are shipped in RPMs, etc. we need to add some extra code to
         # cmake upstream to fix this, and if we do, i think most of this can go away.
-        postInstall = ''
-          mv $out/sbin/fdbserver $out/bin/fdbserver
-          rm -rf \
-            $out/lib/systemd $out/Library $out/usr $out/sbin \
-            $out/var $out/log $out/etc
-
+        postInstall = lib.optionalString (lib.versionOlder version "7.0.0") ''
           mv $out/fdbmonitor/fdbmonitor $out/bin/fdbmonitor && rm -rf $out/fdbmonitor
-
-          rm -rf $out/lib/foundationdb/
           mkdir $out/libexec && ln -sfv $out/bin/fdbbackup $out/libexec/backup_agent
-
+          rm -rf $out/Library
+          rm -rf $out/lib/foundationdb/
           mkdir $out/include/foundationdb && \
             mv $out/include/*.h $out/include/*.options $out/include/foundationdb
+        '' + lib.optionalString (lib.versionAtLeast version "7.0.0") ''
+          mv $out/sbin/fdbmonitor $out/bin/fdbmonitor
+          mkdir $out/libexec && mv $out/usr/lib/foundationdb/backup_agent/backup_agent $out/libexec/backup_agent
+        '' + ''
+          mv $out/sbin/fdbserver $out/bin/fdbserver
+
+          rm -rf $out/etc $out/lib/foundationdb $out/lib/systemd $out/log $out/sbin $out/usr $out/var
 
           # move results into multi outputs
           mkdir -p $dev $lib
@@ -103,12 +124,6 @@ let
           # java bindings
           mkdir -p $lib/share/java
           mv lib/fdb-java-*.jar $lib/share/java/fdb-java.jar
-
-          # include the tests
-          mkdir -p $out/share/test
-          (cd ../tests && for x in ${tests}; do
-            cp --parents $x $out/share/test
-          done)
         '';
 
         outputs = [ "out" "dev" "lib" "pythonsrc" ];
diff --git a/pkgs/servers/foundationdb/default.nix b/pkgs/servers/foundationdb/default.nix
index 383efee182c3..9a6faac0562b 100644
--- a/pkgs/servers/foundationdb/default.nix
+++ b/pkgs/servers/foundationdb/default.nix
@@ -2,17 +2,13 @@
 , lib, fetchurl, fetchpatch, fetchFromGitHub
 
 , cmake, ninja, which, findutils, m4, gawk
-, python2, python3, openjdk, mono, libressl, boost168
-, pkg-config
+, python2, python3, openjdk, mono, libressl, openssl, boost168, boost178
+, pkg-config, msgpack, toml11
 }@args:
 
 let
   vsmakeBuild = import ./vsmake.nix args;
-  cmakeBuild = import ./cmake.nix (args // {
-    gccStdenv    = gccStdenv;
-    llvmPackages = llvmPackages;
-    boost        = boost168;
-  });
+  cmakeBuild = import ./cmake.nix args;
 
   python3-six-patch = fetchpatch {
     name   = "update-python-six.patch";
@@ -81,6 +77,8 @@ in with builtins; {
   foundationdb61 = cmakeBuild {
     version = "6.1.13";
     sha256  = "10vd694dcnh2pp91mri1m80kfbwjanhiy50c53c5ncqfa6pwvk00";
+    boost   = boost168;
+    ssl     = libressl;
 
     patches = [
       ./patches/clang-libcxx.patch
@@ -90,4 +88,17 @@ in with builtins; {
     ];
   };
 
+  foundationdb71 = cmakeBuild {
+    version = "7.1.26";
+    sha256  = "sha256-IVUFC2Z/nJAeKr/TtEiHAo+1HUeZuSZ2birwJtiYZx0=";
+    boost   = boost178;
+    ssl     = openssl;
+
+    patches = [
+      ./patches/disable-flowbench.patch
+      ./patches/don-t-run-tests-requiring-doctest.patch
+      ./patches/don-t-use-static-boost-libs.patch
+      ./patches/fix-open-with-O_CREAT.patch
+    ];
+  };
 }
diff --git a/pkgs/servers/foundationdb/patches/disable-flowbench.patch b/pkgs/servers/foundationdb/patches/disable-flowbench.patch
new file mode 100644
index 000000000000..a604bf94f322
--- /dev/null
+++ b/pkgs/servers/foundationdb/patches/disable-flowbench.patch
@@ -0,0 +1,15 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 185b721eb..6752ff32d 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -185,7 +185,6 @@ endif()
+ add_subdirectory(fdbbackup)
+ add_subdirectory(contrib)
+ add_subdirectory(tests)
+-add_subdirectory(flowbench EXCLUDE_FROM_ALL)
+ if(WITH_PYTHON AND WITH_C_BINDING)
+   add_subdirectory(bindings)
+ endif()
+-- 
+2.38.1
+
diff --git a/pkgs/servers/foundationdb/patches/don-t-run-tests-requiring-doctest.patch b/pkgs/servers/foundationdb/patches/don-t-run-tests-requiring-doctest.patch
new file mode 100644
index 000000000000..702245bd52ff
--- /dev/null
+++ b/pkgs/servers/foundationdb/patches/don-t-run-tests-requiring-doctest.patch
@@ -0,0 +1,128 @@
+From 10c502fd36df24f1fdbdeff446982ff5247ba20e Mon Sep 17 00:00:00 2001
+From: Jente Hidskes Ankarberg <jente@griffin.sh>
+Date: Thu, 9 Feb 2023 12:40:21 +0100
+Subject: [PATCH] Don't run tests requiring doctest
+
+Doctest is unconditionally pulled in as an external project, which we can't do
+---
+ bindings/c/CMakeLists.txt | 59 ---------------------------------------
+ 1 file changed, 59 deletions(-)
+
+diff --git bindings/c/CMakeLists.txt bindings/c/CMakeLists.txt
+index b1a187b99..25b626819 100644
+--- a/bindings/c/CMakeLists.txt
++++ b/bindings/c/CMakeLists.txt
+@@ -84,7 +84,6 @@ if(NOT WIN32)
+     test/mako/mako.h
+     test/mako/utils.c
+     test/mako/utils.h)
+-  add_subdirectory(test/unit/third_party)
+   find_package(Threads REQUIRED)
+   set(UNIT_TEST_SRCS
+     test/unit/unit_tests.cpp
+@@ -93,10 +92,6 @@ if(NOT WIN32)
+ 
+   set(UNIT_TEST_VERSION_510_SRCS test/unit/unit_tests_version_510.cpp)
+   set(TRACE_PARTIAL_FILE_SUFFIX_TEST_SRCS test/unit/trace_partial_file_suffix_test.cpp)
+-  set(DISCONNECTED_TIMEOUT_UNIT_TEST_SRCS
+-    test/unit/disconnected_timeout_tests.cpp
+-    test/unit/fdb_api.cpp
+-    test/unit/fdb_api.hpp)
+ 
+   set(API_TESTER_SRCS
+     test/apitester/fdb_c_api_tester.cpp
+@@ -128,11 +123,7 @@ if(NOT WIN32)
+     add_library(fdb_c_txn_size_test OBJECT test/txn_size_test.c test/test.h)
+     add_library(fdb_c_client_memory_test OBJECT test/client_memory_test.cpp test/unit/fdb_api.cpp test/unit/fdb_api.hpp)
+     add_library(mako OBJECT ${MAKO_SRCS})
+-    add_library(fdb_c_setup_tests OBJECT test/unit/setup_tests.cpp)
+-    add_library(fdb_c_unit_tests OBJECT ${UNIT_TEST_SRCS})
+-    add_library(fdb_c_unit_tests_version_510 OBJECT ${UNIT_TEST_VERSION_510_SRCS})
+     add_library(trace_partial_file_suffix_test OBJECT ${TRACE_PARTIAL_FILE_SUFFIX_TEST_SRCS})
+-    add_library(disconnected_timeout_unit_tests OBJECT ${DISCONNECTED_TIMEOUT_UNIT_TEST_SRCS})
+     add_library(fdb_c_api_tester OBJECT ${API_TESTER_SRCS})
+   else()
+     add_executable(fdb_c_performance_test test/performance_test.c test/test.h)
+@@ -140,11 +131,7 @@ if(NOT WIN32)
+     add_executable(fdb_c_txn_size_test test/txn_size_test.c test/test.h)
+     add_executable(fdb_c_client_memory_test test/client_memory_test.cpp test/unit/fdb_api.cpp test/unit/fdb_api.hpp)
+     add_executable(mako ${MAKO_SRCS})
+-    add_executable(fdb_c_setup_tests test/unit/setup_tests.cpp)
+-    add_executable(fdb_c_unit_tests ${UNIT_TEST_SRCS})
+-    add_executable(fdb_c_unit_tests_version_510 ${UNIT_TEST_VERSION_510_SRCS})
+     add_executable(trace_partial_file_suffix_test ${TRACE_PARTIAL_FILE_SUFFIX_TEST_SRCS})
+-    add_executable(disconnected_timeout_unit_tests ${DISCONNECTED_TIMEOUT_UNIT_TEST_SRCS})
+     add_executable(fdb_c_api_tester ${API_TESTER_SRCS})
+     strip_debug_symbols(fdb_c_performance_test)
+     strip_debug_symbols(fdb_c_ryw_benchmark)
+@@ -155,20 +142,7 @@ if(NOT WIN32)
+   target_link_libraries(fdb_c_ryw_benchmark PRIVATE fdb_c Threads::Threads)
+   target_link_libraries(fdb_c_txn_size_test PRIVATE fdb_c Threads::Threads)
+   target_link_libraries(fdb_c_client_memory_test PRIVATE fdb_c Threads::Threads)
+-
+-  add_dependencies(fdb_c_setup_tests doctest)
+-  add_dependencies(fdb_c_unit_tests doctest)
+-  add_dependencies(fdb_c_unit_tests_version_510 doctest)
+-  add_dependencies(disconnected_timeout_unit_tests doctest)
+-  target_include_directories(fdb_c_setup_tests PUBLIC ${DOCTEST_INCLUDE_DIR})
+-  target_include_directories(fdb_c_unit_tests PUBLIC ${DOCTEST_INCLUDE_DIR})
+-  target_include_directories(fdb_c_unit_tests_version_510 PUBLIC ${DOCTEST_INCLUDE_DIR})
+-  target_include_directories(disconnected_timeout_unit_tests PUBLIC ${DOCTEST_INCLUDE_DIR})
+-  target_link_libraries(fdb_c_setup_tests PRIVATE fdb_c Threads::Threads)
+-  target_link_libraries(fdb_c_unit_tests PRIVATE fdb_c Threads::Threads fdbclient)
+-  target_link_libraries(fdb_c_unit_tests_version_510 PRIVATE fdb_c Threads::Threads)
+   target_link_libraries(trace_partial_file_suffix_test PRIVATE fdb_c Threads::Threads flow)
+-  target_link_libraries(disconnected_timeout_unit_tests PRIVATE fdb_c Threads::Threads)
+ 
+ if(USE_SANITIZER)
+   target_link_libraries(fdb_c_api_tester PRIVATE fdb_c toml11_target Threads::Threads fmt::fmt boost_asan)
+@@ -203,46 +177,13 @@ endif()
+     DEPENDS fdb_c
+     COMMENT "Copy libfdb_c to use as external client for test")
+   add_custom_target(external_client DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/libfdb_c_external.so)
+-  add_dependencies(fdb_c_unit_tests external_client)
+-  add_dependencies(disconnected_timeout_unit_tests external_client)
+   add_dependencies(fdb_c_api_tester external_client)
+ 
+-  add_fdbclient_test(
+-    NAME fdb_c_setup_tests
+-    COMMAND $<TARGET_FILE:fdb_c_setup_tests>)
+-  add_fdbclient_test(
+-    NAME fdb_c_unit_tests
+-    COMMAND $<TARGET_FILE:fdb_c_unit_tests>
+-            @CLUSTER_FILE@
+-            fdb)
+-  add_fdbclient_test(
+-    NAME fdb_c_unit_tests_version_510
+-    COMMAND $<TARGET_FILE:fdb_c_unit_tests_version_510>
+-            @CLUSTER_FILE@
+-            fdb)
+   add_fdbclient_test(
+     NAME trace_partial_file_suffix_test
+     COMMAND $<TARGET_FILE:trace_partial_file_suffix_test>
+             @CLUSTER_FILE@
+             fdb)
+-  add_fdbclient_test(
+-    NAME fdb_c_external_client_unit_tests
+-    COMMAND $<TARGET_FILE:fdb_c_unit_tests>
+-            @CLUSTER_FILE@
+-            fdb
+-            ${CMAKE_CURRENT_BINARY_DIR}/libfdb_c_external.so
+-            )
+-  add_unavailable_fdbclient_test(
+-    NAME disconnected_timeout_unit_tests
+-    COMMAND $<TARGET_FILE:disconnected_timeout_unit_tests>
+-            @CLUSTER_FILE@
+-            )
+-  add_unavailable_fdbclient_test(
+-    NAME disconnected_timeout_external_client_unit_tests
+-    COMMAND $<TARGET_FILE:disconnected_timeout_unit_tests>
+-            @CLUSTER_FILE@
+-            ${CMAKE_CURRENT_BINARY_DIR}/libfdb_c_external.so
+-            )
+   add_fdbclient_test(
+     NAME fdb_c_api_tests
+     DISABLE_LOG_DUMP
+-- 
+2.37.1 (Apple Git-137.1)
+
diff --git a/pkgs/servers/foundationdb/patches/don-t-use-static-boost-libs.patch b/pkgs/servers/foundationdb/patches/don-t-use-static-boost-libs.patch
new file mode 100644
index 000000000000..d26df9004e86
--- /dev/null
+++ b/pkgs/servers/foundationdb/patches/don-t-use-static-boost-libs.patch
@@ -0,0 +1,27 @@
+From 1a217164f8086137ce175da09329745d5ea63027 Mon Sep 17 00:00:00 2001
+From: Jente Hidskes Ankarberg <jente@griffin.sh>
+Date: Tue, 7 Feb 2023 17:17:16 +0100
+Subject: Don't use static Boost libs
+
+We cannot override this in our CMake flags, hence we have to patch it in the source.
+
+---
+ cmake/CompileBoost.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git cmake/CompileBoost.cmake cmake/CompileBoost.cmake
+index 3bc47c776..62b448421 100644
+--- a/cmake/CompileBoost.cmake
++++ b/cmake/CompileBoost.cmake
+@@ -85,7 +85,7 @@ if(USE_SANITIZER)
+ endif()
+ 
+ # since boost 1.72 boost installs cmake configs. We will enforce config mode
+-set(Boost_USE_STATIC_LIBS ON)
++set(Boost_USE_STATIC_LIBS OFF)
+ 
+ # Clang and Gcc will have different name mangling to std::call_once, etc.
+ if (UNIX AND CMAKE_CXX_COMPILER_ID MATCHES "Clang$")
+-- 
+2.37.1 (Apple Git-137.1)
+
diff --git a/pkgs/servers/foundationdb/patches/fix-open-with-O_CREAT.patch b/pkgs/servers/foundationdb/patches/fix-open-with-O_CREAT.patch
new file mode 100644
index 000000000000..23a642cb28fd
--- /dev/null
+++ b/pkgs/servers/foundationdb/patches/fix-open-with-O_CREAT.patch
@@ -0,0 +1,25 @@
+From 533d064ce028a7ebd0ef3a845cb69f10ca04b09f Mon Sep 17 00:00:00 2001
+From: Jente Hidskes Ankarberg <jente@griffin.sh>
+Date: Fri, 17 Feb 2023 00:07:20 +0100
+Subject: [PATCH 2/2] fix open with O_CREAT
+
+---
+ fdbbackup/FileDecoder.actor.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git fdbbackup/FileDecoder.actor.cpp fdbbackup/FileDecoder.actor.cpp
+index 71f693259..547147ea0 100644
+--- a/fdbbackup/FileDecoder.actor.cpp
++++ b/fdbbackup/FileDecoder.actor.cpp
+@@ -433,7 +433,7 @@ public:
+ 					platform::createDirectory(path);
+ 				}
+ 			}
+-			self->lfd = open(self->file.fileName.c_str(), O_WRONLY | O_CREAT | O_TRUNC);
++			self->lfd = open(self->file.fileName.c_str(), O_WRONLY | O_CREAT | O_TRUNC, 0600);
+ 			if (self->lfd == -1) {
+ 				TraceEvent(SevError, "OpenLocalFileFailed").detail("File", self->file.fileName);
+ 				throw platform_error();
+-- 
+2.38.1
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b2b0d8f8ad18..e26190b07cbe 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7612,6 +7612,7 @@ with pkgs;
     foundationdb52
     foundationdb60
     foundationdb61
+    foundationdb71
   ;
 
   foundationdb = foundationdb61;
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 12a65e9a4c9c..ff461e76fb57 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3666,6 +3666,7 @@ self: super: with self; {
   foundationdb52 = callPackage ../servers/foundationdb/python.nix { foundationdb = pkgs.foundationdb52; };
   foundationdb60 = callPackage ../servers/foundationdb/python.nix { foundationdb = pkgs.foundationdb60; };
   foundationdb61 = callPackage ../servers/foundationdb/python.nix { foundationdb = pkgs.foundationdb61; };
+  foundationdb71 = callPackage ../servers/foundationdb/python.nix { foundationdb = pkgs.foundationdb71; };
 
   fountains = callPackage ../development/python-modules/fountains { };
 

From 73ca83e965a2036ea0a17681273c040ed4aff99a Mon Sep 17 00:00:00 2001
From: Jente Hidskes Ankarberg <jente@griffin.sh>
Date: Mon, 13 Feb 2023 23:32:39 +0100
Subject: [PATCH 09/77] foundationdb: build on aarch64-linux

---
 pkgs/servers/foundationdb/cmake.nix | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/foundationdb/cmake.nix b/pkgs/servers/foundationdb/cmake.nix
index dcaa9f3e6f8e..d46502601c2a 100644
--- a/pkgs/servers/foundationdb/cmake.nix
+++ b/pkgs/servers/foundationdb/cmake.nix
@@ -14,6 +14,13 @@ let
 
   tests = builtins.replaceStrings [ "\n" ] [ " " ] (lib.fileContents ./test-list.txt);
 
+  # Only even numbered versions compile on aarch64; odd numbered versions have avx enabled.
+  avxEnabled = version:
+    let
+      isOdd = n: lib.trivial.mod n 2 != 0;
+      patch = lib.toInt (lib.versions.patch version);
+    in isOdd patch;
+
   makeFdb =
     { version
     , sha256
@@ -81,6 +88,8 @@ let
         env.NIX_CFLAGS_COMPILE = toString [
           # Needed with GCC 12
           "-Wno-error=missing-template-keyword"
+          # Needed to compile on aarch64
+          (lib.optionalString stdenv.isAarch64 "-march=armv8-a+crc")
         ];
 
         inherit patches;
@@ -132,7 +141,8 @@ let
           description = "Open source, distributed, transactional key-value store";
           homepage    = "https://www.foundationdb.org";
           license     = licenses.asl20;
-          platforms   = [ "x86_64-linux" ];
+          platforms   = [ "x86_64-linux" ]
+            ++ lib.optionals (lib.versionAtLeast version "7.1.0" && !(avxEnabled version)) [ "aarch64-linux" ];
           maintainers = with maintainers; [ thoughtpolice lostnet ];
        };
     };

From 6fc841cf75467c6082c221036a59d5930a2063b1 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 7 Apr 2023 22:32:24 +0200
Subject: [PATCH 10/77] python310Packages.qcs-api-client: 0.21.3 -> 0.21.4

Diff: https://github.com/rigetti/qcs-api-client-python/compare/refs/tags/v0.21.3...v0.21.4

Changelog: https://github.com/rigetti/qcs-api-client-python/releases/tag/v0.21.4
---
 pkgs/development/python-modules/qcs-api-client/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/qcs-api-client/default.nix b/pkgs/development/python-modules/qcs-api-client/default.nix
index 48b0e0ac7e04..a439236926b0 100644
--- a/pkgs/development/python-modules/qcs-api-client/default.nix
+++ b/pkgs/development/python-modules/qcs-api-client/default.nix
@@ -22,7 +22,7 @@
 
 buildPythonPackage rec {
   pname = "qcs-api-client";
-  version = "0.21.3";
+  version = "0.21.4";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -31,7 +31,7 @@ buildPythonPackage rec {
     owner = "rigetti";
     repo = "qcs-api-client-python";
     rev = "refs/tags/v${version}";
-    hash = "sha256-GEsCyqawLX6fTICjAOOREsO5FsmV6U/5+sDOW1v+VKE=";
+    hash = "sha256-eEN2K2x67dqTNsYMerLJIMV5xtRi4wiYvVql6JOcZh4=";
   };
 
   patches = [

From 812b738e2c03ae74a222f4d3a580137dead3de6b Mon Sep 17 00:00:00 2001
From: Bernardo Meurer <bernardo@meurer.org>
Date: Tue, 18 Apr 2023 15:23:26 -0300
Subject: [PATCH 11/77] fbterm: update and use debian-maintained version

Since upstream has been abandoned for years, let's use the source that's
currently maintained by Debian devs.

This also incorporates patches used by the Arch Linux packaging of
fbterm, and cleans up the derivation
---
 pkgs/os-specific/linux/fbterm/default.nix | 105 ++++++++++++++++------
 1 file changed, 76 insertions(+), 29 deletions(-)

diff --git a/pkgs/os-specific/linux/fbterm/default.nix b/pkgs/os-specific/linux/fbterm/default.nix
index cbea00ae184d..9e89ad555317 100644
--- a/pkgs/os-specific/linux/fbterm/default.nix
+++ b/pkgs/os-specific/linux/fbterm/default.nix
@@ -1,52 +1,99 @@
-{ stdenv, lib, fetchurl, gpm, freetype, fontconfig, pkg-config, ncurses, libx86 }:
+{ stdenv
+, autoreconfHook
+, fetchFromGitLab
+, fetchpatch
+, fetchurl
+, fontconfig
+, freetype
+, gpm
+, lib
+, ncurses
+, pkg-config
+}:
 
 stdenv.mkDerivation rec {
-  version = "1.7.0";
+  version = "1.7-2";
   pname = "fbterm";
 
-  src = fetchurl {
-    url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/fbterm/fbterm-${version}.tar.gz";
-    sha256 = "0pciv5by989vzvjxsv1jsv4bdp4m8j0nfbl29jm5fwi12w4603vj";
+  src = fetchFromGitLab {
+    domain = "salsa.debian.org";
+    owner = "debian";
+    repo = pname;
+    rev = "debian/${version}";
+    hash = "sha256-vRUZgFpA1IkzkLzl7ImT+Yff5XqjFbUlkHmj/hd7XDE=";
   };
 
-  nativeBuildInputs = [ pkg-config ncurses ];
-  buildInputs = [ gpm freetype fontconfig ncurses ]
-    ++ lib.optional stdenv.hostPlatform.isx86 libx86;
+  nativeBuildInputs = [
+    autoreconfHook
+    pkg-config
+    ncurses
+  ];
+  buildInputs = [
+    gpm
+    freetype
+    fontconfig
+    ncurses
+  ];
 
-  preConfigure = ''
-    sed -e '/ifdef SYS_signalfd/atypedef long long loff_t;' -i src/fbterm.cpp
-    sed -e '/install-exec-hook:/,/^[^\t]/{d}; /.NOEXPORT/iinstall-exec-hook:\
-    ' -i src/Makefile.in
-    export HOME=$PWD;
-    export NIX_LDFLAGS="$NIX_LDFLAGS -lfreetype"
+  # preConfigure = ''
+  #   sed -e '/ifdef SYS_signalfd/atypedef long long loff_t;' -i src/fbterm.cpp
+  #   sed -e '/install-exec-hook:/,/^[^\t]/{d}; /.NOEXPORT/iinstall-exec-hook:\
+  #   ' -i src/Makefile.in
+  #   export HOME=$PWD;
+  #   export NIX_LDFLAGS="$NIX_LDFLAGS -lfreetype"
+  # '';
+
+  preInstall = ''
+    export HOME=$PWD
   '';
-  preBuild = ''
+
+  postInstall =
+  let
+    fbtermrc = fetchurl {
+      url = "https://aur.archlinux.org/cgit/aur.git/plain/fbtermrc?h=fbterm";
+      hash = "sha256-zNIfi2ZjEGc5PLdOIirKGTXESb5Wm5XBAI1sfHa31LY=";
+    };
+  in
+  ''
     mkdir -p "$out/share/terminfo"
     tic -a -v2 -o"$out/share/terminfo" terminfo/fbterm
-    makeFlagsArray+=("AR=$AR")
+
+    mkdir -p "$out/etc/fbterm"
+    cp "${fbtermrc}" "$out/etc/fbterm"
   '';
 
+  # Patches from https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=fbterm
   patches = [
-    # fixes from Arch Linux package
-    (fetchurl {
-      url = "https://raw.githubusercontent.com/glitsj16/fbterm-patched/d1fe03313be4654dd0a1c0bb5f51530732345134/gcc-6-build-fixes.patch";
-      sha256 = "1kl9fjnrri6pamjdl4jpkqxk5wxcf6jcchv5801xz8vxp4542m40";
+    (fetchpatch {
+      url = "https://aur.archlinux.org/cgit/aur.git/plain/fbconfig.patch?h=fbterm";
+      hash = "sha256-skCdUqyMkkqxS1YUI7cofsfnNNo3SL/qe4WEIXlhm/s=";
     })
-    (fetchurl {
-      url = "https://raw.githubusercontent.com/glitsj16/fbterm-patched/d1fe03313be4654dd0a1c0bb5f51530732345134/insertmode-fix.patch";
-      sha256 = "1bad9mqcfpqb94lpx23lsamlhplil73ahzin2xjva0gl3gr1038l";
+    (fetchpatch {
+      url = "https://aur.archlinux.org/cgit/aur.git/plain/color_palette.patch?h=fbterm";
+      hash = "sha256-SkWxzfapyBTtMpTXkiFHRAw8/uXw7cAWwg5Q3TqWlk8=";
     })
-    (fetchurl {
-      url = "https://raw.githubusercontent.com/glitsj16/fbterm-patched/d1fe03313be4654dd0a1c0bb5f51530732345134/miscoloring-fix.patch";
-      sha256 = "1mjszji0jgs2jsagjp671fv0d1983wmxv009ff1jfhi9pbay6jd0";
+    (fetchpatch {
+      url = "https://aur.archlinux.org/cgit/aur.git/plain/fbterm.patch?h=fbterm";
+      hash = "sha256-XNHBTGQGeaQPip2XgcKlr123VDwils2pnyiGqkBGhzU=";
+    })
+    (fetchpatch {
+      url = "https://aur.archlinux.org/cgit/aur.git/plain/0001-Fix-build-with-gcc-6.patch?h=fbterm";
+      hash = "sha256-3d3zBvr5upICVVkd6tn63IhuB0sF67f62aKnf8KvOwg=";
+    })
+    (fetchpatch {
+      url = "https://aur.archlinux.org/cgit/aur.git/plain/fix_ftbfs_crosscompile.patch?h=fbterm";
+      hash = "sha256-jv/FSG6dHR0jKjPXQIfqsvpiT/XYzwv/VwuV+qUSovM=";
+    })
+    (fetchpatch {
+      url = "https://aur.archlinux.org/cgit/aur.git/plain/fix_ftbfs_epoll.patch?h=fbterm";
+      hash = "sha256-wkhfG0uY/5ZApcXTERkaKqz5IDpnilxUEcxull4645A=";
     })
-    ./select.patch
   ];
 
   meta = with lib; {
     description = "Framebuffer terminal emulator";
-    homepage = "https://code.google.com/archive/p/fbterm/";
-    maintainers = with maintainers; [ raskin ];
+    homepage = "https://salsa.debian.org/debian/fbterm";
+    maintainers = with maintainers; [ lovesegfault raskin ];
     license = licenses.gpl2;
     platforms = platforms.linux;
   };

From ac1b5deba339478394fd4f8d0450116b757ce12c Mon Sep 17 00:00:00 2001
From: Robert Kovacsics <robert.kovacsics@cambridgeconsultants.com>
Date: Tue, 18 Apr 2023 19:51:01 +0100
Subject: [PATCH 12/77] saleae-logic-2: Fix "Error Connecting to Socket"

The problem was it couldn't find `libcrypt.so.1` because `libxcrypt` now
provides `libcrypt.so.2`
---
 pkgs/development/tools/misc/saleae-logic-2/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/misc/saleae-logic-2/default.nix b/pkgs/development/tools/misc/saleae-logic-2/default.nix
index 6eeb47df10ab..6ffa74182fed 100644
--- a/pkgs/development/tools/misc/saleae-logic-2/default.nix
+++ b/pkgs/development/tools/misc/saleae-logic-2/default.nix
@@ -59,7 +59,7 @@ appimageTools.wrapType2 {
     alsa-lib
     at-spi2-core
     cups
-    libxcrypt
+    libxcrypt-legacy
   ];
 
   meta = with lib; {

From 0fc68550d179aa57b06c3c83279b6469ba9fc93f Mon Sep 17 00:00:00 2001
From: Robert Kovacsics <robert.kovacsics@cambridgeconsultants.com>
Date: Tue, 18 Apr 2023 16:26:06 +0100
Subject: [PATCH 13/77] saleae-logic-2: 2.4.6 -> 2.4.7

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

diff --git a/pkgs/development/tools/misc/saleae-logic-2/default.nix b/pkgs/development/tools/misc/saleae-logic-2/default.nix
index 6ffa74182fed..565027f718cd 100644
--- a/pkgs/development/tools/misc/saleae-logic-2/default.nix
+++ b/pkgs/development/tools/misc/saleae-logic-2/default.nix
@@ -1,10 +1,10 @@
 { lib, fetchurl, makeDesktopItem, appimageTools }:
 let
   name = "saleae-logic-2";
-  version = "2.4.6";
+  version = "2.4.7";
   src = fetchurl {
     url = "https://downloads.saleae.com/logic2/Logic-${version}-master.AppImage";
-    hash = "sha256-FYLjg4lzr8M22r4yoKfMIAx2HKGi2fcD28AaV1ChkLk=";
+    hash = "sha256-dMt8XWLatLNothU9oTJqYrBGNZZs0L5dXRMKP9ZeM6E=";
   };
   desktopItem = makeDesktopItem {
     inherit name;

From 34122f7321d2abe79b6ca1086b02354495888563 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 21 Apr 2023 09:47:16 +0200
Subject: [PATCH 14/77] =?UTF-8?q?ocamlPackages.ocamlmod:=20disable=20for?=
 =?UTF-8?q?=20OCaml=20=E2=89=A5=205.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/development/tools/ocaml/ocamlmod/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/tools/ocaml/ocamlmod/default.nix b/pkgs/development/tools/ocaml/ocamlmod/default.nix
index 5b4f7e8e4407..ee287a92388f 100644
--- a/pkgs/development/tools/ocaml/ocamlmod/default.nix
+++ b/pkgs/development/tools/ocaml/ocamlmod/default.nix
@@ -5,6 +5,9 @@ let
   doCheck = lib.versionAtLeast ocaml.version "4.04";
 in
 
+lib.throwIf (lib.versionAtLeast ocaml.version "5.0")
+  "ocamlmod is not available for OCaml ≥ 5.0"
+
 stdenv.mkDerivation {
   pname = "ocamlmod";
   version = "0.0.9";

From d3db6fe015712bba507f363551d3bf6ded16b5db Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 21 Apr 2023 09:47:21 +0200
Subject: [PATCH 15/77] =?UTF-8?q?ocamlPackages.ocaml=5Foasis:=200.4.10=20?=
 =?UTF-8?q?=E2=86=92=200.4.11?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/development/tools/ocaml/oasis/default.nix | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/tools/ocaml/oasis/default.nix b/pkgs/development/tools/ocaml/oasis/default.nix
index c550bef7dda0..11b7c550d7c4 100644
--- a/pkgs/development/tools/ocaml/oasis/default.nix
+++ b/pkgs/development/tools/ocaml/oasis/default.nix
@@ -1,14 +1,12 @@
 { lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, ocamlmod, ocamlify }:
 
 stdenv.mkDerivation {
-  version = "0.4.10";
+  version = "0.4.11";
   pname = "ocaml-oasis";
 
-  # You must manually update the url, not just the version. OCamlforge keys off
-  # the number after download.php, not the filename.
   src = fetchurl {
-    url = "https://forge.ocamlcore.org/frs/download.php/1694/oasis-0.4.10.tar.gz";
-    sha256 = "13ah03pbcvrjv5lmx971hvkm9rvbvimska5wmjfvgvd20ca0gn8w";
+    url = "https://download.ocamlcore.org/oasis/oasis/0.4.11/oasis-0.4.11.tar.gz";
+    hash = "sha256-GLc97vTtbpqDM38ks7vi3tZSaLP/cwn8wA0l5X4dwS4=";
   };
 
   createFindlibDestdir = true;
@@ -40,10 +38,10 @@ stdenv.mkDerivation {
 
   meta = with lib; {
     description = "Configure, build and install system for OCaml projects";
-    homepage = "http://oasis.forge.ocamlcore.org/";
+    homepage = "https://github.com/ocaml/oasis";
     license = licenses.lgpl21;
     maintainers = with maintainers; [ vbgl maggesi ];
     mainProgram = "oasis";
-    platforms = ocaml.meta.platforms or [];
+    inherit (ocaml.meta) platforms;
   };
 }

From 690e5bf26a0ff837a438bd62232f0705c5b2b1f7 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 23 Apr 2023 10:08:06 +0200
Subject: [PATCH 16/77] python310Packages.tinycss: update meta

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

diff --git a/pkgs/development/python-modules/tinycss/default.nix b/pkgs/development/python-modules/tinycss/default.nix
index 5dc443a0e47a..ac59b9a310f3 100644
--- a/pkgs/development/python-modules/tinycss/default.nix
+++ b/pkgs/development/python-modules/tinycss/default.nix
@@ -40,8 +40,9 @@ buildPythonPackage rec {
 
   meta = with pkgs.lib; {
     description = "Complete yet simple CSS parser for Python";
+    homepage = "https://tinycss.readthedocs.io";
+    changelog = "https://github.com/Kozea/tinycss/releases/tag/v${version}";
     license = licenses.bsd3;
-    homepage = "https://pythonhosted.org/tinycss/";
-    maintainers = [ maintainers.costrouc ];
+    maintainers = with maintainers; [ costrouc ];
   };
 }

From b49aa4221b330db57f08936b1dfac88f38f8b712 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 23 Apr 2023 10:11:08 +0200
Subject: [PATCH 17/77] python310Packages.tinycss: disable on unsupported
 Python releases

- add format
- use hash
- replace pkgs with lib
---
 pkgs/development/python-modules/tinycss/default.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/tinycss/default.nix b/pkgs/development/python-modules/tinycss/default.nix
index ac59b9a310f3..2f69fedb2476 100644
--- a/pkgs/development/python-modules/tinycss/default.nix
+++ b/pkgs/development/python-modules/tinycss/default.nix
@@ -1,4 +1,4 @@
-{ pkgs
+{ lib
 , buildPythonPackage
 , fetchPypi
 , pytest
@@ -6,15 +6,19 @@
 , cython
 , cssutils
 , isPyPy
+, pythonOlder
 }:
 
 buildPythonPackage rec {
   pname = "tinycss";
   version = "0.4";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "12306fb50e5e9e7eaeef84b802ed877488ba80e35c672867f548c0924a76716e";
+    hash = "sha256-EjBvtQ5enn6u74S4Au2HdIi6gONcZyhn9UjAkkp2cW4=";
   };
 
   nativeCheckInputs = [ pytest ];
@@ -38,7 +42,7 @@ buildPythonPackage rec {
   # Disable Cython tests for PyPy
   TINYCSS_SKIP_SPEEDUPS_TESTS = pkgs.lib.optional isPyPy true;
 
-  meta = with pkgs.lib; {
+  meta = with lib; {
     description = "Complete yet simple CSS parser for Python";
     homepage = "https://tinycss.readthedocs.io";
     changelog = "https://github.com/Kozea/tinycss/releases/tag/v${version}";

From cf197c7d49f669d88b3919f72bf9998ca00b70f2 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 23 Apr 2023 10:29:15 +0200
Subject: [PATCH 18/77] python310Packages.tinycss: add pythonImportsCheck

- switch to pytestCheckHook
- don't get coverage
- never run speedup tests
---
 .../python-modules/tinycss/default.nix        | 36 +++++++++++--------
 1 file changed, 22 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/python-modules/tinycss/default.nix b/pkgs/development/python-modules/tinycss/default.nix
index 2f69fedb2476..108c989b7de5 100644
--- a/pkgs/development/python-modules/tinycss/default.nix
+++ b/pkgs/development/python-modules/tinycss/default.nix
@@ -1,11 +1,9 @@
 { lib
 , buildPythonPackage
-, fetchPypi
-, pytest
-, python
-, cython
 , cssutils
-, isPyPy
+, cython
+, fetchPypi
+, pytestCheckHook
 , pythonOlder
 }:
 
@@ -21,26 +19,36 @@ buildPythonPackage rec {
     hash = "sha256-EjBvtQ5enn6u74S4Au2HdIi6gONcZyhn9UjAkkp2cW4=";
   };
 
-  nativeCheckInputs = [ pytest ];
-  propagatedBuildInputs = [ cssutils ];
+  postPatch = ''
+    sed -i "/--cov/d" setup.cfg
+  '';
+
   nativeBuildInputs = [
     cython
   ];
 
+  propagatedBuildInputs = [
+    cssutils
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
   preBuild = ''
-    # Force cython to re-generate this file. If it is present, cython will
+    # Force Cython to re-generate this file. If it is present, Cython will
     # think it is "up to date" even though it was generated with an older,
-    # incompatible version of cython. See
+    # incompatible version of Cython. See
     # https://github.com/Kozea/tinycss/issues/17.
     rm tinycss/speedups.c
   '';
 
-  checkPhase = ''
-    py.test $out/${python.sitePackages}
-  '';
+  # Disable Cython tests
+  TINYCSS_SKIP_SPEEDUPS_TESTS = true;
 
-  # Disable Cython tests for PyPy
-  TINYCSS_SKIP_SPEEDUPS_TESTS = pkgs.lib.optional isPyPy true;
+  pythonImportsCheck = [
+    "tinycss"
+  ];
 
   meta = with lib; {
     description = "Complete yet simple CSS parser for Python";

From 83765a4a84cca6fcd0f64b19941542efe1869f0c Mon Sep 17 00:00:00 2001
From: Tebowy Seba <3144357+tebowy@users.noreply.github.com>
Date: Fri, 7 Apr 2023 10:58:33 +0200
Subject: [PATCH 19/77] armcord: 3.1.6 -> 3.1.7

---
 .../networking/instant-messengers/armcord/default.nix       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/armcord/default.nix b/pkgs/applications/networking/instant-messengers/armcord/default.nix
index 692603558804..34e2dd292822 100644
--- a/pkgs/applications/networking/instant-messengers/armcord/default.nix
+++ b/pkgs/applications/networking/instant-messengers/armcord/default.nix
@@ -39,7 +39,7 @@
 
 stdenv.mkDerivation rec {
   pname = "armcord";
-  version = "3.1.6";
+  version = "3.1.7";
 
   src =
     let
@@ -48,11 +48,11 @@ stdenv.mkDerivation rec {
       {
         x86_64-linux = fetchurl {
           url = "${base}/v${version}/ArmCord_${version}_amd64.deb";
-          sha256 = "sha256-xCwAkRtsFmGOIyCftjNqUsaw7/PcxSgWGqW/D1NhC5M=";
+          sha256 = "sha256-c0ejSivQbxpPUQ6P0YUya3q1EJ1yF4RFGur11BMwz3o=";
         };
         aarch64-linux = fetchurl {
           url = "${base}/v${version}/ArmCord_${version}_arm64.deb";
-          sha256 = "sha256-ka8hwHhMVTXNS1rktTs3yXfXnyxSmRt41IE8z/ftUVc=";
+          sha256 = "sha256-4yqe4eIO4AxsZNYCn99KTBqjQURB+G+gpT0Q17pcEvU=";
         };
       }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
 

From 2b9ec87c4e4380a420923a2610289bc9444ee132 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Mon, 24 Apr 2023 17:23:02 +0100
Subject: [PATCH 20/77] cachix: 1.4.2 -> 1.3.3

reverts back to 1.3.3 until a regression has been addressed.
---
 pkgs/development/haskell-modules/configuration-nix.nix | 6 ++++--
 pkgs/top-level/all-packages.nix                        | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index bf5fe55584ce..7ef090770635 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -988,11 +988,13 @@ self: super: builtins.intersectAttrs super {
     hnix-store-core = super.hnix-store-core_0_6_1_0;
   });
 
-  cachix_1_3_3 = super.cachix_1_3_3.override {
+  cachix_1_3_3 = overrideCabal (drv: {
+    hydraPlatforms = pkgs.lib.platforms.all;
+  }) (super.cachix_1_3_3.override {
     nix = self.hercules-ci-cnix-store.nixPackage;
     fsnotify = dontCheck super.fsnotify_0_4_1_0;
     hnix-store-core = super.hnix-store-core_0_6_1_0;
-  };
+  });
 
   hercules-ci-agent = super.hercules-ci-agent.override { nix = self.hercules-ci-cnix-store.passthru.nixPackage; };
   hercules-ci-cnix-expr = addTestToolDepend pkgs.git (super.hercules-ci-cnix-expr.override { nix = self.hercules-ci-cnix-store.passthru.nixPackage; });
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 186ed846f2dc..14d76fb0f30d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19542,7 +19542,7 @@ with pkgs;
   c-blosc = callPackage ../development/libraries/c-blosc { };
 
   # justStaticExecutables is needed due to https://github.com/NixOS/nix/issues/2990
-  cachix = haskell.lib.justStaticExecutables haskellPackages.cachix;
+  cachix = haskell.lib.justStaticExecutables haskellPackages.cachix_1_3_3;
 
   calcium = callPackage ../development/libraries/calcium { };
 

From 784619c66f5f71c603d2591a584de342fbf58029 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 25 Apr 2023 13:15:51 +0200
Subject: [PATCH 21/77] python310Packages.mailchecker: 5.0.8 -> 5.0.9

Changelog: https://github.com/FGRibreau/mailchecker/blob/v5.0.9/CHANGELOG.md
---
 pkgs/development/python-modules/mailchecker/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mailchecker/default.nix b/pkgs/development/python-modules/mailchecker/default.nix
index 9263e683cd15..4701b456e09a 100644
--- a/pkgs/development/python-modules/mailchecker/default.nix
+++ b/pkgs/development/python-modules/mailchecker/default.nix
@@ -6,14 +6,14 @@
 
 buildPythonPackage rec {
   pname = "mailchecker";
-  version = "5.0.8";
+  version = "5.0.9";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-rqayN1W+dqHSdRH7NFKtD07r2OztQq5FBhMaJEI3iwY=";
+    hash = "sha256-iwg5B9pC2qRI2T6xnwyXjd4uhWVhel52Jxs1pfcoXM0=";
   };
 
   # Module has no tests

From 86fd55beb21420d96c3e9f5ddd08f4346bfcfcb1 Mon Sep 17 00:00:00 2001
From: Konstantin Alekseev <mail@kalekseev.com>
Date: Sun, 5 Feb 2023 11:41:35 +0200
Subject: [PATCH 22/77] python3Packages.ruff-lsp: init at 0.0.24

---
 .../python-modules/ruff-lsp/default.nix       | 63 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 65 insertions(+)
 create mode 100644 pkgs/development/python-modules/ruff-lsp/default.nix

diff --git a/pkgs/development/python-modules/ruff-lsp/default.nix b/pkgs/development/python-modules/ruff-lsp/default.nix
new file mode 100644
index 000000000000..7ef48b86fa0b
--- /dev/null
+++ b/pkgs/development/python-modules/ruff-lsp/default.nix
@@ -0,0 +1,63 @@
+{ lib
+, stdenv
+, pythonOlder
+, buildPythonPackage
+, fetchPypi
+, ruff
+, pygls
+, lsprotocol
+, hatchling
+, typing-extensions
+, unittestCheckHook
+, python-lsp-jsonrpc
+}:
+
+buildPythonPackage rec {
+  pname = "ruff-lsp";
+  version = "0.0.24";
+  format = "pyproject";
+  disabled = pythonOlder "3.7";
+
+  src = fetchPypi {
+    inherit version;
+    pname = "ruff_lsp";
+    sha256 = "sha256-1he/GYk8O9LqPXH3mu7eGWuRygiDG1OnJ+JNT2Pynzo=";
+  };
+
+  postPatch = ''
+    # ruff binary added to PATH in wrapper so it's not needed
+    sed -i '/"ruff>=/d' pyproject.toml
+  '';
+
+  nativeBuildInputs = [
+    hatchling
+  ];
+
+  propagatedBuildInputs = [
+    pygls
+    lsprotocol
+    typing-extensions
+  ];
+
+  doCheck = stdenv.isDarwin;
+
+  nativeCheckInputs = [
+    unittestCheckHook
+    python-lsp-jsonrpc
+    ruff
+  ];
+
+  makeWrapperArgs = [
+    # prefer ruff from user's PATH, that's usually desired behavior
+    "--suffix PATH : ${lib.makeBinPath [ ruff ]}"
+  ];
+
+
+  meta = with lib; {
+    homepage = "https://github.com/charliermarsh/ruff-lsp";
+    description = "A Language Server Protocol implementation for Ruff";
+    changelog = "https://github.com/charliermarsh/ruff-lsp/releases/tag/v${version}";
+    license = licenses.mit;
+    maintainers = with maintainers; [ kalekseev ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1f627f5383bc..5f657564e2f7 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -10457,6 +10457,8 @@ self: super: with self; {
 
   rubymarshal = callPackage ../development/python-modules/rubymarshal { };
 
+  ruff-lsp = callPackage ../development/python-modules/ruff-lsp { };
+
   ruffus = callPackage ../development/python-modules/ruffus { };
 
   runway-python = callPackage ../development/python-modules/runway-python { };

From e5741f7791548b49654f26300a8128450edabd66 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 25 Apr 2023 18:45:55 +0200
Subject: [PATCH 23/77] plasma5Packages.kio-extras: Remove openslp dependency

Has not been a depedency since it was removed upstream in 2017.
---
 pkgs/applications/kde/kio-extras.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/kde/kio-extras.nix b/pkgs/applications/kde/kio-extras.nix
index d9e8cf889491..cb2ccbb22c18 100644
--- a/pkgs/applications/kde/kio-extras.nix
+++ b/pkgs/applications/kde/kio-extras.nix
@@ -3,7 +3,7 @@
   exiv2, kactivities, kactivities-stats, karchive, kbookmarks, kconfig, kconfigwidgets,
   kcoreaddons, kdbusaddons, kdsoap, kguiaddons, kdnssd, kiconthemes, ki18n, kio,
   khtml, kpty, syntax-highlighting, libmtp, libssh, openexr, libtirpc,
-  ilmbase, openslp, phonon, qtsvg, samba, solid, gperf, taglib
+  ilmbase, phonon, qtsvg, samba, solid, gperf, taglib
 }:
 
 mkDerivation {
@@ -16,7 +16,7 @@ mkDerivation {
   buildInputs = [
     exiv2 kactivities kactivities-stats karchive kbookmarks kconfig kconfigwidgets kcoreaddons
     kdbusaddons kdsoap kguiaddons kdnssd kiconthemes ki18n kio khtml
-    kpty syntax-highlighting libmtp libssh openexr libtirpc openslp
+    kpty syntax-highlighting libmtp libssh openexr libtirpc
     phonon qtsvg samba solid gperf taglib
   ];
 

From aa8c9e7d23dbd3844d26c36e914557b9477bee71 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 25 Apr 2023 18:54:53 +0200
Subject: [PATCH 24/77] openslp: Mark vulnerable to CVE-2023-29552

---
 pkgs/development/libraries/openslp/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/libraries/openslp/default.nix b/pkgs/development/libraries/openslp/default.nix
index 5bd2fd070985..7ebbd9ad5ce4 100644
--- a/pkgs/development/libraries/openslp/default.nix
+++ b/pkgs/development/libraries/openslp/default.nix
@@ -32,6 +32,9 @@ stdenv.mkDerivation rec {
     platforms = platforms.all;
     # never built on aarch64-darwin since first introduction in nixpkgs
     broken = stdenv.isDarwin && stdenv.isAarch64;
+    knownVulnerabilities = [
+      "CVE-2023-29552: UDP Reflection Attack with ampliciation factor of up to 2200"
+    ];
   };
 
 }

From 6bc29b99312868ffd410f0afaa359d37e5eaa825 Mon Sep 17 00:00:00 2001
From: Marco Rebhan <me@dblsaiko.net>
Date: Mon, 21 Nov 2022 19:38:11 +0100
Subject: [PATCH 25/77] gimp: Add desktopToDarwinBundle to generate bundle
 files

---
 pkgs/applications/graphics/gimp/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/applications/graphics/gimp/default.nix b/pkgs/applications/graphics/gimp/default.nix
index e7b257cea438..5e1fbe375876 100644
--- a/pkgs/applications/graphics/gimp/default.nix
+++ b/pkgs/applications/graphics/gimp/default.nix
@@ -44,6 +44,7 @@
 , libheif
 , libgudev
 , openexr
+, desktopToDarwinBundle
 , AppKit
 , Cocoa
 , gtk-mac-integration-gtk2
@@ -84,6 +85,8 @@ in stdenv.mkDerivation (finalAttrs: {
     gettext
     makeWrapper
     gtk-doc
+  ] ++ lib.optionals stdenv.isDarwin [
+    desktopToDarwinBundle
   ];
 
   buildInputs = [

From 144e1ae7d57921b9294fe9b1f54e46c127545b9f Mon Sep 17 00:00:00 2001
From: Kiskae <Kiskae@users.noreply.github.com>
Date: Tue, 25 Apr 2023 23:13:55 +0200
Subject: [PATCH 26/77] linuxPackages.nvidia_x11_production: 525.105.17 ->
 525.116.03

---
 pkgs/os-specific/linux/nvidia-x11/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix
index 20649816ae53..fd46acbd78a9 100644
--- a/pkgs/os-specific/linux/nvidia-x11/default.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/default.nix
@@ -25,12 +25,12 @@ rec {
   stable = if stdenv.hostPlatform.system == "i686-linux" then legacy_390 else latest;
 
   production = generic {
-    version = "525.105.17";
-    sha256_64bit = "sha256-xjWiGigsm1NIXxnrtkoPS1NqlouU1Nl2KeC8VHpYFCo=";
-    sha256_aarch64 = "sha256-FUbmupHNVab3sM/ShDXPM7pK+5GC2/ri1YW20Hx3vbE=";
-    openSha256 = "sha256-O3XB8tNLmNkzrYoVyJVEE0IcE772lOdr8qn4rQHIupE=";
-    settingsSha256 = "sha256-KUw31Am9Zfwk5QTs6th8+J3C4oUBacNgb7ZUNeV68W4=";
-    persistencedSha256 = "sha256-jhBtsf9MXrkU/SsBndR1ESGUHhgUWiSH7R75swk3m40=";
+    version = "525.116.03";
+    sha256_64bit = "sha256-XClbAuvsLpqewNebqSkutiO0svu6im7WGQYJKaMNBGk=";
+    sha256_aarch64 = "sha256-x4FZxtMDtlSwLvh0rCTdFp8+lCPoxdevCDA+b3I8De4=";
+    openSha256 = "sha256-AiUWHwVjXiii4hckWcFFGPyvSJfWqBlRi+lZKdfGsKM=";
+    settingsSha256 = "sha256-PgyV8YzEtLTER4ucnZuRjA2LkX1kqy+k0am0k9Ci40Q=";
+    persistencedSha256 = "sha256-Ok20+fGlTlmMyROzIPQ+V+cStsM7BTabTVORJTNZDf4=";
 
     ibtSupport = true;
   };

From 78f0c1a4f6acff39bc882cb5a217c9640e8a5d96 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 25 Apr 2023 22:40:16 +0000
Subject: [PATCH 27/77] f3d: 1.3.1 -> 2.0.0

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

diff --git a/pkgs/applications/graphics/f3d/default.nix b/pkgs/applications/graphics/f3d/default.nix
index d32662937aff..67938d9d1535 100644
--- a/pkgs/applications/graphics/f3d/default.nix
+++ b/pkgs/applications/graphics/f3d/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "f3d";
-  version = "1.3.1";
+  version = "2.0.0";
 
   src = fetchFromGitHub {
     owner = "f3d-app";
     repo = "f3d";
     rev = "v${version}";
-    hash = "sha256-dOpiX7xJWDKHqPLGvlgv7NHgfzyeZhJd898+KzAmD4Q=";
+    hash = "sha256-od8Wu8+HyQb8qTA6C4kiw5hNI2WPBs/EMt321BJDZoc=";
   };
 
   nativeBuildInputs = [ cmake ];

From 3f8fc9c28b06d6815f2cb7c4f90b91948e5d6d36 Mon Sep 17 00:00:00 2001
From: Kiskae <Kiskae@users.noreply.github.com>
Date: Wed, 26 Apr 2023 00:51:46 +0200
Subject: [PATCH 28/77] linuxPackages.nvidia_x11_legacy470: 470.161.03 ->
 470.182.03

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

diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix
index 20649816ae53..f3110fe01620 100644
--- a/pkgs/os-specific/linux/nvidia-x11/default.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/default.nix
@@ -72,21 +72,16 @@ rec {
 
   # Last one supporting Kepler architecture
   legacy_470 = generic {
-    version = "470.161.03";
-    sha256_64bit = "sha256-Xagqf4x254Hn1/C+e3mNtNNE8mvU+s+avPPHHHH+dkA=";
-    sha256_aarch64 = "sha256-Ak+j3CkQNCsclv0X23gP1fx3XPOSEyRkjyK5+GDxhn4=";
-    settingsSha256 = "sha256-ryUSiI8PsY3knkJLg0k1EmyYW5OWkhuZma/hmXNuojw=";
-    persistencedSha256 = "sha256-/2h90Gq9NQd9Q+9eLVE6vrxXmINXxlLcSNOHxKToOEE=";
+    version = "470.182.03";
+    sha256_64bit = "sha256-PbwUCPxIuGXT3azvxF9KP8E7kLg6Yo7lRrAIKrLD/Hk=";
+    sha256_aarch64 = "sha256-FEoWikgQjZKkHvAHgtkxnDhB41GdYplZTttEUBit4QQ=";
+    settingsSha256 = "sha256-TRKQ4brLnCbBZt1smGSIHTfwW+wEFPWWPEwDxjVXN7s=";
+    persistencedSha256 = "sha256-fSJMx49z9trdNxx0iPI45oG57smvvhaqVNxsRnfXKCI=";
 
     prePatch = "pushd kernel";
     postPatch = "popd";
 
     patches = [
-      # source: https://gist.github.com/joanbm/963906fc6772d8955faf1b9cc46c6b04
-      (fetchpatch {
-        url = "https://gist.github.com/joanbm/963906fc6772d8955faf1b9cc46c6b04/raw/0f99aa10d47b524aa0e6e3845664deac3a1ad9d9/nvidia-470xx-fix-linux-6.2.patch";
-        hash = "sha256-5n5/4ivK8od8EJNJf0PI9ZZ4U5RjOw+h4HakA+lmW1c=";
-      })
       # source: https://gist.github.com/joanbm/d10e9cbbbb8e245b6e7e27b2db338faf
       (fetchpatch {
         url = "https://gist.github.com/joanbm/d10e9cbbbb8e245b6e7e27b2db338faf/raw/f5d5238bdbaa16cd4008658a0f82b9dd84f1b38f/nvidia-470xx-fix-linux-6.3.patch";

From 89c1ba29baa41ec6bc96982eef0b34231256b35d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 25 Apr 2023 22:53:22 +0000
Subject: [PATCH 29/77] unciv: 4.6.4-patch2 -> 4.6.5

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

diff --git a/pkgs/games/unciv/default.nix b/pkgs/games/unciv/default.nix
index 1a827686eee6..40051485bbcf 100644
--- a/pkgs/games/unciv/default.nix
+++ b/pkgs/games/unciv/default.nix
@@ -25,11 +25,11 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "unciv";
-  version = "4.6.4-patch2";
+  version = "4.6.5";
 
   src = fetchurl {
     url = "https://github.com/yairm210/Unciv/releases/download/${version}/Unciv.jar";
-    hash = "sha256-LI0PfSQq90f4Ci4np5Z+JgfVgU2b380pSIqNIpm2UKQ=";
+    hash = "sha256-+PXRNVLGCJmxIZSwuuRA4f1v0AxxPYesxby/wEOWR8Q=";
   };
 
   dontUnpack = true;

From 1ae87aa3ea7ca72bd1451c7e313c58f21816591d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 25 Apr 2023 23:08:57 +0000
Subject: [PATCH 30/77] appgate-sdp: 6.1.2 -> 6.1.3

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

diff --git a/pkgs/applications/networking/appgate-sdp/default.nix b/pkgs/applications/networking/appgate-sdp/default.nix
index bcd0e1f88b2f..3fa423e39297 100644
--- a/pkgs/applications/networking/appgate-sdp/default.nix
+++ b/pkgs/applications/networking/appgate-sdp/default.nix
@@ -86,11 +86,11 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "appgate-sdp";
-  version = "6.1.2";
+  version = "6.1.3";
 
   src = fetchurl {
     url = "https://bin.appgate-sdp.com/${lib.versions.majorMinor version}/client/appgate-sdp_${version}_amd64.deb";
-    sha256 = "sha256-nTQDQxXWMHkHgKlr7mIlazH7kW3HJqNLrUATo4s0N1g=";
+    sha256 = "sha256-uk7+XBKtTGnX/bHBQttmxlu9+gKvFqu3VhzC7uIYCNQ=";
   };
 
   # just patch interpreter

From 50cd355baaf95bcfcfc14cc3cb719791517ec115 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 25 Apr 2023 23:52:33 +0000
Subject: [PATCH 31/77] ocenaudio: 3.11.22 -> 3.11.24

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

diff --git a/pkgs/applications/audio/ocenaudio/default.nix b/pkgs/applications/audio/ocenaudio/default.nix
index 98ecd3064a92..418db1a0a51a 100644
--- a/pkgs/applications/audio/ocenaudio/default.nix
+++ b/pkgs/applications/audio/ocenaudio/default.nix
@@ -11,11 +11,11 @@
 
 stdenv.mkDerivation rec {
   pname = "ocenaudio";
-  version = "3.11.22";
+  version = "3.11.24";
 
   src = fetchurl {
     url = "https://www.ocenaudio.com/downloads/index.php/ocenaudio_debian9_64.deb?version=${version}";
-    sha256 = "sha256-mmPFASc2ARI1ht9SYhFsDjTkWfhxXdc2zEi5rvfanZc=";
+    sha256 = "sha256-3NM2jw3XvzMxLpDQAR3LZzCJXwSnQXSDoN7IK4nr4wM=";
   };
 
   nativeBuildInputs = [

From c5f219c0b27e67b3fea9950833022936ab51e4bb Mon Sep 17 00:00:00 2001
From: Matt Carrier <icecreammatt@gmail.com>
Date: Tue, 25 Apr 2023 18:19:58 -0700
Subject: [PATCH 32/77] pocketbase: 0.13.4 -> 0.15.1

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

diff --git a/pkgs/servers/pocketbase/default.nix b/pkgs/servers/pocketbase/default.nix
index e70139b00527..e3d0b2f868c9 100644
--- a/pkgs/servers/pocketbase/default.nix
+++ b/pkgs/servers/pocketbase/default.nix
@@ -5,16 +5,16 @@
 
 buildGoModule rec {
   pname = "pocketbase";
-  version = "0.13.4";
+  version = "0.15.1";
 
   src = fetchFromGitHub {
     owner = "pocketbase";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-i07tgzyvv3wBZK2dNBDCxfgtWB3wfsKO/x+SZeDOtaw=";
+    sha256 = "sha256-SxtKAu+ZLMMoOYqKrg/tARw2GCNDbsceWjsHm0iXwbU=";
   };
 
-  vendorHash = "sha256-hvziOq5zyYwWcvqa23IzHXj/DT27MAcNVegYR38beJ4=";
+  vendorHash = "sha256-OknAntETXDJVl2i5ie1VwsbGmcbRWA+MJomaCIgdKDo=";
 
   # This is the released subpackage from upstream repo
   subPackages = [ "examples/base" ];

From 6b1c191ee72c4e938650e9f0128befb3125b165a Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Tue, 25 Apr 2023 21:41:01 -0400
Subject: [PATCH 33/77] cargo-expand: 1.0.47 -> 1.0.48

Diff: https://github.com/dtolnay/cargo-expand/compare/1.0.47...1.0.48

Changelog: https://github.com/dtolnay/cargo-expand/releases/tag/1.0.48
---
 pkgs/development/tools/rust/cargo-expand/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/rust/cargo-expand/default.nix b/pkgs/development/tools/rust/cargo-expand/default.nix
index 73a34c6e6f22..2cbf1e7f2a5f 100644
--- a/pkgs/development/tools/rust/cargo-expand/default.nix
+++ b/pkgs/development/tools/rust/cargo-expand/default.nix
@@ -5,16 +5,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-expand";
-  version = "1.0.47";
+  version = "1.0.48";
 
   src = fetchFromGitHub {
     owner = "dtolnay";
     repo = pname;
     rev = version;
-    sha256 = "sha256-zbV0m9VezBO543uUvgazjvpbVUpQlJfasCI9b2aF+oA=";
+    sha256 = "sha256-AdL14usCV4iHkrSHcNI6Jg8xeI3ZQxOABLCOCBd+Isw=";
   };
 
-  cargoHash = "sha256-TuGGDdciupk7nCq8r2hTbTPj1q638T9kGzgYMZe1O4g=";
+  cargoHash = "sha256-7sMKstWRAXFqBaEBLbetGH0l+9N4PchZ4IYshjmtxns=";
 
   meta = with lib; {
     description = "A utility and Cargo subcommand designed to let people expand macros in their Rust source code";

From d51f965f9d9cceeef6e964ab61680ea6241f9e57 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 26 Apr 2023 01:47:28 +0000
Subject: [PATCH 34/77] kubeone: 1.6.1 -> 1.6.2

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

diff --git a/pkgs/applications/networking/cluster/kubeone/default.nix b/pkgs/applications/networking/cluster/kubeone/default.nix
index d3ae29712812..88176dd599ee 100644
--- a/pkgs/applications/networking/cluster/kubeone/default.nix
+++ b/pkgs/applications/networking/cluster/kubeone/default.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "kubeone";
-  version = "1.6.1";
+  version = "1.6.2";
 
   src = fetchFromGitHub {
     owner = "kubermatic";
     repo = "kubeone";
     rev = "v${version}";
-    hash = "sha256-bFkJXnz4Nm1XfQMaBWSHfCxaTbGQQwKXRd1ktZKs7hY=";
+    hash = "sha256-dLpe3C1gMnEyajJFPawDlTchYKA8cAy2QUAae6+7QBQ=";
   };
 
-  vendorHash = "sha256-ZpTUhJyM+9e8b2EZzv4hsnV5G3HVPo6ga0pF3Ab53+A=";
+  vendorHash = "sha256-aCRrf/E4UVL6PwUPRRzLjD+MzL8gcNJrc2IgKKyIIHI=";
 
   ldflags = [
     "-s"

From a7f1ae46ac17fc2e70ae5c8ef9304adf2a461245 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 26 Apr 2023 02:04:09 +0000
Subject: [PATCH 35/77] mdbook-admonish: 1.8.0 -> 1.9.0

---
 pkgs/tools/text/mdbook-admonish/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/text/mdbook-admonish/default.nix b/pkgs/tools/text/mdbook-admonish/default.nix
index c2f45425076f..1da9b14747d0 100644
--- a/pkgs/tools/text/mdbook-admonish/default.nix
+++ b/pkgs/tools/text/mdbook-admonish/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "mdbook-admonish";
-  version = "1.8.0";
+  version = "1.9.0";
 
   src = fetchFromGitHub {
     owner = "tommilligan";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-jo5kR1fzSRQq8fvblJaK3IEHfxeN7h0ZdT6vvPBXTXM=";
+    hash = "sha256-B0WfOvt037U56G9C7vfAVP4CElodszEUj8h/UD+qv4I=";
   };
 
-  cargoHash = "sha256-N0zkdaVWas9jK9IXn9T85s18mNTjoEl8OUF2HA2CuHg=";
+  cargoHash = "sha256-EmNy7YjltUgPgAp/L/VjCVG2pu//o7Bq7v+B3vO5ipM=";
 
   buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ];
 

From 9d5baf6d682675510f29af358c026ae7b8e3cc17 Mon Sep 17 00:00:00 2001
From: rewine <lhongxu@outlook.com>
Date: Wed, 26 Apr 2023 10:47:52 +0800
Subject: [PATCH 36/77] deepin.deepin-draw: 5.11.7 -> 6.0.5

---
 pkgs/desktops/deepin/apps/deepin-draw/default.nix | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/pkgs/desktops/deepin/apps/deepin-draw/default.nix b/pkgs/desktops/deepin/apps/deepin-draw/default.nix
index 7bbe4e0a4027..c07ca9e0b880 100644
--- a/pkgs/desktops/deepin/apps/deepin-draw/default.nix
+++ b/pkgs/desktops/deepin/apps/deepin-draw/default.nix
@@ -1,7 +1,6 @@
 { stdenv
 , lib
 , fetchFromGitHub
-, fetchpatch
 , cmake
 , qttools
 , pkg-config
@@ -15,23 +14,15 @@
 
 stdenv.mkDerivation rec {
   pname = "deepin-draw";
-  version = "5.11.7";
+  version = "6.0.5";
 
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
     rev = version;
-    sha256 = "sha256-oryh1b7/78Hp3JclN9vKvfcKRg58nsfGZQvBx6VyJBs";
+    sha256 = "sha256-WeubXsshN4tUlIwEHTxHXv1L2dvJ2DZ6qtSPyiVtc98=";
   };
 
-  patches = [
-    (fetchpatch {
-      name = "chore-use-GNUInstallDirs-in-CmakeLists.patch";
-      url = "https://github.com/linuxdeepin/deepin-draw/commit/dac714fe603e1b77fc39952bfe6949852ee6c2d5.patch";
-      sha256 = "sha256-zajxmKkZJT1lcyvPv/PRPMxcstF69PB1tC50gYKDlWA=";
-    })
-  ];
-
   postPatch = ''
     substituteInPlace com.deepin.Draw.service \
       --replace "/usr/bin/deepin-draw" "$out/bin/deepin-draw"

From d606e6118b6d49f37c9cba9d57a927b8353d1d1a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 26 Apr 2023 03:29:45 +0000
Subject: [PATCH 37/77] dunst: 1.9.1 -> 1.9.2

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

diff --git a/pkgs/applications/misc/dunst/default.nix b/pkgs/applications/misc/dunst/default.nix
index 9b0c5e47dca8..858252a840f4 100644
--- a/pkgs/applications/misc/dunst/default.nix
+++ b/pkgs/applications/misc/dunst/default.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation rec {
   pname = "dunst";
-  version = "1.9.1";
+  version = "1.9.2";
 
   src = fetchFromGitHub {
     owner = "dunst-project";
     repo = "dunst";
     rev = "v${version}";
-    sha256 = "sha256-oCeC/rbI/sydcQ7Rv9feEzw2Gcl7mUde4OOv50dyUSg=";
+    sha256 = "sha256-8IH0WTPSaAundhYh4l7gQR66nyT38H4DstRTm+Xh+Z8=";
   };
 
   nativeBuildInputs = [ perl pkg-config which systemd makeWrapper ];

From 866bfbd095e8977a869fb14eaf687df5be92160c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 26 Apr 2023 03:40:35 +0000
Subject: [PATCH 38/77] python310Packages.heudiconv: 0.8.0 -> 0.12.2

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

diff --git a/pkgs/development/python-modules/heudiconv/default.nix b/pkgs/development/python-modules/heudiconv/default.nix
index 8a860daeb253..f1a867984f47 100644
--- a/pkgs/development/python-modules/heudiconv/default.nix
+++ b/pkgs/development/python-modules/heudiconv/default.nix
@@ -14,7 +14,7 @@
 }:
 
 buildPythonPackage rec {
-  version = "0.8.0";
+  version = "0.12.2";
   pname = "heudiconv";
 
   disabled = isPy27;
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     inherit pname version;
     #sha256 = "0gzqqa4pzhywdbvks2qjniwhr89sgipl5k7h9hcjs7cagmy9gb05";
-    sha256 = "1r6y93125mc84c09970ifps5xysp8ffp62rwlzili3q2k1m3fh4v";
+    sha256 = "sha256-cYr74mw7tXRJRr8rXlu1UMZuU3YXXfDzhuc+vaa+7PQ=";
   };
 
   postPatch = ''

From e196ca505d28035227fb69b2d955a1b3d4333373 Mon Sep 17 00:00:00 2001
From: Ben Darwin <bcdarwin@gmail.com>
Date: Tue, 25 Apr 2023 23:55:03 -0400
Subject: [PATCH 39/77] gdcm: unpin vtk

---
 pkgs/development/libraries/gdcm/default.nix | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/gdcm/default.nix b/pkgs/development/libraries/gdcm/default.nix
index d21fd2501960..3cf934843010 100644
--- a/pkgs/development/libraries/gdcm/default.nix
+++ b/pkgs/development/libraries/gdcm/default.nix
@@ -3,7 +3,7 @@
 , fetchFromGitHub
 , cmake
 , enableVTK ? true
-, vtk_8
+, vtk
 , ApplicationServices
 , Cocoa
 , enablePython ? false
@@ -18,13 +18,17 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "malaterre";
     repo = "GDCM";
-    rev = "v${version}";
-    sha256 = "sha256-BmUJCqCGt+BvVpLG4bzCH4lsqmhWHU0gbOIU2CCIMGU=";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-BmUJCqCGt+BvVpLG4bzCH4lsqmhWHU0gbOIU2CCIMGU=";
   };
 
   cmakeFlags = [
     "-DGDCM_BUILD_APPLICATIONS=ON"
     "-DGDCM_BUILD_SHARED_LIBS=ON"
+    # hack around usual "`RUNTIME_DESTINATION` must not be an absolute path" issue:
+    "-DCMAKE_INSTALL_LIBDIR=lib"
+    "-DCMAKE_INSTALL_BINDIR=bin"
+    "-DCMAKE_INSTALL_INCLUDEDIR=include"
   ] ++ lib.optionals enableVTK [
     "-DGDCM_USE_VTK=ON"
   ] ++ lib.optionals enablePython [
@@ -35,7 +39,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake ];
 
   buildInputs = lib.optionals enableVTK [
-    vtk_8
+    vtk
   ] ++ lib.optionals stdenv.isDarwin [
     ApplicationServices
     Cocoa

From 27ae052ce0871efbe6bb0b2d5c60cde313a96ff7 Mon Sep 17 00:00:00 2001
From: hacker1024 <hacker1024@users.sourceforge.net>
Date: Wed, 26 Apr 2023 14:21:25 +1000
Subject: [PATCH 40/77] dart: 2.19.3 -> 2.19.6

---
 pkgs/development/compilers/dart/sources.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/compilers/dart/sources.nix b/pkgs/development/compilers/dart/sources.nix
index 40e25d358477..bc931e65f4da 100644
--- a/pkgs/development/compilers/dart/sources.nix
+++ b/pkgs/development/compilers/dart/sources.nix
@@ -1,24 +1,24 @@
-let version = "2.19.3"; in
-{  fetchurl }: {
+let version = "2.19.6"; in
+{ fetchurl }: {
   versionUsed = version;
   "${version}-x86_64-darwin" = fetchurl {
     url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-macos-x64-release.zip";
-    sha256 = "193hf56j7bws8bzqxxzz2sgbn2d80g5s8vp8ihi22cm3mmppfi4v";
+    sha256 = "1nlmzappjk1f85iajlvqkvkqfd8ka7svsmglbh57ivvssvb6d6lr";
   };
   "${version}-aarch64-darwin" = fetchurl {
     url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-macos-arm64-release.zip";
-    sha256 = "0b30l8kfcsl1j6w2vbq08p0v4h4gca013l5fpznjqq0midxhybnw";
+    sha256 = "1dpd8czllsxqly7hrcazp8g9b5zj6ibs93l5qyykijjbyjv58srw";
   };
   "${version}-aarch64-linux" = fetchurl {
     url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-linux-arm64-release.zip";
-    sha256 = "0qyi7ppsf4rmzx1qgx3qbn4k7bgbncxjql6a9f2b1aj6l6lllvmg";
+    sha256 = "170bzz4505fffz4lbaxif9ryaw8pl8ylgkbjsd0w32xpng0bf4v9";
   };
   "${version}-x86_64-linux" = fetchurl {
     url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-linux-x64-release.zip";
-    sha256 = "0iq7mdwpsnykk3j2bsgmazg30m4qg7i2lpv1ygbhy2lbhrkdpdck";
+    sha256 = "0kvhvwd2q8s7mnjgvhl6gr3y73agcd0y79sm844xd8ybd9gg5pqg";
   };
   "${version}-i686-linux" = fetchurl {
     url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-linux-ia32-release.zip";
-    sha256 = "0xksis14ff6bzjvycgxgldg96n88rh42adjyrrhcay2s183vh480";
+    sha256 = "02iyzdz9grm3rc2dg7l1clww6n5n4kncv0gg6mlkgvmhk4hn9w1r";
   };
 }

From bab60a1cf4feb455c20c7b77970cd8ae5e52d2a0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 26 Apr 2023 04:29:06 +0000
Subject: [PATCH 41/77] datovka: 4.22.0 -> 4.22.1

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

diff --git a/pkgs/applications/networking/datovka/default.nix b/pkgs/applications/networking/datovka/default.nix
index 9aaf19d75e93..f86fd87573b3 100644
--- a/pkgs/applications/networking/datovka/default.nix
+++ b/pkgs/applications/networking/datovka/default.nix
@@ -12,11 +12,11 @@
 
 mkDerivation rec {
   pname = "datovka";
-  version = "4.22.0";
+  version = "4.22.1";
 
   src = fetchurl {
     url = "https://gitlab.nic.cz/datovka/datovka/-/archive/v${version}/datovka-v${version}.tar.gz";
-    sha256 = "sha256-MM2fTONdgvCOrVlMlBgpaoaZLbuSMVG/ENOx2egug98=";
+    sha256 = "sha256-R18dBsfrMBcBB3EraC0tIJABwZBROFqi/fhm62IDa2g=";
   };
 
   buildInputs = [ libdatovka qmake qtbase qtsvg libxml2 qtwebsockets ];

From ca2df7c70e8eec2aa512d5696226ec90347f61c6 Mon Sep 17 00:00:00 2001
From: Ben Darwin <bcdarwin@gmail.com>
Date: Wed, 26 Apr 2023 01:08:48 -0400
Subject: [PATCH 42/77] freecad: unpin vtk

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

diff --git a/pkgs/applications/graphics/freecad/default.nix b/pkgs/applications/graphics/freecad/default.nix
index ce15b42576b3..29f8746b38d9 100644
--- a/pkgs/applications/graphics/freecad/default.nix
+++ b/pkgs/applications/graphics/freecad/default.nix
@@ -39,7 +39,7 @@
 , soqt
 , spaceNavSupport ? stdenv.isLinux
 , swig
-, vtk_8
+, vtk
 , wrapQtAppsHook
 , wrapGAppsHook
 , xercesc
@@ -97,7 +97,7 @@ mkDerivation rec {
     shiboken2
     soqt
     swig
-    vtk_8
+    vtk
     xercesc
     zlib
   ] ++ lib.optionals spaceNavSupport [

From 6d9a7bc741e815b2f8e169c7d2247649aebaeaaa Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 26 Apr 2023 05:18:09 +0000
Subject: [PATCH 43/77] ssh-to-age: 1.1.2 -> 1.1.3

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

diff --git a/pkgs/tools/security/ssh-to-age/default.nix b/pkgs/tools/security/ssh-to-age/default.nix
index 71e5a2602b5b..ec69085db959 100644
--- a/pkgs/tools/security/ssh-to-age/default.nix
+++ b/pkgs/tools/security/ssh-to-age/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "ssh-to-age";
-  version = "1.1.2";
+  version = "1.1.3";
 
   src = fetchFromGitHub {
     owner = "Mic92";
     repo = "ssh-to-age";
     rev = version;
-    sha256 = "sha256-48j8NXKUepYDMnr/d9fGH+ISPPLN5zsvwt5XHJN6MCc=";
+    sha256 = "sha256-1YCo1Jm52S7hdJQFt/+OkdpWdvWP8eBsThZk5Gi4JiE=";
   };
 
-  vendorHash = "sha256-qtjjrvvRVcrJIM+EPWTd6xFgIbKvEqkiT3vjXakoQp0=";
+  vendorHash = "sha256-L6mjCKMabnLRmiT8jcNCPEsTceYxRBHxhE0CpOvu3Sk=";
 
   checkPhase = ''
     runHook preCheck

From c03083646af7ddff60774b9bd9fc49991e014d81 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 26 Apr 2023 05:36:48 +0000
Subject: [PATCH 44/77] typos: 1.13.18 -> 1.14.8

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

diff --git a/pkgs/development/tools/typos/default.nix b/pkgs/development/tools/typos/default.nix
index 7a0057ce1cde..10fbb535b9d6 100644
--- a/pkgs/development/tools/typos/default.nix
+++ b/pkgs/development/tools/typos/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "typos";
-  version = "1.13.18";
+  version = "1.14.8";
 
   src = fetchFromGitHub {
     owner = "crate-ci";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-J7K7fqtHNQYk6JlcHhcyojHQlIyaQVlAsDnfJUX1Ess=";
+    hash = "sha256-x7Pcg2zgu2s+oLkOJj+Eo/Gs48BJO6+JATckMqaeaj4=";
   };
 
-  cargoHash = "sha256-a6ENeLG/t8Nb8oTNkcIWlquav4wJ0a3CqDEMQwTiuMM=";
+  cargoHash = "sha256-4se9/lcVWAWhbi0i3FDGQraK5KhPZ6ongc2wmJV4gI0=";
 
   meta = with lib; {
     description = "Source code spell checker";

From d8250439c7c80ae58ce4cb8c4e7027cdbafdf058 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 26 Apr 2023 05:51:06 +0000
Subject: [PATCH 45/77] wakatime: 1.70.1 -> 1.73.0

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

diff --git a/pkgs/tools/misc/wakatime/default.nix b/pkgs/tools/misc/wakatime/default.nix
index d2274d908956..bf0e9657296b 100644
--- a/pkgs/tools/misc/wakatime/default.nix
+++ b/pkgs/tools/misc/wakatime/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "wakatime";
-  version = "1.70.1";
+  version = "1.73.0";
 
   src = fetchFromGitHub {
     owner = "wakatime";
     repo = "wakatime-cli";
     rev = "v${version}";
-    hash = "sha256-PZIO8ULvSdsOeRLGPrsRyoql8Z4Xq7z4q/AErw239BI=";
+    hash = "sha256-EUZgYRsQRqtp0yiqNYex+ILSZwGEdO4BhciEgUVdui4=";
   };
 
   vendorHash = "sha256-SlYYrlRDBvhNm2BxemK9HzzsqM/RGH/sDQXpoGEY8rw=";

From bc9a2f67a26d13a3e6c6b340321ac3e27b516225 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 26 Apr 2023 08:29:00 +0200
Subject: [PATCH 46/77] python310Packages.archinfo: 9.2.47 -> 9.2.48

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

diff --git a/pkgs/development/python-modules/archinfo/default.nix b/pkgs/development/python-modules/archinfo/default.nix
index 4298b1461784..e4f04001eaf1 100644
--- a/pkgs/development/python-modules/archinfo/default.nix
+++ b/pkgs/development/python-modules/archinfo/default.nix
@@ -8,7 +8,7 @@
 
 buildPythonPackage rec {
   pname = "archinfo";
-  version = "9.2.47";
+  version = "9.2.48";
   format = "pyproject";
 
   disabled = pythonOlder "3.8";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
     owner = "angr";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-dZ4dbPgAsaSq2CChQ/Bh8nx1wY51kbJVblo1Aw4kOT4=";
+    hash = "sha256-WQkIw/tuT/KwRBVQ2+u2NXioAzisV0hCvTN8tfN+lRY=";
   };
 
   nativeBuildInputs = [

From 570e5e3e2334decc74fde36f722e7458912cbc98 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 26 Apr 2023 08:29:05 +0200
Subject: [PATCH 47/77] python310Packages.ailment: 9.2.47 -> 9.2.48

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

diff --git a/pkgs/development/python-modules/ailment/default.nix b/pkgs/development/python-modules/ailment/default.nix
index bde7a89de507..ebf49d811828 100644
--- a/pkgs/development/python-modules/ailment/default.nix
+++ b/pkgs/development/python-modules/ailment/default.nix
@@ -8,7 +8,7 @@
 
 buildPythonPackage rec {
   pname = "ailment";
-  version = "9.2.47";
+  version = "9.2.48";
   format = "pyproject";
 
   disabled = pythonOlder "3.8";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
     owner = "angr";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-11lvarj2l/cPiGI+Ro88NuHa2CBJYI7S95H3sSv1ln8=";
+    hash = "sha256-abUxA2ndkOlLMWdPspKKTgWGuoGYyypAq43MrgaW+AY=";
   };
 
   nativeBuildInputs = [

From a21211f002192541acce8bc645ff8c57fb6374d4 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 26 Apr 2023 08:29:11 +0200
Subject: [PATCH 48/77] python310Packages.pyvex: 9.2.47 -> 9.2.48

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

diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix
index 96c27a9b2218..40b22ec60322 100644
--- a/pkgs/development/python-modules/pyvex/default.nix
+++ b/pkgs/development/python-modules/pyvex/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "pyvex";
-  version = "9.2.47";
+  version = "9.2.48";
   format = "pyproject";
 
   disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-X6PV54jP5gSo0kYy9QbJYv2fPdbJEB9D0TwQ55wJNLs=";
+    hash = "sha256-kdvmybMPtmCAHyXMzgRXdAPns5jN8N6IDGZ5f4rx7do=";
   };
 
   nativeBuildInputs = [

From 3cf2c43b727f57a697ea7e4834d3d80fa3a093f3 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 26 Apr 2023 08:29:15 +0200
Subject: [PATCH 49/77] python310Packages.claripy: 9.2.47 -> 9.2.48

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

diff --git a/pkgs/development/python-modules/claripy/default.nix b/pkgs/development/python-modules/claripy/default.nix
index 9c0da9560ec3..782ba9d35346 100644
--- a/pkgs/development/python-modules/claripy/default.nix
+++ b/pkgs/development/python-modules/claripy/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "claripy";
-  version = "9.2.47";
+  version = "9.2.48";
   format = "pyproject";
 
   disabled = pythonOlder "3.8";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     owner = "angr";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-YleXykwajlGaqcNRrUYK8ttmzOYdVBpjjBi8aGMK75M=";
+    hash = "sha256-rkeshqKlsYA16TyXb4iRTnoTJwoB2kQJcdH/cBrgJng=";
   };
 
   nativeBuildInputs = [

From c464ef167df191923560d62bffb63dfe4b742f29 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 26 Apr 2023 08:29:19 +0200
Subject: [PATCH 50/77] python310Packages.cle: 9.2.47 -> 9.2.48

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

diff --git a/pkgs/development/python-modules/cle/default.nix b/pkgs/development/python-modules/cle/default.nix
index 21f068ee1542..cbeba8ee3912 100644
--- a/pkgs/development/python-modules/cle/default.nix
+++ b/pkgs/development/python-modules/cle/default.nix
@@ -16,7 +16,7 @@
 
 let
   # The binaries are following the argr projects release cycle
-  version = "9.2.47";
+  version = "9.2.48";
 
   # Binary files from https://github.com/angr/binaries (only used for testing and only here)
   binaries = fetchFromGitHub {
@@ -38,7 +38,7 @@ buildPythonPackage rec {
     owner = "angr";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-NwAKmmx9f+2Xxw9+/NI5khDTlAPJPcKtYRyK0khYNJE=";
+    hash = "sha256-D5qIuu8pqnkroU3ChmhseVitLrUJjwXr01MG7ing2Zk=";
   };
 
   nativeBuildInputs = [

From a1ed8e8e5527c7a89d1a137ffb2d3f7af1bc502f Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 26 Apr 2023 08:29:26 +0200
Subject: [PATCH 51/77] python310Packages.angr: 9.2.47 -> 9.2.48

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

diff --git a/pkgs/development/python-modules/angr/default.nix b/pkgs/development/python-modules/angr/default.nix
index 3cb241b8a63a..339605126715 100644
--- a/pkgs/development/python-modules/angr/default.nix
+++ b/pkgs/development/python-modules/angr/default.nix
@@ -32,7 +32,7 @@
 
 buildPythonPackage rec {
   pname = "angr";
-  version = "9.2.47";
+  version = "9.2.48";
   format = "pyproject";
 
   disabled = pythonOlder "3.8";
@@ -41,7 +41,7 @@ buildPythonPackage rec {
     owner = pname;
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-fMFhNiYFAC2SW6jdB8RuMngIH/Dc8hznOyd7H9baUkE=";
+    hash = "sha256-KHeLi4b54gvWcCsbdIbJ2n1sRcowio7ng4eEqkGacTU=";
   };
 
   propagatedBuildInputs = [

From 37423561504776d861bb6cf613f266aec979806b Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 26 Apr 2023 08:30:06 +0200
Subject: [PATCH 52/77] python311Packages.identify: 2.5.22 -> 2.5.23

Diff: https://github.com/pre-commit/identify/compare/v2.5.22...v2.5.23
---
 pkgs/development/python-modules/identify/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/identify/default.nix b/pkgs/development/python-modules/identify/default.nix
index 8ae60add6460..ee7263a131d9 100644
--- a/pkgs/development/python-modules/identify/default.nix
+++ b/pkgs/development/python-modules/identify/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "identify";
-  version = "2.5.22";
+  version = "2.5.23";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     owner = "pre-commit";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-SSbphjcfgexVveXp2BfAiGzehb2tSBcsMEse5uSh9Xo=";
+    hash = "sha256-li38yO/34V+fjKUF+UgWct5u0RlIswD1ETGEkowRre4=";
   };
 
   nativeCheckInputs = [

From b4f893b9a190bd2aa901224f3e3b7fa51d7a45f3 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 26 Apr 2023 08:31:10 +0200
Subject: [PATCH 53/77] python311Packages.ge25519: 1.3.0 -> 1.4.0

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

diff --git a/pkgs/development/python-modules/ge25519/default.nix b/pkgs/development/python-modules/ge25519/default.nix
index 1850f49a66a9..19590d94a8bd 100644
--- a/pkgs/development/python-modules/ge25519/default.nix
+++ b/pkgs/development/python-modules/ge25519/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "ge25519";
-  version = "1.3.0";
+  version = "1.4.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-y9Nv59pLWk1kRjZG3EmalT34Mjx7RLZ4WkvJlRrK5LI=";
+    hash = "sha256-QDVhvOyTRwOgB9rCpLTpM4floLKa43hAxS2L0h4+HTU=";
   };
 
   nativeBuildInputs = [

From c9e32fdb23f4c62b57917d9bb7792d3854ca8135 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 26 Apr 2023 08:31:32 +0200
Subject: [PATCH 54/77] python311Packages.fe25519: 1.3.0 -> 1.4.0

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

diff --git a/pkgs/development/python-modules/fe25519/default.nix b/pkgs/development/python-modules/fe25519/default.nix
index e85b23a4a959..10a7460b29ca 100644
--- a/pkgs/development/python-modules/fe25519/default.nix
+++ b/pkgs/development/python-modules/fe25519/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "fe25519";
-  version = "1.3.0";
+  version = "1.4.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-/grXAiWERDeTCWgFnNC1Ok8D5I9MBlwd1501TW0yK5c=";
+    hash = "sha256-KWHYlHWNG/ATZP8WJ7e2M8ubQbQoT2ritWqSrl+92h0=";
   };
 
   nativeBuildInputs = [

From 1f799b8fa48dd733809723fe37a94100c5c85826 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 26 Apr 2023 08:34:29 +0200
Subject: [PATCH 55/77] python311Packages.yalexs-ble: 2.1.14 -> 2.1.16

Diff: https://github.com/bdraco/yalexs-ble/compare/refs/tags/v2.1.14...v2.1.16

Changelog: https://github.com/bdraco/yalexs-ble/blob/v2.1.16/CHANGELOG.md
---
 pkgs/development/python-modules/yalexs-ble/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/yalexs-ble/default.nix b/pkgs/development/python-modules/yalexs-ble/default.nix
index cc881824cca3..acdfbe4fc973 100644
--- a/pkgs/development/python-modules/yalexs-ble/default.nix
+++ b/pkgs/development/python-modules/yalexs-ble/default.nix
@@ -5,6 +5,7 @@
 , buildPythonPackage
 , cryptography
 , fetchFromGitHub
+, lru-dict
 , poetry-core
 , pytest-asyncio
 , pytestCheckHook
@@ -13,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "yalexs-ble";
-  version = "2.1.14";
+  version = "2.1.16";
   format = "pyproject";
 
   disabled = pythonOlder "3.9";
@@ -22,7 +23,7 @@ buildPythonPackage rec {
     owner = "bdraco";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-aTtcp6u+/fPHRB/FShdzfCv5haja+Vyo/WLm7GLvadw=";
+    hash = "sha256-dA0g5HAvbnN1t2D+JTfphxZUEbUT7NBLY6oCKFNf5E8=";
   };
 
   nativeBuildInputs = [
@@ -34,6 +35,7 @@ buildPythonPackage rec {
     bleak
     bleak-retry-connector
     cryptography
+    lru-dict
   ];
 
   nativeCheckInputs = [

From d2831ca5dacaae4bcc0f3df06dd59a1bf78238b0 Mon Sep 17 00:00:00 2001
From: Henner Zeller <h.zeller@acm.org>
Date: Sat, 15 Apr 2023 19:14:40 -0700
Subject: [PATCH 56/77] uhdm: 1.45 -> 1.57

Also no vendored dependencies anymore, capnproto is now directly
used from nix, no third_party/ submodules are needed anymore.
---
 .../science/logic/uhdm/default.nix            | 33 +++++--------------
 1 file changed, 8 insertions(+), 25 deletions(-)

diff --git a/pkgs/applications/science/logic/uhdm/default.nix b/pkgs/applications/science/logic/uhdm/default.nix
index a87b6fbf35fa..2a667a8ac9d4 100644
--- a/pkgs/applications/science/logic/uhdm/default.nix
+++ b/pkgs/applications/science/logic/uhdm/default.nix
@@ -3,56 +3,39 @@
 , fetchFromGitHub
 , cmake
 , python3
+, capnproto
 , gtest
-, fetchpatch
 }:
 
 stdenv.mkDerivation rec {
   pname = "UHDM";
-  version = "1.45";
+  version = "1.57";
 
   src = fetchFromGitHub {
     owner = "chipsalliance";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-mxQRmI8yUUrSUYa4kUT9URgfqYvuz3V9e1IGjtiHyhc=";
-    fetchSubmodules = true;
+    hash = "sha256-z3vURlKXCW5W2naVwJjBXcn94u80JsBxlUOIy9ylsJw=";
   };
 
-  # Add ability to use local googletest provided from nix instead of
-  # the version from the submodule in third_party/. The third_party/ version
-  # is slightly older and does not work with our hydra Darwin builds that needs
-  # to set a particular temp directory.
-  # This patch allows to choose UHDM_USE_HOST_GTEST=On in the cflags.
-  patches = [
-    (fetchpatch {
-      url = "https://github.com/chipsalliance/UHDM/commit/ad60fdb65a7c49fdc8ee3fffdca791f9364af4f5.patch";
-      sha256 = "sha256-IkwnepWWmBychJ0mu+kaddUEc9jkldIRq+GyJkhrO8A=";
-      name = "allow-local-gtest.patch";
-    })
-  ];
-
   nativeBuildInputs = [
     cmake
-  ];
-
-  buildInputs = [
     (python3.withPackages (p: with p; [ orderedmultidict ]))
     gtest
   ];
 
+  buildInputs = [
+    capnproto
+  ];
+
   cmakeFlags = [
     "-DUHDM_USE_HOST_GTEST=On"
+    "-DUHDM_USE_HOST_CAPNP=On"
   ];
 
   doCheck = true;
   checkPhase = "make test";
 
-  postInstall = ''
-    mv $out/lib/uhdm/* $out/lib/
-    rm -rf $out/lib/uhdm
-  '';
-
   meta = {
     description = "Universal Hardware Data Model";
     homepage = "https://github.com/chipsalliance/UHDM";

From e3032b1d788cc798127cd265acff5333090b1374 Mon Sep 17 00:00:00 2001
From: Henner Zeller <h.zeller@acm.org>
Date: Sat, 15 Apr 2023 19:17:42 -0700
Subject: [PATCH 57/77] surelog: 1.45 -> 1.57

Also, no vendored dependencies anymore, so we can fetch git
without submodules and use the libraries provided from
nix (flatbuffers, uhdm, gtest, antlr).
---
 .../science/logic/surelog/default.nix         | 37 ++++++++-----------
 1 file changed, 16 insertions(+), 21 deletions(-)

diff --git a/pkgs/applications/science/logic/surelog/default.nix b/pkgs/applications/science/logic/surelog/default.nix
index 00a5b13598ce..3b88ff3403e2 100644
--- a/pkgs/applications/science/logic/surelog/default.nix
+++ b/pkgs/applications/science/logic/surelog/default.nix
@@ -7,33 +7,24 @@
 , libuuid
 , openjdk
 , gperftools
+, gtest
+, uhdm
+, antlr4
 , flatbuffers
-, fetchpatch
+, capnproto
 }:
 
 stdenv.mkDerivation rec {
   pname = "surelog";
-  version = "1.45";
+  version = "1.57";
 
   src = fetchFromGitHub {
     owner = "chipsalliance";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-/SSKcEIhmWDOKN4v3djWTwZ5/nQvR8ibflzSVFDt/rM=";
-    fetchSubmodules = true;
+    hash = "sha256-Gty0OSNG5Nonyw7v2KiKP51LhiugMY7uqI6aJ6as0SQ=";
   };
 
-  # This prevents race conditions in unit tests that surface since we run
-  # ctest in parallel.
-  # This patch can be removed with the next version of surelog
-  patches = [
-    (fetchpatch {
-      url = "https://github.com/chipsalliance/Surelog/commit/9a54efbd156becf65311a4272104810f36041fa6.patch";
-      sha256 = "sha256-rU1Z/0wlVTgnPLqTN/87n+gI1iJ+6k/+sunVVd0ulhQ=";
-      name = "parallel-test-running.patch";
-    })
-  ];
-
   nativeBuildInputs = [
     cmake
     pkg-config
@@ -42,16 +33,25 @@ stdenv.mkDerivation rec {
       psutil
       orderedmultidict
     ]))
+    gtest
+    antlr4
   ];
 
   buildInputs = [
     libuuid
     gperftools
     flatbuffers
+    uhdm
+    capnproto
+    antlr4.runtime.cpp
   ];
 
   cmakeFlags = [
     "-DSURELOG_USE_HOST_FLATBUFFERS=On"
+    "-DSURELOG_USE_HOST_UHDM=On"
+    "-DSURELOG_USE_HOST_GTEST=On"
+    "-DSURELOG_USE_HOST_ANTLR=On"
+    "-DANTLR_JAR_LOCATION=${antlr4.jarLocation}"
   ];
 
   doCheck = true;
@@ -62,16 +62,11 @@ stdenv.mkDerivation rec {
     runHook postCheck
   '';
 
-  postInstall = ''
-    mv $out/lib/surelog/* $out/lib/
-    mv $out/lib/pkg $out/lib/surelog/
-  '';
-
   meta = {
     description = "SystemVerilog 2017 Pre-processor, Parser, Elaborator, UHDM Compiler";
     homepage = "https://github.com/chipsalliance/Surelog";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ matthuszagh ];
-    platforms = lib.platforms.linux;
+    platforms = lib.platforms.all;
   };
 }

From 123b92da6c94e3a63758d1aecf5f6fc5996d150a Mon Sep 17 00:00:00 2001
From: Henner Zeller <h.zeller@acm.org>
Date: Sat, 15 Apr 2023 19:21:55 -0700
Subject: [PATCH 58/77] yosys-symbiflow: 2023.02.08 -> 1.20230425

The plugin now has a tagged version that is based on the date.
Previously, we had to use a random commit and manually choose the
relevant date. Now, we use the official tag as a version here
and to fetch from git.

While at it: fix the tests - somewhere over the course of the
lasts year, the tests stopped being run. Fixed now.
---
 .../yosys/plugins/symbiflow-pmgen.patch       | 15 ------
 .../compilers/yosys/plugins/symbiflow.nix     | 49 ++++++++++---------
 2 files changed, 27 insertions(+), 37 deletions(-)
 delete mode 100644 pkgs/development/compilers/yosys/plugins/symbiflow-pmgen.patch

diff --git a/pkgs/development/compilers/yosys/plugins/symbiflow-pmgen.patch b/pkgs/development/compilers/yosys/plugins/symbiflow-pmgen.patch
deleted file mode 100644
index 8af0f86a89b4..000000000000
--- a/pkgs/development/compilers/yosys/plugins/symbiflow-pmgen.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/yql-qlf-plugin/Makefile b/ql-qlf-plugin/Makefile
-index 2819055c9fe..0e391581012 100644
---- a/ql-qlf-plugin/Makefile
-+++ b/ql-qlf-plugin/Makefile
-@@ -55,10 +55,6 @@ VERILOG_MODULES = $(COMMON)/cells_sim.v         \
-                   $(PP3_DIR)/mult_sim.v        \
-                   $(PP3_DIR)/qlal3_sim.v       \
-
--retrieve-pmgen:=$(shell mkdir -p pmgen && wget -nc -O pmgen/pmgen.py https://raw.githubusercontent.com/SymbiFlow/yosys/master%2Bwip/passes/pmgen/pmgen.py)
--
--pre-build:=$(shell python3 pmgen/pmgen.py -o pmgen/ql-dsp-pm.h -p ql_dsp ql_dsp.pmg)
--
- install_modules: $(VERILOG_MODULES)
- 	$(foreach f,$^,install -D $(f) $(DATA_DIR)/quicklogic/$(f);)
-
diff --git a/pkgs/development/compilers/yosys/plugins/symbiflow.nix b/pkgs/development/compilers/yosys/plugins/symbiflow.nix
index 1ff817a82969..f383efbd44e8 100644
--- a/pkgs/development/compilers/yosys/plugins/symbiflow.nix
+++ b/pkgs/development/compilers/yosys/plugins/symbiflow.nix
@@ -8,18 +8,21 @@
 , zlib
 , yosys-symbiflow
 , uhdm
+, capnproto
 , surelog
+, antlr4
 , flatbuffers
+, pkg-config
 }: let
 
-  src = fetchFromGitHub {
-    owner  = "chipsalliance";
-    repo   = "yosys-f4pga-plugins";
-    rev    = "08430ec4f53d1cf9d6a2091211d6c5ce501d5486";
-    hash   = "sha256-xCFi8OrNfsKt7bVSYJ/yuBify/pyCU1rI16gaCBgil8=";
-  };
+  version = "1.20230425";
 
-  version = "2023.02.08";
+  src = fetchFromGitHub {
+    owner = "chipsalliance";
+    repo  = "yosys-f4pga-plugins";
+    rev   = "v${version}";
+    hash  = "sha256-KNkmhvpKTby85P88+DqCOOGxIKpzbw5KF9ymqy40pfw=";
+  };
 
   # Supported symbiflow plugins.
   #
@@ -38,7 +41,7 @@
     "systemverilog"
   ];
 
-  static_gtest = gtest.dev.overrideAttrs (old: {
+  static_gtest = gtest.overrideAttrs (old: {
     dontDisableStatic = true;
     disableHardening = [ "pie" ];
     cmakeFlags = old.cmakeFlags ++ ["-DBUILD_SHARED_LIBS=OFF"];
@@ -49,23 +52,26 @@ in lib.genAttrs plugins (plugin: stdenv.mkDerivation (rec {
   inherit src version plugin;
   enableParallelBuilding = true;
 
-  nativeBuildInputs = [ python3 ];
-  buildInputs = [ yosys readline zlib uhdm surelog ];
+  nativeBuildInputs = [ python3 pkg-config ];
+  buildInputs = [
+    yosys
+    readline
+    zlib
+    uhdm
+    surelog
+    capnproto
+    antlr4.runtime.cpp
+  ];
 
   # xdc has an incorrect path to a test which has yet to be patched
   doCheck = plugin != "xdc";
   nativeCheckInputs = [ static_gtest ];
 
-  # ql-qlf tries to fetch a yosys script from github
-  # Run the script in preBuild instead.
-  patches = lib.optional ( plugin == "ql-qlf" ) ./symbiflow-pmgen.patch;
-
+  # A Makefile rule tries to wget-fetch a yosys script from github.
+  # Link the script from our yosys sources in preBuild instead, so that
+  # the Makefile rule is a no-op.
   preBuild = ''
-    export LDFLAGS="-L${flatbuffers}/lib"
-    mkdir -p ql-qlf-plugin/pmgen
-  ''
-  + lib.optionalString ( plugin == "ql-qlf" ) ''
-    python3 ${yosys.src}/passes/pmgen/pmgen.py -o ql-qlf-plugin/pmgen/ql-dsp-pm.h -p ql_dsp ql-qlf-plugin/ql_dsp.pmg
+    ln -s ${yosys.src}/passes/pmgen/pmgen.py pmgen.py
   '';
 
   # Providing a symlink avoids the need for patching the test makefile
@@ -83,10 +89,9 @@ in lib.genAttrs plugins (plugin: stdenv.mkDerivation (rec {
     "YOSYS_DATA_DIR=\${out}/share/yosys/"
   ];
 
+  checkTarget = "test";
   checkFlags = [
-    "YOSYS_PLUGINS_DIR=\${NIX_BUILD_TOP}/source/${plugin}-plugin"
-    "YOSYS_DATA_DIR=\${NIX_BUILD_TOP}/source/${plugin}-plugin"
-    ( "NIX_YOSYS_PLUGIN_DIRS=\${NIX_BUILD_TOP}/source/${plugin}-plugin"
+    ( "NIX_YOSYS_PLUGIN_DIRS=\${NIX_BUILD_TOP}/source/${plugin}-plugin/build"
       # sdc and xdc plugins use design introspection for their tests
       + (lib.optionalString ( plugin == "sdc" || plugin == "xdc" )
         ":${yosys-symbiflow.design_introspection}/share/yosys/plugins/")

From 28c6334afbeadb9fc8099ca3c647a5e438e4611d Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Wed, 26 Apr 2023 10:07:20 +0300
Subject: [PATCH 59/77] gdcm: fix build on darwin

---
 pkgs/development/libraries/gdcm/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/libraries/gdcm/default.nix b/pkgs/development/libraries/gdcm/default.nix
index 3cf934843010..c01910e3f39f 100644
--- a/pkgs/development/libraries/gdcm/default.nix
+++ b/pkgs/development/libraries/gdcm/default.nix
@@ -6,6 +6,7 @@
 , vtk
 , ApplicationServices
 , Cocoa
+, libiconv
 , enablePython ? false
 , python ? null
 , swig
@@ -43,6 +44,7 @@ stdenv.mkDerivation rec {
   ] ++ lib.optionals stdenv.isDarwin [
     ApplicationServices
     Cocoa
+    libiconv
   ] ++ lib.optionals enablePython [ swig python ];
 
   meta = with lib; {
@@ -54,5 +56,6 @@ stdenv.mkDerivation rec {
     homepage = "https://gdcm.sourceforge.net/";
     license = with licenses; [ bsd3 asl20 ];
     maintainers = with maintainers; [ tfmoraes ];
+    platforms = platforms.all;
   };
 }

From 9ba06bcddb2bace9b9a205500352607984ca8f4c Mon Sep 17 00:00:00 2001
From: Kevin Rauscher <kevin.rauscher@tomahna.fr>
Date: Wed, 26 Apr 2023 09:30:18 +0200
Subject: [PATCH 60/77] metals: 0.11.11 -> 0.11.12

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

diff --git a/pkgs/development/tools/language-servers/metals/default.nix b/pkgs/development/tools/language-servers/metals/default.nix
index e0ce822583d9..f0c1e92fe0ec 100644
--- a/pkgs/development/tools/language-servers/metals/default.nix
+++ b/pkgs/development/tools/language-servers/metals/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   pname = "metals";
-  version = "0.11.11";
+  version = "0.11.12";
 
   deps = stdenv.mkDerivation {
     name = "${pname}-deps-${version}";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     '';
     outputHashMode = "recursive";
     outputHashAlgo = "sha256";
-    outputHash = "sha256-oz4lrRnpVzc9kN+iJv+mtV/S1wdMKwJBkKpvmWCSwE0=";
+    outputHash = "sha256-3zYjjrd3Hc2T4vwnajiAMNfTDUprKJZnZp2waRLQjI4=";
   };
 
   nativeBuildInputs = [ makeWrapper setJavaClassPath ];

From 6eb0340777c92b9f6e120ad25349d8053d3612c5 Mon Sep 17 00:00:00 2001
From: DarkOnion0 <darkonion0@clapot.org>
Date: Tue, 25 Apr 2023 22:36:15 +0200
Subject: [PATCH 61/77] appflowy: 0.1.2 -> 0.1.3

---
 pkgs/applications/office/appflowy/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/office/appflowy/default.nix b/pkgs/applications/office/appflowy/default.nix
index 3bab193e8adf..ab3e7721ab17 100644
--- a/pkgs/applications/office/appflowy/default.nix
+++ b/pkgs/applications/office/appflowy/default.nix
@@ -13,11 +13,11 @@
 
 stdenv.mkDerivation rec {
   pname = "appflowy";
-  version = "0.1.2";
+  version = "0.1.3";
 
   src = fetchzip {
     url = "https://github.com/AppFlowy-IO/appflowy/releases/download/${version}/AppFlowy_x86_64-unknown-linux-gnu_ubuntu-20.04.tar.gz";
-    sha256 = "sha256-fOPODq938ejJY4QDJawN/WFv6Ynr9pGgJPWnjWD/rQk=";
+    sha256 = "sha256-dZqnwROrw3ioCzUNvpklGOCr5cyjXU1Iqkp6xBdr3rA=";
     stripRoot = false;
   };
 
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
   installPhase = ''
     runHook preInstall
 
-    cd AppFlowy/
+    cd AppFlowy_x86_64-unknown-linux-gnu_ubuntu-20.04/AppFlowy/
 
     mkdir -p $out/opt/
     mkdir -p $out/bin/

From 46ef640edc64beb53dba0c1251eb004b8e2bdd6e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 26 Apr 2023 08:01:57 +0000
Subject: [PATCH 62/77] python310Packages.zigpy: 0.54.1 -> 0.55.0

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

diff --git a/pkgs/development/python-modules/zigpy/default.nix b/pkgs/development/python-modules/zigpy/default.nix
index 6d323ecdb952..d7263a802d28 100644
--- a/pkgs/development/python-modules/zigpy/default.nix
+++ b/pkgs/development/python-modules/zigpy/default.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "zigpy";
-  version = "0.54.1";
+  version = "0.55.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.8";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     owner = "zigpy";
     repo = "zigpy";
     rev = "refs/tags/${version}";
-    hash = "sha256-CFrqDKLklvbPBWAA0S6APGBYEXdmHYRzvbTzSfJ451w=";
+    hash = "sha256-fc98V6KJ7zROgNktHZlWj9/BQRbCIWYT5Px09mFrwHQ=";
   };
 
   propagatedBuildInputs = [

From fe91a464634fb66601fd93fb1cfbede3fa7dad64 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Wed, 26 Apr 2023 12:16:40 +0200
Subject: [PATCH 63/77] python310Packages.aioesphomeapi: 13.7.0 -> 13.7.2

https://github.com/esphome/aioesphomeapi/releases/tag/v13.7.1
https://github.com/esphome/aioesphomeapi/releases/tag/v13.7.2
---
 pkgs/development/python-modules/aioesphomeapi/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/aioesphomeapi/default.nix b/pkgs/development/python-modules/aioesphomeapi/default.nix
index 4502f4985020..bee7cc393321 100644
--- a/pkgs/development/python-modules/aioesphomeapi/default.nix
+++ b/pkgs/development/python-modules/aioesphomeapi/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "aioesphomeapi";
-  version = "13.7.0";
+  version = "13.7.2";
   format = "setuptools";
 
   disabled = pythonOlder "3.9";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     owner = "esphome";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-05UT9CsfO8onEHqnJlXNfzf1acfwiIC07ewCWBE8HPA=";
+    hash = "sha256-V4sOpgrDF+h+um/A7VwXKRE+aIUuus+eR1Z1tpt5C1g=";
   };
 
   propagatedBuildInputs = [

From 2d2c3c0bda8a06572e67189b3dcb83d7efe19643 Mon Sep 17 00:00:00 2001
From: Rafael Varago <rafael.varago@gmail.com>
Date: Fri, 21 Apr 2023 23:25:08 +0200
Subject: [PATCH 64/77] ravedude: init at 0.1.5

This is a tool to make Rust development for AVR microcontrollers
smoother by wrapping `avrdude`.

https://github.com/Rahix/avr-hal/tree/main/ravedude
---
 .../tools/rust/ravedude/default.nix           | 30 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  1 +
 2 files changed, 31 insertions(+)
 create mode 100644 pkgs/development/tools/rust/ravedude/default.nix

diff --git a/pkgs/development/tools/rust/ravedude/default.nix b/pkgs/development/tools/rust/ravedude/default.nix
new file mode 100644
index 000000000000..ea5812e5ad1e
--- /dev/null
+++ b/pkgs/development/tools/rust/ravedude/default.nix
@@ -0,0 +1,30 @@
+{ lib
+, rustPlatform
+, fetchCrate
+, pkg-config
+, udev
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "ravedude";
+  version = "0.1.5";
+
+  src = fetchCrate {
+    inherit pname version;
+    hash = "sha256-wcY9fvfIn1pWMAh5FI/QFl18CV2xjmRGSwwoRfGvujo=";
+  };
+
+  cargoHash = "sha256-AOIrB0FRagbA2+JEURF41d+th0AbR++U5WKCcZmh4Os=";
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [ udev ];
+
+  meta = with lib; {
+    description = "Tool to easily flash code onto an AVR microcontroller with avrdude";
+    homepage = "https://crates.io/crates/ravedude";
+    license = with licenses; [ mit /* or */ asl20 ];
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ rvarago ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2908081c8b71..96ce7854891c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16276,6 +16276,7 @@ with pkgs;
 
   ograc = callPackage ../development/tools/rust/ograc { };
 
+  ravedude = callPackage ../development/tools/rust/ravedude { };
   rhack = callPackage ../development/tools/rust/rhack { };
   roogle = callPackage ../development/tools/rust/roogle { };
   rustfmt = rustPackages.rustfmt;

From dc1b9f6ec6ab7d355a865119f5e2f0eac75cd9d7 Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Fri, 21 Apr 2023 11:24:45 -0300
Subject: [PATCH 65/77] arcan: change self to finalAttrs

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

diff --git a/pkgs/desktops/arcan/arcan/default.nix b/pkgs/desktops/arcan/arcan/default.nix
index 03e73f6813cf..22c214728f2b 100644
--- a/pkgs/desktops/arcan/arcan/default.nix
+++ b/pkgs/desktops/arcan/arcan/default.nix
@@ -56,14 +56,14 @@ let
   cmakeFeatureFlag = feature: flag:
     "-D${feature}=${if flag then "on" else "off"}";
 in
-stdenv.mkDerivation (self: {
+stdenv.mkDerivation (finalAttrs: {
   pname = "arcan" + lib.optionalString useStaticOpenAL "-static-openal";
   version = "0.6.2.1";
 
   src = fetchFromGitHub {
     owner = "letoram";
     repo = "arcan";
-    rev = self.version;
+    rev = finalAttrs.version;
     hash = "sha256-7H3fVSsW5VANLqwhykY+Q53fPjz65utaGksh/OpZnJM=";
   };
 
@@ -172,7 +172,7 @@ stdenv.mkDerivation (self: {
     "-DBUILD_PRESET=everything"
     # The upstream project recommends tagging the distribution
     "-DDISTR_TAG=Nixpkgs"
-    "-DENGINE_BUILDTAG=${self.version}"
+    "-DENGINE_BUILDTAG=${finalAttrs.version}"
     (cmakeFeatureFlag "HYBRID_SDL" true)
     (cmakeFeatureFlag "BUILTIN_LUA" useBuiltinLua)
     (cmakeFeatureFlag "DISABLE_JIT" useBuiltinLua)

From 8a97136a95fd3833b9ff0eeb2d099b62e3dbe37c Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Fri, 21 Apr 2023 11:25:14 -0300
Subject: [PATCH 66/77] cat9: change self to finalAttrs

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

diff --git a/pkgs/desktops/arcan/cat9/default.nix b/pkgs/desktops/arcan/cat9/default.nix
index d94f3c59c425..5e96b0f5fbdd 100644
--- a/pkgs/desktops/arcan/cat9/default.nix
+++ b/pkgs/desktops/arcan/cat9/default.nix
@@ -3,7 +3,7 @@
 , fetchFromGitHub
 }:
 
-stdenvNoCC.mkDerivation (self: {
+stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "cat9";
   version = "unstable-2023-02-11";
 

From 1d03c91a97a209c22ebb86c66141bdacfb719495 Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Fri, 21 Apr 2023 11:25:22 -0300
Subject: [PATCH 67/77] durden: change self to finalAttrs

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

diff --git a/pkgs/desktops/arcan/durden/default.nix b/pkgs/desktops/arcan/durden/default.nix
index 04492ee3db9a..14047669bd52 100644
--- a/pkgs/desktops/arcan/durden/default.nix
+++ b/pkgs/desktops/arcan/durden/default.nix
@@ -3,7 +3,7 @@
 , fetchFromGitHub
 }:
 
-stdenvNoCC.mkDerivation (self: {
+stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "durden";
   version = "unstable-2023-01-19";
 

From 578045597a514af2c879e642693f212d6f8a3513 Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Fri, 21 Apr 2023 11:25:31 -0300
Subject: [PATCH 68/77] prio: change self to finalAttrs

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

diff --git a/pkgs/desktops/arcan/prio/default.nix b/pkgs/desktops/arcan/prio/default.nix
index a2acbfbdea49..f733b189757b 100644
--- a/pkgs/desktops/arcan/prio/default.nix
+++ b/pkgs/desktops/arcan/prio/default.nix
@@ -3,7 +3,7 @@
 , fetchFromGitHub
 }:
 
-stdenvNoCC.mkDerivation (self: {
+stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "prio";
   version = "unstable-2018-09-13";
 

From 12c35abc2955247e3603d21a26ac5e8cc9c7e185 Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Fri, 21 Apr 2023 11:33:56 -0300
Subject: [PATCH 69/77] dev86: change self to finalAttrs

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

diff --git a/pkgs/development/compilers/dev86/default.nix b/pkgs/development/compilers/dev86/default.nix
index 67448f38f257..c42c4ce88c15 100644
--- a/pkgs/development/compilers/dev86/default.nix
+++ b/pkgs/development/compilers/dev86/default.nix
@@ -3,7 +3,7 @@
 , fetchFromGitHub
 }:
 
-stdenv.mkDerivation (self: {
+stdenv.mkDerivation (finalAttrs: {
   pname = "dev86";
   version = "unstable-2022-07-19";
 

From 8cb18516244dbe70b6989b763a940c84abd8e3fd Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Fri, 21 Apr 2023 11:34:10 -0300
Subject: [PATCH 70/77] dxa: change self to finalAttrs

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

diff --git a/pkgs/development/compilers/xa/dxa.nix b/pkgs/development/compilers/xa/dxa.nix
index bda3653eb0d7..44e3e8fb9671 100644
--- a/pkgs/development/compilers/xa/dxa.nix
+++ b/pkgs/development/compilers/xa/dxa.nix
@@ -4,14 +4,14 @@
 , installShellFiles
 }:
 
-stdenv.mkDerivation (self: {
+stdenv.mkDerivation (finalAttrs: {
   pname = "dxa";
   version = "0.1.5";
 
   src = fetchurl {
     urls = [
-      "https://www.floodgap.com/retrotech/xa/dists/dxa-${self.version}.tar.gz"
-      "https://www.floodgap.com/retrotech/xa/dists/unsupported/dxa-${self.version}.tar.gz"
+      "https://www.floodgap.com/retrotech/xa/dists/dxa-${finalAttrs.version}.tar.gz"
+      "https://www.floodgap.com/retrotech/xa/dists/unsupported/dxa-${finalAttrs.version}.tar.gz"
     ];
     hash = "sha256-jkDtd4FlgfmtlaysLtaaL7KseFDkM9Gc1oQZOkWCZ5k=";
   };

From 7439d61ae5f4fb8d1452ea3742468f8599f01bde Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Fri, 21 Apr 2023 11:34:22 -0300
Subject: [PATCH 71/77] xa: change self to finalAttrs

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

diff --git a/pkgs/development/compilers/xa/xa.nix b/pkgs/development/compilers/xa/xa.nix
index 9f4d45ba4977..52be6de0812d 100644
--- a/pkgs/development/compilers/xa/xa.nix
+++ b/pkgs/development/compilers/xa/xa.nix
@@ -4,14 +4,14 @@
 , perl
 }:
 
-stdenv.mkDerivation (self: {
+stdenv.mkDerivation (finalAttrs: {
   pname = "xa";
   version = "2.3.14";
 
   src = fetchurl {
     urls = [
-      "https://www.floodgap.com/retrotech/xa/dists/xa-${self.version}.tar.gz"
-      "https://www.floodgap.com/retrotech/xa/dists/unsupported/xa-${self.version}.tar.gz"
+      "https://www.floodgap.com/retrotech/xa/dists/xa-${finalAttrs.version}.tar.gz"
+      "https://www.floodgap.com/retrotech/xa/dists/unsupported/xa-${finalAttrs.version}.tar.gz"
     ];
     hash = "sha256-G5u6vdvY07lBC4UuUKEo7qQeaBM55vdsPoB2+lQg8C4=";
   };

From cbe2d12c490060af82fd45832ba84231ad9aa61f Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Fri, 21 Apr 2023 11:36:18 -0300
Subject: [PATCH 72/77] yabasic: change self to finalAttrs

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

diff --git a/pkgs/development/interpreters/yabasic/default.nix b/pkgs/development/interpreters/yabasic/default.nix
index 87e2f2299378..9ede197c8144 100644
--- a/pkgs/development/interpreters/yabasic/default.nix
+++ b/pkgs/development/interpreters/yabasic/default.nix
@@ -8,12 +8,12 @@
 , ncurses
 }:
 
-stdenv.mkDerivation (self: {
+stdenv.mkDerivation (finalAttrs: {
   pname = "yabasic";
   version = "2.90.3";
 
   src = fetchurl {
-    url = "http://www.yabasic.de/download/yabasic-${self.version}.tar.gz";
+    url = "http://www.yabasic.de/download/yabasic-${finalAttrs.version}.tar.gz";
     hash = "sha256-ItmlkraNUE0qlq1RghUJcDq4MHb6HRKNoIRylugjboA=";
   };
 

From dfa3263a1facbcb3463585aa5e78fbe4970ae770 Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Fri, 21 Apr 2023 11:36:52 -0300
Subject: [PATCH 73/77] cgreen: change self to finalAttrs

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

diff --git a/pkgs/development/libraries/cgreen/default.nix b/pkgs/development/libraries/cgreen/default.nix
index cfe309a3de5c..86908c871388 100644
--- a/pkgs/development/libraries/cgreen/default.nix
+++ b/pkgs/development/libraries/cgreen/default.nix
@@ -4,14 +4,14 @@
 , cmake
 }:
 
-stdenv.mkDerivation (self: {
+stdenv.mkDerivation (finalAttrs: {
   pname = "cgreen";
   version = "1.6.2";
 
   src = fetchFromGitHub {
     owner = "cgreen-devs";
     repo = "cgreen";
-    rev = self.version;
+    rev = finalAttrs.version;
     sha256 = "sha256-beaCoyDCERb/bdKcKS7dRQHlI0auLOStu3cZr1dhubg=";
   };
 

From 50d259e52c4a620fd5d24a9d0c33176c5fdedfff Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Fri, 21 Apr 2023 11:44:19 -0300
Subject: [PATCH 74/77] libbytesize: change self to finalAttrs

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

diff --git a/pkgs/development/libraries/libbytesize/default.nix b/pkgs/development/libraries/libbytesize/default.nix
index a46dc6767867..52a3d3112f22 100644
--- a/pkgs/development/libraries/libbytesize/default.nix
+++ b/pkgs/development/libraries/libbytesize/default.nix
@@ -14,14 +14,14 @@
 , python3
 }:
 
-stdenv.mkDerivation (self: {
+stdenv.mkDerivation (finalAttrs: {
   pname = "libbytesize";
   version = "2.8";
 
   src = fetchFromGitHub {
     owner = "storaged-project";
     repo = "libbytesize";
-    rev = self.version;
+    rev = finalAttrs.version;
     hash = "sha256-/TVv/srhbotIkne0G77hgBF4j+74INqVUr8zlKsaoM0=";
   };
 

From e4aa12d4f8625e5221fc5aa65c35c1f45416d4f8 Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Fri, 21 Apr 2023 11:44:32 -0300
Subject: [PATCH 75/77] bmake: change self to finalAttrs

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

diff --git a/pkgs/development/tools/build-managers/bmake/default.nix b/pkgs/development/tools/build-managers/bmake/default.nix
index fbe933f6b6d4..69506885a3bf 100644
--- a/pkgs/development/tools/build-managers/bmake/default.nix
+++ b/pkgs/development/tools/build-managers/bmake/default.nix
@@ -8,12 +8,12 @@
 , pkgsMusl # for passthru.tests
 }:
 
-stdenv.mkDerivation (self: {
+stdenv.mkDerivation (finalAttrs: {
   pname = "bmake";
   version = "20230126";
 
   src = fetchurl {
-    url = "http://www.crufty.net/ftp/pub/sjg/${self.pname}-${self.version}.tar.gz";
+    url = "http://www.crufty.net/ftp/pub/sjg/${finalAttrs.pname}-${finalAttrs.version}.tar.gz";
     hash = "sha256-hk9yGFgs95Dsc7ILcQVCXLn/ozUiJUF3LwMTMGtqC8Q=";
   };
 

From 61d49c476c32fccc87f9a206c525a43e11e2537b Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Fri, 21 Apr 2023 12:52:05 -0300
Subject: [PATCH 76/77] fonts (treewide): change self to finalAttrs

---
 pkgs/data/fonts/aileron/default.nix                  | 6 +++---
 pkgs/data/fonts/blackout/default.nix                 | 4 ++--
 pkgs/data/fonts/chunk/default.nix                    | 4 ++--
 pkgs/data/fonts/eunomia/default.nix                  | 4 ++--
 pkgs/data/fonts/f1_8/default.nix                     | 4 ++--
 pkgs/data/fonts/f5_6/default.nix                     | 6 +++---
 pkgs/data/fonts/fa_1/default.nix                     | 6 +++---
 pkgs/data/fonts/fanwood/default.nix                  | 4 ++--
 pkgs/data/fonts/ferrum/default.nix                   | 6 +++---
 pkgs/data/fonts/goudy-bookletter-1911/default.nix    | 4 ++--
 pkgs/data/fonts/junction/default.nix                 | 4 ++--
 pkgs/data/fonts/knewave/default.nix                  | 4 ++--
 pkgs/data/fonts/league-gothic/default.nix            | 4 ++--
 pkgs/data/fonts/league-script-number-one/default.nix | 4 ++--
 pkgs/data/fonts/league-spartan/default.nix           | 4 ++--
 pkgs/data/fonts/linden-hill/default.nix              | 4 ++--
 pkgs/data/fonts/medio/default.nix                    | 6 +++---
 pkgs/data/fonts/melete/default.nix                   | 6 +++---
 pkgs/data/fonts/nacelle/default.nix                  | 6 +++---
 pkgs/data/fonts/orbitron/default.nix                 | 4 ++--
 pkgs/data/fonts/ostrich-sans/default.nix             | 4 ++--
 pkgs/data/fonts/penna/default.nix                    | 6 +++---
 pkgs/data/fonts/prociono/default.nix                 | 4 ++--
 pkgs/data/fonts/raleway/default.nix                  | 4 ++--
 pkgs/data/fonts/route159/default.nix                 | 6 +++---
 pkgs/data/fonts/seshat/default.nix                   | 6 +++---
 pkgs/data/fonts/sniglet/default.nix                  | 4 ++--
 pkgs/data/fonts/sorts-mill-goudy/default.nix         | 4 ++--
 pkgs/data/fonts/tenderness/default.nix               | 6 +++---
 pkgs/data/fonts/the-neue-black/default.nix           | 4 ++--
 pkgs/data/fonts/vegur/default.nix                    | 4 ++--
 31 files changed, 73 insertions(+), 73 deletions(-)

diff --git a/pkgs/data/fonts/aileron/default.nix b/pkgs/data/fonts/aileron/default.nix
index 5ae83519278b..c52824dbe120 100644
--- a/pkgs/data/fonts/aileron/default.nix
+++ b/pkgs/data/fonts/aileron/default.nix
@@ -4,12 +4,12 @@ let
   majorVersion = "0";
   minorVersion = "102";
 in
-stdenvNoCC.mkDerivation (self: {
+stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "aileron";
   version = "${majorVersion}.${minorVersion}";
 
   src = fetchzip {
-    url = "https://dotcolon.net/download/fonts/${self.pname}_${majorVersion}${minorVersion}.zip";
+    url = "https://dotcolon.net/download/fonts/${finalAttrs.pname}_${majorVersion}${minorVersion}.zip";
     hash = "sha256-Ht48gwJZrn0djo1yl6jHZ4+0b710FVwStiC1Zk5YXME=";
     stripRoot = false;
   };
@@ -23,7 +23,7 @@ stdenvNoCC.mkDerivation (self: {
   '';
 
   meta = with lib; {
-    homepage = "http://dotcolon.net/font/${self.pname}/";
+    homepage = "http://dotcolon.net/font/${finalAttrs.pname}/";
     description = "A helvetica font in nine weights";
     platforms = platforms.all;
     maintainers = with maintainers; [ leenaars minijackson ];
diff --git a/pkgs/data/fonts/blackout/default.nix b/pkgs/data/fonts/blackout/default.nix
index b615aa66c59c..44cb10b408e9 100644
--- a/pkgs/data/fonts/blackout/default.nix
+++ b/pkgs/data/fonts/blackout/default.nix
@@ -1,12 +1,12 @@
 { lib, fetchFromGitHub, stdenvNoCC }:
 
-stdenvNoCC.mkDerivation (self: {
+stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "blackout";
   version = "2014-07-29";
 
   src = fetchFromGitHub {
     owner = "theleagueof";
-    repo = self.pname;
+    repo = finalAttrs.pname;
     rev = "4864cfc1749590e9f78549c6e57116fe98480c0f";
     hash = "sha256-UmJVmtuPQYW/w+mdnJw9Ql4R1xf/07l+/Ky1wX9WKqw=";
   };
diff --git a/pkgs/data/fonts/chunk/default.nix b/pkgs/data/fonts/chunk/default.nix
index 708393185e94..fec1c043bfa1 100644
--- a/pkgs/data/fonts/chunk/default.nix
+++ b/pkgs/data/fonts/chunk/default.nix
@@ -1,12 +1,12 @@
 { lib, fetchFromGitHub, stdenvNoCC }:
 
-stdenvNoCC.mkDerivation (self: {
+stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "chunk";
   version = "2021-03-03";
 
   src = fetchFromGitHub {
     owner = "theleagueof";
-    repo = self.pname;
+    repo = finalAttrs.pname;
     rev = "12a243f3fb7c7a68844901023f7d95d6eaf14104";
     hash = "sha256-NMkRvrUgy9yzOT3a1rN6Ch/p8Cr902CwL4G0w7jVm1E=";
   };
diff --git a/pkgs/data/fonts/eunomia/default.nix b/pkgs/data/fonts/eunomia/default.nix
index a09a0ad0d782..ea3613b5f81f 100644
--- a/pkgs/data/fonts/eunomia/default.nix
+++ b/pkgs/data/fonts/eunomia/default.nix
@@ -4,12 +4,12 @@ let
   majorVersion = "0";
   minorVersion = "200";
 in
-stdenvNoCC.mkDerivation (self: {
+stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "eunomia";
   version = "${majorVersion}.${minorVersion}";
 
   src = fetchzip {
-    url = "https://dotcolon.net/download/fonts/${self.pname}_${majorVersion}${minorVersion}.zip";
+    url = "https://dotcolon.net/download/fonts/${finalAttrs.pname}_${majorVersion}${minorVersion}.zip";
     hash = "sha256-Rd2EakaTWjzoEV00tHTgg/bXgJUFfPjCyQUWi7QhFG4=";
     stripRoot = false;
   };
diff --git a/pkgs/data/fonts/f1_8/default.nix b/pkgs/data/fonts/f1_8/default.nix
index 5898fe1eabaf..93e44be17cda 100644
--- a/pkgs/data/fonts/f1_8/default.nix
+++ b/pkgs/data/fonts/f1_8/default.nix
@@ -4,7 +4,7 @@ let
   majorVersion = "1";
   minorVersion = "101";
 in
-stdenvNoCC.mkDerivation (self: {
+stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "f1_8";
   version = "${majorVersion}.${minorVersion}";
 
@@ -24,7 +24,7 @@ stdenvNoCC.mkDerivation (self: {
   '';
 
   meta = with lib; {
-    homepage = "http://dotcolon.net/font/${self.pname}/";
+    homepage = "http://dotcolon.net/font/${finalAttrs.pname}/";
     description = "A weighted decorative font";
     platforms = platforms.all;
     maintainers = with maintainers; [ minijackson ];
diff --git a/pkgs/data/fonts/f5_6/default.nix b/pkgs/data/fonts/f5_6/default.nix
index a37ee591ef48..f1e8e7698f27 100644
--- a/pkgs/data/fonts/f5_6/default.nix
+++ b/pkgs/data/fonts/f5_6/default.nix
@@ -4,12 +4,12 @@ let
   majorVersion = "0";
   minorVersion = "110";
 in
-stdenvNoCC.mkDerivation (self: {
+stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "f5_6";
   version = "${majorVersion}.${minorVersion}";
 
   src = fetchzip {
-    url = "https://dotcolon.net/download/fonts/${self.pname}_${majorVersion}${minorVersion}.zip";
+    url = "https://dotcolon.net/download/fonts/${finalAttrs.pname}_${majorVersion}${minorVersion}.zip";
     hash = "sha256-FeCU+mzR0iO5tixI72XUnhvpGj+WRfKyT3mhBtud3uE=";
     stripRoot = false;
   };
@@ -23,7 +23,7 @@ stdenvNoCC.mkDerivation (self: {
   '';
 
   meta = with lib; {
-    homepage = "http://dotcolon.net/font/${self.pname}/";
+    homepage = "http://dotcolon.net/font/${finalAttrs.pname}/";
     description = "A weighted decorative font";
     platforms = platforms.all;
     maintainers = with maintainers; [ leenaars minijackson ];
diff --git a/pkgs/data/fonts/fa_1/default.nix b/pkgs/data/fonts/fa_1/default.nix
index 4e8ab3cbaa83..1c21bb279be6 100644
--- a/pkgs/data/fonts/fa_1/default.nix
+++ b/pkgs/data/fonts/fa_1/default.nix
@@ -4,12 +4,12 @@ let
   majorVersion = "0";
   minorVersion = "100";
 in
-stdenvNoCC.mkDerivation (self: {
+stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "fa_1";
   version = "${majorVersion}.${minorVersion}";
 
   src = fetchzip {
-    url = "https://dotcolon.net/download/fonts/${self.pname}_${majorVersion}${minorVersion}.zip";
+    url = "https://dotcolon.net/download/fonts/${finalAttrs.pname}_${majorVersion}${minorVersion}.zip";
     hash = "sha256-BPJ+wZMYXY/yg5oEgBc5YnswA6A7w6V0gdv+cac0qdc=";
     stripRoot = false;
   };
@@ -23,7 +23,7 @@ stdenvNoCC.mkDerivation (self: {
   '';
 
   meta = with lib; {
-    homepage = "http://dotcolon.net/font/${self.pname}/";
+    homepage = "http://dotcolon.net/font/${finalAttrs.pname}/";
     description = "A weighted decorative font";
     platforms = platforms.all;
     maintainers = with maintainers; [ minijackson ];
diff --git a/pkgs/data/fonts/fanwood/default.nix b/pkgs/data/fonts/fanwood/default.nix
index ef8be0a6522a..669ee6ac206e 100644
--- a/pkgs/data/fonts/fanwood/default.nix
+++ b/pkgs/data/fonts/fanwood/default.nix
@@ -1,12 +1,12 @@
 { lib, fetchFromGitHub, stdenvNoCC }:
 
-stdenvNoCC.mkDerivation (self: {
+stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "fanwood";
   version = "2011-05-11";
 
   src = fetchFromGitHub {
     owner = "theleagueof";
-    repo = self.pname;
+    repo = finalAttrs.pname;
     rev = "cbaaed9704e7d37d3dcdbdf0b472e9efd0e39432";
     hash = "sha256-OroFhhb4RxPHkx+/8PtFnxs1GQVXMPiYTd+2vnRbIjg=";
   };
diff --git a/pkgs/data/fonts/ferrum/default.nix b/pkgs/data/fonts/ferrum/default.nix
index 33b3813cca38..5f6459a1f6bf 100644
--- a/pkgs/data/fonts/ferrum/default.nix
+++ b/pkgs/data/fonts/ferrum/default.nix
@@ -4,12 +4,12 @@ let
   majorVersion = "0";
   minorVersion = "200";
 in
-stdenvNoCC.mkDerivation (self: {
+stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "ferrum";
   version = "${majorVersion}.${minorVersion}";
 
   src = fetchzip {
-    url = "https://dotcolon.net/download/fonts/${self.pname}_${majorVersion}${minorVersion}.zip";
+    url = "https://dotcolon.net/download/fonts/${finalAttrs.pname}_${majorVersion}${minorVersion}.zip";
     hash = "sha256-NDJwgFWZgyhMkGRWlY55l2omEw6ju3e3dHCEsWNzQIc=";
     stripRoot = false;
   };
@@ -23,7 +23,7 @@ stdenvNoCC.mkDerivation (self: {
   '';
 
   meta = with lib; {
-    homepage = "http://dotcolon.net/font/${self.pname}/";
+    homepage = "http://dotcolon.net/font/${finalAttrs.pname}/";
     description = "A decorative font";
     platforms = platforms.all;
     maintainers = with maintainers; [ leenaars minijackson ];
diff --git a/pkgs/data/fonts/goudy-bookletter-1911/default.nix b/pkgs/data/fonts/goudy-bookletter-1911/default.nix
index 3fd0352b5557..14997cd62b6e 100644
--- a/pkgs/data/fonts/goudy-bookletter-1911/default.nix
+++ b/pkgs/data/fonts/goudy-bookletter-1911/default.nix
@@ -1,12 +1,12 @@
 { lib, fetchFromGitHub, stdenvNoCC }:
 
-stdenvNoCC.mkDerivation (self: {
+stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "goudy-bookletter-1911";
   version = "2011-05-11";
 
   src = fetchFromGitHub {
     owner = "theleagueof";
-    repo = self.pname;
+    repo = finalAttrs.pname;
     rev = "85ff5b834b4f63feb36fd2053949c19660580e48";
     hash = "sha256-11axs1+SRQj+1lYTq2LYf1I65WrrvB/UnAgZkHPP1N8=";
   };
diff --git a/pkgs/data/fonts/junction/default.nix b/pkgs/data/fonts/junction/default.nix
index 7f5ba5c4a201..b629477f6144 100644
--- a/pkgs/data/fonts/junction/default.nix
+++ b/pkgs/data/fonts/junction/default.nix
@@ -1,12 +1,12 @@
 { lib, fetchFromGitHub, stdenvNoCC }:
 
-stdenvNoCC.mkDerivation (self: {
+stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "junction";
   version = "2014-05-29";
 
   src = fetchFromGitHub {
     owner = "theleagueof";
-    repo = self.pname;
+    repo = finalAttrs.pname;
     rev = "fb73260e86dd301b383cf6cc9ca8e726ef806535";
     hash = "sha256-Zqh23HPWGed+JkADYjYdsVNRxqJDvC9xhnqAqWZ3Eu8=";
   };
diff --git a/pkgs/data/fonts/knewave/default.nix b/pkgs/data/fonts/knewave/default.nix
index eaadb7afc0de..27def2271802 100644
--- a/pkgs/data/fonts/knewave/default.nix
+++ b/pkgs/data/fonts/knewave/default.nix
@@ -1,12 +1,12 @@
 { lib, fetchFromGitHub, stdenvNoCC }:
 
-stdenvNoCC.mkDerivation (self: {
+stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "knewave";
   version = "2012-07-30";
 
   src = fetchFromGitHub {
     owner = "theleagueof";
-    repo = self.pname;
+    repo = finalAttrs.pname;
     rev = "f335d5ff1f12e4acf97d4208e1c37b4d386e57fb";
     hash = "sha256-SaJU2GlxU7V3iJNQzFKg1YugaPsiJuSZpC8NCqtWyz0=";
   };
diff --git a/pkgs/data/fonts/league-gothic/default.nix b/pkgs/data/fonts/league-gothic/default.nix
index 4186eb70f6db..fd12e0a86591 100644
--- a/pkgs/data/fonts/league-gothic/default.nix
+++ b/pkgs/data/fonts/league-gothic/default.nix
@@ -1,11 +1,11 @@
 { lib, fetchzip, stdenvNoCC }:
 
-stdenvNoCC.mkDerivation (self: {
+stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "league-gothic";
   version = "1.601";
 
   src = fetchzip {
-    url = "https://github.com/theleagueof/league-gothic/releases/download/${self.version}/LeagueGothic-${self.version}.tar.xz";
+    url = "https://github.com/theleagueof/league-gothic/releases/download/${finalAttrs.version}/LeagueGothic-${finalAttrs.version}.tar.xz";
     hash = "sha256-emkXKyQw4R0Zgg02oJsvBkqV0jmczP0tF0K2IKqJHMA=";
   };
 
diff --git a/pkgs/data/fonts/league-script-number-one/default.nix b/pkgs/data/fonts/league-script-number-one/default.nix
index 11d7dc6173c5..bc847f4f81c8 100644
--- a/pkgs/data/fonts/league-script-number-one/default.nix
+++ b/pkgs/data/fonts/league-script-number-one/default.nix
@@ -1,12 +1,12 @@
 { lib, fetchFromGitHub, stdenvNoCC }:
 
-stdenvNoCC.mkDerivation (self: {
+stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "league-script-number-one";
   version = "2011-05-25";
 
   src = fetchFromGitHub {
     owner = "theleagueof";
-    repo = self.pname;
+    repo = finalAttrs.pname;
     rev = "225add0b37cf8268759ba4572e02630d9fb54ecf";
     hash = "sha256-Z3Zrp0Os3On0tESVical1Qh6wY1H2Hc0OPTlkbtsrCI=";
   };
diff --git a/pkgs/data/fonts/league-spartan/default.nix b/pkgs/data/fonts/league-spartan/default.nix
index 599aeca8ca65..d0e36e591491 100644
--- a/pkgs/data/fonts/league-spartan/default.nix
+++ b/pkgs/data/fonts/league-spartan/default.nix
@@ -1,11 +1,11 @@
 { lib, fetchzip, stdenvNoCC }:
 
-stdenvNoCC.mkDerivation (self: {
+stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "league-spartan";
   version = "2.220";
 
   src = fetchzip {
-    url = "https://github.com/theleagueof/league-spartan/releases/download/${self.version}/LeagueSpartan-${self.version}.tar.xz";
+    url = "https://github.com/theleagueof/league-spartan/releases/download/${finalAttrs.version}/LeagueSpartan-${finalAttrs.version}.tar.xz";
     hash = "sha256-dkvWRYli8vk+E0DkZ2NWCJKfSfdo4jEcGo0puQpFVVc=";
   };
 
diff --git a/pkgs/data/fonts/linden-hill/default.nix b/pkgs/data/fonts/linden-hill/default.nix
index f48313fd4ac9..9e452d34b99a 100644
--- a/pkgs/data/fonts/linden-hill/default.nix
+++ b/pkgs/data/fonts/linden-hill/default.nix
@@ -1,12 +1,12 @@
 { lib, fetchFromGitHub, stdenvNoCC }:
 
-stdenvNoCC.mkDerivation (self: {
+stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "linden-hill";
   version = "2011-05-25";
 
   src = fetchFromGitHub {
     owner = "theleagueof";
-    repo = self.pname;
+    repo = finalAttrs.pname;
     rev = "a3f7ae6c4cac1b7e5ce5269e1fcc6a2fbb9e31ee";
     hash = "sha256-EjXcLjzVQeOJgLxGua8t0oMc+APOsONGGpG6VJVCgFw=";
   };
diff --git a/pkgs/data/fonts/medio/default.nix b/pkgs/data/fonts/medio/default.nix
index 240b6fbeead8..5adcad008662 100644
--- a/pkgs/data/fonts/medio/default.nix
+++ b/pkgs/data/fonts/medio/default.nix
@@ -4,12 +4,12 @@ let
   majorVersion = "0";
   minorVersion = "200";
 in
-stdenvNoCC.mkDerivation (self: {
+stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "medio";
   version = "${majorVersion}.${minorVersion}";
 
   src = fetchzip {
-    url = "https://dotcolon.net/download/fonts/${self.pname}_${majorVersion}${minorVersion}.zip";
+    url = "https://dotcolon.net/download/fonts/${finalAttrs.pname}_${majorVersion}${minorVersion}.zip";
     hash = "sha256-S+CcwD4zGVk7cIFD6K4NnpE/0mrJq4RnDJC576rhcLQ=";
     stripRoot = false;
   };
@@ -23,7 +23,7 @@ stdenvNoCC.mkDerivation (self: {
   '';
 
   meta = with lib; {
-    homepage = "http://dotcolon.net/font/${self.pname}/";
+    homepage = "http://dotcolon.net/font/${finalAttrs.pname}/";
     description = "Serif font designed by Sora Sagano";
     longDescription = ''
       Medio is a serif font designed by Sora Sagano, based roughly
diff --git a/pkgs/data/fonts/melete/default.nix b/pkgs/data/fonts/melete/default.nix
index cae6bcaf4eaf..3d3e24ac81da 100644
--- a/pkgs/data/fonts/melete/default.nix
+++ b/pkgs/data/fonts/melete/default.nix
@@ -4,12 +4,12 @@ let
   majorVersion = "0";
   minorVersion = "200";
 in
-stdenvNoCC.mkDerivation (self: {
+stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "melete";
   version = "${majorVersion}.${minorVersion}";
 
   src = fetchzip {
-    url = "https://dotcolon.net/download/fonts/${self.pname}_${majorVersion}${minorVersion}.zip";
+    url = "https://dotcolon.net/download/fonts/${finalAttrs.pname}_${majorVersion}${minorVersion}.zip";
     hash = "sha256-y1xtNM1Oy92gOvbr9J71XNxb1JeTzOgxKms3G2YHK00=";
     stripRoot = false;
   };
@@ -23,7 +23,7 @@ stdenvNoCC.mkDerivation (self: {
   '';
 
   meta = with lib; {
-    homepage = "http://dotcolon.net/font/${self.pname}/";
+    homepage = "http://dotcolon.net/font/${finalAttrs.pname}/";
     description = "A headline typeface that could be used as a movie title";
     platforms = platforms.all;
     maintainers = with maintainers; [ minijackson ];
diff --git a/pkgs/data/fonts/nacelle/default.nix b/pkgs/data/fonts/nacelle/default.nix
index 007de90b75ac..2d670cdc229d 100644
--- a/pkgs/data/fonts/nacelle/default.nix
+++ b/pkgs/data/fonts/nacelle/default.nix
@@ -4,12 +4,12 @@ let
   majorVersion = "1";
   minorVersion = "00";
 in
-stdenvNoCC.mkDerivation (self: {
+stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "nacelle";
   version = "${majorVersion}.${minorVersion}";
 
   src = fetchzip {
-    url = "https://dotcolon.net/download/fonts/${self.pname}_${majorVersion}${minorVersion}.zip";
+    url = "https://dotcolon.net/download/fonts/${finalAttrs.pname}_${majorVersion}${minorVersion}.zip";
     hash = "sha256-e4QsPiyfWEAYHWdwR3CkGc2UzuA3hZPYYlWtIubY0Oo=";
     stripRoot = false;
   };
@@ -23,7 +23,7 @@ stdenvNoCC.mkDerivation (self: {
   '';
 
   meta = with lib; {
-    homepage = "http://dotcolon.net/font/${self.pname}/";
+    homepage = "http://dotcolon.net/font/${finalAttrs.pname}/";
     description = "A improved version of the Aileron font";
     platforms = platforms.all;
     maintainers = with maintainers; [ minijackson ];
diff --git a/pkgs/data/fonts/orbitron/default.nix b/pkgs/data/fonts/orbitron/default.nix
index dcbf0085141e..7e6897552060 100644
--- a/pkgs/data/fonts/orbitron/default.nix
+++ b/pkgs/data/fonts/orbitron/default.nix
@@ -1,12 +1,12 @@
 { lib, stdenvNoCC, fetchFromGitHub }:
 
-stdenvNoCC.mkDerivation (self: {
+stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "orbitron";
   version = "2011-05-25";
 
   src = fetchFromGitHub {
     owner = "theleagueof";
-    repo = self.pname;
+    repo = finalAttrs.pname;
     rev = "13e6a5222aa6818d81c9acd27edd701a2d744152";
     hash = "sha256-zjNPVrDUxcQbrsg1/8fFa6Wenu1yuG/XDfKA7NVZ0rA=";
   };
diff --git a/pkgs/data/fonts/ostrich-sans/default.nix b/pkgs/data/fonts/ostrich-sans/default.nix
index b86727312ec1..67ca4b72823c 100644
--- a/pkgs/data/fonts/ostrich-sans/default.nix
+++ b/pkgs/data/fonts/ostrich-sans/default.nix
@@ -1,12 +1,12 @@
 { lib, fetchFromGitHub, stdenvNoCC }:
 
-stdenvNoCC.mkDerivation (self: {
+stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "ostrich-sans";
   version = "2014-04-18";
 
   src = fetchFromGitHub {
     owner = "theleagueof";
-    repo = self.pname;
+    repo = finalAttrs.pname;
     rev = "a949d40d0576d12ba26e2a45e19c91fd0228c964";
     hash = "sha256-vvTNtl+fO2zWooH1EvCmO/dPYYgCkj8Ckg5xfg1gtnw=";
   };
diff --git a/pkgs/data/fonts/penna/default.nix b/pkgs/data/fonts/penna/default.nix
index 893262f66e56..e1a7fc181ddc 100644
--- a/pkgs/data/fonts/penna/default.nix
+++ b/pkgs/data/fonts/penna/default.nix
@@ -4,12 +4,12 @@ let
   majorVersion = "0";
   minorVersion = "100";
 in
-stdenvNoCC.mkDerivation (self: {
+stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "penna";
   version = "${majorVersion}.${minorVersion}";
 
   src = fetchzip {
-    url = "https://dotcolon.net/download/fonts/${self.pname}_${majorVersion}${minorVersion}.zip";
+    url = "https://dotcolon.net/download/fonts/${finalAttrs.pname}_${majorVersion}${minorVersion}.zip";
     hash = "sha256-fmCJnEaoUGdW9JK3J7JSm5D4qOMRW7qVKPgVE7uCH5w=";
     stripRoot = false;
   };
@@ -23,7 +23,7 @@ stdenvNoCC.mkDerivation (self: {
   '';
 
   meta = with lib; {
-    homepage = "http://dotcolon.net/font/${self.pname}/";
+    homepage = "http://dotcolon.net/font/${finalAttrs.pname}/";
     description = "Geometric sans serif designed by Sora Sagano";
     longDescription = ''
      Penna is a geometric sans serif designed by Sora Sagano,
diff --git a/pkgs/data/fonts/prociono/default.nix b/pkgs/data/fonts/prociono/default.nix
index b5bdf4d22926..8749c9d0736e 100644
--- a/pkgs/data/fonts/prociono/default.nix
+++ b/pkgs/data/fonts/prociono/default.nix
@@ -1,12 +1,12 @@
 { lib, fetchFromGitHub, stdenvNoCC }:
 
-stdenvNoCC.mkDerivation (self: {
+stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "prociono";
   version = "2011-05-25";
 
   src = fetchFromGitHub {
     owner = "theleagueof";
-    repo = self.pname;
+    repo = finalAttrs.pname;
     rev = "f9d9680de6d6f0c13939f23c9dd14cd7853cf844";
     hash = "sha256-gC5E0Z0O2cnthoBEu+UOQLsr3/a/3/JPIx3WCPsXXtk=";
   };
diff --git a/pkgs/data/fonts/raleway/default.nix b/pkgs/data/fonts/raleway/default.nix
index c1d766f7d36b..ffaca35c6b9e 100644
--- a/pkgs/data/fonts/raleway/default.nix
+++ b/pkgs/data/fonts/raleway/default.nix
@@ -1,11 +1,11 @@
 { lib, fetchzip, stdenvNoCC }:
 
-stdenvNoCC.mkDerivation (self: {
+stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "raleway";
   version = "4.101";
 
   src = fetchzip {
-    url = "https://github.com/theleagueof/raleway/releases/download/${self.version}/Raleway-${self.version}.tar.xz";
+    url = "https://github.com/theleagueof/raleway/releases/download/${finalAttrs.version}/Raleway-${finalAttrs.version}.tar.xz";
     hash = "sha256-itNHIMoRjiaqYAJoDNetkCquv47VAfel8MAzwsd//Ww=";
   };
 
diff --git a/pkgs/data/fonts/route159/default.nix b/pkgs/data/fonts/route159/default.nix
index 4d0bf9941b44..e19d25d61d0f 100644
--- a/pkgs/data/fonts/route159/default.nix
+++ b/pkgs/data/fonts/route159/default.nix
@@ -4,12 +4,12 @@ let
   majorVersion = "1";
   minorVersion = "10";
 in
-stdenvNoCC.mkDerivation (self: {
+stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "route159";
   version = "${majorVersion}.${minorVersion}";
 
   src = fetchzip {
-    url = "https://dotcolon.net/download/fonts/${self.pname}_${majorVersion}${minorVersion}.zip";
+    url = "https://dotcolon.net/download/fonts/${finalAttrs.pname}_${majorVersion}${minorVersion}.zip";
     hash = "sha256-1InyBW1LGbp/IU/ql9mvT14W3MTxJdWThFwRH6VHpTU=";
     stripRoot = false;
   };
@@ -23,7 +23,7 @@ stdenvNoCC.mkDerivation (self: {
   '';
 
   meta = with lib; {
-    homepage = "http://dotcolon.net/font/${self.pname}/";
+    homepage = "http://dotcolon.net/font/${finalAttrs.pname}/";
     description = "A weighted sans serif font";
     platforms = platforms.all;
     maintainers = with maintainers; [ leenaars minijackson ];
diff --git a/pkgs/data/fonts/seshat/default.nix b/pkgs/data/fonts/seshat/default.nix
index 7ed7abd5fb17..e86b0539c927 100644
--- a/pkgs/data/fonts/seshat/default.nix
+++ b/pkgs/data/fonts/seshat/default.nix
@@ -4,12 +4,12 @@ let
   majorVersion = "0";
   minorVersion = "100";
 in
-stdenvNoCC.mkDerivation (self: {
+stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "seshat";
   version = "${majorVersion}.${minorVersion}";
 
   src = fetchzip {
-    url = "https://dotcolon.net/download/fonts/${self.pname}_${majorVersion}${minorVersion}.zip";
+    url = "https://dotcolon.net/download/fonts/${finalAttrs.pname}_${majorVersion}${minorVersion}.zip";
     hash = "sha256-XgprDhzAbcTzZw2QOwpCnzusYheYmSlM+ApU+Y0wO2Q=";
     stripRoot = false;
   };
@@ -23,7 +23,7 @@ stdenvNoCC.mkDerivation (self: {
   '';
 
   meta = with lib; {
-    homepage = "http://dotcolon.net/font/${self.pname}/";
+    homepage = "http://dotcolon.net/font/${finalAttrs.pname}/";
     description = "Roman body font designed for main text by Sora Sagano";
     longDescription = ''
       Seshat is a Roman body font designed for the main text. By
diff --git a/pkgs/data/fonts/sniglet/default.nix b/pkgs/data/fonts/sniglet/default.nix
index a109637a9a1b..ab60e9c56f7c 100644
--- a/pkgs/data/fonts/sniglet/default.nix
+++ b/pkgs/data/fonts/sniglet/default.nix
@@ -1,12 +1,12 @@
 { lib, fetchFromGitHub, stdenvNoCC }:
 
-stdenvNoCC.mkDerivation (self: {
+stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "sniglet";
   version = "2011-05-25";
 
   src = fetchFromGitHub {
     owner = "theleagueof";
-    repo = self.pname;
+    repo = finalAttrs.pname;
     rev = "5c6b0860bdd0d8c4f16222e4de3918c384db17c4";
     hash = "sha256-fLT2hZT9o1Ka30EB/6oWwmalhVJ+swXLRFG99yRWd2c=";
   };
diff --git a/pkgs/data/fonts/sorts-mill-goudy/default.nix b/pkgs/data/fonts/sorts-mill-goudy/default.nix
index 432740a9267d..1edbbd9787ed 100644
--- a/pkgs/data/fonts/sorts-mill-goudy/default.nix
+++ b/pkgs/data/fonts/sorts-mill-goudy/default.nix
@@ -1,12 +1,12 @@
 { lib, fetchFromGitHub, stdenvNoCC }:
 
-stdenvNoCC.mkDerivation (self: {
+stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "sorts-mill-goudy";
   version = "2011-05-25";
 
   src = fetchFromGitHub {
     owner = "theleagueof";
-    repo = self.pname;
+    repo = finalAttrs.pname;
     rev = "06072890c7b05f274215a24f17449655ccb2c8af";
     hash = "sha256-NEfLBJatUmdUL5gJEimJHZfOd1OtI7pxTN97eWMODyM=";
   };
diff --git a/pkgs/data/fonts/tenderness/default.nix b/pkgs/data/fonts/tenderness/default.nix
index 40b284c2549f..9149c081d493 100644
--- a/pkgs/data/fonts/tenderness/default.nix
+++ b/pkgs/data/fonts/tenderness/default.nix
@@ -4,12 +4,12 @@ let
   majorVersion = "0";
   minorVersion = "601";
 in
-stdenvNoCC.mkDerivation (self: {
+stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "tenderness";
   version = "${majorVersion}.${minorVersion}";
 
   src = fetchzip {
-    url = "https://dotcolon.net/download/fonts/${self.pname}_${majorVersion}${minorVersion}.zip";
+    url = "https://dotcolon.net/download/fonts/${finalAttrs.pname}_${majorVersion}${minorVersion}.zip";
     hash = "sha256-bwJKW+rY7/r2pBCSA6HYlaRMsI/U8UdW2vV4tmYuJww=";
     stripRoot = false;
   };
@@ -23,7 +23,7 @@ stdenvNoCC.mkDerivation (self: {
   '';
 
   meta = with lib; {
-    homepage = "http://dotcolon.net/font/${self.pname}/";
+    homepage = "http://dotcolon.net/font/${finalAttrs.pname}/";
     description = "Serif font designed by Sora Sagano with old-style figures";
     platforms = platforms.all;
     maintainers = with maintainers; [ leenaars minijackson ];
diff --git a/pkgs/data/fonts/the-neue-black/default.nix b/pkgs/data/fonts/the-neue-black/default.nix
index af3cd639c6e9..3288925464fe 100644
--- a/pkgs/data/fonts/the-neue-black/default.nix
+++ b/pkgs/data/fonts/the-neue-black/default.nix
@@ -1,11 +1,11 @@
 { lib, fetchzip, stdenvNoCC }:
 
-stdenvNoCC.mkDerivation (self: {
+stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "the-neue-black";
   version = "1.007";
 
   src = fetchzip {
-    url = "https://github.com/theleagueof/the-neue-black/releases/download/${self.version}/TheNeueBlack-${self.version}.tar.xz";
+    url = "https://github.com/theleagueof/the-neue-black/releases/download/${finalAttrs.version}/TheNeueBlack-${finalAttrs.version}.tar.xz";
     hash = "sha256-AsB6w1000xdl+pOPDXqqzQhru1T/VD0hIJ4gFec7mU4=";
   };
 
diff --git a/pkgs/data/fonts/vegur/default.nix b/pkgs/data/fonts/vegur/default.nix
index effaf74be7db..e03f25951b54 100644
--- a/pkgs/data/fonts/vegur/default.nix
+++ b/pkgs/data/fonts/vegur/default.nix
@@ -4,12 +4,12 @@ let
   majorVersion = "0";
   minorVersion = "701";
 in
-stdenvNoCC.mkDerivation (self: {
+stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "vegur";
   version = "${majorVersion}.${minorVersion}";
 
   src = fetchzip {
-    url = "https://dotcolon.net/download/fonts/${self.pname}_${majorVersion}${minorVersion}.zip";
+    url = "https://dotcolon.net/download/fonts/${finalAttrs.pname}_${majorVersion}${minorVersion}.zip";
     hash = "sha256-sGb3mEb3g15ZiVCxEfAanly8zMUopLOOjw8W4qbXLPA=";
     stripRoot = false;
   };

From a7d91e68ac7a826c686148ee0dd39d5c64aee6d1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 26 Apr 2023 03:40:21 +0000
Subject: [PATCH 77/77] erigon: 2.42.0 -> 2.43.0

---
 pkgs/applications/blockchains/erigon/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/blockchains/erigon/default.nix b/pkgs/applications/blockchains/erigon/default.nix
index 3b489f8ace4c..8583fc8683fd 100644
--- a/pkgs/applications/blockchains/erigon/default.nix
+++ b/pkgs/applications/blockchains/erigon/default.nix
@@ -2,7 +2,7 @@
 
 let
   pname = "erigon";
-  version = "2.42.0";
+  version = "2.43.0";
 in
 buildGoModule {
   inherit pname version;
@@ -11,11 +11,11 @@ buildGoModule {
     owner = "ledgerwatch";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-M2u8/WKo1yZu27KjTJhJFqycCxCopJqtVQpIs9inswI=";
+    sha256 = "sha256-3o7vu2bA8lB1CiVaSF6YU9WjwNliQAK5AcGl82GCqFg=";
     fetchSubmodules = true;
   };
 
-  vendorSha256 = "sha256-Vyurf4wSN4zSDjcH8FC+OOiviiSjRVF4RId/eqFDd+c=";
+  vendorSha256 = "sha256-JhMefeUxo9ksyCnNsLgAhGG0Ix7kxCA/cYyiELd0H64=";
   proxyVendor = true;
 
   # Build errors in mdbx when format hardening is enabled: