From fedbbb459ca6223d5589df622965e03c0fd7921a Mon Sep 17 00:00:00 2001
From: penalty1083 <121009904+penalty1083@users.noreply.github.com>
Date: Tue, 10 Sep 2024 13:07:45 +0000
Subject: [PATCH 01/38] geph: 4.11.0 -> 4.99.2

---
 pkgs/applications/networking/geph/default.nix | 77 ++++++++++---------
 1 file changed, 41 insertions(+), 36 deletions(-)

diff --git a/pkgs/applications/networking/geph/default.nix b/pkgs/applications/networking/geph/default.nix
index 32b0fe146294..43761b659b82 100644
--- a/pkgs/applications/networking/geph/default.nix
+++ b/pkgs/applications/networking/geph/default.nix
@@ -1,26 +1,24 @@
-{ lib
-, stdenvNoCC
-, rustPlatform
-, fetchFromGitHub
-, buildGoModule
-, makeWrapper
-, nodejs
-, pnpm
-, cacert
-, esbuild
-, jq
-, moreutils
-, perl
-, pkg-config
-, glib
-, webkitgtk
-, libayatana-appindicator
-, cairo
-, openssl
+{
+  lib,
+  stdenvNoCC,
+  rustPlatform,
+  fetchFromGitHub,
+  buildGoModule,
+  makeWrapper,
+  nodejs,
+  pnpm,
+  esbuild,
+  perl,
+  pkg-config,
+  glib,
+  webkitgtk,
+  libayatana-appindicator,
+  cairo,
+  openssl,
 }:
 
 let
-  version = "4.11.0";
+  version = "4.99.2";
   geph-meta = with lib; {
     description = "Modular Internet censorship circumvention system designed specifically to deal with national filtering";
     homepage = "https://geph.io";
@@ -37,10 +35,10 @@ in
       owner = "geph-official";
       repo = pname;
       rev = "v${version}";
-      hash = "sha256-6zii8WxJp++yqTkxejNDta7IW+SG0uPgmnWqX5Oa9PU=";
+      hash = "sha256-aZFm4+oUQungCPbxs7j1J8hLcCYoIodIEQEiQfjoLUw=";
     };
 
-    cargoHash = "sha256-WI525ufJxuepRZHyx8tO4K+7WZuM/NlTVNqVMJH6avg=";
+    cargoHash = "sha256-ypnjVoscGqVifkjzFh2KE+3EVFWIiyahTNTil3nu/+s=";
 
     nativeBuildInputs = [ perl ];
 
@@ -56,8 +54,8 @@ in
     src = fetchFromGitHub {
       owner = "geph-official";
       repo = "gephgui-pkg";
-      rev = "3a6d2fa85603e9ac3d5d6286685d8a8ca792a508";
-      hash = "sha256-SE1TwYvR3+zwdPxlanq4hovmJsOdCJQzWfSJ6sSyJ5k=";
+      rev = "3b045e21b8c587c26f9d5f0f2b4bdf0a34bfee80";
+      hash = "sha256-p+AxAOznUsG45Ibm1kczapfmbK+aeex2js463eqZ8gY=";
       fetchSubmodules = true;
     };
 
@@ -96,18 +94,25 @@ in
         openssl
       ];
 
-      ESBUILD_BINARY_PATH = "${lib.getExe (esbuild.override {
-        buildGoModule = args: buildGoModule (args // rec {
-          version = "0.15.10";
-          src = fetchFromGitHub {
-            owner = "evanw";
-            repo = "esbuild";
-            rev = "v${version}";
-            hash = "sha256-DebmLtgPrla+1UcvOHMnWmxa/ZqrugeRRKXIiJ9LYDk=";
-          };
-          vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ=";
-        });
-      })}";
+      ESBUILD_BINARY_PATH = "${lib.getExe (
+        esbuild.override {
+          buildGoModule =
+            args:
+            buildGoModule (
+              args
+              // rec {
+                version = "0.15.10";
+                src = fetchFromGitHub {
+                  owner = "evanw";
+                  repo = "esbuild";
+                  rev = "v${version}";
+                  hash = "sha256-DebmLtgPrla+1UcvOHMnWmxa/ZqrugeRRKXIiJ9LYDk=";
+                };
+                vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ=";
+              }
+            );
+        }
+      )}";
 
       pnpmRoot = "gephgui";
 

From 7a9f947b29884bf170df48b236a24403b54e8b00 Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Sun, 1 Sep 2024 10:28:21 -0300
Subject: [PATCH 02/38] bmake: use nix*Log in setup hook

---
 pkgs/by-name/bm/bmake/setup-hook.sh | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/bm/bmake/setup-hook.sh b/pkgs/by-name/bm/bmake/setup-hook.sh
index d6a7c4aafa0f..acca59004730 100644
--- a/pkgs/by-name/bm/bmake/setup-hook.sh
+++ b/pkgs/by-name/bm/bmake/setup-hook.sh
@@ -17,7 +17,7 @@ bmakeBuildPhase() {
     )
     concatTo flagsArray makeFlags makeFlagsArray buildFlags buildFlagsArray
 
-    echoCmd 'build flags' "${flagsArray[@]}"
+    nixInfoLog "${FUNCNAME[0]}: flagsArray: ${flagsArray[@]}"
     bmake ${makefile:+-f $makefile} "${flagsArray[@]}"
 
     runHook postBuild
@@ -36,7 +36,7 @@ bmakeCheckPhase() {
     fi
 
     if [ -z "${checkTarget:-}" ]; then
-        echo "no test target found in bmake, doing nothing"
+        nixInfoLog "${FUNCNAME[0]}: no test target found in bmake, doing nothing"
     else
         local flagsArray=(
             ${enableParallelChecking:+-j${NIX_BUILD_CORES}}
@@ -44,7 +44,7 @@ bmakeCheckPhase() {
         )
         concatTo flagsArray makeFlags makeFlagsArray checkFlags=VERBOSE=y checkFlagsArray checkTarget
 
-        echoCmd 'check flags' "${flagsArray[@]}"
+        nixInfoLog "${FUNCNAME[0]}: flagsArray: ${flagsArray[@]}"
         bmake ${makefile:+-f $makefile} "${flagsArray[@]}"
     fi
 
@@ -64,7 +64,7 @@ bmakeInstallPhase() {
     )
     concatTo flagsArray makeFlags makeFlagsArray installFlags installFlagsArray installTargets=install
 
-    echoCmd 'install flags' "${flagsArray[@]}"
+    nixInfoLog "${FUNCNAME[0]}: flagsArray: ${flagsArray[@]}"
     bmake ${makefile:+-f $makefile} "${flagsArray[@]}"
 
     runHook postInstall
@@ -80,7 +80,7 @@ bmakeDistPhase() {
     local flagsArray=()
     concatTo flagsArray distFlags distFlagsArray distTarget=dist
 
-    echo 'dist flags: %q' "${flagsArray[@]}"
+    nixInfoLog "${FUNCNAME[0]}: flagsArray: ${flagsArray[@]}"
     bmake ${makefile:+-f $makefile} "${flagsArray[@]}"
 
     if [ "${dontCopyDist:-0}" != 1 ]; then
@@ -98,16 +98,20 @@ preConfigureHooks+=(addMakeFlags)
 
 if [ -z "${dontUseBmakeBuild-}" ] && [ -z "${buildPhase-}" ]; then
     buildPhase=bmakeBuildPhase
+    nixInfoLog "${FUNCNAME[0]}: set buildPhase to bmakeBuildPhase"
 fi
 
 if [ -z "${dontUseBmakeCheck-}" ] && [ -z "${checkPhase-}" ]; then
     checkPhase=bmakeCheckPhase
+    nixInfoLog "${FUNCNAME[0]}: set checkPhase to bmakeCheckPhase"
 fi
 
 if [ -z "${dontUseBmakeInstall-}" ] && [ -z "${installPhase-}" ]; then
     installPhase=bmakeInstallPhase
+    nixInfoLog "${FUNCNAME[0]}: set installPhase to bmakeInstallPhase"
 fi
 
 if [ -z "${dontUseBmakeDist-}" ] && [ -z "${distPhase-}" ]; then
     distPhase=bmakeDistPhase
+    nixInfoLog "${FUNCNAME[0]}: set distPhase to bmakeDistPhase"
 fi

From 83e26d0f965736312efa0e3075c221c3e8d07946 Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Sun, 1 Sep 2024 10:28:00 -0300
Subject: [PATCH 03/38] bmake: 20240722 -> 20240808

---
 pkgs/by-name/bm/bmake/package.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/bm/bmake/package.nix b/pkgs/by-name/bm/bmake/package.nix
index 3d21eb39455f..f18b65c62552 100644
--- a/pkgs/by-name/bm/bmake/package.nix
+++ b/pkgs/by-name/bm/bmake/package.nix
@@ -11,11 +11,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "bmake";
-  version = "20240722";
+  version = "20240808";
 
   src = fetchurl {
     url = "https://www.crufty.net/ftp/pub/sjg/bmake-${finalAttrs.version}.tar.gz";
-    hash = "sha256-FlS9DK0oQ2CElmmh6amTGB/tE3iWqsJpS4LqmjX3CeQ=";
+    hash = "sha256-tZGJJRtIPezUSS8fdDh7KlhMA9WqRjfNSLOOxiucCEg=";
   };
 
   patches = [
@@ -29,7 +29,9 @@ stdenv.mkDerivation (finalAttrs: {
 
   outputs = [ "out" "man" ];
 
-  nativeBuildInputs = [ getopt ];
+  nativeBuildInputs = [
+    getopt
+  ];
 
   nativeCheckInputs = [
     bc

From 153d36c733c5c95ddfc87dc3565ab09f4adb2ccd Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Sun, 1 Sep 2024 11:18:02 -0300
Subject: [PATCH 04/38] bozohttpd: migrate to by-name

---
 .../bozohttpd/default.nix => by-name/bo/bozohttpd/package.nix} | 0
 pkgs/top-level/all-packages.nix                                | 3 +--
 2 files changed, 1 insertion(+), 2 deletions(-)
 rename pkgs/{servers/http/bozohttpd/default.nix => by-name/bo/bozohttpd/package.nix} (100%)

diff --git a/pkgs/servers/http/bozohttpd/default.nix b/pkgs/by-name/bo/bozohttpd/package.nix
similarity index 100%
rename from pkgs/servers/http/bozohttpd/default.nix
rename to pkgs/by-name/bo/bozohttpd/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f9cb26f34e8f..79e9f8ee60d3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4226,8 +4226,7 @@ with pkgs;
 
   boxfs = callPackage ../tools/filesystems/boxfs { };
 
-  bozohttpd = callPackage ../servers/http/bozohttpd { };
-  bozohttpd-minimal = callPackage ../servers/http/bozohttpd { minimal = true; };
+  bozohttpd-minimal = bozohttpd.override { minimal = true; };
 
   brasero-original = lowPrio (callPackage ../tools/cd-dvd/brasero { });
 

From 7be9afd71c8feda8bc77a874350258a890e66222 Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Sun, 1 Sep 2024 11:26:00 -0300
Subject: [PATCH 05/38] bozohttpd: nixfmt-rfc-style

---
 pkgs/by-name/bo/bozohttpd/package.nix | 96 ++++++++++++++++-----------
 1 file changed, 56 insertions(+), 40 deletions(-)

diff --git a/pkgs/by-name/bo/bozohttpd/package.nix b/pkgs/by-name/bo/bozohttpd/package.nix
index 0aad8168ffa8..cf54fd1de87a 100644
--- a/pkgs/by-name/bo/bozohttpd/package.nix
+++ b/pkgs/by-name/bo/bozohttpd/package.nix
@@ -1,24 +1,26 @@
-{ lib
-, stdenv
-, fetchurl
-, bmake
-, groff
-, inetutils
-, wget
-, openssl
-, libxcrypt
-, minimal ? false
-, userSupport ? !minimal
-, cgiSupport ? !minimal
-, dirIndexSupport ? !minimal
-, dynamicContentSupport ? !minimal
-, sslSupport ? !minimal
-, luaSupport ? !minimal
-, lua
-, htpasswdSupport ? !minimal
+{
+  lib,
+  stdenv,
+  fetchurl,
+  bmake,
+  groff,
+  inetutils,
+  wget,
+  openssl,
+  libxcrypt,
+  minimal ? false,
+  userSupport ? !minimal,
+  cgiSupport ? !minimal,
+  dirIndexSupport ? !minimal,
+  dynamicContentSupport ? !minimal,
+  sslSupport ? !minimal,
+  luaSupport ? !minimal,
+  lua,
+  htpasswdSupport ? !minimal,
 }:
 
-let inherit (lib) optional optionals;
+let
+  inherit (lib) optional optionals;
 in
 stdenv.mkDerivation rec {
   pname = "bozohttpd";
@@ -31,36 +33,50 @@ stdenv.mkDerivation rec {
     hash = "sha512-fr1PnyYAS3wkpmj/npRC3A87UL9LIXw4thlM4GfrtlJbuX5EkWGVJnHJW/EmYp7z+N91dcdRJgdO79l6WJsKpg==";
   };
 
-  buildInputs = [ openssl libxcrypt ] ++ optional (luaSupport) lua;
-  nativeBuildInputs = [ bmake groff ];
+  buildInputs = [
+    openssl
+    libxcrypt
+  ] ++ optional (luaSupport) lua;
+  nativeBuildInputs = [
+    bmake
+    groff
+  ];
 
-  COPTS = [
-    "-D_DEFAULT_SOURCE"
-    "-D_GNU_SOURCE"
+  COPTS =
+    [
+      "-D_DEFAULT_SOURCE"
+      "-D_GNU_SOURCE"
 
-    # ensure that we can serve >2GB files even on 32-bit systems.
-    "-D_LARGEFILE_SOURCE"
-    "-D_FILE_OFFSET_BITS=64"
+      # ensure that we can serve >2GB files even on 32-bit systems.
+      "-D_LARGEFILE_SOURCE"
+      "-D_FILE_OFFSET_BITS=64"
 
-    # unpackaged dependency: https://man.netbsd.org/blocklist.3
-    "-DNO_BLOCKLIST_SUPPORT"
-  ]
-  ++ optional (!userSupport) "-DNO_USER_SUPPORT"
-  ++ optional (!dirIndexSupport) "-DNO_DIRINDEX_SUPPORT"
-  ++ optional (!dynamicContentSupport) "-DNO_DYNAMIC_CONTENT"
-  ++ optional (!luaSupport) "-DNO_LUA_SUPPORT"
-  ++ optional (!sslSupport) "-DNO_SSL_SUPPORT"
-  ++ optional (!cgiSupport) "-DNO_CGIBIN_SUPPORT"
-  ++ optional (htpasswdSupport) "-DDO_HTPASSWD";
+      # unpackaged dependency: https://man.netbsd.org/blocklist.3
+      "-DNO_BLOCKLIST_SUPPORT"
+    ]
+    ++ optional (!userSupport) "-DNO_USER_SUPPORT"
+    ++ optional (!dirIndexSupport) "-DNO_DIRINDEX_SUPPORT"
+    ++ optional (!dynamicContentSupport) "-DNO_DYNAMIC_CONTENT"
+    ++ optional (!luaSupport) "-DNO_LUA_SUPPORT"
+    ++ optional (!sslSupport) "-DNO_SSL_SUPPORT"
+    ++ optional (!cgiSupport) "-DNO_CGIBIN_SUPPORT"
+    ++ optional (htpasswdSupport) "-DDO_HTPASSWD";
 
-  _LDADD = [ "-lm" ]
+  _LDADD =
+    [ "-lm" ]
     ++ optional (stdenv.hostPlatform.libc != "libSystem") "-lcrypt"
     ++ optional (luaSupport) "-llua"
-    ++ optionals (sslSupport) [ "-lssl" "-lcrypto" ];
+    ++ optionals (sslSupport) [
+      "-lssl"
+      "-lcrypto"
+    ];
   makeFlags = [ "LDADD=$(_LDADD)" ];
 
   doCheck = true;
-  nativeCheckInputs = [ inetutils wget ];
+  nativeCheckInputs = [
+    inetutils
+    wget
+  ];
   checkFlags = optional (!cgiSupport) "CGITESTS=";
 
   meta = with lib; {

From be7b698a98334a0768c20d611d6cf16bfcc858e0 Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Sun, 1 Sep 2024 11:34:05 -0300
Subject: [PATCH 06/38] bozohttpd: rewrite expression

- asciibetical order
- use lib.* directly
- finalAttrs
- get rid of pname
- hammering
- meta.mainProgram
- get rid of nested with in meta
---
 pkgs/by-name/bo/bozohttpd/package.nix | 109 ++++++++++++++------------
 1 file changed, 58 insertions(+), 51 deletions(-)

diff --git a/pkgs/by-name/bo/bozohttpd/package.nix b/pkgs/by-name/bo/bozohttpd/package.nix
index cf54fd1de87a..4ff11c5a66ca 100644
--- a/pkgs/by-name/bo/bozohttpd/package.nix
+++ b/pkgs/by-name/bo/bozohttpd/package.nix
@@ -1,13 +1,15 @@
 {
   lib,
-  stdenv,
-  fetchurl,
   bmake,
+  fetchurl,
   groff,
   inetutils,
-  wget,
-  openssl,
   libxcrypt,
+  lua,
+  openssl,
+  stdenv,
+  wget,
+  # Boolean flags
   minimal ? false,
   userSupport ? !minimal,
   cgiSupport ? !minimal,
@@ -15,71 +17,76 @@
   dynamicContentSupport ? !minimal,
   sslSupport ? !minimal,
   luaSupport ? !minimal,
-  lua,
   htpasswdSupport ? !minimal,
 }:
 
-let
-  inherit (lib) optional optionals;
-in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "bozohttpd";
   version = "20240126";
 
   # bozohttpd is developed in-tree in pkgsrc, canonical hashes can be found at:
   # http://cvsweb.netbsd.org/bsdweb.cgi/pkgsrc/www/bozohttpd/distinfo
   src = fetchurl {
-    url = "http://eterna23.net/${pname}/${pname}-${version}.tar.bz2";
+    url = "http://eterna23.net/bozohttpd/bozohttpd-${finalAttrs.version}.tar.bz2";
     hash = "sha512-fr1PnyYAS3wkpmj/npRC3A87UL9LIXw4thlM4GfrtlJbuX5EkWGVJnHJW/EmYp7z+N91dcdRJgdO79l6WJsKpg==";
   };
 
   buildInputs = [
-    openssl
     libxcrypt
-  ] ++ optional (luaSupport) lua;
+    openssl
+  ] ++ lib.optionals (luaSupport) [ lua ];
+
   nativeBuildInputs = [
     bmake
     groff
   ];
 
-  COPTS =
-    [
-      "-D_DEFAULT_SOURCE"
-      "-D_GNU_SOURCE"
-
-      # ensure that we can serve >2GB files even on 32-bit systems.
-      "-D_LARGEFILE_SOURCE"
-      "-D_FILE_OFFSET_BITS=64"
-
-      # unpackaged dependency: https://man.netbsd.org/blocklist.3
-      "-DNO_BLOCKLIST_SUPPORT"
-    ]
-    ++ optional (!userSupport) "-DNO_USER_SUPPORT"
-    ++ optional (!dirIndexSupport) "-DNO_DIRINDEX_SUPPORT"
-    ++ optional (!dynamicContentSupport) "-DNO_DYNAMIC_CONTENT"
-    ++ optional (!luaSupport) "-DNO_LUA_SUPPORT"
-    ++ optional (!sslSupport) "-DNO_SSL_SUPPORT"
-    ++ optional (!cgiSupport) "-DNO_CGIBIN_SUPPORT"
-    ++ optional (htpasswdSupport) "-DDO_HTPASSWD";
-
-  _LDADD =
-    [ "-lm" ]
-    ++ optional (stdenv.hostPlatform.libc != "libSystem") "-lcrypt"
-    ++ optional (luaSupport) "-llua"
-    ++ optionals (sslSupport) [
-      "-lssl"
-      "-lcrypto"
-    ];
-  makeFlags = [ "LDADD=$(_LDADD)" ];
-
-  doCheck = true;
   nativeCheckInputs = [
     inetutils
     wget
   ];
-  checkFlags = optional (!cgiSupport) "CGITESTS=";
 
-  meta = with lib; {
+  env = {
+    COPTS = lib.concatStringsSep " " (
+      [
+        "-D_DEFAULT_SOURCE"
+        "-D_GNU_SOURCE"
+
+        # ensure that we can serve >2GB files even on 32-bit systems.
+        "-D_LARGEFILE_SOURCE"
+        "-D_FILE_OFFSET_BITS=64"
+
+        # unpackaged dependency: https://man.netbsd.org/blocklist.3
+        "-DNO_BLOCKLIST_SUPPORT"
+      ]
+      ++ lib.optionals (htpasswdSupport) [ "-DDO_HTPASSWD" ]
+      ++ lib.optionals (!cgiSupport) [ "-DNO_CGIBIN_SUPPORT" ]
+      ++ lib.optionals (!dirIndexSupport) [ "-DNO_DIRINDEX_SUPPORT" ]
+      ++ lib.optionals (!dynamicContentSupport) [ "-DNO_DYNAMIC_CONTENT" ]
+      ++ lib.optionals (!luaSupport) [ "-DNO_LUA_SUPPORT" ]
+      ++ lib.optionals (!sslSupport) [ "-DNO_SSL_SUPPORT" ]
+      ++ lib.optionals (!userSupport) [ "-DNO_USER_SUPPORT" ]
+    );
+
+    _LDADD = lib.concatStringsSep " " (
+      [ "-lm" ]
+      ++ lib.optionals (stdenv.hostPlatform.libc != "libSystem") [ "-lcrypt" ]
+      ++ lib.optionals (luaSupport) [ "-llua" ]
+      ++ lib.optionals (sslSupport) [
+        "-lcrypto"
+        "-lssl"
+      ]
+    );
+  };
+
+  makeFlags = [ "LDADD=$(_LDADD)" ];
+
+  checkFlags = lib.optionals (!cgiSupport) [ "CGITESTS=" ];
+
+  doCheck = true;
+
+  meta = {
+    homepage = "http://www.eterna23.net/bozohttpd/";
     description = "Bozotic HTTP server; small and secure";
     longDescription = ''
       bozohttpd is a small and secure HTTP version 1.1 server. Its main
@@ -91,10 +98,10 @@ stdenv.mkDerivation rec {
       single machine. It is capable of servicing pages via the IPv6 protocol.
       It has SSL support. It has no configuration file by design.
     '';
-    homepage = "http://www.eterna.com.au/bozohttpd/";
-    changelog = "http://www.eterna.com.au/bozohttpd/CHANGES";
-    license = licenses.bsd2;
-    maintainers = [ maintainers.embr ];
-    platforms = platforms.all;
+    changelog = "http://www.eterna23.net/bozohttpd/CHANGES";
+    license = lib.licenses.bsd2;
+    mainProgram = "bozohttpd";
+    maintainers = [ lib.maintainers.embr ];
+    platforms = lib.platforms.all;
   };
-}
+})

From 33bc3df1b82faa2d8fec30de67f56c71c060f0f1 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 13 Sep 2024 09:30:33 +0200
Subject: [PATCH 07/38] python312Packages.aiogram: 3.12.0 -> 3.13.0

Diff: https://github.com/aiogram/aiogram/compare/refs/tags/v3.12.0...v3.13.0

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

diff --git a/pkgs/development/python-modules/aiogram/default.nix b/pkgs/development/python-modules/aiogram/default.nix
index c3b073ba8439..78051d815e18 100644
--- a/pkgs/development/python-modules/aiogram/default.nix
+++ b/pkgs/development/python-modules/aiogram/default.nix
@@ -26,7 +26,7 @@
 
 buildPythonPackage rec {
   pname = "aiogram";
-  version = "3.12.0";
+  version = "3.13.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -35,7 +35,7 @@ buildPythonPackage rec {
     owner = "aiogram";
     repo = "aiogram";
     rev = "refs/tags/v${version}";
-    hash = "sha256-5W7GuWZsUjTwjgKnNs7j4wZhOME1Giz757cM3sKuSQY=";
+    hash = "sha256-P/W47IhVL7wvYI+v6OvnFJt79KPrgY6d1jdOk477MdM=";
   };
 
   build-system = [ hatchling ];

From 4ff7a38739fc4c050aa51e601424cb1a3ae11fe6 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 13 Sep 2024 09:39:44 +0200
Subject: [PATCH 08/38] python312Packages.aiogram: add optional-dependencies

---
 .../python-modules/aiogram/default.nix        | 28 ++++++++++++-------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/python-modules/aiogram/default.nix b/pkgs/development/python-modules/aiogram/default.nix
index 78051d815e18..bddcb187798e 100644
--- a/pkgs/development/python-modules/aiogram/default.nix
+++ b/pkgs/development/python-modules/aiogram/default.nix
@@ -1,8 +1,9 @@
 {
   lib,
+  aiodns,
   aiofiles,
-  aiohttp,
   aiohttp-socks,
+  aiohttp,
   aresponses,
   babel,
   buildPythonPackage,
@@ -22,6 +23,7 @@
   pythonOlder,
   pytz,
   redis,
+  uvloop,
 }:
 
 buildPythonPackage rec {
@@ -40,31 +42,37 @@ buildPythonPackage rec {
 
   build-system = [ hatchling ];
 
-
-  pythonRelaxDeps = [ "pydantic" ];
-
   dependencies = [
     aiofiles
     aiohttp
-    babel
     certifi
     magic-filter
     pydantic
   ];
 
+  optional-dependencies = {
+    fast = [
+      aiodns
+      uvloop
+    ];
+    mongo = [
+      motor
+      pymongo
+    ];
+    redis = [ redis ];
+    proxy = [ aiohttp-socks ];
+    i18n = [ babel ];
+  };
+
   nativeCheckInputs = [
-    aiohttp-socks
     aresponses
-    motor
     pycryptodomex
-    pymongo
     pytest-aiohttp
     pytest-asyncio
     pytest-lazy-fixture
     pytestCheckHook
     pytz
-    redis
-  ];
+  ] ++ lib.flatten (builtins.attrValues optional-dependencies);
 
   pytestFlagsArray = [
     "-W"

From a0fd0488735e16218663422ca1c64acee7699246 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 13 Sep 2024 13:13:53 +0200
Subject: [PATCH 09/38] python312Packages.asteval: 1.0.2 -> 1.0.3

Diff: https://github.com/lmfit/asteval/compare/refs/tags/1.0.2...1.0.3

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

diff --git a/pkgs/development/python-modules/asteval/default.nix b/pkgs/development/python-modules/asteval/default.nix
index 322bb50e711f..090188b5cbc9 100644
--- a/pkgs/development/python-modules/asteval/default.nix
+++ b/pkgs/development/python-modules/asteval/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "asteval";
-  version = "1.0.2";
+  version = "1.0.3";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     owner = "lmfit";
     repo = "asteval";
     rev = "refs/tags/${version}";
-    hash = "sha256-TIMyfX8bpzey0hw0lBMcdZVnc07j9PFVjn4YbX4oW/8=";
+    hash = "sha256-CAjj5vlXCfelH7nyE/tS44ThCQrCwrNETyjXEVbfmiA=";
   };
 
   postPatch = ''

From 6b1aa6159ff250e582e0118594ddfb0eb10d59d9 Mon Sep 17 00:00:00 2001
From: BirdeeHub <robindbor@gmail.com>
Date: Tue, 3 Sep 2024 18:45:43 -0700
Subject: [PATCH 10/38] vimPlugins.lze: init at 0.1.1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

I made this, and I almost completely deleted it because I was fully
on board with lz-n again. However, I have been using it and lz-n
simultaneosly and trying them out.

I wish to publish lze after all. I like it a lot.

It works completely differently from lz-n and has a different handler
api, but has a similar plugin spec.

Update pkgs/development/lua-modules/overrides.nix

Co-authored-by: Gaétan Lepage <33058747+GaetanLepage@users.noreply.github.com>
---
 maintainers/scripts/luarocks-packages.csv     |  1 +
 .../editors/vim/plugins/overrides.nix         |  2 ++
 .../lua-modules/generated-packages.nix        | 23 +++++++++++++++++++
 pkgs/development/lua-modules/overrides.nix    | 11 +++++++++
 4 files changed, 37 insertions(+)

diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv
index 26b5dc52be6f..4d1ed177c1c4 100644
--- a/maintainers/scripts/luarocks-packages.csv
+++ b/maintainers/scripts/luarocks-packages.csv
@@ -105,6 +105,7 @@ luv,,,,1.48.0-2,,
 lush.nvim,,,https://luarocks.org/dev,,,teto
 lyaml,,,,,,lblasc
 lz.n,,,,,,mrcjkb
+lze,,,,,,birdee
 lzn-auto-require,,,,,,mrcjkb
 magick,,,,,5.1,donovanglover
 markdown,,,,,,
diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix
index 976c5e9d93ef..b6ba6d533877 100644
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -1015,6 +1015,8 @@
 
   lz-n = neovimUtils.buildNeovimPlugin { luaAttr = "lz-n"; };
 
+  lze = neovimUtils.buildNeovimPlugin { luaAttr = "lze"; };
+
   lzn-auto-require = neovimUtils.buildNeovimPlugin { luaAttr = "lzn-auto-require"; };
 
   magma-nvim-goose = buildVimPlugin {
diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix
index aec5d2b0b896..c57850a86dad 100644
--- a/pkgs/development/lua-modules/generated-packages.nix
+++ b/pkgs/development/lua-modules/generated-packages.nix
@@ -2512,6 +2512,29 @@ buildLuarocksPackage {
   };
 }) {};
 
+lze = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder }:
+buildLuarocksPackage {
+  pname = "lze";
+  version = "0.1.1-1";
+  knownRockspec = (fetchurl {
+    url    = "mirror://luarocks/lze-0.1.1-1.rockspec";
+    sha256 = "0rih9kgx846qhp1fmsqlnp8y08kv4hp8gl9dwykz4zr0zljy94j3";
+  }).outPath;
+  src = fetchzip {
+    url    = "https://github.com/BirdeeHub/lze/archive/v0.1.1.zip";
+    sha256 = "1s6n61jabsv94s37xd5g0y7fxhficc4rwsklgsmzajravpgy60a8";
+  };
+
+  disabled = luaOlder "5.1";
+
+  meta = {
+    homepage = "https://github.com/BirdeeHub/lze";
+    description = "A lazy-loading library for neovim, inspired by, but different from, nvim-neorocks/lz.n";
+    maintainers = with lib.maintainers; [ birdee ];
+    license.fullName = "GPL-2+";
+  };
+}) {};
+
 lzn-auto-require = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder, lz-n }:
 buildLuarocksPackage {
   pname = "lzn-auto-require";
diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix
index 358560cfc771..ed25e552cef9 100644
--- a/pkgs/development/lua-modules/overrides.nix
+++ b/pkgs/development/lua-modules/overrides.nix
@@ -544,6 +544,17 @@ in
       '';
   });
 
+  lze  = prev.lze.overrideAttrs(oa: {
+    doCheck = lua.luaversion == "5.1";
+    nativeCheckInputs = [ final.nlua final.busted ];
+    checkPhase = ''
+      runHook preCheck
+      export HOME=$(mktemp -d)
+      busted --lua=nlua
+      runHook postCheck
+    '';
+  });
+
   neotest  = prev.neotest.overrideAttrs(oa: {
     # A few tests fail for strange reasons on darwin
     doCheck = !stdenv.isDarwin;

From 4632a733124cde4e7ebe515f3bbb0307bc39ff26 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Sat, 14 Sep 2024 07:43:56 +0200
Subject: [PATCH 11/38] mg: 7.3 -> 7.3-unstable-2024-06-04

The only change is a compilation fix for GCC 14.
---
 pkgs/applications/editors/mg/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/mg/default.nix b/pkgs/applications/editors/mg/default.nix
index c54cd01dbf28..121d62219db0 100644
--- a/pkgs/applications/editors/mg/default.nix
+++ b/pkgs/applications/editors/mg/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "mg";
-  version = "7.3";
+  version = "7.3-unstable-2024-06-04";
 
   src = fetchFromGitHub {
     owner = "ibara";
     repo = "mg";
-    rev = "mg-${version}";
-    sha256 = "sha256-88FrXN7h5uRLY8YMKSzUjBF4n18DEiiiDyoYr+7qXdQ=";
+    rev = "4d4abcfc793554dbd4effdba8a3cc28ce2654c33";
+    hash = "sha256-+sp8Edu5UWv73TCNVZTeH5rl2Q5XarYrlTYHuQsroVs=";
   };
 
   postPatch = lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) ''

From 1e71925b95df3240216753c6aec6efa4316343f5 Mon Sep 17 00:00:00 2001
From: Tomodachi94 <tomodachi94@protonmail.com>
Date: Fri, 13 Sep 2024 23:18:10 -0700
Subject: [PATCH 12/38] doc/packages/lhapdf: add documentation

This documents:
* The existence of the `lhapdf` package (not particularly important)
* The existence of the `lhapdf.pdf_sets` attrset (important)
* The setup hook used in all of the entries in `lhapdf.pdf_sets`
  (slightly important)

Part of #341479.
---
 doc/packages/index.md          |  1 +
 doc/packages/lhapdf.section.md | 11 +++++++++++
 2 files changed, 12 insertions(+)
 create mode 100644 doc/packages/lhapdf.section.md

diff --git a/doc/packages/index.md b/doc/packages/index.md
index d6c62770b381..89d7e477e76f 100644
--- a/doc/packages/index.md
+++ b/doc/packages/index.md
@@ -17,6 +17,7 @@ ibus.section.md
 kakoune.section.md
 krita.section.md
 linux.section.md
+lhapdf.section.md
 locales.section.md
 etc-files.section.md
 nginx.section.md
diff --git a/doc/packages/lhapdf.section.md b/doc/packages/lhapdf.section.md
new file mode 100644
index 000000000000..af07d4edd42a
--- /dev/null
+++ b/doc/packages/lhapdf.section.md
@@ -0,0 +1,11 @@
+# LHAPDF {#lhapdf}
+
+[LHAPDF](https://lhapdf.hepforge.org/) is a tool for evaluating parton distribution functions (PDFs) in high-energy physics. LHAPDF is available in the `lhapdf` package.
+
+## PDF sets {#lhapdf-sets}
+
+All of [the PDF sets made available by the LHAPDF project](https://lhapdf.hepforge.org/pdfsets.html) are available through the `lhapdf.pdf_sets` attrset.
+
+### Setup hook {#lhapdf-sets-hook}
+
+Each package provided in the `lhapdf.pdf_sets` attrset contains a setup hook which adds itself to [the `LHAPDF_DATA_PATH` environment variable](https://lhapdf.hepforge.org/#sets).

From 9030f18586ce02b134d14e256a230835c0e74203 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Sat, 14 Sep 2024 10:00:14 +0200
Subject: [PATCH 13/38] libieee1284: fix building for musl with GCC 14

The Void patch changes more than is now necssary for musl, and one of
those things is that it stops including <sys/io.h>, causing the ioperm
function to be implicitly declared.  This will be a hard error with
GCC 14.  The Gentoo patch only changes the one thing currently needed
for musl.
---
 pkgs/development/libraries/libieee1284/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/libieee1284/default.nix b/pkgs/development/libraries/libieee1284/default.nix
index 4b5bef5c32a6..c49e42523137 100644
--- a/pkgs/development/libraries/libieee1284/default.nix
+++ b/pkgs/development/libraries/libieee1284/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, fetchpatch
+{ lib, stdenv, fetchFromGitHub, fetchurl
 , autoconf, automake, libtool, xmlto, docbook_xml_dtd_412, docbook_xsl
 }:
 
@@ -14,10 +14,10 @@ stdenv.mkDerivation rec {
   };
 
   patches = [
-    # Fix build on Musl.
-    (fetchpatch {
-      url = "https://raw.githubusercontent.com/void-linux/void-packages/861ac185a6b60134292ff93d40e40b5391d0aa8e/srcpkgs/libieee1284/patches/musl.patch";
-      sha256 = "03xivd6z7m51i5brlmzs60pjrlqyr4561qlnh182wa7rrm01x5y6";
+    (fetchurl {
+      name = "musl.patch";
+      url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/sys-libs/libieee1284/files/libieee1284-0.2.11-don-t-blindly-assume-outb_p-to-be-available.patch";
+      hash = "sha256-sNu0OPBMa9GIwSu754noateF4FZC14f+8YRgYUl13KQ=";
     })
   ];
 

From a83b0df317d744d98c01abd2cf4b5cc1f244ca48 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 14 Sep 2024 10:14:44 +0200
Subject: [PATCH 14/38] python312Packages.pydiscovergy: 3.0.1 -> 3.0.2

Diff: jpbede/pydiscovergy@refs/tags/v3.0.1...v3.0.2

Changelog: https://github.com/jpbede/pydiscovergy/releases/tag/v3.0.2
---
 pkgs/development/python-modules/pydiscovergy/default.nix | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/pydiscovergy/default.nix b/pkgs/development/python-modules/pydiscovergy/default.nix
index 919eec4fae1f..8a5379fd1bdd 100644
--- a/pkgs/development/python-modules/pydiscovergy/default.nix
+++ b/pkgs/development/python-modules/pydiscovergy/default.nix
@@ -11,13 +11,12 @@
   poetry-core,
   pytestCheckHook,
   pythonOlder,
-  pytz,
   respx,
 }:
 
 buildPythonPackage rec {
   pname = "pydiscovergy";
-  version = "3.0.1";
+  version = "3.0.2";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -26,7 +25,7 @@ buildPythonPackage rec {
     owner = "jpbede";
     repo = "pydiscovergy";
     rev = "refs/tags/v${version}";
-    hash = "sha256-0zyg1EBPOfcA1jAgtNbDCVaTv9hJQ2Xidl+doHbjKrM=";
+    hash = "sha256-g6KWX7APdqB0dNe7p6WGualxSj5fiw+jRq+0qfqTs4w=";
   };
 
   postPatch = ''
@@ -35,13 +34,11 @@ buildPythonPackage rec {
 
   build-system = [ poetry-core ];
 
-
   dependencies = [
     authlib
     httpx
     mashumaro
     orjson
-    pytz
   ];
 
   nativeCheckInputs = [

From c81bb2da57c2db245764786364a5322011419da2 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 14 Sep 2024 10:29:15 +0200
Subject: [PATCH 15/38] python312Packages.aiogram: enable support for darwin

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

diff --git a/pkgs/development/python-modules/aiogram/default.nix b/pkgs/development/python-modules/aiogram/default.nix
index bddcb187798e..35c8cb8359c2 100644
--- a/pkgs/development/python-modules/aiogram/default.nix
+++ b/pkgs/development/python-modules/aiogram/default.nix
@@ -87,6 +87,8 @@ buildPythonPackage rec {
 
   passthru.updateScript = gitUpdater { rev-prefix = "v"; };
 
+  __darwinAllowLocalNetworking = true;
+
   meta = with lib; {
     description = "Modern and fully asynchronous framework for Telegram Bot API";
     homepage = "https://github.com/aiogram/aiogram";

From 84d2f83b44eec90b8d47b29eaafb3e162bd33167 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 14 Sep 2024 11:43:18 +0200
Subject: [PATCH 16/38] metasploit: 6.4.25 -> 6.4.26

---
 pkgs/tools/security/metasploit/Gemfile      | 2 +-
 pkgs/tools/security/metasploit/Gemfile.lock | 6 +++---
 pkgs/tools/security/metasploit/default.nix  | 4 ++--
 pkgs/tools/security/metasploit/gemset.nix   | 6 +++---
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/tools/security/metasploit/Gemfile b/pkgs/tools/security/metasploit/Gemfile
index 60c1bfad1134..196dc83a0bb4 100644
--- a/pkgs/tools/security/metasploit/Gemfile
+++ b/pkgs/tools/security/metasploit/Gemfile
@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 source "https://rubygems.org"
 
-gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.4.25"
+gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.4.26"
diff --git a/pkgs/tools/security/metasploit/Gemfile.lock b/pkgs/tools/security/metasploit/Gemfile.lock
index 49c0b3dd6918..e847ced51a9f 100644
--- a/pkgs/tools/security/metasploit/Gemfile.lock
+++ b/pkgs/tools/security/metasploit/Gemfile.lock
@@ -1,9 +1,9 @@
 GIT
   remote: https://github.com/rapid7/metasploit-framework
-  revision: 8a95b2c37de1aea1c347324a1e8171d9189e149b
-  ref: refs/tags/6.4.25
+  revision: 4ec7d1be72158642c17b18dcb9e66e44c1bb5a5a
+  ref: refs/tags/6.4.26
   specs:
-    metasploit-framework (6.4.25)
+    metasploit-framework (6.4.26)
       aarch64
       abbrev
       actionpack (~> 7.0.0)
diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix
index d52a883e6520..07d80e4d89ef 100644
--- a/pkgs/tools/security/metasploit/default.nix
+++ b/pkgs/tools/security/metasploit/default.nix
@@ -15,13 +15,13 @@ let
   };
 in stdenv.mkDerivation rec {
   pname = "metasploit-framework";
-  version = "6.4.25";
+  version = "6.4.26";
 
   src = fetchFromGitHub {
     owner = "rapid7";
     repo = "metasploit-framework";
     rev = "refs/tags/${version}";
-    hash = "sha256-JSRex8aNwINEErNi5UoW29YV0R6pSfkyYrULK9vLTAc=";
+    hash = "sha256-yGpS3wvUjJ4M4OTHcNNa3PQCl884q4vow+2YiM5QQSI=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/tools/security/metasploit/gemset.nix b/pkgs/tools/security/metasploit/gemset.nix
index b59162d271e0..1466ecaa80e3 100644
--- a/pkgs/tools/security/metasploit/gemset.nix
+++ b/pkgs/tools/security/metasploit/gemset.nix
@@ -724,12 +724,12 @@
     platforms = [];
     source = {
       fetchSubmodules = false;
-      rev = "8a95b2c37de1aea1c347324a1e8171d9189e149b";
-      sha256 = "01scrgdjn2xmc8rgjjd93v8ibmnv2r5faqmk29287h4dqv3mw915";
+      rev = "4ec7d1be72158642c17b18dcb9e66e44c1bb5a5a";
+      sha256 = "08j1a378i67dqgl8parqrybh5x6wbb9p1iz4w069x36l1ggm4sn8";
       type = "git";
       url = "https://github.com/rapid7/metasploit-framework";
     };
-    version = "6.4.25";
+    version = "6.4.26";
   };
   metasploit-model = {
     groups = ["default"];

From f98ac3c65d9e87cdc7d4981e24ee2665e47a44d6 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 14 Sep 2024 12:07:59 +0200
Subject: [PATCH 17/38] python312Packages.types-requests: 2.32.0.20240905 ->
 2.32.0.20240914

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

diff --git a/pkgs/development/python-modules/types-requests/default.nix b/pkgs/development/python-modules/types-requests/default.nix
index a58435471d7d..ed5295ea0d97 100644
--- a/pkgs/development/python-modules/types-requests/default.nix
+++ b/pkgs/development/python-modules/types-requests/default.nix
@@ -9,12 +9,12 @@
 
 buildPythonPackage rec {
   pname = "types-requests";
-  version = "2.32.0.20240905";
+  version = "2.32.0.20240914";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-6X/QFaXtmCyd3NFMxK+6nREeDga3l8j3dtFGAnNem9Y=";
+    hash = "sha256-KFDheNs5Gdm/gJ5DTu9luknQ5+M6yS1Yj0peKV//1AU=";
   };
 
   build-system = [ setuptools ];

From d593460eb975b82d7bf25b3b86326845e6ee31e4 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 14 Sep 2024 13:09:08 +0200
Subject: [PATCH 18/38] python312Packages.pwkit: 1.2.0 -> 1.2.1

Changelog: https://github.com/pkgw/pwkit/releases/tag/pwkit%401.2.1
---
 pkgs/development/python-modules/pwkit/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pwkit/default.nix b/pkgs/development/python-modules/pwkit/default.nix
index f1fe2ad54556..6a4e3de6badd 100644
--- a/pkgs/development/python-modules/pwkit/default.nix
+++ b/pkgs/development/python-modules/pwkit/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "pwkit";
-  version = "1.2.0";
+  version = "1.2.1";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     owner = "pkgw";
     repo = "pwkit";
     rev = "refs/tags/pwkit@${version}";
-    hash = "sha256-bQno1SIbxAJ1TL068eshfFgAkRXFmbGu2GTbv1BRGU0=";
+    hash = "sha256-X3nQPtPrY1+HH0Cs7PrFLqMP3fUEcwXQGap1F/3Aom0=";
   };
 
   build-system = [ setuptools ];

From f58ca7ca7b5ecbe4126e52fc469f6b7f80a176ca Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 14 Sep 2024 13:18:38 +0200
Subject: [PATCH 19/38] django-simple-history: refactor

fix build (https://hydra.nixos.org/build/271981979)
---
 .../python-modules/django-simple-history/default.nix      | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/django-simple-history/default.nix b/pkgs/development/python-modules/django-simple-history/default.nix
index 0179760be698..45e1854de8d9 100644
--- a/pkgs/development/python-modules/django-simple-history/default.nix
+++ b/pkgs/development/python-modules/django-simple-history/default.nix
@@ -13,7 +13,7 @@
 buildPythonPackage rec {
   pname = "django-simple-history";
   version = "3.7.0";
-  format = "setuptools";
+  pyproject = true;
 
   disabled = pythonOlder "3.8";
 
@@ -24,13 +24,13 @@ buildPythonPackage rec {
     hash = "sha256-bPdMdtiEDRvRD00ZBwUQkeCDKCx2SW65+FsbuMwVdK0=";
   };
 
-  nativeBuildInputs = [
+  build-system = [
     hatch-fancy-pypi-readme
     hatchling
     hatch-vcs
   ];
 
-  propagatedBuildInputs = [ django ];
+  dependencies = [ django ];
 
   checkPhase = ''
     runHook preCheck
@@ -41,7 +41,7 @@ buildPythonPackage rec {
   pythonImportsCheck = [ "simple_history" ];
 
   meta = with lib; {
-    description = "django-simple-history stores Django model state on every create/update/delete";
+    description = "Module to store Django model state on every create/update/delete";
     homepage = "https://github.com/jazzband/django-simple-history/";
     changelog = "https://github.com/jazzband/django-simple-history/releases/tag/${version}";
     license = licenses.bsd3;

From 302cf3818b7e3ca3035434b78378ad3c5903862b Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 14 Sep 2024 13:32:06 +0200
Subject: [PATCH 20/38] python312Packages.css-html-js-minify: refactor

Fix build (https://hydra.nixos.org/build/271821834)
---
 .../css-html-js-minify/default.nix            | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/css-html-js-minify/default.nix b/pkgs/development/python-modules/css-html-js-minify/default.nix
index a1a26dd9eaa6..df6f74caa571 100644
--- a/pkgs/development/python-modules/css-html-js-minify/default.nix
+++ b/pkgs/development/python-modules/css-html-js-minify/default.nix
@@ -2,26 +2,36 @@
   lib,
   buildPythonPackage,
   fetchPypi,
+  distutils,
+  setuptools,
+  pythonOlder,
 }:
 
 buildPythonPackage rec {
   pname = "css-html-js-minify";
   version = "2.5.5";
-  format = "setuptools";
+  pyproject = true;
+
+  disabled = pythonOlder "3.9";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "4a9f11f7e0496f5284d12111f3ba4ff5ff2023d12f15d195c9c48bd97013746c";
+    hash = "sha256-Sp8R9+BJb1KE0SER87pP9f8gI9EvFdGVycSL2XATdGw=";
   };
 
-  doCheck = false; # Tests are useless and broken
+  build-system = [
+    distutils
+    setuptools
+  ];
+
+  # Tests are useless and broken
+  doCheck = false;
 
   pythonImportsCheck = [ "css_html_js_minify" ];
 
   meta = with lib; {
     description = "StandAlone Async cross-platform Minifier for the Web";
-    mainProgram = "css-html-js-minify";
     homepage = "https://github.com/juancarlospaco/css-html-js-minify";
     license = with licenses; [
       gpl3Plus
@@ -29,5 +39,6 @@ buildPythonPackage rec {
       mit
     ];
     maintainers = with maintainers; [ FlorianFranzen ];
+    mainProgram = "css-html-js-minify";
   };
 }

From 14bce1c19bd4098971e4ead45196ec499a1c3371 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 14 Sep 2024 13:40:00 +0200
Subject: [PATCH 21/38] python312Packages.hcs-utils: refactor

Fix build (https://hydra.nixos.org/build/271830497)
---
 .../python-modules/hcs-utils/default.nix      | 35 +++++++++++--------
 1 file changed, 21 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/python-modules/hcs-utils/default.nix b/pkgs/development/python-modules/hcs-utils/default.nix
index a69622a440d4..646e6a636cce 100644
--- a/pkgs/development/python-modules/hcs-utils/default.nix
+++ b/pkgs/development/python-modules/hcs-utils/default.nix
@@ -2,38 +2,45 @@
   lib,
   buildPythonPackage,
   fetchPypi,
+  pytestCheckHook,
+  pythonOlder,
+  setuptools,
   six,
-  glibcLocales,
-  pytest,
+  versioneer,
 }:
 
 buildPythonPackage rec {
   pname = "hcs-utils";
   version = "2.0";
-  format = "setuptools";
+  pyproject = true;
+
+  disabled = pythonOlder "3.9";
 
   src = fetchPypi {
     pname = "hcs_utils";
     inherit version;
-    sha256 = "04xq69hrys8lf9kp8pva0c4aphjjfw412km7c32ydkwq0i59rhp2";
+    hash = "sha256-4sKcSgSYz+bFYKdOEQh3UsKrCANqX3RnchRpn2EyuBM=";
   };
 
-  LC_ALL = "en_US.UTF-8";
-
-  checkPhase = ''
-    # root does not has /root as home in sandbox
-    py.test -k 'not test_expand' hcs_utils/test
+  postPatch = ''
+    # Remove vendorized versioneer.py
+    rm versioneer.py
   '';
 
-  buildInputs = [
-    six
-    glibcLocales
+  build-system = [
+    setuptools
+    versioneer
   ];
-  nativeCheckInputs = [ pytest ];
+
+  dependencies = [ six ];
+
+  nativeCheckInputs = [ pytestCheckHook ];
+
+  disabledTests = [ "test_expand" ];
 
   meta = with lib; {
     description = "Library collecting some useful snippets";
-    homepage = "https://pypi.python.org/pypi/hcs_utils/1.3";
+    homepage = "https://gitlab.com/hcs/hcs_utils";
     license = licenses.isc;
     maintainers = with maintainers; [ lovek323 ];
     platforms = platforms.unix;

From 36e343e8a113a454bf0d7e57216b77b072f065fe Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 14 Sep 2024 13:44:25 +0200
Subject: [PATCH 22/38] python312Packages.sphinx-material: refactor

---
 .../sphinx-material/default.nix               | 20 ++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/sphinx-material/default.nix b/pkgs/development/python-modules/sphinx-material/default.nix
index c7faabcd5d8d..752c15928d40 100644
--- a/pkgs/development/python-modules/sphinx-material/default.nix
+++ b/pkgs/development/python-modules/sphinx-material/default.nix
@@ -7,14 +7,16 @@
   lxml,
   python-slugify,
   pythonOlder,
+  setuptools,
   sphinx,
   unidecode,
+  versioneer,
 }:
 
 buildPythonPackage rec {
   pname = "sphinx-material";
   version = "0.0.36";
-  format = "setuptools";
+  pyproject = true;
 
   disabled = pythonOlder "3.7";
 
@@ -24,7 +26,17 @@ buildPythonPackage rec {
     hash = "sha256-7v9ffT3AFq8yuv33DGbmcdFch1Tb4GE9+9Yp++2RKGk=";
   };
 
-  propagatedBuildInputs = [
+  postPatch = ''
+    # Remove vendorized versioneer.py
+    rm versioneer.py
+  '';
+
+  build-system = [
+    setuptools
+    versioneer
+  ];
+
+  dependencies = [
     sphinx
     beautifulsoup4
     python-slugify
@@ -33,13 +45,15 @@ buildPythonPackage rec {
     lxml
   ];
 
-  doCheck = false; # no tests
+  # Module has no tests
+  doCheck = false;
 
   pythonImportsCheck = [ "sphinx_material" ];
 
   meta = with lib; {
     description = "Material-based, responsive theme inspired by mkdocs-material";
     homepage = "https://bashtage.github.io/sphinx-material";
+    changelog = "https://github.com/bashtage/sphinx-material/releases/tag/v${version}";
     license = licenses.mit;
     maintainers = with maintainers; [ FlorianFranzen ];
   };

From 8efcb0779445acf84155116f5347c31ea3276303 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Sat, 14 Sep 2024 10:38:36 +0200
Subject: [PATCH 23/38] python3Packages.pyqt5-sip: 12.13.0 -> 12.15.0

Fixes build with GCC 14.
---
 pkgs/development/python-modules/pyqt/sip.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pyqt/sip.nix b/pkgs/development/python-modules/pyqt/sip.nix
index a9042856e466..865a357f7abf 100644
--- a/pkgs/development/python-modules/pyqt/sip.nix
+++ b/pkgs/development/python-modules/pyqt/sip.nix
@@ -7,12 +7,12 @@
 
 buildPythonPackage rec {
   pname = "pyqt5-sip";
-  version = "12.13.0";
+  version = "12.15.0";
 
   src = fetchPypi {
     pname = "PyQt5_sip";
     inherit version;
-    hash = "sha256-fzIdr4S5ydvKYbgOHvN72v/A6TMS7a4s19oluVOXHZE=";
+    hash = "sha256-0j/fzzY7XO3Z05+KnFcQ59UoBPWwiljpHGOLNur8twI=";
   };
 
   # There is no test code and the check phase fails with:

From 6756497baee7de55c2977e2faf3851f0651dc819 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 14 Sep 2024 12:56:06 +0000
Subject: [PATCH 24/38] crystal-dock: 2.2 -> 2.3

---
 pkgs/by-name/cr/crystal-dock/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/cr/crystal-dock/package.nix b/pkgs/by-name/cr/crystal-dock/package.nix
index e0b3be7ae7fc..4b000a5f5a38 100644
--- a/pkgs/by-name/cr/crystal-dock/package.nix
+++ b/pkgs/by-name/cr/crystal-dock/package.nix
@@ -8,13 +8,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "crystal-dock";
-  version = "2.2";
+  version = "2.3";
 
   src = fetchFromGitHub {
     owner = "dangvd";
     repo = "crystal-dock";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-c5Kae2cZ/DoJ972VT4kQWNUr2cF6Noy3nPIChWok/BA=";
+    hash = "sha256-lqj2C4WrpJd1WMtm8JvGTEWeEUh17DR6J5TqxKt5hWM=";
   };
 
   nativeBuildInputs = [

From 35203d7e9000a89da81c90edf08a64b086ec33b9 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Sat, 14 Sep 2024 13:17:42 +0000
Subject: [PATCH 25/38] fmit: add orivej to maintainers

---
 pkgs/applications/audio/fmit/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/audio/fmit/default.nix b/pkgs/applications/audio/fmit/default.nix
index fdcf94422048..1c297ee3433d 100644
--- a/pkgs/applications/audio/fmit/default.nix
+++ b/pkgs/applications/audio/fmit/default.nix
@@ -55,6 +55,7 @@ mkDerivation rec {
     '';
     homepage = "http://gillesdegottex.github.io/fmit/";
     license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ orivej ];
     platforms = platforms.linux;
   };
 }

From 0dfe3aa8cbdc387028e0a3c490e19065c475098e Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Sat, 14 Sep 2024 13:17:59 +0000
Subject: [PATCH 26/38] fmit: delete custom postInstall

Currently the default install installs everything appropriately.
---
 pkgs/applications/audio/fmit/default.nix | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/pkgs/applications/audio/fmit/default.nix b/pkgs/applications/audio/fmit/default.nix
index 1c297ee3433d..c22fe3ab0977 100644
--- a/pkgs/applications/audio/fmit/default.nix
+++ b/pkgs/applications/audio/fmit/default.nix
@@ -36,17 +36,6 @@ mkDerivation rec {
       PREFIXSHORTCUT=$out"
   '';
 
-  postInstall = ''
-    mkdir -p $out/share/applications
-    ln -s $out/fmit.desktop $out/share/applications/fmit.desktop
-
-    mkdir -p $out/share/icons/hicolor/128x128/apps
-    ln -s $out/fmit.png $out/share/icons/hicolor/128x128/apps/fmit.png
-
-    mkdir -p $out/share/icons/hicolor/scalable/apps
-    ln -s $out/fmit.svg $out/share/icons/hicolor/scalable/apps/fmit.svg
-  '';
-
   meta = with lib; {
     description = "Free Musical Instrument Tuner";
     longDescription = ''

From 36e9dc5e568cbcc09ea3a77803500f3c237e99ee Mon Sep 17 00:00:00 2001
From: Brian McGee <brian@bmcgee.ie>
Date: Fri, 13 Sep 2024 16:19:42 +0100
Subject: [PATCH 27/38] nixos-facter: init at 0.1.0

---
 pkgs/by-name/ni/nixos-facter/package.nix | 70 ++++++++++++++++++++++++
 1 file changed, 70 insertions(+)
 create mode 100644 pkgs/by-name/ni/nixos-facter/package.nix

diff --git a/pkgs/by-name/ni/nixos-facter/package.nix b/pkgs/by-name/ni/nixos-facter/package.nix
new file mode 100644
index 000000000000..50791c62c205
--- /dev/null
+++ b/pkgs/by-name/ni/nixos-facter/package.nix
@@ -0,0 +1,70 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+  hwinfo,
+  libusb1,
+  gcc,
+  pkg-config,
+  util-linux,
+  pciutils,
+  stdenv,
+}:
+let
+  # We are waiting on some changes to be merged upstream: https://github.com/openSUSE/hwinfo/pulls
+  hwinfoOverride = hwinfo.overrideAttrs {
+    src = fetchFromGitHub {
+      owner = "numtide";
+      repo = "hwinfo";
+      rev = "42b014495b2de8735eeec950bc2d3afbefc65ec4";
+      hash = "sha256-OXbGF8M1r8GSgqeY4TqfjF+IO0SXXB/dX2jE2JtkPUk=";
+    };
+  };
+in
+buildGoModule rec {
+  pname = "nixos-facter";
+  version = "0.1.0";
+
+  src = fetchFromGitHub {
+    owner = "numtide";
+    repo = "nixos-facter";
+    rev = "v${version}";
+    hash = "sha256-TBSzIaOuD/IEObgwSx0UwFFAkqF1pAAWhDrNDtQShdY=";
+  };
+
+  vendorHash = "sha256-8yQO7topYvXL6bP0oSVN1rApiPjse4Q2bjFNM5jVl8c=";
+
+  CGO_ENABLED = 1;
+
+  buildInputs = [
+    libusb1
+    hwinfoOverride
+  ];
+
+  nativeBuildInputs = [
+    gcc
+    pkg-config
+  ];
+
+  runtimeInputs = [
+    libusb1
+    util-linux
+    pciutils
+  ];
+
+  ldflags = [
+    "-s"
+    "-w"
+    "-X git.numtide.com/numtide/nixos-facter/build.Name=nixos-facter"
+    "-X git.numtide.com/numtide/nixos-facter/build.Version=v${version}"
+    "-X github.com/numtide/nixos-facter/pkg/build.System=${stdenv.hostPlatform.system}"
+  ];
+
+  meta = {
+    description = "Declarative hardware configuration for NixOS";
+    homepage = "https://github.com/numtide/nixos-facter";
+    license = lib.licenses.gpl3Plus;
+    maintainers = [ lib.maintainers.brianmcgee ];
+    mainProgram = "nixos-facter";
+  };
+}

From f9249f8361d7cea20be43dc1972cc49514baea4f Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 14 Sep 2024 15:47:59 +0200
Subject: [PATCH 28/38] python312Packages.lmfit: refactor

---
 .../python-modules/lmfit/default.nix          | 36 +++++++++++--------
 1 file changed, 21 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/python-modules/lmfit/default.nix b/pkgs/development/python-modules/lmfit/default.nix
index 926944ee55e3..2445006427c2 100644
--- a/pkgs/development/python-modules/lmfit/default.nix
+++ b/pkgs/development/python-modules/lmfit/default.nix
@@ -1,40 +1,43 @@
 {
   lib,
   buildPythonPackage,
-  fetchPypi,
-  setuptools,
-  setuptools-scm,
   asteval,
   dill,
-  numpy,
-  scipy,
-  uncertainties,
-  pytestCheckHook,
-  pandas,
+  fetchPypi,
   matplotlib,
+  numpy,
+  pandas,
+  pytestCheckHook,
+  pythonOlder,
+  scipy,
+  setuptools-scm,
+  setuptools,
+  uncertainties,
 }:
 
 buildPythonPackage rec {
   pname = "lmfit";
   version = "1.3.2";
-
   pyproject = true;
 
+  disabled = pythonOlder "3.8";
+
   src = fetchPypi {
     inherit pname version;
     hash = "sha256-Mb7q4fAnwbjBTc1/LoSIqAt1+zied/ymd1Sb3C/ll7s=";
   };
 
   postPatch = ''
-    substituteInPlace pyproject.toml --replace "--cov=lmfit --cov-report html" ""
+    substituteInPlace pyproject.toml \
+      --replace-fail "--cov=lmfit --cov-report html" ""
   '';
 
-  nativeBuildInputs = [
+  build-system = [
     setuptools
     setuptools-scm
   ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     asteval
     dill
     numpy
@@ -43,14 +46,17 @@ buildPythonPackage rec {
   ];
 
   nativeCheckInputs = [
-    pytestCheckHook
-    pandas
     matplotlib
+    pandas
+    pytestCheckHook
   ];
 
+  pythonImportsCheck = [ "lmfit" ];
+
   meta = with lib; {
     description = "Least-Squares Minimization with Bounds and Constraints";
-    homepage = "https://lmfit-py.readthedocs.io/";
+    homepage = "https://lmfit.github.io/lmfit-py/";
+    changelog = "https://github.com/lmfit/lmfit-py/releases/tag/${version}";
     license = licenses.bsd3;
     maintainers = with maintainers; [ nomeata ];
   };

From 87d3c358df18520bbb03116ab8913a1e4238853c Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 14 Sep 2024 15:49:35 +0200
Subject: [PATCH 29/38] python312Packages.lmfit: disable failing test

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

diff --git a/pkgs/development/python-modules/lmfit/default.nix b/pkgs/development/python-modules/lmfit/default.nix
index 2445006427c2..16046208ea9a 100644
--- a/pkgs/development/python-modules/lmfit/default.nix
+++ b/pkgs/development/python-modules/lmfit/default.nix
@@ -53,6 +53,8 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "lmfit" ];
 
+  disabledTests = [ "test_check_ast_errors" ];
+
   meta = with lib; {
     description = "Least-Squares Minimization with Bounds and Constraints";
     homepage = "https://lmfit.github.io/lmfit-py/";

From 55f62508e975d2603a7f5cd8b144972ef8e10345 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sat, 14 Sep 2024 17:39:57 +0200
Subject: [PATCH 30/38] python312Packages.pylance: skip failing tests on darwin

---
 pkgs/development/python-modules/pylance/default.nix | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/pkgs/development/python-modules/pylance/default.nix b/pkgs/development/python-modules/pylance/default.nix
index 4a05d6c40eed..9da8ad14dfab 100644
--- a/pkgs/development/python-modules/pylance/default.nix
+++ b/pkgs/development/python-modules/pylance/default.nix
@@ -100,6 +100,17 @@ buildPythonPackage rec {
     cd python/python/tests
   '';
 
+  disabledTests = lib.optionals stdenv.isDarwin [
+    # AttributeError: module 'torch.distributed' has no attribute 'is_initialized'
+    "test_convert_int_tensors"
+    "test_ground_truth"
+    "test_index_cast_centroids"
+    "test_index_with_no_centroid_movement"
+    "test_iter_filter"
+    "test_iter_over_dataset_fixed_shape_tensor"
+    "test_iter_over_dataset_fixed_size_lists"
+  ];
+
   passthru.updateScript = nix-update-script {
     extraArgs = [
       "--generate-lockfile"

From 5a6db3bc9310229d103368abed3bc52a2749e71e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <Mic92@users.noreply.github.com>
Date: Sat, 14 Sep 2024 18:01:19 +0200
Subject: [PATCH 31/38] pkgs/by-name/ni/nixos-facter: limit to linux

Co-authored-by: Aleksana <alexander.huang.y@gmail.com>
---
 pkgs/by-name/ni/nixos-facter/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/ni/nixos-facter/package.nix b/pkgs/by-name/ni/nixos-facter/package.nix
index 50791c62c205..b93412378cc7 100644
--- a/pkgs/by-name/ni/nixos-facter/package.nix
+++ b/pkgs/by-name/ni/nixos-facter/package.nix
@@ -66,5 +66,6 @@ buildGoModule rec {
     license = lib.licenses.gpl3Plus;
     maintainers = [ lib.maintainers.brianmcgee ];
     mainProgram = "nixos-facter";
+    platforms = lib.platforms.linux;
   };
 }

From 7df8f71afbf1f15345149732edae5082c85c3d19 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sat, 14 Sep 2024 18:50:13 +0200
Subject: [PATCH 32/38] python312Packages.equinox: 0.11.5 -> 0.11.6

Diff: https://github.com/patrick-kidger/equinox/compare/refs/tags/v0.11.5...v0.11.6

Changelog: https://github.com/patrick-kidger/equinox/releases/tag/v0.11.6
---
 .../python-modules/equinox/default.nix        | 29 ++-----------------
 1 file changed, 2 insertions(+), 27 deletions(-)

diff --git a/pkgs/development/python-modules/equinox/default.nix b/pkgs/development/python-modules/equinox/default.nix
index 592d10d8f8cd..831241312a9b 100644
--- a/pkgs/development/python-modules/equinox/default.nix
+++ b/pkgs/development/python-modules/equinox/default.nix
@@ -1,7 +1,6 @@
 {
   lib,
   buildPythonPackage,
-  pythonOlder,
   fetchFromGitHub,
 
   # build-system
@@ -22,16 +21,14 @@
 
 buildPythonPackage rec {
   pname = "equinox";
-  version = "0.11.5";
+  version = "0.11.6";
   pyproject = true;
 
-  disabled = pythonOlder "3.9";
-
   src = fetchFromGitHub {
     owner = "patrick-kidger";
     repo = "equinox";
     rev = "refs/tags/v${version}";
-    hash = "sha256-r4HKn+WJmC7BrTeDDAQ1++TpQhhtLcK6HL2CoM/MGx8=";
+    hash = "sha256-Ee715otEKmXbXwZ2umrJN3HlIjabQao8hl6MRGqJnNw=";
   };
 
   build-system = [ hatchling ];
@@ -52,28 +49,6 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "equinox" ];
 
-  disabledTests = [
-    # For simplicity, JAX has removed its internal frames from the traceback of the following exception.
-    # https://github.com/patrick-kidger/equinox/issues/716
-    "test_abstract"
-    "test_complicated"
-    "test_grad"
-    "test_jvp"
-    "test_mlp"
-    "test_num_traces"
-    "test_pytree_in"
-    "test_simple"
-    "test_vmap"
-
-    # AssertionError: assert 'foo:\n   pri...pe=float32)\n' == 'foo:\n   pri...pe=float32)\n'
-    # Also reported in patrick-kidger/equinox#716
-    "test_backward_nan"
-
-    # Flaky test
-    # See https://github.com/patrick-kidger/equinox/issues/781
-    "test_traceback_runtime_eqx"
-  ];
-
   meta = {
     description = "JAX library based around a simple idea: represent parameterised functions (such as neural networks) as PyTrees";
     changelog = "https://github.com/patrick-kidger/equinox/releases/tag/v${version}";

From 3bb484cc6b759b1136a1e8f3859c54ae6f41cdf1 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sat, 14 Sep 2024 19:22:39 +0200
Subject: [PATCH 33/38] python312Packages.pylance: mark as broken on
 x86_64-darwin

---
 pkgs/development/python-modules/pylance/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/python-modules/pylance/default.nix b/pkgs/development/python-modules/pylance/default.nix
index 9da8ad14dfab..95e9cc8326cd 100644
--- a/pkgs/development/python-modules/pylance/default.nix
+++ b/pkgs/development/python-modules/pylance/default.nix
@@ -125,5 +125,8 @@ buildPythonPackage rec {
     changelog = "https://github.com/lancedb/lance/releases/tag/v${version}";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ natsukium ];
+    # test_indices.py ...sss.Fatal Python error: Fatal Python error: Illegal instructionIllegal instruction
+    # File "/nix/store/wiiccrs0vd1qbh4j6ki9p40xmamsjix3-python3.12-pylance-0.17.0/lib/python3.12/site-packages/lance/indices.py", line 237 in train_ivf
+    broken = stdenv.isDarwin && stdenv.isx86_64;
   };
 }

From 8237693407b6c593b9efa8441c4f9e5d5c5e2f70 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 14 Sep 2024 18:01:04 +0000
Subject: [PATCH 34/38] python312Packages.solarlog-cli: 0.2.2 -> 0.3.0

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

diff --git a/pkgs/development/python-modules/solarlog-cli/default.nix b/pkgs/development/python-modules/solarlog-cli/default.nix
index eea509879c6a..a2b039d217a8 100644
--- a/pkgs/development/python-modules/solarlog-cli/default.nix
+++ b/pkgs/development/python-modules/solarlog-cli/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "solarlog-cli";
-  version = "0.2.2";
+  version = "0.3.0";
   pyproject = true;
 
   disabled = pythonOlder "3.12";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "dontinelli";
     repo = "solarlog_cli";
     rev = "refs/tags/v${version}";
-    hash = "sha256-RibfHggpuJAtvENOToSp7eFuvfkTRHdSq0Eg9kk05vc=";
+    hash = "sha256-jNvwSh89Ncl/rR/cUNVbJfJThJTa9JlANjvH/vRruAU=";
   };
 
   build-system = [ hatchling ];

From c0c7df1288fc83746a0e3c0b1afc4ee6e7a6640e Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sat, 14 Sep 2024 20:36:13 +0200
Subject: [PATCH 35/38] python312Packages.accelerate: 0.34.0 -> 0.34.2

Diff:
https://github.com/huggingface/accelerate/compare/refs/tags/v0.34.0...v0.34.2

Changelog:
https://github.com/huggingface/accelerate/releases/tag/v0.34.2
---
 .../python-modules/accelerate/default.nix     | 35 +++++++++++++------
 1 file changed, 24 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/python-modules/accelerate/default.nix b/pkgs/development/python-modules/accelerate/default.nix
index 9b143bd3a121..566908cfa3b5 100644
--- a/pkgs/development/python-modules/accelerate/default.nix
+++ b/pkgs/development/python-modules/accelerate/default.nix
@@ -4,35 +4,40 @@
   buildPythonPackage,
   fetchFromGitHub,
   pythonAtLeast,
-  pythonOlder,
+
+  # buildInputs
   llvmPackages,
-  pytest7CheckHook,
+
+  # build-system
   setuptools,
+
+  # dependencies
   numpy,
   packaging,
   psutil,
   pyyaml,
   safetensors,
   torch,
-  config,
-  cudatoolkit,
+
+  # tests
   evaluate,
   parameterized,
+  pytest7CheckHook,
   transformers,
+  config,
+  cudatoolkit,
 }:
 
 buildPythonPackage rec {
   pname = "accelerate";
-  version = "0.34.0";
+  version = "0.34.2";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
-
   src = fetchFromGitHub {
     owner = "huggingface";
     repo = "accelerate";
     rev = "refs/tags/v${version}";
-    hash = "sha256-MyV1GKxD43QSzS8jea8amt8Xe1h0Xm0WdtUNGkYHfvw=";
+    hash = "sha256-4kDNLta6gGev16A4hNOArTpoD8p6LMRwqwHS/DZjtz0=";
   };
 
   buildInputs = [ llvmPackages.openmp ];
@@ -101,6 +106,14 @@ buildPythonPackage rec {
       # requires ptxas from cudatoolkit, which is unfree
       "test_dynamo_extract_model"
     ]
+    ++ lib.optionals (stdenv.isDarwin) [
+      # RuntimeError: 'accelerate-launch /nix/store/a7vhm7b74a7bmxc35j26s9iy1zfaqjs...
+      "test_accelerate_test"
+      "test_init_trackers"
+      "test_init_trackers"
+      "test_log"
+      "test_log_with_tensor"
+    ]
     ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [
       # RuntimeError: torch_shm_manager: execl failed: Permission denied
       "CheckpointTest"
@@ -118,12 +131,12 @@ buildPythonPackage rec {
 
   __darwinAllowLocalNetworking = true;
 
-  meta = with lib; {
+  meta = {
     homepage = "https://huggingface.co/docs/accelerate";
     description = "Simple way to train and use PyTorch models with multi-GPU, TPU, mixed-precision";
     changelog = "https://github.com/huggingface/accelerate/releases/tag/v${version}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ bcdarwin ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ bcdarwin ];
     mainProgram = "accelerate";
   };
 }

From 0919767972b81b64e64ae47315e090027d2a211d Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Sat, 14 Sep 2024 19:45:05 +0100
Subject: [PATCH 36/38] zile: fix the eval
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

    $ nix build --no-link -f. zile
    error:
       … while calling the 'derivationStrict' builtin
         at <nix/derivation-internal.nix>:34:12:
           33|
           34|   strict = derivationStrict drvAttrs;
             |            ^
           35|

       … while evaluating derivation 'zile-2.6.2'
         whose name attribute is located at pkgs/stdenv/generic/make-derivation.nix:336:7

       … while evaluating attribute 'NIX_CFLAGS_COMPILE' of derivation 'zile-2.6.2'

       (stack trace truncated; use '--show-trace' to show the full, detailed trace)

       error: The `env` attribute set can only contain derivation, string, boolean or integer attributes. The `NIX_CFLAGS_COMPILE` attribute is of type list.
---
 pkgs/applications/editors/zile/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/zile/default.nix b/pkgs/applications/editors/zile/default.nix
index b7d7099a3472..801c0d384445 100644
--- a/pkgs/applications/editors/zile/default.nix
+++ b/pkgs/applications/editors/zile/default.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
   # fiddle with the terminal.
   doCheck = false;
 
-  env.NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isClang "-Wno-error=incompatible-function-pointer-types";
+  env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=incompatible-function-pointer-types";
 
   # XXX: Work around cross-compilation-unfriendly `gl_FUNC_FSTATAT' macro.
   gl_cv_func_fstatat_zero_flag="yes";

From c9dbde8fc960f7184ceeef65adef0cfd2b99d7ad Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 14 Sep 2024 18:59:39 +0000
Subject: [PATCH 37/38] wakatime-cli: 1.98.3 -> 1.98.5

---
 pkgs/by-name/wa/wakatime-cli/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/wa/wakatime-cli/package.nix b/pkgs/by-name/wa/wakatime-cli/package.nix
index a0e03a6cd788..7524d82c62b8 100644
--- a/pkgs/by-name/wa/wakatime-cli/package.nix
+++ b/pkgs/by-name/wa/wakatime-cli/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule rec {
   pname = "wakatime-cli";
-  version = "1.98.3";
+  version = "1.98.5";
 
   src = fetchFromGitHub {
     owner = "wakatime";
     repo = "wakatime-cli";
     rev = "v${version}";
-    hash = "sha256-AoefP/hWdflCOjZtmKyjcjUfst3SXF+EHfJyPcACWPE=";
+    hash = "sha256-Ez5fzaZxvHOH8z4tQ7+PUnGrpzAd97vbAta1exEtvtQ=";
   };
 
   vendorHash = "sha256-+9zdEIaKQlLcBwFaY5Fe5mpHWQDqfV+j1TPmDkdRjyk=";

From 253a16dc024cfb28ad5332e7ab50caee08d7bd8e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 14 Sep 2024 14:23:12 +0000
Subject: [PATCH 38/38] flitter: 1.0.0 -> 1.1.0

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

diff --git a/pkgs/tools/misc/flitter/default.nix b/pkgs/tools/misc/flitter/default.nix
index 9ef8b525584f..b32329efd9eb 100644
--- a/pkgs/tools/misc/flitter/default.nix
+++ b/pkgs/tools/misc/flitter/default.nix
@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "flitter";
-  version = "1.0.0";
+  version = "1.1.0";
 
   src = fetchFromGitHub {
     owner = "alexozer";
     repo = "flitter";
     rev = "v${version}";
-    sha256 = "sha256-XyHUUuENnGmIUlfYl7+NuSP115+sZfjXtd4bEIZQpf8=";
+    sha256 = "sha256-CjWixIiQFBoS+m8hPLqz0UR/EbQWgx8eKf3Y9kkgQew=";
   };
 
-  cargoHash = "sha256-ydYBHC/LxdYGA1+eYLTSZdkOhAgkw99J9JVT5micgdg=";
+  cargoHash = "sha256-jkIdlvMYNopp8syZpIiAiekALUrRWWRKFFHYyMYRMg4=";
 
   nativeBuildInputs = [
     pkg-config