From 0c09895790ebbebf73b637f531a71273112960a2 Mon Sep 17 00:00:00 2001
From: Will Cohen <willcohen@users.noreply.github.com>
Date: Tue, 14 Dec 2021 11:41:59 -0500
Subject: [PATCH 01/31] qscintilla-qt4: move qscintilla recipe here

---
 .../libraries/qscintilla-qt4/default.nix      | 70 +++++++++++++++++++
 .../fix-qt4-build.patch                       |  0
 2 files changed, 70 insertions(+)
 create mode 100644 pkgs/development/libraries/qscintilla-qt4/default.nix
 rename pkgs/development/libraries/{qscintilla => qscintilla-qt4}/fix-qt4-build.patch (100%)

diff --git a/pkgs/development/libraries/qscintilla-qt4/default.nix b/pkgs/development/libraries/qscintilla-qt4/default.nix
new file mode 100644
index 000000000000..fc2ef6c09a63
--- /dev/null
+++ b/pkgs/development/libraries/qscintilla-qt4/default.nix
@@ -0,0 +1,70 @@
+{ stdenv, lib, fetchurl, unzip
+, qt4 ? null, qmake4Hook ? null
+, withQt5 ? false, qtbase ? null, qtmacextras ? null, qmake ? null
+, fixDarwinDylibNames
+}:
+
+let
+  pname = "qscintilla-qt${if withQt5 then "5" else "4"}";
+  version = "2.11.6";
+
+in stdenv.mkDerivation rec {
+  inherit pname version;
+
+  src = fetchurl {
+    url = "https://www.riverbankcomputing.com/static/Downloads/QScintilla/${version}/QScintilla-${version}.tar.gz";
+    sha256 = "5zRgV9tH0vs4RGf6/M/LE6oHQTc8XVk7xytVsvDdIKc=";
+  };
+
+  sourceRoot = "QScintilla-${version}/Qt4Qt5";
+
+  buildInputs = [ (if withQt5 then qtbase else qt4) ];
+
+  propagatedBuildInputs = lib.optional (withQt5 && stdenv.isDarwin) qtmacextras;
+
+  nativeBuildInputs = [ unzip ]
+    ++ (if withQt5 then [ qmake ] else [ qmake4Hook ])
+    ++ lib.optional stdenv.isDarwin fixDarwinDylibNames;
+
+  patches = lib.optional (!withQt5) ./fix-qt4-build.patch;
+
+  # Make sure that libqscintilla2.so is available in $out/lib since it is expected
+  # by some packages such as sqlitebrowser
+  postFixup = ''
+    ln -s $out/lib/libqscintilla2_qt?.so $out/lib/libqscintilla2.so
+  '';
+
+  dontWrapQtApps = true;
+
+  postPatch = ''
+    substituteInPlace qscintilla.pro \
+      --replace '$$[QT_INSTALL_LIBS]'         $out/lib \
+      --replace '$$[QT_INSTALL_HEADERS]'      $out/include \
+      --replace '$$[QT_INSTALL_TRANSLATIONS]' $out/translations \
+      --replace '$$[QT_HOST_DATA]/mkspecs'    $out/mkspecs \
+      --replace '$$[QT_INSTALL_DATA]/mkspecs' $out/mkspecs \
+      --replace '$$[QT_INSTALL_DATA]'         $out/share${lib.optionalString (! withQt5) "/qt"}
+  '';
+
+  meta = with lib; {
+    description = "A Qt port of the Scintilla text editing library";
+    longDescription = ''
+      QScintilla is a port to Qt of Neil Hodgson's Scintilla C++ editor
+      control.
+
+      As well as features found in standard text editing components,
+      QScintilla includes features especially useful when editing and
+      debugging source code. These include support for syntax styling,
+      error indicators, code completion and call tips. The selection
+      margin can contain markers like those used in debuggers to
+      indicate breakpoints and the current line. Styling choices are
+      more open than with many editors, allowing the use of
+      proportional fonts, bold and italics, multiple foreground and
+      background colours and multiple fonts.
+    '';
+    homepage = "https://www.riverbankcomputing.com/software/qscintilla/intro";
+    license = with licenses; [ gpl3 ]; # and commercial
+    maintainers = with maintainers; [ peterhoeg ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/development/libraries/qscintilla/fix-qt4-build.patch b/pkgs/development/libraries/qscintilla-qt4/fix-qt4-build.patch
similarity index 100%
rename from pkgs/development/libraries/qscintilla/fix-qt4-build.patch
rename to pkgs/development/libraries/qscintilla-qt4/fix-qt4-build.patch

From f7a0145a933f3e5f55c2c43157f56729083bfa95 Mon Sep 17 00:00:00 2001
From: Will Cohen <willcohen@users.noreply.github.com>
Date: Tue, 14 Dec 2021 11:42:56 -0500
Subject: [PATCH 02/31] qscintilla: update to use Qt5 only

---
 .../libraries/qscintilla/default.nix          | 28 ++++++++-----------
 1 file changed, 12 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/libraries/qscintilla/default.nix b/pkgs/development/libraries/qscintilla/default.nix
index fc2ef6c09a63..bebe637be9b5 100644
--- a/pkgs/development/libraries/qscintilla/default.nix
+++ b/pkgs/development/libraries/qscintilla/default.nix
@@ -1,33 +1,30 @@
 { stdenv, lib, fetchurl, unzip
-, qt4 ? null, qmake4Hook ? null
-, withQt5 ? false, qtbase ? null, qtmacextras ? null, qmake ? null
+, withQt5 ? true, qtbase, qtmacextras ? null
+, qmake
 , fixDarwinDylibNames
 }:
 
 let
-  pname = "qscintilla-qt${if withQt5 then "5" else "4"}";
-  version = "2.11.6";
+  pname = "qscintilla-qt5";
+  version = "2.13.1";
 
 in stdenv.mkDerivation rec {
   inherit pname version;
 
   src = fetchurl {
-    url = "https://www.riverbankcomputing.com/static/Downloads/QScintilla/${version}/QScintilla-${version}.tar.gz";
-    sha256 = "5zRgV9tH0vs4RGf6/M/LE6oHQTc8XVk7xytVsvDdIKc=";
+    url = "https://www.riverbankcomputing.com/static/Downloads/QScintilla/${version}/QScintilla_src-${version}.tar.gz";
+    sha256 = "gA49IHGpa8zNdYE0avDS/ij8MM1oUwy4MCaF0BOv1Uo=";
   };
 
-  sourceRoot = "QScintilla-${version}/Qt4Qt5";
+  sourceRoot = "QScintilla_src-${version}/src";
 
-  buildInputs = [ (if withQt5 then qtbase else qt4) ];
+  buildInputs = [ qtbase ];
 
-  propagatedBuildInputs = lib.optional (withQt5 && stdenv.isDarwin) qtmacextras;
+  propagatedBuildInputs = lib.optional stdenv.isDarwin qtmacextras;
 
-  nativeBuildInputs = [ unzip ]
-    ++ (if withQt5 then [ qmake ] else [ qmake4Hook ])
+  nativeBuildInputs = [ unzip qmake ]
     ++ lib.optional stdenv.isDarwin fixDarwinDylibNames;
 
-  patches = lib.optional (!withQt5) ./fix-qt4-build.patch;
-
   # Make sure that libqscintilla2.so is available in $out/lib since it is expected
   # by some packages such as sqlitebrowser
   postFixup = ''
@@ -36,14 +33,13 @@ in stdenv.mkDerivation rec {
 
   dontWrapQtApps = true;
 
-  postPatch = ''
+  preConfigure = ''
     substituteInPlace qscintilla.pro \
       --replace '$$[QT_INSTALL_LIBS]'         $out/lib \
       --replace '$$[QT_INSTALL_HEADERS]'      $out/include \
       --replace '$$[QT_INSTALL_TRANSLATIONS]' $out/translations \
       --replace '$$[QT_HOST_DATA]/mkspecs'    $out/mkspecs \
-      --replace '$$[QT_INSTALL_DATA]/mkspecs' $out/mkspecs \
-      --replace '$$[QT_INSTALL_DATA]'         $out/share${lib.optionalString (! withQt5) "/qt"}
+      --replace '$$[QT_INSTALL_DATA]'         $out/share
   '';
 
   meta = with lib; {

From fde6436feb1fb695913b675add3e79b13bd2ce3a Mon Sep 17 00:00:00 2001
From: Will Cohen <willcohen@users.noreply.github.com>
Date: Tue, 14 Dec 2021 11:43:51 -0500
Subject: [PATCH 03/31] pythonPackages.qscintilla-qt4: put qscintilla here

---
 .../python-modules/qscintilla-qt4/default.nix | 43 +++++++++++++++++++
 1 file changed, 43 insertions(+)
 create mode 100644 pkgs/development/python-modules/qscintilla-qt4/default.nix

diff --git a/pkgs/development/python-modules/qscintilla-qt4/default.nix b/pkgs/development/python-modules/qscintilla-qt4/default.nix
new file mode 100644
index 000000000000..24719de779eb
--- /dev/null
+++ b/pkgs/development/python-modules/qscintilla-qt4/default.nix
@@ -0,0 +1,43 @@
+{ lib
+, buildPythonPackage
+, disabledIf
+, isPy3k
+, isPyPy
+, pkgs
+, python
+, pyqt4
+}:
+
+disabledIf (isPy3k || isPyPy)
+  (buildPythonPackage {
+    # TODO: Qt5 support
+    pname = "qscintilla";
+    version = pkgs.qscintilla.version;
+    format = "other";
+
+    src = pkgs.qscintilla.src;
+
+    nativeBuildInputs = [ pkgs.xorg.lndir ];
+
+    buildInputs = [ pyqt4.qt pyqt4 ];
+
+    preConfigure = ''
+      mkdir -p $out
+      lndir ${pyqt4} $out
+      rm -rf "$out/nix-support"
+      cd Python
+      ${python.executable} ./configure-old.py \
+          --destdir $out/lib/${python.libPrefix}/site-packages/PyQt4 \
+          --apidir $out/api/${python.libPrefix} \
+          -n ${pkgs.qscintilla}/include \
+          -o ${pkgs.qscintilla}/lib \
+          --sipdir $out/share/sip
+    '';
+
+    meta = with lib; {
+      description = "A Python binding to QScintilla, Qt based text editing control";
+      license = licenses.lgpl21Plus;
+      maintainers = with maintainers; [ danbst ];
+      platforms = platforms.unix;
+    };
+  })

From aa44e613ef8b1ace137837ca14f0d74f5c98a98e Mon Sep 17 00:00:00 2001
From: Will Cohen <willcohen@users.noreply.github.com>
Date: Tue, 14 Dec 2021 11:44:55 -0500
Subject: [PATCH 04/31] pythonPackages.qscintilla-qt5: use pyproject

---
 .../python-modules/qscintilla-qt5/default.nix | 73 ++++++++++++-------
 1 file changed, 45 insertions(+), 28 deletions(-)

diff --git a/pkgs/development/python-modules/qscintilla-qt5/default.nix b/pkgs/development/python-modules/qscintilla-qt5/default.nix
index 70ee43089134..b3fb0644824e 100644
--- a/pkgs/development/python-modules/qscintilla-qt5/default.nix
+++ b/pkgs/development/python-modules/qscintilla-qt5/default.nix
@@ -2,51 +2,68 @@
 , pythonPackages
 , qscintilla
 , qtbase
+, qmake
+, qtmacextras ? null
+, stdenv
 }:
 
 let
-  inherit (pythonPackages) buildPythonPackage isPy3k python sip_4 pyqt5;
+  inherit (pythonPackages) buildPythonPackage isPy3k python sip sipbuild pyqt5 pyqt-builder;
 in buildPythonPackage rec {
   pname = "qscintilla";
   version = qscintilla.version;
   src = qscintilla.src;
-  format = "other";
+  format = "pyproject";
 
   disabled = !isPy3k;
 
-  nativeBuildInputs = [ sip_4 qtbase ];
-  buildInputs = [ qscintilla ];
-  propagatedBuildInputs = [ pyqt5 ];
+  nativeBuildInputs = [ sip qmake pyqt-builder ];
+  buildInputs = [ qtbase qscintilla ];
+  propagatedBuildInputs = [ pyqt5 pyqt5 ] ++ lib.optional (stdenv.isDarwin) qtmacextras;
 
   dontWrapQtApps = true;
 
+  # postPatch = ''
+  #   substituteInPlace Python/configure.py \
+  #     --replace \
+  #     "target_config.py_module_dir" \
+  #     "'$out/${python.sitePackages}'"
+  # '';
+  #
+
+  qsciFeaturesDir = qscintilla + "/mkspecs/features";
+  qsciIncludeDir = qscintilla + "/include";
+  qsciLibraryDir = qscintilla + "/lib";
+  sipIncludeDirs = pyqt5 + "/" + python.sitePackages + "/PyQt5/bindings";
+  apiDir = qscintilla + "/share";
+
   postPatch = ''
-    substituteInPlace Python/configure.py \
-      --replace \
-      "target_config.py_module_dir" \
-      "'$out/${python.sitePackages}'"
-  '';
-
-  preConfigure = ''
-    # configure.py will look for this folder
-    mkdir -p $out/share/sip/PyQt5
-
     cd Python
-    substituteInPlace configure.py \
-      --replace "qmake = {'CONFIG': 'qscintilla2'}" "qmake = {'CONFIG': 'qscintilla2', 'QT': 'widgets printsupport'}"
-    ${python.executable} ./configure.py \
-      --pyqt=PyQt5 \
-      --destdir=$out/${python.sitePackages}/PyQt5 \
-      --stubsdir=$out/${python.sitePackages}/PyQt5 \
-      --apidir=$out/api/${python.libPrefix} \
-      --qsci-incdir=${qscintilla}/include \
-      --qsci-featuresdir=${qscintilla}/mkspecs/features \
-      --qsci-libdir=${qscintilla}/lib \
-      --pyqt-sipdir=${pyqt5}/${python.sitePackages}/PyQt5/bindings \
-      --qsci-sipdir=$out/share/sip/PyQt5 \
-      --sip-incdir=${sip_4}/include
+    cp pyproject-qt5.toml pyproject.toml
+    echo '[tool.sip.project]' >> pyproject.toml
+    echo 'sip-include-dirs = [ "${sipIncludeDirs}" ]' >> pyproject.toml
   '';
 
+  dontConfigure = true;
+    # substituteInPlace configure.py \
+    #   --replace "qmake = {'CONFIG': 'qscintilla2'}" "qmake = {'CONFIG': 'qscintilla2', 'QT': 'widgets printsupport'}"
+    # ${python.executable} ./configure.py \
+    #   --pyqt=PyQt5 \
+    #   --destdir=$out/${python.sitePackages}/PyQt5 \
+    #   --stubsdir=$out/${python.sitePackages}/PyQt5 \
+    #   --apidir=$out/api/${python.libPrefix} \
+    #   --qsci-incdir=${qscintilla}/include \
+    #   --qsci-featuresdir=${qscintilla}/mkspecs/features \
+    #   --qsci-libdir=${qscintilla}/lib \
+    #   --pyqt-sipdir=${pyqt5}/${python.sitePackages}/PyQt5/bindings \
+    #   --qsci-sipdir=$out/share/sip/PyQt5 \
+    #   --sip-incdir=${sip}/include
+    #
+
+  build = "sip-install --qsci-features-dir ${qsciFeaturesDir} --qsci-include-dir ${qsciIncludeDir} \
+           --qsci-library-dir ${qsciLibraryDir} --api-dir ${apiDir}" + lib.optionalString stdenv.isDarwin
+           " --qmake-setting 'QT += widgets'";
+
   postInstall = ''
     # Needed by pythonImportsCheck to find the module
     export PYTHONPATH="$out/${python.sitePackages}:$PYTHONPATH"

From 7a7a18064ae40a75bb09e317d93b5bac83ae12ba Mon Sep 17 00:00:00 2001
From: Will Cohen <willcohen@users.noreply.github.com>
Date: Tue, 14 Dec 2021 11:46:09 -0500
Subject: [PATCH 05/31] qscintilla: default to Qt5

---
 pkgs/top-level/all-packages.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0cfe37021e46..48e1881a6c68 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9092,7 +9092,15 @@ with pkgs;
 
   qprint = callPackage ../tools/text/qprint { };
 
-  qscintilla = callPackage ../development/libraries/qscintilla { };
+  qscintilla = if stdenv.isDarwin then
+    callPackage ../development/libraries/qscintilla {
+      inherit (qt5) qmake qtbase qtmacextras;
+  } else
+    callPackage ../development/libraries/qscintilla {
+      inherit (qt5) qmake qtbase;
+  };
+
+  qscintilla-qt4 = callPackage ../development/libraries/qscintilla-qt4 { };
 
   qshowdiff = callPackage ../tools/text/qshowdiff { };
 

From b1964626fbae34612e37faf1df7466f2a4ab462a Mon Sep 17 00:00:00 2001
From: Will Cohen <willcohen@users.noreply.github.com>
Date: Tue, 14 Dec 2021 11:46:44 -0500
Subject: [PATCH 06/31] pythonPackages.qscintilla: default to Qt5

---
 pkgs/top-level/python-packages.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 622dbecc206a..56f6dfe420cc 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8287,13 +8287,14 @@ in {
 
   qreactor = callPackage ../development/python-modules/qreactor { };
 
-  qscintilla-qt4 = callPackage ../development/python-modules/qscintilla { };
+  qscintilla-qt4 = callPackage ../development/python-modules/qscintilla-qt4 { };
 
   qscintilla-qt5 = pkgs.libsForQt5.callPackage ../development/python-modules/qscintilla-qt5 {
+    inherit (pkgs.qt5) qtbase;
     pythonPackages = self;
   };
 
-  qscintilla = self.qscintilla-qt4;
+  qscintilla = self.qscintilla-qt5;
 
   qtawesome = callPackage ../development/python-modules/qtawesome { };
 

From c39ac297240440bb863ff2148b8f28bdc6819c6f Mon Sep 17 00:00:00 2001
From: Will Cohen <willcohen@users.noreply.github.com>
Date: Tue, 14 Dec 2021 13:26:23 -0500
Subject: [PATCH 07/31] pythonPackages.qscintilla-qt5: fix darwin make

---
 .../python-modules/qscintilla-qt5/default.nix  | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/qscintilla-qt5/default.nix b/pkgs/development/python-modules/qscintilla-qt5/default.nix
index b3fb0644824e..3ccb9a22d370 100644
--- a/pkgs/development/python-modules/qscintilla-qt5/default.nix
+++ b/pkgs/development/python-modules/qscintilla-qt5/default.nix
@@ -19,7 +19,7 @@ in buildPythonPackage rec {
 
   nativeBuildInputs = [ sip qmake pyqt-builder ];
   buildInputs = [ qtbase qscintilla ];
-  propagatedBuildInputs = [ pyqt5 pyqt5 ] ++ lib.optional (stdenv.isDarwin) qtmacextras;
+  propagatedBuildInputs = [ pyqt5 ] ++ lib.optional (stdenv.isDarwin) qtmacextras;
 
   dontWrapQtApps = true;
 
@@ -41,7 +41,18 @@ in buildPythonPackage rec {
     cd Python
     cp pyproject-qt5.toml pyproject.toml
     echo '[tool.sip.project]' >> pyproject.toml
-    echo 'sip-include-dirs = [ "${sipIncludeDirs}" ]' >> pyproject.toml
+    echo 'sip-include-dirs = [ "${sipIncludeDirs}"]' >> pyproject.toml
+  '' + lib.optionalString stdenv.isDarwin ''
+    substituteInPlace project.py \
+      --replace \
+      "if self.project.qsci_external_lib:
+                if self.qsci_features_dir is not None:" \
+      "if self.project.qsci_external_lib:
+                self.builder_settings.append('QT += widgets')
+
+                self.builder_settings.append('QT += printsupport')
+
+                if self.qsci_features_dir is not None:"
   '';
 
   dontConfigure = true;
@@ -61,8 +72,7 @@ in buildPythonPackage rec {
     #
 
   build = "sip-install --qsci-features-dir ${qsciFeaturesDir} --qsci-include-dir ${qsciIncludeDir} \
-           --qsci-library-dir ${qsciLibraryDir} --api-dir ${apiDir}" + lib.optionalString stdenv.isDarwin
-           " --qmake-setting 'QT += widgets'";
+           --qsci-library-dir ${qsciLibraryDir} --api-dir ${apiDir}";
 
   postInstall = ''
     # Needed by pythonImportsCheck to find the module

From b83d9bd7050f54170d6a537db200cfd7f46acee8 Mon Sep 17 00:00:00 2001
From: Will Cohen <willcohen@users.noreply.github.com>
Date: Tue, 14 Dec 2021 16:10:35 -0500
Subject: [PATCH 08/31] pythonPackages.qscintilla-qt5: fix darwin linking

---
 .../python-modules/qscintilla-qt5/default.nix | 43 ++++---------------
 1 file changed, 9 insertions(+), 34 deletions(-)

diff --git a/pkgs/development/python-modules/qscintilla-qt5/default.nix b/pkgs/development/python-modules/qscintilla-qt5/default.nix
index 3ccb9a22d370..afc684b3b0e8 100644
--- a/pkgs/development/python-modules/qscintilla-qt5/default.nix
+++ b/pkgs/development/python-modules/qscintilla-qt5/default.nix
@@ -17,31 +17,18 @@ in buildPythonPackage rec {
 
   disabled = !isPy3k;
 
-  nativeBuildInputs = [ sip qmake pyqt-builder ];
-  buildInputs = [ qtbase qscintilla ];
+  nativeBuildInputs = [ sip qmake pyqt-builder qscintilla ];
+  buildInputs = [ qtbase ];
   propagatedBuildInputs = [ pyqt5 ] ++ lib.optional (stdenv.isDarwin) qtmacextras;
 
   dontWrapQtApps = true;
 
-  # postPatch = ''
-  #   substituteInPlace Python/configure.py \
-  #     --replace \
-  #     "target_config.py_module_dir" \
-  #     "'$out/${python.sitePackages}'"
-  # '';
-  #
-
-  qsciFeaturesDir = qscintilla + "/mkspecs/features";
-  qsciIncludeDir = qscintilla + "/include";
-  qsciLibraryDir = qscintilla + "/lib";
-  sipIncludeDirs = pyqt5 + "/" + python.sitePackages + "/PyQt5/bindings";
-  apiDir = qscintilla + "/share";
-
   postPatch = ''
     cd Python
     cp pyproject-qt5.toml pyproject.toml
     echo '[tool.sip.project]' >> pyproject.toml
-    echo 'sip-include-dirs = [ "${sipIncludeDirs}"]' >> pyproject.toml
+    echo 'sip-include-dirs = [ "${pyqt5}/${python.sitePackages}/PyQt5/bindings"]' \
+       >> pyproject.toml
   '' + lib.optionalString stdenv.isDarwin ''
     substituteInPlace project.py \
       --replace \
@@ -56,24 +43,12 @@ in buildPythonPackage rec {
   '';
 
   dontConfigure = true;
-    # substituteInPlace configure.py \
-    #   --replace "qmake = {'CONFIG': 'qscintilla2'}" "qmake = {'CONFIG': 'qscintilla2', 'QT': 'widgets printsupport'}"
-    # ${python.executable} ./configure.py \
-    #   --pyqt=PyQt5 \
-    #   --destdir=$out/${python.sitePackages}/PyQt5 \
-    #   --stubsdir=$out/${python.sitePackages}/PyQt5 \
-    #   --apidir=$out/api/${python.libPrefix} \
-    #   --qsci-incdir=${qscintilla}/include \
-    #   --qsci-featuresdir=${qscintilla}/mkspecs/features \
-    #   --qsci-libdir=${qscintilla}/lib \
-    #   --pyqt-sipdir=${pyqt5}/${python.sitePackages}/PyQt5/bindings \
-    #   --qsci-sipdir=$out/share/sip/PyQt5 \
-    #   --sip-incdir=${sip}/include
-    #
-
-  build = "sip-install --qsci-features-dir ${qsciFeaturesDir} --qsci-include-dir ${qsciIncludeDir} \
-           --qsci-library-dir ${qsciLibraryDir} --api-dir ${apiDir}";
 
+  build = ''
+    sip-install --qsci-features-dir ${qscintilla}/mkspecs/features \
+    --qsci-include-dir ${qscintilla}/include \
+    --qsci-library-dir ${qscintilla}/lib --api-dir ${qscintilla}/share";
+  '';
   postInstall = ''
     # Needed by pythonImportsCheck to find the module
     export PYTHONPATH="$out/${python.sitePackages}:$PYTHONPATH"

From 06d2d8bc2d2093ee74e89d67d899bb4e3ec12ba1 Mon Sep 17 00:00:00 2001
From: Will Cohen <willcohen@users.noreply.github.com>
Date: Tue, 14 Dec 2021 16:20:11 -0500
Subject: [PATCH 09/31] miniaudicle: specify use of qscintilla-qt4

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

diff --git a/pkgs/applications/audio/miniaudicle/default.nix b/pkgs/applications/audio/miniaudicle/default.nix
index 90821b014764..e469a96ab720 100644
--- a/pkgs/applications/audio/miniaudicle/default.nix
+++ b/pkgs/applications/audio/miniaudicle/default.nix
@@ -7,7 +7,7 @@
 , alsa-lib
 , libsndfile
 , qt4
-, qscintilla
+, qscintilla-qt4
 , libpulseaudio
 , libjack2
 , audioBackend ? "pulse" # "pulse", "alsa", or "jack"
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
     alsa-lib
     libsndfile
     qt4
-    qscintilla
+    qscintilla-qt4
   ] ++ lib.optional (audioBackend == "pulse") libpulseaudio
     ++ lib.optional (audioBackend == "jack")  libjack2;
 

From 693a0e84b2135cd55f760da9c5da68941b40732b Mon Sep 17 00:00:00 2001
From: Will Cohen <willcohen@users.noreply.github.com>
Date: Tue, 14 Dec 2021 16:20:56 -0500
Subject: [PATCH 10/31] sqliteman: specify use of qscintilla-qt4

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

diff --git a/pkgs/applications/misc/sqliteman/default.nix b/pkgs/applications/misc/sqliteman/default.nix
index a0ddf8db053e..556c635e60b4 100644
--- a/pkgs/applications/misc/sqliteman/default.nix
+++ b/pkgs/applications/misc/sqliteman/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, cmake, qt4, qscintilla }:
+{ lib, stdenv, fetchFromGitHub, cmake, qt4, qscintilla-qt4 }:
 
 stdenv.mkDerivation rec {
   pname = "sqliteman";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ cmake ];
-  buildInputs = [ qt4 qscintilla ];
+  buildInputs = [ qt4 qscintilla-qt4 ];
 
   prePatch = ''
     sed -i 's,m_file(0),m_file(QString()),' Sqliteman/sqliteman/main.cpp
@@ -20,8 +20,8 @@ stdenv.mkDerivation rec {
 
   preConfigure = ''
     cd Sqliteman
-    sed -i 's,/usr/include/Qsci,${qscintilla}/include/Qsci,' cmake/modules/FindQScintilla.cmake
-    sed -i 's,PATHS ''${QT_LIBRARY_DIR},PATHS ${qscintilla}/libs,' cmake/modules/FindQScintilla.cmake
+    sed -i 's,/usr/include/Qsci,${qscintilla-qt4}/include/Qsci,' cmake/modules/FindQScintilla.cmake
+    sed -i 's,PATHS ''${QT_LIBRARY_DIR},PATHS ${qscintilla-qt4}/libs,' cmake/modules/FindQScintilla.cmake
   '';
 
   meta = with lib; {

From 2cdbb565adbed90914eb2ea417b834837af10378 Mon Sep 17 00:00:00 2001
From: Will Cohen <willcohen@users.noreply.github.com>
Date: Tue, 14 Dec 2021 22:17:02 -0500
Subject: [PATCH 11/31] qgis: update QSCI_SIP_DIR location

---
 pkgs/applications/gis/qgis/unwrapped.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/gis/qgis/unwrapped.nix b/pkgs/applications/gis/qgis/unwrapped.nix
index 0ec81c785b4b..14bafb6c51bc 100644
--- a/pkgs/applications/gis/qgis/unwrapped.nix
+++ b/pkgs/applications/gis/qgis/unwrapped.nix
@@ -114,7 +114,7 @@ in mkDerivation rec {
   cmakeFlags = [
     "-DCMAKE_SKIP_BUILD_RPATH=OFF"
     "-DPYQT5_SIP_DIR=${python3Packages.pyqt5}/${python3Packages.python.sitePackages}/PyQt5/bindings"
-    "-DQSCI_SIP_DIR=${python3Packages.qscintilla-qt5}/share/sip/PyQt5"
+    "-DQSCI_SIP_DIR=${python3Packages.qscintilla-qt5}/${python3Packages.python.sitePackages}/PyQt5/bindings"
   ] ++ lib.optional (!withWebKit) "-DWITH_QTWEBKIT=OFF"
     ++ lib.optional withGrass "-DGRASS_PREFIX7=${grass}/${grass.name}";
 

From 9d8903bab640891b1655023eef3da939618cea32 Mon Sep 17 00:00:00 2001
From: Will Cohen <willcohen@users.noreply.github.com>
Date: Wed, 15 Dec 2021 11:07:15 -0500
Subject: [PATCH 12/31] qscintilla-qt4: Remove qt5/darwin support

---
 .../libraries/qscintilla-qt4/default.nix      | 21 +++++++------------
 .../python-modules/qscintilla-qt4/default.nix |  3 +--
 2 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/libraries/qscintilla-qt4/default.nix b/pkgs/development/libraries/qscintilla-qt4/default.nix
index fc2ef6c09a63..c74a9b9d1900 100644
--- a/pkgs/development/libraries/qscintilla-qt4/default.nix
+++ b/pkgs/development/libraries/qscintilla-qt4/default.nix
@@ -1,11 +1,8 @@
-{ stdenv, lib, fetchurl, unzip
-, qt4 ? null, qmake4Hook ? null
-, withQt5 ? false, qtbase ? null, qtmacextras ? null, qmake ? null
-, fixDarwinDylibNames
+{ stdenv, lib, fetchurl, unzip, qt4, qmake4Hook
 }:
 
 let
-  pname = "qscintilla-qt${if withQt5 then "5" else "4"}";
+  pname = "qscintilla-qt4";
   version = "2.11.6";
 
 in stdenv.mkDerivation rec {
@@ -18,15 +15,11 @@ in stdenv.mkDerivation rec {
 
   sourceRoot = "QScintilla-${version}/Qt4Qt5";
 
-  buildInputs = [ (if withQt5 then qtbase else qt4) ];
+  buildInputs = [ qt4 ];
 
-  propagatedBuildInputs = lib.optional (withQt5 && stdenv.isDarwin) qtmacextras;
+  nativeBuildInputs = [ unzip qmake4Hook ];
 
-  nativeBuildInputs = [ unzip ]
-    ++ (if withQt5 then [ qmake ] else [ qmake4Hook ])
-    ++ lib.optional stdenv.isDarwin fixDarwinDylibNames;
-
-  patches = lib.optional (!withQt5) ./fix-qt4-build.patch;
+  patches = ./fix-qt4-build.patch;
 
   # Make sure that libqscintilla2.so is available in $out/lib since it is expected
   # by some packages such as sqlitebrowser
@@ -43,7 +36,7 @@ in stdenv.mkDerivation rec {
       --replace '$$[QT_INSTALL_TRANSLATIONS]' $out/translations \
       --replace '$$[QT_HOST_DATA]/mkspecs'    $out/mkspecs \
       --replace '$$[QT_INSTALL_DATA]/mkspecs' $out/mkspecs \
-      --replace '$$[QT_INSTALL_DATA]'         $out/share${lib.optionalString (! withQt5) "/qt"}
+      --replace '$$[QT_INSTALL_DATA]'         $out/share
   '';
 
   meta = with lib; {
@@ -65,6 +58,6 @@ in stdenv.mkDerivation rec {
     homepage = "https://www.riverbankcomputing.com/software/qscintilla/intro";
     license = with licenses; [ gpl3 ]; # and commercial
     maintainers = with maintainers; [ peterhoeg ];
-    platforms = platforms.unix;
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/development/python-modules/qscintilla-qt4/default.nix b/pkgs/development/python-modules/qscintilla-qt4/default.nix
index 24719de779eb..bc3f3596923f 100644
--- a/pkgs/development/python-modules/qscintilla-qt4/default.nix
+++ b/pkgs/development/python-modules/qscintilla-qt4/default.nix
@@ -10,7 +10,6 @@
 
 disabledIf (isPy3k || isPyPy)
   (buildPythonPackage {
-    # TODO: Qt5 support
     pname = "qscintilla";
     version = pkgs.qscintilla.version;
     format = "other";
@@ -38,6 +37,6 @@ disabledIf (isPy3k || isPyPy)
       description = "A Python binding to QScintilla, Qt based text editing control";
       license = licenses.lgpl21Plus;
       maintainers = with maintainers; [ danbst ];
-      platforms = platforms.unix;
+      platforms = platforms.linux;
     };
   })

From 24522dcd0fa808ef34b486363a578d1af3118ead Mon Sep 17 00:00:00 2001
From: Will Cohen <willcohen@users.noreply.github.com>
Date: Wed, 15 Dec 2021 11:22:46 -0500
Subject: [PATCH 13/31] qscintilla: migrate to libsForQt5.qscintilla

---
 pkgs/top-level/all-packages.nix | 14 ++++----------
 pkgs/top-level/qt5-packages.nix |  9 +++++++--
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 48e1881a6c68..19b7b1dbd0b6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9092,13 +9092,7 @@ with pkgs;
 
   qprint = callPackage ../tools/text/qprint { };
 
-  qscintilla = if stdenv.isDarwin then
-    callPackage ../development/libraries/qscintilla {
-      inherit (qt5) qmake qtbase qtmacextras;
-  } else
-    callPackage ../development/libraries/qscintilla {
-      inherit (qt5) qmake qtbase;
-  };
+  qscintilla = libsForQt5.callPackage ../development/libraries/qscintilla { };
 
   qscintilla-qt4 = callPackage ../development/libraries/qscintilla-qt4 { };
 
@@ -19500,17 +19494,17 @@ with pkgs;
     });
 
   libsForQt512 = recurseIntoAttrs (import ./qt5-packages.nix {
-    inherit lib pkgs;
+    inherit lib pkgs stdenv;
     qt5 = qt512;
   });
 
   libsForQt514 = recurseIntoAttrs (import ./qt5-packages.nix {
-    inherit lib pkgs;
+    inherit lib pkgs stdenv;
     qt5 = qt514;
   });
 
   libsForQt515 = recurseIntoAttrs (import ./qt5-packages.nix {
-    inherit lib pkgs;
+    inherit lib pkgs stdenv;
     qt5 = qt515;
   });
 
diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix
index a2bd8dc6a547..5579461a712b 100644
--- a/pkgs/top-level/qt5-packages.nix
+++ b/pkgs/top-level/qt5-packages.nix
@@ -9,6 +9,7 @@
 { lib
 , pkgs
 , qt5
+, stdenv
 }:
 
 (lib.makeScope pkgs.newScope ( self:
@@ -190,8 +191,12 @@ in (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdParty // kdeGea
 
   qoauth = callPackage ../development/libraries/qoauth { };
 
-  qscintilla = callPackage ../development/libraries/qscintilla {
-    withQt5 = true;
+  qscintilla = if stdenv.isDarwin then
+    callPackage ../development/libraries/qscintilla {
+      inherit (qt5) qmake qtbase qtmacextras;
+  } else
+    callPackage ../development/libraries/qscintilla {
+      inherit (qt5) qmake qtbase;
   };
 
   qt5ct = callPackage ../tools/misc/qt5ct { };

From 8dfa5168245896a50e2ba0168d17715e949cc802 Mon Sep 17 00:00:00 2001
From: Will Cohen <willcohen@users.noreply.github.com>
Date: Wed, 5 Jan 2022 18:49:47 -0500
Subject: [PATCH 14/31] qscintilla, python3Packages.qscintilla-qt5: syntax

- Cleanup top-level package calls to remove unnecessary darwin
  logic and inherit statements
- Remove unnecessary let blocks in qscintilla and qscintilla-qt4
- Remove mention of withQt5
---
 pkgs/development/libraries/qscintilla-qt4/default.nix | 5 +----
 pkgs/development/libraries/qscintilla/default.nix     | 7 ++-----
 pkgs/top-level/python-packages.nix                    | 1 -
 pkgs/top-level/qt5-packages.nix                       | 8 +-------
 4 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/pkgs/development/libraries/qscintilla-qt4/default.nix b/pkgs/development/libraries/qscintilla-qt4/default.nix
index c74a9b9d1900..7cefdec97ca2 100644
--- a/pkgs/development/libraries/qscintilla-qt4/default.nix
+++ b/pkgs/development/libraries/qscintilla-qt4/default.nix
@@ -1,13 +1,10 @@
 { stdenv, lib, fetchurl, unzip, qt4, qmake4Hook
 }:
 
-let
+stdenv.mkDerivation rec {
   pname = "qscintilla-qt4";
   version = "2.11.6";
 
-in stdenv.mkDerivation rec {
-  inherit pname version;
-
   src = fetchurl {
     url = "https://www.riverbankcomputing.com/static/Downloads/QScintilla/${version}/QScintilla-${version}.tar.gz";
     sha256 = "5zRgV9tH0vs4RGf6/M/LE6oHQTc8XVk7xytVsvDdIKc=";
diff --git a/pkgs/development/libraries/qscintilla/default.nix b/pkgs/development/libraries/qscintilla/default.nix
index bebe637be9b5..332d61c1c4a3 100644
--- a/pkgs/development/libraries/qscintilla/default.nix
+++ b/pkgs/development/libraries/qscintilla/default.nix
@@ -1,16 +1,13 @@
 { stdenv, lib, fetchurl, unzip
-, withQt5 ? true, qtbase, qtmacextras ? null
+, qtbase, qtmacextras
 , qmake
 , fixDarwinDylibNames
 }:
 
-let
+stdenv.mkDerivation rec {
   pname = "qscintilla-qt5";
   version = "2.13.1";
 
-in stdenv.mkDerivation rec {
-  inherit pname version;
-
   src = fetchurl {
     url = "https://www.riverbankcomputing.com/static/Downloads/QScintilla/${version}/QScintilla_src-${version}.tar.gz";
     sha256 = "gA49IHGpa8zNdYE0avDS/ij8MM1oUwy4MCaF0BOv1Uo=";
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 56f6dfe420cc..0fc093f20c12 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8290,7 +8290,6 @@ in {
   qscintilla-qt4 = callPackage ../development/python-modules/qscintilla-qt4 { };
 
   qscintilla-qt5 = pkgs.libsForQt5.callPackage ../development/python-modules/qscintilla-qt5 {
-    inherit (pkgs.qt5) qtbase;
     pythonPackages = self;
   };
 
diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix
index 5579461a712b..814d58dcd211 100644
--- a/pkgs/top-level/qt5-packages.nix
+++ b/pkgs/top-level/qt5-packages.nix
@@ -191,13 +191,7 @@ in (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdParty // kdeGea
 
   qoauth = callPackage ../development/libraries/qoauth { };
 
-  qscintilla = if stdenv.isDarwin then
-    callPackage ../development/libraries/qscintilla {
-      inherit (qt5) qmake qtbase qtmacextras;
-  } else
-    callPackage ../development/libraries/qscintilla {
-      inherit (qt5) qmake qtbase;
-  };
+  qscintilla = callPackage ../development/libraries/qscintilla { };
 
   qt5ct = callPackage ../tools/misc/qt5ct { };
 

From 58703232948d8200099930c009842cea835f63c1 Mon Sep 17 00:00:00 2001
From: Johannes Schleifenbaum <johannes@js-webcoding.de>
Date: Thu, 6 Jan 2022 08:56:00 +0100
Subject: [PATCH 15/31] libreddit: 0.21.4 -> 0.21.7

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

diff --git a/pkgs/servers/libreddit/default.nix b/pkgs/servers/libreddit/default.nix
index 5ad43a89522f..121eeb991f93 100644
--- a/pkgs/servers/libreddit/default.nix
+++ b/pkgs/servers/libreddit/default.nix
@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "libreddit";
-  version = "0.21.4";
+  version = "0.21.7";
 
   src = fetchFromGitHub {
     owner = "spikecodes";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-9Qr1afzp5BwcnJ4WjACJQk4NA81JTnNBmZZNFMZ6FvU=";
+    sha256 = "sha256-pALPhSoamsU5xEbSoXFe+Cikl16gxTXccUATMkYB97M=";
   };
 
-  cargoSha256 = "sha256-HD6asNFb0ZICeXnUwF4ZZ568GJRPeSy4XwflpIuWJw8=";
+  cargoSha256 = "sha256-/P8wyFPCcCoGINtJ0qom3xLlkunH6xZPd7/7ynXmTy4=";
 
   buildInputs = lib.optional stdenv.isDarwin Security;
 

From 4fabed4488c1c0b88642fadf540d7e92d79aa426 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 6 Jan 2022 10:30:23 +0100
Subject: [PATCH 16/31] python3Packages.meshtastic: 1.2.51 -> 1.2.52

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

diff --git a/pkgs/development/python-modules/meshtastic/default.nix b/pkgs/development/python-modules/meshtastic/default.nix
index 0d1e17afc386..95e1a3e3316a 100644
--- a/pkgs/development/python-modules/meshtastic/default.nix
+++ b/pkgs/development/python-modules/meshtastic/default.nix
@@ -18,7 +18,7 @@
 
 buildPythonPackage rec {
   pname = "meshtastic";
-  version = "1.2.51";
+  version = "1.2.52";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
     owner = "meshtastic";
     repo = "Meshtastic-python";
     rev = version;
-    sha256 = "sha256-CMoa7FQnGTWS14WmWvuryO2bKMWC05PBIDBlEWRjNRA=";
+    sha256 = "sha256-PSacL0ze+TvNBHj+HIpaoy8GxnklFwFrNztEso6lwqU=";
   };
 
   propagatedBuildInputs = [

From 40bf36ec59101baee8a9318df5de0bee8688df39 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 6 Jan 2022 12:16:27 +0000
Subject: [PATCH 17/31] python38Packages.geoalchemy2: 0.10.0 -> 0.10.1

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

diff --git a/pkgs/development/python-modules/geoalchemy2/default.nix b/pkgs/development/python-modules/geoalchemy2/default.nix
index d32eea8cedbc..b6890fe3fdbc 100644
--- a/pkgs/development/python-modules/geoalchemy2/default.nix
+++ b/pkgs/development/python-modules/geoalchemy2/default.nix
@@ -11,12 +11,12 @@
 
 buildPythonPackage rec {
   pname = "GeoAlchemy2";
-  version = "0.10.0";
+  version = "0.10.1";
   format = "setuptools";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "d97f85a4ff84341c12b1d7a6fee5ab5e5e942271279684310bb2f507b6ee5c53";
+    sha256 = "3b51f4d0558b7effb9add93aaa813c7a160ed293c346f5379a6fa1c8049af062";
   };
 
   nativeBuildInputs = [

From 74ae0ea8b794b9ee055a942991ecd86504dd4131 Mon Sep 17 00:00:00 2001
From: Solene Rapenne <solene@perso.pw>
Date: Fri, 17 Dec 2021 23:06:54 +0100
Subject: [PATCH 18/31] minigalaxy: init at 1.1.0

---
 pkgs/applications/misc/minigalaxy/default.nix | 76 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 78 insertions(+)
 create mode 100644 pkgs/applications/misc/minigalaxy/default.nix

diff --git a/pkgs/applications/misc/minigalaxy/default.nix b/pkgs/applications/misc/minigalaxy/default.nix
new file mode 100644
index 000000000000..6a1f14cbd44a
--- /dev/null
+++ b/pkgs/applications/misc/minigalaxy/default.nix
@@ -0,0 +1,76 @@
+{ lib
+, fetchFromGitHub
+, docutils
+, gettext
+, glibcLocales
+, glib-networking
+, gobject-introspection
+, gtk3
+, python3
+, python3Packages
+, steam-run-native
+, unzip
+, webkitgtk
+, wrapGAppsHook
+}:
+
+python3Packages.buildPythonApplication rec {
+  pname = "minigalaxy";
+  version = "1.1.0";
+
+  src = fetchFromGitHub {
+    owner = "sharkwouter";
+    repo = pname;
+    rev = version;
+    sha256 = "sha256-BbtwLuG5TH/+06Ez8+mwSAjG1IWg9/3uxzjmgPHczAw=";
+  };
+
+  checkPhase = ''
+    runHook preCheck
+    env HOME=$PWD LC_ALL=en_US.UTF-8 pytest
+    runHook postCheck
+  '';
+
+  nativeBuildInputs = [
+    gettext
+    wrapGAppsHook
+  ];
+
+  buildInputs = [
+    glib-networking
+    gobject-introspection
+    gtk3
+  ];
+
+  checkInputs = with python3Packages; [
+    glibcLocales
+    pytest
+    tox
+  ];
+
+  pythonPath = [
+    docutils
+    python3.pkgs.pygobject3
+    python3.pkgs.requests
+    python3.pkgs.setuptools
+    python3.pkgs.simplejson
+    steam-run-native
+    unzip
+    webkitgtk
+  ];
+
+  # Run Linux games using the Steam Runtime by using steam-run in the wrapper
+  postFixup = ''
+    sed -e 's#exec -a "$0"#exec -a "$0" ${steam-run-native}/bin/steam-run#' -i $out/bin/minigalaxy
+  '';
+
+  meta = with lib; {
+    homepage = "https://sharkwouter.github.io/minigalaxy/";
+    changelog = "https://github.com/sharkwouter/minigalaxy/blob/${version}/CHANGELOG.md";
+    downloadPage = "https://github.com/sharkwouter/minigalaxy/releases";
+    description = "A simple GOG client for Linux";
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ srapenne ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 301afaac82ee..eedfaf58f29e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -26949,6 +26949,8 @@ with pkgs;
 
   minicom = callPackage ../tools/misc/minicom { };
 
+  minigalaxy = callPackage ../applications/misc/minigalaxy { };
+
   minimodem = callPackage ../applications/radio/minimodem { };
 
   minidjvu = callPackage ../applications/graphics/minidjvu { };

From 1d4350656972f9369463e2326821e9b771763301 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 6 Jan 2022 10:38:10 +0000
Subject: [PATCH 19/31] python38Packages.fontparts: 0.10.1 -> 0.10.2

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

diff --git a/pkgs/development/python-modules/fontparts/default.nix b/pkgs/development/python-modules/fontparts/default.nix
index 9b9cc129c63b..7c04c54d424c 100644
--- a/pkgs/development/python-modules/fontparts/default.nix
+++ b/pkgs/development/python-modules/fontparts/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "fontParts";
-  version = "0.10.1";
+  version = "0.10.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "794ada47e19ba41ef39b59719be312b127672bcb56bb7208dd3234d2bb3e8218";
+    sha256 = "a3a3926e977f82ae19e6823760b59f2338085973da1eaad5badaf969f261a737";
     extension = "zip";
   };
 

From b8504e9b84e2dcd7cfed69b291b532913197bfb8 Mon Sep 17 00:00:00 2001
From: Will Cohen <willcohen@users.noreply.github.com>
Date: Thu, 6 Jan 2022 08:30:39 -0500
Subject: [PATCH 20/31] qscintilla: cleanup of derivations

---
 pkgs/development/libraries/qscintilla/default.nix          | 2 +-
 pkgs/development/python-modules/qscintilla-qt5/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix                            | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/qscintilla/default.nix b/pkgs/development/libraries/qscintilla/default.nix
index 332d61c1c4a3..3dcbc22e15fe 100644
--- a/pkgs/development/libraries/qscintilla/default.nix
+++ b/pkgs/development/libraries/qscintilla/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ qtbase ];
 
-  propagatedBuildInputs = lib.optional stdenv.isDarwin qtmacextras;
+  propagatedBuildInputs = lib.optionals stdenv.isDarwin [ qtmacextras ];
 
   nativeBuildInputs = [ unzip qmake ]
     ++ lib.optional stdenv.isDarwin fixDarwinDylibNames;
diff --git a/pkgs/development/python-modules/qscintilla-qt5/default.nix b/pkgs/development/python-modules/qscintilla-qt5/default.nix
index afc684b3b0e8..11445c99f4f4 100644
--- a/pkgs/development/python-modules/qscintilla-qt5/default.nix
+++ b/pkgs/development/python-modules/qscintilla-qt5/default.nix
@@ -3,7 +3,7 @@
 , qscintilla
 , qtbase
 , qmake
-, qtmacextras ? null
+, qtmacextras
 , stdenv
 }:
 
@@ -19,7 +19,7 @@ in buildPythonPackage rec {
 
   nativeBuildInputs = [ sip qmake pyqt-builder qscintilla ];
   buildInputs = [ qtbase ];
-  propagatedBuildInputs = [ pyqt5 ] ++ lib.optional (stdenv.isDarwin) qtmacextras;
+  propagatedBuildInputs = [ pyqt5 ] ++ lib.optionals stdenv.isDarwin [ qtmacextras ];
 
   dontWrapQtApps = true;
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 19b7b1dbd0b6..f2f02bebef2d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19494,17 +19494,17 @@ with pkgs;
     });
 
   libsForQt512 = recurseIntoAttrs (import ./qt5-packages.nix {
-    inherit lib pkgs stdenv;
+    inherit lib pkgs;
     qt5 = qt512;
   });
 
   libsForQt514 = recurseIntoAttrs (import ./qt5-packages.nix {
-    inherit lib pkgs stdenv;
+    inherit lib pkgs;
     qt5 = qt514;
   });
 
   libsForQt515 = recurseIntoAttrs (import ./qt5-packages.nix {
-    inherit lib pkgs stdenv;
+    inherit lib pkgs;
     qt5 = qt515;
   });
 

From a98370af81bd86f2ef3d2177536bb905b10af450 Mon Sep 17 00:00:00 2001
From: Will Cohen <willcohen@users.noreply.github.com>
Date: Thu, 6 Jan 2022 08:35:25 -0500
Subject: [PATCH 21/31] qt5: remove stdenv from qt5-packages

---
 pkgs/top-level/qt5-packages.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix
index 814d58dcd211..d9cc05afe713 100644
--- a/pkgs/top-level/qt5-packages.nix
+++ b/pkgs/top-level/qt5-packages.nix
@@ -9,7 +9,6 @@
 { lib
 , pkgs
 , qt5
-, stdenv
 }:
 
 (lib.makeScope pkgs.newScope ( self:

From f6ee491278eb30e4619253fef211f1c1a92f8f65 Mon Sep 17 00:00:00 2001
From: David Leslie <dlesl@users.noreply.github.com>
Date: Thu, 6 Jan 2022 14:39:23 +0100
Subject: [PATCH 22/31] rebar3: 3.17.0 -> 3.18.0 (#153710)

---
 .../tools/build-managers/rebar3/default.nix   |  4 +--
 .../build-managers/rebar3/rebar-deps.nix      | 26 +++++++++----------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/tools/build-managers/rebar3/default.nix b/pkgs/development/tools/build-managers/rebar3/default.nix
index a575b0ee3be5..37cb4dd86609 100644
--- a/pkgs/development/tools/build-managers/rebar3/default.nix
+++ b/pkgs/development/tools/build-managers/rebar3/default.nix
@@ -3,7 +3,7 @@
   writeScript, common-updater-scripts, coreutils, git, gnused, nix, rebar3-nix }:
 
 let
-  version = "3.17.0";
+  version = "3.18.0";
   owner = "erlang";
   deps = import ./rebar-deps.nix { inherit fetchFromGitHub fetchgit fetchHex; };
   rebar3 = stdenv.mkDerivation rec {
@@ -16,7 +16,7 @@ let
       inherit owner;
       repo = pname;
       rev = version;
-      sha256 = "02sk3whrbprzlih4pgcsd6ngmassfjfmkz21gwvb7mq64pib40k6";
+      sha256 = "09648hzc2mnjwf9klm20cg4hb5rn2xv2gmzcg98ffv37p5yfl327";
     };
 
     buildInputs = [ erlang ];
diff --git a/pkgs/development/tools/build-managers/rebar3/rebar-deps.nix b/pkgs/development/tools/build-managers/rebar3/rebar-deps.nix
index 8882feaf3c92..3848600cb4c7 100644
--- a/pkgs/development/tools/build-managers/rebar3/rebar-deps.nix
+++ b/pkgs/development/tools/build-managers/rebar3/rebar-deps.nix
@@ -16,23 +16,23 @@ let
     };
     relx = builder {
       name = "relx";
-      version = "4.5.0";
+      version = "4.6.0";
       src = fetchHex {
         pkg = "relx";
-        version = "4.5.0";
-        sha256 = "sha256-3bWPIMzmymP1onJeklgW3XITR2aYo/PDy0+ownIgLFI=";
+        version = "4.6.0";
+        sha256 = "sha256-L/gTHGMJPGIcazfcUtGyhIqTiIZYS0twHTW9vkN39Qk=";
       };
       beamDeps = [ bbmustache ];
     };
     providers = builder {
       name = "providers";
-      version = "1.8.1";
+      version = "1.9.0";
       src = fetchHex {
         pkg = "providers";
-        version = "1.8.1";
-        sha256 = "sha256-5FdFrenEdqmkaeoIQOQYqxk2DcRPAaIzME4RikRIa6A=";
+        version = "1.9.0";
+        sha256 = "sha256-0ofodEBqFQVghkKwo9tbaNato/KrABrsh+f018efwBc=";
       };
-      beamDeps = [ getopt ];
+      beamDeps = [ erlware_commons getopt ];
     };
     getopt = builder {
       name = "getopt";
@@ -86,21 +86,21 @@ let
     };
     certifi = builder {
       name = "certifi";
-      version = "2.6.1";
+      version = "2.8.0";
       src = fetchHex {
         pkg = "certifi";
-        version = "2.6.1";
-        sha256 = "sha256-UkyXtJkbOEndXBemMSI4licsawr0RneLpGdaHf9Tu34=";
+        version = "2.8.0";
+        sha256 = "sha256-asfvwcb4YAsI1iUpLUu/WE4UhHzhtrXETZg9Jz4Ql+o=";
       };
       beamDeps = [ ];
     };
     bbmustache = builder {
       name = "bbmustache";
-      version = "1.10.0";
+      version = "1.12.2";
       src = fetchHex {
         pkg = "bbmustache";
-        version = "1.10.0";
-        sha256 = "sha256-Q+/6P9S7lSMVevWp4idsSTSVuEWfyHNxRKoYbLE84u4=";
+        version = "1.12.2";
+        sha256 = "sha256-aIszpNXMLVH1da3ws2g/xAo4MUovFQkG7c/Hf1tXezs=";
       };
       beamDeps = [ ];
     };

From dd4432a118ec94f97e9c7667c02b7049d5db1814 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Thu, 6 Jan 2022 14:57:35 +0100
Subject: [PATCH 23/31] signal-desktop: 5.26.1 -> 5.27.0

---
 .../networking/instant-messengers/signal-desktop/default.nix  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
index 38e718972f32..384feaac635b 100644
--- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
@@ -24,7 +24,7 @@ let
 
 in stdenv.mkDerivation rec {
   pname = "signal-desktop";
-  version = "5.26.1"; # Please backport all updates to the stable channel.
+  version = "5.27.0"; # Please backport all updates to the stable channel.
   # All releases have a limited lifetime and "expire" 90 days after the release.
   # When releases "expire" the application becomes unusable until an update is
   # applied. The expiration date for the current release can be extracted with:
@@ -34,7 +34,7 @@ in stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
-    sha256 = "sha256-QIRt16AHILBNxKPxsOQ0n65W/bbalhXH1fM7KIaXP10=";
+    sha256 = "1agxn4fcgln5lsccvw5b7g2psv6nv2y7qm5df201c9pbwjak74nm";
   };
 
   nativeBuildInputs = [

From 18d0fe9b696633d58bf6dbc1a6c750a72cabcf27 Mon Sep 17 00:00:00 2001
From: Danielle Lancashire <dani@builds.terrible.systems>
Date: Thu, 6 Jan 2022 14:26:57 +0000
Subject: [PATCH 24/31] docker_20_10: 20.10.9 -> 20.10.12

---
 pkgs/applications/virtualization/docker/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix
index a6c94bf89144..462ebb556f1d 100644
--- a/pkgs/applications/virtualization/docker/default.nix
+++ b/pkgs/applications/virtualization/docker/default.nix
@@ -233,19 +233,19 @@ rec {
   # Get revisions from
   # https://github.com/moby/moby/tree/${version}/hack/dockerfile/install/*
   docker_20_10 = callPackage dockerGen rec {
-    version = "20.10.9";
+    version = "20.10.12";
     rev = "v${version}";
-    sha256 = "1msqvzfccah6cggvf1pm7n35zy09zr4qg2aalgwpqigv0jmrbyd4";
+    sha256 = "sha256-nU6grb2lSW7BY7w9aAXwVbGp9TyO2ZxnJaxAi0wbk/c=";
     moby-src = fetchFromGitHub {
       owner = "moby";
       repo = "moby";
       rev = "v${version}";
-      sha256 = "04xx7m8s9vrkm67ba2k5i90053h5qqkjcvw5rc8w7m5a309xcp4n";
+      sha256 = "sha256-qizzK1qJNRGFisahE3iAzZTNW/HmledlMNxcJCMQSJ4=";
     };
-    runcRev = "v1.0.2"; # v1.0.2
+    runcRev = "v1.0.2";
     runcSha256 = "1bpckghjah0rczciw1a1ab8z718lb2d3k4mjm4zb45lpm3njmrcp";
-    containerdRev = "v1.4.11"; # v1.4.11
-    containerdSha256 = "02slv4gc2blxnmv0p8pkm139vjn6ihjblmn8ps2k1afbbyps0ilr";
+    containerdRev = "v1.4.12";
+    containerdSha256 = "sha256-g30kshXyGVew5tVaXFAOQUOYvvo0JBqIj1YaC5nTiS8=";
     tiniRev = "v0.19.0"; # v0.19.0
     tiniSha256 = "1h20i3wwlbd8x4jr2gz68hgklh0lb0jj7y5xk1wvr8y58fip1rdn";
   };

From e4f818576620732ec564d21e88e96b579d9a0782 Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Wed, 5 Jan 2022 00:06:58 +0100
Subject: [PATCH 25/31] python3{8,9}Packages.scikit-learn: 1.0.1 -> 1.0.2

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

diff --git a/pkgs/development/python-modules/scikit-learn/default.nix b/pkgs/development/python-modules/scikit-learn/default.nix
index b717432a653e..7e2096c9b9ba 100644
--- a/pkgs/development/python-modules/scikit-learn/default.nix
+++ b/pkgs/development/python-modules/scikit-learn/default.nix
@@ -19,12 +19,12 @@
 
 buildPythonPackage rec {
   pname = "scikit-learn";
-  version = "1.0.1";
+  version = "1.0.2";
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-rCyp27dU1hz+HIO6hINJjvlR0puT7AnW8AKEfyEKmdo=";
+    sha256 = "sha256-tYcJWaVIS2FPJtMcpMF1JLGwMXUiGZ3JhcO0JW4DB2c=";
   };
 
   buildInputs = [

From 8553a5d3dc2aa6bb10f4b0c67a51fe34ad03c49e Mon Sep 17 00:00:00 2001
From: Danielle Lancashire <dani@builds.terrible.systems>
Date: Thu, 6 Jan 2022 14:45:28 +0000
Subject: [PATCH 26/31] containerd: 1.5.8 -> 1.5.9

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

diff --git a/pkgs/applications/virtualization/containerd/default.nix b/pkgs/applications/virtualization/containerd/default.nix
index 8f8da3d18015..a41dde4c9519 100644
--- a/pkgs/applications/virtualization/containerd/default.nix
+++ b/pkgs/applications/virtualization/containerd/default.nix
@@ -10,7 +10,7 @@
 
 buildGoModule rec {
   pname = "containerd";
-  version = "1.5.8";
+  version = "1.5.9";
 
   outputs = [ "out" "man" ];
 
@@ -18,7 +18,7 @@ buildGoModule rec {
     owner = "containerd";
     repo = "containerd";
     rev = "v${version}";
-    sha256 = "sha256-XIAByE2/eVG8DAZXstKs51LQYdVPcPQuIlST3xCclrU=";
+    sha256 = "sha256-v5seKJMfZUVMbydxKiTSy0OSwen6I/3DrGJnL2DyqHg=";
   };
 
   vendorSha256 = null;
@@ -51,7 +51,7 @@ buildGoModule rec {
     homepage = "https://containerd.io/";
     description = "A daemon to control runC";
     license = licenses.asl20;
-    maintainers = with maintainers; [ offline vdemeester ];
+    maintainers = with maintainers; [ offline vdemeester endocrimes ];
     platforms = platforms.linux;
   };
 }

From 76cbdfd89b9b45c35a5a071ab5b1368eb98edc52 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Thu, 6 Jan 2022 08:11:10 -0600
Subject: [PATCH 27/31] nextpnr: 2021.15.21 -> 2022.01.03, with apycula update

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/development/compilers/nextpnr/default.nix      | 6 +++---
 pkgs/development/python-modules/apycula/default.nix | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/compilers/nextpnr/default.nix b/pkgs/development/compilers/nextpnr/default.nix
index 16f0a8348d1c..e20a25ac8e80 100644
--- a/pkgs/development/compilers/nextpnr/default.nix
+++ b/pkgs/development/compilers/nextpnr/default.nix
@@ -14,14 +14,14 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "nextpnr";
-  version = "2021.15.21";
+  version = "2022.01.03";
 
   srcs = [
     (fetchFromGitHub {
       owner = "YosysHQ";
       repo  = "nextpnr";
-      rev   = "d04cfd5f0f6da184f5b8a03f0ce18fbd1d98eca3";
-      hash  = "sha256-gm/+kwIZ/m10+KuCJoK45F56nKZD3tM0myHwbFKIKAs=";
+      rev   = "089ca8258e6f4dc93f8d39594c1109a8578cdc98";
+      hash  = "sha256-N8kX/+fN8Qe+qme8RFlZyYQ/3p1WBkt0ztUwjJIQCIw=";
       name  = "nextpnr";
     })
     (fetchFromGitHub {
diff --git a/pkgs/development/python-modules/apycula/default.nix b/pkgs/development/python-modules/apycula/default.nix
index 53851ded566d..d8a369d6da04 100644
--- a/pkgs/development/python-modules/apycula/default.nix
+++ b/pkgs/development/python-modules/apycula/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "apycula";
-  version = "0.0.1a12";
+  version = "0.2a2";
 
   disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit version;
     pname = "Apycula";
-    hash = "sha256-TFb1C1GaMAK+ckEeXDxSyO2Cgx5dmq62daoSnAiAFmI=";
+    hash = "sha256-pcVoYGBhp9jyuWBJ/Rpi8cjwDgPjhJ1PrPblj5DQTpk=";
   };
 
   nativeBuildInputs = [ setuptools-scm ];

From 8efa46a893ed68af726cb7c24e3620ed295bfb65 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Thu, 6 Jan 2022 08:12:02 -0600
Subject: [PATCH 28/31] yosys: 0.12+36 -> 0.12.54, with yosys-bluespec update

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/development/compilers/yosys/default.nix          | 8 ++++----
 pkgs/development/compilers/yosys/plugins/bluespec.nix | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/compilers/yosys/default.nix b/pkgs/development/compilers/yosys/default.nix
index 9c3d9179f7ba..8f7de8736264 100644
--- a/pkgs/development/compilers/yosys/default.nix
+++ b/pkgs/development/compilers/yosys/default.nix
@@ -34,13 +34,13 @@
 
 stdenv.mkDerivation rec {
   pname   = "yosys";
-  version = "0.12+36";
+  version = "0.12+54";
 
   src = fetchFromGitHub {
     owner = "YosysHQ";
     repo  = "yosys";
-    rev   = "60c3ea367c942459a95e610ed98f277ce46c0142";
-    hash  = "sha256-NcfhNUmb3IDG08XgS+NGbRLI8sn4aQkOA7RF7wucDug=";
+    rev   = "59a71503448401d2476cf0872808e0a99c3a4d81";
+    hash  = "sha256-cz4PQymaA9UW91lN+6iniFhbcPRpFNIAeC8ZkwYeg0U=";
   };
 
   enableParallelBuilding = true;
@@ -78,7 +78,7 @@ stdenv.mkDerivation rec {
     fi
 
     if ! grep -q "YOSYS_VER := $version" Makefile; then
-      echo "ERROR: yosys version in Makefile isn't equivalent to version of the nix package (${version}), failing."
+      echo "ERROR: yosys version in Makefile isn't equivalent to version of the nix package (allegedly ${version}), failing."
       exit 1
     fi
   '';
diff --git a/pkgs/development/compilers/yosys/plugins/bluespec.nix b/pkgs/development/compilers/yosys/plugins/bluespec.nix
index 6e436cd0043b..519da019c251 100644
--- a/pkgs/development/compilers/yosys/plugins/bluespec.nix
+++ b/pkgs/development/compilers/yosys/plugins/bluespec.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation {
   pname = "yosys-bluespec";
-  version = "2021.08.19";
+  version = "2021.09.08";
 
   src = fetchFromGitHub {
     owner  = "thoughtpolice";
     repo   = "yosys-bluespec";
-    rev    = "bcea1635c97747acd3bcb5b8f1968b3f57ae62bc";
-    sha256 = "0ipx9yjngs3haksdb440wlydviszwqnxgzynpp7yic2x3ai7i8m1";
+    rev    = "f6f4127a4e96e18080fd5362b6769fa3e24c76b1";
+    sha256 = "sha256-3cNFP/k4JsgLyUQHWU10Htl2Rh0staAcA3R4piD6hDE=";
   };
 
   buildInputs = [ yosys readline zlib bluespec ];

From 5bb94d32cd9bd8626c76ee0ffdba9bc4885f178a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 6 Jan 2022 08:02:01 -0800
Subject: [PATCH 29/31] jsonnet: 0.17.0 -> 0.18.0

 (#153267)
---
 pkgs/development/compilers/jsonnet/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/jsonnet/default.nix b/pkgs/development/compilers/jsonnet/default.nix
index e85404c58b55..f85ec0118b94 100644
--- a/pkgs/development/compilers/jsonnet/default.nix
+++ b/pkgs/development/compilers/jsonnet/default.nix
@@ -2,14 +2,14 @@
 
 stdenv.mkDerivation rec {
   pname = "jsonnet";
-  version = "0.17.0";
+  version = "0.18.0";
   outputs = ["out" "doc"];
 
   src = fetchFromGitHub {
     rev = "v${version}";
     owner = "google";
     repo = "jsonnet";
-    sha256 = "1ddz14699v5lqx3dh0mb7hfffr6fk5zhmzn3z8yxkqqvriqnciim";
+    sha256 = "sha256-RmuvpKv9Dg3JcxsdZDBMehJjG5SvrV0spHgxApFeuJo=";
   };
 
   nativeBuildInputs = [ jekyll ];

From 9a4b481cdcb88c8717c7f9a9471b5987af488f02 Mon Sep 17 00:00:00 2001
From: Raphael Megzari <raphael@megzari.com>
Date: Thu, 6 Jan 2022 11:13:57 -0500
Subject: [PATCH 30/31] indradb: init at unstable-2021-01-05 (#153637)

---
 .../tools/database/indradb/default.nix        | 51 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 ++
 2 files changed, 55 insertions(+)
 create mode 100644 pkgs/development/tools/database/indradb/default.nix

diff --git a/pkgs/development/tools/database/indradb/default.nix b/pkgs/development/tools/database/indradb/default.nix
new file mode 100644
index 000000000000..f577963e8f4b
--- /dev/null
+++ b/pkgs/development/tools/database/indradb/default.nix
@@ -0,0 +1,51 @@
+{ stdenv
+, fetchFromGitHub
+, lib
+, rustPlatform
+, rustfmt
+}:
+let
+  src = fetchFromGitHub {
+    owner = "indradb";
+    repo = "indradb";
+    rev = "06134dde5bb53eb1d2aaa52afdaf9ff3bf1aa674";
+    sha256 = "sha256-g4Jam7yxMc+piYQzgMvVsNTF+ce1U3thzYl/M9rKG4o=";
+  };
+
+  meta = with lib; {
+    description = "A graph database written in rust ";
+    homepage = "https://github.com/indradb/indradb";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ happysalada ];
+    platforms = platforms.unix;
+  };
+in
+{
+  indradb-server = rustPlatform.buildRustPackage {
+    pname = "indradb-server";
+    version = "unstable-2021-01-05";
+    inherit src;
+
+    cargoSha256 = "sha256-3WtiW31AkyNX7HiT/zqfNo2VSKR7Q57/wCigST066Js=";
+
+    buildAndTestSubdir = "server";
+
+    nativeBuildInputs = [ rustfmt ];
+
+    # test rely on libindradb and it can't be found
+    # failure at https://github.com/indradb/indradb/blob/master/server/tests/plugins.rs#L63
+    # `let _server = Server::start(&format!("../target/debug/libindradb_plugin_*.{}", LIBRARY_EXTENSION)).unwrap();`
+    doCheck = false;
+  };
+  indradb-client = rustPlatform.buildRustPackage {
+    pname = "indradb-client";
+    version = "unstable-2021-01-05";
+    inherit src;
+
+    cargoSha256 = "sha256-pxan6W/CEsOxv8DbbytEBuIqxWn/C4qT4ze/RnvESOM=";
+
+    nativeBuildInputs = [ rustfmt ];
+
+    buildAndTestSubdir = "client";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 33ce4b910e73..7af550049f82 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12408,6 +12408,10 @@ with pkgs;
 
   idris2 = callPackage ../development/compilers/idris2 { };
 
+  inherit (callPackage ../development/tools/database/indradb { })
+    indradb-server
+    indradb-client;
+
   intel-graphics-compiler = callPackage ../development/compilers/intel-graphics-compiler { };
 
   intercal = callPackage ../development/compilers/intercal { };

From f77a556c73cf19a6a7108693db307a43be507cbf Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Fri, 7 Jan 2022 03:31:36 +1000
Subject: [PATCH 31/31] direnv: 2.30.2 -> 2.30.3 (#153654)

https://github.com/direnv/direnv/releases/tag/v2.30.3
---
 pkgs/tools/misc/direnv/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/direnv/default.nix b/pkgs/tools/misc/direnv/default.nix
index e9d38cbdcc2c..1920dac54343 100644
--- a/pkgs/tools/misc/direnv/default.nix
+++ b/pkgs/tools/misc/direnv/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "direnv";
-  version = "2.30.2";
+  version = "2.30.3";
 
   src = fetchFromGitHub {
     owner = "direnv";
     repo = "direnv";
     rev = "v${version}";
-    sha256 = "sha256-lQcy3EXl6KicAzRbypyX8sh39vNbZE2aUHBtwx07s9g=";
+    sha256 = "sha256-cLDafCZH0WKexO6jCdzUhRWaxmQYb1ay9w9lje3cQ+U=";
   };
 
   vendorSha256 = "sha256-YhgQUl9fdictEtz6J88vEzznGd8Ipeb9AYo/p1ZLz5k=";
@@ -29,6 +29,9 @@ buildGoModule rec {
 
   checkInputs = [ fish zsh ];
 
+  # temporarily disable tests, check if they can be reenabled with the next release
+  doCheck = false;
+
   checkPhase = ''
     export HOME=$(mktemp -d)
     make test-go test-bash test-fish test-zsh