From e9e9fd2803db35484fc3ed1ff71757bc50c3d9da Mon Sep 17 00:00:00 2001
From: Daniel Poelzleithner <poelzleithner@b1-systems.de>
Date: Tue, 2 May 2023 19:58:46 +0200
Subject: [PATCH 01/37] kicli: init at 0.0.3

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

diff --git a/pkgs/tools/misc/kicli/default.nix b/pkgs/tools/misc/kicli/default.nix
new file mode 100644
index 000000000000..76516f4e4ac3
--- /dev/null
+++ b/pkgs/tools/misc/kicli/default.nix
@@ -0,0 +1,28 @@
+{ lib
+, buildGoModule
+, fetchFromGitHub
+, nix-update-script
+}:
+buildGoModule rec {
+  pname = "kicli";
+  version = "0.0.3";
+
+  src = fetchFromGitHub {
+    owner = "anned20";
+    repo = pname;
+    rev = "v${version}";
+    hash = "sha256-Mt1lHOC8gBcLQ6kArUvlPrH+Y/63mIQTCsUY2UTJE2c=";
+  };
+
+  vendorHash = "sha256-+8L/9NJ3dzP4k+LXkPD208uFGeARv7aT39bhH+R08e0=";
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = with lib; {
+    homepage = "https://github.com/anned20/kicli";
+    description = "CLI interface to the Kimai time tracking project";
+    license = licenses.mit;
+    maintainers = with maintainers; [ poelzi ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 195ab5e9155a..1c84b71300fb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1593,6 +1593,8 @@ with pkgs;
 
   kaufkauflist = callPackage ../applications/misc/kaufkauflist { };
 
+  kicli = callPackage ../tools/misc/kicli { };
+
   ksmbd-tools = callPackage ../os-specific/linux/ksmbd-tools { };
 
   ksnip = libsForQt5.callPackage ../tools/misc/ksnip { };

From 3f43324c557297f3caa80e7b7b140a3f5f4c1a74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carl=20Thom=C3=A9?= <carlthome@gmail.com>
Date: Tue, 16 May 2023 23:34:48 +0200
Subject: [PATCH 02/37] maintainers: add carlthome

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index ffaa68bd7bfe..bc3d17d0b70e 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -2524,6 +2524,12 @@
     githubId = 82591;
     name = "Carl Sverre";
   };
+  carlthome = {
+    name = "Carl Thomé";
+    email = "carlthome@gmail.com";
+    github = "carlthome";
+    githubId = 1595907;
+  };
   carpinchomug = {
     email = "aki.suda@protonmail.com";
     github = "carpinchomug";

From d4e59e7f4a052d17a95f115176a75289de243b6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carl=20Thom=C3=A9?= <carlthome@gmail.com>
Date: Tue, 16 May 2023 23:35:01 +0200
Subject: [PATCH 03/37] python3Packages.mir_eval: init at 0.7

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

diff --git a/pkgs/development/python-modules/mir_eval/default.nix b/pkgs/development/python-modules/mir_eval/default.nix
new file mode 100644
index 000000000000..eaf4a9e4f535
--- /dev/null
+++ b/pkgs/development/python-modules/mir_eval/default.nix
@@ -0,0 +1,39 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, future
+, six
+, numpy
+, scipy
+, matplotlib
+}:
+
+buildPythonPackage rec {
+  pname = "mir_eval";
+  version = "0.7";
+  format = "setuptools";
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-4f66pXZsZadUXCoXCyQUkPR6mJhzcLHgZ0JCTF3r5l4=";
+  };
+
+  propagatedBuildInputs = [
+    future
+    six
+    numpy
+    scipy
+    matplotlib
+  ];
+
+  pythonImportsCheck = [
+    "mir_eval"
+  ];
+
+  meta = with lib; {
+    description = "Common metrics for common audio/music processing tasks";
+    homepage = "https://github.com/craffel/mir_eval";
+    license = licenses.mit;
+    maintainers = with maintainers; [ carlthome ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 06e00fe5b650..eba6a580d97e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6160,6 +6160,8 @@ self: super: with self; {
 
   mip = callPackage ../development/python-modules/mip { };
 
+  mir_eval = callPackage ../development/python-modules/mir_eval { };
+
   misaka = callPackage ../development/python-modules/misaka { };
 
   misoc = callPackage ../development/python-modules/misoc { };

From 3ed22708d0c54e646d4990ca76a24977013766a0 Mon Sep 17 00:00:00 2001
From: Andrew Marshall <andrew@johnandrewmarshall.com>
Date: Fri, 9 Jun 2023 19:41:56 -0400
Subject: [PATCH 04/37] fetchfirefoxaddon: formatting

Had some inconsistent spacing, so ran against nixpkgs-fmt and also split
fn args into multiple lines for simpler diffs.
---
 .../fetchfirefoxaddon/default.nix             | 21 ++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/pkgs/build-support/fetchfirefoxaddon/default.nix b/pkgs/build-support/fetchfirefoxaddon/default.nix
index fe9ff5c469ba..3ef344a209a4 100644
--- a/pkgs/build-support/fetchfirefoxaddon/default.nix
+++ b/pkgs/build-support/fetchfirefoxaddon/default.nix
@@ -1,7 +1,12 @@
-{stdenv, unzip, jq, zip, fetchurl,writeScript,  ...}:
+{ stdenv
+, fetchurl
+, jq
+, unzip
+, writeScript
+, zip
+}:
 
-{
-  name
+{ name
 , url ? null
 , md5 ? ""
 , sha1 ? ""
@@ -14,7 +19,8 @@
 
 let
   extid = if fixedExtid == null then "nixos@${name}" else fixedExtid;
-  source = if url == null then src else fetchurl {
+  source = if url == null then src else
+  fetchurl {
     url = url;
     inherit md5 sha1 sha256 sha512 hash;
   };
@@ -40,5 +46,10 @@ stdenv.mkDerivation {
     zip -r -q -FS "$out/$UUID.xpi" *
     rm -r "$out/$UUID"
   '';
-  nativeBuildInputs = [ unzip zip jq  ];
+
+  nativeBuildInputs = [
+    jq
+    unzip
+    zip
+  ];
 }

From 2e02abd798f741887ab4e5983c29e1c22f754c9b Mon Sep 17 00:00:00 2001
From: Andrew Marshall <andrew@johnandrewmarshall.com>
Date: Fri, 9 Jun 2023 19:45:50 -0400
Subject: [PATCH 05/37] fetchfirefoxaddon: make reproducible

---
 pkgs/build-support/fetchfirefoxaddon/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/build-support/fetchfirefoxaddon/default.nix b/pkgs/build-support/fetchfirefoxaddon/default.nix
index 3ef344a209a4..41eaa550ea27 100644
--- a/pkgs/build-support/fetchfirefoxaddon/default.nix
+++ b/pkgs/build-support/fetchfirefoxaddon/default.nix
@@ -1,6 +1,7 @@
 { stdenv
 , fetchurl
 , jq
+, strip-nondeterminism
 , unzip
 , writeScript
 , zip
@@ -44,11 +45,13 @@ stdenv.mkDerivation {
     echo "$NEW_MANIFEST" > "$out/$UUID/manifest.json"
     cd "$out/$UUID"
     zip -r -q -FS "$out/$UUID.xpi" *
+    strip-nondeterminism "$out/$UUID.xpi"
     rm -r "$out/$UUID"
   '';
 
   nativeBuildInputs = [
     jq
+    strip-nondeterminism
     unzip
     zip
   ];

From 54d8532f40d7ccd47c3ace56ba0fda4276778fc1 Mon Sep 17 00:00:00 2001
From: Andrew Marshall <andrew@johnandrewmarshall.com>
Date: Fri, 9 Jun 2023 23:40:13 -0400
Subject: [PATCH 06/37] bisq-desktop: formatting

---
 pkgs/applications/blockchains/bisq-desktop/default.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/blockchains/bisq-desktop/default.nix b/pkgs/applications/blockchains/bisq-desktop/default.nix
index 36bc0ebfb883..1151b06792c5 100644
--- a/pkgs/applications/blockchains/bisq-desktop/default.nix
+++ b/pkgs/applications/blockchains/bisq-desktop/default.nix
@@ -41,7 +41,14 @@ stdenv.mkDerivation rec {
     sha256 = "0jisxzajsc4wfvxabvfzd0x9y1fxzg39fkhap1781q7wyi4ry9kd";
   };
 
-  nativeBuildInputs = [ makeWrapper copyDesktopItems imagemagick dpkg zip xz ];
+  nativeBuildInputs = [
+    copyDesktopItems
+    dpkg
+    imagemagick
+    makeWrapper
+    xz
+    zip
+  ];
 
   desktopItems = [
     (makeDesktopItem {

From d634a6244fa5d9ce035bcd6fc7604f1b062a81be Mon Sep 17 00:00:00 2001
From: Andrew Marshall <andrew@johnandrewmarshall.com>
Date: Fri, 9 Jun 2023 23:40:32 -0400
Subject: [PATCH 07/37] bisq-desktop: make reproducible

---
 pkgs/applications/blockchains/bisq-desktop/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/blockchains/bisq-desktop/default.nix b/pkgs/applications/blockchains/bisq-desktop/default.nix
index 1151b06792c5..46f6b57859c2 100644
--- a/pkgs/applications/blockchains/bisq-desktop/default.nix
+++ b/pkgs/applications/blockchains/bisq-desktop/default.nix
@@ -9,6 +9,7 @@
 , dpkg
 , writeScript
 , bash
+, strip-nondeterminism
 , tor
 , zip
 , xz
@@ -46,6 +47,7 @@ stdenv.mkDerivation rec {
     dpkg
     imagemagick
     makeWrapper
+    strip-nondeterminism
     xz
     zip
   ];
@@ -71,8 +73,9 @@ stdenv.mkDerivation rec {
 
     mkdir -p native/linux/x64/
     cp ${bisq-tor} ./tor
-    tar -cJf native/linux/x64/tor.tar.xz tor
+    tar --sort=name --mtime="@$SOURCE_DATE_EPOCH" -cJf native/linux/x64/tor.tar.xz tor
     zip -r opt/bisq/lib/app/desktop-${version}-all.jar native
+    strip-nondeterminism opt/bisq/lib/app/desktop-${version}-all.jar
   '';
 
   installPhase = ''

From 90427d2381a5293ca377be7306c5e3cecb69a255 Mon Sep 17 00:00:00 2001
From: Andrew Marshall <andrew@johnandrewmarshall.com>
Date: Sat, 10 Jun 2023 01:21:40 -0400
Subject: [PATCH 08/37] pcsx2: formatting

---
 pkgs/applications/emulators/pcsx2/default.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/emulators/pcsx2/default.nix b/pkgs/applications/emulators/pcsx2/default.nix
index 953fd3a3daa2..015f12cdac28 100644
--- a/pkgs/applications/emulators/pcsx2/default.nix
+++ b/pkgs/applications/emulators/pcsx2/default.nix
@@ -58,7 +58,12 @@ stdenv.mkDerivation rec {
     "-DDISABLE_BUILD_DATE=TRUE"
   ];
 
-  nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook zip ];
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+    wrapQtAppsHook
+    zip
+  ];
 
   buildInputs = [
     curl

From 199cc23afee9a574a440ae4916f4112baac61234 Mon Sep 17 00:00:00 2001
From: Andrew Marshall <andrew@johnandrewmarshall.com>
Date: Fri, 9 Jun 2023 23:49:31 -0400
Subject: [PATCH 09/37] pcsx2: make reproducible

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

diff --git a/pkgs/applications/emulators/pcsx2/default.nix b/pkgs/applications/emulators/pcsx2/default.nix
index 015f12cdac28..517f4356a012 100644
--- a/pkgs/applications/emulators/pcsx2/default.nix
+++ b/pkgs/applications/emulators/pcsx2/default.nix
@@ -23,6 +23,7 @@
 , rapidyaml
 , SDL2
 , soundtouch
+, strip-nondeterminism
 , vulkan-headers
 , vulkan-loader
 , wayland
@@ -61,6 +62,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     cmake
     pkg-config
+    strip-nondeterminism
     wrapQtAppsHook
     zip
   ];
@@ -100,6 +102,7 @@ stdenv.mkDerivation rec {
     install -Dm644 $src/.github/workflows/scripts/linux/pcsx2-qt.desktop $out/share/applications/PCSX2.desktop
 
     zip -jq $out/bin/resources/patches.zip ${pcsx2_patches}/patches/*
+    strip-nondeterminism $out/bin/resources/patches.zip
   '';
 
   qtWrapperArgs = [

From 2db2887d2fc6205fe9a66a49b46b05fd059e44d9 Mon Sep 17 00:00:00 2001
From: Andrew Marshall <andrew@johnandrewmarshall.com>
Date: Fri, 9 Jun 2023 23:51:44 -0400
Subject: [PATCH 10/37] slimmerjs: formatting

---
 pkgs/development/tools/slimerjs/default.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/tools/slimerjs/default.nix b/pkgs/development/tools/slimerjs/default.nix
index 7ebe7dba8512..e15e84b3a4bc 100644
--- a/pkgs/development/tools/slimerjs/default.nix
+++ b/pkgs/development/tools/slimerjs/default.nix
@@ -1,4 +1,11 @@
-{ lib, stdenv, fetchFromGitHub, zip, unzip, firefox, bash }:
+{ lib
+, bash
+, fetchFromGitHub
+, firefox
+, stdenv
+, unzip
+, zip
+}:
 
 stdenv.mkDerivation rec {
   pname = "slimerjs";

From 013dde9275cde07ae9d6993c11372606004c98db Mon Sep 17 00:00:00 2001
From: Andrew Marshall <andrew@johnandrewmarshall.com>
Date: Sat, 10 Jun 2023 00:17:58 -0400
Subject: [PATCH 11/37] slimmerjs: make reproducible

---
 pkgs/development/tools/slimerjs/default.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/tools/slimerjs/default.nix b/pkgs/development/tools/slimerjs/default.nix
index e15e84b3a4bc..f800dedf615f 100644
--- a/pkgs/development/tools/slimerjs/default.nix
+++ b/pkgs/development/tools/slimerjs/default.nix
@@ -2,6 +2,7 @@
 , bash
 , fetchFromGitHub
 , firefox
+, strip-nondeterminism
 , stdenv
 , unzip
 , zip
@@ -19,7 +20,10 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ zip ];
-  nativeBuildInputs = [ unzip ];
+  nativeBuildInputs = [
+    strip-nondeterminism
+    unzip
+  ];
 
   preConfigure = ''
     test -d src && cd src
@@ -27,6 +31,7 @@ stdenv.mkDerivation rec {
   '';
 
   installPhase = ''
+    strip-nondeterminism --type zip omni.ja
     mkdir -p "$out"/{bin,share/doc/slimerjs,lib/slimerjs}
     cp LICENSE README* "$out/share/doc/slimerjs"
     cp -r * "$out/lib/slimerjs"

From bf818c857f12d97570fe11e48de55a28ec434cf3 Mon Sep 17 00:00:00 2001
From: Andrew Marshall <andrew@johnandrewmarshall.com>
Date: Fri, 9 Jun 2023 23:57:00 -0400
Subject: [PATCH 12/37] mari0: formatting

---
 pkgs/games/mari0/default.nix | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/pkgs/games/mari0/default.nix b/pkgs/games/mari0/default.nix
index 9541b97476c1..864e015e54a3 100644
--- a/pkgs/games/mari0/default.nix
+++ b/pkgs/games/mari0/default.nix
@@ -1,5 +1,12 @@
-{ lib, stdenv, fetchFromGitHub, zip, love, makeWrapper, makeDesktopItem
-, copyDesktopItems }:
+{ lib
+, copyDesktopItems
+, fetchFromGitHub
+, love
+, makeDesktopItem
+, makeWrapper
+, stdenv
+, zip
+}:
 
 stdenv.mkDerivation rec {
   pname = "mari0";
@@ -12,7 +19,11 @@ stdenv.mkDerivation rec {
     sha256 = "1zqaq4w599scsjvy1rsb21fd2r8j3srx9vym4ir9bh666dp36gxa";
   };
 
-  nativeBuildInputs = [ makeWrapper copyDesktopItems zip ];
+  nativeBuildInputs = [
+    copyDesktopItems
+    makeWrapper
+    zip
+  ];
 
   desktopItems = [
     (makeDesktopItem {

From aea09ca7070ba1339c021cd55f3c743d4731af65 Mon Sep 17 00:00:00 2001
From: Andrew Marshall <andrew@johnandrewmarshall.com>
Date: Sat, 10 Jun 2023 00:18:14 -0400
Subject: [PATCH 13/37] mari0: make reproducible

---
 pkgs/games/mari0/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/games/mari0/default.nix b/pkgs/games/mari0/default.nix
index 864e015e54a3..6e644245c4fb 100644
--- a/pkgs/games/mari0/default.nix
+++ b/pkgs/games/mari0/default.nix
@@ -5,6 +5,7 @@
 , makeDesktopItem
 , makeWrapper
 , stdenv
+, strip-nondeterminism
 , zip
 }:
 
@@ -22,6 +23,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     copyDesktopItems
     makeWrapper
+    strip-nondeterminism
     zip
   ];
 
@@ -39,6 +41,7 @@ stdenv.mkDerivation rec {
   installPhase = ''
     runHook preInstall
     zip -9 -r mari0.love ./*
+    strip-nondeterminism --type zip mari0.love
     install -Dm444 -t $out/share/games/lovegames/ mari0.love
     makeWrapper ${love}/bin/love $out/bin/mari0 \
       --add-flags $out/share/games/lovegames/mari0.love

From c0a48fcaf5f2fee3ecc1d4512210c868543c6de3 Mon Sep 17 00:00:00 2001
From: Andrew Marshall <andrew@johnandrewmarshall.com>
Date: Sat, 10 Jun 2023 00:21:02 -0400
Subject: [PATCH 14/37] orthorobot: formatting

---
 pkgs/games/orthorobot/default.nix | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/pkgs/games/orthorobot/default.nix b/pkgs/games/orthorobot/default.nix
index 5fc11d212514..e6ee3bcb4e08 100644
--- a/pkgs/games/orthorobot/default.nix
+++ b/pkgs/games/orthorobot/default.nix
@@ -1,5 +1,14 @@
-{ lib, stdenv, fetchurl, fetchFromGitHub, love, zip, fetchpatch, makeWrapper
-, makeDesktopItem, copyDesktopItems }:
+{ lib
+, copyDesktopItems
+, fetchFromGitHub
+, fetchpatch
+, fetchurl
+, love
+, makeDesktopItem
+, makeWrapper
+, stdenv
+, zip
+}:
 
 stdenv.mkDerivation rec {
   pname = "orthorobot";
@@ -29,7 +38,11 @@ stdenv.mkDerivation rec {
     })
   ];
 
-  nativeBuildInputs = [ makeWrapper zip copyDesktopItems ];
+  nativeBuildInputs = [
+    copyDesktopItems
+    makeWrapper
+    zip
+  ];
 
   patches = [
     # support for love11

From a7b2dbf48d537997ccfe64fe5786c5c4338a4b29 Mon Sep 17 00:00:00 2001
From: Andrew Marshall <andrew@johnandrewmarshall.com>
Date: Sat, 10 Jun 2023 00:24:27 -0400
Subject: [PATCH 15/37] orthorobot: make reproducible

---
 pkgs/games/orthorobot/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/games/orthorobot/default.nix b/pkgs/games/orthorobot/default.nix
index e6ee3bcb4e08..6ca70596458d 100644
--- a/pkgs/games/orthorobot/default.nix
+++ b/pkgs/games/orthorobot/default.nix
@@ -7,6 +7,7 @@
 , makeDesktopItem
 , makeWrapper
 , stdenv
+, strip-nondeterminism
 , zip
 }:
 
@@ -41,6 +42,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     copyDesktopItems
     makeWrapper
+    strip-nondeterminism
     zip
   ];
 
@@ -55,6 +57,7 @@ stdenv.mkDerivation rec {
   installPhase = ''
     runHook preInstall
     zip -9 -r orthorobot.love ./*
+    strip-nondeterminism --type zip orthorobot.love
     install -Dm444 -t $out/share/games/lovegames/ orthorobot.love
     makeWrapper ${love}/bin/love $out/bin/orthorobot \
                 --add-flags $out/share/games/lovegames/orthorobot.love

From 34e6a8b4a1d7f7dddd7f6faf9727da59de526acb Mon Sep 17 00:00:00 2001
From: Andrew Marshall <andrew@johnandrewmarshall.com>
Date: Sat, 10 Jun 2023 00:24:55 -0400
Subject: [PATCH 16/37] wireworld: formatting

---
 pkgs/games/wireworld/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/games/wireworld/default.nix b/pkgs/games/wireworld/default.nix
index 5528b52a280a..b12e21bfb6e5 100644
--- a/pkgs/games/wireworld/default.nix
+++ b/pkgs/games/wireworld/default.nix
@@ -19,7 +19,11 @@ stdenv.mkDerivation rec {
     hash = "sha256-8BshnGLuA8lmG9g7FU349DWKP/fZvlvjrQBau/LSJ4E=";
   };
 
-  nativeBuildInputs = [ makeWrapper copyDesktopItems zip ];
+  nativeBuildInputs = [
+    copyDesktopItems
+    makeWrapper
+    zip
+  ];
 
   desktopItems = [
     (makeDesktopItem {

From 059f9dc3c0f654f53779f0d4364911a31c216286 Mon Sep 17 00:00:00 2001
From: Andrew Marshall <andrew@johnandrewmarshall.com>
Date: Sat, 10 Jun 2023 00:26:13 -0400
Subject: [PATCH 17/37] wireworld: make reproducible

---
 pkgs/games/wireworld/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/games/wireworld/default.nix b/pkgs/games/wireworld/default.nix
index b12e21bfb6e5..828d313d2a87 100644
--- a/pkgs/games/wireworld/default.nix
+++ b/pkgs/games/wireworld/default.nix
@@ -6,6 +6,7 @@
 , makeWrapper
 , makeDesktopItem
 , copyDesktopItems
+, strip-nondeterminism
 }:
 
 stdenv.mkDerivation rec {
@@ -22,6 +23,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     copyDesktopItems
     makeWrapper
+    strip-nondeterminism
     zip
   ];
 
@@ -39,6 +41,7 @@ stdenv.mkDerivation rec {
   installPhase = ''
     runHook preInstall
     zip -9 -r Wireworld.love ./*
+    strip-nondeterminism --type zip Wireworld.love
     install -Dm444 -t $out/share/games/lovegames/ Wireworld.love
     makeWrapper ${love}/bin/love $out/bin/Wireworld \
       --add-flags $out/share/games/lovegames/Wireworld.love

From 24eb37f2a8d3514ad840eaff99e4dc4ca5baf876 Mon Sep 17 00:00:00 2001
From: Andrew Marshall <andrew@johnandrewmarshall.com>
Date: Sat, 10 Jun 2023 00:31:52 -0400
Subject: [PATCH 18/37] pridefetch: formatting

---
 pkgs/tools/misc/pridefetch/default.nix | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/pridefetch/default.nix b/pkgs/tools/misc/pridefetch/default.nix
index 80fd1b0e9bc2..24169b413437 100644
--- a/pkgs/tools/misc/pridefetch/default.nix
+++ b/pkgs/tools/misc/pridefetch/default.nix
@@ -1,4 +1,11 @@
-{ lib, stdenv, fetchFromGitHub, python3, zip }: let
+{ lib
+, fetchFromGitHub
+, python3
+, stdenv
+, zip
+}:
+
+let
   version = "1.1.0";
   sha256 = "sha256-563xOz63vto19yuaHtReV1dSw6BgNf+CLtS3lrPnaoc=";
 
@@ -9,16 +16,21 @@
     rev = "v" + version;
     inherit sha256;
   };
-in stdenv.mkDerivation {
+in
+
+stdenv.mkDerivation {
   inherit pname version src;
+
   nativeBuildInputs = [
     zip
   ];
+
   buildInputs = [
     (python3.withPackages (pythonPackages: with pythonPackages; [
       distro
     ]))
   ];
+
   buildPhase = ''
     runHook preBuild
     pushd src
@@ -28,6 +40,7 @@ in stdenv.mkDerivation {
     rm pridefetch.zip
     runHook postBuild
   '';
+
   installPhase = ''
     runHook preInstall
     mkdir -p $out/bin
@@ -35,6 +48,7 @@ in stdenv.mkDerivation {
     chmod +x $out/bin/pridefetch
     runHook postInstall
   '';
+
   meta = with lib; {
     description = "Print out system statistics with pride flags";
     longDescription = ''

From b06a89a01ccf2ef8175e24b1ea58f33d7d594176 Mon Sep 17 00:00:00 2001
From: Andrew Marshall <andrew@johnandrewmarshall.com>
Date: Sat, 10 Jun 2023 00:43:00 -0400
Subject: [PATCH 19/37] pridefetch: make reproducible

---
 pkgs/tools/misc/pridefetch/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/tools/misc/pridefetch/default.nix b/pkgs/tools/misc/pridefetch/default.nix
index 24169b413437..22e5c7a0afb2 100644
--- a/pkgs/tools/misc/pridefetch/default.nix
+++ b/pkgs/tools/misc/pridefetch/default.nix
@@ -2,6 +2,7 @@
 , fetchFromGitHub
 , python3
 , stdenv
+, strip-nondeterminism
 , zip
 }:
 
@@ -22,6 +23,7 @@ stdenv.mkDerivation {
   inherit pname version src;
 
   nativeBuildInputs = [
+    strip-nondeterminism
     zip
   ];
 
@@ -35,6 +37,7 @@ stdenv.mkDerivation {
     runHook preBuild
     pushd src
     zip -r ../pridefetch.zip ./*
+    strip-nondeterminism ../pridefetch.zip
     popd
     echo '#!/usr/bin/env python' | cat - pridefetch.zip > pridefetch
     rm pridefetch.zip

From 005cfc8b0cea9cef36a8d129c3b06e0a98a918da Mon Sep 17 00:00:00 2001
From: Emily Trau <emily@downunderctf.com>
Date: Thu, 18 May 2023 10:12:53 +1000
Subject: [PATCH 20/37] minimal-bootstrap: create top-level attr for bootstrap
 sources

---
 .../stage0-posix/bootstrap-sources.nix        | 22 ++++++++++++---
 .../minimal-bootstrap/stage0-posix/hex0.nix   |  2 +-
 .../stage0-posix/kaem/minimal.nix             |  2 +-
 .../stage0-posix/make-bootstrap-sources.nix   | 28 ++++++++++++++-----
 pkgs/top-level/all-packages.nix               |  1 +
 5 files changed, 42 insertions(+), 13 deletions(-)

diff --git a/pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/bootstrap-sources.nix b/pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/bootstrap-sources.nix
index f06db98a8efe..e7ddede2ffa4 100644
--- a/pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/bootstrap-sources.nix
+++ b/pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/bootstrap-sources.nix
@@ -15,8 +15,7 @@ rec {
     executable = true;
   };
 
-  # Packaged resources required for the first bootstrapping stage.
-  # Contains source code and 256-byte hex0 binary seed.
+  # Packaged source files for the first bootstrapping stage.
   #
   # We don't have access to utilities such as fetchgit and fetchzip since this
   # is this is part of the bootstrap process and would introduce a circular
@@ -25,10 +24,25 @@ rec {
   # tarballs to be repackaged.
   #
   # To build see `make-bootstrap-sources.nix`
+
+  #
+  # Files came from this Hydra build:
+  #
+  #   https://hydra.nixos.org/build/<placeholder>
+  #
+  # Which used nixpkgs revision <placeholder>
+  # to instantiate:
+  #
+  #   /nix/store/<placeholder>.drv
+  #
+  # and then built:
+  #
+  #   /nix/store/<placeholder>
+  #
   src = import <nix/fetchurl.nix> {
     inherit name;
-    url = "https://github.com/emilytrau/bootstrap-tools-nar-mirror/releases/download/2023-05-02/${name}.nar.xz";
-    hash = "sha256-ZRG0k49MxL1UTZhuMTvPoEprdSpJRNVy8QhLE6k+etg=";
+    url = "https://github.com/emilytrau/bootstrap-tools-nar-mirror/releases/download/2023-05-18/${name}.nar.xz";
+    hash = "sha256-FpMp7z+B3cR3LkQ+PooH/b1/NlxH8NHVJNWifaPWt4U=";
     unpack = true;
   };
 }
diff --git a/pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/hex0.nix b/pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/hex0.nix
index 43859b966add..b85b2f2cac14 100644
--- a/pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/hex0.nix
+++ b/pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/hex0.nix
@@ -9,7 +9,7 @@ derivationWithMeta {
   pname = "hex0";
   builder = hex0-seed;
   args = [
-    "${src}/bootstrap-seeds/POSIX/x86/hex0_x86.hex0"
+    "${src}/x86/hex0_x86.hex0"
     (placeholder "out")
   ];
 
diff --git a/pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/kaem/minimal.nix b/pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/kaem/minimal.nix
index e85efbbb0243..24fc77f8d345 100644
--- a/pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/kaem/minimal.nix
+++ b/pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/kaem/minimal.nix
@@ -9,7 +9,7 @@ derivationWithMeta {
   pname = "kaem-minimal";
   builder = hex0;
   args = [
-    "${src}/bootstrap-seeds/POSIX/x86/kaem-minimal.hex0"
+    "${src}/x86/kaem-minimal.hex0"
     (placeholder "out")
   ];
 
diff --git a/pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/make-bootstrap-sources.nix b/pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/make-bootstrap-sources.nix
index fec03f370bc3..be0974edf430 100644
--- a/pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/make-bootstrap-sources.nix
+++ b/pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/make-bootstrap-sources.nix
@@ -1,5 +1,4 @@
-# Packaged resources required for the first bootstrapping stage.
-# Contains source code and 256-byte hex0 binary seed.
+# Packaged source files for the first bootstrapping stage.
 #
 # We don't have access to utilities such as fetchgit and fetchzip since this
 # is this is part of the bootstrap process and would introduce a circular
@@ -9,23 +8,30 @@
 #
 # To build:
 #
-#   nix-build pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/make-bootstrap-sources.nix
+#   nix-build . -A minimal-bootstrap-sources
 #   => ./result/stage0-posix-$version-$rev-source.nar.xz
 #
 
-{ pkgs ? import ../../../../.. {} }:
+{ lib
+, fetchFromGitHub
+, runCommand
+, nix
+, xz
+}:
 let
-  inherit (pkgs) callPackage runCommand fetchFromGitHub nix xz;
-
   inherit (import ./bootstrap-sources.nix) name rev;
 
   src = fetchFromGitHub {
     owner = "oriansj";
     repo = "stage0-posix";
     inherit rev;
-    sha256 = "sha256-ZRG0k49MxL1UTZhuMTvPoEprdSpJRNVy8QhLE6k+etg=";
+    sha256 = "sha256-FpMp7z+B3cR3LkQ+PooH/b1/NlxH8NHVJNWifaPWt4U=";
     fetchSubmodules = true;
     postFetch = ''
+      # Seed binaries will be fetched separately
+      echo "Removing seed binaries"
+      rm -rf $out/bootstrap-seeds/*
+
       # Remove vendored/duplicate M2libc's
       echo "Removing duplicate M2libc"
       rm -rf \
@@ -40,6 +46,14 @@ runCommand name {
   nativeBuildInputs = [ nix xz ];
 
   passthru = { inherit src; };
+
+  meta = with lib; {
+    description = "Packaged sources for the first bootstrapping stage";
+    homepage = "https://github.com/oriansj/stage0-posix";
+    license = licenses.gpl3Plus;
+    maintainers = teams.minimal-bootstrap.members;
+    platforms = platforms.all;
+  };
 } ''
   mkdir $out
   nix-store --dump ${src} | xz -c > "$out/${name}.nar.xz"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 607d824f4faa..761b4fdd0df2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -27441,6 +27441,7 @@ with pkgs;
     };
     checkMeta = callPackage ../stdenv/generic/check-meta.nix { };
   });
+  minimal-bootstrap-sources = callPackage ../os-specific/linux/minimal-bootstrap/stage0-posix/make-bootstrap-sources.nix { };
 
   mingetty = callPackage ../os-specific/linux/mingetty { };
 

From d045cfa32ac280f91faa1adadd31e1c164744c78 Mon Sep 17 00:00:00 2001
From: Emily Trau <emily@downunderctf.com>
Date: Tue, 20 Jun 2023 22:00:12 +1000
Subject: [PATCH 21/37] caeml: init at unstable-2023-05-24

---
 .../networking/mailreaders/caeml/default.nix  | 30 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 32 insertions(+)
 create mode 100644 pkgs/applications/networking/mailreaders/caeml/default.nix

diff --git a/pkgs/applications/networking/mailreaders/caeml/default.nix b/pkgs/applications/networking/mailreaders/caeml/default.nix
new file mode 100644
index 000000000000..54b4c7f60cdb
--- /dev/null
+++ b/pkgs/applications/networking/mailreaders/caeml/default.nix
@@ -0,0 +1,30 @@
+{ lib
+, buildGoModule
+, fetchFromGitHub
+}:
+buildGoModule rec {
+  pname = "caeml";
+  version = "unstable-2023-05-24";
+
+  src = fetchFromGitHub {
+    owner = "ferdinandyb";
+    repo = pname;
+    rev = "25dbe10e99aac9b0ce3b80787c162628104f5cd2";
+    sha256 = "UIQCNkUyrtMF0IiAfkDvE8siqxNvfFc9TZdlZiTxCVc=";
+  };
+
+  vendorHash = "sha256-SDJsRLIGlLv/6NUctCrn6z1IDEmum1Wn5I8RFuwcOe8=";
+
+  meta = with lib; {
+    description = "cat eml files";
+    longDescription = ''
+      Reads an email file from either STDIN or from a file passed as the first
+      argument, digests it and outputs it to STDOUT in a more human readable
+      format. This means only From, To, Cc, Bcc, Date and Subject headers are
+      kept and these are decoded and of all the parts only text/plain is returned.
+    '';
+    homepage = "https://github.com/ferdinandyb/caeml";
+    license = licenses.mit;
+    maintainers = with maintainers; [ emilytrau ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 77742af33997..4589484b03cb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6608,6 +6608,8 @@ with pkgs;
 
   bombardier = callPackage ../tools/networking/bombardier { };
 
+  caeml = callPackage ../applications/networking/mailreaders/caeml { };
+
   calyx-vpn = libsForQt5.callPackage ../tools/networking/bitmask-vpn {
     provider = "calyx";
     inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;

From adf84c345f4b7afe9001265db94d0b0ba7ba924e Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 21 Jun 2023 12:19:49 +0200
Subject: [PATCH 22/37] python310Packages.wxPython_4_2: 4.2.0 -> 4.2.1

https://github.com/wxWidgets/Phoenix/blob/wxPython-4.2.1/CHANGES.rst
---
 pkgs/development/python-modules/wxPython/4.2.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/wxPython/4.2.nix b/pkgs/development/python-modules/wxPython/4.2.nix
index 3d4ddb1e7061..0ed40b8a9173 100644
--- a/pkgs/development/python-modules/wxPython/4.2.nix
+++ b/pkgs/development/python-modules/wxPython/4.2.nix
@@ -41,13 +41,13 @@
 
 buildPythonPackage rec {
   pname = "wxPython";
-  version = "4.2.0";
+  version = "4.2.1";
   format = "other";
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-ZjzrxFCdfl0RNRiGX+J093+VQ0xdV7w4btWNZc7thsc=";
+    hash = "sha256-5I3iEaZga/By7D+neHcda3RsALf0uXDrWHKN31bRPVw=";
   };
 
   patches = [
@@ -127,6 +127,7 @@ buildPythonPackage rec {
 
 
   meta = with lib; {
+    changelog = "https://github.com/wxWidgets/Phoenix/blob/wxPython-${version}/CHANGES.rst";
     description = "Cross platform GUI toolkit for Python, Phoenix version";
     homepage = "http://wxpython.org/";
     license = licenses.wxWindows;

From 3221b01f736b8e89f91bc1c352b5ce6877425c45 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 22 Jun 2023 11:35:06 +0200
Subject: [PATCH 23/37] python310Packages.asyncssh: 2.13.1 -> 2.13.2

https://github.com/ronf/asyncssh/blob/v2.13.2/docs/changes.rst
---
 pkgs/development/python-modules/asyncssh/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/asyncssh/default.nix b/pkgs/development/python-modules/asyncssh/default.nix
index 0e95beec83e0..3f52c3acd354 100644
--- a/pkgs/development/python-modules/asyncssh/default.nix
+++ b/pkgs/development/python-modules/asyncssh/default.nix
@@ -20,14 +20,14 @@
 
 buildPythonPackage rec {
   pname = "asyncssh";
-  version = "2.13.1";
+  version = "2.13.2";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-67uDwFwLRc8jDeHvLwYFnjYPmvpcPd9g/JL697lP+Ic=";
+    hash = "sha256-mR5THEu32+xit1SHjZajJGM4qsEaKM48PpkBj7L1gow=";
   };
 
   propagatedBuildInputs = [

From ddd94a31036dd31dcb5f6bb509f7dae5f97fdb69 Mon Sep 17 00:00:00 2001
From: Ilan Joselevich <personal@ilanjoselevich.com>
Date: Sat, 24 Jun 2023 00:10:23 +0300
Subject: [PATCH 24/37] wl-screenrec: init at unstable-2023-05-31

---
 pkgs/tools/wayland/wl-screenrec/default.nix | 39 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 ++
 2 files changed, 41 insertions(+)
 create mode 100644 pkgs/tools/wayland/wl-screenrec/default.nix

diff --git a/pkgs/tools/wayland/wl-screenrec/default.nix b/pkgs/tools/wayland/wl-screenrec/default.nix
new file mode 100644
index 000000000000..8f09b806f6af
--- /dev/null
+++ b/pkgs/tools/wayland/wl-screenrec/default.nix
@@ -0,0 +1,39 @@
+{ lib
+, rustPlatform
+, fetchFromGitHub
+, pkg-config
+, wayland
+, ffmpeg
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "wl-screenrec";
+  version = "unstable-2023-05-31";
+
+  src = fetchFromGitHub {
+    owner = "russelltg";
+    repo = pname;
+    rev = "fc918f7898900c1882c6f64c96ed2de8cb9a6300";
+    hash = "sha256-P/JELiw0qGcwLFgNPccN/uetNy8CNCJdlCLhgq0h4sc=";
+  };
+
+  cargoHash = "sha256-r9zmAiLiAntHcb5W/WKmKbVP9c9+15ElIWtHkks0wig=";
+
+  nativeBuildInputs = [
+    pkg-config
+    rustPlatform.bindgenHook
+  ];
+
+  buildInputs = [
+    wayland
+    ffmpeg
+  ];
+
+  meta = with lib; {
+    description = "High performance wlroots screen recording, featuring hardware encoding";
+    homepage = "https://github.com/russelltg/wl-screenrec";
+    license = licenses.asl20;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ colemickens ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 19805c0d4c8a..642a1d872e09 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4484,6 +4484,8 @@ with pkgs;
 
   wl-mirror = callPackage ../tools/wayland/wl-mirror { };
 
+  wl-screenrec = callPackage ../tools/wayland/wl-screenrec { };
+
   wlogout = callPackage ../tools/wayland/wlogout { };
 
   wlopm = callPackage ../tools/wayland/wlopm { };

From 74d8cf6138d485edb7e7b71cecb96c58c0b1b222 Mon Sep 17 00:00:00 2001
From: Benedikt Broich <b.broich@posteo.de>
Date: Sun, 25 Jun 2023 21:38:16 +0200
Subject: [PATCH 25/37] blueprint-compiler: 0.6.0 -> 0.8.1

---
 .../compilers/blueprint/default.nix           | 39 ++++++++++++++++---
 1 file changed, 33 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/compilers/blueprint/default.nix b/pkgs/development/compilers/blueprint/default.nix
index 0016c8a2c7d9..d75d4eeeef16 100644
--- a/pkgs/development/compilers/blueprint/default.nix
+++ b/pkgs/development/compilers/blueprint/default.nix
@@ -1,23 +1,27 @@
-{ fetchFromGitLab
+{ dbus
+, fetchFromGitLab
 , gobject-introspection
 , gtk4
 , lib
+, libadwaita
+, makeFontsConf
 , meson
 , ninja
 , python3
 , stdenv
 , testers
+, xvfb-run
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "blueprint-compiler";
-  version = "0.6.0";
+  version = "0.8.1";
 
   src = fetchFromGitLab {
     domain = "gitlab.gnome.org";
     owner = "jwestman";
     repo = "blueprint-compiler";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-L6EGterkZ8EB6xSnJDZ3IMuOumpTpEGnU74X3UgC7k0=";
+    hash = "sha256-3lj9BMN5aNujbhhZjObdTOCQfH5ERQCgGqIAw5eZIQc=";
   };
 
   nativeBuildInputs = [
@@ -26,6 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
+    libadwaita
     (python3.withPackages (ps: with ps; [
       pygobject3
     ]))
@@ -36,12 +41,34 @@ stdenv.mkDerivation (finalAttrs: {
     gobject-introspection
   ];
 
-  doCheck = true;
-
   nativeCheckInputs = [
+    xvfb-run
+    dbus
     gtk4
   ];
 
+  env = {
+    # Fontconfig error: Cannot load default config file: No such file: (null)
+    FONTCONFIG_FILE = makeFontsConf { fontDirectories = [ ]; };
+  };
+
+  doCheck = true;
+
+  preBuild = ''
+    # Fontconfig error: No writable cache directories
+    export XDG_CACHE_HOME="$(mktemp -d)"
+  '';
+
+  checkPhase = ''
+    runHook preCheck
+
+    xvfb-run dbus-run-session \
+      --config-file=${dbus}/share/dbus-1/session.conf \
+      meson test --no-rebuild --print-errorlogs
+
+    runHook postCheck
+  '';
+
   passthru.tests.version = testers.testVersion {
     package = finalAttrs.finalPackage;
   };
@@ -51,6 +78,6 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://gitlab.gnome.org/jwestman/blueprint-compiler";
     license = licenses.lgpl3Plus;
     maintainers = with maintainers; [ benediktbroich ranfdev ];
-    platforms = platforms.unix;
+    platforms = platforms.linux;
   };
 })

From 4ba8610783e0b750fef7d49d36e5fa545f37b8a2 Mon Sep 17 00:00:00 2001
From: Benedikt Broich <b.broich@posteo.de>
Date: Sun, 25 Jun 2023 21:39:10 +0200
Subject: [PATCH 26/37] textpieces: mark broken

---
 pkgs/tools/text/textpieces/default.nix | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/text/textpieces/default.nix b/pkgs/tools/text/textpieces/default.nix
index 7b20083a80bf..d9bd7a07b828 100644
--- a/pkgs/tools/text/textpieces/default.nix
+++ b/pkgs/tools/text/textpieces/default.nix
@@ -10,6 +10,7 @@
 , gtk4
 , libgee
 , libadwaita
+, libportal-gtk4
 , json-glib
 , blueprint-compiler
 , gtksourceview5
@@ -20,17 +21,17 @@
 }:
 
 let
-  pythonEnv = python3.withPackages ( ps: with ps; [ pyyaml ] );
+  pythonEnv = python3.withPackages (ps: with ps; [ pyyaml ]);
 in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "textpieces";
-  version = "3.4.0";
+  version = "3.4.1";
 
   src = fetchFromGitHub {
     owner = "liferooter";
-    repo = pname;
-    rev = "v${version}";
-    hash = "sha256-LQq6pjue72a4kIHhWtoxJi/eKxPa4du5sBQY97SG1gY=";
+    repo = "textpieces";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-3ZUHzt3oXYgsnJVDf83JUDhcF+0DLgFfOMtpKI/FTcE=";
   };
 
   nativeBuildInputs = [
@@ -49,6 +50,7 @@ stdenv.mkDerivation rec {
     glib
     gtk4
     libadwaita
+    libportal-gtk4
     libgee
     json-glib
     gtksourceview5
@@ -72,5 +74,6 @@ stdenv.mkDerivation rec {
     license = licenses.gpl3Plus;
     platforms = platforms.linux;
     maintainers = with maintainers; [ zendo ];
+    broken = true; # https://github.com/liferooter/textpieces/issues/130
   };
-}
+})

From df720da7f09899dada20872600a5e7de31a2a995 Mon Sep 17 00:00:00 2001
From: Adam Joseph <adam@westernsemico.com>
Date: Sat, 17 Jun 2023 20:57:55 -0700
Subject: [PATCH 27/37] minimal-bootstrap: make sources a
 non-tarballs.nixos.org FOD

This commit adjusts #232576 to break the
fetchurl<->minimal-bootstrap-sources dependency cycle without
needing an upload to tarballs.nixos.org.  It does this by appending
the low-level FOD attributes onto the `runCommand` derivation.

  https://nixos.org/manual/nix/unstable/language/advanced-attributes.html#adv-attr-outputHash
---
 .../linux/minimal-bootstrap/default.nix       |  3 +
 .../stage0-posix/bootstrap-sources.nix        | 93 ++++++++++++-------
 .../stage0-posix/default.nix                  |  5 +-
 .../stage0-posix/make-bootstrap-sources.nix   | 11 +--
 pkgs/top-level/all-packages.nix               |  3 +-
 5 files changed, 75 insertions(+), 40 deletions(-)

diff --git a/pkgs/os-specific/linux/minimal-bootstrap/default.nix b/pkgs/os-specific/linux/minimal-bootstrap/default.nix
index 3e4e9e7f5cb8..3c1746716f06 100644
--- a/pkgs/os-specific/linux/minimal-bootstrap/default.nix
+++ b/pkgs/os-specific/linux/minimal-bootstrap/default.nix
@@ -4,6 +4,7 @@
 , hostPlatform
 , fetchurl
 , checkMeta
+, make-minimal-bootstrap-sources
 }:
 
 lib.makeScope
@@ -60,6 +61,8 @@ lib.makeScope
 
     ln-boot = callPackage ./ln-boot { };
 
+    inherit make-minimal-bootstrap-sources;
+
     mes = lib.recurseIntoAttrs (callPackage ./mes { });
     mes-libc = callPackage ./mes/libc.nix { };
 
diff --git a/pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/bootstrap-sources.nix b/pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/bootstrap-sources.nix
index e7ddede2ffa4..4aa5d32f7498 100644
--- a/pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/bootstrap-sources.nix
+++ b/pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/bootstrap-sources.nix
@@ -1,3 +1,6 @@
+{ make-minimal-bootstrap-sources
+}:
+
 rec {
   name = "stage0-posix-${version}-${rev}-source";
   # Pinned from https://github.com/oriansj/stage0-posix/commit/3189b5f325b7ef8b88e3edec7c1cde4fce73c76c
@@ -5,9 +8,6 @@ rec {
   rev = "3189b5f325b7ef8b88e3edec7c1cde4fce73c76c";
 
   # This 256 byte seed is the only pre-compiled binary in the bootstrap chain.
-  # While it is included in the stage0-posix source bundle and is synced with
-  # stage0-posix updates, we have split it out into its own derivation to highlight
-  # its unique status as a trusted binary seed.
   hex0-seed = import <nix/fetchurl.nix> {
     name = "hex0-seed-${version}";
     url = "https://github.com/oriansj/bootstrap-seeds/raw/b1263ff14a17835f4d12539226208c426ced4fba/POSIX/x86/hex0-seed";
@@ -15,34 +15,63 @@ rec {
     executable = true;
   };
 
-  # Packaged source files for the first bootstrapping stage.
-  #
-  # We don't have access to utilities such as fetchgit and fetchzip since this
-  # is this is part of the bootstrap process and would introduce a circular
-  # dependency. The only tool we have to fetch source trees is `import <nix/fetchurl.nix>`
-  # with the unpack option, taking a NAR file as input. This requires source
-  # tarballs to be repackaged.
-  #
-  # To build see `make-bootstrap-sources.nix`
+  /*
+  Since `make-minimal-bootstrap-sources` requires nixpkgs and nix it
+  will create a circular dependency if it is used in place of the
+  binary bootstrap-files.  To break the circular dependency,
+  `minimal-bootstrap-sources` extends `make-minimal-bootstrap-sources`
+  by adding Fixed Output Derivation (FOD) attributes.  These cause
+  the builder to be skipped if the expected output is found (by
+  its hash) in the store or on a substituter.
 
-  #
-  # Files came from this Hydra build:
-  #
-  #   https://hydra.nixos.org/build/<placeholder>
-  #
-  # Which used nixpkgs revision <placeholder>
-  # to instantiate:
-  #
-  #   /nix/store/<placeholder>.drv
-  #
-  # and then built:
-  #
-  #   /nix/store/<placeholder>
-  #
-  src = import <nix/fetchurl.nix> {
-    inherit name;
-    url = "https://github.com/emilytrau/bootstrap-tools-nar-mirror/releases/download/2023-05-18/${name}.nar.xz";
-    hash = "sha256-FpMp7z+B3cR3LkQ+PooH/b1/NlxH8NHVJNWifaPWt4U=";
-    unpack = true;
-  };
+  # How do I update the hash?
+
+  Run the following command:
+  ```
+  nix hash file $(nix build --print-out-paths -f '<nixpkgs>' make-minimal-bootstrap-sources)
+  ```
+
+  # Why do we need this `.nar` archive?
+
+  This archive exists only because of a quirk/limitation of Nix: in
+  restricted mode the builtin fetchers can download only single
+  files; they have no way to unpack multi-file archives except for
+  NAR archives:
+
+  https://github.com/NixOS/nixpkgs/pull/232576#issuecomment-1592415619
+
+  # Why don't we have to upload this to tarballs.nixos.org like the binary bootstrap-files did?
+
+  Unlike this archive, the binary bootstrap-files contained binaries,
+  which meant that we had to:
+
+  1. Make sure they came from a trusted builder (Hydra)
+  2. Keep careful track of exactly what toolchain (i.e. nixpkgs
+     commit) that builder used to create them.
+  3. Keep copies of the built binaries, in case the toolchains that
+     produced them failed to be perfectly deterministic.
+
+  The curated archives at tarballs.nixos.org exist in order to
+  satisfy these requirements.
+
+  The second point created a significant burden: since the nixpkgs
+  toolchain used to build a given copy of the binary bootstrap-files
+  itself used a *previous* copy of the bootstrap-files, this meant
+  we had to track the provenance of all bootstrap-files tarballs
+  ever used, for all eternity.  There was no explanation of where
+  the "original" bootstrap-files came from: turtles all the way
+  down.  In spite of all this effort we still can't be sure of our
+  ability to reproduce the binary bootstrap-files, since the
+  compilers that built them don't always produce exactly bit-for-bit
+  deterministic results.
+
+  Since this archive contains no binaries and uses a format (NAR)
+  specifically designed for bit-exact reproducibility, none of the
+  requirements above apply to `minimal-bootstrap-sources`.
+  */
+  minimal-bootstrap-sources = make-minimal-bootstrap-sources.overrideAttrs(_: {
+    outputHashMode = "flat";
+    outputHashAlgo = "sha256";
+    outputHash = "sha256-ig988BiRTz92hhZZgKQW1tVPoV4aQ2D69Cq3wHvVgHg=";
+  });
 }
diff --git a/pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/default.nix b/pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/default.nix
index 2b41261add3a..8e0900100aed 100644
--- a/pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/default.nix
+++ b/pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/default.nix
@@ -3,7 +3,10 @@
 }:
 
 lib.makeScope newScope (self: with self; {
-  inherit (import ./bootstrap-sources.nix) version hex0-seed src;
+  inherit (self.callPackage ./bootstrap-sources.nix)
+    version hex0-seed minimal-bootstrap-sources;
+
+  src = minimal-bootstrap-sources;
 
   m2libc = src + "/M2libc";
 
diff --git a/pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/make-bootstrap-sources.nix b/pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/make-bootstrap-sources.nix
index be0974edf430..4fe9a9be7881 100644
--- a/pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/make-bootstrap-sources.nix
+++ b/pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/make-bootstrap-sources.nix
@@ -8,8 +8,7 @@
 #
 # To build:
 #
-#   nix-build . -A minimal-bootstrap-sources
-#   => ./result/stage0-posix-$version-$rev-source.nar.xz
+#   nix-build '<nixpkgs>' -o sources.nar.xz -A make-minimal-bootstrap-sources
 #
 
 { lib
@@ -19,7 +18,7 @@
 , xz
 }:
 let
-  inherit (import ./bootstrap-sources.nix) name rev;
+  inherit (import ./bootstrap-sources.nix { make-minimal-bootstrap-sources = null; }) name rev;
 
   src = fetchFromGitHub {
     owner = "oriansj";
@@ -41,8 +40,9 @@ let
         $out/mescc-tools-extra/M2libc
     '';
   };
+
 in
-runCommand name {
+runCommand "${name}.nar.xz" {
   nativeBuildInputs = [ nix xz ];
 
   passthru = { inherit src; };
@@ -55,6 +55,5 @@ runCommand name {
     platforms = platforms.all;
   };
 } ''
-  mkdir $out
-  nix-store --dump ${src} | xz -c > "$out/${name}.nar.xz"
+  nix-store --dump ${src} | xz -c > $out
 ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 761b4fdd0df2..55d5131553ca 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -27440,8 +27440,9 @@ with pkgs;
       inherit (stdenv.buildPlatform) system;
     };
     checkMeta = callPackage ../stdenv/generic/check-meta.nix { };
+    inherit make-minimal-bootstrap-sources;
   });
-  minimal-bootstrap-sources = callPackage ../os-specific/linux/minimal-bootstrap/stage0-posix/make-bootstrap-sources.nix { };
+  make-minimal-bootstrap-sources = callPackage ../os-specific/linux/minimal-bootstrap/stage0-posix/make-bootstrap-sources.nix { };
 
   mingetty = callPackage ../os-specific/linux/mingetty { };
 

From c8080b06a9458f8c898ea4537dab82d32e71d06c Mon Sep 17 00:00:00 2001
From: Adam Joseph <adam@westernsemico.com>
Date: Mon, 26 Jun 2023 00:52:22 -0700
Subject: [PATCH 28/37] separate minimal-bootstrap-sources from
 make-minimal-bootstrap-sources

Ericson2314 observed that although FODs break the build-time cycle,
they don't break the eval-time cycle.  This cycle must be broken in
order to compute the derivation hash.

make-minimal-bootstrap-sources does and always has depended on the
full nixpkgs (including fetchFromGitHub).  This commit completely
separates minimal-bootstrap-sources from it, so that
minimal-bootstrap-sources now does not depend on
make-minimal-bootstrap-sources (or nixpkgs) in any way.

minimal-bootstrap-sources is now a "bare Nix" derivation.  It is an
FOD whose builder always fails with an error message.
---
 .../linux/minimal-bootstrap/default.nix       |  3 --
 .../stage0-posix/bootstrap-sources.nix        | 37 +++++++++++++++++--
 .../stage0-posix/default.nix                  |  2 +-
 .../stage0-posix/make-bootstrap-sources.nix   |  2 +-
 pkgs/top-level/all-packages.nix               |  2 +-
 5 files changed, 36 insertions(+), 10 deletions(-)

diff --git a/pkgs/os-specific/linux/minimal-bootstrap/default.nix b/pkgs/os-specific/linux/minimal-bootstrap/default.nix
index 3c1746716f06..3e4e9e7f5cb8 100644
--- a/pkgs/os-specific/linux/minimal-bootstrap/default.nix
+++ b/pkgs/os-specific/linux/minimal-bootstrap/default.nix
@@ -4,7 +4,6 @@
 , hostPlatform
 , fetchurl
 , checkMeta
-, make-minimal-bootstrap-sources
 }:
 
 lib.makeScope
@@ -61,8 +60,6 @@ lib.makeScope
 
     ln-boot = callPackage ./ln-boot { };
 
-    inherit make-minimal-bootstrap-sources;
-
     mes = lib.recurseIntoAttrs (callPackage ./mes { });
     mes-libc = callPackage ./mes/libc.nix { };
 
diff --git a/pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/bootstrap-sources.nix b/pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/bootstrap-sources.nix
index 4aa5d32f7498..65b052c44569 100644
--- a/pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/bootstrap-sources.nix
+++ b/pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/bootstrap-sources.nix
@@ -1,4 +1,4 @@
-{ make-minimal-bootstrap-sources
+{
 }:
 
 rec {
@@ -6,6 +6,7 @@ rec {
   # Pinned from https://github.com/oriansj/stage0-posix/commit/3189b5f325b7ef8b88e3edec7c1cde4fce73c76c
   version = "unstable-2023-05-02";
   rev = "3189b5f325b7ef8b88e3edec7c1cde4fce73c76c";
+  outputHashAlgo = "sha256";
 
   # This 256 byte seed is the only pre-compiled binary in the bootstrap chain.
   hex0-seed = import <nix/fetchurl.nix> {
@@ -69,9 +70,37 @@ rec {
   specifically designed for bit-exact reproducibility, none of the
   requirements above apply to `minimal-bootstrap-sources`.
   */
-  minimal-bootstrap-sources = make-minimal-bootstrap-sources.overrideAttrs(_: {
+  minimal-bootstrap-sources = derivation {
+    name = "${name}.nar.xz";
+    system = builtins.currentSystem;
     outputHashMode = "flat";
-    outputHashAlgo = "sha256";
+    inherit outputHashAlgo;
     outputHash = "sha256-ig988BiRTz92hhZZgKQW1tVPoV4aQ2D69Cq3wHvVgHg=";
-  });
+
+    # This builder always fails, but fortunately Nix will print the
+    # "builder", which is really the error message that we want the
+    # user to see.
+    builder = ''
+      #
+      #
+      # Neither your store nor your substituters seems to have:
+      #
+      #  ${name}.nar.xz
+      #
+      # Please obtain or create this file, give it exactly the name
+      # shown above, and then run the following command:
+      #
+      #   nix-store --add-fixed ${outputHashAlgo} ${name}.nar.xz
+      #
+      # You can create this file from an already-bootstrapped nixpkgs
+      # using the following command:
+      #
+      #   nix-build '<nixpkgs>' -A make-minimal-bootstrap-sources
+      #
+      # Or, if you prefer, you can create this file using only `git`,
+      # `nix`, and `xz`.  For the commands needed in order to do this,
+      # see `make-bootstrap-sources.nix`.
+      #
+    '';
+  };
 }
diff --git a/pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/default.nix b/pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/default.nix
index 8e0900100aed..c15223a43d48 100644
--- a/pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/default.nix
+++ b/pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/default.nix
@@ -3,7 +3,7 @@
 }:
 
 lib.makeScope newScope (self: with self; {
-  inherit (self.callPackage ./bootstrap-sources.nix)
+  inherit (self.callPackage ./bootstrap-sources.nix {})
     version hex0-seed minimal-bootstrap-sources;
 
   src = minimal-bootstrap-sources;
diff --git a/pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/make-bootstrap-sources.nix b/pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/make-bootstrap-sources.nix
index 4fe9a9be7881..8951cc9ddbc4 100644
--- a/pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/make-bootstrap-sources.nix
+++ b/pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/make-bootstrap-sources.nix
@@ -18,7 +18,7 @@
 , xz
 }:
 let
-  inherit (import ./bootstrap-sources.nix { make-minimal-bootstrap-sources = null; }) name rev;
+  inherit (import ./bootstrap-sources.nix { }) name rev;
 
   src = fetchFromGitHub {
     owner = "oriansj";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 55d5131553ca..e68f4669541f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -27440,8 +27440,8 @@ with pkgs;
       inherit (stdenv.buildPlatform) system;
     };
     checkMeta = callPackage ../stdenv/generic/check-meta.nix { };
-    inherit make-minimal-bootstrap-sources;
   });
+  minimal-bootstrap-sources = callPackage ../os-specific/linux/minimal-bootstrap/stage0-posix/bootstrap-sources.nix { };
   make-minimal-bootstrap-sources = callPackage ../os-specific/linux/minimal-bootstrap/stage0-posix/make-bootstrap-sources.nix { };
 
   mingetty = callPackage ../os-specific/linux/mingetty { };

From b6ae54346690ba76902db44f124e6eda75e8ed89 Mon Sep 17 00:00:00 2001
From: Keenan Weaver <keenanweaver@protonmail.com>
Date: Mon, 26 Jun 2023 14:34:27 -0500
Subject: [PATCH 29/37] ibm-plex: 6.2.0 -> 6.3.0

---
 pkgs/data/fonts/ibm-plex/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/fonts/ibm-plex/default.nix b/pkgs/data/fonts/ibm-plex/default.nix
index 21321d83af34..72aac21ea694 100644
--- a/pkgs/data/fonts/ibm-plex/default.nix
+++ b/pkgs/data/fonts/ibm-plex/default.nix
@@ -2,11 +2,11 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "ibm-plex";
-  version = "6.2.0";
+  version = "6.3.0";
 
   src = fetchzip {
     url = "https://github.com/IBM/plex/releases/download/v${version}/OpenType.zip";
-    hash = "sha256-RvD/aeZrvltJiuAHqYMNaRsjLgTdcC1/5zqlcd4qKAA=";
+    hash = "sha256-VwJyZMH10FXDxc7T7m8sl7raUlrarSM0Snjruo1ICHU=";
   };
 
   installPhase = ''

From 0000000d732bc16c7992be3778691273f97bb284 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Mon, 26 Jun 2023 20:45:43 +0200
Subject: [PATCH 30/37] ArchiSteamFarm: 5.4.7.2 -> 5.4.7.3

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

diff --git a/pkgs/applications/misc/ArchiSteamFarm/default.nix b/pkgs/applications/misc/ArchiSteamFarm/default.nix
index c7cbf72bc776..0dbcf051c3c9 100644
--- a/pkgs/applications/misc/ArchiSteamFarm/default.nix
+++ b/pkgs/applications/misc/ArchiSteamFarm/default.nix
@@ -9,15 +9,15 @@
 }:
 
 buildDotnetModule rec {
-  pname = "archisteamfarm";
+  pname = "ArchiSteamFarm";
   # nixpkgs-update: no auto update
-  version = "5.4.7.2";
+  version = "5.4.7.3";
 
   src = fetchFromGitHub {
-    owner = "justarchinet";
-    repo = pname;
+    owner = "JustArchiNET";
+    repo = "ArchiSteamFarm";
     rev = version;
-    hash = "sha256-qKG4eFF/YTb7wlABBtEjOqBYvtVTLKCXqTD9idkhnI4=";
+    hash = "sha256-xxHNMqFHxFVbKpy9JHHif4GZ/jk9CUUwgyPWmlTXgcc=";
   };
 
   dotnet-runtime = dotnetCorePackages.aspnetcore_7_0;
@@ -56,7 +56,7 @@ buildDotnetModule rec {
     buildPlugin() {
       echo "Publishing plugin $1"
       dotnet publish $1 -p:ContinuousIntegrationBuild=true -p:Deterministic=true \
-        --output $out/lib/${pname}/plugins/$1 --configuration Release \
+        --output $out/lib/archisteamfarm/plugins/$1 --configuration Release \
         -p:TargetLatestRuntimePatch=false -p:UseAppHost=false --no-restore \
         --framework=net7.0
      }

From dc5888be97094f6f0aa0422ea411803c9bf290c6 Mon Sep 17 00:00:00 2001
From: Vincenzo Mantova <1962985+xworld21@users.noreply.github.com>
Date: Mon, 26 Jun 2023 22:09:19 +0100
Subject: [PATCH 31/37] python3Packages.speg: init at 0.3

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

diff --git a/pkgs/development/python-modules/speg/default.nix b/pkgs/development/python-modules/speg/default.nix
new file mode 100644
index 000000000000..83bdc1e5b046
--- /dev/null
+++ b/pkgs/development/python-modules/speg/default.nix
@@ -0,0 +1,28 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, speg
+}:
+
+buildPythonPackage rec {
+  pname = "speg";
+  version = "0.3";
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-EMvvR+Fo38YvFNtXXPHEKAN6K4gc7mw8/O2gQ5wkPnE=";
+    extension = "zip";
+  };
+
+  pythonImportChecks = [ "speg" ];
+
+  # checks fail for seemingly spurious reasons
+  doCheck = false;
+
+  meta = with lib; {
+    description = "A PEG-based parser interpreter with memoization (in time)";
+    homepage = "https://github.com/avakar/speg";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ xworld21 ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 6df7c8b16581..7c0a592e1a0e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11500,6 +11500,8 @@ self: super: with self; {
 
   speedtest-cli = callPackage ../development/python-modules/speedtest-cli { };
 
+  speg = callPackage ../development/python-modules/speg { };
+
   spglib = callPackage ../development/python-modules/spglib { };
 
   sphfile = callPackage ../development/python-modules/sphfile { };

From c44ab108b2fc705f516fef6b4b4de42b29715f11 Mon Sep 17 00:00:00 2001
From: Vincenzo Mantova <1962985+xworld21@users.noreply.github.com>
Date: Mon, 26 Jun 2023 22:09:19 +0100
Subject: [PATCH 32/37] python3Packages.cson: init at 0.8

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

diff --git a/pkgs/development/python-modules/cson/default.nix b/pkgs/development/python-modules/cson/default.nix
new file mode 100644
index 000000000000..c05ad78240c0
--- /dev/null
+++ b/pkgs/development/python-modules/cson/default.nix
@@ -0,0 +1,26 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, speg
+}:
+
+buildPythonPackage rec {
+  pname = "cson";
+  version = "0.8";
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-7owBZvzR9ReJiHGX4+g1Sse++jlvwpcGvOta8l7cngE=";
+  };
+
+  propagatedBuildInputs = [ speg ];
+
+  pythonImportChecks = [ "cson" ];
+
+  meta = with lib; {
+    description = "A python parser for the Coffeescript Object Notation (CSON)";
+    homepage = "https://github.com/avakar/pycson";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ xworld21 ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7c0a592e1a0e..70338846d2aa 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2199,6 +2199,8 @@ self: super: with self; {
 
   crytic-compile = callPackage ../development/python-modules/crytic-compile { };
 
+  cson  = callPackage ../development/python-modules/cson { };
+
   csrmesh  = callPackage ../development/python-modules/csrmesh { };
 
   csscompressor = callPackage ../development/python-modules/csscompressor { };

From 640d4e204d62b55fe37883cbabf2ccc6f4b86c0e Mon Sep 17 00:00:00 2001
From: Vincenzo Mantova <1962985+xworld21@users.noreply.github.com>
Date: Mon, 26 Jun 2023 22:09:19 +0100
Subject: [PATCH 33/37] asymptote: make the python modules imported by xasy
 available at runtime

---
 pkgs/tools/graphics/asymptote/default.nix | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/graphics/asymptote/default.nix b/pkgs/tools/graphics/asymptote/default.nix
index 9950d3c56f99..38edd3050e83 100644
--- a/pkgs/tools/graphics/asymptote/default.nix
+++ b/pkgs/tools/graphics/asymptote/default.nix
@@ -2,7 +2,7 @@
 , autoreconfHook, bison, glm, flex
 , freeglut, ghostscriptX, imagemagick, fftw
 , boehmgc, libGLU, libGL, mesa, ncurses, readline, gsl, libsigsegv
-, python3Packages
+, python3
 , zlib, perl, curl
 , texLive, texinfo
 , darwin
@@ -32,10 +32,8 @@ stdenv.mkDerivation rec {
     boehmgc ncurses readline gsl libsigsegv
     zlib perl curl
     texLive
-  ] ++ (with python3Packages; [
-    python
-    pyqt5
-  ]);
+    (python3.withPackages (ps: with ps; [ cson numpy pyqt5 ]))
+  ];
 
   propagatedBuildInputs = [
     glm

From ba1db967e7f554d2600fb1a0ceef05b992af9723 Mon Sep 17 00:00:00 2001
From: Vincenzo Mantova <1962985+xworld21@users.noreply.github.com>
Date: Mon, 26 Jun 2023 22:09:19 +0100
Subject: [PATCH 34/37] asymptote: add Qt5 libraries and wrapper for xasy

---
 pkgs/tools/graphics/asymptote/default.nix | 12 +++++++++---
 pkgs/top-level/all-packages.nix           |  2 +-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/graphics/asymptote/default.nix b/pkgs/tools/graphics/asymptote/default.nix
index 38edd3050e83..c3dfe639f95c 100644
--- a/pkgs/tools/graphics/asymptote/default.nix
+++ b/pkgs/tools/graphics/asymptote/default.nix
@@ -1,8 +1,8 @@
 { lib, stdenv, fetchFromGitHub, fetchurl, fetchpatch
-, autoreconfHook, bison, glm, flex
+, autoreconfHook, bison, glm, flex, wrapQtAppsHook
 , freeglut, ghostscriptX, imagemagick, fftw
 , boehmgc, libGLU, libGL, mesa, ncurses, readline, gsl, libsigsegv
-, python3
+, python3, qtbase, qtsvg
 , zlib, perl, curl
 , texLive, texinfo
 , darwin
@@ -25,12 +25,13 @@ stdenv.mkDerivation rec {
     flex
     bison
     texinfo
+    wrapQtAppsHook
   ];
 
   buildInputs = [
     ghostscriptX imagemagick fftw
     boehmgc ncurses readline gsl libsigsegv
-    zlib perl curl
+    zlib perl curl qtbase qtsvg
     texLive
     (python3.withPackages (ps: with ps; [ cson numpy pyqt5 ]))
   ];
@@ -43,6 +44,8 @@ stdenv.mkDerivation rec {
     OpenGL GLUT Cocoa
   ]);
 
+  dontWrapQtApps = true;
+
   preConfigure = ''
     HOME=$TMP
   '';
@@ -55,6 +58,9 @@ stdenv.mkDerivation rec {
   env.NIX_CFLAGS_COMPILE = "-I${boehmgc.dev}/include/gc";
 
   postInstall = ''
+    rm "$out"/bin/xasy
+    makeQtWrapper "$out"/share/asymptote/GUI/xasy.py "$out"/bin/xasy --prefix PATH : "$out"/bin
+
     mv $out/share/info/asymptote/*.info $out/share/info/
     sed -i -e 's|(asymptote/asymptote)|(asymptote)|' $out/share/info/asymptote.info
     rmdir $out/share/info/asymptote
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 29600cc58489..cc7a87414182 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3014,7 +3014,7 @@ with pkgs;
 
   astc-encoder = callPackage ../tools/graphics/astc-encoder { };
 
-  asymptote = callPackage ../tools/graphics/asymptote {
+  asymptote = libsForQt5.callPackage ../tools/graphics/asymptote {
     texLive = texlive.combine { inherit (texlive) scheme-small epsf cm-super texinfo media9 ocgx2 collection-latexextra; };
   };
 

From 3493e8525854bc2f87bc4c7f7dc5a22f3d931fad Mon Sep 17 00:00:00 2001
From: Vincenzo Mantova <1962985+xworld21@users.noreply.github.com>
Date: Mon, 26 Jun 2023 22:09:19 +0100
Subject: [PATCH 35/37] asymptote: enable lsp

---
 pkgs/tools/graphics/asymptote/default.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/graphics/asymptote/default.nix b/pkgs/tools/graphics/asymptote/default.nix
index c3dfe639f95c..795378d370c2 100644
--- a/pkgs/tools/graphics/asymptote/default.nix
+++ b/pkgs/tools/graphics/asymptote/default.nix
@@ -1,8 +1,8 @@
 { lib, stdenv, fetchFromGitHub, fetchurl, fetchpatch
-, autoreconfHook, bison, glm, flex, wrapQtAppsHook
+, autoreconfHook, bison, glm, flex, wrapQtAppsHook, cmake
 , freeglut, ghostscriptX, imagemagick, fftw
 , boehmgc, libGLU, libGL, mesa, ncurses, readline, gsl, libsigsegv
-, python3, qtbase, qtsvg
+, python3, qtbase, qtsvg, boost
 , zlib, perl, curl
 , texLive, texinfo
 , darwin
@@ -26,12 +26,13 @@ stdenv.mkDerivation rec {
     bison
     texinfo
     wrapQtAppsHook
+    cmake
   ];
 
   buildInputs = [
     ghostscriptX imagemagick fftw
     boehmgc ncurses readline gsl libsigsegv
-    zlib perl curl qtbase qtsvg
+    zlib perl curl qtbase qtsvg boost
     texLive
     (python3.withPackages (ps: with ps; [ cson numpy pyqt5 ]))
   ];
@@ -70,6 +71,8 @@ stdenv.mkDerivation rec {
     install -Dt $out/share/emacs/site-lisp/${pname} $out/share/asymptote/*.el
   '';
 
+  dontUseCmakeConfigure = true;
+
   enableParallelBuilding = true;
   # Missing install depends:
   #   ...-coreutils-9.1/bin/install: cannot stat 'asy-keywords.el': No such file or directory

From aab01f1797fb67b64dbbc9651e9d4be63120c048 Mon Sep 17 00:00:00 2001
From: emattiza <emattiza@gmail.com>
Date: Sat, 27 May 2023 19:34:46 -0500
Subject: [PATCH 36/37] update: otel-cli 0.2.0 -> 0.3.0

updates otel-cli from 0.2.0 to 0.3.0
see https://github.com/equinix-labs/otel-cli/releases/tag/v0.3.0
for changelog and release details
---
 pkgs/tools/misc/otel-cli/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/misc/otel-cli/default.nix b/pkgs/tools/misc/otel-cli/default.nix
index b9efcd250286..992dd9c71d16 100644
--- a/pkgs/tools/misc/otel-cli/default.nix
+++ b/pkgs/tools/misc/otel-cli/default.nix
@@ -1,23 +1,23 @@
-{ lib, bash, buildGoModule, fetchFromGitHub, getent, nix-update-script, stdenv }:
+{ lib, bash, buildGoModule, fetchFromGitHub, getent, coreutils, nix-update-script, stdenv }:
 
 buildGoModule rec {
   pname = "otel-cli";
-  version = "0.2.0";
+  version = "0.3.0";
 
   src = fetchFromGitHub {
     owner = "equinix-labs";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-hez/jHet7W4FnOjgLb0jE1FhoNimiLGaOuTI44UWbSA=";
+    hash = "sha256-edxDPxUamZiBezMj2SII/zq8atnyZVWtboUJsShDAyw=";
   };
 
-  vendorHash = "sha256-gVRgqBgiFnPU6MRZi/Igs7nDPMwJYsdln7vPAcxTvPU=";
+  vendorHash = "sha256-MlLFTi+O925NA73zDRrk0AgJzwtdNBhCxDjmniNPwio=";
 
   preCheck = ''
     ln -s $GOPATH/bin/otel-cli .
   '' + lib.optionalString (!stdenv.isDarwin) ''
     substituteInPlace main_test.go \
-      --replace 'const minimumPath = `/bin:/usr/bin`' 'const minimumPath = `${lib.makeBinPath [ getent ]}`'
+      --replace 'const minimumPath = `/bin:/usr/bin`' 'const minimumPath = `${lib.makeBinPath [ getent coreutils ]}`'
   '';
 
   passthru.updateScript = nix-update-script {};

From 3b2ade8b0499ac102bb9b2ce35ef866f0f54234c Mon Sep 17 00:00:00 2001
From: happysalada <raphael@megzari.com>
Date: Sun, 25 Jun 2023 11:19:10 +0800
Subject: [PATCH 37/37] atomic-swap: init at 0.4.0

---
 .../blockchains/atomic-swap/default.nix       | 36 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 38 insertions(+)
 create mode 100644 pkgs/applications/blockchains/atomic-swap/default.nix

diff --git a/pkgs/applications/blockchains/atomic-swap/default.nix b/pkgs/applications/blockchains/atomic-swap/default.nix
new file mode 100644
index 000000000000..3e8ebcc947a9
--- /dev/null
+++ b/pkgs/applications/blockchains/atomic-swap/default.nix
@@ -0,0 +1,36 @@
+{ lib, buildGoModule, fetchFromGitHub, nix-update-script }:
+
+let
+  pname = "atomic-swap";
+  version = "0.4.0";
+in
+buildGoModule {
+  inherit pname version;
+
+  src = fetchFromGitHub {
+    owner = "AthanorLabs";
+    repo = "atomic-swap";
+    rev = "v${version}";
+    hash = "sha256-wVLufTC7WcRELhzebzLgIUvIWklEY+8/C41FluPkya0=";
+  };
+
+  vendorSha256 = "sha256-igHuklt76r7MDxz8TAaFgFdQS7L3DJkMYarAMNVYTC4=";
+
+  subPackages = [
+    "cmd/swapcli"
+    "cmd/swapd"
+    "cmd/bootnode"
+  ];
+
+  # integration tests require network access
+  doCheck = false;
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = with lib; {
+    homepage = "https://github.com/AthanorLabs/atomic-swap";
+    description = "ETH-XMR atomic swap implementation";
+    license = with licenses; [ gpl3Only ];
+    maintainers = with maintainers; [ happysalada ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e974d91a2b66..06afe4bc938c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -316,6 +316,8 @@ with pkgs;
 
   atomic-operator = callPackage ../tools/security/atomic-operator { };
 
+  atomic-swap = callPackage ../applications/blockchains/atomic-swap { };
+
   avro-tools = callPackage ../development/tools/avro-tools { };
 
   bacnet-stack = callPackage ../tools/networking/bacnet-stack { };