Merge master into staging-next

pkgs/applications/audio/musescore/default.nix

@@ -49,27 +49,15 @@ let
   } else portaudio;
 in stdenv'.mkDerivation (finalAttrs: {
   pname = "musescore";
-  version = "4.4.0";
+  version = "4.4.1";
 
   src = fetchFromGitHub {
     owner = "musescore";
     repo = "MuseScore";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-oDbOaLFmSpZ7D8E7LBxUwFwiaPcucIUj3eEp6sXR5o8=";
+    sha256 = "sha256-eLtpLgXSc8L5y1Mg3s1wrxr09+/vBxNqJEtl9IoKYSM=";
   };
   patches = [
-    # https://github.com/musescore/MuseScore/pull/24247
-    (fetchpatch {
-      name = "skip-downloading-harfbuzz.patch";
-      url = "https://github.com/musescore/MuseScore/commit/686ea243d58b43eb3dff7ebdabb2e09de4d212e4.patch";
-      hash = "sha256-fsb1hKFKXwBdMPh+Ek0UT3XtI8qg3ieWUQW1/XDvhmg=";
-    })
-    # https://github.com/musescore/MuseScore/pull/24261
-    (fetchpatch {
-      name = "allow-using-system-harfbuzz.patch";
-      url = "https://github.com/musescore/MuseScore/commit/696279e362afe72db5e92f8a47aa64b3a0e86a86.patch";
-      hash = "sha256-z1W2SmzUUlVL7mRR2frzUZjMEnwqkVfRVz4TufR1tDU=";
-    })
     # https://github.com/musescore/MuseScore/pull/24326
     (fetchpatch {
       name = "fix-menubar-with-qt6.5+.patch";
@@ -132,12 +120,14 @@ in stdenv'.mkDerivation (finalAttrs: {
     qtbase
     qtdeclarative
     qt5compat
-    qtwayland
     qtsvg
     qtscxml
     qtnetworkauth
   ] ++ lib.optionals stdenv.isLinux [
     alsa-lib
+    qtwayland
+  ] ++ lib.optionals stdenv.isDarwin [
+    darwin.apple_sdk_11_0.frameworks.Cocoa
   ];
 
   postInstall = ''

pkgs/applications/blockchains/clightning/default.nix

@@ -20,15 +20,15 @@
 , jq
 }:
 let
-  py3 = python3.withPackages (p: [ p.mako ]);
+  py3 = python3.withPackages (p: [ p.distutils p.mako ]);
 in
 stdenv.mkDerivation rec {
   pname = "clightning";
-  version = "24.05";
+  version = "24.08";
 
   src = fetchurl {
     url = "https://github.com/ElementsProject/lightning/releases/download/v${version}/clightning-v${version}.zip";
-    hash = "sha256-FD7JFM80wrruqBWjYnJHZh2f2GZJ6XDQmUQ0XetnWBg=";
+    hash = "sha256-u4dkVcdduTBuRE615mPx66U8OFZSeMdL2fNJNoHbVxc=";
   };
 
   # when building on darwin we need cctools to provide the correct libtool

pkgs/applications/editors/vim/plugins/overrides.nix

@@ -141,7 +141,7 @@
     nvimRequireCheck = "alpha";
   };
 
-  advanced-git-search-nvim = super.autosave-nvim.overrideAttrs {
+  advanced-git-search-nvim = super.advanced-git-search-nvim.overrideAttrs {
     dependencies = with super; [ telescope-nvim vim-fugitive vim-rhubarb ];
   };
 

pkgs/applications/misc/avrdudess/default.nix

@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation {
   pname = "avrdudess";
-  version = "2.17";
+  version = "2.18";
 
   src = fetchurl {
-    url = "https://github.com/ZakKemble/AVRDUDESS/releases/download/v2.17/AVRDUDESS-2.17-portable.zip";
-    sha256 = "sha256-TcXXGDs75Q2ew+m2B/p00Y24O5aJQlp+3FcAn7GSVyI=";
+    url = "https://github.com/ZakKemble/AVRDUDESS/releases/download/v2.18/AVRDUDESS-2.18-portable.zip";
+    sha256 = "sha256-N93FLiXp1WwhI5KwH6sho2wyFtkbODwCHOpEVbVnYdc=";
   };
 
   nativeBuildInputs = [ unzip ];

pkgs/applications/misc/watchmate/default.nix

@@ -1,61 +1,66 @@
-{ lib
-, rustPlatform
-, fetchFromGitHub
-, pkg-config
-, gtk4
-, libadwaita
-, bluez
-, dbus
-, openssl
-, wrapGAppsHook4
-, glib
-}:
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  pkg-config,
+  gtk4,
+  libadwaita,
+  bluez,
+  dbus,
+  openssl,
+  wrapGAppsHook4,
+  glib,
+}: let
+  releaseVersion = "0.5.2";
+in
+  rustPlatform.buildRustPackage rec {
+    pname = "watchmate";
+    version = "${releaseVersion}-unstable-2024-08-13";
 
-rustPlatform.buildRustPackage rec {
-  pname = "watchmate";
-  version = "0.4.5";
-
-  src = fetchFromGitHub {
-    owner = "azymohliad";
-    repo = "watchmate";
-    rev = "v${version}";
-    hash = "sha256-4L9mfZWphwXON8VgRcGrz+k62wyPzd1phtRu9HQnVdE=";
-  };
-
-  cargoLock = {
-    lockFile = ./Cargo.lock;
-    outputHashes = {
-      "mpris2-zbus-0.1.0" = "sha256-f2hth7TnA14I4UPyp0u4IfMi9WY4G3M1sEc4xNtnbr0=";
+    src = fetchFromGitHub {
+      owner = "azymohliad";
+      repo = "watchmate";
+      rev = "e05edfae94a1973110c6f40f25133d5979f485ab";
+      hash = "sha256-fHWxn7hFx/9cnLlCHIC6hIJaLd1U3Ii9mJgTJ+Hw63M=";
     };
-  };
 
-  nativeBuildInputs = [
-    pkg-config
-    wrapGAppsHook4
-    glib
-  ];
-  buildInputs = [
-    gtk4
-    libadwaita
-    bluez
-    dbus
-    openssl
-  ];
+    cargoLock = {
+      lockFile = ./Cargo.lock;
+      outputHashes = {
+        "mpris2-zbus-0.1.0" = "sha256-a/cvbB0M9cUd8RP5XxgHRbJ/i/UKAEK4DTwwUU69IuY=";
+      };
+    };
 
-  postInstall = ''
-    install -Dm444 assets/io.gitlab.azymohliad.WatchMate.desktop -t $out/share/applications/
-    install -Dm444 assets/io.gitlab.azymohliad.WatchMate.metainfo.xml -t $out/share/metainfo/
-    install -Dm444 assets/icons/io.gitlab.azymohliad.WatchMate.svg -t $out/share/icons/hicolor/scalable/apps/
-    install -Dm444 assets/icons/io.gitlab.azymohliad.WatchMate-symbolic.svg -t $out/share/icons/hicolor/scalable/apps/
-  '';
+    nativeBuildInputs = [
+      pkg-config
+      wrapGAppsHook4
+      glib
+    ];
 
-  meta = with lib; {
-    description = "PineTime smart watch companion app for Linux phone and desktop";
-    mainProgram = "watchmate";
-    homepage = "https://github.com/azymohliad/watchmate";
-    changelog = "https://github.com/azymohliad/watchmate/raw/v${version}/CHANGELOG.md";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ chuangzhu ];
-    platforms = platforms.linux;
-  };
-}
+    buildInputs = [
+      gtk4
+      libadwaita
+      bluez
+      dbus
+      openssl
+    ];
+
+    postInstall = ''
+      install -Dm444 assets/io.gitlab.azymohliad.WatchMate.desktop -t $out/share/applications/
+      install -Dm444 assets/io.gitlab.azymohliad.WatchMate.metainfo.xml -t $out/share/metainfo/
+      install -Dm444 assets/io.gitlab.azymohliad.WatchMate.gschema.xml -t $out/share/glib-2.0/schemas/
+      glib-compile-schemas $out/share/glib-2.0/schemas/
+      install -Dm444 assets/icons/io.gitlab.azymohliad.WatchMate.svg -t $out/share/icons/hicolor/scalable/apps/
+      install -Dm444 assets/icons/io.gitlab.azymohliad.WatchMate-symbolic.svg -t $out/share/icons/hicolor/scalable/apps/
+    '';
+
+    meta = with lib; {
+      description = "PineTime smart watch companion app for Linux phone and desktop";
+      mainProgram = "watchmate";
+      homepage = "https://github.com/azymohliad/watchmate";
+      changelog = "https://github.com/azymohliad/watchmate/raw/v${releaseVersion}/CHANGELOG.md";
+      license = licenses.gpl3Plus;
+      maintainers = with maintainers; [chuangzhu];
+      platforms = platforms.linux;
+    };
+  }

pkgs/applications/networking/cluster/glooctl/default.nix

@@ -1,21 +1,22 @@
-{ lib
-, buildGoModule
-, fetchFromGitHub
-, installShellFiles
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+  installShellFiles,
 }:
 
 buildGoModule rec {
   pname = "glooctl";
-  version = "1.16.17";
+  version = "1.17.6";
 
   src = fetchFromGitHub {
     owner = "solo-io";
     repo = "gloo";
     rev = "v${version}";
-    hash = "sha256-18ZvxXAE83/NT/Syv/wshTiulTMroAaamxYtfuYIuR4=";
+    hash = "sha256-uuT/3MU9qdtdCaELkwKCLdif9MqAt2gDnwjH1LrsF8U=";
   };
 
-  vendorHash = "sha256-wLB+sUaSOBb1VLx/iwlU4U6LKakUP+GbhdWfjlvCu84=";
+  vendorHash = "sha256-C8zzNMHA4tKIUncqUJRE3VZFJO8KEX8GbOcTvbOnmU0=";
 
   subPackages = [ "projects/gloo/cli/cmd" ];
 
@@ -25,10 +26,13 @@ buildGoModule rec {
 
   ldflags = [
     "-s"
-    "-w"
     "-X github.com/solo-io/gloo/pkg/version.Version=${version}"
   ];
 
+  preCheck = ''
+    export HOME=$TMPDIR
+  '';
+
   postInstall = ''
     mv $out/bin/cmd $out/bin/glooctl
     installShellCompletion --cmd glooctl \
@@ -37,9 +41,10 @@ buildGoModule rec {
   '';
 
   meta = {
-    description = "glooctl is the unified CLI for Gloo";
+    description = "Unified CLI for Gloo, the feature-rich, Kubernetes-native, next-generation API gateway built on Envoy";
     mainProgram = "glooctl";
     homepage = "https://docs.solo.io/gloo-edge/latest/reference/cli/glooctl/";
+    changelog = "https://github.com/solo-io/gloo/releases/tag/v${version}";
     license = lib.licenses.asl20;
     maintainers = [ ];
   };

pkgs/applications/networking/instant-messengers/jackline/default.nix

@@ -4,15 +4,15 @@ with ocamlPackages;
 
 buildDunePackage rec {
   pname = "jackline";
-  version = "unstable-2023-03-09";
+  version = "unstable-2024-02-28";
 
   minimalOCamlVersion = "4.08";
 
   src = fetchFromGitHub {
     owner  = "hannesm";
     repo   = "jackline";
-    rev    = "a7acd19bd8141b842ac69b05146d9a63e729230d";
-    hash = "sha256-AhiFfZkDit9tnGenETc3A1hHqWN+csiS2bVjsGNaHf8=";
+    rev  = "31b90275a5f848cfc8c4f5b75e7d1933bec37852";
+    hash = "sha256-G2jjsc/i9Qgo0TP+ZE4gB/1cjuZ9l8R7e59K2DGD5GY=";
   };
 
   nativeBuildInpts = [

pkgs/by-name/ab/abcmidi/package.nix

@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "abcmidi";
-  version = "2024.08.11";
+  version = "2024.08.13";
 
   src = fetchFromGitHub {
     owner = "sshlien";
     repo = "abcmidi";
     rev = "refs/tags/${finalAttrs.version}";
-    hash = "sha256-ljRwRSF6Odv99ej8mmMjtf9NE0du7TtAypkw7W9TEYU=";
+    hash = "sha256-+X7ZPjZtqxEq2GSzdhLA48aqHfWFimST1GCfZ/NLjeU=";
   };
 
   meta = {

pkgs/by-name/aq/aquamarine/package.nix

@@ -23,13 +23,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "aquamarine";
-  version = "0.4.0";
+  version = "0.4.1";
 
   src = fetchFromGitHub {
     owner = "hyprwm";
     repo = "aquamarine";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-EaKtf4mESHvHF2ak5Lt7ycSTLqdjI+Ry+zWpQaPqgD8=";
+    hash = "sha256-/NO/h/qD/eJXAQr/fHA4mdDgYsNT9thHQ+oT6KPi2ac=";
   };
 
   nativeBuildInputs = [

pkgs/by-name/at/atlauncher/package.nix

@@ -21,13 +21,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "atlauncher";
-  version = "3.4.37.2";
+  version = "3.4.37.3";
 
   src = fetchFromGitHub {
     owner = "ATLauncher";
     repo = "ATLauncher";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-1sIzQBJWbkGk8VrZdRi3eIHBAfiu90lodEZVouZNzVM=";
+    hash = "sha256-XdTbrM7FPR0o0d+p4ko48UonMsY+nLfiXj5fP2a3/zI=";
   };
 
   postPatch = ''

pkgs/by-name/au/auto-cpufreq/fix-version-output.patch

@@ -1,33 +1,20 @@
-diff --git a/auto_cpufreq/core.py b/auto_cpufreq/core.py
-index 58cedb7..89e77a4 100755
---- a/auto_cpufreq/core.py
-+++ b/auto_cpufreq/core.py
-@@ -136,26 +136,8 @@ except PermissionError:
-
+diff --git c/auto_cpufreq/core.py i/auto_cpufreq/core.py
+index b51d55d..b0bff1e 100755
+--- c/auto_cpufreq/core.py
++++ i/auto_cpufreq/core.py
+@@ -96,13 +96,8 @@ except PermissionError:
+ 
  # display running version of auto-cpufreq
  def app_version():
--
 -    print("auto-cpufreq version: ", end="")
 -
--    # snap package
--    if os.getenv("PKG_MARKER") == "SNAP":
--        print(getoutput(r"echo \(Snap\) $SNAP_VERSION"))
--    # aur package
--    elif dist_name in ["arch", "manjaro", "garuda"]:
--        aur_pkg_check = call("pacman -Qs auto-cpufreq > /dev/null", shell=True)
--        if aur_pkg_check == 1:
--            print(get_formatted_version())
--        else:
--            print(getoutput("pacman -Qi auto-cpufreq | grep Version"))
+-    if IS_INSTALLED_WITH_SNAP: print(getoutput(r"echo \(Snap\) $SNAP_VERSION"))
+-    elif IS_INSTALLED_WITH_AUR: print(getoutput("pacman -Qi auto-cpufreq | grep Version"))
 -    else:
--        # source code (auto-cpufreq-installer)
--        try:
--            print(get_formatted_version())
--        except Exception as e:
--            print(repr(e))
--            pass
-+   print("auto-cpufreq version: @version@")
-+   print("Git commit: v@version@")
-
+-        try: print(get_formatted_version())
+-        except Exception as e: print(repr(e))
++    print("auto-cpufreq version: @version@")
++    print("Git commit: v@version@")
+ 
  def check_for_update():
      # returns True if a new release is available from the GitHub repo

pkgs/by-name/au/auto-cpufreq/package.nix

@@ -9,14 +9,14 @@
 }:
 python3Packages.buildPythonPackage rec {
   pname = "auto-cpufreq";
-  version = "2.3.0";
+  version = "2.4.0";
   format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "AdnanHodzic";
     repo = "auto-cpufreq";
-    rev = "v${version}";
-    hash = "sha256-Bet/WOVveLIA+0Mvly4AsielR+r/AJXIgHdWrtc7i/U=";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-Xsh3d7rQY7RKzZ7J0swrgxZEyITb7B3oX5F/tcBGjfk=";
   };
 
   nativeBuildInputs = [

pkgs/by-name/au/auto-cpufreq/prevent-install-and-copy.patch

@@ -1,13 +1,13 @@
-diff --git a/auto_cpufreq/bin/auto_cpufreq.py b/auto_cpufreq/bin/auto_cpufreq.py
-index 4343b8d..dc286f6 100755
---- a/auto_cpufreq/bin/auto_cpufreq.py
-+++ b/auto_cpufreq/bin/auto_cpufreq.py
-@@ -199,41 +199,9 @@ def main(config, daemon, debug, update, install, remove, live, log, monitor, sta
-             print("https://github.com/AdnanHodzic/auto-cpufreq/#donate")
-             footer()
+diff --git c/auto_cpufreq/bin/auto_cpufreq.py i/auto_cpufreq/bin/auto_cpufreq.py
+index 7192366..96289e1 100755
+--- c/auto_cpufreq/bin/auto_cpufreq.py
++++ i/auto_cpufreq/bin/auto_cpufreq.py
+@@ -134,20 +134,7 @@ def main(monitor, live, daemon, install, update, remove, force, config, stats, g
+                 except KeyboardInterrupt: break
+             conf.notifier.stop()
          elif install:
--            if os.getenv("PKG_MARKER") == "SNAP":
--                root_check()
+-            root_check()
+-            if IS_INSTALLED_WITH_SNAP:
 -                running_daemon_check()
 -                gnome_power_detect_snap()
 -                tlp_service_detect_snap()
@@ -15,17 +15,21 @@ index 4343b8d..dc286f6 100755
 -                gov_check()
 -                run("snapctl set daemon=enabled", shell=True)
 -                run("snapctl start --enable auto-cpufreq", shell=True)
--                deploy_complete_msg()
 -            else:
--                root_check()
 -                running_daemon_check()
 -                gov_check()
 -                deploy_daemon()
--                deploy_complete_msg()
+-            deploy_complete_msg()
 +            print("install is disabled in the nix package")
+         elif update:
+             root_check()
+             custom_dir = "/opt/auto-cpufreq/source"
+@@ -185,21 +172,7 @@ def main(monitor, live, daemon, install, update, remove, force, config, stats, g
+                     run(["auto-cpufreq", "--version"])
+                 else: print("Aborted")
          elif remove:
--            if os.getenv("PKG_MARKER") == "SNAP":
--                root_check()
+-            root_check()
+-            if IS_INSTALLED_WITH_SNAP:
 -                run("snapctl set daemon=disabled", shell=True)
 -                run("snapctl stop --disable auto-cpufreq", shell=True)
 -                if auto_cpufreq_stats_path.exists():
@@ -37,92 +41,73 @@ index 4343b8d..dc286f6 100755
 -                # {the following snippet also used in --update, update it there too(if required)}
 -                # * undo bluetooth boot disable
 -                gnome_power_rm_reminder_snap()
--                remove_complete_msg()
--            else:
--                root_check()
--                remove_daemon()
--                remove_complete_msg()
+-            else: remove_daemon()
+-            remove_complete_msg()
 +            print("remove is disabled in the nix package")
-         elif update:
-             root_check()
-             custom_dir = "/opt/auto-cpufreq/source"
-diff --git a/auto_cpufreq/core.py b/auto_cpufreq/core.py
-index 58cedb7..c50b0e1 100755
---- a/auto_cpufreq/core.py
-+++ b/auto_cpufreq/core.py
-@@ -391,30 +391,13 @@ def get_current_gov():
- 
+         elif stats:
+             not_running_daemon_check()
+             config_info_dialog()
+diff --git c/auto_cpufreq/core.py i/auto_cpufreq/core.py
+index b51d55d..4e4b5d3 100755
+--- c/auto_cpufreq/core.py
++++ i/auto_cpufreq/core.py
+@@ -277,18 +277,12 @@ def get_current_gov():
+     )
  
  def cpufreqctl():
 -    """
--    deploy cpufreqctl script
+-    deploy cpufreqctl.auto-cpufreq script
 -    """
--
--    # detect if running on a SNAP
--    if os.getenv("PKG_MARKER") == "SNAP":
--        pass
--    else:
--        # deploy cpufreqctl.auto-cpufreq script
--        if not os.path.isfile("/usr/local/bin/cpufreqctl.auto-cpufreq"):
--            shutil.copy(SCRIPTS_DIR / "cpufreqctl.sh", "/usr/local/bin/cpufreqctl.auto-cpufreq")
+-    if not (IS_INSTALLED_WITH_SNAP or os.path.isfile("/usr/local/bin/cpufreqctl.auto-cpufreq")):
+-        copy(SCRIPTS_DIR / "cpufreqctl.sh", "/usr/local/bin/cpufreqctl.auto-cpufreq")
 +    # scripts are already in the correct place
 +    pass
  
- 
  def cpufreqctl_restore():
 -    """
 -    remove cpufreqctl.auto-cpufreq script
 -    """
--    # detect if running on a SNAP
--    if os.getenv("PKG_MARKER") == "SNAP":
--        pass
--    else:
--        if os.path.isfile("/usr/local/bin/cpufreqctl.auto-cpufreq"):
--            os.remove("/usr/local/bin/cpufreqctl.auto-cpufreq")
--
+-    if not IS_INSTALLED_WITH_SNAP and os.path.isfile("/usr/local/bin/cpufreqctl.auto-cpufreq"):
+-        os.remove("/usr/local/bin/cpufreqctl.auto-cpufreq")
 +    # no need to restore
 +    pass
  
- def footer(l=79):
-     print("\n" + "-" * l + "\n")
-@@ -441,30 +424,8 @@ def remove_complete_msg():
+ def footer(l=79): print("\n" + "-" * l + "\n")
  
+@@ -306,27 +300,8 @@ def remove_complete_msg():
+     footer()
  
  def deploy_daemon():
 -    print("\n" + "-" * 21 + " Deploying auto-cpufreq as a daemon " + "-" * 22 + "\n")
 -
--    # deploy cpufreqctl script func call
--    cpufreqctl()
+-    cpufreqctl() # deploy cpufreqctl script func call
 -
--    # turn off bluetooth on boot
--    bluetooth_disable()
+-    bluetooth_disable() # turn off bluetooth on boot
 -
 -    auto_cpufreq_stats_path.touch(exist_ok=True)
 -
 -    print("\n* Deploy auto-cpufreq install script")
--    shutil.copy(SCRIPTS_DIR / "auto-cpufreq-install.sh", "/usr/local/bin/auto-cpufreq-install")
+-    copy(SCRIPTS_DIR / "auto-cpufreq-install.sh", "/usr/local/bin/auto-cpufreq-install")
 -
 -    print("\n* Deploy auto-cpufreq remove script")
--    shutil.copy(SCRIPTS_DIR / "auto-cpufreq-remove.sh", "/usr/local/bin/auto-cpufreq-remove")
+-    copy(SCRIPTS_DIR / "auto-cpufreq-remove.sh", "/usr/local/bin/auto-cpufreq-remove")
 -
 -    # output warning if gnome power profile is running
 -    gnome_power_detect_install()
 -    gnome_power_svc_disable()
 -
--    # output warning if TLP service is detected
--    tlp_service_detect()
+-    tlp_service_detect() # output warning if TLP service is detected
 -
 -    call("/usr/local/bin/auto-cpufreq-install", shell=True)
 +    # prevent needless copying and system changes
 +    pass
  
- 
  def deploy_daemon_performance():
-@@ -504,40 +465,7 @@ def deploy_daemon_performance():
+     print("\n" + "-" * 21 + " Deploying auto-cpufreq as a daemon (performance) " + "-" * 22 + "\n")
+@@ -359,34 +334,7 @@ def deploy_daemon_performance():
+     call("/usr/local/bin/auto-cpufreq-install", shell=True)
  
- # remove auto-cpufreq daemon
  def remove_daemon():
--
 -    # check if auto-cpufreq is installed
 -    if not os.path.exists("/usr/local/bin/auto-cpufreq-remove"):
 -        print("\nauto-cpufreq daemon is not installed.\n")
@@ -130,8 +115,7 @@ index 58cedb7..c50b0e1 100755
 -
 -    print("\n" + "-" * 21 + " Removing auto-cpufreq daemon " + "-" * 22 + "\n")
 -
--    # turn on bluetooth on boot
--    bluetooth_enable()
+-    bluetooth_enable() # turn on bluetooth on boot
 -
 -    # output warning if gnome power profile is stopped
 -    gnome_power_rm_reminder()
@@ -144,19 +128,15 @@ index 58cedb7..c50b0e1 100755
 -    os.remove("/usr/local/bin/auto-cpufreq-remove")
 -
 -    # delete override pickle if it exists
--    if os.path.exists(governor_override_state):
--        os.remove(governor_override_state)
+-    if os.path.exists(governor_override_state):  os.remove(governor_override_state)
 -
 -    # delete stats file
 -    if auto_cpufreq_stats_path.exists():
--        if auto_cpufreq_stats_file is not None:
--            auto_cpufreq_stats_file.close()
--
+-        if auto_cpufreq_stats_file is not None: auto_cpufreq_stats_file.close()
 -        auto_cpufreq_stats_path.unlink()
 -
--    # restore original cpufrectl script
--    cpufreqctl_restore()
+-    cpufreqctl_restore() # restore original cpufrectl script
 +    pass
  
- 
  def gov_check():
+     for gov in AVAILABLE_GOVERNORS:

pkgs/by-name/au/auto-cpufreq/prevent-update.patch

@@ -1,10 +1,10 @@
-diff --git a/auto_cpufreq/bin/auto_cpufreq.py b/auto_cpufreq/bin/auto_cpufreq.py
-index 4343b8d..183c2e9 100755
---- a/auto_cpufreq/bin/auto_cpufreq.py
-+++ b/auto_cpufreq/bin/auto_cpufreq.py
-@@ -235,47 +235,7 @@ def main(config, daemon, debug, update, install, remove, live, log, monitor, sta
-                 remove_daemon()
-                 remove_complete_msg()
+diff --git c/auto_cpufreq/bin/auto_cpufreq.py i/auto_cpufreq/bin/auto_cpufreq.py
+index 7192366..0bf087e 100755
+--- c/auto_cpufreq/bin/auto_cpufreq.py
++++ i/auto_cpufreq/bin/auto_cpufreq.py
+@@ -149,41 +149,7 @@ def main(monitor, live, daemon, install, update, remove, force, config, stats, g
+                 deploy_daemon()
+             deploy_complete_msg()
          elif update:
 -            root_check()
 -            custom_dir = "/opt/auto-cpufreq/source"
@@ -16,27 +16,22 @@ index 4343b8d..183c2e9 100755
 -            if "--update" in sys.argv:
 -                update = True
 -                sys.argv.remove("--update")
--                if len(sys.argv) == 2:
--                    custom_dir = sys.argv[1] 
+-                if len(sys.argv) == 2: custom_dir = sys.argv[1] 
 -                    
--            if os.getenv("PKG_MARKER") == "SNAP":
+-            if IS_INSTALLED_WITH_SNAP:
 -                print("Detected auto-cpufreq was installed using snap")
 -                # refresh snap directly using this command
 -                # path wont work in this case
 -
 -                print("Please update using snap package manager, i.e: `sudo snap refresh auto-cpufreq`.")
 -                #check for AUR 
--            elif subprocess.run(["bash", "-c", "command -v pacman >/dev/null 2>&1"]).returncode == 0 and subprocess.run(["bash", "-c", "pacman -Q auto-cpufreq >/dev/null 2>&1"]).returncode == 0:
--                print("Arch-based distribution with AUR support detected. Please refresh auto-cpufreq using your AUR helper.")
+-            elif IS_INSTALLED_WITH_AUR: print("Arch-based distribution with AUR support detected. Please refresh auto-cpufreq using your AUR helper.")
 -            else:
 -                is_new_update = check_for_update()
--                if not is_new_update:
--                    return
+-                if not is_new_update: return
 -                ans = input("Do you want to update auto-cpufreq to the latest release? [Y/n]: ").strip().lower()
--                if not os.path.exists(custom_dir):
--                    os.makedirs(custom_dir)
--                if os.path.exists(os.path.join(custom_dir, "auto-cpufreq")):
--                    shutil.rmtree(os.path.join(custom_dir, "auto-cpufreq"))
+-                if not os.path.exists(custom_dir): os.makedirs(custom_dir)
+-                if os.path.exists(os.path.join(custom_dir, "auto-cpufreq")): rmtree(os.path.join(custom_dir, "auto-cpufreq"))
 -                if ans in ['', 'y', 'yes']:
 -                    remove_daemon()
 -                    remove_complete_msg()
@@ -45,28 +40,28 @@ index 4343b8d..183c2e9 100755
 -                    run(["auto-cpufreq", "--install"])
 -                    print("auto-cpufreq is installed with the latest version")
 -                    run(["auto-cpufreq", "--version"])
--                else:
--                    print("Aborted")
+-                else: print("Aborted")
 +            print("update is disabled in the nix package")
- 
-         elif completions:
-             if completions == "bash":
-diff --git a/auto_cpufreq/core.py b/auto_cpufreq/core.py
-index 58cedb7..8b44712 100755
---- a/auto_cpufreq/core.py
-+++ b/auto_cpufreq/core.py
-@@ -17,8 +17,7 @@ import importlib.metadata
- from math import isclose
+         elif remove:
+             root_check()
+             if IS_INSTALLED_WITH_SNAP:
+diff --git c/auto_cpufreq/core.py i/auto_cpufreq/core.py
+index b51d55d..99eeed8 100755
+--- c/auto_cpufreq/core.py
++++ i/auto_cpufreq/core.py
+@@ -7,9 +7,8 @@ from math import isclose
  from pathlib import Path
- from shutil import which
--from subprocess import getoutput, call, run, check_output, DEVNULL
--import requests
-+from subprocess import getoutput, call, run, DEVNULL
- import re
+ from pickle import dump, load
+ from re import search
+-from requests import get, exceptions
+ from shutil import copy
+-from subprocess import call, check_output, DEVNULL, getoutput, run
++from subprocess import call, DEVNULL, getoutput, run
+ from time import sleep
+ from warnings import filterwarnings
  
- # execution timestamp used in countdown func
-@@ -158,55 +157,7 @@ def app_version():
-             pass
+@@ -105,49 +104,7 @@ def app_version():
+         except Exception as e: print(repr(e))
  
  def check_for_update():
 -    # returns True if a new release is available from the GitHub repo
@@ -74,21 +69,19 @@ index 58cedb7..8b44712 100755
 -    # Specify the repository and package name
 -    # IT IS IMPORTANT TO  THAT IF THE REPOSITORY STRUCTURE IS CHANGED, THE FOLLOWING FUNCTION NEEDS TO BE UPDATED ACCORDINGLY
 -    # Fetch the latest release information from GitHub API
--    latest_release_url = f"https://api.github.com/repos/AdnanHodzic/auto-cpufreq/releases/latest"
+-    latest_release_url = GITHUB.replace("github.com", "api.github.com/repos") + "/releases/latest"
 -    try:
--        response = requests.get(latest_release_url)
--        if response.status_code == 200:
--            latest_release = response.json()
+-        response = get(latest_release_url)
+-        if response.status_code == 200: latest_release = response.json()
 -        else:
 -            message = response.json().get("message")
 -            print("Error fetching recent release!")
 -            if message is not None and message.startswith("API rate limit exceeded"):
 -                print("GitHub Rate limit exceeded. Please try again later within 1 hour or use different network/VPN.")
--            else:
--                print("Unexpected status code:", response.status_code)
+-            else: print("Unexpected status code:", response.status_code)
 -            return False
--    except (requests.exceptions.ConnectionError, requests.exceptions.Timeout,
--            requests.exceptions.RequestException, requests.exceptions.HTTPError) as err:
+-    except (exceptions.ConnectionError, exceptions.Timeout,
+-            exceptions.RequestException, exceptions.HTTPError):
 -        print("Error Connecting to server!")
 -        return False
 -
@@ -98,8 +91,7 @@ index 58cedb7..8b44712 100755
 -        # Get the current version of auto-cpufreq
 -        # Extract version number from the output string
 -        output = check_output(['auto-cpufreq', '--version']).decode('utf-8')
--        try:
--            version_line = next((re.search(r'\d+\.\d+\.\d+', line).group() for line in output.split('\n') if line.startswith('auto-cpufreq version')), None)
+-        try: version_line = next((search(r'\d+\.\d+\.\d+', line).group() for line in output.split('\n') if line.startswith('auto-cpufreq version')), None)
 -        except AttributeError:
 -            print("Error Retrieving Current Version!")
 -            exit(1)
@@ -113,40 +105,31 @@ index 58cedb7..8b44712 100755
 -            print(f"Updates are available,\nCurrent version: {installed_version}\nLatest version: {latest_version}")
 -            print("Note that your previous custom settings might be erased with the following update")
 -            return True
--    else:
--        # Handle the case where "tag_name" key doesn't exist
--        print("Malformed Released data!\nReinstall manually or Open an issue on GitHub for help!")
--
--
+-    # Handle the case where "tag_name" key doesn't exist
+-    else: print("Malformed Released data!\nReinstall manually or Open an issue on GitHub for help!")
 +    pass
  
  def new_update(custom_dir):
      os.chdir(custom_dir)
-diff --git a/poetry.lock b/poetry.lock
-index 2a99ca6..9bc26e2 100644
---- a/poetry.lock
-+++ b/poetry.lock
-@@ -1,4 +1,4 @@
--# This file is automatically @generated by Poetry 1.8.2 and should not be changed by hand.
-+# This file is automatically @generated by Poetry 1.8.3 and should not be changed by hand.
- 
- [[package]]
- name = "attrs"
-@@ -1300,4 +1300,4 @@ testing = ["big-O", "jaraco.functools", "jaraco.itertools", "more-itertools", "p
+diff --git c/poetry.lock i/poetry.lock
+index 0e6da84..b4936fe 100644
+--- c/poetry.lock
++++ i/poetry.lock
+@@ -1306,4 +1306,4 @@ test = ["big-O", "jaraco.functools", "jaraco.itertools", "jaraco.test", "more-it
  [metadata]
  lock-version = "2.0"
  python-versions = "^3.8"
--content-hash = "ee73b2db6a43cac87120f38c93d0a8a297bec52f1346b55bc0ca2992aa464482"
-+content-hash = "1ba0c404ffea01a611e7c74f9c104de44a914b0a6fad2350470f15880931ae42"
-diff --git a/pyproject.toml b/pyproject.toml
-index 876d80c..7190356 100644
---- a/pyproject.toml
-+++ b/pyproject.toml
+-content-hash = "cad3783d04e35b66b241352e76631d0a83c8df3d286b113979ba34a65847f06c"
++content-hash = "b21af52156d2d624602fe6941cf001abd7f8cf5b70b22ebfd7b7ad0dece1e39f"
+diff --git c/pyproject.toml i/pyproject.toml
+index 562a94b..cc44d8d 100644
+--- c/pyproject.toml
++++ i/pyproject.toml
 @@ -25,7 +25,6 @@ python = "^3.8"
- psutil = {git = "https://github.com/giampaolo/psutil.git", rev = "4cf56e08c1bc883ec89758834b50954380759858"}
+ psutil = "^6.0.0"
  click = "^8.1.0"
  distro = "^1.8.0"
--requests = "^2.31.0"
+-requests = "^2.32.3"
  PyGObject = "^3.46.0"
  pyinotify = {git = "https://github.com/shadeyg56/pyinotify-3.12"}
  

pkgs/by-name/do/docfd/package.nix

@@ -21,7 +21,7 @@ let
 in
 buildDunePackage' rec {
   pname = "docfd";
-  version = "8.0.1";
+  version = "8.0.2";
 
   minimalOCamlVersion = "5.1";
 
@@ -29,7 +29,7 @@ buildDunePackage' rec {
     owner = "darrenldl";
     repo = "docfd";
     rev = version;
-    hash = "sha256-0VeUT9i3/eEA64XsrpUi3oXyrinEFSJWzsEXrsUly30=";
+    hash = "sha256-A4feBRZs9EFpfgbGGcaKlwAz59RbKuPZAVJytgYVUAc=";
   };
 
   nativeBuildInputs = [

pkgs/by-name/li/libtorrent/package.nix

@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation {
   pname = "rakshasa-libtorrent";
-  version = "0.13.8-unstable-2024-08-21";
+  version = "0.13.8-unstable-2024-09-01";
 
   src = fetchFromGitHub {
     owner = "rakshasa";
     repo = "libtorrent";
-    rev = "96cb7e53f4b9f1bccf722627b9736fab85424082";
-    hash = "sha256-IxQ9YA6i7FBu92oswIcHk4G6lI+uduUzVzCs9v+b5NI=";
+    rev = "ca6eed1c7e7985016689004eaeed2fb2a119e5f8";
+    hash = "sha256-Hu0/T5NG7h+COLoOsfi2Uy0BVUPiEhkMhUhFo/JqZq0=";
   };
 
   nativeBuildInputs = [

pkgs/by-name/mi/misconfig-mapper/package.nix

@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "misconfig-mapper";
-  version = "1.8.3";
+  version = "1.8.4";
 
   src = fetchFromGitHub {
     owner = "intigriti";
     repo = "misconfig-mapper";
     rev = "refs/tags/v${version}";
-    hash = "sha256-1ggiNO5ZYYmV44ub80IpzsHCcsEYhRlWcZtX012hJxQ=";
+    hash = "sha256-zg7OBHrveBmsljUJUE0/kz3AkIbUtTHf64BQbROUXsQ=";
   };
 
-  vendorHash = "sha256-hx03o4LaqFNylStCkt/MFtgwvsOZFFcEC/c54g1kCNk=";
+  vendorHash = "sha256-aABtsS39yxBBFMN98fjr4gy6QeF3dobrZqeZmmv2ywQ=";
 
   ldflags = [
     "-s"

pkgs/by-name/op/open-webui/package.nix

@@ -7,19 +7,19 @@
 }:
 let
   pname = "open-webui";
-  version = "0.3.20";
+  version = "0.3.21";
 
   src = fetchFromGitHub {
     owner = "open-webui";
     repo = "open-webui";
     rev = "refs/tags/v${version}";
-    hash = "sha256-bzNwqUrFbU0Llew2den8ETDUDJ7HdGCwvSvbFFhAOFo=";
+    hash = "sha256-b+r+nEv+9IM56KkCi9tZqnEbyCX69mFhp0Be5/9lR9c=";
   };
 
   frontend = buildNpmPackage {
     inherit pname version src;
 
-    npmDepsHash = "sha256-ejXQO2dwztyMBDUIlavJzflulXmV938SF5Do0sdQGAY=";
+    npmDepsHash = "sha256-LH07LzYZpVzRAvkjoTgt7LJdXZZoDMt//ZAl30z7AHw=";
 
     # Disabling `pyodide:fetch` as it downloads packages during `buildPhase`
     # Until this is solved, running python packages from the browser will not work.

pkgs/development/libraries/libevent/default.nix

@@ -2,6 +2,8 @@
 , updateAutotoolsGnuConfigScriptsHook
 , sslSupport ? true, openssl
 , fetchpatch
+
+, static ? stdenv.hostPlatform.isStatic
 }:
 
 stdenv.mkDerivation rec {
@@ -21,7 +23,10 @@ stdenv.mkDerivation rec {
     })
   ];
 
-  configureFlags = lib.optional (!sslSupport) "--disable-openssl";
+  configureFlags = lib.flatten [
+    (lib.optional (!sslSupport) "--disable-openssl")
+    (lib.optionals static ["--disable-shared" "--with-pic"])
+  ];
 
   preConfigure = lib.optionalString (lib.versionAtLeast stdenv.hostPlatform.darwinMinVersion "11") ''
     MACOSX_DEPLOYMENT_TARGET=10.16

pkgs/development/libraries/yaml-cpp/default.nix

@@ -3,6 +3,7 @@
 , fetchFromGitHub
 , gitUpdater
 , cmake
+, static ? stdenv.hostPlatform.isStatic
 }:
 
 stdenv.mkDerivation rec {
@@ -24,7 +25,7 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = [
     "-DYAML_CPP_BUILD_TOOLS=false"
-    "-DYAML_BUILD_SHARED_LIBS=${lib.boolToString (!stdenv.hostPlatform.isStatic)}"
+    (lib.cmakeBool "YAML_BUILD_SHARED_LIBS" (!static))
     "-DINSTALL_GTEST=false"
   ];
 

pkgs/development/node-packages/overrides.nix

@@ -210,7 +210,7 @@ final: prev: {
       version = esbuild-version;
       src = fetchurl {
         url = "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-${esbuild-version}.tgz";
-        sha512 = "sha512-1rYdTpyv03iycF1+BhzrzQJCdOuAOtaqHTWJZCWvijKD2N5Xu0TtVC8/+1faWqcP9iBCWOmjmhoH94dH82BxPQ==";
+        sha512 = "sha512-EV6+ovTsEXCPAp58g2dD68LxoP/wK5pRvgy0J/HxPGB009omFPv3Yet0HiaqvrIrgPTBuC6wCH1LTOY91EO5hQ==";
       };
     };
     esbuild-linux-arm64 = {
@@ -219,7 +219,7 @@ final: prev: {
       version = esbuild-version;
       src = fetchurl {
         url = "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-${esbuild-version}.tgz";
-        sha512 = "sha512-9pb6rBjGvTFNira2FLIWqDk/uaf42sSyLE8j1rnUpuzsODBq7FvpwHYZxQ/It/8b+QOS1RYfqgGFNLRI+qlq2A==";
+        sha512 = "sha512-/93bf2yxencYDnItMYV/v116zff6UyTjo4EtEQjUBeGiVpMmffDNUyD9UN2zV+V3LRV3/on4xdZ26NKzn6754g==";
       };
     };
     esbuild-darwin-x64 = {
@@ -228,7 +228,7 @@ final: prev: {
       version = esbuild-version;
       src = fetchurl {
         url = "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-${esbuild-version}.tgz";
-        sha512 = "sha512-se/JjF8NlmKVG4kNIuyWMV/22ZaerB+qaSi5MdrXtd6R08kvs2qCN4C09miupktDitvh8jRFflwGFBQcxZRjbw==";
+        sha512 = "sha512-aClqdgTDVPSEGgoCS8QDG37Gu8yc9lTHNAQlsztQ6ENetKEO//b8y31MMu2ZaPbn4kVsIABzVLXYLhCGekGDqw==";
       };
     };
     esbuild-darwin-arm64 = {
@@ -237,7 +237,7 @@ final: prev: {
       version = esbuild-version;
       src = fetchurl {
         url = "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-${esbuild-version}.tgz";
-        sha512 = "sha512-DwqXqZyuk5AiWWf3UfLiRDJ5EDd49zg6O9wclZ7kUMv2WRFr4HKjXp/5t8JZ11QbQfUS6/cRCKGwYhtNAY88kQ==";
+        sha512 = "sha512-YsS2e3Wtgnw7Wq53XXBLcV6JhRsEq8hkfg91ESVadIrzr9wO6jJDMZnCQbHm1Guc5t/CdDiFSSfWP58FNuvT3Q==";
       };
     };
   in{

pkgs/development/python-modules/aioairzone/default.nix

@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "aioairzone";
-  version = "0.8.2";
+  version = "0.9.0";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -18,12 +18,12 @@ buildPythonPackage rec {
     owner = "Noltari";
     repo = "aioairzone";
     rev = "refs/tags/${version}";
-    hash = "sha256-v/fLWsaVxgKa70X6Lac4ieVU3l3jhIWphWDtLPUZwlA=";
+    hash = "sha256-32fd4+y3EICVesrtSZUf/jYUEIqvPPnSp4hrpgXZoxU=";
   };
 
-  nativeBuildInputs = [ setuptools ];
+  build-system = [ setuptools ];
 
-  propagatedBuildInputs = [ aiohttp ];
+  dependencies = [ aiohttp ];
 
   # Module has no tests
   doCheck = false;
@@ -34,7 +34,7 @@ buildPythonPackage rec {
     description = "Module to control AirZone devices";
     homepage = "https://github.com/Noltari/aioairzone";
     changelog = "https://github.com/Noltari/aioairzone/releases/tag/${version}";
-    license = with licenses; [ asl20 ];
+    license = licenses.asl20;
     maintainers = with maintainers; [ fab ];
   };
 }

pkgs/development/python-modules/aiortm/default.nix

@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "aiortm";
-  version = "0.8.22";
+  version = "0.8.27";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     owner = "MartinHjelmare";
     repo = "aiortm";
     rev = "refs/tags/v${version}";
-    hash = "sha256-9owFyqkeCdOAb0erD8wNPAwF5qNPLpISNGjfMdUorPk=";
+    hash = "sha256-87v1A2FlgM4z0jv4Ii9/ZO3DcLYDAFpnlI5r+UVmzzA=";
   };
 
   postPatch = ''

pkgs/development/python-modules/aiosmb/default.nix

@@ -10,6 +10,7 @@
   prompt-toolkit,
   pycryptodomex,
   pythonOlder,
+  setuptools,
   six,
   tqdm,
   winacl,
@@ -18,17 +19,19 @@
 
 buildPythonPackage rec {
   pname = "aiosmb";
-  version = "0.4.10";
-  format = "setuptools";
+  version = "0.4.11";
+  pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-uN5lbhuPt9axp2ZTTxDgHuDRwlQjXANEkGPgQJL1o90=";
+    hash = "sha256-bWb1HtI1T3byBmE+rA1j83z9ntRL6figZZTUECRCc9c=";
   };
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     asyauth
     asysocks
     colorama
@@ -51,7 +54,7 @@ buildPythonPackage rec {
     description = "Python SMB library";
     homepage = "https://github.com/skelsec/aiosmb";
     changelog = "https://github.com/skelsec/aiosmb/releases/tag/${version}";
-    license = with licenses; [ mit ];
+    license = licenses.mit;
     maintainers = with maintainers; [ fab ];
   };
 }

pkgs/development/python-modules/llama-index-agent-openai/default.nix

@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "llama-index-agent-openai";
-  version = "0.3.0";
+  version = "0.3.1";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "llama_index_agent_openai";
     inherit version;
-    hash = "sha256-2t5w6LmHGU16+2kl9yMGDp9JU+sTRADaL81M7t8sPf8=";
+    hash = "sha256-QcmqW3zrxQQ63ds0QuMWfpeXFYlGbjZEjgTgp2f1uao=";
   };
 
   pythonRelaxDeps = [ "llama-index-llms-openai" ];

pkgs/development/python-modules/llama-index-core/default.nix

@@ -47,7 +47,7 @@ in
 
 buildPythonPackage rec {
   pname = "llama-index-core";
-  version = "0.11.3";
+  version = "0.11.7";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -56,7 +56,7 @@ buildPythonPackage rec {
     owner = "run-llama";
     repo = "llama_index";
     rev = "refs/tags/v${version}";
-    hash = "sha256-bgkuX7ukN7aEnaUyIbPQ7FoUtsUT9Tq326RQgXNnOpg=";
+    hash = "sha256-48cx+hquZCjAEIp40cO1jM5wMwKQ1PNQftuwmJBnHVQ=";
   };
 
   sourceRoot = "${src.name}/${pname}";

pkgs/development/python-modules/llama-index-embeddings-openai/default.nix

@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "llama-index-embeddings-openai";
-  version = "0.2.3";
+  version = "0.2.4";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "llama_index_embeddings_openai";
     inherit version;
-    hash = "sha256-L3re9rYf1PG+pIcWb/ml/wYyJ2hrfbtdIifkZFCn7Ew=";
+    hash = "sha256-CeJf+5Rt0fld8VAXI23kV4GoONzmVJhVnQdTxy7/5hc=";
   };
 
   build-system = [ poetry-core ];

pkgs/development/python-modules/llama-index-llms-ollama/default.nix

@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "llama-index-llms-ollama";
-  version = "0.3.0";
+  version = "0.3.1";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "llama_index_llms_ollama";
     inherit version;
-    hash = "sha256-nfL+cUwdw6zPc8J81dCEFoLpcCIKMBNNeCXkzvZgsdQ=";
+    hash = "sha256-8fHR/p6H0LN5BZno0lEz6et+hgRVGYJ9wIHfNLXvcDQ=";
   };
 
   build-system = [ poetry-core ];

pkgs/development/python-modules/llama-index-llms-openai/default.nix

@@ -3,13 +3,14 @@
   buildPythonPackage,
   fetchPypi,
   llama-index-core,
+  openai,
   poetry-core,
   pythonOlder,
 }:
 
 buildPythonPackage rec {
   pname = "llama-index-llms-openai";
-  version = "0.2.0";
+  version = "0.2.3";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -17,12 +18,20 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "llama_index_llms_openai";
     inherit version;
-    hash = "sha256-E8hdTPEr0Hueq5gFy8Qt+y410N/J3CZyDt0b3xwRKlQ=";
+    hash = "sha256-6Rc7QwMxeRxqWp3xZ5ZDeuSjriR/1ODygffL5ZJYsHo=";
   };
 
+  pythonRemoveDeps = [
+    # Circular dependency
+    "llama-index-agent-openai"
+  ];
+
   build-system = [ poetry-core ];
 
-  dependencies = [ llama-index-core ];
+  dependencies = [
+    llama-index-core
+    openai
+  ];
 
   # Tests are only available in the mono repo
   doCheck = false;

pkgs/development/python-modules/llama-index-readers-file/default.nix

@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "llama-index-readers-file";
-  version = "0.2.0";
+  version = "0.2.1";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "llama_index_readers_file";
     inherit version;
-    hash = "sha256-Vdt8MWZrqyst0vdi1iLy3I5zkzlDyS+IOIaKkB5QVwg=";
+    hash = "sha256-x/kgdISfxZsQBJ1JakrlJmmr/LFZoZnZoROFKi/tcLg=";
   };
 
   pythonRelaxDeps = [

pkgs/development/python-modules/llama-index-readers-llama-parse/default.nix

@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "llama-index-readers-llama-parse";
-  version = "0.2.0";
+  version = "0.3.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "llama_index_readers_llama_parse";
     inherit version;
-    hash = "sha256-xU6KIH1z77nwEWNqMKTBB2tD13o00lY9N03GfAzd/IM=";
+    hash = "sha256-pf6toIlXFNzEHWXdUSwcOM9w2K4ZlHz/grgNWOaqNn4=";
   };
 
   pythonRelaxDeps = [ "llama-parse" ];

pkgs/development/python-modules/llama-parse/default.nix

@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "llama-parse";
-  version = "0.5.1";
+  version = "0.5.2";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "llama_parse";
     inherit version;
-    hash = "sha256-IGw0gUeR6WRNrtDaD61QTctrbVK9pUKoe8CB7aknAKA=";
+    hash = "sha256-7ER3jp+KOKG4gZp82tIKtEJi1QZD2l2K2zi5VUfzMEc=";
   };
 
   build-system = [ poetry-core ];

pkgs/development/python-modules/private-gpt/default.nix

@@ -1,51 +1,56 @@
 {
   lib,
   buildPythonPackage,
-  python,
   fetchFromGitHub,
+  fetchurl,
+
+  # build-system
   poetry-core,
+
+  # dependencies
+  docx2txt,
   fastapi,
   injector,
   llama-index-core,
   llama-index-readers-file,
-  huggingface-hub,
   python-multipart,
   pyyaml,
   transformers,
   uvicorn,
   watchdog,
+
+  # optional-dependencies
+  python,
+  huggingface-hub,
   gradio,
-  fetchurl,
-  fetchpatch,
+
+  # tests
   nixosTests,
 }:
 
 buildPythonPackage rec {
   pname = "private-gpt";
-  version = "0.5.0";
+  version = "0.6.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "zylon-ai";
     repo = "private-gpt";
-    rev = "v${version}";
-    hash = "sha256-bjydzJhOJjmbflcJbuMyNsmby7HtNPFW3MY2Tw12cHw=";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-IYTysU3W/NrtBuLe3ZJkztVSK+gzjkGIg0qcBYzB3bs=";
   };
 
-  patches = [
-    # Fix a vulnerability, to be removed in the next bump version
-    # See https://github.com/zylon-ai/private-gpt/pull/1890
-    (fetchpatch {
-      url = "https://github.com/zylon-ai/private-gpt/commit/86368c61760c9cee5d977131d23ad2a3e063cbe9.patch";
-      hash = "sha256-4ysRUuNaHW4bmNzg4fn++89b430LP6AzYDoX2HplVH0=";
-    })
-  ];
-
   build-system = [ poetry-core ];
 
-  pythonRelaxDeps = [ "fastapi" ];
+  pythonRelaxDeps = [
+    "cryptography"
+    "fastapi"
+    "llama-index-core"
+    "llama-index-readers-file"
+  ];
 
   dependencies = [
+    docx2txt
     fastapi
     injector
     llama-index-core
@@ -55,7 +60,7 @@ buildPythonPackage rec {
     transformers
     uvicorn
     watchdog
-  ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies);
+  ] ++ lib.flatten (builtins.attrValues optional-dependencies);
 
   # This is needed for running the tests and the service in offline mode,
   # See related issue at https://github.com/zylon-ai/private-gpt/issues/1870
@@ -64,7 +69,7 @@ buildPythonPackage rec {
     hash = "sha256-Ijkht27pm96ZW3/3OFE+7xAPtR0YyTWXoRO8/+hlsqc=";
   };
 
-  passthru.optional-dependencies = with python.pkgs; {
+  optional-dependencies = with python.pkgs; {
     embeddings-huggingface = [
       huggingface-hub
       llama-index-embeddings-huggingface
@@ -98,6 +103,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/zylon-ai/private-gpt";
     license = lib.licenses.asl20;
     mainProgram = "private-gpt";
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ GaetanLepage ];
   };
 }

pkgs/development/python-modules/qcs-api-client/default.nix

@@ -15,6 +15,7 @@
   python-dateutil,
   pythonAtLeast,
   pythonOlder,
+  tenacity,
   respx,
   retrying,
   rfc3339,
@@ -23,7 +24,7 @@
 
 buildPythonPackage rec {
   pname = "qcs-api-client";
-  version = "0.25.3";
+  version = "0.25.5";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -32,7 +33,7 @@ buildPythonPackage rec {
     owner = "rigetti";
     repo = "qcs-api-client-python";
     rev = "refs/tags/v${version}";
-    hash = "sha256-MkM7cRgDGjW8nh4JOqH0aKKlTV5qpQDLCR5kGfdKp2A=";
+    hash = "sha256-fVUvAXtZcMWBBK0wdGJA0oIneCNKI4GI2qNIc30HU9M=";
   };
 
   patches = [
@@ -64,6 +65,7 @@ buildPythonPackage rec {
     python-dateutil
     retrying
     rfc3339
+    tenacity
     toml
   ];
 

pkgs/development/python-modules/types-awscrt/default.nix

@@ -2,24 +2,24 @@
   lib,
   buildPythonPackage,
   fetchPypi,
-  poetry-core,
   pythonOlder,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "types-awscrt";
-  version = "0.21.2";
+  version = "0.21.5";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
+  disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     pname = "types_awscrt";
     inherit version;
-    hash = "sha256-hKn09CLsUlwxT99Uwjoec+37zsloVglDyi1Bz65iOzg=";
+    hash = "sha256-n39H3mh5nLK8ueSG9I13ufWJYrkvukPLiGDacLPFfRs=";
   };
 
-  build-system = [ poetry-core ];
+  build-system = [ setuptools ];
 
   pythonImportsCheck = [ "awscrt-stubs" ];
 

pkgs/development/python-modules/types-beautifulsoup4/default.nix

@@ -8,12 +8,12 @@
 
 buildPythonPackage rec {
   pname = "types-beautifulsoup4";
-  version = "4.12.0.20240511";
+  version = "4.12.0.20240907";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-AE9glv3YOxnNv2yxDk6uV7ECBezMNl0Kadd9qDYBLig=";
+    hash = "sha256-jQI7hlMJIgcEF6HUxNkWeKsP8kObOyss/6O2KLSeurE=";
   };
 
   build-system = [ setuptools ];

pkgs/development/python-modules/types-markdown/default.nix

@@ -7,13 +7,13 @@
 
 buildPythonPackage rec {
   pname = "types-markdown";
-  version = "3.6.0.20240316";
+  version = "3.7.0.20240822";
   pyproject = true;
 
   src = fetchPypi {
     pname = "types-Markdown";
     inherit version;
-    hash = "sha256-3p+4SGC1W2R7FwyldolfzKYbk0puzcZcMZMsZ5W0QLg=";
+    hash = "sha256-GDVXyfT4Zb3v2PX5ajgUXDGBknHN4RHTVVfDvSBp540=";
   };
 
   nativeBuildInputs = [ setuptools ];

pkgs/development/tools/rust/cargo-insta/default.nix

@@ -5,20 +5,23 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-insta";
-  # use stable release once 1.40 lands
-  version = "1.39-unstable-2024-08-22";
+  version = "1.40";
 
   src = fetchFromGitHub {
     owner = "mitsuhiko";
     repo = "insta";
-    rev = "abb6ba50163fb9093fa79c2fb784a57e08b2fcc0";
-    hash = "sha256-465xY68M00lBM+3pz8FIXkBXnRrMi4wbBRieYHz0w+s=";
+    rev = "83f33653b687c84823fe6af00806107e1dd4f4b8";
+    hash = "sha256-eau5h75oZpxufTrf0fLHfr+3TIOFXB/kSgHX+o2GtiE=";
   };
 
-  cargoHash = "sha256-2mf9GJ1BtZE1k9jIdFmjiK1KfQ9qPkeSABT8X7G+p9I=";
+  cargoHash = "sha256-OqM8SERSWHtbvW6SZfM7lOrQZu66uzsv5wiD3Iqaf3s=";
 
+  checkFlags = [
   # Depends on `rustfmt` and does not matter for packaging.
-  checkFlags = [ "--skip=utils::test_format_rust_expression" ];
+  "--skip=utils::test_format_rust_expression"
+  # Requires networking
+  "--skip=test_force_update_snapshots"
+  ];
 
   meta = with lib; {
     description = "Cargo subcommand for snapshot testing";

pkgs/os-specific/linux/dcgm/default.nix

@@ -16,18 +16,10 @@
 , symlinkJoin
 , tclap_1_4
 , yaml-cpp
+
+, static ? gcc11Stdenv.hostPlatform.isStatic
 }:
 let
-  # Flags copied from DCGM's libevent build script
-  libevent-nossl = libevent.override { sslSupport = false; };
-  libevent-nossl-static = libevent-nossl.overrideAttrs (super: {
-    CFLAGS = "-Wno-cast-function-type -Wno-implicit-fallthrough -fPIC";
-    CXXFLAGS = "-Wno-cast-function-type -Wno-implicit-fallthrough -fPIC";
-    configureFlags = super.configureFlags ++ [ "--disable-shared" "--with-pic" ];
-  });
-
-  jsoncpp-static = jsoncpp.override { enableStatic = true; };
-
   # DCGM depends on 3 different versions of CUDA at the same time.
   # The runtime closure, thankfully, is quite small because most things
   # are statically linked.
@@ -86,13 +78,13 @@ let
 # C.f. https://github.com/NVIDIA/DCGM/blob/7e1012302679e4bb7496483b32dcffb56e528c92/dcgmbuild/build.sh#L22
 in gcc11Stdenv.mkDerivation rec {
   pname = "dcgm";
-  version = "3.2.5"; # N.B: If you change this, be sure prometheus-dcgm-exporter supports this version.
+  version = "3.3.5"; # N.B: If you change this, be sure prometheus-dcgm-exporter supports this version.
 
   src = fetchFromGitHub {
     owner = "NVIDIA";
     repo = "DCGM";
     rev = "refs/tags/v${version}";
-    hash = "sha256-iMyYOr3dSpdRV2S/TlB/tEOAWYhK09373ZRbd5vzogQ=";
+    hash = "sha256-n/uWvgvxAGfr1X51XgtHfFGDOO5AMBSV5UWQQpsylpg=";
   };
 
   # Add our paths to the CUDA paths so FindCuda.cmake can find them.
@@ -117,14 +109,18 @@ in gcc11Stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
-    plog.dev # header-only
-    tclap_1_4 # header-only
-
+    # Header-only
     catch2
-    fmt_9
-    jsoncpp-static
-    libevent-nossl-static
-    yaml-cpp
+    plog.dev
+    tclap_1_4
+
+    # Dependencies that can be either static or dynamic.
+    (fmt_9.override { enableShared = !static; }) # DCGM's build uses the static outputs regardless of enableShared
+    (yaml-cpp.override { inherit static; stdenv = gcc11Stdenv; })
+
+    # TODO: Dependencies that DCGM's CMake hard-codes to be static-only.
+    (jsoncpp.override { enableStatic = true; })
+    (libevent.override { sslSupport = false; static = true; })
   ];
 
   disallowedReferences = lib.concatMap (x: x.pkgSet) cudaPackageSetByVersion;

pkgs/servers/monitoring/prometheus/dcgm-exporter/default.nix

@@ -3,31 +3,19 @@
 , fetchFromGitHub
 , autoAddDriverRunpath
 , dcgm
-, linuxPackages
 }:
 buildGoModule rec {
   pname = "dcgm-exporter";
 
   # The first portion of this version string corresponds to a compatible DCGM
   # version.
-  version = "3.2.5-3.1.7"; # N.B: If you change this, update dcgm as well to the matching version.
+  version = "3.3.5-3.4.0"; # N.B: If you change this, update dcgm as well to the matching version.
 
   src = fetchFromGitHub {
     owner = "NVIDIA";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-+Hviq+iu1LBcy2VwmCX5xOq1I/zevfydesVlrVorGOI=";
-  };
-
-  # Upgrade to go 1.17 during the vendoring FOD build because it fails otherwise.
-  overrideModAttrs = _: {
-    preBuild = ''
-      substituteInPlace go.mod --replace 'go 1.16' 'go 1.17'
-      go mod tidy
-    '';
-    postInstall = ''
-      cp go.mod "$out/go.mod"
-    '';
+    hash = "sha256-IOVPEK+9ogBZJYns2pTyJwHUBMN8JqG1THTJPvpCwdo=";
   };
 
   CGO_LDFLAGS = "-ldcgm";
@@ -40,12 +28,7 @@ buildGoModule rec {
   # symbols are available on startup.
   hardeningDisable = [ "bindnow" ];
 
-  # Copy the modified go.mod we got from the vendoring process.
-  preBuild = ''
-    cp vendor/go.mod go.mod
-  '';
-
-  vendorHash = "sha256-Fjvx15e/psxoqoS6c6GhiQfe7g2aI40EmPR26xLhrzg=";
+  vendorHash = "sha256-urKa0O8QZnM8cWjPcGVhoAWhx6fCdMmhRX0JOriRaig=";
 
   nativeBuildInputs = [
     autoAddDriverRunpath

pkgs/servers/web-apps/peering-manager/default.nix

@@ -19,6 +19,12 @@ python3.pkgs.buildPythonApplication rec {
 
   format = "other";
 
+  patches = [
+    # Fix compatibility with pyixapi 0.2.3
+    # https://github.com/peering-manager/peering-manager/commit/ee558ff66e467412942559a8a92252e3fc009920
+    ./fix-pyixapi-0.2.3-compatibility.patch
+  ];
+
   propagatedBuildInputs = with python3.pkgs; [
     django
     djangorestframework

pkgs/servers/web-apps/peering-manager/fix-pyixapi-0.2.3-compatibility.patch

@@ -0,0 +1,30 @@
+From ee558ff66e467412942559a8a92252e3fc009920 Mon Sep 17 00:00:00 2001
+From: Guillaume Mazoyer <guillaume@mazoyer.eu>
+Date: Wed, 21 Feb 2024 23:32:32 +0100
+Subject: [PATCH] Use pyixapi 0.2.3
+
+---
+diff --git a/extras/models/ixapi.py b/extras/models/ixapi.py
+index 65572c971e065e3deed69465a71a54b4e1372851..637a004043e0a044c65a5e37fbb2b3bf82965436 100644
+--- a/extras/models/ixapi.py
++++ b/extras/models/ixapi.py
+@@ -7,7 +7,6 @@
+ from django.db import models
+ from django.db.models import Q
+ from django.urls import reverse
+-from django.utils.timezone import make_aware
+ 
+ from peering_manager.models import ChangeLoggedModel
+ 
+@@ -117,9 +116,9 @@ def dial(self):
+         if auth:
+             # Save tokens if they've changed
+             self.access_token = api.access_token.encoded
+-            self.access_token_expiration = make_aware(api.access_token.expires_at)
++            self.access_token_expiration = api.access_token.expires_at
+             self.refresh_token = api.refresh_token.encoded
+-            self.refresh_token_expiration = make_aware(api.refresh_token.expires_at)
++            self.refresh_token_expiration = api.refresh_token.expires_at
+             self.save()
+ 
+         return api

pkgs/shells/zsh/zinit/default.nix

@@ -32,6 +32,9 @@ stdenvNoCC.mkDerivation rec {
     # find zmodules/ -type f -exec install -m 744 "{}" "$outdir/{}" \;
 
   '';
+  postInstall = ''
+    installManPage doc/zinit.1
+  '';
   #TODO:doc output
 
   meta = with lib; {