From dcd8bd6fb27b905f97c3b726f8b500d76244a212 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 11 Feb 2023 07:24:28 +0000
Subject: [PATCH 01/34] SDL2_ttf: 2.20.1 -> 2.20.2

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

diff --git a/pkgs/development/libraries/SDL2_ttf/default.nix b/pkgs/development/libraries/SDL2_ttf/default.nix
index f424a2e67f56..06793ee5e551 100644
--- a/pkgs/development/libraries/SDL2_ttf/default.nix
+++ b/pkgs/development/libraries/SDL2_ttf/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "SDL2_ttf";
-  version = "2.20.1";
+  version = "2.20.2";
 
   src = fetchurl {
     url = "https://www.libsdl.org/projects/SDL_ttf/release/${pname}-${version}.tar.gz";
-    sha256 = "sha256-eM2tUfPMOtppMrG7bpFLM3mKuXCh6Bd2PyLdv9l9DFc=";
+    sha256 = "sha256-ncce2TSHUhsQeixKnKa/Q/ti9r3dXCawVea5FBiiIFM=";
   };
 
   configureFlags = lib.optional stdenv.isDarwin "--disable-sdltest";

From a7f5d1cb32cb00790ae831aed25c019e65dbfa35 Mon Sep 17 00:00:00 2001
From: Yaya <github@uwu.is>
Date: Sat, 11 Feb 2023 09:15:43 +0000
Subject: [PATCH 02/34] gitlab-runner: 15.8.0 -> 15.8.2

https://gitlab.com/gitlab-org/gitlab-runner/blob/v15.8.2/CHANGELOG.md
---
 .../tools/continuous-integration/gitlab-runner/default.nix    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
index 14984ba9519e..29d9412137a9 100644
--- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
+++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
@@ -1,7 +1,7 @@
 { lib, buildGoModule, fetchFromGitLab, fetchurl, bash }:
 
 let
-  version = "15.8.0";
+  version = "15.8.2";
 in
 buildGoModule rec {
   inherit version;
@@ -23,7 +23,7 @@ buildGoModule rec {
     owner = "gitlab-org";
     repo = "gitlab-runner";
     rev = "v${version}";
-    sha256 = "sha256-U7yVlnEzwqcgTX8WjXe2i4SQ0KyW7PgSM3UyuGkjm9g=";
+    sha256 = "sha256-kb1xDvU2aP6bI9oziAlUfxbmIq8CgFXPs04hRUmaPyE=";
   };
 
   patches = [

From 1518b4cd0b974bf9e8c934a127b67c280d6006a2 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 11 Feb 2023 12:22:59 +0100
Subject: [PATCH 03/34] python310Packages.meshtastic: 2.0.11 -> 2.0.12

Diff: https://github.com/meshtastic/Meshtastic-python/compare/refs/tags/2.0.11...2.0.12

Changelog: https://github.com/meshtastic/python/releases/tag/2.0.12
---
 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 a76d3ff3eff6..66bcc5f3dfa2 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 = "2.0.11";
+  version = "2.0.12";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
     owner = "meshtastic";
     repo = "Meshtastic-python";
     rev = "refs/tags/${version}";
-    hash = "sha256-XIYzlGtj+S28N7RLvA38WSLv7LNZqKs8aJUaEG1CslI=";
+    hash = "sha256-Y3X5LW85e+OQ548H13fQ0s+R870Hzp0kVd+v+lbdqtg=";
   };
 
   propagatedBuildInputs = [

From aa680bde642889b2decd1187f4ace6cfc74ea292 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 11 Feb 2023 12:28:05 +0100
Subject: [PATCH 04/34] python310Packages.peaqevcore: 11.2.0 -> 12.0.1

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

diff --git a/pkgs/development/python-modules/peaqevcore/default.nix b/pkgs/development/python-modules/peaqevcore/default.nix
index 3e1776b97b49..151389fbfd9d 100644
--- a/pkgs/development/python-modules/peaqevcore/default.nix
+++ b/pkgs/development/python-modules/peaqevcore/default.nix
@@ -6,14 +6,14 @@
 
 buildPythonPackage rec {
   pname = "peaqevcore";
-  version = "11.2.0";
+  version = "12.0.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-L4QUQsLdFwJPGq8ZdpTHRv5dNn1o6lc1q37LVNNCOOM=";
+    hash = "sha256-nhipggmTd0BgYOPo4SoezrvPmw7wQL71K5y1EKoHRDw=";
   };
 
   postPatch = ''

From a8b1e8d7b121b98f7a823e0a1f92e0dfb4b42917 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 11 Feb 2023 12:29:55 +0100
Subject: [PATCH 05/34] python310Packages.md-toc: 8.1.8 -> 8.1.9

Diff: https://github.com/frnmst/md-toc/compare/8.1.8...8.1.9

Changelog: https://blog.franco.net.eu.org/software/CHANGELOG-md-toc.html
---
 pkgs/development/python-modules/md-toc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/md-toc/default.nix b/pkgs/development/python-modules/md-toc/default.nix
index a8d1c18c471e..193fca714ad5 100644
--- a/pkgs/development/python-modules/md-toc/default.nix
+++ b/pkgs/development/python-modules/md-toc/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "md-toc";
-  version = "8.1.8";
+  version = "8.1.9";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     owner = "frnmst";
     repo = pname;
     rev = version;
-    hash = "sha256-2Q/NcsGupYV80byrKmuoxA0d6/z7Z+fmGB6bfzDRvqQ=";
+    hash = "sha256-t3G8nQCVUUuDb+W+Gw+f2miXQ2i/hdVfT6yGxdNWKpw=";
   };
 
   propagatedBuildInputs = [

From 8b55a288c075765a42cc90eb8d28827b0caff91e Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 11 Feb 2023 12:34:46 +0100
Subject: [PATCH 06/34] python310Packages.netutils: 1.4.0 -> 1.4.1

Diff: https://github.com/networktocode/netutils/compare/refs/tags/v1.4.0...v1.4.1

Changelog: https://github.com/networktocode/netutils/releases/tag/v1.4.1
---
 pkgs/development/python-modules/netutils/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/netutils/default.nix b/pkgs/development/python-modules/netutils/default.nix
index 9bf6f3c7817b..3ca143638ca4 100644
--- a/pkgs/development/python-modules/netutils/default.nix
+++ b/pkgs/development/python-modules/netutils/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "netutils";
-  version = "1.4.0";
+  version = "1.4.1";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "networktocode";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-RT6KAliRlH285sEx2fbIXJNwe1gcyH6CrQ8pXKgY/hQ=";
+    hash = "sha256-hSSHCWi0L/ZfFz0JQ6Al5mjhb2g0DpykLF66uMKMIN8=";
   };
 
   nativeBuildInputs = [

From 7cee38c2f0d6ec4c1a93be6903a43d9748cc4c48 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 11 Feb 2023 12:40:02 +0100
Subject: [PATCH 07/34] python310Packages.incomfort-client: 0.4.5 -> 0.5.0

Diff: https://github.com/zxdavb/incomfort-client/compare/refs/tags/0.4.5...0.5.0
---
 .../incomfort-client/default.nix              | 26 ++++++++++++++-----
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/incomfort-client/default.nix b/pkgs/development/python-modules/incomfort-client/default.nix
index d281ece24635..496c98488910 100644
--- a/pkgs/development/python-modules/incomfort-client/default.nix
+++ b/pkgs/development/python-modules/incomfort-client/default.nix
@@ -1,29 +1,43 @@
 { lib
 , aiohttp
+, aioresponses
 , buildPythonPackage
 , fetchFromGitHub
+, pytest-asyncio
+, pytestCheckHook
 , pythonOlder
 }:
 
 buildPythonPackage rec {
   pname = "incomfort-client";
-  version = "0.4.5";
+  version = "0.5.0";
+  format = "setuptools";
+
   disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
     owner = "zxdavb";
     repo = pname;
-    rev = version;
-    sha256 = "0r9f15fcjwhrq6ldji1dzbb76wsvinpkmyyaj7n55rl6ibnsyrwp";
+    rev = "refs/tags/${version}";
+    hash = "sha256-kdPue3IfF85O+0dgvX+dN6S4WoQmjxdCfwfv83SnO8E=";
   };
 
   propagatedBuildInputs = [
     aiohttp
   ];
 
-  # Project has no tests
-  doCheck = false;
-  pythonImportsCheck = [ "incomfortclient" ];
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  checkInputs = [
+    aioresponses
+    pytest-asyncio
+  ];
+
+  pythonImportsCheck = [
+    "incomfortclient"
+  ];
 
   meta = with lib; {
     description = "Python module to poll Intergas boilers via a Lan2RF gateway";

From e107a769e7d5e36090a38c2f5415e3aef4d09d28 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 11 Feb 2023 13:35:00 +0100
Subject: [PATCH 08/34] python310Packages.pydanfossair: 0.1.0 -> 0.2.0

Diff: https://github.com/JonasPed/pydanfoss-air/compare/v0.1.0...v0.2.0
---
 pkgs/development/python-modules/pydanfossair/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pydanfossair/default.nix b/pkgs/development/python-modules/pydanfossair/default.nix
index d492923f07ab..11332ecb6f0f 100644
--- a/pkgs/development/python-modules/pydanfossair/default.nix
+++ b/pkgs/development/python-modules/pydanfossair/default.nix
@@ -5,13 +5,13 @@
 
 buildPythonPackage rec {
   pname = "pydanfossair";
-  version = "0.1.0";
+  version = "0.2.0";
 
   src = fetchFromGitHub {
     owner = "JonasPed";
     repo = "pydanfoss-air";
     rev = "v${version}";
-    sha256 = "0950skga7x930whdn9f765x7fi8g6rr3zh99zpzaj8avjdwf096b";
+    sha256 = "sha256-WTRiEQbd3wwNAz1gk0rS3khy6lg61rcGZQTMlBc0uO8=";
   };
 
   # Project has no tests

From 785cd824a36b7c9b1e90f1c12eefe2484632fff3 Mon Sep 17 00:00:00 2001
From: Marin <supermarin@users.noreply.github.com>
Date: Fri, 10 Feb 2023 17:13:09 -0500
Subject: [PATCH 09/34] nixos/yubikey-agent: Add dependency to pcsd.service

Issue: after installing, running `yubikey-agent -setup` produces the
following error:
```
nixOS: Failed to connect to the YubiKey: connecting to pscs: the Smart
card resource manager is not running
```

More on this issue: https://github.com/FiloSottile/yubikey-agent/issues/137
---
 nixos/modules/services/security/yubikey-agent.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/nixos/modules/services/security/yubikey-agent.nix b/nixos/modules/services/security/yubikey-agent.nix
index c91ff3e69a0a..ee57ec8bf812 100644
--- a/nixos/modules/services/security/yubikey-agent.nix
+++ b/nixos/modules/services/security/yubikey-agent.nix
@@ -57,6 +57,9 @@ in
       ];
     };
 
+    # Yubikey-agent expects pcsd to be running in order to function.
+    services.pcscd.enable = true;
+
     environment.extraInit = ''
       if [ -z "$SSH_AUTH_SOCK" -a -n "$XDG_RUNTIME_DIR" ]; then
         export SSH_AUTH_SOCK="$XDG_RUNTIME_DIR/yubikey-agent/yubikey-agent.sock"

From 524ebdd7e1b6aaf90a21372911778c732d994c44 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 11 Feb 2023 15:58:04 +0000
Subject: [PATCH 10/34] python310Packages.globus-sdk: 3.15.1 -> 3.16.0

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

diff --git a/pkgs/development/python-modules/globus-sdk/default.nix b/pkgs/development/python-modules/globus-sdk/default.nix
index 57f869842c83..c04bb6e7f873 100644
--- a/pkgs/development/python-modules/globus-sdk/default.nix
+++ b/pkgs/development/python-modules/globus-sdk/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "globus-sdk";
-  version = "3.15.1";
+  version = "3.16.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     owner = "globus";
     repo = "globus-sdk-python";
     rev = "refs/tags/${version}";
-    hash = "sha256-qxqGfbrnMvmjbBD7l8OtGKx7WJr65Jbd9y5IyZDXwW4=";
+    hash = "sha256-zl5+22r0KMqdBKIlBe+8xxgh6h9am34USc1dLy+VGyY=";
   };
 
   propagatedBuildInputs = [

From 5b7d66bc32ce6d89df5af4f880435137804bef64 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Sat, 11 Feb 2023 16:59:44 +0100
Subject: [PATCH 11/34] license-generator: 0.8.1 -> 1.0.0

---
 pkgs/tools/misc/license-generator/default.nix | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/pkgs/tools/misc/license-generator/default.nix b/pkgs/tools/misc/license-generator/default.nix
index b880c66f971c..5662b356f34e 100644
--- a/pkgs/tools/misc/license-generator/default.nix
+++ b/pkgs/tools/misc/license-generator/default.nix
@@ -1,20 +1,20 @@
 { lib, fetchCrate, rustPlatform }:
 
 rustPlatform.buildRustPackage rec {
-    pname = "license-generator";
-    version = "0.8.1";
+  pname = "license-generator";
+  version = "1.0.0";
 
-    src = fetchCrate {
-      inherit pname version;
-      sha256 = "sha256-ZVhsbaJJ9WBcQPx2yikIAQJeBXwC6ZAJkfCRmokNV3I=";
-    };
+  src = fetchCrate {
+    inherit pname version;
+    hash = "sha256-ijA/AqLeQ9/XLeCriWNUA6R3iKyq+QPDH5twSvqFmEA=";
+  };
 
-    cargoSha256 = "sha256-Yh9q/aYHXUF2eIFpJ7ccgeyIO5mQMgRDCNr+ZyS166Y=";
+  cargoHash = "sha256-FfkCV4anPHElGGIOYDSzHam5ohVGpOgtu/nM0aw9HzU=";
 
-    meta = with lib; {
-      description = "Command-line tool for generating license files";
-      homepage = "https://github.com/azu/license-generator";
-      license = licenses.mit;
-      maintainers = with maintainers; [ loicreynier ];
-    };
+  meta = with lib; {
+    description = "Command-line tool for generating license files";
+    homepage = "https://github.com/azu/license-generator";
+    license = licenses.mit;
+    maintainers = with maintainers; [ loicreynier ];
+  };
 }

From 3927f4fcbd1016ed57f96db869accc5b1423da70 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Sat, 11 Feb 2023 17:26:04 +0100
Subject: [PATCH 12/34] ydotool: 1.0.3 -> 1.0.4

---
 pkgs/tools/wayland/ydotool/default.nix | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/pkgs/tools/wayland/ydotool/default.nix b/pkgs/tools/wayland/ydotool/default.nix
index 319a9249f0a4..42f95735de59 100644
--- a/pkgs/tools/wayland/ydotool/default.nix
+++ b/pkgs/tools/wayland/ydotool/default.nix
@@ -1,24 +1,26 @@
-{ lib, stdenv, fetchFromGitHub, cmake, scdoc, util-linux }:
+{ lib, stdenv, fetchFromGitHub, cmake, scdoc, util-linux, xorg }:
 
 stdenv.mkDerivation rec {
   pname = "ydotool";
-  version = "1.0.3";
+  version = "1.0.4";
 
   src = fetchFromGitHub {
     owner = "ReimuNotMoe";
     repo = "ydotool";
     rev = "v${version}";
-    sha256 = "sha256-RcPHQFXD3YgfF11OFpcnSowPlEjxy2c2RWhGYr30GhI=";
+    hash = "sha256-MtanR+cxz6FsbNBngqLE+ITKPZFHmWGsD1mBDk0OVng=";
   };
 
+  postPatch = ''
+    substituteInPlace Daemon/ydotoold.c \
+      --replace "/usr/bin/xinput" "${xorg.xinput}/bin/xinput"
+    substituteInPlace Daemon/ydotool.service.in \
+      --replace "/usr/bin/kill" "${util-linux}/bin/kill"
+  '';
+
   strictDeps = true;
   nativeBuildInputs = [ cmake scdoc ];
 
-  postInstall = ''
-    substituteInPlace ${placeholder "out"}/lib/systemd/user/ydotool.service \
-      --replace /usr/bin/kill "${util-linux}/bin/kill"
-  '';
-
   meta = with lib; {
     homepage = "https://github.com/ReimuNotMoe/ydotool";
     description = "Generic Linux command-line automation tool";

From bb69864c554805b54751550e010df67cea77d29b Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Sat, 11 Feb 2023 14:05:13 -0300
Subject: [PATCH 13/34] dev86: 0.16.21 -> unstable-2022-07-19

---
 pkgs/development/compilers/dev86/default.nix | 38 +++++++++++---------
 1 file changed, 22 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/compilers/dev86/default.nix b/pkgs/development/compilers/dev86/default.nix
index 2e6b0d3f68f1..67448f38f257 100644
--- a/pkgs/development/compilers/dev86/default.nix
+++ b/pkgs/development/compilers/dev86/default.nix
@@ -1,29 +1,35 @@
-{ lib, stdenv, fetchurl }:
+{ lib
+, stdenv
+, fetchFromGitHub
+}:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (self: {
   pname = "dev86";
-  version = "0.16.21";
+  version = "unstable-2022-07-19";
 
-  src = fetchurl {
-    url = "http://v3.sk/~lkundrak/dev86/Dev86src-${version}.tar.gz";
-    sha256 = "154dyr2ph4n0kwi8yx0n78j128kw29rk9r9f7s2gddzrdl712jr3";
+  src = fetchFromGitHub {
+    owner = "jbruchon";
+    repo = "dev86";
+    rev = "f5cd3e5c17a0d3cd8298bac8e30bed6e59c4e57a";
+    hash = "sha256-CWeboFkJkpKHZ/wkuvMj5a+5qB2uzAtoYy8OdyYErMg=";
   };
 
-  hardeningDisable = [ "format" ];
+  makeFlags = [ "PREFIX=${placeholder "out"}" ];
 
-  makeFlags = [ "PREFIX=$(out)" ];
-
-  # Parallel builds are not supported due to build process structure:
-  # tools are built sequentially in submakefiles and are reusing the
-  # same targets as dependencies. Building dependencies in parallel
-  # from different submakes is not synchronized and fails:
+  # Parallel builds are not supported due to build process structure: tools are
+  # built sequentially in submakefiles and are reusing the same targets as
+  # dependencies. Building dependencies in parallel from different submakes is
+  # not synchronized and fails:
   #     make[3]: Entering directory '/build/dev86-0.16.21/libc'
   #     Unable to execute as86.
   enableParallelBuilding = false;
 
   meta = {
-    description = "Linux 8086 development environment";
-    homepage = "https://github.com/lkundrak/dev86";
+    homepage = "https://github.com/jbruchon/dev86";
+    description =
+      "C compiler, assembler and linker environment for the production of 8086 executables";
+    license = lib.licenses.gpl2Plus;
+    maintainers = [ lib.maintainers.AndersonTorres ];
     platforms = lib.platforms.linux;
   };
-}
+})

From fb7ddb6681ada2bacc2e70e6e985abab240cd9e7 Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Thu, 9 Feb 2023 23:52:57 -0300
Subject: [PATCH 14/34] harePackages: refactor

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

diff --git a/pkgs/development/compilers/hare/default.nix b/pkgs/development/compilers/hare/default.nix
index c04897fad1bb..121365320812 100644
--- a/pkgs/development/compilers/hare/default.nix
+++ b/pkgs/development/compilers/hare/default.nix
@@ -1,7 +1,7 @@
 { config, lib, pkgs }:
 
-lib.makeScope pkgs.newScope (self: with self; {
+lib.makeScope pkgs.newScope (self: {
 
-  harec = callPackage ./harec { };
-  hare = callPackage ./hare { };
+  harec = pkgs.callPackage ./harec { };
+  hare = pkgs.callPackage ./hare { };
 })

From 4c4ce6a06850691ca9137ac7b886db4fbb278784 Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Thu, 9 Feb 2023 23:52:23 -0300
Subject: [PATCH 15/34] harePackages.harec: 2022-07-02 -> 2023-02-08

---
 .../compilers/hare/harec/default.nix           | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/compilers/hare/harec/default.nix b/pkgs/development/compilers/hare/harec/default.nix
index bdc9ef56b9d1..b29f53151ae4 100644
--- a/pkgs/development/compilers/hare/harec/default.nix
+++ b/pkgs/development/compilers/hare/harec/default.nix
@@ -4,15 +4,15 @@
 , qbe
 }:
 
-stdenv.mkDerivation (finalAttrs: {
+stdenv.mkDerivation (self: {
   pname = "harec";
-  version = "unstable-2022-07-02";
+  version = "unstable-2023-02-08";
 
   src = fetchFromSourcehut {
     owner = "~sircmpwn";
     repo = "harec";
-    rev = "56359312644f76941de1878d33a1a0b840be8056";
-    hash = "sha256-8SFYRJSvX8hmsHBgaLUfhLUV7d54im22ETZds1eASc4=";
+    rev = "4730fa6b835f08c44bd7991cc8b264fbc27d752b";
+    hash = "sha256-XOhZWdmkMAuXbj7svILJI3wI7RF9OAb/OE1uGel4/vE=";
   };
 
   nativeBuildInputs = [
@@ -30,15 +30,15 @@ stdenv.mkDerivation (finalAttrs: {
 
   doCheck = true;
 
-  meta = with lib; {
+  meta = {
     homepage = "http://harelang.org/";
     description = "Bootstrapping Hare compiler written in C for POSIX systems";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [ AndersonTorres ];
+    license = lib.licenses.gpl3Only;
+    maintainers = [ lib.maintainers.AndersonTorres ];
     # The upstream developers do not like proprietary operating systems; see
     # https://harelang.org/platforms/
-    platforms = with platforms;
+    platforms = with lib.platforms;
       lib.intersectLists (freebsd ++ linux) (aarch64 ++ x86_64 ++ riscv64);
-    badPlatforms = with platforms; darwin;
+    badPlatforms = lib.platforms.darwin;
   };
 })

From ad966da3478fd7c9ad6327565b7cabb37de33d0c Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Thu, 9 Feb 2023 23:50:44 -0300
Subject: [PATCH 16/34] harePackages.hare: 2022-07-30 -> 2023-02-10

---
 ...ch => 000-disable-failing-test-cases.diff} |  0
 .../compilers/hare/hare/config-template.mk    | 17 ++++++++++++++
 .../compilers/hare/hare/default.nix           | 23 +++++++++++--------
 3 files changed, 31 insertions(+), 9 deletions(-)
 rename pkgs/development/compilers/hare/hare/{disable-failing-test-cases.patch => 000-disable-failing-test-cases.diff} (100%)

diff --git a/pkgs/development/compilers/hare/hare/disable-failing-test-cases.patch b/pkgs/development/compilers/hare/hare/000-disable-failing-test-cases.diff
similarity index 100%
rename from pkgs/development/compilers/hare/hare/disable-failing-test-cases.patch
rename to pkgs/development/compilers/hare/hare/000-disable-failing-test-cases.diff
diff --git a/pkgs/development/compilers/hare/hare/config-template.mk b/pkgs/development/compilers/hare/hare/config-template.mk
index 1d0783b118d3..b3b0f535915a 100644
--- a/pkgs/development/compilers/hare/hare/config-template.mk
+++ b/pkgs/development/compilers/hare/hare/config-template.mk
@@ -25,3 +25,20 @@ SCDOC = scdoc
 
 # Where to store build artifacts
 # set HARECACHE externally
+
+# Cross-compiler toolchains
+# # TODO: fixup this
+AARCH64_AS=aarch64-as
+AARCH64_AR=aarch64-ar
+AARCH64_CC=aarch64-cc
+AARCH64_LD=aarch64-ld
+
+RISCV64_AS=riscv64-as
+RISCV64_AR=riscv64-ar
+RISCV64_CC=riscv64-cc
+RISCV64_LD=riscv64-ld
+
+X86_64_AS=as
+X86_64_AR=ar
+X86_64_CC=cc
+X86_64_LD=ld
diff --git a/pkgs/development/compilers/hare/hare/default.nix b/pkgs/development/compilers/hare/hare/default.nix
index 2c6b8da6e342..342a85933834 100644
--- a/pkgs/development/compilers/hare/hare/default.nix
+++ b/pkgs/development/compilers/hare/hare/default.nix
@@ -2,25 +2,30 @@
 , stdenv
 , fetchFromSourcehut
 , binutils-unwrapped
-, harec
+, harePackages
 , makeWrapper
 , qbe
 , scdoc
 , substituteAll
 }:
 
-stdenv.mkDerivation (finalAttrs: {
+let
+  inherit (harePackages) harec;
+in
+stdenv.mkDerivation (self: {
   pname = "hare";
-  version = "unstable-2022-07-30";
+  version = "unstable-2023-02-10";
 
   src = fetchFromSourcehut {
     owner = "~sircmpwn";
     repo = "hare";
-    rev = "296925c91d79362d6b8ac94e0336a38e9af0f1c9";
-    hash = "sha256-LeIUnpTMZ6vxgAy/LPm9/IMit41RgezdVESIv+gQFHc=";
+    rev = "52b3f2d0c7a85e04a79666a954101e527b7f1272";
+    hash = "sha256-/zP8LbZ113Ar06MZF1zP20LKMGko+4HcOXSntLVAQAU=";
   };
 
-  patches = [ ./disable-failing-test-cases.patch ];
+  patches = [
+    ./000-disable-failing-test-cases.diff
+  ];
 
   nativeBuildInputs = [
     binutils-unwrapped
@@ -86,12 +91,12 @@ stdenv.mkDerivation (finalAttrs: {
 
   setupHook = ./setup-hook.sh;
 
-  meta = with lib; {
+  meta = {
     homepage = "http://harelang.org/";
     description =
       "A systems programming language designed to be simple, stable, and robust";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [ AndersonTorres ];
+    license = lib.licenses.gpl3Only;
+    maintainers = [ lib.maintainers.AndersonTorres ];
     inherit (harec.meta) platforms badPlatforms;
   };
 })

From 45d1e00708a24558adf3da3c86bf18be61799d15 Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Sat, 11 Feb 2023 12:51:10 -0300
Subject: [PATCH 17/34] harePackages.hare: mark as broken on ARM64

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

diff --git a/pkgs/development/compilers/hare/hare/default.nix b/pkgs/development/compilers/hare/hare/default.nix
index 342a85933834..c1d5e7800c95 100644
--- a/pkgs/development/compilers/hare/hare/default.nix
+++ b/pkgs/development/compilers/hare/hare/default.nix
@@ -98,5 +98,6 @@ stdenv.mkDerivation (self: {
     license = lib.licenses.gpl3Only;
     maintainers = [ lib.maintainers.AndersonTorres ];
     inherit (harec.meta) platforms badPlatforms;
+    broken = stdenv.isAarch64; # still figuring how to set cross-compiling stuff
   };
 })

From f831445c5d645fb37027a1fbfd8548f5fb490bb6 Mon Sep 17 00:00:00 2001
From: "P. R. d. O" <d.ol.rod@tutanota.com>
Date: Fri, 10 Feb 2023 15:59:24 -0600
Subject: [PATCH 18/34] gometer: remove

---
 pkgs/applications/misc/gometer/default.nix | 48 ----------------------
 pkgs/top-level/aliases.nix                 |  1 +
 pkgs/top-level/all-packages.nix            |  2 -
 3 files changed, 1 insertion(+), 50 deletions(-)
 delete mode 100644 pkgs/applications/misc/gometer/default.nix

diff --git a/pkgs/applications/misc/gometer/default.nix b/pkgs/applications/misc/gometer/default.nix
deleted file mode 100644
index 8c68f8672c3b..000000000000
--- a/pkgs/applications/misc/gometer/default.nix
+++ /dev/null
@@ -1,48 +0,0 @@
-{ lib, stdenv, fetchurl, rpmextract, wrapGAppsHook, nwjs }:
-
-stdenv.mkDerivation rec {
-  pname = "gometer";
-  version = "5.2.0";
-
-  src = fetchurl {
-    url = "https://gometer-prod-new-apps.s3-accelerate.amazonaws.com/${version}/goMeter-linux64.rpm";
-    sha256 = "sha256-E53sVvneW2EMPz9HNCgbGuHnDlVihE+Lf+DkFIP+j28=";
-  };
-
-  nativeBuildInputs = [
-    rpmextract
-    wrapGAppsHook
-  ];
-
-  dontBuild = true;
-  dontConfigure = true;
-
-  unpackPhase = ''
-    rpmextract ${src}
-  '';
-
-  installPhase = ''
-    runHook preInstall
-
-    mv usr $out
-    mv opt $out
-
-    mkdir $out/share/applications
-    mv $out/opt/goMeter/goMeter.desktop $out/share/applications/gometer.desktop
-    substituteInPlace $out/share/applications/gometer.desktop \
-      --replace '/opt/goMeter/' ""
-
-    makeWrapper ${nwjs}/bin/nw $out/bin/goMeter \
-      --add-flags $out/opt/goMeter/package.nw
-
-    runHook postInstall
-  '';
-
-  meta = with lib; {
-    description = "Analytic-Tracking tool for GoLance";
-    homepage = "https://golance.com/download-gometer";
-    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
-    license = licenses.unfree;
-    maintainers = with maintainers; [ wolfangaukang ];
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 818abd1e3672..e21c14874964 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -582,6 +582,7 @@ mapAliases ({
   go-mk = throw "go-mk has been dropped due to the lack of maintanence from upstream since 2015"; # Added 2022-06-02
   go-pup = throw "'go-pup' has been renamed to/replaced by 'pup'"; # Converted to throw 2022-02-22
   go-repo-root = throw "go-repo-root has been dropped due to the lack of maintanence from upstream since 2014"; # Added 2022-06-02
+  gometer = throw "gometer has been removed from nixpkgs because goLance stopped offering Linux support"; # Added 2023-02-10
   gpgstats = throw "gpgstats has been removed: upstream is gone"; # Added 2022-02-06
   gpshell = throw "gpshell has been removed, because it was unmaintained in nixpkgs"; # added 2021-12-17
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f0f76053ee29..1ec362f90cff 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -25803,8 +25803,6 @@ with pkgs;
 
   gmailctl = callPackage ../applications/networking/gmailctl { };
 
-  gometer = callPackage ../applications/misc/gometer { };
-
   gomp = callPackage ../applications/version-management/gomp { };
 
   gomplate = callPackage ../development/tools/gomplate { };

From 4734c1fce6b123dd65bf5d3cd11debb48932e3d9 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 11 Feb 2023 10:24:03 -0800
Subject: [PATCH 19/34] cwltool: 3.1.20230201130431 -> 3.1.20230209161050
 (#215856)

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

diff --git a/pkgs/applications/science/misc/cwltool/default.nix b/pkgs/applications/science/misc/cwltool/default.nix
index 8ac8adcbf594..815ccc6cc249 100644
--- a/pkgs/applications/science/misc/cwltool/default.nix
+++ b/pkgs/applications/science/misc/cwltool/default.nix
@@ -7,14 +7,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "cwltool";
-  version = "3.1.20230201130431";
+  version = "3.1.20230209161050";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "common-workflow-language";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-rx5rdB8OgJ7Mck3pm1GRrymZbQ3lHlXFecICb/pbnKg=";
+    hash = "sha256-gc/KSJS3KcxXc3xDyJSXavaxtwhKBiihgdI7yc7d2I8=";
   };
 
   postPatch = ''

From 4e5dac05750620ef5d96c5b6e02d352d815710f5 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Sat, 11 Feb 2023 19:13:32 +0000
Subject: [PATCH 20/34] v8: add homepage

---
 pkgs/development/libraries/v8/8_x.nix     | 1 +
 pkgs/development/libraries/v8/default.nix | 1 +
 2 files changed, 2 insertions(+)

diff --git a/pkgs/development/libraries/v8/8_x.nix b/pkgs/development/libraries/v8/8_x.nix
index b5184bafcbff..2d260b2042cd 100644
--- a/pkgs/development/libraries/v8/8_x.nix
+++ b/pkgs/development/libraries/v8/8_x.nix
@@ -162,6 +162,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with lib; {
+    homepage = "https://v8.dev/";
     description = "Google's open source JavaScript engine";
     maintainers = with maintainers; [ cstrahan proglodyte matthewbauer ];
     platforms = platforms.unix;
diff --git a/pkgs/development/libraries/v8/default.nix b/pkgs/development/libraries/v8/default.nix
index 7ca5080cb74c..7cdad40d9701 100644
--- a/pkgs/development/libraries/v8/default.nix
+++ b/pkgs/development/libraries/v8/default.nix
@@ -171,6 +171,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with lib; {
+    homepage = "https://v8.dev/";
     description = "Google's open source JavaScript engine";
     maintainers = with maintainers; [ cstrahan proglodyte matthewbauer ];
     platforms = platforms.unix;

From b5afd5924dbda626d1c70902bfaa21a74fd3766d Mon Sep 17 00:00:00 2001
From: Sandro <sandro.jaeckel@gmail.com>
Date: Sat, 11 Feb 2023 21:03:21 +0100
Subject: [PATCH 21/34] dino: 0.3.1 -> 0.4.0 (#215211)

https://github.com/dino/dino/releases/tag/v0.4.0

Switched to gtk4, cleaned up dependencies and tested in a MUC.
---
 .../instant-messengers/dino/default.nix       | 67 +++++++++++--------
 pkgs/top-level/all-packages.nix               |  2 +-
 2 files changed, 41 insertions(+), 28 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/dino/default.nix b/pkgs/applications/networking/instant-messengers/dino/default.nix
index 5a65b43a8acb..d9288c4a4464 100644
--- a/pkgs/applications/networking/instant-messengers/dino/default.nix
+++ b/pkgs/applications/networking/instant-messengers/dino/default.nix
@@ -1,37 +1,48 @@
 { lib, stdenv, fetchFromGitHub
 , vala, cmake, ninja, wrapGAppsHook, pkg-config, gettext
-, gobject-introspection, gnome, glib, gdk-pixbuf, gtk3, glib-networking
-, xorg, libXdmcp, libxkbcommon
+, gobject-introspection, glib, gdk-pixbuf, gtk4, glib-networking
+, libadwaita
 , libnotify, libsoup, libgee
-, librsvg, libsignal-protocol-c
+, libsignal-protocol-c
 , libgcrypt
-, libepoxy
-, at-spi2-core
 , sqlite
-, dbus
 , gpgme
-, pcre
+, pcre2
 , qrencode
 , icu
 , gspell
-, srtp, libnice, gnutls, gstreamer, gst-plugins-base, gst-plugins-good, webrtc-audio-processing
- }:
+, srtp
+, libnice
+, gnutls
+, gstreamer
+, gst-plugins-base
+, gst-plugins-good
+, gst-plugins-bad
+, gst-vaapi
+, webrtc-audio-processing
+}:
 
 stdenv.mkDerivation rec {
   pname = "dino";
-  version = "0.3.1";
+  version = "0.4.0";
 
   src = fetchFromGitHub {
     owner = "dino";
     repo = "dino";
     rev = "v${version}";
-    sha256 = "sha256-wjSgs1mUMV7j/8ZeXqWs8aOeWvJHwKziUfbtOC1HS3s=";
+    sha256 = "sha256-FZ7MVeVxIzxzSQi5G9y+nn487pKLcXEZV1JK9mCY2MQ=";
   };
 
+  postPatch = ''
+    # don't overwrite manually set version information
+    substituteInPlace CMakeLists.txt \
+      --replace "include(ComputeVersion)" ""
+  '';
+
   nativeBuildInputs = [
     vala
     cmake
-    ninja
+    ninja # https://github.com/dino/dino/issues/230
     pkg-config
     wrapGAppsHook
     gettext
@@ -40,40 +51,42 @@ stdenv.mkDerivation rec {
   buildInputs = [
     qrencode
     gobject-introspection
-    glib-networking
     glib
+    glib-networking # required for TLS support
+    libadwaita
     libgee
-    gnome.adwaita-icon-theme
     sqlite
     gdk-pixbuf
-    gtk3
+    gtk4
     libnotify
     gpgme
     libgcrypt
     libsoup
-    pcre
-    libepoxy
-    at-spi2-core
-    dbus
+    pcre2
     icu
     libsignal-protocol-c
-    librsvg
     gspell
     srtp
     libnice
     gnutls
     gstreamer
     gst-plugins-base
-    gst-plugins-good
+    gst-plugins-good # contains rtpbin, required for VP9
+    gst-plugins-bad # required for H264, MSDK
+    gst-vaapi # required for VAAPI
     webrtc-audio-processing
-  ] ++ lib.optionals (!stdenv.isDarwin) [
-    xorg.libxcb
-    xorg.libpthreadstubs
-    libXdmcp
-    libxkbcommon
   ];
 
-  cmakeFlags = ["-DBUILD_TESTS=yes"];
+  cmakeFlags = [
+    "-DBUILD_TESTS=true"
+    "-DRTP_ENABLE_H264=true"
+    "-DRTP_ENABLE_MSDK=true"
+    "-DRTP_ENABLE_VAAPI=true"
+    "-DRTP_ENABLE_VP9=true"
+    "-DVERSION_FOUND=true"
+    "-DVERSION_IS_RELEASE=true"
+    "-DVERSION_FULL=${version}"
+  ];
 
   # Undefined symbols for architecture arm64: "_gpg_strerror"
   NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-lgpg-error";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1ec362f90cff..46a945f44f44 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4408,7 +4408,7 @@ with pkgs;
   ditaa = callPackage ../tools/graphics/ditaa { };
 
   dino = callPackage ../applications/networking/instant-messengers/dino {
-    inherit (gst_all_1) gstreamer gst-plugins-base;
+    inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-bad gst-vaapi;
     gst-plugins-good = gst_all_1.gst-plugins-good.override { gtkSupport = true; };
   };
 

From 43659969168b73cf525279484f058351456585f3 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Sat, 11 Feb 2023 20:16:22 +0000
Subject: [PATCH 22/34] mirakurun: add license

---
 pkgs/applications/video/mirakurun/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/mirakurun/default.nix b/pkgs/applications/video/mirakurun/default.nix
index d0d52ade25ad..ce4d412b77f8 100644
--- a/pkgs/applications/video/mirakurun/default.nix
+++ b/pkgs/applications/video/mirakurun/default.nix
@@ -86,8 +86,9 @@ stdenvNoCC.mkDerivation rec {
       yarn2nix;
   };
 
-  meta = {
+  meta = with lib; {
     inherit (mirakurun.meta) description platforms;
-    maintainers = with lib.maintainers; [ midchildan ];
+    license = licenses.asl20;
+    maintainers = with maintainers; [ midchildan ];
   };
 }

From 519f9b3d298e84a6ad2efda06d166203681cac33 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Sat, 11 Feb 2023 19:06:16 +0000
Subject: [PATCH 23/34] v8_8_x: mark broken with GCC 12

---
 pkgs/development/libraries/v8/8_x.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/v8/8_x.nix b/pkgs/development/libraries/v8/8_x.nix
index 2d260b2042cd..b467bd83e2d4 100644
--- a/pkgs/development/libraries/v8/8_x.nix
+++ b/pkgs/development/libraries/v8/8_x.nix
@@ -167,5 +167,6 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [ cstrahan proglodyte matthewbauer ];
     platforms = platforms.unix;
     license = licenses.bsd3;
+    broken = lib.versionAtLeast stdenv.cc.version "12";
   };
 }

From 77dbe93d0d2c56e129fcb99255929131fb816cfb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 11 Feb 2023 20:41:31 +0000
Subject: [PATCH 24/34] python310Packages.pyvisa-py: 0.6.1 -> 0.6.2

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

diff --git a/pkgs/development/python-modules/pyvisa-py/default.nix b/pkgs/development/python-modules/pyvisa-py/default.nix
index bd5b31869cba..d4b3d70b72a9 100644
--- a/pkgs/development/python-modules/pyvisa-py/default.nix
+++ b/pkgs/development/python-modules/pyvisa-py/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "pyvisa-py";
-  version = "0.6.1";
+  version = "0.6.2";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "pyvisa";
     repo = "pyvisa-py";
     rev = "refs/tags/${version}";
-    hash = "sha256-cXxiT/PWDf5WV+s8GbEA2u+1dPyfUKu19IQ2+Q4GTqM=";
+    hash = "sha256-2jNf/jmqpAE4GoX7xGvQTr0MF/UalIWDMAQHUq+B4v4=";
   };
 
   nativeBuildInputs = [

From cbff2010dec85ec733dd243b077a25b9f09ab20e Mon Sep 17 00:00:00 2001
From: Bob van der Linden <bobvanderlinden@gmail.com>
Date: Wed, 1 Feb 2023 15:38:11 +0100
Subject: [PATCH 25/34] pjsip: add pythonSupport option

---
 pkgs/applications/networking/pjsip/default.nix | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/pkgs/applications/networking/pjsip/default.nix b/pkgs/applications/networking/pjsip/default.nix
index eae9a8a3d87a..781b8462a392 100644
--- a/pkgs/applications/networking/pjsip/default.nix
+++ b/pkgs/applications/networking/pjsip/default.nix
@@ -4,8 +4,11 @@
 , fetchpatch
 , openssl
 , libsamplerate
+, swig
 , alsa-lib
 , AppKit
+, python3
+, pythonSupport ? true
 }:
 
 stdenv.mkDerivation rec {
@@ -33,6 +36,9 @@ stdenv.mkDerivation rec {
     })
   ];
 
+  nativeBuildInputs =
+    lib.optionals pythonSupport [ swig python3 ];
+
   buildInputs = [ openssl libsamplerate ]
     ++ lib.optional stdenv.isLinux alsa-lib
     ++ lib.optional stdenv.isDarwin AppKit;
@@ -41,11 +47,22 @@ stdenv.mkDerivation rec {
     export LD=$CC
   '';
 
+  postBuild = lib.optionalString pythonSupport ''
+    make -C pjsip-apps/src/swig/python
+  '';
+
+  outputs = [ "out" ]
+    ++ lib.optional pythonSupport "py";
+
   postInstall = ''
     mkdir -p $out/bin
     cp pjsip-apps/bin/pjsua-* $out/bin/pjsua
     mkdir -p $out/share/${pname}-${version}/samples
     cp pjsip-apps/bin/samples/*/* $out/share/${pname}-${version}/samples
+  '' + lib.optionalString pythonSupport ''
+    (cd pjsip-apps/src/swig/python && \
+      python setup.py install --prefix=$py
+    )
   '';
 
   # We need the libgcc_s.so.1 loadable (for pthread_cancel to work)

From 237abc78ec6bd915207a481f7b8f1f8941a9624f Mon Sep 17 00:00:00 2001
From: Bob van der Linden <bobvanderlinden@gmail.com>
Date: Fri, 3 Feb 2023 15:17:26 +0100
Subject: [PATCH 26/34] pythonPackages: pjsua2: init pjsua2 from pjsip

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c672707b90ef..741d6b653ec1 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7174,6 +7174,11 @@ self: super: with self; {
 
   pixelmatch = callPackage ../development/python-modules/pixelmatch { };
 
+  pjsua2 = (toPythonModule (pkgs.pjsip.override {
+    pythonSupport = true;
+    python3 = self.python;
+  })).py;
+
   pkce = callPackage ../development/python-modules/pkce { };
 
   pkgconfig = callPackage ../development/python-modules/pkgconfig { };

From c2a0dc782d5036dd71302d83ea9e79109442dd17 Mon Sep 17 00:00:00 2001
From: Bob van der Linden <bobvanderlinden@gmail.com>
Date: Fri, 3 Feb 2023 15:17:47 +0100
Subject: [PATCH 27/34] pjsip: enable building shared libraries

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

diff --git a/pkgs/applications/networking/pjsip/default.nix b/pkgs/applications/networking/pjsip/default.nix
index 781b8462a392..33747e2d669b 100644
--- a/pkgs/applications/networking/pjsip/default.nix
+++ b/pkgs/applications/networking/pjsip/default.nix
@@ -54,6 +54,8 @@ stdenv.mkDerivation rec {
   outputs = [ "out" ]
     ++ lib.optional pythonSupport "py";
 
+  configureFlags = [ "--enable-shared" ];
+
   postInstall = ''
     mkdir -p $out/bin
     cp pjsip-apps/bin/pjsua-* $out/bin/pjsua

From 829b777f5309827eb22e5044fa24c7bb5c9a0ea2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sat, 11 Feb 2023 12:21:48 -0800
Subject: [PATCH 28/34] python310Packages.torch-bin: correct meta.platforms

---
 pkgs/development/python-modules/torch/bin.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/torch/bin.nix b/pkgs/development/python-modules/torch/bin.nix
index e9018c123d46..6e66aa75b068 100644
--- a/pkgs/development/python-modules/torch/bin.nix
+++ b/pkgs/development/python-modules/torch/bin.nix
@@ -76,7 +76,7 @@ in buildPythonPackage {
     # https://www.intel.com/content/www/us/en/developer/articles/license/onemkl-license-faq.html
     license = licenses.bsd3;
     sourceProvenance = with sourceTypes; [ binaryNativeCode ];
-    platforms = platforms.linux ++ platforms.darwin;
+    platforms = [ "aarch64-darwin" "x86_64-darwin" "x86_64-linux" ];
     hydraPlatforms = []; # output size 3.2G on 1.11.0
     maintainers = with maintainers; [ junjihashimoto ];
   };

From b9acfcab07bb0d3d8b50152a9cfd2e7e5e2d970b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sat, 11 Feb 2023 13:02:00 -0800
Subject: [PATCH 29/34] python310Packages.home-assistant-chip-core: correct
 meta.platforms

---
 .../python-modules/home-assistant-chip-core/default.nix         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/home-assistant-chip-core/default.nix b/pkgs/development/python-modules/home-assistant-chip-core/default.nix
index c5c199f50539..a3a8cf93b810 100644
--- a/pkgs/development/python-modules/home-assistant-chip-core/default.nix
+++ b/pkgs/development/python-modules/home-assistant-chip-core/default.nix
@@ -87,7 +87,7 @@ buildPythonPackage rec {
     homepage = "https://github.com/home-assistant-libs/chip-wheels";
     license = licenses.asl20;
     maintainers = teams.home-assistant.members;
-    platforms = platforms.linux;
+    platforms = [ "aarch64-linux" "x86_64-linux" ];
     sourceProvenance = with sourceTypes; [ binaryNativeCode ];
   };
 }

From e93108d02724d8455818fea6736c64f8d4074a64 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sat, 11 Feb 2023 13:08:39 -0800
Subject: [PATCH 30/34] python310Packages.torchaudio-bin: correct
 meta.platforms

---
 pkgs/development/python-modules/torchaudio/bin.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/torchaudio/bin.nix b/pkgs/development/python-modules/torchaudio/bin.nix
index f3656aa0a46f..f840b10e2b87 100644
--- a/pkgs/development/python-modules/torchaudio/bin.nix
+++ b/pkgs/development/python-modules/torchaudio/bin.nix
@@ -51,7 +51,7 @@ buildPythonPackage rec {
     # https://www.intel.com/content/www/us/en/developer/articles/license/onemkl-license-faq.html
     license = licenses.bsd3;
     sourceProvenance = with sourceTypes; [ binaryNativeCode ];
-    platforms = platforms.linux;
+    platforms = [ "x86_64-linux" ];
     maintainers = with maintainers; [ junjihashimoto ];
   };
 }

From 6615030dddd11222fc54e61f2f128793d5a72ad0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sat, 11 Feb 2023 13:10:43 -0800
Subject: [PATCH 31/34] python310Packages.torchvision-bin: correct
 meta.platforms

---
 pkgs/development/python-modules/torchvision/bin.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/torchvision/bin.nix b/pkgs/development/python-modules/torchvision/bin.nix
index afa862ab4778..3c7aa4bb6248 100644
--- a/pkgs/development/python-modules/torchvision/bin.nix
+++ b/pkgs/development/python-modules/torchvision/bin.nix
@@ -61,7 +61,7 @@ in buildPythonPackage {
     # https://www.intel.com/content/www/us/en/developer/articles/license/onemkl-license-faq.html
     license = licenses.bsd3;
     sourceProvenance = with sourceTypes; [ binaryNativeCode ];
-    platforms = platforms.linux;
+    platforms = [ "x86_64-linux" ];
     maintainers = with maintainers; [ junjihashimoto ];
   };
 }

From 78367ae5cbc49899e69c3d58ed83df264e583528 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Wed, 8 Feb 2023 20:01:43 +0000
Subject: [PATCH 32/34] ocaml-ng.ocamlPackages_4_09.ocaml: fix with GCC 12

---
 .../compilers/ocaml/4.09.1-Werror.patch          | 16 ++++++++++++++++
 pkgs/development/compilers/ocaml/4.09.nix        |  1 +
 2 files changed, 17 insertions(+)
 create mode 100644 pkgs/development/compilers/ocaml/4.09.1-Werror.patch

diff --git a/pkgs/development/compilers/ocaml/4.09.1-Werror.patch b/pkgs/development/compilers/ocaml/4.09.1-Werror.patch
new file mode 100644
index 000000000000..153c8a06e34e
--- /dev/null
+++ b/pkgs/development/compilers/ocaml/4.09.1-Werror.patch
@@ -0,0 +1,16 @@
+The 4.09.1 tarball appears to have been acidentally generated as a
+development tarball, which causes configure to enable -Werror.  This
+means newer compilers will make the build fail.
+
+diff a/configure b/configure
+--- a/configure
++++ b/configure
+@@ -12360,7 +12360,7 @@ case $ocaml_cv_cc_vendor in #(
+   msvc-*) :
+     outputobj=-Fo; CPP="cl -nologo -EP"; gcc_warnings="" ;; #(
+   *) :
+-    outputobj='-o $(EMPTY)'; case 4.09.1+dev1-2020-03-13 in #(
++    outputobj='-o $(EMPTY)'; case 4.09.1 in #(
+   *+dev*) :
+     gcc_warnings="-Wall -Werror" ;; #(
+   *) :
diff --git a/pkgs/development/compilers/ocaml/4.09.nix b/pkgs/development/compilers/ocaml/4.09.nix
index c5f649c15d6b..2d0672093905 100644
--- a/pkgs/development/compilers/ocaml/4.09.nix
+++ b/pkgs/development/compilers/ocaml/4.09.nix
@@ -8,6 +8,7 @@ import ./generic.nix {
   hardeningDisable = [ "strictoverflow" ];
 
   patches = [
+    ./4.09.1-Werror.patch
     # Compatibility with Glibc 2.34
     { url = "https://github.com/ocaml/ocaml/commit/8eed2e441222588dc385a98ae8bd6f5820eb0223.patch";
       sha256 = "sha256:1b3jc6sj2k23yvfwrv6nc1f4x2n2biqbhbbp74aqb6iyqyjsq35n"; }

From 0492d670913ebec88564b2f99e8a32a480db9340 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 11 Feb 2023 22:19:29 +0000
Subject: [PATCH 33/34] python310Packages.aiolifx: 0.8.7 -> 0.8.9

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

diff --git a/pkgs/development/python-modules/aiolifx/default.nix b/pkgs/development/python-modules/aiolifx/default.nix
index 6cae53c1bce8..4c5ea7191940 100644
--- a/pkgs/development/python-modules/aiolifx/default.nix
+++ b/pkgs/development/python-modules/aiolifx/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "aiolifx";
-  version = "0.8.7";
+  version = "0.8.9";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-pqneX4O3BnDH7vT7RgFiEIMpLcoXOpBvKOYuMla3Iq4=";
+    hash = "sha256-Ih82dNDZd3sbGHhxDTtzJQXkjn6Pgefb0S24gttiOO8=";
   };
 
   propagatedBuildInputs = [

From 73ef12485825a2d793a5241cd9602b30a4bb21d2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 11 Feb 2023 22:50:10 +0000
Subject: [PATCH 34/34] python310Packages.vertica-python: 1.2.0 -> 1.3.0

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

diff --git a/pkgs/development/python-modules/vertica-python/default.nix b/pkgs/development/python-modules/vertica-python/default.nix
index 1bd12d4a3dc2..11bf821e0e6c 100644
--- a/pkgs/development/python-modules/vertica-python/default.nix
+++ b/pkgs/development/python-modules/vertica-python/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "vertica-python";
-  version = "1.2.0";
+  version = "1.3.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-zfeXJJL5pWzv9y39MWHYZggBRBAPGJItUKKaxp8MlRM=";
+    hash = "sha256-UC8RkZCRodsK4DV0Pnn2jUohM7pNiqGWrbjWlDqn72I=";
   };
 
   propagatedBuildInputs = [