Merge master into staging-next

maintainers/maintainer-list.nix

@@ -20122,6 +20122,12 @@
     githubId = 69053978;
     name = "rogarb";
   };
+  RoGreat = {
+    email = "roguegreat@gmail.com";
+    github = "RoGreat";
+    githubId = 64620440;
+    name = "RoGreat";
+  };
   rohanssrao = {
     email = "rohanssrao@gmail.com";
     github = "rohanssrao";

nixos/modules/system/boot/loader/grub/install-grub.pl

@@ -3,7 +3,7 @@ use warnings;
 use Class::Struct;
 use XML::LibXML;
 use File::Basename;
-use File::Path;
+use File::Path qw(make_path);
 use File::stat;
 use File::Copy;
 use File::Copy::Recursive qw(rcopy pathrm);
@@ -37,7 +37,8 @@ sub readFile {
     my ($fn) = @_;
     # enable slurp mode: read entire file in one go
     local $/ = undef;
-    open my $fh, "<$fn" or return undef;
+    open my $fh, "<", $fn
+        or return;
     my $s = <$fh>;
     close $fh;
     # disable slurp mode
@@ -48,7 +49,7 @@ sub readFile {
 
 sub writeFile {
     my ($fn, $s) = @_;
-    open my $fh, ">$fn" or die "cannot create $fn: $!\n";
+    open my $fh, ">", $fn or die "cannot create $fn: $!\n";
     print $fh $s or die "cannot write to $fn: $!\n";
     close $fh or die "cannot close $fn: $!\n";
 }
@@ -98,7 +99,7 @@ $ENV{'PATH'} = get("path");
 
 print STDERR "updating GRUB 2 menu...\n";
 
-mkpath("$bootPath/grub", 0, 0700);
+make_path("$bootPath/grub", {  mode => 0700 });
 
 # Discover whether the bootPath is on the same filesystem as / and
 # /nix/store.  If not, then all kernels and initrds must be copied to
@@ -438,7 +439,7 @@ $conf .= "$extraConfig\n";
 $conf .= "\n";
 
 my %copied;
-mkpath("$bootPath/kernels", 0, 0755) if $copyKernels;
+make_path("$bootPath/kernels", { mode => 0755 }) if $copyKernels;
 
 sub copyToKernelsDir {
     my ($path) = @_;
@@ -471,7 +472,7 @@ sub addEntry {
         my $systemName = basename(Cwd::abs_path("$path"));
         my $initrdSecretsPath = "$bootPath/kernels/$systemName-secrets";
 
-        mkpath(dirname($initrdSecretsPath), 0, 0755);
+        make_path(dirname($initrdSecretsPath), { mode => 0755 });
         my $oldUmask = umask;
         # Make sure initrd is not world readable (won't work if /boot is FAT)
         umask 0137;
@@ -690,17 +691,17 @@ struct(GrubState => {
 # because it is read line-by-line.
 sub readGrubState {
     my $defaultGrubState = GrubState->new(name => "", version => "", efi => "", devices => "", efiMountPoint => "", extraGrubInstallArgs => () );
-    open FILE, "<$bootPath/grub/state" or return $defaultGrubState;
+    open my $fh, "<", "$bootPath/grub/state" or return $defaultGrubState;
     local $/ = "\n";
-    my $name = <FILE>;
+    my $name = <$fh>;
     chomp($name);
-    my $version = <FILE>;
+    my $version = <$fh>;
     chomp($version);
-    my $efi = <FILE>;
+    my $efi = <$fh>;
     chomp($efi);
-    my $devices = <FILE>;
+    my $devices = <$fh>;
     chomp($devices);
-    my $efiMountPoint = <FILE>;
+    my $efiMountPoint = <$fh>;
     chomp($efiMountPoint);
     # Historically, arguments in the state file were one per each line, but that
     # gets really messy when newlines are involved, structured arguments
@@ -708,7 +709,7 @@ sub readGrubState {
     # when we need to remove a setting in the future. Thus, the 6th line is a JSON
     # object that can store structured data, with named keys, and all new state
     # should go in there.
-    my $jsonStateLine = <FILE>;
+    my $jsonStateLine = <$fh>;
     # For historical reasons we do not check the values above for un-definedness
     # (that is, when the state file has too few lines and EOF is reached),
     # because the above come from the first version of this logic and are thus
@@ -720,7 +721,7 @@ sub readGrubState {
     }
     my %jsonState = %{decode_json($jsonStateLine)};
     my @extraGrubInstallArgs = exists($jsonState{'extraGrubInstallArgs'}) ? @{$jsonState{'extraGrubInstallArgs'}} : ();
-    close FILE;
+    close $fh;
     my $grubState = GrubState->new(name => $name, version => $version, efi => $efi, devices => $devices, efiMountPoint => $efiMountPoint, extraGrubInstallArgs => \@extraGrubInstallArgs );
     return $grubState
 }
@@ -787,18 +788,18 @@ if ($requireNewInstall != 0) {
     my $stateFile = "$bootPath/grub/state";
     my $stateFileTmp = $stateFile . ".tmp";
 
-    open FILE, ">$stateFileTmp" or die "cannot create $stateFileTmp: $!\n";
-    print FILE get("fullName"), "\n" or die;
-    print FILE get("fullVersion"), "\n" or die;
-    print FILE $efiTarget, "\n" or die;
-    print FILE join( ",", @deviceTargets ), "\n" or die;
-    print FILE $efiSysMountPoint, "\n" or die;
+    open my $fh, ">", "$stateFileTmp" or die "cannot create $stateFileTmp: $!\n";
+    print $fh get("fullName"), "\n" or die;
+    print $fh get("fullVersion"), "\n" or die;
+    print $fh $efiTarget, "\n" or die;
+    print $fh join( ",", @deviceTargets ), "\n" or die;
+    print $fh $efiSysMountPoint, "\n" or die;
     my %jsonState = (
         extraGrubInstallArgs => \@extraGrubInstallArgs
     );
     my $jsonStateLine = encode_json(\%jsonState);
-    print FILE $jsonStateLine, "\n" or die;
-    close FILE or die;
+    print $fh $jsonStateLine, "\n" or die;
+    close $fh or die;
 
     # Atomically switch to the new state file
     rename $stateFileTmp, $stateFile or die "cannot rename $stateFileTmp to $stateFile: $!\n";

pkgs/applications/editors/vscode/extensions/ms-dotnettools.csharp/lockfile.json

@@ -1,7 +1,7 @@
 {
-  "version": "2.61.28",
+  "version": "2.63.32",
   "linux-x64": {
-    "hash": "sha256-lyP/NCvpaVW8dbZp/8OS9qrBa7yuO4rTo8Wwo/7wD7g=",
+    "hash": "sha256-laI6zoydOKAkRHZvHXQ6eFEJoFrb2I2Fe6gvti3eoJg=",
     "binaries": [
       ".debugger/createdump",
       ".debugger/vsdbg",
@@ -11,7 +11,7 @@
     ]
   },
   "linux-arm64": {
-    "hash": "sha256-bZ5ABDh3MnO33MQEXhLlF4UVGTCrcj5pCYgQDS6AP58=",
+    "hash": "sha256-3XWSzNhPSoAUlVVe3RNQ/Ttxm4WIuWahH0hGd4FXFhw=",
     "binaries": [
       ".debugger/createdump",
       ".debugger/vsdbg",
@@ -21,7 +21,7 @@
     ]
   },
   "darwin-x64": {
-    "hash": "sha256-5yDTJp3GDb7HYAG9q8wvr4QKwjGJ214ifUjwxZMwIts=",
+    "hash": "sha256-TfI6XR2jCxKCNt3mNu+ndH3KqHctWK+JF52eNd+QaLQ=",
     "binaries": [
       ".debugger/x86_64/createdump",
       ".debugger/x86_64/vsdbg",
@@ -31,7 +31,7 @@
     ]
   },
   "darwin-arm64": {
-    "hash": "sha256-58fz7IFzYgvC9Eruz1JgF4/ftHQV4FGdcfOODlCmGBA=",
+    "hash": "sha256-SoTaPgFYuxilmXZ/QXrc8xrMa58u6HnmuhiNK9knfME=",
     "binaries": [
       ".debugger/arm64/createdump",
       ".debugger/arm64/vsdbg",

pkgs/by-name/b3/b3sum/package.nix

@@ -6,15 +6,15 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "b3sum";
-  version = "1.5.5";
+  version = "1.6.0";
 
   src = fetchCrate {
     inherit version pname;
-    hash = "sha256-PgtQc8rwIbiHAue323POh15png7DerZbCuAKLi+jEYE=";
+    hash = "sha256-nsixj/zskHNIkv/qiD1DvrjeqkzVuN76tH+vCLGvPW8=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-4RD6GcBGUHMXS8BYs1NqpR3fVul2J3qh5E4MFnMbwoE=";
+  cargoHash = "sha256-HAbL/3StlK+VlonoviB2hFxCj7oyG93ReUytE3pFOMQ=";
 
   meta = {
     description = "BLAKE3 cryptographic hash function";

pkgs/by-name/ci/civo/package.nix

@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "civo";
-  version = "1.1.95";
+  version = "1.1.97";
 
   src = fetchFromGitHub {
     owner = "civo";
     repo = "cli";
     rev = "v${version}";
-    hash = "sha256-/byI9QFxkCiyVvxF0K1RjK5xW4EE8l/+LqqKy9GW1Pw=";
+    hash = "sha256-0BIvKzG+ePN4VyXPj4VfCoZiq/pDZb9/7k/kTIa4Fqs=";
   };
 
-  vendorHash = "sha256-ZylfnOeS6tXYaBbXg5znus6CKE+IZXmPSOc9UwYtscc=";
+  vendorHash = "sha256-V1R5MQ3y8mcm8ffc2INKk6BTYUROEvr8lHBs6MvbpkQ=";
 
   nativeBuildInputs = [ installShellFiles ];
 

pkgs/by-name/cl/clapper/package.nix

@@ -20,17 +20,18 @@
   libmicrodns,
   gtuber,
   glib-networking,
+  libpeas2,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "clapper";
-  version = "0.6.1";
+  version = "0.8.0";
 
   src = fetchFromGitHub {
     owner = "Rafostar";
     repo = "clapper";
-    rev = finalAttrs.version;
-    hash = "sha256-IQJTnLB6FzYYPONOqBkvi89iF0U6fx/aWYvNOOJpBvc=";
+    tag = finalAttrs.version;
+    hash = "sha256-Yb2fWsdd8jhxkGWKanLn7CAuF4MjyQ27XTrO8ja3hfs=";
   };
 
   nativeBuildInputs = [
@@ -59,6 +60,7 @@ stdenv.mkDerivation (finalAttrs: {
     libadwaita
     libsoup_3
     libmicrodns
+    libpeas2
   ];
 
   postPatch = ''
@@ -72,15 +74,15 @@ stdenv.mkDerivation (finalAttrs: {
     )
   '';
 
-  meta = with lib; {
+  meta = {
     description = "GNOME media player built using GTK4 toolkit and powered by GStreamer with OpenGL rendering";
     longDescription = ''
       Clapper is a GNOME media player built using the GTK4 toolkit.
       The media player is using GStreamer as a media backend.
     '';
     homepage = "https://github.com/Rafostar/clapper";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ aleksana ];
-    platforms = platforms.linux;
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ aleksana ];
+    platforms = lib.platforms.linux;
   };
 })

pkgs/by-name/cl/clashtui/package.nix

@@ -0,0 +1,52 @@
+{
+  lib,
+  fetchFromGitHub,
+  rustPlatform,
+  versionCheckHook,
+  nix-update-script,
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "clashtui";
+  version = "0.2.3";
+
+  src = fetchFromGitHub {
+    owner = "JohanChane";
+    repo = "clashtui";
+    tag = "v${version}";
+    hash = "sha256-2iQVYZrqo55EO0ZGn6ktP/3Py5v+LiVgrSYTtaxYXyQ=";
+  };
+
+  sourceRoot = "${src.name}/clashtui";
+
+  useFetchCargoVendor = true;
+
+  cargoHash = "sha256-8oDnumyn0Ry1AIWNLO2+1HSPsxkVLRLItgEVEXqSRFI=";
+
+  cargoBuildFlags = [ "--all-features" ];
+
+  checkFlags = [
+    # need fhs
+    "--skip=utils::config::test::test_save_and_load"
+  ];
+
+  doInstallCheck = true;
+
+  versionCheckProgramArg = "--version";
+
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Mihomo (Clash.Meta) TUI Client";
+    homepage = "https://github.com/JohanChane/clashtui";
+    changelog = "https://github.com/JohanChane/clashtui/releases/tag/v${version}";
+    mainProgram = "clashtui";
+    license = lib.licenses.mit;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ nayeko ];
+  };
+}

pkgs/by-name/de/deltachat-desktop/package.nix

@@ -1,6 +1,6 @@
 { lib
 , copyDesktopItems
-, electron_32
+, electron_34
 , fetchFromGitHub
 , deltachat-rpc-server
 , makeDesktopItem
@@ -19,36 +19,36 @@
 
 let
   deltachat-rpc-server' = deltachat-rpc-server.overrideAttrs rec {
-    version = "1.155.1";
+    version = "1.155.5";
     src = fetchFromGitHub {
       owner = "deltachat";
       repo = "deltachat-core-rust";
       tag = "v${version}";
-      hash = "sha256-XZLKvOvdyvR5poRY/oo9MHi1f2XzBmSDR8VqjW3wq74=";
+      hash = "sha256-U0phIPkR4lt/WsCDt2TQv8NfjG04JdmCVDbMA1/ySdo=";
     };
     cargoDeps = rustPlatform.fetchCargoVendor {
       pname = "deltachat-core-rust";
       inherit version src;
-      hash = "sha256-ZxKR1M9wqmzKVbSdBKzTsKF9tDVRGHnd+Ra9Jy5CQQY=";
+      hash = "sha256-lkqBC/b128GSMpvAWpWmkrrf/E0twCDtDM1EBPOnp7Y=";
     };
   };
-  electron = electron_32;
+  electron = electron_34;
   pnpm = pnpm_9;
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "deltachat-desktop";
-  version = "1.52.1";
+  version = "1.54.1";
 
   src = fetchFromGitHub {
     owner = "deltachat";
     repo = "deltachat-desktop";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-L/dgdg7Yrosy054Jdo2ST3x37kQ+CHOEN92/YNjnTYc=";
+    hash = "sha256-mt0y7W16ThRYQNALFPBNcnR34MDqs6m3Vt+mYALqGs8=";
   };
 
   pnpmDeps = pnpm.fetchDeps {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-ovwdFpVFqXaGqsYc1ldhimqgdi0CXjQYMMMcmUXtMFc=";
+    hash = "sha256-/1utoiKw/BycWPuwWykcJniUw9kUGk/WtPCqqZu8E+U=";
   };
 
   nativeBuildInputs = [

pkgs/by-name/de/devenv/package.nix

@@ -27,7 +27,7 @@ let
     doInstallCheck = false;
   });
 
-  version = "1.4";
+  version = "1.4.1";
 in
 rustPlatform.buildRustPackage {
   pname = "devenv";
@@ -37,11 +37,11 @@ rustPlatform.buildRustPackage {
     owner = "cachix";
     repo = "devenv";
     rev = "v${version}";
-    hash = "sha256-ax0264nOyPcTJvIJAnPKGfkfXQ8Oe8ZVFziKf3UV26o=";
+    hash = "sha256-OjdnHKQ+eWA8YvPUpl3xxyaNK91c9sMebqXgVdN8Lm4=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-K06D4tD3IOCA7/iqQ7fhybsgcSmMxPUcoUi+VNPtgAY=";
+  cargoHash = "sha256-Z7xf1fuXi2Lx005rQwWa7ZNw8nJGz1z33KPnX/pxO3E=";
 
   buildAndTestSubdir = "devenv";
 

pkgs/by-name/go/goverlay/package.nix

@@ -12,17 +12,16 @@
   libGL,
   libGLU,
   libnotify,
-  libqtpas,
   libX11,
+  lsb-release,
   nix-update-script,
   polkit,
   procps,
-  qt6,
+  qt6Packages,
   systemd,
   util-linux,
   vulkan-tools,
   which,
-  wrapQtAppsHook,
 }:
 
 stdenv.mkDerivation rec {
@@ -48,24 +47,26 @@ stdenv.mkDerivation rec {
     substituteInPlace overlayunit.pas \
       --replace-fail '/usr/share/icons/hicolor/128x128/apps/goverlay.png' "$out/share/icons/hicolor/128x128/apps/goverlay.png" \
       --replace-fail '/sbin/ip' "${lib.getExe' iproute2 "ip"}" \
-      --replace-fail '/bin/bash' "${lib.getExe' bash "bash"}"
+      --replace-fail '/bin/bash' "${lib.getExe' bash "bash"}" \
+      --replace-fail '/usr/lib/os-release' '/etc/os-release' \
+      --replace-fail 'lsb_release' "${lib.getExe' lsb-release "lsb_release"} 2> /dev/null"
   '';
 
   nativeBuildInputs = [
     fpc
     lazarus-qt6
-    wrapQtAppsHook
+    qt6Packages.wrapQtAppsHook
   ];
 
   buildInputs = [
     libGL
     libGLU
-    libqtpas
+    qt6Packages.libqtpas
     libX11
-    qt6.qtbase
+    qt6Packages.qtbase
   ];
 
-  NIX_LDFLAGS = "-lGLU -rpath ${lib.makeLibraryPath buildInputs}";
+  NIX_LDFLAGS = "-lGLU -lGL -rpath ${lib.makeLibraryPath buildInputs}";
 
   buildPhase = ''
     runHook preBuild
@@ -89,10 +90,6 @@ stdenv.mkDerivation rec {
         which
       ]
     }"
-
-    # Force xcb since libqt5pas doesn't support Wayland
-    # See https://github.com/benjamimgois/goverlay/issues/107
-    "--set QT_QPA_PLATFORM xcb"
   ];
 
   passthru.updateScript = nix-update-script { };
@@ -101,7 +98,7 @@ stdenv.mkDerivation rec {
     description = "Opensource project that aims to create a Graphical UI to help manage Linux overlays";
     homepage = "https://github.com/benjamimgois/goverlay";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = with maintainers; [ RoGreat ];
     platforms = platforms.linux;
     mainProgram = "goverlay";
   };

pkgs/by-name/hu/humblebundle-downloader/package.nix

@@ -0,0 +1,36 @@
+{
+  fetchFromGitHub,
+  lib,
+  python3Packages,
+}:
+
+python3Packages.buildPythonApplication rec {
+  pname = "humblebundle-downloader";
+  version = "0.4.3";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "xtream1101";
+    repo = "humblebundle-downloader";
+    tag = version;
+    hash = "sha256-fLfAGDKn6AWHJKsgQ0fBYdN6mGfZNrVs9n6Zo9VRgIY=";
+  };
+
+  build-system = with python3Packages; [
+    poetry-core
+  ];
+
+  dependencies = with python3Packages; [
+    parsel
+    requests
+  ];
+
+  meta = {
+    description = "Download your Humble Bundle Library";
+    mainProgram = "hbd";
+    homepage = "https://github.com/xtream1101/humblebundle-downloader";
+    changelog = "https://github.com/xtream1101/humblebundle-downloader/blob/${src.tag}/CHANGELOG.md";
+    license = with lib.licenses; [ mit ];
+    maintainers = with lib.maintainers; [ jopejoe1 ];
+  };
+}

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

@@ -20,13 +20,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libdeltachat";
-  version = "1.155.4";
+  version = "1.155.6";
 
   src = fetchFromGitHub {
     owner = "deltachat";
     repo = "deltachat-core-rust";
     tag = "v${version}";
-    hash = "sha256-cSk3GK6jlFkZ7XckB9PKIYHyK1Yj1qoJvWDrlbRmrhw=";
+    hash = "sha256-d7EmmyLSJjFIZM1j6LP8f4WnXiptNTAqOdJD/oPL02Y=";
   };
 
   patches = [
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
   cargoDeps = rustPlatform.fetchCargoVendor {
     pname = "deltachat-core-rust";
     inherit version src;
-    hash = "sha256-+j6ENk6wvA3t2I2C8J2tOYJUVSS6s1Wa/8sDwGqF9Ho=";
+    hash = "sha256-E01aEzNi06LQntrlA+342a8Nl5API6v7HbdmuKpfajs=";
   };
 
   nativeBuildInputs = [

pkgs/by-name/mi/mitra/package.nix

@@ -6,18 +6,18 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "mitra";
-  version = "3.14.0";
+  version = "3.16.0";
 
   src = fetchFromGitea {
     domain = "codeberg.org";
     owner = "silverpill";
     repo = "mitra";
     rev = "v${version}";
-    hash = "sha256-4f0zh7rdS0lTnN4OzUEL8tn6S18cYTj92vA8akyt4K4=";
+    hash = "sha256-jVm1ftFSOxEseNgze6xsF9k8G02UJc3f/CGxzdNzfhw=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-MA/C/8x7Bmh6ekd4iHvjX9Lf/hG43Qb5nhEHINpeBHA=";
+  cargoHash = "sha256-QQRl9/Rc0cVs1ug5LXN9OFZI4uTO7Jgu1vQQM/RQsLo=";
 
   # require running database
   doCheck = false;

pkgs/by-name/nc/ncmpc/package.nix

@@ -17,13 +17,13 @@
 
 stdenv.mkDerivation rec {
   pname = "ncmpc";
-  version = "0.51";
+  version = "0.52";
 
   src = fetchFromGitHub {
     owner = "MusicPlayerDaemon";
     repo = "ncmpc";
-    rev = "v${version}";
-    sha256 = "sha256-mFZ8szJT7eTPHQHxjpP5pThCcY0YERGkGR8528Xu9MA=";
+    tag = "v${version}";
+    sha256 = "sha256-j/hZdKl1LQ/yEGDUv9k5PQJ6pngAl52mVCpfacWrRw0=";
   };
 
   buildInputs = [

pkgs/by-name/oc/oculante/package.nix

@@ -55,7 +55,6 @@ rustPlatform.buildRustPackage rec {
       libXi
       libXrandr
       gtk3
-
       libxkbcommon
       wayland
     ]
@@ -70,20 +69,28 @@ rustPlatform.buildRustPackage rec {
   ];
 
   postInstall = ''
-    install -Dm444 $src/res/icons/icon.png -t $out/share/icons/hicolor/128x128/apps/
+    install -Dm444 $src/res/icons/icon.png $out/share/icons/hicolor/128x128/apps/oculante.png
     install -Dm444 $src/res/oculante.desktop -t $out/share/applications
     wrapProgram $out/bin/oculante \
-      --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libGL ]}
+      --prefix LD_LIBRARY_PATH : ${
+        lib.makeLibraryPath (
+          [
+            libGL
+            libxkbcommon
+          ]
+          ++ lib.optionals stdenv.hostPlatform.isLinux [ wayland ]
+        )
+      }
   '';
 
-  meta = with lib; {
+  meta = {
     broken = stdenv.hostPlatform.isDarwin;
     description = "Minimalistic crossplatform image viewer written in Rust";
     homepage = "https://github.com/woelper/oculante";
     changelog = "https://github.com/woelper/oculante/blob/${version}/CHANGELOG.md";
-    license = licenses.mit;
+    license = lib.licenses.mit;
     mainProgram = "oculante";
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       dit7ya
       figsoda
     ];

pkgs/by-name/pr/prometheus-node-exporter/package.nix

@@ -9,17 +9,17 @@
 
 buildGoModule rec {
   pname = "node_exporter";
-  version = "1.8.2";
+  version = "1.9.0";
   rev = "v${version}";
 
   src = fetchFromGitHub {
     inherit rev;
     owner = "prometheus";
     repo = "node_exporter";
-    hash = "sha256-b2uior67RcCCpUE+qx55G1eWiT2wWDVsnosSH9fd3/I=";
+    hash = "sha256-mm4ZQjpIxaCbKIhZak0ZD4HVx3t+0m6YwjtIWak8RXc=";
   };
 
-  vendorHash = "sha256-sly8AJk+jNZG8ijTBF1Pd5AOOUJJxIG8jHwBUdlt8fM=";
+  vendorHash = "sha256-rItbct0UIWs9zulyoQF647RwLJkTsBTDJHLORCgVDo8=";
 
   # FIXME: tests fail due to read-only nix store
   doCheck = false;

pkgs/by-name/ri/rimgo/package.nix

@@ -2,7 +2,7 @@
   lib,
   fetchFromGitea,
   buildGoModule,
-  tailwindcss,
+  tailwindcss_3,
 }:
 buildGoModule rec {
   pname = "rimgo";
@@ -18,7 +18,7 @@ buildGoModule rec {
 
   vendorHash = "sha256-nk1Pl9K62RjmBUgTlbp3u6cCoiEwpUHavfT3Oy0iyGU=";
 
-  nativeBuildInputs = [ tailwindcss ];
+  nativeBuildInputs = [ tailwindcss_3 ];
 
   preBuild = ''
     tailwindcss -i static/tailwind.css -o static/app.css -m

pkgs/by-name/ro/root/package.nix

@@ -11,18 +11,14 @@
   coreutils,
   git,
   davix,
+  fftw,
   ftgl,
   gl2ps,
   glew,
   gnugrep,
   gnused,
   gsl,
-  gtest,
   lapack,
-  libX11,
-  libXpm,
-  libXft,
-  libXext,
   libGLU,
   libGL,
   libxcrypt,
@@ -30,6 +26,7 @@
   llvm_18,
   lsof,
   lz4,
+  xorg,
   xz,
   man,
   openblas,
@@ -56,7 +53,7 @@
 
 stdenv.mkDerivation rec {
   pname = "root";
-  version = "6.34.02";
+  version = "6.34.04";
 
   passthru = {
     tests = import ./tests { inherit callPackage; };
@@ -64,7 +61,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://root.cern.ch/download/root_v${version}.source.tar.gz";
-    hash = "sha256-FmvsVi5CDhd6rzEz+j+wn4Ls3avoouGQY0W61EJRP5Q=";
+    hash = "sha256-4yDFNzqOh7sptygJVMqDVa2MQpXPSSNWBvDIsgCss3Q=";
   };
 
   clad_src = fetchgit {
@@ -87,12 +84,12 @@ stdenv.mkDerivation rec {
   buildInputs =
     [
       davix
+      fftw
       ftgl
       giflib
       gl2ps
       glew
       gsl
-      gtest
       lapack
       libjpeg
       libpng
@@ -117,12 +114,12 @@ stdenv.mkDerivation rec {
     ]
     ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk.privateFrameworksHook ]
     ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
-      libX11
-      libXpm
-      libXft
-      libXext
       libGLU
       libGL
+      xorg.libX11
+      xorg.libXpm
+      xorg.libXft
+      xorg.libXext
     ];
 
   preConfigure =
@@ -135,9 +132,6 @@ stdenv.mkDerivation rec {
       substituteInPlace cmake/modules/SearchInstalledSoftware.cmake \
         --replace-fail 'set(lcgpackages ' '#set(lcgpackages '
 
-      # Make sure that clad is not downloaded when building
-      substituteInPlace interpreter/cling/tools/plugins/clad/CMakeLists.txt \
-        --replace-fail 'UPDATE_COMMAND ""' 'DOWNLOAD_COMMAND "" UPDATE_COMMAND ""'
       # Make sure that clad is finding the right llvm version
       substituteInPlace interpreter/cling/tools/plugins/clad/CMakeLists.txt \
         --replace-fail '-DLLVM_DIR=''${LLVM_BINARY_DIR}' '-DLLVM_DIR=''${LLVM_CMAKE_PATH}'
@@ -151,6 +145,9 @@ stdenv.mkDerivation rec {
       # Eliminate impure reference to /System/Library/PrivateFrameworks
       substituteInPlace core/macosx/CMakeLists.txt \
         --replace-fail "-F/System/Library/PrivateFrameworks " ""
+      # Just like in libpng/12.nix to build the builtin libpng on macOS
+      substituteInPlace graf2d/asimage/src/libAfterImage/libpng/pngpriv.h \
+        --replace-fail '<fp.h>' '<math.h>'
     ''
     +
       lib.optionalString
@@ -167,6 +164,7 @@ stdenv.mkDerivation rec {
       "-DCMAKE_INSTALL_LIBDIR=lib"
       "-Dbuiltin_llvm=OFF"
       "-Dfail-on-missing=ON"
+      "-Dfftw3=ON"
       "-Dfitsio=OFF"
       "-Dgnuinstall=ON"
       "-Dmathmore=ON"

pkgs/by-name/ro/root5/package.nix

@@ -115,7 +115,6 @@ stdenv.mkDerivation rec {
       done
 
       patchShebangs build/unix/
-      ln -s ${lib.getDev stdenv.cc.libc}/include/AvailabilityMacros.h cint/cint/include/
 
       # __malloc_hook is deprecated
       substituteInPlace misc/memstat/src/TMemStatHook.cxx \

pkgs/by-name/st/stalwart-mail/webadmin.nix

@@ -3,7 +3,7 @@
   rustPlatform,
   fetchFromGitHub,
   trunk,
-  tailwindcss,
+  tailwindcss_3,
   fetchNpmDeps,
   nix-update-script,
   nodejs,
@@ -44,7 +44,7 @@ rustPlatform.buildRustPackage rec {
     llvmPackages.bintools-unwrapped
     nodejs
     npmHooks.npmConfigHook
-    tailwindcss
+    tailwindcss_3
     trunk
     # needs to match with wasm-bindgen version in upstreams Cargo.lock
     wasm-bindgen-cli_0_2_93

pkgs/by-name/ta/tailwindcss/package.nix

@@ -1 +1 @@
-{ tailwindcss_4 }: tailwindcss_4
+{ tailwindcss_3 }: tailwindcss_3

pkgs/by-name/un/unixcw/package.nix

@@ -1,33 +1,54 @@
 {
   lib,
-  mkDerivation,
+  stdenv,
   fetchurl,
   libpulseaudio,
   alsa-lib,
   pkg-config,
-  qtbase,
+  qt5,
+  ncurses,
+  autoreconfHook,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "unixcw";
   version = "3.5.1";
+
   src = fetchurl {
     url = "mirror://sourceforge/unixcw/unixcw_${version}.orig.tar.gz";
-    sha256 = "5f3aacd8a26e16e6eff437c7ae1e9b389956fb137eeb3de24670ce05de479e7a";
+    hash = "sha256-Xzqs2KJuFubv9DfHrh6bOJlW+xN+6z3iRnDOBd5Hnno=";
   };
+
   patches = [
     ./remove-use-of-dlopen.patch
+
+    # fix pkg-config searching for ncurses
+    # yoinked from gentoo (https://gitweb.gentoo.org/repo/gentoo.git/tree/media-radio/unixcw/files/unixcw-3.6-tinfo.patch), with modifications
+    ./unixcw-3.6-tinfo.patch
   ];
-  nativeBuildInputs = [ pkg-config ];
+
+  postPatch = ''
+    substituteInPlace src/cwcp/Makefile.am \
+      --replace-fail '-lcurses' '-lncurses'
+  '';
+
+  nativeBuildInputs = [
+    autoreconfHook
+    pkg-config
+    qt5.wrapQtAppsHook
+  ];
+
   buildInputs = [
     libpulseaudio
     alsa-lib
-    qtbase
+    qt5.qtbase
+    ncurses
   ];
+
   CFLAGS = "-lasound -lpulse-simple";
 
-  meta = with lib; {
-    description = "sound characters as Morse code on the soundcard or console speaker";
+  meta = {
+    description = "Sound characters as Morse code on the soundcard or console speaker";
     longDescription = ''
       unixcw is a project providing libcw library and a set of programs
       using the library: cw, cwgen, cwcp and xcwcp.
@@ -44,8 +65,8 @@ mkDerivation rec {
       cw reports any errors in  embedded  commands
     '';
     homepage = "https://unixcw.sourceforge.net";
-    maintainers = [ maintainers.mafo ];
-    license = licenses.gpl2;
-    platforms = platforms.linux;
+    maintainers = [ lib.maintainers.mafo ];
+    license = lib.licenses.gpl2Plus;
+    platforms = lib.platforms.linux;
   };
 }

pkgs/by-name/un/unixcw/unixcw-3.6-tinfo.patch

@@ -0,0 +1,20 @@
+--- a/configure.ac	2017-03-07 13:31:46.074580930 +0100
++++ b/configure.ac	2017-03-07 13:33:25.640924331 +0100
+@@ -347,7 +347,7 @@
+     AC_DEFINE([LIBCW_WITH_PULSEAUDIO], [1], [Define as 1 if your build machine can support PulseAudio.])
+ fi
+ 
+-
++PKG_PROG_PKG_CONFIG
+ 
+ if test "$enable_cwcp" = "no" ; then
+    WITH_CWCP='no'
+@@ -355,6 +355,7 @@
+     AC_CHECK_LIB(curses, initscr)
+-    if test $ac_cv_lib_curses_initscr = 'yes' ; then
++    if true ; then
+ 	WITH_CWCP='yes'
++	PKG_CHECK_MODULES(ncurses, ncurses, [NCURSES_LIB="$ncurses_LIBS"], )
+     else
+ 	WITH_CWCP='no'
+ 	AC_MSG_WARN([Cannot find libcurses - unable to build cwcp])

pkgs/by-name/yo/yoda/package.nix

@@ -4,7 +4,7 @@
   fetchFromGitLab,
   autoreconfHook,
   bash,
-  python,
+  python3,
   root,
   makeWrapper,
   zlib,
@@ -13,16 +13,16 @@
 
 stdenv.mkDerivation rec {
   pname = "yoda";
-  version = "2.0.2";
+  version = "2.0.3";
 
   src = fetchFromGitLab {
     owner = "hepcedar";
     repo = pname;
     rev = "yoda-${version}";
-    hash = "sha256-sHvwgLH22fvdlh4oLjr4fzZ2WtBJMAlvr4Vxi9Xdf84=";
+    hash = "sha256-No2Lr4nmYNfFnJVpg7xYjd35g12CbQtpW9QMjM3owko=";
   };
 
-  nativeBuildInputs = with python.pkgs; [
+  nativeBuildInputs = with python3.pkgs; [
     autoreconfHook
     bash
     cython
@@ -31,9 +31,9 @@ stdenv.mkDerivation rec {
 
   buildInputs =
     [
-      python
+      python3
     ]
-    ++ (with python.pkgs; [
+    ++ (with python3.pkgs; [
       numpy
       matplotlib
     ])
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
     patchShebangs .
 
     substituteInPlace pyext/yoda/plotting/script_generator.py \
-      --replace '/usr/bin/env python' '${python.interpreter}'
+      --replace '/usr/bin/env python' '${python3.interpreter}'
   '';
 
   postInstall = ''
@@ -70,12 +70,12 @@ stdenv.mkDerivation rec {
 
   installCheckTarget = "check";
 
-  meta = with lib; {
+  meta = {
     description = "Provides small set of data analysis (specifically histogramming) classes";
-    license = licenses.gpl3Only;
+    license = lib.licenses.gpl3Only;
     homepage = "https://yoda.hepforge.org";
     changelog = "https://gitlab.com/hepcedar/yoda/-/blob/yoda-${version}/ChangeLog";
-    platforms = platforms.unix;
-    maintainers = with maintainers; [ veprbl ];
+    platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; [ veprbl ];
   };
 }

pkgs/development/interpreters/php/8.3.nix

@@ -4,8 +4,8 @@ let
   base = callPackage ./generic.nix (
     _args
     // {
-      version = "8.3.16";
-      hash = "sha256-6SCCGMvcuBaDS2xe2N3FdI+xL/d3z54OA7tIlidmCLY=";
+      version = "8.3.17";
+      hash = "sha256-TgNNynqxb8YGLIxTBnUo9OyqJGvyIxDmhB9wCAlCZKw=";
     }
   );
 in

pkgs/development/ocaml-modules/bitv/default.nix

@@ -1,42 +1,26 @@
 {
-  stdenv,
   lib,
   fetchFromGitHub,
-  autoreconfHook,
-  which,
-  ocaml,
-  findlib,
+  buildDunePackage,
 }:
 
-if lib.versionOlder ocaml.version "4.02" then
-  throw "bitv is not available for OCaml ${ocaml.version}"
-else
+buildDunePackage rec {
+  pname = "bitv";
+  version = "2.0";
+  minimalOCamlVersion = "4.08";
 
-  stdenv.mkDerivation rec {
-    pname = "ocaml${ocaml.version}-bitv";
-    version = "1.3";
+  src = fetchFromGitHub {
+    owner = "backtracking";
+    repo = "bitv";
+    tag = version;
+    hash = "sha256-llfbdrvxrz6323G2LBAtKaXOrHQriFzaz3ulvFVhH6s=";
+  };
 
-    src = fetchFromGitHub {
-      owner = "backtracking";
-      repo = "bitv";
-      rev = version;
-      sha256 = "sha256-sZwq6c10hBBS9tGvKlWD9GE3JBrZPByfDrXE6xIPcG4=";
-    };
-
-    nativeBuildInputs = [
-      autoreconfHook
-      which
-      ocaml
-      findlib
-    ];
-
-    createFindlibDestdir = true;
-
-    meta = {
-      description = "Bit vector library for OCaml";
-      license = lib.licenses.lgpl21;
-      homepage = "https://github.com/backtracking/bitv";
-      maintainers = [ lib.maintainers.vbgl ];
-      inherit (ocaml.meta) platforms;
-    };
-  }
+  meta = {
+    description = "Bit vector library for OCaml";
+    license = lib.licenses.lgpl21;
+    homepage = "https://github.com/backtracking/bitv";
+    changelog = "https://github.com/backtracking/bitv/releases/tag/${version}";
+    maintainers = [ lib.maintainers.vbgl ];
+  };
+}

pkgs/development/ocaml-modules/ctypes_stubs_js/default.nix

@@ -14,7 +14,6 @@ buildDunePackage rec {
   pname = "ctypes_stubs_js";
   version = "0.1";
 
-  duneVersion = "3";
   minimalOCamlVersion = "4.08";
 
   src = fetchFromGitLab {
@@ -27,7 +26,12 @@ buildDunePackage rec {
   propagatedBuildInputs = [ integers_stubs_js ];
   nativeCheckInputs = [
     nodejs
-    js_of_ocaml-compiler
+    (
+      if lib.versionAtLeast js_of_ocaml-compiler.version "6.0" then
+        js_of_ocaml-compiler.override { version = "5.9.1"; }
+      else
+        js_of_ocaml-compiler
+    )
   ];
   checkInputs = [
     ctypes

pkgs/development/ocaml-modules/gen_js_api/ojs.nix

@@ -8,7 +8,6 @@ buildDunePackage rec {
   pname = "ojs";
 
   inherit (gen_js_api) version src;
-  duneVersion = "3";
 
   propagatedBuildInputs = [ js_of_ocaml-compiler ];
 

pkgs/development/ocaml-modules/janestreet/0.15.nix

@@ -9,6 +9,16 @@
   zstd,
 }:
 
+let
+  js_of_ocaml-compiler = self.js_of_ocaml-compiler.override { version = "5.9.1"; };
+  js_of_ocaml = self.js_of_ocaml.override { inherit js_of_ocaml-compiler; };
+  gen_js_api = self.gen_js_api.override {
+    inherit js_of_ocaml-compiler;
+    ojs = self.ojs.override { inherit js_of_ocaml-compiler; };
+  };
+  js_of_ocaml-ppx = self.js_of_ocaml-ppx.override { inherit js_of_ocaml; };
+in
+
 with self;
 
 {

pkgs/development/ocaml-modules/janestreet/0.16.nix

@@ -9,6 +9,16 @@
   krb5,
 }:
 
+let
+  js_of_ocaml-compiler = self.js_of_ocaml-compiler.override { version = "5.9.1"; };
+  js_of_ocaml = self.js_of_ocaml.override { inherit js_of_ocaml-compiler; };
+  gen_js_api = self.gen_js_api.override {
+    inherit js_of_ocaml-compiler;
+    ojs = self.ojs.override { inherit js_of_ocaml-compiler; };
+  };
+  js_of_ocaml-ppx = self.js_of_ocaml-ppx.override { inherit js_of_ocaml; };
+in
+
 with self;
 
 {

pkgs/development/ocaml-modules/janestreet/0.17.nix

@@ -8,6 +8,16 @@
   zstd,
 }:
 
+let
+  js_of_ocaml-compiler = self.js_of_ocaml-compiler.override { version = "5.9.1"; };
+  js_of_ocaml = self.js_of_ocaml.override { inherit js_of_ocaml-compiler; };
+  gen_js_api = self.gen_js_api.override {
+    inherit js_of_ocaml-compiler;
+    ojs = self.ojs.override { inherit js_of_ocaml-compiler; };
+  };
+  js_of_ocaml-ppx = self.js_of_ocaml-ppx.override { inherit js_of_ocaml; };
+in
+
 with self;
 
 {

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

@@ -26,7 +26,7 @@
 
 buildPythonPackage rec {
   pname = "aioesphomeapi";
-  version = "29.0.0";
+  version = "29.1.0";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -35,7 +35,7 @@ buildPythonPackage rec {
     owner = "esphome";
     repo = "aioesphomeapi";
     tag = "v${version}";
-    hash = "sha256-1H6+/V87mjkBvHwPTs3sgrqY24Gc/MCKb97r2ly6oTA=";
+    hash = "sha256-/4/FNb6lGlitsAzO0OadWqP02Wx+mnlrA6yzXFm72sg=";
   };
 
   build-system = [
@@ -62,17 +62,13 @@ buildPythonPackage rec {
   ];
 
   disabledTests = [
-    # https://github.com/esphome/aioesphomeapi/issues/837
-    "test_reconnect_logic_stop_callback"
-    # python3.12.4 regression
-    # https://github.com/esphome/aioesphomeapi/issues/889
-    "test_start_connection_cannot_increase_recv_buffer"
-    "test_start_connection_can_only_increase_buffer_size_to_262144"
+    # https://github.com/esphome/aioesphomeapi/pull/1081
+    "test_request_while_handshaking"
   ];
 
   disabledTestPaths = [
     # benchmarking requires pytest-codespeed
-    "tests/test_bluetooth_benchmarks.py"
+    "tests/benchmarks"
   ];
 
   pythonImportsCheck = [ "aioesphomeapi" ];

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

@@ -48,7 +48,7 @@ buildPythonPackage rec {
   ];
 
   optional-dependencies = {
-    ssh = [ paramiko paramiko.optional-dependencies.ed25519 ];
+    ssh = [ paramiko ];
     tls = [];
     websockets = [ websocket-client ];
   };

pkgs/development/python-modules/docling-ibm-models/default.nix

@@ -19,14 +19,14 @@
 
 buildPythonPackage rec {
   pname = "docling-ibm-models";
-  version = "3.3.0";
+  version = "3.3.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "DS4SD";
     repo = "docling-ibm-models";
     tag = "v${version}";
-    hash = "sha256-wxkHd+TCBibOTWO09JOsjX6oBtUxZ/9IOmyLdeptzeQ=";
+    hash = "sha256-8mqDgbTj5g6jXEumj16Me9NjHLCOdR+pXmAwn2dghfg=";
   };
 
   build-system = [

pkgs/development/python-modules/esphome-glyphsets/default.nix

@@ -0,0 +1,34 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+}:
+
+buildPythonPackage rec {
+  pname = "esphome-glyphsets";
+  version = "0.1.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "esphome";
+    repo = "esphome-glyphsets";
+    tag = "v${version}";
+    hash = "sha256-kST2AsZRWZrVmInUNN153+FOXa/t9vbHN3hAReKQJaU=";
+    fetchSubmodules = true;
+  };
+
+  build-system = [ setuptools ];
+
+  pythonImportsCheck = [
+    "esphome_glyphsets"
+  ];
+
+  meta = {
+    description = "A lightweight version of glyphsets for ESPHome";
+    homepage = "https://github.com/esphome/esphome-glyphsets";
+    changelog = "https://github.com/esphome/esphome-glyphsets/blob/${src.tag}/CHANGELOG.md";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ hexa ];
+  };
+}

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

@@ -14,14 +14,14 @@
 
 buildPythonPackage rec {
   pname = "explorerscript";
-  version = "0.2.1.post2";
+  version = "0.2.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "SkyTemple";
     repo = "explorerscript";
     tag = version;
-    hash = "sha256-cKEceWr7XmZbuomPOmjQ32ptAjz3LZDQBWAgZEFadDY=";
+    hash = "sha256-fh40HCU12AVA3cZ5xvRott+93qo8VzHFsbPzTkoV3x4=";
     # Include a pinned antlr4 fork used as a C++ library
     fetchSubmodules = true;
   };
@@ -29,19 +29,17 @@ buildPythonPackage rec {
   build-system = [
     setuptools
     scikit-build-core
-    ninja
-    cmake
     pybind11
   ];
 
+  nativeBuildInputs = [
+    cmake
+    ninja
+  ];
+
   # The source include some auto-generated ANTLR code that could be recompiled, but trying that resulted in a crash while decompiling unionall.ssb.
   # We thus do not rebuild them.
 
-  postPatch = ''
-    substituteInPlace pyproject.toml \
-      --replace-fail "scikit-build-core<=0.9.8" scikit-build-core
-  '';
-
   dontUseCmakeConfigure = true;
 
   pythonRelaxDeps = [

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

@@ -10,6 +10,7 @@
   pillow,
   pyjwt,
   pytestCheckHook,
+  pytest-cov-stub,
   pythonOlder,
   requests,
   requests-futures,
@@ -30,17 +31,17 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "pycontribs";
-    repo = pname;
+    repo = "jira";
     tag = version;
     hash = "sha256-P3dbrBKpHvLNIA+JBeSXEQl4QVZ0FdKkNIU8oPHWw6k=";
   };
 
-  nativeBuildInputs = [
+  build-system = [
     setuptools
     setuptools-scm
   ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     defusedxml
     packaging
     requests
@@ -67,14 +68,10 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     flaky
     pytestCheckHook
+    pytest-cov-stub
     requests-mock
   ];
 
-  postPatch = ''
-    substituteInPlace setup.cfg \
-      --replace "--cov-report=xml --cov jira" ""
-  '';
-
   pythonImportsCheck = [ "jira" ];
 
   # impure tests because of connectivity attempts to jira servers

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

@@ -27,7 +27,7 @@ buildPythonPackage rec {
     paramiko
     lxml
     six
-  ] ++ paramiko.optional-dependencies.ed25519;
+  ];
 
   nativeCheckInputs = [ pytestCheckHook ];
 

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

@@ -50,6 +50,13 @@ buildPythonPackage {
       oneDNN
       re2
       onnxruntime.protobuf
+
+      # https://github.com/NixOS/nixpkgs/pull/357656 patches the onnx lib to ${pkgs.onnxruntime}/lib
+      # but these files are copied into this package too. If the origional non-python onnxruntime
+      # package is GC-ed, cuda support in this python package will break.
+      # Two options, rebuild onnxruntime twice with the different paths hard-coded, or just hold a runtime
+      # dependency between the two. Option 2, because onnxruntime takes forever to build with cuda support.
+      onnxruntime
     ]
     ++ lib.optionals onnxruntime.passthru.cudaSupport (
       with onnxruntime.passthru.cudaPackages;

pkgs/development/python-modules/smart-open/default.nix

@@ -11,7 +11,6 @@
   requests,
   moto,
   paramiko,
-  pynacl,
   pytestCheckHook,
   responses,
   setuptools,
@@ -57,7 +56,6 @@ buildPythonPackage rec {
     moto
     pytestCheckHook
     responses
-    pynacl
   ] ++ lib.flatten (lib.attrValues optional-dependencies);
 
   pytestFlagsArray = [ "smart_open" ];

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

@@ -20,7 +20,7 @@ buildPythonPackage rec {
 
   build-system = [ setuptools ];
 
-  dependencies = [ paramiko ] ++ paramiko.optional-dependencies.ed25519;
+  dependencies = [ paramiko ];
 
   nativeCheckInputs = [
     pytestCheckHook

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

@@ -19,7 +19,6 @@
   paramiko,
   pbr,
   prettytable,
-  pynacl,
   python,
   pythonOlder,
   pyyaml,
@@ -75,7 +74,6 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     hacking
     oslotest
-    pynacl
     stestr
   ];
 

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

@@ -2,7 +2,6 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  fetchpatch,
 
   # build-system
   setuptools,
@@ -59,25 +58,16 @@
 
 buildPythonPackage rec {
   pname = "transformers";
-  version = "4.48.3";
+  version = "4.49.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "huggingface";
     repo = "transformers";
     tag = "v${version}";
-    hash = "sha256-gDPJx/kgFa8KCoX8XCMtFrSY/z2as22yDSNEW3UDm/0=";
+    hash = "sha256-drq7RWoRaRejiQjCUHIYuzaKa9rA4eQZI2do74scp1c=";
   };
 
-  patches = [
-    # Remove on the next major version bump
-    (fetchpatch {
-      url = "https://github.com/huggingface/transformers/commit/db864b5526d56fd99143619abff969bfcb5596d5.patch?full_index=1";
-      name = "dont-import-torch-distributed-if-not-available.patch";
-      hash = "sha256-XOraJmSt9Rp/oNiil6vDUBqZhd8MDbA0nz1Tx16Mk14=";
-    })
-  ];
-
   build-system = [ setuptools ];
 
   dependencies = [
@@ -200,7 +190,7 @@ buildPythonPackage rec {
     homepage = "https://github.com/huggingface/transformers";
     description = "Natural Language Processing for TensorFlow 2.0 and PyTorch";
     mainProgram = "transformers-cli";
-    changelog = "https://github.com/huggingface/transformers/releases/tag/${src.tag}";
+    changelog = "https://github.com/huggingface/transformers/releases/tag/v${version}";
     license = lib.licenses.asl20;
     platforms = lib.platforms.unix;
     maintainers = with lib.maintainers; [

pkgs/development/tools/build-managers/gradle/default.nix

@@ -230,8 +230,8 @@ rec {
   # https://docs.gradle.org/current/userguide/compatibility.html
 
   gradle_8 = gen {
-    version = "8.12";
-    hash = "sha256-egDVH7kxR4Gaq3YCT+7OILa4TkIGlBAfJ2vpUuCL7wM=";
+    version = "8.12.1";
+    hash = "sha256-jZepeYT2y9K4X+TGCnQ0QKNHVEvxiBgEjmEfUojUbJQ=";
     defaultJava = jdk21;
   };
 
@@ -259,7 +259,8 @@ rec {
         gradle = gradle-unwrapped.override args;
       in
       symlinkJoin {
-        name = "gradle-${gradle.version}";
+        pname = "gradle";
+        inherit (gradle) version;
 
         paths = [
           (makeSetupHook { name = "gradle-setup-hook"; } (concatTextFile {

pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix

@@ -10,7 +10,7 @@
   menhir,
   menhirLib,
   sedlex,
-  version ? if lib.versionAtLeast ocaml.version "4.11" then "5.9.1" else "5.8.2",
+  version ? if lib.versionAtLeast ocaml.version "4.11" then "6.0.1" else "5.8.2",
 }:
 
 buildDunePackage {
@@ -22,6 +22,7 @@ buildDunePackage {
     url = "https://github.com/ocsigen/js_of_ocaml/releases/download/${version}/js_of_ocaml-${version}.tbz";
     hash =
       {
+        "6.0.1" = "sha256-gT2+4rYuFUEEnqI6IOQFzyROJ+v6mFl4XPpT4obSxhQ=";
         "5.9.1" = "sha256-aMlcYIcdjpyaVMgvNeLtUEE7y0QPIg0LNRayoe4ccwc=";
         "5.8.2" = "sha256-ciAZS9L5sU2VgVOlogZ1A1nXtJ3hL+iNdFDThc7L8Eo=";
       }

pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix

@@ -1,6 +1,5 @@
 {
   buildDunePackage,
-  js_of_ocaml-compiler,
   js_of_ocaml-ppx,
   js_of_ocaml,
   lwt,
@@ -10,7 +9,7 @@
 buildDunePackage {
   pname = "js_of_ocaml-lwt";
 
-  inherit (js_of_ocaml-compiler) version src;
+  inherit (js_of_ocaml) version src meta;
 
   buildInputs = [ js_of_ocaml-ppx ];
 
@@ -19,6 +18,4 @@ buildDunePackage {
     lwt
     lwt_log
   ];
-
-  meta = builtins.removeAttrs js_of_ocaml-compiler.meta [ "mainProgram" ];
 }

pkgs/development/tools/ocaml/js_of_ocaml/ppx.nix

@@ -1,17 +1,14 @@
 {
   buildDunePackage,
-  js_of_ocaml-compiler,
-  ppxlib,
   js_of_ocaml,
+  ppxlib,
 }:
 
 buildDunePackage {
   pname = "js_of_ocaml-ppx";
 
-  inherit (js_of_ocaml-compiler) version src;
+  inherit (js_of_ocaml) version src meta;
 
   buildInputs = [ js_of_ocaml ];
   propagatedBuildInputs = [ ppxlib ];
-
-  meta = builtins.removeAttrs js_of_ocaml-compiler.meta [ "mainProgram" ];
 }

pkgs/development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix

@@ -1,6 +1,5 @@
 {
   buildDunePackage,
-  js_of_ocaml-compiler,
   js_of_ocaml,
   ppxlib,
 }:
@@ -8,12 +7,10 @@
 buildDunePackage {
   pname = "js_of_ocaml-ppx_deriving_json";
 
-  inherit (js_of_ocaml-compiler) version src;
+  inherit (js_of_ocaml) version src meta;
 
   propagatedBuildInputs = [
     js_of_ocaml
     ppxlib
   ];
-
-  meta = builtins.removeAttrs js_of_ocaml-compiler.meta [ "mainProgram" ];
 }

pkgs/development/tools/ocaml/js_of_ocaml/tyxml.nix

@@ -1,6 +1,5 @@
 {
   buildDunePackage,
-  js_of_ocaml-compiler,
   js_of_ocaml-ppx,
   js_of_ocaml,
   reactivedata,
@@ -10,7 +9,7 @@
 buildDunePackage {
   pname = "js_of_ocaml-tyxml";
 
-  inherit (js_of_ocaml-compiler) version src;
+  inherit (js_of_ocaml) version src meta;
 
   buildInputs = [ js_of_ocaml-ppx ];
 
@@ -19,6 +18,4 @@ buildDunePackage {
     reactivedata
     tyxml
   ];
-
-  meta = builtins.removeAttrs js_of_ocaml-compiler.meta [ "mainProgram" ];
 }

pkgs/servers/web-apps/plausible/default.nix

@@ -9,7 +9,7 @@
   nixosTests,
   npm-lockfile-fix,
   brotli,
-  tailwindcss,
+  tailwindcss_3,
   esbuild,
   ...
 }:
@@ -141,7 +141,7 @@ beamPackages.mixRelease rec {
     cp -r ${tracker} tracker
 
     cat >> config/config.exs <<EOF
-    config :tailwind, path: "${lib.getExe tailwindcss}"
+    config :tailwind, path: "${lib.getExe tailwindcss_3}"
     config :esbuild, path: "${lib.getExe esbuild}"
     EOF
   '';

pkgs/tools/networking/telepresence/default.nix

@@ -29,6 +29,10 @@ pythonPackages.buildPythonPackage rec {
     sha256 = "1ccc8bzcdxp6rh6llk7grcnmyc05fq7dz5w0mifdzjv3a473hsky";
   };
 
+  patches = [
+    ./fix-versioneer.patch
+  ];
+
   nativeBuildInputs = [ makeWrapper ];
 
   postInstall = ''

pkgs/tools/networking/telepresence/fix-versioneer.patch

@@ -0,0 +1,16 @@
+diff --git a/versioneer.py b/versioneer.py
+index 7e5bb402e..60d65ef76 100644
+--- a/versioneer.py
++++ b/versioneer.py
+@@ -339,9 +339,9 @@ def get_config_from_root(root):
+     # configparser.NoOptionError (if it lacks "VCS="). See the docstring at
+     # the top of versioneer.py for instructions on writing your setup.cfg .
+     setup_cfg = os.path.join(root, "setup.cfg")
+-    parser = configparser.SafeConfigParser()
++    parser = configparser.ConfigParser()
+     with open(setup_cfg, "r") as f:
+-        parser.readfp(f)
++        parser.read_file(f)
+     VCS = parser.get("versioneer", "VCS")  # mandatory
+
+     def get(parser, name):

pkgs/tools/system/clinfo/default.nix

@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation rec {
   pname = "clinfo";
-  version = "3.0.23.01.25";
+  version = "3.0.25.02.14";
 
   src = fetchFromGitHub {
     owner = "Oblomov";
     repo = "clinfo";
     rev = version;
-    sha256 = "sha256-1jZP4SnLIHh3vQJLBp+j/eQ1c8XBGFR2hjYxflhpWAU=";
+    sha256 = "sha256-UkkrRpmY5vZtTeEqPNYfxAGaJDoTSrNUG9N1Bknozow=";
   };
 
   buildInputs =

pkgs/top-level/all-packages.nix

@@ -3476,10 +3476,6 @@ with pkgs;
 
   gdown = with python3Packages; toPythonApplication gdown;
 
-  goverlay = qt6Packages.callPackage ../tools/graphics/goverlay {
-    inherit (qt6Packages) libqtpas wrapQtAppsHook;
-  };
-
   gpt4all-cuda = gpt4all.override {
     cudaSupport = true;
   };
@@ -17368,9 +17364,6 @@ with pkgs;
     imagemagick = graphicsmagick-imagemagick-compat;
   };
 
-  yoda = callPackage ../development/libraries/physics/yoda {
-    python = python3;
-  };
   yoda-with-root = lowPrio (yoda.override {
     withRootSupport = true;
   });
@@ -17925,8 +17918,6 @@ with pkgs;
 
   unityhub = callPackage ../development/tools/unityhub { };
 
-  unixcw = libsForQt5.callPackage ../applications/radio/unixcw { };
-
   vaultenv = haskell.lib.justStaticExecutables haskellPackages.vaultenv;
 
   vaultwarden = callPackage ../tools/security/vaultwarden {

pkgs/top-level/ocaml-packages.nix

@@ -460,7 +460,15 @@ let
       stdenv = pkgs.gcc13Stdenv;
     };
 
-    eliom = callPackage ../development/ocaml-modules/eliom { };
+    eliom = let
+      js_of_ocaml-compiler = self.js_of_ocaml-compiler.override { version = "5.9.1"; };
+      js_of_ocaml = self.js_of_ocaml.override { inherit js_of_ocaml-compiler; };
+    in callPackage ../development/ocaml-modules/eliom rec {
+      js_of_ocaml-ppx = self.js_of_ocaml-ppx.override { inherit js_of_ocaml; };
+      js_of_ocaml-ppx_deriving_json = self.js_of_ocaml-ppx_deriving_json.override { inherit js_of_ocaml; };
+      js_of_ocaml-lwt = self.js_of_ocaml-lwt.override { inherit js_of_ocaml js_of_ocaml-ppx; };
+      js_of_ocaml-tyxml = self.js_of_ocaml-tyxml.override { inherit js_of_ocaml js_of_ocaml-ppx; };
+    };
 
     elpi = callPackage ../development/ocaml-modules/elpi (
       let ppxlib_0_15 = if lib.versionAtLeast ppxlib.version "0.15"
@@ -1425,7 +1433,12 @@ let
 
     ocsigen-start = callPackage ../development/ocaml-modules/ocsigen-start { };
 
-    ocsigen-toolkit = callPackage ../development/ocaml-modules/ocsigen-toolkit { };
+    ocsigen-toolkit = let
+      js_of_ocaml-compiler = self.js_of_ocaml-compiler.override { version = "5.9.1"; };
+      js_of_ocaml = self.js_of_ocaml.override { inherit js_of_ocaml-compiler; };
+    in callPackage ../development/ocaml-modules/ocsigen-toolkit {
+      js_of_ocaml-ppx_deriving_json = self.js_of_ocaml-ppx_deriving_json.override { inherit js_of_ocaml; };
+    };
 
     ocsipersist = callPackage ../development/ocaml-modules/ocsipersist {};
 

pkgs/top-level/python-packages.nix

@@ -4275,6 +4275,8 @@ self: super: with self; {
 
   esphome-dashboard-api = callPackage ../development/python-modules/esphome-dashboard-api { };
 
+  esphome-glyphsets = callPackage ../development/python-modules/esphome-glyphsets { };
+
   esprima = callPackage ../development/python-modules/esprima { };
 
   escapism = callPackage ../development/python-modules/escapism { };
@@ -18630,7 +18632,7 @@ self: super: with self; {
 
   yfinance = callPackage ../development/python-modules/yfinance { };
 
-  yoda = toPythonModule (pkgs.yoda.override { inherit python; });
+  yoda = toPythonModule (pkgs.yoda.override { python3 = python; });
 
   yolink-api = callPackage ../development/python-modules/yolink-api { };