diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md index ab9a4209b979..762b593263bc 100644 --- a/doc/release-notes/rl-2511.section.md +++ b/doc/release-notes/rl-2511.section.md @@ -33,6 +33,8 @@ - `conftest` since `0.60.0` has moved to use rego `v1` as default. To continue using `v0` use `--rego-version v0`. For more information about upgrading to Rego v1 syntax, see the [upstream docs](https://www.openpolicyagent.org/docs/latest/v0-upgrade/). +- `stalwart-mail` since `0.13.0` "introduces a significant redesign of the MTA’s delivery and queueing subsystem". See [the upgrading announcement for the `0.13.0` release](https://github.com/stalwartlabs/stalwart/blob/89b561b5ca1c5a11f2a768b4a2cfef0f473b7a01/UPGRADING.md#upgrading-from-v012x-and-v011x-to-v013x). + - The `archipelago-minecraft` package was removed, as upstream no longer provides support for the Minecraft APWorld. - `tooling-language-server` has been renamed to `deputy` (both the package and binary), following the rename of the upstream project. diff --git a/nixos/modules/services/mail/stalwart-mail.nix b/nixos/modules/services/mail/stalwart-mail.nix index 9975bcc56672..d9d6e119d9f3 100644 --- a/nixos/modules/services/mail/stalwart-mail.nix +++ b/nixos/modules/services/mail/stalwart-mail.nix @@ -71,6 +71,23 @@ in }; config = lib.mkIf cfg.enable { + assertions = [ + { + assertion = + !( + (lib.hasAttrByPath [ "settings" "queue" ] cfg) + && (builtins.any (lib.hasAttrByPath [ + "value" + "next-hop" + ]) (lib.attrsToList cfg.settings.queue)) + ); + message = '' + Stalwart deprecated `next-hop` in favor of "virtual queues" `queue.strategy.route` \ + with v0.13.0 see [Outbound Strategy](https://stalw.art/docs/mta/outbound/strategy/#configuration) \ + and [release announcement](https://github.com/stalwartlabs/stalwart/blob/main/UPGRADING.md#upgrading-from-v012x-and-v011x-to-v013x). + ''; + } + ]; # Default config: all local services.stalwart-mail.settings = { diff --git a/nixos/tests/stalwart/stalwart-mail-config.nix b/nixos/tests/stalwart/stalwart-mail-config.nix index 800090ab5949..cb2989033763 100644 --- a/nixos/tests/stalwart/stalwart-mail-config.nix +++ b/nixos/tests/stalwart/stalwart-mail-config.nix @@ -50,7 +50,7 @@ in storage.lookup = "rocksdb"; session.rcpt.directory = "'in-memory'"; - queue.outbound.next-hop = "'local'"; + queue.strategy.route = "'local'"; store."rocksdb" = { type = "rocksdb"; diff --git a/pkgs/applications/graphics/rawtherapee/default.nix b/pkgs/applications/graphics/rawtherapee/default.nix index 307e3cf403ba..e1d571e4dbd0 100644 --- a/pkgs/applications/graphics/rawtherapee/default.nix +++ b/pkgs/applications/graphics/rawtherapee/default.nix @@ -50,7 +50,15 @@ stdenv.mkDerivation rec { }; postPatch = '' - echo "set(HG_VERSION ${version})" > ReleaseInfo.cmake + cat < ReleaseInfo.cmake + set(GIT_DESCRIBE ${version}) + set(GIT_BRANCH ${version}) + set(GIT_VERSION ${version}) + # Missing GIT_COMMIT and GIT_COMMIT_DATE, which are not easy to obtain. + set(GIT_COMMITS_SINCE_TAG 0) + set(GIT_COMMITS_SINCE_BRANCH 0) + set(GIT_VERSION_NUMERIC_BS ${version}) + EOF substituteInPlace tools/osx/Info.plist.in rtgui/config.h.in \ --replace "/Applications" "${placeholder "out"}/Applications" ''; diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 7b0a8a2da750..4861dc40bf33 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -9,11 +9,11 @@ "vendorHash": "sha256-nHaBNYCKfTvaDnz2SeexM2cyNVK5ThPYn4rnGEw7Wi0=" }, "aci": { - "hash": "sha256-NS5q6ElCGEGSceOCIVudKE6m6EzXMV/3HGHHXwYopOA=", + "hash": "sha256-+aD4M07xXMTbvp69IuGlO3rSkVEi5NVe5fqEPkWNeM0=", "homepage": "https://registry.terraform.io/providers/CiscoDevNet/aci", "owner": "CiscoDevNet", "repo": "terraform-provider-aci", - "rev": "v2.16.0", + "rev": "v2.17.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -363,11 +363,11 @@ "vendorHash": "sha256-quoFrJbB1vjz+MdV+jnr7FPACHuUe5Gx9POLubD2IaM=" }, "digitalocean": { - "hash": "sha256-+JX1EJBRJee6nvn5srwGWSE++LagHw+n1bgfZTBXzKU=", + "hash": "sha256-tR4qN0N+tJu1fmiFIwTTIQyOTsqrVi2DSWJjU6oVdwE=", "homepage": "https://registry.terraform.io/providers/digitalocean/digitalocean", "owner": "digitalocean", "repo": "terraform-provider-digitalocean", - "rev": "v2.60.0", + "rev": "v2.61.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -732,11 +732,11 @@ "vendorHash": "sha256-FcxAh8EOvnT8r1GHu0Oj2C5Jgbr2WPwD7/vY4/qIvTA=" }, "kubernetes": { - "hash": "sha256-JUlthPqYTYlsKyPAjyN9N0A0i8aMJh3tAtwH1vHjzJs=", + "hash": "sha256-QVHLGLTzr39liRcM5AKJ0unYoc/DW2elcJWisiHC2pw=", "homepage": "https://registry.terraform.io/providers/hashicorp/kubernetes", "owner": "hashicorp", "repo": "terraform-provider-kubernetes", - "rev": "v2.37.1", + "rev": "v2.38.0", "spdx": "MPL-2.0", "vendorHash": "sha256-LeMFN4pOJotTTqakEbVelHSTEb4p7CQIuKzeuX3SZUM=" }, @@ -922,11 +922,11 @@ "vendorHash": "sha256-LRIfxQGwG988HE5fftGl6JmBG7tTknvmgpm4Fu1NbWI=" }, "oci": { - "hash": "sha256-4Clqd/WO2nmKHQkIf33BROnQveKAvogWdiIabYfU390=", + "hash": "sha256-xdVHJWEvap6Bp/r5hz/113kJF6SexsCROFkQgRTJgYA=", "homepage": "https://registry.terraform.io/providers/oracle/oci", "owner": "oracle", "repo": "terraform-provider-oci", - "rev": "v7.10.0", + "rev": "v7.11.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -1156,13 +1156,13 @@ "vendorHash": "sha256-HKmIl/GjGJZmhWLrK3lMjYo1F5nmo+U9ZpvBo5hDH/0=" }, "scaleway": { - "hash": "sha256-rSchMweT5Hxz2tpX6V7cBzntJzIeFB46bjV9lkaIWAQ=", + "hash": "sha256-/LyxYC+x6e5SQ12iZLxtbgFkF9MvotUlBYdK3/BiiAo=", "homepage": "https://registry.terraform.io/providers/scaleway/scaleway", "owner": "scaleway", "repo": "terraform-provider-scaleway", - "rev": "v2.57.0", + "rev": "v2.58.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-p9rESR1A1SEYlvjf8du2j2yAlI39LsMRcPvyyJIwWdg=" + "vendorHash": "sha256-Fsa4I8aYHiK9V8arwd64piASA8qAPmGZRqDPK5ec3uk=" }, "secret": { "hash": "sha256-MmAnA/4SAPqLY/gYcJSTnEttQTsDd2kEdkQjQj6Bb+A=", diff --git a/pkgs/applications/office/mendeley/default.nix b/pkgs/applications/office/mendeley/default.nix index 2e08508ef6f5..44be311190a3 100644 --- a/pkgs/applications/office/mendeley/default.nix +++ b/pkgs/applications/office/mendeley/default.nix @@ -8,13 +8,13 @@ let pname = "mendeley"; - version = "2.135.0"; + version = "2.136.0"; executableName = "${pname}-reference-manager"; src = fetchurl { url = "https://static.mendeley.com/bin/desktop/mendeley-reference-manager-${version}-x86_64.AppImage"; - hash = "sha256-fJ2rW3VKN4TqwDCCDlPpSFckoBjBtmMOvXanqqMS7AM="; + hash = "sha256-NAH4BwWEdI1WFWgPJIPbWkpkN/qxR2+8NwGtdCeohbA="; }; appimageContents = appimageTools.extractType2 { diff --git a/pkgs/applications/science/astronomy/celestia/default.nix b/pkgs/applications/science/astronomy/celestia/default.nix index 407a47964c76..288ccfa194db 100644 --- a/pkgs/applications/science/astronomy/celestia/default.nix +++ b/pkgs/applications/science/astronomy/celestia/default.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch2, pkg-config, libglut, gtk2, @@ -27,6 +28,18 @@ stdenv.mkDerivation rec { sha256 = "sha256-MkElGo1ZR0ImW/526QlDE1ePd+VOQxwkX7l+0WyZ6Vs="; }; + patches = [ + (fetchpatch2 { + url = "https://github.com/CelestiaProject/Celestia/commit/94894bed3bf98d41c5097e7829d491d8ff8d4a62.patch?full_index=1"; + hash = "sha256-hEZ6BhSEx6Qm+fLisc63xSCDT6GX92AHD0BuldOhzFk="; + }) + ]; + + postPatch = '' + substituteInPlace configure.ac \ + --replace-fail "dnl AM_GNU_GETTEXT_VERSION([0.15])" "AM_GNU_GETTEXT_VERSION([0.15])" + ''; + nativeBuildInputs = [ pkg-config autoreconfHook diff --git a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprsplit.nix b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprsplit.nix index a094d3c8478f..06b0f1e10ce7 100644 --- a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprsplit.nix +++ b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprsplit.nix @@ -9,13 +9,13 @@ }: mkHyprlandPlugin hyprland rec { pluginName = "hyprsplit"; - version = "0.49.0"; + version = "0.50.1"; src = fetchFromGitHub { owner = "shezdy"; repo = "hyprsplit"; - rev = "refs/tags/v${version}"; - hash = "sha256-0jrsiUoQi/VXM2Ji7YTOEYDYYlBI2C3ZbgQpYoAEVKI="; + tag = "v${version}"; + hash = "sha256-D0zfdUJXBRnNMmv/5qW+X4FJJ3/+t7yQmwJFkBuEgck="; }; nativeBuildInputs = [ diff --git a/pkgs/build-support/php/builders/v2/hooks/composer-vendor-hook.sh b/pkgs/build-support/php/builders/v2/hooks/composer-vendor-hook.sh index 9fccc90d014a..53503194cfa4 100644 --- a/pkgs/build-support/php/builders/v2/hooks/composer-vendor-hook.sh +++ b/pkgs/build-support/php/builders/v2/hooks/composer-vendor-hook.sh @@ -5,6 +5,14 @@ source @phpScriptUtils@ declare -g out declare -g composerLock +declare -g composerNoDev +declare -g composerNoPlugins +declare -g composerNoScripts + +declare -ga composerFlags=() +[[ -n "$composerNoDev" ]] && composerFlags+=(--no-dev) +[[ -n "$composerNoPlugins" ]] && composerFlags+=(--no-plugins) +[[ -n "$composerNoScripts" ]] && composerFlags+=(--no-scripts) preConfigureHooks+=(composerVendorConfigureHook) preBuildHooks+=(composerVendorBuildHook) @@ -32,9 +40,7 @@ composerVendorConfigureHook() { --no-interaction \ --no-progress \ --optimize-autoloader \ - ${composerNoDev:+--no-dev} \ - ${composerNoPlugins:+--no-plugins} \ - ${composerNoScripts:+--no-scripts} \ + "${composerFlags[@]}" \ update if [[ -f "composer.lock" ]]; then @@ -76,9 +82,7 @@ composerVendorBuildHook() { --no-interaction \ --no-progress \ --optimize-autoloader \ - ${composerNoDev:+--no-dev} \ - ${composerNoPlugins:+--no-plugins} \ - ${composerNoScripts:+--no-scripts} \ + "${composerFlags[@]}" \ install echo "Finished composerVendorBuildHook" diff --git a/pkgs/by-name/ab/abcde/package.nix b/pkgs/by-name/ab/abcde/package.nix index 517ddd6539e3..1b64dcbb07e7 100644 --- a/pkgs/by-name/ab/abcde/package.nix +++ b/pkgs/by-name/ab/abcde/package.nix @@ -27,6 +27,8 @@ stdenv.mkDerivation (finalAttrs: { # FIXME: This package does not support `distmp3', `eject', etc. configurePhase = '' + runHook preConfigure + sed -i "s|^[[:blank:]]*prefix *=.*$|prefix = $out|g ; s|^[[:blank:]]*etcdir *=.*$|etcdir = $out/etc|g ; s|^[[:blank:]]*INSTALL *=.*$|INSTALL = install -c|g" \ @@ -37,6 +39,8 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace "abcde" \ --replace "/etc/abcde.conf" "$out/etc/abcde.conf" + + runHook postConfigure ''; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/ae/aerospace/package.nix b/pkgs/by-name/ae/aerospace/package.nix index 1731a4a66d9a..dfedcbf3dea0 100644 --- a/pkgs/by-name/ae/aerospace/package.nix +++ b/pkgs/by-name/ae/aerospace/package.nix @@ -9,7 +9,7 @@ let appName = "AeroSpace.app"; - version = "0.18.5-Beta"; + version = "0.19.2-Beta"; in stdenv.mkDerivation { pname = "aerospace"; @@ -18,7 +18,7 @@ stdenv.mkDerivation { src = fetchzip { url = "https://github.com/nikitabobko/AeroSpace/releases/download/v${version}/AeroSpace-v${version}.zip"; - sha256 = "sha256-rF4emnLNVE1fFlxExliN7clSBocBrPwQOwBqRtX9Q4o="; + sha256 = "sha256-6RyGw84GhGwULzN0ObjsB3nzRu1HYQS/qoCvzVWOYWQ="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/ai/aiger/package.nix b/pkgs/by-name/ai/aiger/package.nix index 00cdde0997ce..0c79ee9c9575 100644 --- a/pkgs/by-name/ai/aiger/package.nix +++ b/pkgs/by-name/ai/aiger/package.nix @@ -46,12 +46,16 @@ stdenv.mkDerivation rec { }; configurePhase = '' + runHook preConfigure + # Set up picosat, so we can build 'aigbmc' mkdir ../picosat ln -s ${picosat}/include/picosat/picosat.h ../picosat/picosat.h ln -s ${picosat}/lib/picosat.o ../picosat/picosat.o ln -s ${picosat}/share/picosat.version ../picosat/VERSION ./configure.sh + + runHook postConfigure ''; postBuild = '' diff --git a/pkgs/by-name/as/async-profiler/package.nix b/pkgs/by-name/as/async-profiler/package.nix index 44737209b9af..ce1ac1d6e498 100644 --- a/pkgs/by-name/as/async-profiler/package.nix +++ b/pkgs/by-name/as/async-profiler/package.nix @@ -8,13 +8,13 @@ }: stdenv.mkDerivation rec { pname = "async-profiler"; - version = "4.0"; + version = "4.1"; src = fetchFromGitHub { owner = "jvm-profiling-tools"; repo = "async-profiler"; rev = "v${version}"; - hash = "sha256-4S5Lbhqu2V7TzrbFf3G3G4OEYLU6w5lcgUl49k9YqSA="; + hash = "sha256-82aZK9y1Y5PaYtIG7FqnrbYU+bQ3nNzOCn+3lFzyeCA="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/au/auto-cpufreq/package.nix b/pkgs/by-name/au/auto-cpufreq/package.nix index 71899abad4ed..8f26f63605e5 100644 --- a/pkgs/by-name/au/auto-cpufreq/package.nix +++ b/pkgs/by-name/au/auto-cpufreq/package.nix @@ -9,10 +9,11 @@ getent, nixosTests, }: + python3Packages.buildPythonPackage rec { pname = "auto-cpufreq"; version = "2.6.0"; - format = "pyproject"; + pyproject = true; src = fetchFromGitHub { owner = "AdnanHodzic"; @@ -21,35 +22,6 @@ python3Packages.buildPythonPackage rec { hash = "sha256-DEs6jbWYJFJgpaPtF5NT3DQs3erjzdm2brLNHpjrEPA="; }; - nativeBuildInputs = [ - gobject-introspection - wrapGAppsHook3 - ]; - - buildInputs = [ - gtk3 - python3Packages.poetry-core - ]; - - propagatedBuildInputs = - with python3Packages; - [ - click - distro - psutil - pygobject3 - poetry-dynamic-versioning - setuptools - pyinotify - urwid - pyasyncore - requests - ] - ++ [ getent ]; - - doCheck = false; - pythonImportsCheck = [ "auto_cpufreq" ]; - patches = [ # hardcodes version output (replaceVars ./fix-version-output.patch { @@ -64,38 +36,73 @@ python3Packages.buildPythonPackage rec { postPatch = '' substituteInPlace auto_cpufreq/core.py \ - --replace-fail '/opt/auto-cpufreq/override.pickle' /var/run/override.pickle + --replace-fail "/opt/auto-cpufreq/override.pickle" "/var/run/override.pickle" substituteInPlace scripts/org.auto-cpufreq.pkexec.policy \ - --replace-fail "/opt/auto-cpufreq/venv/bin/auto-cpufreq" $out/bin/auto-cpufreq + --replace-fail "/opt/auto-cpufreq/venv/bin/auto-cpufreq" "$out/bin/auto-cpufreq" substituteInPlace auto_cpufreq/gui/app.py auto_cpufreq/gui/objects.py \ - --replace-fail "/usr/local/share/auto-cpufreq/images/icon.png" $out/share/pixmaps/auto-cpufreq.png + --replace-fail "/usr/local/share/auto-cpufreq/images/icon.png" "$out/share/icons/hicolor/512x512/apps/auto-cpufreq.png" substituteInPlace auto_cpufreq/gui/app.py \ - --replace-fail "/usr/local/share/auto-cpufreq/scripts/style.css" $out/share/auto-cpufreq/scripts/style.css + --replace-fail "/usr/local/share/auto-cpufreq/scripts/style.css" "$out/share/auto-cpufreq/scripts/style.css" ''; - postInstall = '' + build-system = with python3Packages; [ + poetry-core + poetry-dynamic-versioning + ]; + + dependencies = with python3Packages; [ + click + distro + psutil + pygobject3 + poetry-dynamic-versioning + setuptools + pyinotify + urwid + pyasyncore + requests + ]; + + nativeBuildInputs = [ + gobject-introspection + wrapGAppsHook3 + ]; + + buildInputs = [ gtk3 ]; + + propagatedBuildInputs = [ getent ]; + + postInstall = # copy script manually - cp ${src}/scripts/cpufreqctl.sh $out/bin/cpufreqctl.auto-cpufreq - + '' + install -Dm 0755 scripts/cpufreqctl.sh $out/bin/cpufreqctl.auto-cpufreq + '' # copy css file - mkdir -p $out/share/auto-cpufreq/scripts - cp scripts/style.css $out/share/auto-cpufreq/scripts/style.css - + + '' + install -Dm 0644 scripts/style.css $out/share/auto-cpufreq/scripts/style.css + '' # systemd service - mkdir -p $out/lib/systemd/system - cp ${src}/scripts/auto-cpufreq.service $out/lib/systemd/system - + + '' + install -Dm 0644 scripts/auto-cpufreq.service -t $out/lib/systemd/system + '' # desktop icon - mkdir -p $out/share/applications - mkdir $out/share/pixmaps - cp scripts/auto-cpufreq-gtk.desktop $out/share/applications - cp images/icon.png $out/share/pixmaps/auto-cpufreq.png - + + '' + install -Dm 0644 scripts/auto-cpufreq-gtk.desktop -t $out/share/applications + install -Dm 0644 images/icon.png $out/share/icons/hicolor/512x512/apps/auto-cpufreq.png + '' # polkit policy - mkdir -p $out/share/polkit-1/actions - cp scripts/org.auto-cpufreq.pkexec.policy $out/share/polkit-1/actions + + '' + install -Dm 0644 scripts/org.auto-cpufreq.pkexec.policy -t $out/share/polkit-1/actions + ''; + + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") ''; + pythonImportsCheck = [ "auto_cpufreq" ]; + passthru.tests = { inherit (nixosTests) auto-cpufreq; }; diff --git a/pkgs/by-name/bi/bitcomet/package.nix b/pkgs/by-name/bi/bitcomet/package.nix index 32b6cda4b3c1..bd68ae671bef 100644 --- a/pkgs/by-name/bi/bitcomet/package.nix +++ b/pkgs/by-name/bi/bitcomet/package.nix @@ -1,44 +1,96 @@ { lib, + stdenvNoCC, + buildFHSEnv, appimageTools, fetchurl, + desktop-file-utils, + dpkg, + webkitgtk_4_0, + runScript ? "BitComet", }: let pname = "bitcomet"; - version = "2.13.2"; - - src = fetchurl { - url = "https://download.bitcomet.com/linux/x86_64/BitComet-${version}-x86_64.AppImage"; - hash = "sha256-T66hmWmjt7ZZj03IxTSYtNUBoFHgwOoAIOHMyJSAmbU="; - }; - - appimageContents = appimageTools.extractType2 { inherit pname version src; }; -in -appimageTools.wrapType2 { - inherit pname version src; - - extraPkgs = - pkgs: with pkgs; [ - libxml2 - libpng - webkitgtk_4_0 - ]; - - extraInstallCommands = '' - install -Dm644 ${appimageContents}/com.bitcomet.linux.desktop $out/share/applications/bitcomet.desktop - substituteInPlace $out/share/applications/bitcomet.desktop \ - --replace-fail "Exec=usr/bin/BitComet" "Exec=bitcomet" - cp -r ${appimageContents}/usr/share/icons $out/share/icons - ''; + version = "2.15.0"; meta = { homepage = "https://www.bitcomet.com"; description = "BitTorrent download client"; - mainProgram = "bitcomet"; + mainProgram = "BitComet"; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfree; - platforms = [ "x86_64-linux" ]; + platforms = [ + "aarch64-linux" + "x86_64-linux" + ]; maintainers = with lib.maintainers; [ ]; }; + + bitcomet = stdenvNoCC.mkDerivation { + inherit pname version meta; + + src = + let + selectSystem = + attrs: + attrs.${stdenvNoCC.hostPlatform.system} + or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}"); + arch = selectSystem { + x86_64-linux = "x86_64"; + aarch64-linux = "arm64"; + }; + in + fetchurl { + url = "https://download.bitcomet.com/linux/${arch}/BitComet-${version}-${arch}.deb"; + hash = selectSystem { + x86_64-linux = "sha256-YmcHcrqw4Ue8uyQqYcLWTYS5WYQro3kk7VLY8pfIsRQ="; + aarch64-linux = "sha256-Bfg20aKU90Ap8scn4eHtf451uxPfWcnQCrh5gWRQmsU="; + }; + }; + + nativeBuildInputs = [ + dpkg + desktop-file-utils + ]; + + installPhase = '' + runHook preInstall + + desktop-file-edit usr/share/applications/bitcomet.desktop \ + --remove-key="Version" \ + --remove-key="Comment" \ + --set-key="Exec" --set-value="BitComet" \ + --set-icon="bitcomet" + cp -r usr $out + + runHook postInstall + ''; + }; +in +buildFHSEnv { + inherit + pname + version + runScript + meta + ; + + executableName = "BitComet"; + + targetPkgs = + pkgs: + [ + bitcomet + webkitgtk_4_0 + ] + ++ appimageTools.defaultFhsEnvArgs.targetPkgs pkgs; + + multiPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs; + + extraInstallCommands = '' + mkdir -p $out/share + ln -s ${bitcomet}/share/applications $out/share/applications + ln -s ${bitcomet}/share/icons $out/share/icons + ''; } diff --git a/pkgs/by-name/bu/buffer/package.nix b/pkgs/by-name/bu/buffer/package.nix index 6dd991fa261b..2e91c32e236c 100644 --- a/pkgs/by-name/bu/buffer/package.nix +++ b/pkgs/by-name/bu/buffer/package.nix @@ -18,14 +18,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "buffer"; - version = "0.10.0"; + version = "0.10.1"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "cheywood"; repo = "buffer"; tag = finalAttrs.version; - hash = "sha256-81riamRKzV4wXVTXkp1ngO/5mG7leRJMw/r2DDHl8LU="; + hash = "sha256-AkgmKMMy3tBgJudJ2Mm8LFV+aE0QbviKxgAJEZ9A3cg="; }; cargoDeps = rustPlatform.fetchCargoVendor { diff --git a/pkgs/by-name/ca/caps/package.nix b/pkgs/by-name/ca/caps/package.nix index 1e37af40dbac..5f12ee25b738 100644 --- a/pkgs/by-name/ca/caps/package.nix +++ b/pkgs/by-name/ca/caps/package.nix @@ -12,7 +12,11 @@ stdenv.mkDerivation rec { }; configurePhase = '' + runHook preConfigure + echo "PREFIX = $out" > defines.make + + runHook postConfigure ''; meta = { diff --git a/pkgs/by-name/cf/cfonts/package.nix b/pkgs/by-name/cf/cfonts/package.nix index 287d54ed9f75..226aa06b9f45 100644 --- a/pkgs/by-name/cf/cfonts/package.nix +++ b/pkgs/by-name/cf/cfonts/package.nix @@ -5,14 +5,14 @@ }: rustPlatform.buildRustPackage rec { pname = "cfonts"; - version = "1.2.0"; + version = "1.3.0"; src = fetchCrate { inherit pname version; - hash = "sha256-W5hN+b4R50tNfYb3WrM0z5Etm6ixa11pZWnzGC9bjSs="; + hash = "sha256-rgdqQzJyb1/bYB3S1MD/53vdQ+GaxOvGHuPE6dxMRB0="; }; - cargoHash = "sha256-MXUUvk7R1JdjNlZ7h3ymUAPOT/A0I8TOW3saBB4C94o="; + cargoHash = "sha256-Gf4W7ACyyVSCXV2RmpAfrE7Xircjk34Llk2j58cWXtU="; meta = with lib; { homepage = "https://github.com/dominikwilkowski/cfonts"; diff --git a/pkgs/by-name/cg/cgui/package.nix b/pkgs/by-name/cg/cgui/package.nix index 3e416d14f73b..ed6425d2290b 100644 --- a/pkgs/by-name/cg/cgui/package.nix +++ b/pkgs/by-name/cg/cgui/package.nix @@ -25,7 +25,11 @@ stdenv.mkDerivation rec { ]; configurePhase = '' + runHook preConfigure + sh fix.sh unix + + runHook postConfigure ''; hardeningDisable = [ "format" ]; diff --git a/pkgs/by-name/ch/check50/package.nix b/pkgs/by-name/ch/check50/package.nix index 4651da8a8150..f82720beca02 100644 --- a/pkgs/by-name/ch/check50/package.nix +++ b/pkgs/by-name/ch/check50/package.nix @@ -7,14 +7,14 @@ python3Packages.buildPythonApplication rec { pname = "check50"; - version = "3.3.11"; + version = "3.4.0"; pyproject = true; src = fetchFromGitHub { owner = "cs50"; repo = "check50"; tag = "v${version}"; - hash = "sha256-+qyEMzAJG/fyIqj+0mk0HTxTlQk6sHZhvmfd9Hgj/aw="; + hash = "sha256-3WxFdXECIjbTxHK65BFnxOroEYzu7iOJwm15gIjitLA="; }; build-system = [ @@ -45,7 +45,7 @@ python3Packages.buildPythonApplication rec { description = "Testing tool for checking student CS50 code"; homepage = "https://cs50.readthedocs.io/projects/check50/en/latest/"; downloadPage = "https://github.com/cs50/check50"; - changelog = "https://github.com/cs50/check50/releases/tag/v${version}"; + changelog = "https://github.com/cs50/check50/releases/tag/${src.tag}"; license = lib.licenses.gpl3Only; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ ethancedwards8 ]; diff --git a/pkgs/by-name/ch/chirp/package.nix b/pkgs/by-name/ch/chirp/package.nix index 0cc988b8c02f..c7eacf5d33e4 100644 --- a/pkgs/by-name/ch/chirp/package.nix +++ b/pkgs/by-name/ch/chirp/package.nix @@ -11,14 +11,14 @@ python3Packages.buildPythonApplication { pname = "chirp"; - version = "0.4.0-unstable-2025-07-17"; + version = "0.4.0-unstable-2025-07-25"; pyproject = true; src = fetchFromGitHub { owner = "kk7ds"; repo = "chirp"; - rev = "c28ea5e8a7d8036ccc76ec38a050fd30b84c65e4"; - hash = "sha256-hr8Q8BUanM64CktbrCazs8uvt/ssf+JBdevAMuDj6G4="; + rev = "85e0655382b2c1564c387aa2fa5e21a444887ea1"; + hash = "sha256-IrwKTJt8RXJKzZFQjrEYndQ5WmG52IiJnB+hrw89tfU="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/cl/clj-kondo/package.nix b/pkgs/by-name/cl/clj-kondo/package.nix index de4c204c81e8..32955942097a 100644 --- a/pkgs/by-name/cl/clj-kondo/package.nix +++ b/pkgs/by-name/cl/clj-kondo/package.nix @@ -6,11 +6,11 @@ buildGraalvmNativeImage (finalAttrs: { pname = "clj-kondo"; - version = "2025.06.05"; + version = "2025.07.26"; src = fetchurl { url = "https://github.com/clj-kondo/clj-kondo/releases/download/v${finalAttrs.version}/clj-kondo-${finalAttrs.version}-standalone.jar"; - sha256 = "sha256-jmQFiL8MFIuMrHPSxW27E7yZIGf+k8J5nFVXgNGIKoM="; + sha256 = "sha256-jo8iY8vEtrGTQTV98y89i2OLWW4M3u6hsXZebd7cnUw="; }; extraNativeImageBuildArgs = [ diff --git a/pkgs/by-name/cn/cnijfilter_4_00/package.nix b/pkgs/by-name/cn/cnijfilter_4_00/package.nix index 16ff7195b2fd..614e1fc126df 100644 --- a/pkgs/by-name/cn/cnijfilter_4_00/package.nix +++ b/pkgs/by-name/cn/cnijfilter_4_00/package.nix @@ -87,6 +87,8 @@ stdenv.mkDerivation { ''; configurePhase = '' + runHook preConfigure + cd libs ./autogen.sh --prefix=$out @@ -127,6 +129,8 @@ stdenv.mkDerivation { sed -e "s,cnijlgmon2_LDADD =,cnijlgmon2_LDADD = -L../../com/libs_bin${arch}," \ -i lgmon2/src/Makefile.am || die + + runHook postConfigure ''; preInstall = '' diff --git a/pkgs/by-name/da/daemontools/package.nix b/pkgs/by-name/da/daemontools/package.nix index e137079280e7..ff4b1597c869 100644 --- a/pkgs/by-name/da/daemontools/package.nix +++ b/pkgs/by-name/da/daemontools/package.nix @@ -38,6 +38,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ installShellFiles ]; configurePhase = '' + runHook preConfigure + cd daemontools-${version} sed -i -e '1 s_$_ -include ${glibc.dev}/include/errno.h_' src/conf-cc @@ -48,6 +50,8 @@ stdenv.mkDerivation rec { sed -i -e "s_^PATH=.*_PATH=$src/daemontools-${version}/compile:''${PATH}_" src/rts.tests cat ${glibc.dev}/include/errno.h + + runHook postConfigure ''; buildPhase = '' diff --git a/pkgs/by-name/db/dbgate/package.nix b/pkgs/by-name/db/dbgate/package.nix index bc3c376337b6..6fb13019a436 100644 --- a/pkgs/by-name/db/dbgate/package.nix +++ b/pkgs/by-name/db/dbgate/package.nix @@ -8,25 +8,25 @@ let pname = "dbgate"; - version = "6.5.6"; + version = "6.6.0"; src = fetchurl { aarch64-linux = { url = "https://github.com/dbgate/dbgate/releases/download/v${version}/dbgate-${version}-linux_arm64.AppImage"; - hash = "sha256-S0xlC0ht6G+RDrsMaMD4nk/vKdLvtvAtUaMaFowT/Gw="; + hash = "sha256-GFKsZ/rSMXWn2hAlRRdswDrooqUIGeIhEsMchIPEb5U="; }; x86_64-linux = { url = "https://github.com/dbgate/dbgate/releases/download/v${version}/dbgate-${version}-linux_x86_64.AppImage"; - hash = "sha256-JBE/t/IwFe02LrK4Ci+2KEtAXlH1zr5WcTmQir6yvNc="; + hash = "sha256-2g8XsljPvn2TITC1/PtBlgdrfwVDPnjmOXeOS/iQh5Q="; }; x86_64-darwin = { url = "https://github.com/dbgate/dbgate/releases/download/v${version}/dbgate-${version}-mac_x64.dmg"; - hash = "sha256-EkySGJCHAR/YCS/I6j2LZHA6/L0P8VX2WDPScj58mSg="; + hash = "sha256-ooLivNWt5IDKB779PLb4FOgk9jSU10IkB0D9OPLVKsE="; }; aarch64-darwin = { url = "https://github.com/dbgate/dbgate/releases/download/v${version}/dbgate-${version}-mac_universal.dmg"; - hash = "sha256-isOrajXB+O9y3fiSulhjoSSt/7lgu4xPMXBhUcfgK2Y="; + hash = "sha256-PqgG8dGvr4S8BhxqfvYo2BiR5KoAWon9ZI8KGKT3ujI="; }; } .${stdenv.hostPlatform.system} or (throw "dbgate: ${stdenv.hostPlatform.system} is unsupported."); diff --git a/pkgs/by-name/de/decker/package.nix b/pkgs/by-name/de/decker/package.nix index 2bed0cd4bc68..a222e307e220 100644 --- a/pkgs/by-name/de/decker/package.nix +++ b/pkgs/by-name/de/decker/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "decker"; - version = "1.56"; + version = "1.57"; src = fetchFromGitHub { owner = "JohnEarnest"; repo = "Decker"; rev = "v${version}"; - hash = "sha256-b4Z+hQ7sQf8sdFXcX4+GA9Q8gJDUeb5LuVgrd3bY6vA="; + hash = "sha256-2y/kr8kBMfHAiWO6s7rAyDYyv70NnmiKeYhYq9Zmz0Y="; }; buildInputs = [ diff --git a/pkgs/by-name/dl/dl-poly-classic-mpi/package.nix b/pkgs/by-name/dl/dl-poly-classic-mpi/package.nix index 0c6972e1d9be..412c6d57b568 100644 --- a/pkgs/by-name/dl/dl-poly-classic-mpi/package.nix +++ b/pkgs/by-name/dl/dl-poly-classic-mpi/package.nix @@ -20,8 +20,12 @@ stdenv.mkDerivation { buildInputs = [ mpi ]; configurePhase = '' + runHook preConfigure + cd source cp -v ../build/MakePAR Makefile + + runHook postConfigure ''; # https://gitlab.com/DL_POLY_Classic/dl_poly/-/blob/master/README diff --git a/pkgs/by-name/do/do-agent/package.nix b/pkgs/by-name/do/do-agent/package.nix index 9da041ee75b6..b0a6fc087218 100644 --- a/pkgs/by-name/do/do-agent/package.nix +++ b/pkgs/by-name/do/do-agent/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "do-agent"; - version = "3.18.0"; + version = "3.18.2"; src = fetchFromGitHub { owner = "digitalocean"; repo = "do-agent"; rev = version; - sha256 = "sha256-sS6aBJVrF9NrAzizSBBXKM3iMAHa+j9rDw7hZSHgRFg="; + sha256 = "sha256-+UoQhJkwxazfe6LwqNF4zn4jnc3ZQia0ZOL3GX27r3w="; }; ldflags = [ diff --git a/pkgs/by-name/do/dorion/package.nix b/pkgs/by-name/do/dorion/package.nix index c2c4ad54681b..60c4b348a09a 100644 --- a/pkgs/by-name/do/dorion/package.nix +++ b/pkgs/by-name/do/dorion/package.nix @@ -122,8 +122,12 @@ rustPlatform.buildRustPackage (finalAttrs: { ''; configurePhase = '' + runHook preConfigure + cmakeConfigurePhase pnpmConfigHook + + runHook postConfigure ''; buildPhase = '' diff --git a/pkgs/by-name/ec/ecdsatool/package.nix b/pkgs/by-name/ec/ecdsatool/package.nix index f0ffe858c202..e06e549358ca 100644 --- a/pkgs/by-name/ec/ecdsatool/package.nix +++ b/pkgs/by-name/ec/ecdsatool/package.nix @@ -16,8 +16,12 @@ stdenv.mkDerivation { }; configurePhase = '' + runHook preConfigure + ./autogen.sh ./configure --prefix=$out + + runHook postConfigure ''; patches = [ diff --git a/pkgs/by-name/ed/edid-generator/package.nix b/pkgs/by-name/ed/edid-generator/package.nix index 30f74cb253e2..6eb7f2f594da 100644 --- a/pkgs/by-name/ed/edid-generator/package.nix +++ b/pkgs/by-name/ed/edid-generator/package.nix @@ -48,6 +48,8 @@ stdenv.mkDerivation { modelines = ""; configurePhase = '' + runHook preConfigure + test "$clean" != 1 || rm *x*.S ./modeline2edid - <"$modelinesPath" @@ -56,6 +58,8 @@ stdenv.mkDerivation { cat "$file" done make clean + + runHook postConfigure ''; buildPhase = '' diff --git a/pkgs/by-name/fa/far2l/package.nix b/pkgs/by-name/fa/far2l/package.nix index 5ad12479f2ef..22c4ee27f6fa 100644 --- a/pkgs/by-name/fa/far2l/package.nix +++ b/pkgs/by-name/fa/far2l/package.nix @@ -27,7 +27,7 @@ # Plugins withColorer ? true, spdlog, - xercesc, + libxml2, withMultiArc ? true, libarchive, pcre, @@ -43,13 +43,13 @@ stdenv.mkDerivation rec { pname = "far2l"; - version = "2.6.3"; + version = "2.6.5"; src = fetchFromGitHub { owner = "elfmz"; repo = "far2l"; rev = "v_${version}"; - sha256 = "sha256-iWZQpLe+shdepCVOHZDp7QEQoqelbHGRJh09KWb6aD0="; + sha256 = "sha256-a/k36O19z/lHnETOGIbTJ7BNAI5zOQxVUSp+nIM08i4="; }; nativeBuildInputs = [ @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { ++ lib.optional withUCD libuchardet ++ lib.optionals withColorer [ spdlog - xercesc + libxml2 ] ++ lib.optionals withMultiArc [ libarchive @@ -121,7 +121,6 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram $out/bin/far2l \ - --argv0 $out/bin/far2l \ --prefix PATH : ${lib.makeBinPath runtimeDeps} \ --suffix PATH : ${lib.makeBinPath [ xdg-utils ]} ''; diff --git a/pkgs/by-name/fa/fast-downward/package.nix b/pkgs/by-name/fa/fast-downward/package.nix index 500aa339baa4..644e75080674 100644 --- a/pkgs/by-name/fa/fast-downward/package.nix +++ b/pkgs/by-name/fa/fast-downward/package.nix @@ -31,7 +31,11 @@ stdenv.mkDerivation rec { cmakeFlags = lib.optionals osi.withCplex [ "-DDOWNWARD_CPLEX_ROOT=${cplex}/cplex" ]; configurePhase = '' + runHook preConfigure + python build.py release + + runHook postConfigure ''; postPatch = '' diff --git a/pkgs/by-name/fl/flyctl/package.nix b/pkgs/by-name/fl/flyctl/package.nix index 1eedf6ed722e..f9d6b7192b1f 100644 --- a/pkgs/by-name/fl/flyctl/package.nix +++ b/pkgs/by-name/fl/flyctl/package.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "flyctl"; - version = "0.3.157"; + version = "0.3.161"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - hash = "sha256-R5hZLY7uKYfSQdSnYkCruobdHiUZfHshnb/oIYbCMEc="; + hash = "sha256-ctE8X3vyNqbdYQuDrmCLmwy/EMGpJFRnlcjxnRji1Zo="; }; vendorHash = "sha256-OwxzdLXNPiQRq6mgvZaOs8tnNZQm0mYyzyPFUYcokb0="; diff --git a/pkgs/by-name/fr/fricas/package.nix b/pkgs/by-name/fr/fricas/package.nix index f2ed21c7205f..95bb1e5ee3a6 100644 --- a/pkgs/by-name/fr/fricas/package.nix +++ b/pkgs/by-name/fr/fricas/package.nix @@ -36,7 +36,11 @@ stdenv.mkDerivation rec { # Remove when updating to next version configurePhase = '' + runHook preConfigure + ./configure --prefix=$out --with-lisp='sbcl --dynamic-space-size 3072' + + runHook postConfigure ''; dontStrip = true; diff --git a/pkgs/by-name/ga/gatling/package.nix b/pkgs/by-name/ga/gatling/package.nix index bf457905254c..72edeea83727 100644 --- a/pkgs/by-name/ga/gatling/package.nix +++ b/pkgs/by-name/ga/gatling/package.nix @@ -30,10 +30,14 @@ stdenv.mkDerivation rec { ]; configurePhase = '' + runHook preConfigure + substituteInPlace Makefile --replace-fail "/usr/local" "$out" substituteInPlace GNUmakefile --replace-fail "/opt/diet" "$out" substituteInPlace tryalloca.c --replace-fail "main() {" "int main() {" substituteInPlace trysocket.c --replace-fail "main() {" "int main() {" + + runHook postConfigure ''; buildPhase = '' diff --git a/pkgs/by-name/gi/gildas/package.nix b/pkgs/by-name/gi/gildas/package.nix index 9956ddef9fb6..bcebb23da297 100644 --- a/pkgs/by-name/gi/gildas/package.nix +++ b/pkgs/by-name/gi/gildas/package.nix @@ -68,11 +68,15 @@ stdenv.mkDerivation rec { env.GAG_CPP = lib.optionalString stdenv.hostPlatform.isDarwin "${gfortran.outPath}/bin/cpp"; configurePhase = '' + runHook preConfigure + substituteInPlace admin/wrapper.sh --replace '%%OUT%%' $out substituteInPlace admin/wrapper.sh --replace '%%PYTHONHOME%%' ${python3Env} substituteInPlace utilities/main/gag-makedepend.pl --replace '/usr/bin/perl' ${perl}/bin/perl source admin/gildas-env.sh -c gfortran -o openmp echo "gag_doc: $out/share/doc/" >> kernel/etc/gag.dico.lcl + + runHook postConfigure ''; userExec = "astro class greg mapping sic"; diff --git a/pkgs/by-name/gi/git-cliff/package.nix b/pkgs/by-name/gi/git-cliff/package.nix index 19f485e20402..6fd5c403079d 100644 --- a/pkgs/by-name/gi/git-cliff/package.nix +++ b/pkgs/by-name/gi/git-cliff/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "git-cliff"; - version = "2.9.1"; + version = "2.10.0"; src = fetchFromGitHub { owner = "orhun"; repo = "git-cliff"; rev = "v${version}"; - hash = "sha256-J3KjVPH7shMupogLSfA5HV1FyA+cFSOWP9gMBU6txww="; + hash = "sha256-Kv17U2/1mM+c1356oo2730AihgYUDGULOoZVlqW5tZY="; }; - cargoHash = "sha256-16ouBn6GQlE1ZVr4g/TicEL0cTiewegGkuhGcJPicrc="; + cargoHash = "sha256-nsE4yDXVA7h82LekaKMPLEG0cRfR4UmxoCzF/wecMcQ="; # attempts to run the program on .git in src which is not deterministic doCheck = false; diff --git a/pkgs/by-name/gm/gmsh/package.nix b/pkgs/by-name/gm/gmsh/package.nix index d0be8fc8fc50..c2b341e5f15e 100644 --- a/pkgs/by-name/gm/gmsh/package.nix +++ b/pkgs/by-name/gm/gmsh/package.nix @@ -2,7 +2,8 @@ lib, stdenv, fetchurl, - fetchpatch, + makeDesktopItem, + copyDesktopItems, cmake, blas, lapack, @@ -16,22 +17,30 @@ xorg, opencascade-occt, llvmPackages, - python ? null, + python3Packages, enablePython ? false, }: assert (!blas.isILP64) && (!lapack.isILP64); -assert enablePython -> (python != null); -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gmsh"; - version = "4.13.1"; + version = "4.14.0"; src = fetchurl { - url = "https://gmsh.info/src/gmsh-${version}-source.tgz"; - hash = "sha256-d5chRfQxcmAm1QWWpqRPs8HJXCElUhjWaVWAa4btvo0="; + url = "https://gmsh.info/src/gmsh-${finalAttrs.version}-source.tgz"; + hash = "sha256-2019ogYumkNWqCCDITirmfl69jiL/rIVmaLq37C3aig="; }; + nativeBuildInputs = [ + cmake + gfortran + ] + ++ lib.optional ( + enablePython && stdenv.buildPlatform == stdenv.hostPlatform + ) python3Packages.pythonImportsCheckHook + ++ lib.optional stdenv.hostPlatform.isLinux copyDesktopItems; + buildInputs = [ blas lapack @@ -54,22 +63,7 @@ stdenv.mkDerivation rec { xorg.libSM xorg.libICE ] - ++ lib.optional stdenv.cc.isClang llvmPackages.openmp - ++ lib.optional enablePython python; - - enableParallelBuilding = true; - - patches = [ - (fetchpatch { - url = "https://gitlab.onelab.info/gmsh/gmsh/-/commit/7d5094fb0a5245cb435afd3f3e8c35e2ecfe70fd.patch"; - hash = "sha256-3atm1NGsMI4KEct2xakRG6EasRpF6YRI4raoVYxBV4g="; - }) - ]; - - postPatch = '' - substituteInPlace api/gmsh.py \ - --replace-fail 'find_library("gmsh")' \"$out/lib/libgmsh${stdenv.hostPlatform.extensions.sharedLibrary}\" - ''; + ++ lib.optional stdenv.cc.isClang llvmPackages.openmp; # N.B. the shared object is used by bindings cmakeFlags = [ @@ -78,23 +72,46 @@ stdenv.mkDerivation rec { "-DENABLE_OPENMP=ON" ]; - nativeBuildInputs = [ - cmake - gfortran + doCheck = true; + + desktopItems = [ + (makeDesktopItem { + name = "gmsh"; + exec = "gmsh"; + comment = finalAttrs.meta.description; + desktopName = "Gmsh"; + genericName = "3D Mesh Generator"; + categories = [ + "Science" + "Math" + ]; + icon = "gmsh"; + }) ]; - postFixup = lib.optionalString enablePython '' - mkdir -p $out/lib/python${python.pythonVersion}/site-packages - mv $out/lib/gmsh.py $out/lib/python${python.pythonVersion}/site-packages - mv $out/lib/*.dist-info $out/lib/python${python.pythonVersion}/site-packages - ''; + postInstall = + let + logo = fetchurl { + url = "https://salsa.debian.org/science-team/gmsh/-/raw/d2d8b4e3488c7b0f51879f809f624b537b4bd28f/debian/gmsh.svg"; + hash = "sha256-p69Cju3bn1ShWmESOSOmJj0x3IYDGI9oD25SFTh2GLo="; + }; + in + lib.optionalString stdenv.hostPlatform.isLinux '' + install -Dm644 ${logo} $out/share/icons/hicolor/scalable/apps/gmsh.svg + '' + + lib.optionalString enablePython '' + mkdir -p $out/${python3Packages.python.sitePackages} + mv $out/lib/gmsh.py $out/${python3Packages.python.sitePackages} + mv $out/lib/*.dist-info $out/${python3Packages.python.sitePackages} + ''; - doCheck = true; + pythonImportsCheck = [ "gmsh" ]; meta = { description = "Three-dimensional finite element mesh generator"; mainProgram = "gmsh"; homepage = "https://gmsh.info/"; + changelog = "https://gitlab.onelab.info/gmsh/gmsh/-/releases/gmsh_${lib.concatStringsSep "_" (lib.versions.splitVersion finalAttrs.version)}#changelog"; license = lib.licenses.gpl2Plus; }; -} +}) diff --git a/pkgs/by-name/gn/gnu-efi/package.nix b/pkgs/by-name/gn/gnu-efi/package.nix index 455c7e0f4a36..2100fc8343c8 100644 --- a/pkgs/by-name/gn/gnu-efi/package.nix +++ b/pkgs/by-name/gn/gnu-efi/package.nix @@ -14,13 +14,13 @@ assert lib.assertMsg stdenv.hostPlatform.isEfi "gnu-efi may only be built for EF stdenv.mkDerivation (finalAttrs: { pname = "gnu-efi"; - version = "4.0.0"; + version = "4.0.2"; src = fetchFromGitHub { owner = "ncroxon"; repo = "gnu-efi"; tag = finalAttrs.version; - hash = "sha256-vVtJkAPe5tPDLAFZibnJRC7G7WtOg11JT5QipdO+FIk="; + hash = "sha256-oIj0aNY4xU5OcO69TTjh5FcWzzkFd6jbenwzVvTXjqo="; }; buildInputs = [ pciutils ]; @@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: { license = with lib.licenses; [ # This is a mess, upstream is aware. # The source for these is Fedora's SPDX identifier for this package. - # Fedora also has gpl2Only here, but 4.0.0 doesn't have gpl2Only code. + # Fedora also has gpl2Only here, but 4.0.2 doesn't have gpl2Only code. # However, both upstream and Fedora seems to have missed # bsdAxisNoDisclaimerUnmodified and MIT. bsd2 diff --git a/pkgs/by-name/go/gorched/package.nix b/pkgs/by-name/go/gorched/package.nix index 2ac768a5fa9b..ef499d1b8179 100644 --- a/pkgs/by-name/go/gorched/package.nix +++ b/pkgs/by-name/go/gorched/package.nix @@ -6,15 +6,15 @@ }: buildGoModule (finalAttrs: { pname = "gorched"; - version = "1.6"; + version = "1.7"; src = fetchFromGitHub { owner = "zladovan"; repo = "gorched"; tag = "v${finalAttrs.version}"; - hash = "sha256-cT6wkWUlz3ixv7Mu5143I5NxjfwhKQ6bLwrW3BwTtTQ="; + hash = "sha256-n4MKZqhgAIsgK9XPv2pF8mK0I4suSN02JkqY7Aj+LG0="; }; - vendorHash = "sha256-9fucarQKltIxV8j8L+yQ6Fa7IRIhoQCNxcG21KYOpuw="; + vendorHash = "sha256-ohFj0jEHt0SV3pC9+mz+XAjOJ6MIBFY7CJf+G++r72U="; postPatch = '' mkdir ./cmd/gorched diff --git a/pkgs/by-name/gq/gqlgen/package.nix b/pkgs/by-name/gq/gqlgen/package.nix index 16a7efad6fc1..dd4aafe9a251 100644 --- a/pkgs/by-name/gq/gqlgen/package.nix +++ b/pkgs/by-name/gq/gqlgen/package.nix @@ -6,7 +6,7 @@ }: let - version = "0.17.76"; + version = "0.17.77"; in buildGoModule { pname = "gqlgen"; @@ -16,10 +16,10 @@ buildGoModule { owner = "99designs"; repo = "gqlgen"; tag = "v${version}"; - hash = "sha256-b226pRpO693e48OlzVwSaDlPM5RAivIoX/KHXESVEJI="; + hash = "sha256-3feo0wpRHDK3Vx9R6YoQuc2NU+4F+trkaNTvA3AV2NE="; }; - vendorHash = "sha256-cqNRfKPneq4BxVA+kGAxSalwfeNI/hFxsrOgVhkUbLs="; + vendorHash = "sha256-qDPJKGQmZz5Taj/gXakx3t/4bDaMrNR+HehV19HvdCI="; subPackages = [ "." ]; diff --git a/pkgs/by-name/gx/gxplugins-lv2/package.nix b/pkgs/by-name/gx/gxplugins-lv2/package.nix index 7ed2538bc6ac..70a474006607 100644 --- a/pkgs/by-name/gx/gxplugins-lv2/package.nix +++ b/pkgs/by-name/gx/gxplugins-lv2/package.nix @@ -32,9 +32,13 @@ stdenv.mkDerivation rec { installFlags = [ "INSTALL_DIR=$(out)/lib/lv2" ]; configurePhase = '' + runHook preConfigure + for i in GxBoobTube GxValveCaster; do substituteInPlace $i.lv2/Makefile --replace "\$(shell which echo) -e" "echo -e" done + + runHook postConfigure ''; meta = with lib; { diff --git a/pkgs/by-name/hd/hdr10plus/package.nix b/pkgs/by-name/hd/hdr10plus/package.nix index d0a7778a0449..d0e319eb6817 100644 --- a/pkgs/by-name/hd/hdr10plus/package.nix +++ b/pkgs/by-name/hd/hdr10plus/package.nix @@ -63,10 +63,14 @@ rustPlatform.buildRustPackage (finalAttrs: { ]; configurePhase = '' + runHook preConfigure + # let stdenv handle stripping export "CARGO_PROFILE_''${cargoBuildType@U}_STRIP"=false prependToVar cargoCFlags -j "$NIX_BUILD_CORES" + + runHook postConfigure ''; buildPhase = '' diff --git a/pkgs/by-name/he/hebcal/package.nix b/pkgs/by-name/he/hebcal/package.nix index 6e567c8439ca..724e588da2a3 100644 --- a/pkgs/by-name/he/hebcal/package.nix +++ b/pkgs/by-name/he/hebcal/package.nix @@ -6,16 +6,16 @@ buildGoModule (finalAttrs: { pname = "hebcal"; - version = "5.9.2"; + version = "5.9.4"; src = fetchFromGitHub { owner = "hebcal"; repo = "hebcal"; tag = "v${finalAttrs.version}"; - hash = "sha256-6iyltrnA1pLtTUg0AUIp0yciN53oeoLE88dAbTxBK6I="; + hash = "sha256-6SyK5BKVMGcqEFy3tbPBPqmZYp9/DD8A3VUNpAsihEM="; }; - vendorHash = "sha256-azKie/qJUmRSVgkfqsL04NpnePx9ToUPjz6RUOFRdUw="; + vendorHash = null; preBuild = '' make dcity.go diff --git a/pkgs/by-name/he/heptabase/package.nix b/pkgs/by-name/he/heptabase/package.nix index eb907cd64468..a3ebe695e7be 100644 --- a/pkgs/by-name/he/heptabase/package.nix +++ b/pkgs/by-name/he/heptabase/package.nix @@ -5,10 +5,10 @@ }: let pname = "heptabase"; - version = "1.64.0"; + version = "1.66.0"; src = fetchurl { url = "https://github.com/heptameta/project-meta/releases/download/v${version}/Heptabase-${version}.AppImage"; - hash = "sha256-VBoQgSVpEshmGjEGzSe1sG8nDcrl8nJ+m7+s/7LlAMg="; + hash = "sha256-8kkY+Tp8RuE+REcCT/gj8CA6CqTLk6eVeAEsOKv+axA="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; diff --git a/pkgs/by-name/ht/httperf/package.nix b/pkgs/by-name/ht/httperf/package.nix index 64a47ff2e76a..46bc4c6a643c 100644 --- a/pkgs/by-name/ht/httperf/package.nix +++ b/pkgs/by-name/ht/httperf/package.nix @@ -21,10 +21,14 @@ stdenv.mkDerivation { propagatedBuildInputs = [ openssl ]; configurePhase = '' + runHook preConfigure + autoreconf -i mkdir -pv build cd build ../configure + + runHook postConfigure ''; installPhase = '' diff --git a/pkgs/by-name/hy/hydralauncher/package.nix b/pkgs/by-name/hy/hydralauncher/package.nix index 02dba3a30849..f2b850c18895 100644 --- a/pkgs/by-name/hy/hydralauncher/package.nix +++ b/pkgs/by-name/hy/hydralauncher/package.nix @@ -6,10 +6,10 @@ }: let pname = "hydralauncher"; - version = "3.6.2"; + version = "3.6.3"; src = fetchurl { url = "https://github.com/hydralauncher/hydra/releases/download/v${version}/hydralauncher-${version}.AppImage"; - hash = "sha256-ybSTrglU0ktDJahGtqoTBVqqCPATtQYgo83Bd53HSeM="; + hash = "sha256-WFkO5N9KY0RFMzIrr5IyaNc2GZSusC4GQq5Jepwa1JA="; }; appimageContents = appimageTools.extractType2 { inherit pname src version; }; diff --git a/pkgs/by-name/il/illum/package.nix b/pkgs/by-name/il/illum/package.nix index 57e0d2568a17..889e0e9a7bca 100644 --- a/pkgs/by-name/il/illum/package.nix +++ b/pkgs/by-name/il/illum/package.nix @@ -39,7 +39,11 @@ stdenv.mkDerivation rec { ]; configurePhase = '' + runHook preConfigure + bash ./configure + + runHook postConfigure ''; installPhase = '' diff --git a/pkgs/by-name/ju/just/package.nix b/pkgs/by-name/ju/just/package.nix index 01a38404aa07..f1fede42a821 100644 --- a/pkgs/by-name/ju/just/package.nix +++ b/pkgs/by-name/ju/just/package.nix @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { pname = "just"; - version = "1.42.3"; + version = "1.42.4"; outputs = [ "out" ] @@ -32,10 +32,10 @@ rustPlatform.buildRustPackage rec { owner = "casey"; repo = "just"; tag = version; - hash = "sha256-SinL3sdSTtE3oGHe54P4n1jWarJIwYXWp1kPNXGwKIA="; + hash = "sha256-MLGtHMNCyhYq9OTquCc9zKmear1ts5vNAvlLxNQaOqk="; }; - cargoHash = "sha256-byE2ssjEy6etHzkbeYCuW69TC8ErkYhU7oTt0U107Ac="; + cargoHash = "sha256-udNHlPEwTb5S1ZypIqng7JLZ6Yl1vbYwASn+DT2SOLY="; nativeBuildInputs = lib.optionals (installShellCompletions || installManPages) [ installShellFiles ] diff --git a/pkgs/by-name/kc/kcl/package.nix b/pkgs/by-name/kc/kcl/package.nix index 5973fa7de973..74b1a8b63094 100644 --- a/pkgs/by-name/kc/kcl/package.nix +++ b/pkgs/by-name/kc/kcl/package.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "kcl"; - version = "0.11.2"; + version = "0.11.3"; src = fetchFromGitHub { owner = "kcl-lang"; repo = "cli"; rev = "v${version}"; - hash = "sha256-9QPGQ8PfXtb37RIrfqLeezobmXSpgvYzxJOWldmgnyc="; + hash = "sha256-LJ+Mclw/dMyOeUHg6TAckSbvDGFYCf6mMGzDmiIQVZc="; }; - vendorHash = "sha256-zToyM20ykPAd+EHwSUsX+4BvBPT8iXk5suGK2ZYBjvc="; + vendorHash = "sha256-jNQ0g7BGXUoYKV5RkU/f9GrSC3ygeZv83SekAmyKLxc="; subPackages = [ "cmd/kcl" ]; diff --git a/pkgs/by-name/ki/kissat/package.nix b/pkgs/by-name/ki/kissat/package.nix index b40359ca01e6..29d4520c31db 100644 --- a/pkgs/by-name/ki/kissat/package.nix +++ b/pkgs/by-name/ki/kissat/package.nix @@ -59,7 +59,11 @@ stdenv.mkDerivation rec { setOutputFlags = false; configurePhase = '' + runHook preConfigure + ./configure + + runHook postConfigure ''; buildPhase = '' diff --git a/pkgs/by-name/ko/kopia-ui/package.nix b/pkgs/by-name/ko/kopia-ui/package.nix index 7957563a8c65..754bc9e9d1b9 100644 --- a/pkgs/by-name/ko/kopia-ui/package.nix +++ b/pkgs/by-name/ko/kopia-ui/package.nix @@ -10,12 +10,12 @@ kopia, }: let - version = "0.21.0"; + version = "0.21.1"; src = fetchFromGitHub { owner = "kopia"; repo = "kopia"; tag = "v${version}"; - hash = "sha256-M4qI8CzIIeoUqCvi8wc7s2CItPFN+1scHdwACy9vw/4="; + hash = "sha256-0i8bKah3a7MrgzATysgFCsmDZxK9qH+4hmBMW+GR9/4="; }; in buildNpmPackage { diff --git a/pkgs/by-name/ku/kubectl-cnpg/package.nix b/pkgs/by-name/ku/kubectl-cnpg/package.nix index 67a7d3f61704..2385c48877bc 100644 --- a/pkgs/by-name/ku/kubectl-cnpg/package.nix +++ b/pkgs/by-name/ku/kubectl-cnpg/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "kubectl-cnpg"; - version = "1.26.0"; + version = "1.26.1"; src = fetchFromGitHub { owner = "cloudnative-pg"; repo = "cloudnative-pg"; rev = "v${version}"; - hash = "sha256-IYHzgP9KDNGlNe1znWKv/IST1if9Nnn2cP9rerAIgkY="; + hash = "sha256-CRQrHW8mJ6yzWCLfU/4G10w1h/Hp1+7UqlZ9ziQqjNs="; }; - vendorHash = "sha256-mJyriMf2/2J1ol4gBxgmEdNT1qWCBnwKwIB0yyubxc4="; + vendorHash = "sha256-mlVfJrsuBDtk4b78uEWYmXRbzAl91Pqp5twe9tolGdI="; subPackages = [ "cmd/kubectl-cnpg" ]; diff --git a/pkgs/by-name/ku/kubeone/package.nix b/pkgs/by-name/ku/kubeone/package.nix index 44ff3ce47f5e..98ee73ca4afa 100644 --- a/pkgs/by-name/ku/kubeone/package.nix +++ b/pkgs/by-name/ku/kubeone/package.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "kubeone"; - version = "1.11.0"; + version = "1.11.1"; src = fetchFromGitHub { owner = "kubermatic"; repo = "kubeone"; rev = "v${version}"; - hash = "sha256-K33KKvGw4iF7aq/eumSFzYk3ij8pE8mUh4wN9TA9Q/4="; + hash = "sha256-K3Xo2tvtmkGbXl2yJjd8Q1xzdLSap8p824ommi+r8dY="; }; vendorHash = "sha256-Wnnwp1GRlE1q8MSc23pOmSn9fKu5uHVzkivfuF2lnEk="; diff --git a/pkgs/by-name/ku/kubernetes-polaris/package.nix b/pkgs/by-name/ku/kubernetes-polaris/package.nix index 0b6c83434559..2587ad0b9a4c 100644 --- a/pkgs/by-name/ku/kubernetes-polaris/package.nix +++ b/pkgs/by-name/ku/kubernetes-polaris/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "kubernetes-polaris"; - version = "9.6.4"; + version = "10.0.0"; src = fetchFromGitHub { owner = "FairwindsOps"; repo = "polaris"; rev = version; - sha256 = "sha256-ymChgk3r1m4B6jiX3cL+vo4KzmvzsjUxA0t/MjfYvrU="; + sha256 = "sha256-yJPtTIj6vfzWwjozwcsIJjZGfy3QS6h8uOcoL4OXrnQ="; }; - vendorHash = "sha256-F7QGVowpwRyHxvgKYtuSqH2A/IH2Bvxr3vU78PNN0Z0="; + vendorHash = "sha256-4H1NHeYGd3ujtOo+UDkjIQaH+rkODS41C865OE1S9YA="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/la/latex2html/package.nix b/pkgs/by-name/la/latex2html/package.nix index e3a8847e2d35..ca0bd75fe666 100644 --- a/pkgs/by-name/la/latex2html/package.nix +++ b/pkgs/by-name/la/latex2html/package.nix @@ -29,10 +29,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; configurePhase = '' + runHook preConfigure + ./configure \ --prefix="$out" \ --without-mktexlsr \ --with-texpath=$out/share/texmf/tex/latex/html + + runHook postConfigure ''; postInstall = '' diff --git a/pkgs/by-name/li/lingeling/package.nix b/pkgs/by-name/li/lingeling/package.nix index ba9ba673027b..6ca0b1fad952 100644 --- a/pkgs/by-name/li/lingeling/package.nix +++ b/pkgs/by-name/li/lingeling/package.nix @@ -18,6 +18,8 @@ stdenv.mkDerivation { }; configurePhase = '' + runHook preConfigure + ./configure.sh # Rather than patch ./configure, just sneak in use of aiger here, since it @@ -28,6 +30,8 @@ stdenv.mkDerivation { --replace-fail '$(AIGER)/aiger.o' '${aiger.lib}/lib/libaiger.a' \ --replace-fail '$(AIGER)/aiger.h' '${aiger.dev}/include/aiger.h' \ --replace-fail '-I$(AIGER)' '-I${aiger.dev}/include' + + runHook postConfigure ''; installPhase = '' diff --git a/pkgs/by-name/li/liquidfun/package.nix b/pkgs/by-name/li/liquidfun/package.nix index 84974f233890..210b61295e3b 100644 --- a/pkgs/by-name/li/liquidfun/package.nix +++ b/pkgs/by-name/li/liquidfun/package.nix @@ -37,9 +37,13 @@ stdenv.mkDerivation rec { ''; configurePhase = '' + runHook preConfigure + mkdir Build cd Build; cmake -DBOX2D_INSTALL=ON -DBOX2D_BUILD_SHARED=ON -DCMAKE_INSTALL_PREFIX=$out .. + + runHook postConfigure ''; meta = with lib; { diff --git a/pkgs/by-name/ma/markdown-oxide/package.nix b/pkgs/by-name/ma/markdown-oxide/package.nix index 88be5814d204..9bef874b7789 100644 --- a/pkgs/by-name/ma/markdown-oxide/package.nix +++ b/pkgs/by-name/ma/markdown-oxide/package.nix @@ -5,16 +5,16 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "markdown-oxide"; - version = "0.25.4"; + version = "0.25.5"; src = fetchFromGitHub { owner = "Feel-ix-343"; repo = "markdown-oxide"; tag = "v${finalAttrs.version}"; - hash = "sha256-wS75Etj6NAMt/wlWB1yLGetM+OsgyeCo0dqHkrjUsQI="; + hash = "sha256-4K69eBHp1RGv0b7BUwGTErDc2M+XOh5ZIly+XvR1Aa4="; }; - cargoHash = "sha256-W+4WmWfqNuh3kmqE9X6CQ5/kTqMoUqyuIFCRiZa6Kc4="; + cargoHash = "sha256-7peel81Yf//MLIoXXCY3lklkykY9XxY/dfIxuNQyQ64="; meta = { description = "Markdown LSP server inspired by Obsidian"; diff --git a/pkgs/by-name/ma/matrix-alertmanager-receiver/package.nix b/pkgs/by-name/ma/matrix-alertmanager-receiver/package.nix index 653e69d6cf86..9f8fb9fcee57 100644 --- a/pkgs/by-name/ma/matrix-alertmanager-receiver/package.nix +++ b/pkgs/by-name/ma/matrix-alertmanager-receiver/package.nix @@ -8,16 +8,16 @@ buildGoModule (finalAttrs: { pname = "matrix-alertmanager-receiver"; - version = "2025.7.2"; + version = "2025.7.23"; src = fetchFromGitHub { owner = "metio"; repo = "matrix-alertmanager-receiver"; tag = finalAttrs.version; - hash = "sha256-Dz2oP3lNxO75Lqmke0WprvI1yuuQIv3HffNxMYCSJso="; + hash = "sha256-DkltZsWcCFLMDzTMxDv+amwbTVNHxpQVBtgpnTJOFsU="; }; - vendorHash = "sha256-+tkxK3h6N45XA4OvdNYrRFNbqJLGflY2v8oF36Gpwm4="; + vendorHash = "sha256-6N0G0JGFp+dIUyTFHwpp526QmVZlp071NX+H6CB0uVE="; env.CGO_ENABLED = "0"; diff --git a/pkgs/by-name/mi/min-ed-launcher/package.nix b/pkgs/by-name/mi/min-ed-launcher/package.nix index 25510bb33167..4371bc758479 100644 --- a/pkgs/by-name/mi/min-ed-launcher/package.nix +++ b/pkgs/by-name/mi/min-ed-launcher/package.nix @@ -6,13 +6,13 @@ }: buildDotnetModule rec { pname = "min-ed-launcher"; - version = "0.12.1"; + version = "0.12.2"; src = fetchFromGitHub { owner = "rfvgyhn"; repo = "min-ed-launcher"; tag = "v${version}"; - hash = "sha256-/dzcWwpg1nIrqICAQIxzwMgfrCB1G9bu2bT7Cv1khFM="; + hash = "sha256-jx8R/8mWuluD7ub8J3UqiP4A8k1npBgZpqRti3mhBrM="; leaveDotGit = true; # During build the current commit is appended to the version }; diff --git a/pkgs/by-name/mi/minivmac/package.nix b/pkgs/by-name/mi/minivmac/package.nix index a143585f5280..a754854fc187 100644 --- a/pkgs/by-name/mi/minivmac/package.nix +++ b/pkgs/by-name/mi/minivmac/package.nix @@ -23,6 +23,8 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=${placeholder "out"}" ]; configurePhase = '' + runHook preConfigure + ${lib.getExe' buildPackages.stdenv.cc "cc"} setup/tool.c -o setup_t ./setup_t -t lx64 > setup.sh @@ -31,6 +33,8 @@ stdenv.mkDerivation rec { substituteInPlace setup.sh --replace 'strip --strip-unneeded' '${stdenv.cc.targetPrefix}strip --strip-unneeded' sh < ./setup.sh + + runHook postConfigure ''; installPhase = '' diff --git a/pkgs/by-name/mr/mrtrix/package.nix b/pkgs/by-name/mr/mrtrix/package.nix index 0fe0b96ca8ef..9a9e864ed011 100644 --- a/pkgs/by-name/mr/mrtrix/package.nix +++ b/pkgs/by-name/mr/mrtrix/package.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "mrtrix"; - version = "3.0.6"; + version = "3.0.7"; src = fetchFromGitHub { owner = "MRtrix3"; repo = "mrtrix3"; rev = finalAttrs.version; - hash = "sha256-5GcQVZaRV7A6aA/ES6qR0dNBrToJiUXt/LyLYmnpvlQ="; + hash = "sha256-cPI6Ac1Yp5yb07zv9r5O7ZbsHpjrv5BkzbAW1qgj3gQ="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/na/naja/package.nix b/pkgs/by-name/na/naja/package.nix index 8e797d668a0e..d56382c003b4 100644 --- a/pkgs/by-name/na/naja/package.nix +++ b/pkgs/by-name/na/naja/package.nix @@ -16,13 +16,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "naja"; - version = "0.1.24"; + version = "0.2.1"; src = fetchFromGitHub { owner = "najaeda"; repo = "naja"; tag = "v${finalAttrs.version}"; - hash = "sha256-vfP/xusfY11bk0GsIZcW38rXPMgutTDgTNjO40Uz1bU="; + hash = "sha256-eKeb6V9u4huesQV4sq9GxIcxO2SVvMrUDeQaObCCags="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/nc/ncpamixer/package.nix b/pkgs/by-name/nc/ncpamixer/package.nix index 88b0ad65c22c..30e616118a02 100644 --- a/pkgs/by-name/nc/ncpamixer/package.nix +++ b/pkgs/by-name/nc/ncpamixer/package.nix @@ -49,7 +49,11 @@ stdenv.mkDerivation rec { ]; configurePhase = '' + runHook preConfigure + make PREFIX=$out USE_WIDE=1 RELEASE=1 build/Makefile + + runHook postConfigure ''; meta = with lib; { diff --git a/pkgs/by-name/ne/netevent/package.nix b/pkgs/by-name/ne/netevent/package.nix index 19e87147f28d..989943a062fa 100644 --- a/pkgs/by-name/ne/netevent/package.nix +++ b/pkgs/by-name/ne/netevent/package.nix @@ -27,8 +27,12 @@ stdenv.mkDerivation { ]; configurePhase = '' + runHook preConfigure + export RST2MAN=rst2man ./configure + + runHook postConfigure ''; installPhase = '' diff --git a/pkgs/by-name/ne/netsniff-ng/package.nix b/pkgs/by-name/ne/netsniff-ng/package.nix index 8489627e329c..791ea0ed4df2 100644 --- a/pkgs/by-name/ne/netsniff-ng/package.nix +++ b/pkgs/by-name/ne/netsniff-ng/package.nix @@ -53,9 +53,13 @@ stdenv.mkDerivation rec { # ./configure is not autoGNU but some home-brewn magic configurePhase = '' + runHook preConfigure + patchShebangs configure substituteInPlace configure --replace "which" "command -v" NACL_INC_DIR=${libsodium.dev}/include/sodium NACL_LIB=sodium ./configure + + runHook postConfigure ''; enableParallelBuilding = true; diff --git a/pkgs/by-name/nv/nvrh/package.nix b/pkgs/by-name/nv/nvrh/package.nix index b30d4631de2c..d8044b7c2fe2 100644 --- a/pkgs/by-name/nv/nvrh/package.nix +++ b/pkgs/by-name/nv/nvrh/package.nix @@ -8,13 +8,13 @@ buildGoModule (finalAttrs: { pname = "nvrh"; - version = "0.1.17"; + version = "0.1.19"; src = fetchFromGitHub { owner = "mikew"; repo = "nvrh"; tag = "v${finalAttrs.version}"; - hash = "sha256-5LkDbLKz4phSOsKqdzC/tMHqdXy+c5chBsXwWso/Wsk="; + hash = "sha256-oLCHuU2KZypMnW+KOuc3RhSP/mO4hQUN3Pi1W8uhoJA="; }; postPatch = '' diff --git a/pkgs/by-name/oe/oelint-adv/package.nix b/pkgs/by-name/oe/oelint-adv/package.nix index b21067ed3726..16714558cdf2 100644 --- a/pkgs/by-name/oe/oelint-adv/package.nix +++ b/pkgs/by-name/oe/oelint-adv/package.nix @@ -7,14 +7,14 @@ python3Packages.buildPythonApplication rec { pname = "oelint-adv"; - version = "8.1.4"; + version = "8.2.0"; pyproject = true; src = fetchFromGitHub { owner = "priv-kweihmann"; repo = "oelint-adv"; tag = version; - hash = "sha256-Ld8PwAWKH1BQTvmIev5e6ZI1xOaaopunKJkTgAFUipI="; + hash = "sha256-K1MUf9QDDBuIuVovyXYkHPK4eoth4wdFnzjuFpZFBLc="; }; postPatch = '' diff --git a/pkgs/by-name/ow/owi/package.nix b/pkgs/by-name/ow/owi/package.nix index 4b306120a697..d1e52452ccac 100644 --- a/pkgs/by-name/ow/owi/package.nix +++ b/pkgs/by-name/ow/owi/package.nix @@ -15,14 +15,14 @@ let in ocamlPackages.buildDunePackage rec { pname = "owi"; - version = "0.2-unstable-2025-07-11"; + version = "0.2-unstable-2025-07-23"; src = fetchFromGitHub { owner = "ocamlpro"; repo = "owi"; - rev = "be3d93320dcbf7d4e991f9b240ff490b5a1b0acc"; + rev = "bcebeb15de0a4968d1cb59970ee4a0c635e78bf4"; fetchSubmodules = true; - hash = "sha256-yc/f/N+smGk3NwtZnP/k4ISN3mvp1GL9VTcjgosbQJw="; + hash = "sha256-MOgh5Q5Ai1Nk8DllUswiOk+Qu+hMRp7Q6mYPNSUs/1A="; }; nativeBuildInputs = with ocamlPackages; [ diff --git a/pkgs/by-name/pa/parmetis/package.nix b/pkgs/by-name/pa/parmetis/package.nix index 8419e81b19f5..bb5832ae3b6a 100644 --- a/pkgs/by-name/pa/parmetis/package.nix +++ b/pkgs/by-name/pa/parmetis/package.nix @@ -23,9 +23,13 @@ stdenv.mkDerivation { buildInputs = [ mpi ]; configurePhase = '' + runHook preConfigure + tar xf ${metis.src} mv metis-* metis make config metis_path=metis gklib_path=metis/GKlib prefix=$out + + runHook postConfigure ''; meta = with lib; { diff --git a/pkgs/by-name/ph/phrase-cli/package.nix b/pkgs/by-name/ph/phrase-cli/package.nix index 49a89e42e19b..1579ff23cb65 100644 --- a/pkgs/by-name/ph/phrase-cli/package.nix +++ b/pkgs/by-name/ph/phrase-cli/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "phrase-cli"; - version = "2.43.0"; + version = "2.44.0"; src = fetchFromGitHub { owner = "phrase"; repo = "phrase-cli"; rev = version; - sha256 = "sha256-myG+V7piegEvjqLYeGg8Q3YgcNeLSZmB+5qwUhZRUik="; + sha256 = "sha256-tMWjk+cqgVcmtFSXqWhvOTc6y/85hJ8ds8OVukLbtzQ="; }; - vendorHash = "sha256-ycjpZBa/6yYChQh+gHrq0V76GR38TnEU73QKJQBlr5o="; + vendorHash = "sha256-Eb/rkXvih7CDEgxZ15BD62zE5/TRYWNTTZzQU+uxtXg="; ldflags = [ "-X=github.com/phrase/phrase-cli/cmd.PHRASE_CLIENT_VERSION=${version}" ]; diff --git a/pkgs/by-name/pm/pmccabe/package.nix b/pkgs/by-name/pm/pmccabe/package.nix index 4c740db6e2aa..a1d7bacca210 100644 --- a/pkgs/by-name/pm/pmccabe/package.nix +++ b/pkgs/by-name/pm/pmccabe/package.nix @@ -20,11 +20,15 @@ stdenv.mkDerivation rec { env.NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; configurePhase = '' + runHook preConfigure + sed -i -r Makefile \ -e 's,/usr/,/,g' \ -e "s,^DESTDIR =.*$,DESTDIR = $out," \ -e "s,^INSTALL = install.*$,INSTALL = install," \ -e "s,^all:.*$,all: \$(PROGS)," + + runHook postConfigure ''; checkPhase = "make test"; diff --git a/pkgs/by-name/pn/pngcrush/package.nix b/pkgs/by-name/pn/pngcrush/package.nix index 0fac3e2168d6..703d941d6f1f 100644 --- a/pkgs/by-name/pn/pngcrush/package.nix +++ b/pkgs/by-name/pn/pngcrush/package.nix @@ -28,7 +28,11 @@ stdenv.mkDerivation rec { ]; # gcc and/or clang compat configurePhase = '' + runHook preConfigure + sed -i s,/usr,$out, Makefile + + runHook postConfigure ''; buildInputs = [ libpng ]; diff --git a/pkgs/by-name/pn/pngtoico/package.nix b/pkgs/by-name/pn/pngtoico/package.nix index fc429a35f642..f4a21fc58e6e 100644 --- a/pkgs/by-name/pn/pngtoico/package.nix +++ b/pkgs/by-name/pn/pngtoico/package.nix @@ -23,7 +23,11 @@ stdenv.mkDerivation rec { ]; configurePhase = '' + runHook preConfigure + sed -i s,/usr/local,$out, Makefile + + runHook postConfigure ''; buildInputs = [ libpng ]; diff --git a/pkgs/by-name/pr/pretix/package.nix b/pkgs/by-name/pr/pretix/package.nix index 6ddcc6fad71a..1e4e68027e61 100644 --- a/pkgs/by-name/pr/pretix/package.nix +++ b/pkgs/by-name/pr/pretix/package.nix @@ -83,6 +83,7 @@ python.pkgs.buildPythonApplication rec { pythonRelaxDeps = [ "beautifulsoup4" "celery" + "css-inline" "django-bootstrap3" "django-localflavor" "django-phonenumber-field" diff --git a/pkgs/by-name/ps/pscale/package.nix b/pkgs/by-name/ps/pscale/package.nix index a3b9034d80ae..0349cf6c3df8 100644 --- a/pkgs/by-name/ps/pscale/package.nix +++ b/pkgs/by-name/ps/pscale/package.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "pscale"; - version = "0.247.0"; + version = "0.248.0"; src = fetchFromGitHub { owner = "planetscale"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-/ZBGeZTrtRUCqoS1cgDHglogpVOzOLroOWgJC3j9Zxg="; + sha256 = "sha256-Vp9qS8Od+OVV/kVMH8CsD/Ltx9aFykU7E8w+o91J2gY="; }; - vendorHash = "sha256-w1abfm7wSywu+KXIACfYtHZoW/uSzW/2M0vR9gXrj34="; + vendorHash = "sha256-eGF44NEW8dIm2neJmGnYiafvRISIAUgA5jKV9EzsJj0="; ldflags = [ "-s" diff --git a/pkgs/by-name/re/renode-unstable/package.nix b/pkgs/by-name/re/renode-unstable/package.nix index d7b3b3247a3c..b33a4af28867 100644 --- a/pkgs/by-name/re/renode-unstable/package.nix +++ b/pkgs/by-name/re/renode-unstable/package.nix @@ -7,11 +7,11 @@ renode.overrideAttrs ( finalAttrs: _: { pname = "renode-unstable"; - version = "1.15.3+20250711gitb35bde0fb"; + version = "1.15.3+20250720git2309db7fd"; src = fetchurl { url = "https://builds.renode.io/renode-${finalAttrs.version}.linux-dotnet.tar.gz"; - hash = "sha256-jjs8e8+ipyrF96c/lKwS8S6JXyiRLy9Lf1RYsU+Tk6s="; + hash = "sha256-pcgjT27cBlHzHnh4q9AsgVAVXshdvA0Tdo0dsq9rXP4="; }; passthru.updateScript = diff --git a/pkgs/by-name/re/retrofe/package.nix b/pkgs/by-name/re/retrofe/package.nix index ff44ea04755e..d3ec51c5ca25 100644 --- a/pkgs/by-name/re/retrofe/package.nix +++ b/pkgs/by-name/re/retrofe/package.nix @@ -52,8 +52,12 @@ stdenv.mkDerivation { ]); configurePhase = '' + runHook preConfigure + cmake RetroFE/Source -BRetroFE/Build -DCMAKE_BUILD_TYPE=Release \ -DVERSION_MAJOR=0 -DVERSION_MINOR=0 -DVERSION_BUILD=0 \ + + runHook postConfigure ''; buildPhase = '' diff --git a/pkgs/by-name/ru/rustfinity/package.nix b/pkgs/by-name/ru/rustfinity/package.nix index e19318429fd6..dd2b1d262070 100644 --- a/pkgs/by-name/ru/rustfinity/package.nix +++ b/pkgs/by-name/ru/rustfinity/package.nix @@ -8,14 +8,14 @@ }: rustPlatform.buildRustPackage rec { pname = "rustfinity"; - version = "0.2.13"; + version = "0.2.14"; src = fetchCrate { inherit pname version; - hash = "sha256-yBWhY4Uta/K/Ka5DzhpZUiv0Y3Yfn4dI4ZARpJqTqY8="; + hash = "sha256-Oh+AEgmBhlOQaCFECheuHCXT6hndpUnZH/l+tWMp2RQ="; }; - cargoHash = "sha256-ifVhVFiTO1CVpWo6B9OZXJwuc40IRkSc4ncMXG+5DnE="; + cargoHash = "sha256-e1RnPqfgeyeEh8Av81RTuaMgYc6zoBZcygbc29DNKqE="; nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ]; buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ openssl ]; diff --git a/pkgs/by-name/sb/sbsigntool/package.nix b/pkgs/by-name/sb/sbsigntool/package.nix index 0064476b7036..b0e1abf98df4 100644 --- a/pkgs/by-name/sb/sbsigntool/package.nix +++ b/pkgs/by-name/sb/sbsigntool/package.nix @@ -40,6 +40,8 @@ stdenv.mkDerivation rec { ]; configurePhase = '' + runHook preConfigure + substituteInPlace configure.ac --replace "@@NIX_GNUEFI@@" "${gnu-efi}" lib/ccan.git/tools/create-ccan-tree --build-type=automake lib/ccan "talloc read_write_all build_assert array_size endian" @@ -54,6 +56,8 @@ stdenv.mkDerivation rec { automake --add-missing -Wno-portability ./configure --prefix=$out + + runHook postConfigure ''; meta = with lib; { diff --git a/pkgs/by-name/si/signalbackup-tools/package.nix b/pkgs/by-name/si/signalbackup-tools/package.nix index 863535406a9f..0c90f0083589 100644 --- a/pkgs/by-name/si/signalbackup-tools/package.nix +++ b/pkgs/by-name/si/signalbackup-tools/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "signalbackup-tools"; - version = "20250718"; + version = "20250726"; src = fetchFromGitHub { owner = "bepaald"; repo = "signalbackup-tools"; rev = version; - hash = "sha256-weUqp77bK8svM5Pj0z6E1agAw1bTfELcaWTeW+XlfY0="; + hash = "sha256-BDrz2AHscjJdlnHW52TWaMGaz8TKVMRLGXs1rn2TQVI="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/si/sillytavern/package.nix b/pkgs/by-name/si/sillytavern/package.nix index 79bbd55a1d0b..0f75fefdbf89 100644 --- a/pkgs/by-name/si/sillytavern/package.nix +++ b/pkgs/by-name/si/sillytavern/package.nix @@ -7,15 +7,15 @@ }: buildNpmPackage (finalAttrs: { pname = "sillytavern"; - version = "1.13.1"; + version = "1.13.2"; src = fetchFromGitHub { owner = "SillyTavern"; repo = "SillyTavern"; tag = finalAttrs.version; - hash = "sha256-rWDJBuGzgG34jpsBPdLqIegcOfV3bRyOdulRsMS2mhg="; + hash = "sha256-tTBpSXkXzQjp3TW9hksqUpA3sagR2GSY42bHLHEd9oI="; }; - npmDepsHash = "sha256-DyqAaaeSCAdsKXWUo1t4FpUuqu1n4TfZBLg23URuNUM="; + npmDepsHash = "sha256-hayhsEZN857V6bsWPXupLeqxcOr1sgKs0uWN2pSQD+k="; nativeBuildInputs = [ makeBinaryWrapper ]; diff --git a/pkgs/by-name/sn/snis-unwrapped/package.nix b/pkgs/by-name/sn/snis-unwrapped/package.nix index efbb19ddc8c0..d274737370d3 100644 --- a/pkgs/by-name/sn/snis-unwrapped/package.nix +++ b/pkgs/by-name/sn/snis-unwrapped/package.nix @@ -27,13 +27,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "snis"; - version = "1.0.8"; + version = "1.0.9"; src = fetchFromGitHub { owner = "smcameron"; repo = "space-nerds-in-space"; tag = "v${finalAttrs.version}"; - hash = "sha256-WxxJW0o4PtOhmloeRLqxJahJwWlGpcdpQjrjrah+Ixk="; + hash = "sha256-H6ZeZOeKy8Z5HGicQs9CmjR2tDzD8AGvLr75Xx0YkAg="; }; enableParallelBuilding = true; diff --git a/pkgs/by-name/sp/spacer/package.nix b/pkgs/by-name/sp/spacer/package.nix index a0eb2e9e58d5..16b5af06e42a 100644 --- a/pkgs/by-name/sp/spacer/package.nix +++ b/pkgs/by-name/sp/spacer/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "spacer"; - version = "0.4.1"; + version = "0.4.5"; src = fetchFromGitHub { owner = "samwho"; repo = "spacer"; rev = "v${version}"; - hash = "sha256-3+1YWx+o1sDWXsG3qZCrtshRxVJgh5D9XJ5qVo+sL0M="; + hash = "sha256-GG9v6N7bJN7kYEQRqRIDgPPT0gGJ6LSSr8NWBDKsajo="; }; - cargoHash = "sha256-ERMP+gG2zCmkiB5GWM0s2dPo8JevWyjfMDUA8NxH3dc="; + cargoHash = "sha256-sWE0nFFVAUcCgW6R3BWBdSqn1QMRI8tKnuxX4gpRdvA="; meta = with lib; { description = "CLI tool to insert spacers when command output stops"; diff --git a/pkgs/by-name/sp/spectrojack/package.nix b/pkgs/by-name/sp/spectrojack/package.nix index c3346f675d40..f31420ac81eb 100644 --- a/pkgs/by-name/sp/spectrojack/package.nix +++ b/pkgs/by-name/sp/spectrojack/package.nix @@ -23,9 +23,13 @@ stdenv.mkDerivation rec { gtk2 ]; configurePhase = '' + runHook preConfigure + sed -i 's/.*home.*/#&/' ./Makefile substituteInPlace ./Makefile \ --replace "/usr/share" "$out/usr/share" + + runHook postConfigure ''; installPhase = '' install -Dm755 spectrojack $out/bin/spectrojack diff --git a/pkgs/by-name/ss/ssdfs-utils/package.nix b/pkgs/by-name/ss/ssdfs-utils/package.nix index d08eccdc0581..9558822ce516 100644 --- a/pkgs/by-name/ss/ssdfs-utils/package.nix +++ b/pkgs/by-name/ss/ssdfs-utils/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation { # as ssdfs-utils, not ssdfs-tools. pname = "ssdfs-utils"; # The version is taken from `configure.ac`, there are no tags. - version = "4.56"; + version = "4.57"; src = fetchFromGitHub { owner = "dubeyko"; repo = "ssdfs-tools"; - rev = "300d57aabcf7d6208ee863463e7947005efa70e9"; - hash = "sha256-X2LTt1iVyRX+Zli/KePu5Ryf6Fz2/hcDDWyaL9qp/vI="; + rev = "fab40f45663ecd03f32ccf891691798db245bd04"; + hash = "sha256-9Eha2tqEBykhlF/GUX5nH1jYQlzEW7ou7mUbTL2A2r0="; }; strictDeps = true; diff --git a/pkgs/by-name/st/stalwart-mail/package.nix b/pkgs/by-name/st/stalwart-mail/package.nix index 74392a503eca..f22a683eefc3 100644 --- a/pkgs/by-name/st/stalwart-mail/package.nix +++ b/pkgs/by-name/st/stalwart-mail/package.nix @@ -20,16 +20,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "stalwart-mail" + (lib.optionalString stalwartEnterprise "-enterprise"); - version = "0.12.4"; + version = "0.13.1"; src = fetchFromGitHub { owner = "stalwartlabs"; repo = "stalwart"; tag = "v${finalAttrs.version}"; - hash = "sha256-MUbWGBbb8+b5cp+M5w27A/cHHkMcoEtkN13++FyBvbM="; + hash = "sha256-6zoI+yvE1Ep5jh9XthDqphm2zBA4UzhfK7VCKRWIH8g="; }; - cargoHash = "sha256-G1c7hh0nScc4Cx7A1UUXv6slA6pP0fC6h00zR71BJIo="; + cargoHash = "sha256-t4BLko8vIVHZ44yeQoAhss3OxOlxJCErHm9h+FGG+28="; nativeBuildInputs = [ pkg-config @@ -75,83 +75,86 @@ rustPlatform.buildRustPackage (finalAttrs: { --replace "__PATH__" "$out" ''; - checkFlags = [ + checkFlags = lib.forEach [ # Require running mysql, postgresql daemon - "--skip=directory::imap::imap_directory" - "--skip=directory::internal::internal_directory" - "--skip=directory::ldap::ldap_directory" - "--skip=directory::sql::sql_directory" - "--skip=directory::oidc::oidc_directory" - "--skip=store::blob::blob_tests" - "--skip=store::lookup::lookup_tests" - "--skip=smtp::lookup::sql::lookup_sql" + "directory::imap::imap_directory" + "directory::internal::internal_directory" + "directory::ldap::ldap_directory" + "directory::sql::sql_directory" + "directory::oidc::oidc_directory" + "store::blob::blob_tests" + "store::lookup::lookup_tests" + "smtp::lookup::sql::lookup_sql" # thread 'directory::smtp::lmtp_directory' panicked at tests/src/store/mod.rs:122:44: # called `Result::unwrap()` on an `Err` value: Os { code: 2, kind: NotFound, message: "No such file or directory" } - "--skip=directory::smtp::lmtp_directory" + "directory::smtp::lmtp_directory" # thread 'imap::imap_tests' panicked at tests/src/imap/mod.rs:436:14: # Missing store type. Try running `STORE= cargo test`: NotPresent - "--skip=imap::imap_tests" + "imap::imap_tests" # thread 'jmap::jmap_tests' panicked at tests/src/jmap/mod.rs:303:14: # Missing store type. Try running `STORE= cargo test`: NotPresent - "--skip=jmap::jmap_tests" + "jmap::jmap_tests" # Failed to read system DNS config: io error: No such file or directory (os error 2) - "--skip=smtp::inbound::data::data" + "smtp::inbound::data::data" # Expected "X-My-Header: true" but got Received: from foobar.net (unknown [10.0.0.123]) - "--skip=smtp::inbound::scripts::sieve_scripts" + "smtp::inbound::scripts::sieve_scripts" # thread 'smtp::outbound::lmtp::lmtp_delivery' panicked at tests/src/smtp/session.rs:313:13: # Expected " (failed to lookup" but got From: "Mail Delivery Subsystem" - "--skip=smtp::outbound::lmtp::lmtp_delivery" + "smtp::outbound::lmtp::lmtp_delivery" # thread 'smtp::outbound::extensions::extensions' panicked at tests/src/smtp/inbound/mod.rs:45:23: # No queue event received. - "--skip=smtp::outbound::extensions::extensions" + "smtp::outbound::extensions::extensions" # panicked at tests/src/smtp/outbound/smtp.rs:173:5: - "--skip=smtp::outbound::smtp::smtp_delivery" + "smtp::outbound::smtp::smtp_delivery" # panicked at tests/src/smtp/outbound/lmtp.rs - "--skip=smtp::outbound::lmtp::lmtp_delivery" + "smtp::outbound::lmtp::lmtp_delivery" # thread 'smtp::queue::retry::queue_retry' panicked at tests/src/smtp/queue/retry.rs:119:5: # assertion `left == right` failed # left: [1, 2, 2] # right: [1, 2, 3] - "--skip=smtp::queue::retry::queue_retry" + "smtp::queue::retry::queue_retry" + # thread 'smtp::queue::virtualq::virtual_queue' panicked at /build/source/crates/store/src/dispatch/store.rs:548:14: + # called `Result::unwrap()` on an `Err` value: Error(Event { inner: Store(MysqlError), keys: [(Reason, String("Input/output error: Input/output error: Connection refused (os error 111)")), (CausedBy, String("crates/store/src/dispatch/store.rs:301"))] }) + "smtp::queue::virtualq::virtual_queue" # Missing store type. Try running `STORE= cargo test`: NotPresent - "--skip=store::store_tests" + "store::store_tests" # Missing store type. Try running `STORE= cargo test`: NotPresent - "--skip=cluster::cluster_tests" + "cluster::cluster_tests" # Missing store type. Try running `STORE= cargo test`: NotPresent - "--skip=webdav::webdav_tests" + "webdav::webdav_tests" # thread 'config::parser::tests::toml_parse' panicked at crates/utils/src/config/parser.rs:463:58: # called `Result::unwrap()` on an `Err` value: "Expected ['\\n'] but found '!' in value at line 70." - "--skip=config::parser::tests::toml_parse" + "config::parser::tests::toml_parse" # error[E0432]: unresolved import `r2d2_sqlite` # use of undeclared crate or module `r2d2_sqlite` - "--skip=backend::sqlite::pool::SqliteConnectionManager::with_init" + "backend::sqlite::pool::SqliteConnectionManager::with_init" # thread 'smtp::reporting::analyze::report_analyze' panicked at tests/src/smtp/reporting/analyze.rs:88:5: # assertion `left == right` failed # left: 0 # right: 12 - "--skip=smtp::reporting::analyze::report_analyze" + "smtp::reporting::analyze::report_analyze" # thread 'smtp::inbound::dmarc::dmarc' panicked at tests/src/smtp/inbound/mod.rs:59:26: # Expected empty queue but got Reload - "--skip=smtp::inbound::dmarc::dmarc" + "smtp::inbound::dmarc::dmarc" # thread 'smtp::queue::concurrent::concurrent_queue' panicked at tests/src/smtp/inbound/mod.rs:65:9: # assertion `left == right` failed - "--skip=smtp::queue::concurrent::concurrent_queue" + "smtp::queue::concurrent::concurrent_queue" # Failed to read system DNS config: io error: No such file or directory (os error 2) - "--skip=smtp::inbound::auth::auth" + "smtp::inbound::auth::auth" # Failed to read system DNS config: io error: No such file or directory (os error 2) - "--skip=smtp::inbound::antispam::antispam" + "smtp::inbound::antispam::antispam" # Failed to read system DNS config: io error: No such file or directory (os error 2) - "--skip=smtp::inbound::vrfy::vrfy_expn" + "smtp::inbound::vrfy::vrfy_expn" # thread 'smtp::management::queue::manage_queue' panicked at tests/src/smtp/inbound/mod.rs:45:23: # No queue event received. # NOTE: Test unreliable on high load systems - "--skip=smtp::management::queue::manage_queue" + "smtp::management::queue::manage_queue" # thread 'responses::tests::parse_responses' panicked at crates/dav-proto/src/responses/mod.rs:671:17: # assertion `left == right` failed: failed for 008.xml # left: ElementEnd # right: Bytes([...]) - "--skip=responses::tests::parse_responses" - ]; + "responses::tests::parse_responses" + ] (test: "--skip=${test}"); doCheck = !(stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); diff --git a/pkgs/by-name/st/stalwart-mail/webadmin.nix b/pkgs/by-name/st/stalwart-mail/webadmin.nix index af550fa5b3b8..881942373b62 100644 --- a/pkgs/by-name/st/stalwart-mail/webadmin.nix +++ b/pkgs/by-name/st/stalwart-mail/webadmin.nix @@ -17,13 +17,13 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "webadmin"; - version = "0.1.28"; + version = "0.1.31"; src = fetchFromGitHub { owner = "stalwartlabs"; repo = "webadmin"; tag = "v${finalAttrs.version}"; - hash = "sha256-OgZ2qs84zVM2zNmBQSPnb9Uy4mahzNC81vbWM9wmrn4="; + hash = "sha256-4+R7QQT0cbKYe6WzgvzreOFULBnWdNcbPC27f4r+M0g="; }; npmDeps = fetchNpmDeps { @@ -31,7 +31,7 @@ rustPlatform.buildRustPackage (finalAttrs: { hash = "sha256-na1HEueX8w7kuDp8LEtJ0nD1Yv39cyk6sEMpS1zix2s="; }; - cargoHash = "sha256-rcgeSdCGIRvpz2xZPw0I753+D3zm9AYbtuUdMSp2I94="; + cargoHash = "sha256-Q05+wH9+NfkfmEDJFLuWVQ7wuDeEu9h1XmOMN6SYdyU="; postPatch = '' # Using local tailwindcss for compilation diff --git a/pkgs/by-name/st/sttr/package.nix b/pkgs/by-name/st/sttr/package.nix index 192df215a273..66647f41abbe 100644 --- a/pkgs/by-name/st/sttr/package.nix +++ b/pkgs/by-name/st/sttr/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "sttr"; - version = "0.2.25"; + version = "0.2.26"; src = fetchFromGitHub { owner = "abhimanyu003"; repo = "sttr"; rev = "v${version}"; - hash = "sha256-FVjdlheKt3WoFQnb9qrYQATSkJmuXCVrigBbnKUHUR0="; + hash = "sha256-VyO4NyiTWWQJjbhKHoIC86B4KdSowlrR6XR3HCKr0U4="; }; - vendorHash = "sha256-OQxp52v8TEgB09obp3UKOReRWB79Cwa6zbSE1V/s+JY="; + vendorHash = "sha256-g35BCThoym9awjMObMUecRkkLsQyEIviYc4rdQsIICY="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/su/subread/package.nix b/pkgs/by-name/su/subread/package.nix index fb3ee4ecacd4..164defc6deee 100644 --- a/pkgs/by-name/su/subread/package.nix +++ b/pkgs/by-name/su/subread/package.nix @@ -19,8 +19,12 @@ stdenv.mkDerivation rec { ]; configurePhase = '' + runHook preConfigure + cd src cp Makefile.${if stdenv.hostPlatform.isLinux then "Linux" else "MacOS"} Makefile + + runHook postConfigure ''; makeFlags = [ "CC_EXEC=cc" ]; diff --git a/pkgs/by-name/te/teetertorture/package.nix b/pkgs/by-name/te/teetertorture/package.nix index b5d8051142a2..a9852baed320 100644 --- a/pkgs/by-name/te/teetertorture/package.nix +++ b/pkgs/by-name/te/teetertorture/package.nix @@ -22,7 +22,11 @@ stdenv.mkDerivation rec { ]; configurePhase = '' + runHook preConfigure + sed -i s,data/,$out/share/teetertorture/, src/teetertorture.c + + runHook postConfigure ''; patchPhase = '' diff --git a/pkgs/by-name/te/tennix/package.nix b/pkgs/by-name/te/tennix/package.nix index ab6e4596aaef..11bdb0bc78c0 100644 --- a/pkgs/by-name/te/tennix/package.nix +++ b/pkgs/by-name/te/tennix/package.nix @@ -33,7 +33,11 @@ stdenv.mkDerivation rec { ]; configurePhase = '' + runHook preConfigure + ./configure --prefix $out + + runHook postConfigure ''; meta = with lib; { diff --git a/pkgs/by-name/te/testkube/package.nix b/pkgs/by-name/te/testkube/package.nix index 9a616b7f0fba..64f677448fbb 100644 --- a/pkgs/by-name/te/testkube/package.nix +++ b/pkgs/by-name/te/testkube/package.nix @@ -5,13 +5,13 @@ }: buildGoModule rec { pname = "testkube"; - version = "2.1.163"; + version = "2.1.164"; src = fetchFromGitHub { owner = "kubeshop"; repo = "testkube"; rev = "v${version}"; - hash = "sha256-g9m3Uyrc8dXeDm5mjmWhcSrlVAqP0/4OCvuZQwW6Pf8="; + hash = "sha256-GBQDVzloAWROD7xM26gt0+cko8hbquHf5kvxVjjFeA0="; }; vendorHash = "sha256-i7GjhW9w6TEHg+PBVsQ8bOuToejiPpuOcSbXO5ffAMs="; diff --git a/pkgs/by-name/ti/tideways-daemon/package.nix b/pkgs/by-name/ti/tideways-daemon/package.nix index 3fe6156af3e9..cf3e089b8450 100644 --- a/pkgs/by-name/ti/tideways-daemon/package.nix +++ b/pkgs/by-name/ti/tideways-daemon/package.nix @@ -10,7 +10,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "tideways-daemon"; - version = "1.9.44"; + version = "1.9.46"; src = finalAttrs.passthru.sources.${stdenvNoCC.hostPlatform.system} @@ -28,15 +28,15 @@ stdenvNoCC.mkDerivation (finalAttrs: { sources = { "x86_64-linux" = fetchurl { url = "https://tideways.s3.amazonaws.com/daemon/${finalAttrs.version}/tideways-daemon_linux_amd64-${finalAttrs.version}.tar.gz"; - hash = "sha256-JzsSyUqKuH4msdSqN+rFdfrnNvlkFFFmspfpYLsiRZc="; + hash = "sha256-QIXnKaANoPEkVU2PiRkfNzJQ1rJ+D8Di9qGqiFMS9so="; }; "aarch64-linux" = fetchurl { url = "https://tideways.s3.amazonaws.com/daemon/${finalAttrs.version}/tideways-daemon_linux_aarch64-${finalAttrs.version}.tar.gz"; - hash = "sha256-1nE61XHqnycMgjvjKIZnbgVSak0HYOIUHgF67RjcJi8="; + hash = "sha256-/aGqC5qV9fFV+7QLFUFaMz5eUixL4RiATelq+M/yzkM="; }; "aarch64-darwin" = fetchurl { url = "https://tideways.s3.amazonaws.com/daemon/${finalAttrs.version}/tideways-daemon_macos_arm64-${finalAttrs.version}.tar.gz"; - hash = "sha256-4KwUsFK3G73hGiVGqF1sAOv7gEjqJXSAj99wLyHE+qM="; + hash = "sha256-diATzMDw2sE5Ab/291pA7b6TQz+uJxIzECWQXVh5mng="; }; }; updateScript = "${ diff --git a/pkgs/by-name/ti/tinfoil-cli/package.nix b/pkgs/by-name/ti/tinfoil-cli/package.nix index 16ad589dc5ab..9421172e7981 100644 --- a/pkgs/by-name/ti/tinfoil-cli/package.nix +++ b/pkgs/by-name/ti/tinfoil-cli/package.nix @@ -7,16 +7,16 @@ buildGoModule (finalAttrs: { pname = "tinfoil-cli"; - version = "0.1.1"; + version = "0.1.3"; src = fetchFromGitHub { owner = "tinfoilsh"; repo = "tinfoil-cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-u7ELBS2WKet+MhTlUL+ID6f3AeNjE6aUj+PJY1rXb+8="; + hash = "sha256-yOFlQxMRxrdC1w8r8D9b0qrwGLjEflgcvLX5Q8ntMJY="; }; - vendorHash = "sha256-Dn1hhWE18UConE1a1RfLty3NWQ859Axt0LFBSC9i1uc="; + vendorHash = "sha256-L4wdnxm5fOtGymIZfr/YYTDnXpREgZmEthcZV1ploI4="; # The attestation test requires internet access checkFlags = [ "-skip=TestAttestationVerifySEV" ]; diff --git a/pkgs/by-name/to/topicctl/package.nix b/pkgs/by-name/to/topicctl/package.nix index 8c3f8add607d..0f11643aa80d 100644 --- a/pkgs/by-name/to/topicctl/package.nix +++ b/pkgs/by-name/to/topicctl/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "topicctl"; - version = "1.20.1"; + version = "1.20.2"; src = fetchFromGitHub { owner = "segmentio"; repo = "topicctl"; rev = "v${version}"; - sha256 = "sha256-9bp9dGpJYYgOqNcqOWWaf1ZKVewiFm02af6oZo5F6iM="; + sha256 = "sha256-OrHQVgN4wwRBdYvCdn4GCzMIhMaav7wmmHemZbQMRCc="; }; vendorHash = "sha256-M/lNhGD9zNmwkzTAjp0lbAeliNpLOCVJbOG16N76QL4="; diff --git a/pkgs/by-name/ui/uid_wrapper/package.nix b/pkgs/by-name/ui/uid_wrapper/package.nix index c26c7b2e6007..1bfa6b1f8e34 100644 --- a/pkgs/by-name/ui/uid_wrapper/package.nix +++ b/pkgs/by-name/ui/uid_wrapper/package.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "uid_wrapper"; - version = "1.3.1"; + version = "1.3.2"; src = fetchurl { url = "mirror://samba/cwrap/uid_wrapper-${version}.tar.gz"; - sha256 = "sha256-9mB9hketooqW+rg8Sa1y/IPrbTiZHKJ7JJWzWP8Pbew="; + sha256 = "sha256-rkvzuPCnSPRwUxplBDazkYLIIX7pJpqcfpJcZDgKm9o="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/uq/uqm/package.nix b/pkgs/by-name/uq/uqm/package.nix index c9e47cd2bb99..773c0ad9d1e2 100644 --- a/pkgs/by-name/uq/uqm/package.nix +++ b/pkgs/by-name/uq/uqm/package.nix @@ -113,11 +113,15 @@ stdenv.mkDerivation rec { # uqm has a 'unique' build system with a root script incidentally called # 'build.sh'. configurePhase = '' + runHook preConfigure + echo "INPUT_install_prefix_VALUE='$out'" >> config.state echo "INPUT_install_bindir_VALUE='$out/bin'" >> config.state echo "INPUT_install_libdir_VALUE='$out/lib'" >> config.state echo "INPUT_install_sharedir_VALUE='$out/share'" >> config.state PREFIX=$out ./build.sh uqm config + + runHook postConfigure ''; buildPhase = '' diff --git a/pkgs/by-name/us/usbguard/package.nix b/pkgs/by-name/us/usbguard/package.nix index 5ff76bf68f60..baa057785a9b 100644 --- a/pkgs/by-name/us/usbguard/package.nix +++ b/pkgs/by-name/us/usbguard/package.nix @@ -25,14 +25,14 @@ let protobuf = protobuf_29; in stdenv.mkDerivation rec { - version = "1.1.3"; + version = "1.1.4"; pname = "usbguard"; src = fetchFromGitHub { owner = "USBGuard"; repo = "usbguard"; rev = "usbguard-${version}"; - hash = "sha256-8y8zaKJfoIXc9AvG1wi3EzZA7BR2wVFLuOyD+zpBY0s="; + hash = "sha256-PDuYszdG6BK4fkAHWWBct1d7tnwwe+5XOw+xmSPoPCY="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/v2/v2rayn/package.nix b/pkgs/by-name/v2/v2rayn/package.nix index dbdfab5cced9..7e46f5d5f076 100644 --- a/pkgs/by-name/v2/v2rayn/package.nix +++ b/pkgs/by-name/v2/v2rayn/package.nix @@ -21,13 +21,13 @@ buildDotnetModule rec { pname = "v2rayn"; - version = "7.13.1"; + version = "7.13.2"; src = fetchFromGitHub { owner = "2dust"; repo = "v2rayN"; tag = version; - hash = "sha256-4lnMT6p32uHeLd85JNWEVg1LsDr99YVsgpxG2MdpYQ0="; + hash = "sha256-go0XhZF3rEZ11MmHSx+dKqOT6IyiTqtn6hNHLwTyHOM="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/ve/vep/package.nix b/pkgs/by-name/ve/vep/package.nix index 576b4c9b35fb..97d4f9e63592 100644 --- a/pkgs/by-name/ve/vep/package.nix +++ b/pkgs/by-name/ve/vep/package.nix @@ -58,7 +58,11 @@ let }; # PREFIX is important configurePhase = '' + runHook preConfigure + perl Makefile.PL PREFIX=$out INSTALLDIRS=site + + runHook postConfigure ''; # Test do not work -- wrong include path doCheck = false; diff --git a/pkgs/by-name/vk/vkeybd/package.nix b/pkgs/by-name/vk/vkeybd/package.nix index faf940bfc062..b37b4c943439 100644 --- a/pkgs/by-name/vk/vkeybd/package.nix +++ b/pkgs/by-name/vk/vkeybd/package.nix @@ -27,8 +27,12 @@ stdenv.mkDerivation rec { ]; configurePhase = '' + runHook preConfigure + mkdir -p $out/bin sed -e "s@/usr/local@$out@" -i Makefile + + runHook postConfigure ''; makeFlags = [ diff --git a/pkgs/by-name/wa/walker/package.nix b/pkgs/by-name/wa/walker/package.nix index efe2a3afc248..35ebbb3ce95b 100644 --- a/pkgs/by-name/wa/walker/package.nix +++ b/pkgs/by-name/wa/walker/package.nix @@ -14,16 +14,16 @@ buildGoModule rec { pname = "walker"; - version = "0.12.39"; + version = "0.13.13"; src = fetchFromGitHub { owner = "abenz1267"; repo = "walker"; rev = "v${version}"; - hash = "sha256-HLQ2hYZhXcrA9V0kshV1GxxgI1CGXtTeI7dKelrIz6w="; + hash = "sha256-/4XKb2nU76EvUeuvhaTQr2CeLA5k20D0/XXYdX4n9cs="; }; - vendorHash = "sha256-250HPwSkcT7pOulhqAtmuoWOJUakF0S1bpZ8FMsp7bU="; + vendorHash = "sha256-N7lNxO/l3E1BlSSbSiQjrDPy2sWwk4G4JYlUArmMJxs="; subPackages = [ "cmd/walker.go" ]; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/wa/wannier90/package.nix b/pkgs/by-name/wa/wannier90/package.nix index d21ff8146a3e..5c76e480009a 100644 --- a/pkgs/by-name/wa/wannier90/package.nix +++ b/pkgs/by-name/wa/wannier90/package.nix @@ -45,7 +45,11 @@ stdenv.mkDerivation rec { ''; configurePhase = '' + runHook preConfigure + cp config/make.inc.gfort make.inc + + runHook postConfigure ''; buildFlags = [ diff --git a/pkgs/by-name/wa/wayback-x11/package.nix b/pkgs/by-name/wa/wayback-x11/package.nix index 2c3423f0a952..620bf263357d 100644 --- a/pkgs/by-name/wa/wayback-x11/package.nix +++ b/pkgs/by-name/wa/wayback-x11/package.nix @@ -2,13 +2,14 @@ fetchFromGitLab, lib, libxkbcommon, + makeWrapper, meson, ninja, + nix-update-script, pixman, pkg-config, scdoc, stdenv, - unstableGitUpdater, wayland, wayland-protocols, wayland-scanner, @@ -16,16 +17,16 @@ xwayland, }: -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "wayback"; - version = "0-unstable-2025-07-20"; + version = "0.2"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "wayback"; repo = "wayback"; - rev = "4b1b4c59f67a2639e960d6b19e1282cf03fc3660"; - hash = "sha256-+4fPMVVPoUAYbt0jgfl+dmt0ZNyGGWF7xuF1UzZ2uiU="; + tag = "${finalAttrs.version}"; + hash = "sha256-8pfW1tu7OI6dLSR9iiVuJDdK76fRgpQmesW5wJUVN/0="; }; strictDeps = true; @@ -35,6 +36,7 @@ stdenv.mkDerivation { ]; nativeBuildInputs = [ + makeWrapper meson ninja pkg-config @@ -51,14 +53,20 @@ stdenv.mkDerivation { xwayland ]; - passthru.updateScript = unstableGitUpdater { }; + postInstall = '' + wrapProgram "$out/bin/wayback-session" \ + --set XWAYBACK_PATH "$out/bin/Xwayback" + ''; + + passthru.updateScript = nix-update-script { }; meta = { description = "X11 compatibility layer leveraging wlroots and Xwayland"; homepage = "https://wayback.freedesktop.org"; + changelog = "https://gitlab.freedesktop.org/wayback/wayback/-/releases/${finalAttrs.version}"; license = lib.licenses.mit; platforms = lib.platforms.linux; - mainProgram = "wayback-session"; + mainProgram = "Xwayback"; maintainers = with lib.maintainers; [ dramforever ]; }; -} +}) diff --git a/pkgs/by-name/we/wealthfolio/package.nix b/pkgs/by-name/we/wealthfolio/package.nix index 31b6c06ef864..40f667ecc140 100644 --- a/pkgs/by-name/we/wealthfolio/package.nix +++ b/pkgs/by-name/we/wealthfolio/package.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "wealthfolio"; - version = "1.1.5"; + version = "1.1.6"; src = fetchFromGitHub { owner = "afadil"; repo = "wealthfolio"; rev = "v${finalAttrs.version}"; - hash = "sha256-w/NA8rOkJHCrxQc4VTt3q9iLlTlQHp3x23lpcZJj9sI="; + hash = "sha256-YjCAMWyGSEEC4NhSKxWbaP11yP9xLs5Mk5B+NZRQwDo="; }; pnpmDeps = pnpm_9.fetchDeps { @@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: { src cargoRoot ; - hash = "sha256-FU02JpDc3VvFqwXTBzpBQM2RBp/BcdPlEg2iCvvskA8="; + hash = "sha256-scgo526LDZTj7XHiX4/hF8PRPJuA7ul8DD3kIZyPUKs="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/wi/wiggle/package.nix b/pkgs/by-name/wi/wiggle/package.nix index f1c97794c714..582c99f068e2 100644 --- a/pkgs/by-name/wi/wiggle/package.nix +++ b/pkgs/by-name/wi/wiggle/package.nix @@ -23,6 +23,8 @@ stdenv.mkDerivation rec { ]; configurePhase = '' + runHook preConfigure + makeFlagsArray=( CFLAGS="-I. -O3" STRIP="-s" INSTALL="install" @@ -30,6 +32,8 @@ stdenv.mkDerivation rec { MANDIR="$out/share/man" ) patchShebangs . + + runHook postConfigure ''; meta = with lib; { diff --git a/pkgs/by-name/wt/wtfis/package.nix b/pkgs/by-name/wt/wtfis/package.nix index 2f9e2f2ff0bb..ea966471f01c 100644 --- a/pkgs/by-name/wt/wtfis/package.nix +++ b/pkgs/by-name/wt/wtfis/package.nix @@ -6,12 +6,12 @@ let pname = "wtfis"; - version = "0.11.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "pirxthepilot"; repo = "wtfis"; tag = "v${version}"; - hash = "sha256-53D5ty5u5/NUEIQXYxuZOOaCrNLPKcHu/faX7S31+lU="; + hash = "sha256-LEqWfpRpxZEnlIw1bllqM27Xb3KTp7AhzU7Vpo686ak="; }; in python3.pkgs.buildPythonApplication { diff --git a/pkgs/by-name/xf/xfractint/package.nix b/pkgs/by-name/xf/xfractint/package.nix index bd3c45d299b2..1c29c8b6bccd 100644 --- a/pkgs/by-name/xf/xfractint/package.nix +++ b/pkgs/by-name/xf/xfractint/package.nix @@ -20,7 +20,11 @@ stdenv.mkDerivation rec { ]; configurePhase = '' + runHook preConfigure + sed -e 's@/usr/bin/@@' -i Makefile + + runHook postConfigure ''; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/by-name/xk/xk6/package.nix b/pkgs/by-name/xk/xk6/package.nix index a83507c16b6f..5bfba7bd4aa4 100644 --- a/pkgs/by-name/xk/xk6/package.nix +++ b/pkgs/by-name/xk/xk6/package.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "xk6"; - version = "1.1.1"; + version = "1.1.2"; src = fetchFromGitHub { owner = "grafana"; repo = "xk6"; tag = "v${version}"; - hash = "sha256-cypxnBQwVW4gdesRljlT8ATmgojOj5RxU+lScMTj5Ac="; + hash = "sha256-o+sN/xAGewqHo6/aoN23+FG1YrtNykc4voSg5wO74uA="; }; vendorHash = null; diff --git a/pkgs/by-name/xp/xprintidle-ng/package.nix b/pkgs/by-name/xp/xprintidle-ng/package.nix index a7e920d32d62..28644d574a7e 100644 --- a/pkgs/by-name/xp/xprintidle-ng/package.nix +++ b/pkgs/by-name/xp/xprintidle-ng/package.nix @@ -51,8 +51,12 @@ stdenv.mkDerivation rec { ]; configurePhase = '' + runHook preConfigure + ./bootstrap --gnulib-srcdir=${gnulib} ./configure --prefix="$out" + + runHook postConfigure ''; buildInputs = [ diff --git a/pkgs/by-name/ze/zeroad-unwrapped/package.nix b/pkgs/by-name/ze/zeroad-unwrapped/package.nix index f58ffb457b77..d26f986ddc08 100644 --- a/pkgs/by-name/ze/zeroad-unwrapped/package.nix +++ b/pkgs/by-name/ze/zeroad-unwrapped/package.nix @@ -109,6 +109,8 @@ stdenv.mkDerivation rec { ]; configurePhase = '' + runHook preConfigure + # Delete shipped libraries which we don't need. rm -rf libraries/source/{cxxtest-4.4,nvtt,premake-core,spidermonkey,spirv-reflect} @@ -138,6 +140,8 @@ stdenv.mkDerivation rec { # Move to the build directory. pushd build/workspaces/gcc + + runHook postConfigure ''; enableParallelBuilding = true; diff --git a/pkgs/desktops/gnome/extensions/default.nix b/pkgs/desktops/gnome/extensions/default.nix index da2a8b5d4c95..c952ca8d04d7 100644 --- a/pkgs/desktops/gnome/extensions/default.nix +++ b/pkgs/desktops/gnome/extensions/default.nix @@ -93,7 +93,6 @@ rec { // lib.optionalAttrs config.allowAliases { unite-shell = gnomeExtensions.unite; # added 2021-01-19 arc-menu = gnomeExtensions.arcmenu; # added 2021-02-14 - disable-unredirect = gnomeExtensions.disable-unredirect-fullscreen-windows; # added 2021-11-20 icon-hider = throw "gnomeExtensions.icon-hider was removed on 2024-03-15. The extension has not received any updates since 2020/3.34."; nohotcorner = throw "gnomeExtensions.nohotcorner removed since 2019-10-09: Since 3.34, it is a part of GNOME Shell configurable through GNOME Tweaks."; diff --git a/pkgs/development/compilers/flutter/versions/3_32/data.json b/pkgs/development/compilers/flutter/versions/3_32/data.json index cfbe37f9d3d5..078a4c8a8d51 100644 --- a/pkgs/development/compilers/flutter/versions/3_32/data.json +++ b/pkgs/development/compilers/flutter/versions/3_32/data.json @@ -1,17 +1,17 @@ { - "version": "3.32.7", - "engineVersion": "39d6d6e699e51b2874210e14cddf1a22fb9524b2", + "version": "3.32.8", + "engineVersion": "ef0cd000916d64fa0c5d09cc809fa7ad244a5767", "engineSwiftShaderHash": "sha256-ATVcuxqPHqHOWYyO7DoX9LdgUiO3INUi7m9Mc6ccc1M=", "engineSwiftShaderRev": "d040a5bab638bf7c226235c95787ba6288bb6416", "channel": "stable", "engineHashes": { "aarch64-linux": { - "aarch64-linux": "sha256-3cqYwwQlnHPMRoeRLsru+Xk9rMiAaLZ6rBxdJttJSW0=", - "x86_64-linux": "sha256-3cqYwwQlnHPMRoeRLsru+Xk9rMiAaLZ6rBxdJttJSW0=" + "aarch64-linux": "sha256-JrbIMYwdfe36y6bHj1eAjYOKPGGp7mfWxWDCoCm7wiQ=", + "x86_64-linux": "sha256-JrbIMYwdfe36y6bHj1eAjYOKPGGp7mfWxWDCoCm7wiQ=" }, "x86_64-linux": { - "aarch64-linux": "sha256-8jXbz7gQZhaoU2Cs6uAbR5xF22HzBxMghA4edm/7oa4=", - "x86_64-linux": "sha256-8jXbz7gQZhaoU2Cs6uAbR5xF22HzBxMghA4edm/7oa4=" + "aarch64-linux": "sha256-R0ut5hzzBgfjbZFB1ofK4jEmr3CcBKHFJUl3c7nmn0E=", + "x86_64-linux": "sha256-R0ut5hzzBgfjbZFB1ofK4jEmr3CcBKHFJUl3c7nmn0E=" } }, "dartVersion": "3.8.1", @@ -21,53 +21,53 @@ "x86_64-darwin": "sha256-S3iGDVLollApke2SnXAcV919qsDTVmz5Gf9fTletr00=", "aarch64-darwin": "sha256-haHQks9N1mBIqRsYg9sOLw7ra7gC708gsTWfKxvIK1c=" }, - "flutterHash": "sha256-fPCa9JHvQGP47uo6LHbGC2aMMwdX+AOEZfvIyZ3M2/U=", + "flutterHash": "sha256-s5T16+cMmL2ustJQjwFbfS8G+/TJW/WCEF1IO4WgbXQ=", "artifactHashes": { "android": { - "aarch64-darwin": "sha256-Gs4SLCLh/6e/n8lu6pTujksW/MqIieWymF151N5dDnw=", - "aarch64-linux": "sha256-aTVHfbG6V4T2/SDbxdCEYo3+7EryjK6sAUL4FF4AmUM=", - "x86_64-darwin": "sha256-Gs4SLCLh/6e/n8lu6pTujksW/MqIieWymF151N5dDnw=", - "x86_64-linux": "sha256-aTVHfbG6V4T2/SDbxdCEYo3+7EryjK6sAUL4FF4AmUM=" + "aarch64-darwin": "sha256-hswA4YkMM3uur0F2KuA32g+EXtCPH7SYVZkjr2EFV7o=", + "aarch64-linux": "sha256-1V8hfmK2q2QgbIT+YC/WtFZmkG7xcvrJYPeiN0o4fhY=", + "x86_64-darwin": "sha256-hswA4YkMM3uur0F2KuA32g+EXtCPH7SYVZkjr2EFV7o=", + "x86_64-linux": "sha256-1V8hfmK2q2QgbIT+YC/WtFZmkG7xcvrJYPeiN0o4fhY=" }, "fuchsia": { - "aarch64-darwin": "sha256-cKUp9CQq10Ls3dOcB3wPdnnwVK26RG0JWn0n4TsWigc=", - "aarch64-linux": "sha256-cKUp9CQq10Ls3dOcB3wPdnnwVK26RG0JWn0n4TsWigc=", - "x86_64-darwin": "sha256-cKUp9CQq10Ls3dOcB3wPdnnwVK26RG0JWn0n4TsWigc=", - "x86_64-linux": "sha256-cKUp9CQq10Ls3dOcB3wPdnnwVK26RG0JWn0n4TsWigc=" + "aarch64-darwin": "sha256-WkWLbIpEyrwyB9mcA3ElNecRmCVt8+6y3qKi9zFRR9I=", + "aarch64-linux": "sha256-WkWLbIpEyrwyB9mcA3ElNecRmCVt8+6y3qKi9zFRR9I=", + "x86_64-darwin": "sha256-WkWLbIpEyrwyB9mcA3ElNecRmCVt8+6y3qKi9zFRR9I=", + "x86_64-linux": "sha256-WkWLbIpEyrwyB9mcA3ElNecRmCVt8+6y3qKi9zFRR9I=" }, "ios": { - "aarch64-darwin": "sha256-EvzvRyR2aRomFPiz7WfGyhg0JiOHzCIi6xEDbLeIGAQ=", - "aarch64-linux": "sha256-EvzvRyR2aRomFPiz7WfGyhg0JiOHzCIi6xEDbLeIGAQ=", - "x86_64-darwin": "sha256-EvzvRyR2aRomFPiz7WfGyhg0JiOHzCIi6xEDbLeIGAQ=", - "x86_64-linux": "sha256-EvzvRyR2aRomFPiz7WfGyhg0JiOHzCIi6xEDbLeIGAQ=" + "aarch64-darwin": "sha256-obbmFnObjvQH6sLL0MsRrFtA0x8yCOo7clMqQzteWGY=", + "aarch64-linux": "sha256-obbmFnObjvQH6sLL0MsRrFtA0x8yCOo7clMqQzteWGY=", + "x86_64-darwin": "sha256-obbmFnObjvQH6sLL0MsRrFtA0x8yCOo7clMqQzteWGY=", + "x86_64-linux": "sha256-obbmFnObjvQH6sLL0MsRrFtA0x8yCOo7clMqQzteWGY=" }, "linux": { - "aarch64-darwin": "sha256-eLGFwZxd4P9NSnHhOssAvjWea+ahuPUtIi4BrsOxZDE=", - "aarch64-linux": "sha256-eLGFwZxd4P9NSnHhOssAvjWea+ahuPUtIi4BrsOxZDE=", - "x86_64-darwin": "sha256-WhDM+gxvSWsQ0RyaInKH3obabboMfBtfBPZPx6379kc=", - "x86_64-linux": "sha256-WhDM+gxvSWsQ0RyaInKH3obabboMfBtfBPZPx6379kc=" + "aarch64-darwin": "sha256-LID4h0JABLwjmrv3XS1MEWTYn/7GmBtybqiLbErfgWA=", + "aarch64-linux": "sha256-LID4h0JABLwjmrv3XS1MEWTYn/7GmBtybqiLbErfgWA=", + "x86_64-darwin": "sha256-k8fVg13YXFFBAI0OKph1DqzfmNk1PYAyy/PVuma2hlM=", + "x86_64-linux": "sha256-k8fVg13YXFFBAI0OKph1DqzfmNk1PYAyy/PVuma2hlM=" }, "macos": { - "aarch64-darwin": "sha256-3QXe7KTjh9noCdZnCRbo6bXuif7dhQ75mk6/lyydSck=", - "aarch64-linux": "sha256-3QXe7KTjh9noCdZnCRbo6bXuif7dhQ75mk6/lyydSck=", - "x86_64-darwin": "sha256-3QXe7KTjh9noCdZnCRbo6bXuif7dhQ75mk6/lyydSck=", - "x86_64-linux": "sha256-3QXe7KTjh9noCdZnCRbo6bXuif7dhQ75mk6/lyydSck=" + "aarch64-darwin": "sha256-Y+T2SuM4D8Du/MAQR9DScU8ObPPE7WGxxvC5Km2YmHg=", + "aarch64-linux": "sha256-Y+T2SuM4D8Du/MAQR9DScU8ObPPE7WGxxvC5Km2YmHg=", + "x86_64-darwin": "sha256-Y+T2SuM4D8Du/MAQR9DScU8ObPPE7WGxxvC5Km2YmHg=", + "x86_64-linux": "sha256-Y+T2SuM4D8Du/MAQR9DScU8ObPPE7WGxxvC5Km2YmHg=" }, "universal": { - "aarch64-darwin": "sha256-Z7UTqCTESwcpv0yxzTEMThkQMNfisOCnhC7sltY0dUA=", - "aarch64-linux": "sha256-VIMu52o7BIEkxt4h0u4sILcrgKg85TY+3ieQl290icM=", - "x86_64-darwin": "sha256-/jOrwEy6EWCx8cS9MyIEI4NqO2H8Rs/VV7N6RmCyPWM=", - "x86_64-linux": "sha256-mcQYpXo8E/j4j4OYIwlcx6xpiyYbnKXrwfT+rl6W4Zw=" + "aarch64-darwin": "sha256-h4v8Pyw7VqFDWh+VCcz12bgd1o5FIb+cpomR0k570f4=", + "aarch64-linux": "sha256-ZBDA3tS2GwnubeIuXhZ7Zxc75KNim5OCYkkn03KMYGs=", + "x86_64-darwin": "sha256-USoiNw8AUinCwMvrpOTmhSDq/TP1f0N9ZT8l8ZILzOo=", + "x86_64-linux": "sha256-OfSxYyyaRxaUCDR8ZjTdIBQ3PFpRXoA1YHIIooXAKKY=" }, "web": { - "aarch64-darwin": "sha256-2nnM91LPjdxuU2uWCdE2tFoZ75N0L5DWlJa75KCulY8=", - "aarch64-linux": "sha256-2nnM91LPjdxuU2uWCdE2tFoZ75N0L5DWlJa75KCulY8=", - "x86_64-darwin": "sha256-2nnM91LPjdxuU2uWCdE2tFoZ75N0L5DWlJa75KCulY8=", - "x86_64-linux": "sha256-2nnM91LPjdxuU2uWCdE2tFoZ75N0L5DWlJa75KCulY8=" + "aarch64-darwin": "sha256-jaDnIyn0uwLOblQ1IqU0TlsgBrXyk8wXhlRzAwXLo50=", + "aarch64-linux": "sha256-jaDnIyn0uwLOblQ1IqU0TlsgBrXyk8wXhlRzAwXLo50=", + "x86_64-darwin": "sha256-jaDnIyn0uwLOblQ1IqU0TlsgBrXyk8wXhlRzAwXLo50=", + "x86_64-linux": "sha256-jaDnIyn0uwLOblQ1IqU0TlsgBrXyk8wXhlRzAwXLo50=" }, "windows": { - "x86_64-darwin": "sha256-boajU3GH29bhgDT+emE3gIQjAtuon1OUi1gGBH6iq/4=", - "x86_64-linux": "sha256-boajU3GH29bhgDT+emE3gIQjAtuon1OUi1gGBH6iq/4=" + "x86_64-darwin": "sha256-zJrruuMcgtOXRrkRPoGHovyjABDck0Dzjrz7bCtx4C4=", + "x86_64-linux": "sha256-zJrruuMcgtOXRrkRPoGHovyjABDck0Dzjrz7bCtx4C4=" } }, "pubspecLock": { diff --git a/pkgs/development/python-modules/aioimmich/default.nix b/pkgs/development/python-modules/aioimmich/default.nix index 2f7330e737bc..4f7cafd03ee8 100644 --- a/pkgs/development/python-modules/aioimmich/default.nix +++ b/pkgs/development/python-modules/aioimmich/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "aioimmich"; - version = "0.10.2"; + version = "0.11.1"; pyproject = true; src = fetchFromGitHub { owner = "mib1185"; repo = "aioimmich"; tag = "v${version}"; - hash = "sha256-+k696FDr8LoJr90SfCNzjhwxC3776IN3kRLqdtPk/LI="; + hash = "sha256-f/zTgaLqR0WRhi7ea2djfHbI3/qz2p5lArsKNLz/Y1s="; }; postPatch = '' diff --git a/pkgs/development/python-modules/blosc2/default.nix b/pkgs/development/python-modules/blosc2/default.nix index 638ee54f12e7..a1cb18bb5633 100644 --- a/pkgs/development/python-modules/blosc2/default.nix +++ b/pkgs/development/python-modules/blosc2/default.nix @@ -32,14 +32,14 @@ buildPythonPackage rec { pname = "blosc2"; - version = "3.5.1"; + version = "3.6.1"; pyproject = true; src = fetchFromGitHub { owner = "Blosc"; repo = "python-blosc2"; tag = "v${version}"; - hash = "sha256-ToPlN8OMgH6BCp0mPanfH0SUJWnrPDxVncF6pBpRhRI="; + hash = "sha256-MSGuG9Vqniz6gie0je84XNTHLZaZho9tmqELMKoDh/U="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix index 8d9f622dcad1..33eed93b7e88 100644 --- a/pkgs/development/python-modules/boto3-stubs/default.nix +++ b/pkgs/development/python-modules/boto3-stubs/default.nix @@ -359,7 +359,7 @@ buildPythonPackage rec { pname = "boto3-stubs"; - version = "1.39.9"; + version = "1.39.11"; pyproject = true; disabled = pythonOlder "3.7"; @@ -367,7 +367,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "boto3_stubs"; inherit version; - hash = "sha256-neoNjC22AkSykCziRCs5L74gymljglGgLUdSecfeMto="; + hash = "sha256-3Ig1yx4lbzCWAx5ehFVkNk0LKNXLT/7/5U7K99smaug="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/css-inline/Cargo.lock b/pkgs/development/python-modules/css-inline/Cargo.lock index 3f23fc989016..d3758752bdca 100644 --- a/pkgs/development/python-modules/css-inline/Cargo.lock +++ b/pkgs/development/python-modules/css-inline/Cargo.lock @@ -113,9 +113,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.2.27" +version = "1.2.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d487aa071b5f64da6f19a3e848e3578944b726ee5a4854b82172f02aa876bfdc" +checksum = "deec109607ca693028562ed836a5f1c4b8bd77755c4e132fc5ce11b0b6211ae7" dependencies = [ "shlex", ] @@ -177,7 +177,7 @@ checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28" [[package]] name = "css-inline" -version = "0.15.0" +version = "0.17.0" dependencies = [ "cssparser", "html5ever", @@ -193,7 +193,7 @@ dependencies = [ [[package]] name = "css-inline-python" -version = "0.15.0" +version = "0.17.0" dependencies = [ "built", "css-inline", @@ -228,9 +228,18 @@ dependencies = [ [[package]] name = "derive_more" -version = "0.99.20" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6edb4b64a43d977b8e99788fe3a04d483834fba1215a7e02caa415b626497f7f" +checksum = "093242cf7570c207c83073cf82f79706fe7b8317e98620a47d5be7c3d8497678" +dependencies = [ + "derive_more-impl", +] + +[[package]] +name = "derive_more-impl" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bda628edc44c4bb645fbe0f758797143e4e07926f7ebf4e9bdfbd3d2ce621df3" dependencies = [ "proc-macro2", "quote", @@ -417,12 +426,11 @@ checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" [[package]] name = "html5ever" -version = "0.31.0" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "953cbbe631aae7fc0a112702ad5d3aaf09da38beaf45ea84610d6e1c358f569c" +checksum = "55d958c2f74b664487a2035fe1dadb032c48718a03b63f3ab0b8537db8549ed4" dependencies = [ "log", - "mac", "markup5ever", "match_token", ] @@ -505,9 +513,9 @@ dependencies = [ [[package]] name = "hyper-util" -version = "0.1.14" +version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc2fdfdbff08affe55bb779f33b053aa1fe5dd5b54c257343c17edfa55711bdb" +checksum = "8d9b05277c7e8da2c93a568989bb6207bef0112e8d17df7a6eda4a3cf143bc5e" dependencies = [ "base64", "bytes", @@ -521,7 +529,7 @@ dependencies = [ "libc", "percent-encoding", "pin-project-lite", - "socket2", + "socket2 0.6.0", "tokio", "tower-service", "tracing", @@ -674,6 +682,17 @@ version = "2.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f4c7245a08504955605670dbf141fceab975f15ca21570696aebe9d2e71576bd" +[[package]] +name = "io-uring" +version = "0.7.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d93587f37623a1a17d94ef2bc9ada592f5465fe7732084ab7beefabe5c77c0c4" +dependencies = [ + "bitflags", + "cfg-if", + "libc", +] + [[package]] name = "ipnet" version = "2.11.0" @@ -736,9 +755,9 @@ checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94" [[package]] name = "lru" -version = "0.14.0" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f8cc7106155f10bdf99a6f379688f543ad6596a415375b36a59a054ceda1198" +checksum = "86ea4e65087ff52f3862caff188d489f1fab49a0cb09e01b2e3f1a617b10aaed" dependencies = [ "hashbrown", ] @@ -757,9 +776,9 @@ checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4" [[package]] name = "markup5ever" -version = "0.16.2" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e4cd8c02f18a011991a039855480c64d74291c5792fcc160d55d77dc4de4a39" +checksum = "311fe69c934650f8f19652b3946075f0fc41ad8757dbb68f1ca14e7900ecc1c3" dependencies = [ "log", "tendril", @@ -768,9 +787,9 @@ dependencies = [ [[package]] name = "match_token" -version = "0.1.0" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88a9689d8d44bf9964484516275f5cd4c9b59457a6940c1d5d0ecbb94510a36b" +checksum = "ac84fd3f360fcc43dc5f5d186f02a94192761a080e8bc58621ad4d12296a58cf" dependencies = [ "proc-macro2", "quote", @@ -1055,7 +1074,7 @@ dependencies = [ "quinn-udp", "rustc-hash", "rustls", - "socket2", + "socket2 0.5.10", "thiserror", "tokio", "tracing", @@ -1071,7 +1090,7 @@ dependencies = [ "bytes", "getrandom 0.3.3", "lru-slab", - "rand 0.9.1", + "rand 0.9.2", "ring", "rustc-hash", "rustls", @@ -1092,7 +1111,7 @@ dependencies = [ "cfg_aliases", "libc", "once_cell", - "socket2", + "socket2 0.5.10", "tracing", "windows-sys 0.59.0", ] @@ -1123,9 +1142,9 @@ dependencies = [ [[package]] name = "rand" -version = "0.9.1" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fbfd9d094a40bf3ae768db9361049ace4c0e04a4fd6b359518bd7b73a73dd97" +checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1" dependencies = [ "rand_chacha", "rand_core 0.9.3", @@ -1178,18 +1197,18 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.5.13" +version = "0.5.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d04b7d0ee6b4a0207a0a7adb104d23ecb0b47d6beae7152d0fa34b692b29fd6" +checksum = "7251471db004e509f4e75a62cca9435365b5ec7bcdff530d612ac7c87c44a792" dependencies = [ "bitflags", ] [[package]] name = "reqwest" -version = "0.12.20" +version = "0.12.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eabf4c97d9130e2bf606614eb937e86edac8292eaa6f422f995d7e8de1eb1813" +checksum = "cbc931937e6ca3a06e3b6c0aa7841849b160a90351d6ab467a8b9b9959767531" dependencies = [ "base64", "bytes", @@ -1253,9 +1272,9 @@ checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d" [[package]] name = "rustls" -version = "0.23.28" +version = "0.23.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7160e3e10bf4535308537f3c4e1641468cd0e485175d6163087c0393c7d46643" +checksum = "2491382039b29b9b11ff08b76ff6c97cf287671dbb74f0be44bda389fffe9bd1" dependencies = [ "once_cell", "ring", @@ -1277,9 +1296,9 @@ dependencies = [ [[package]] name = "rustls-webpki" -version = "0.103.3" +version = "0.103.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4a72fe2bcf7a6ac6fd7d0b9e5cb68aeb7d4c0a0271730218b3e92d43b4eb435" +checksum = "0a17884ae0c1b773f1ccd2bd4a8c72f16da897310a98b0e84bf349ad5ead92fc" dependencies = [ "ring", "rustls-pki-types", @@ -1306,9 +1325,9 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "selectors" -version = "0.28.0" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db3079aef7a4383aff1e60eca2818995d3de8168e85ae4b6ea8fb2804b182c54" +checksum = "3df44ba8a7ca7a4d28c589e04f526266ed76b6cc556e33fe69fa25de31939a65" dependencies = [ "bitflags", "cssparser", @@ -1354,9 +1373,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.140" +version = "1.0.141" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373" +checksum = "30b9eff21ebe718216c6ec64e1d9ac57087aad11efc64e32002bce4a0d4c03d3" dependencies = [ "itoa", "memchr", @@ -1428,6 +1447,16 @@ dependencies = [ "windows-sys 0.52.0", ] +[[package]] +name = "socket2" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "233504af464074f9d066d7b5416c5f9b894a5862a6506e306f7b816cdd6f1807" +dependencies = [ + "libc", + "windows-sys 0.59.0", +] + [[package]] name = "stable_deref_trait" version = "1.2.0" @@ -1560,17 +1589,19 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.45.1" +version = "1.47.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75ef51a33ef1da925cea3e4eb122833cb377c61439ca401b770f54902b806779" +checksum = "43864ed400b6043a4757a25c7a64a8efde741aed79a056a2fb348a406701bb35" dependencies = [ "backtrace", "bytes", + "io-uring", "libc", "mio", "pin-project-lite", - "socket2", - "windows-sys 0.52.0", + "slab", + "socket2 0.6.0", + "windows-sys 0.59.0", ] [[package]] @@ -1864,9 +1895,9 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8782dd5a41a24eed3a4f40b606249b3e236ca61adf1f25ea4d45c73de122b502" +checksum = "7e8983c3ab33d6fb807cfcdad2491c4ea8cbc8ed839181c7dfd9c67c83e261b2" dependencies = [ "rustls-pki-types", ] @@ -2014,9 +2045,9 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winnow" -version = "0.7.11" +version = "0.7.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74c7b26e3480b707944fc872477815d29a8e429d2f93a1ce000f5fa84a15cbcd" +checksum = "f3edebf492c8125044983378ecb5766203ad3b4c2f7a922bd7dd207f6d443e95" dependencies = [ "memchr", ] diff --git a/pkgs/development/python-modules/css-inline/default.nix b/pkgs/development/python-modules/css-inline/default.nix index 13c0b52aafd3..cb58bb88517a 100644 --- a/pkgs/development/python-modules/css-inline/default.nix +++ b/pkgs/development/python-modules/css-inline/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "css-inline"; - version = "0.15.0"; + version = "0.17.0"; pyproject = true; src = fetchFromGitHub { owner = "Stranger6667"; repo = "css-inline"; rev = "python-v${version}"; - hash = "sha256-js9n+m5xDlzxMbXtN74klS0rjTCsHL3LhVAp0tx48b0="; + hash = "sha256-RclMgVJpK2dOtuFKearRMK8rpa6vFTa8T3Z+A7mk7Zs="; }; postPatch = '' @@ -43,7 +43,7 @@ buildPythonPackage rec { cd bindings/python ln -s ${./Cargo.lock} Cargo.lock ''; - hash = "sha256-4DVLcJrK2at1vlThey0N97IWFHd1NM2MEXXA74BYfZs="; + hash = "sha256-WvUlumpXVLiu9htY07wfGyibro2StWgYF7XVW411ePw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/django-anymail/default.nix b/pkgs/development/python-modules/django-anymail/default.nix index 3ffbd7d39494..69074db017ef 100644 --- a/pkgs/development/python-modules/django-anymail/default.nix +++ b/pkgs/development/python-modules/django-anymail/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "django-anymail"; - version = "13.0"; + version = "13.0.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "anymail"; repo = "django-anymail"; tag = "v${version}"; - hash = "sha256-0KqpgS71QwTfLp4I8p1An6sCnGcvxTNB4xy4LaFFl8E="; + hash = "sha256-ozaukE6W2tq+RBVL10GV9epUMb5W6Yn4s2oeB14Skp8="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/falconpy/default.nix b/pkgs/development/python-modules/falconpy/default.nix index d45bbc0dded8..706c2cdaacbc 100644 --- a/pkgs/development/python-modules/falconpy/default.nix +++ b/pkgs/development/python-modules/falconpy/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "falconpy"; - version = "1.5.3"; + version = "1.5.4"; pyproject = true; src = fetchFromGitHub { owner = "CrowdStrike"; repo = "falconpy"; tag = "v${version}"; - hash = "sha256-yK6delBTDnK5cP8mWIQZRfZClRsM2IeqjqrqOjbrlnc="; + hash = "sha256-m/pW9M2HXTtu42UIOCq7J1lr+y9mc3N74lD+qaCjaVE="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/gaphas/default.nix b/pkgs/development/python-modules/gaphas/default.nix index 2911711d09df..f9ae6c26140b 100644 --- a/pkgs/development/python-modules/gaphas/default.nix +++ b/pkgs/development/python-modules/gaphas/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "gaphas"; - version = "5.1.0"; + version = "5.1.1"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-89KGjrA5ncwxK5gVayfhlTddRZj2912L5G4L4ov4YhA="; + hash = "sha256-ifr1Ul9/IaIvZ6b2SU08o110lRXlZ6RoqkH3CRYcH5A="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-spanner/default.nix b/pkgs/development/python-modules/google-cloud-spanner/default.nix index e0292cffafa2..3b46d66997aa 100644 --- a/pkgs/development/python-modules/google-cloud-spanner/default.nix +++ b/pkgs/development/python-modules/google-cloud-spanner/default.nix @@ -33,14 +33,14 @@ buildPythonPackage rec { pname = "google-cloud-spanner"; - version = "3.55.0"; + version = "3.56.0"; pyproject = true; src = fetchFromGitHub { owner = "googleapis"; repo = "python-spanner"; tag = "v${version}"; - hash = "sha256-0+mTBqgy8SaHjoYhQjCaypipVsJTrN2DdhcfPY3PxSc="; + hash = "sha256-yCEFVf/euu48j+0jK5QfjhdJMV4c4mEHFYE+Ukz7Rjo="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/model-checker/default.nix b/pkgs/development/python-modules/model-checker/default.nix index 3341cd7559eb..bfd4163caaa0 100644 --- a/pkgs/development/python-modules/model-checker/default.nix +++ b/pkgs/development/python-modules/model-checker/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "model-checker"; - version = "0.9.28"; + version = "0.9.31"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "model_checker"; inherit version; - hash = "sha256-mRJpkJkSA8wNTCs3YhNm+W3OQnRVUXhCYz5CJhmqpmA="; + hash = "sha256-mg964kVjZD4XnfDV93sC1NRhThnI8mlYQ3iYBzB92IU="; }; # z3 does not provide a dist-info, so python-runtime-deps-check will fail diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index a9f3ef8b8d7f..5f9271c16395 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -230,8 +230,8 @@ rec { "sha256-c0qUMt2dvFgmJCTabQSkliysaBDBepkz5kOBgNIlQSk="; mypy-boto3-cloudfront = - buildMypyBoto3Package "cloudfront" "1.39.8" - "sha256-N1QVZiMkTf9AS9I2nm+2foIozWGhuLtauNZHvDvA1nk="; + buildMypyBoto3Package "cloudfront" "1.39.10" + "sha256-2v3ZBFKuD2bfjTaZpW4gpaKKSJ4FhpTnOyFbeBInkOo="; mypy-boto3-cloudhsm = buildMypyBoto3Package "cloudhsm" "1.39.0" @@ -446,16 +446,16 @@ rec { "sha256-uYeekAsfyETYQYWR3L8S+uzlp6EQpvYEWsqiX+60b/Y="; mypy-boto3-ec2 = - buildMypyBoto3Package "ec2" "1.39.8" - "sha256-jdFnyTA5Po3XaVWVCwEtY10JeyiIC453jw8cTZ6xjFs="; + buildMypyBoto3Package "ec2" "1.39.10" + "sha256-8fxtJZJnC0UDtEqRMdOzU92mht0oAg4zjxcS1kb6biw="; mypy-boto3-ec2-instance-connect = buildMypyBoto3Package "ec2-instance-connect" "1.39.0" "sha256-VbEhzVf9uNm1DmyEvAUBEkHawITLiArgya5kwotuYbI="; mypy-boto3-ecr = - buildMypyBoto3Package "ecr" "1.39.0" - "sha256-fsGs0xUocXqkO2ANby3RuluJizT9HGgo6GhdeG5SMJg="; + buildMypyBoto3Package "ecr" "1.39.11" + "sha256-1tIxouuj5FmgUyz+W5vfbVYRMH5FkCYBR5oechO9tXo="; mypy-boto3-ecr-public = buildMypyBoto3Package "ecr-public" "1.39.0" @@ -498,8 +498,8 @@ rec { "sha256-WK1TbY46qCD6V+lRv2hqEG8xtjF37xJO6K2t5gj2xLU="; mypy-boto3-emr = - buildMypyBoto3Package "emr" "1.39.0" - "sha256-Nxu4G4ww6yTBukU9TwhO7jVGL57cEFdsNadDUCDvQKI="; + buildMypyBoto3Package "emr" "1.39.11" + "sha256-C/Ui2pSoYCB2sCFR53UAEj17YPvW8Z8vtV7tmJTz0iA="; mypy-boto3-emr-containers = buildMypyBoto3Package "emr-containers" "1.39.0" @@ -770,8 +770,8 @@ rec { "sha256-UMrR80IPpkYrz4iBsArrjWbt+n58KmNOIFUUlp05eNk="; mypy-boto3-lambda = - buildMypyBoto3Package "lambda" "1.39.0" - "sha256-ZDoMZQQn6ElClTDZtXDm1XPecnSYQZPxggM8y/ylXQw="; + buildMypyBoto3Package "lambda" "1.39.11" + "sha256-qYZ7pUztjP0el3r67gU9EmTI1k7yFf6NEyuaOkc2/gc="; mypy-boto3-lex-models = buildMypyBoto3Package "lex-models" "1.39.0" @@ -946,8 +946,8 @@ rec { "sha256-q8NsWE/syMihH6TE1b1nBFgHhNavOBaFdwgQnDQXrXs="; mypy-boto3-neptunedata = - buildMypyBoto3Package "neptunedata" "1.39.0" - "sha256-Jrgjn7fXiMBZ87VKHcknDlexLfHmDYuN4TIyGQA4fAw="; + buildMypyBoto3Package "neptunedata" "1.39.11" + "sha256-KdPpWb+esR94Abnfs1K09qf2MWfTkj28yLRSg/1QCFI="; mypy-boto3-network-firewall = buildMypyBoto3Package "network-firewall" "1.39.0" @@ -1174,8 +1174,8 @@ rec { "sha256-vW033S6oYNQN+iCLiDEGbgaNOxjDM0FK0P/SrSHEprA="; mypy-boto3-sagemaker = - buildMypyBoto3Package "sagemaker" "1.39.5" - "sha256-mEYdxdkrTwbl8ByvLIfqJnZw12+xstzevnFMqC2uWFY="; + buildMypyBoto3Package "sagemaker" "1.39.10" + "sha256-jqLHNFIZ4P03QO0NgXzU9V0RdLbR/i0er6VPk4QDbks="; mypy-boto3-sagemaker-a2i-runtime = buildMypyBoto3Package "sagemaker-a2i-runtime" "1.39.0" diff --git a/pkgs/development/python-modules/nats-py/default.nix b/pkgs/development/python-modules/nats-py/default.nix index 1e620f9493bb..73746749cfcb 100644 --- a/pkgs/development/python-modules/nats-py/default.nix +++ b/pkgs/development/python-modules/nats-py/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "nats-py"; - version = "2.10.0"; + version = "2.11.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "nats-io"; repo = "nats.py"; tag = "v${version}"; - hash = "sha256-cgcoxDTfXeP2w1k8Miw8zY1Bln0XpTdtUY13SSvrHXw="; + hash = "sha256-wILjBhdlNU8U2lyJm4CmPy4DzOjJ7cBIkawKwW5KVgg="; }; build-system = [ setuptools ]; @@ -67,7 +67,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python client for NATS.io"; homepage = "https://github.com/nats-io/nats.py"; - changelog = "https://github.com/nats-io/nats.py/releases/tag/v${version}"; + changelog = "https://github.com/nats-io/nats.py/releases/tag/${src.tag}"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/osc-sdk-python/default.nix b/pkgs/development/python-modules/osc-sdk-python/default.nix index fff6eb0c864b..d7ee910f3e36 100644 --- a/pkgs/development/python-modules/osc-sdk-python/default.nix +++ b/pkgs/development/python-modules/osc-sdk-python/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "osc-sdk-python"; - version = "0.34.0"; + version = "0.35.0"; pyproject = true; src = fetchFromGitHub { owner = "outscale"; repo = "osc-sdk-python"; tag = "v${version}"; - hash = "sha256-RVcpwLJ/95dAfQNTvhuKg3DFsXVhJsGshVWqiQUgTvk="; + hash = "sha256-/UYxleKMFN42EKxXuGSb1FtY8QoVkKCqzJUqocLjeFg="; fetchSubmodules = true; }; diff --git a/pkgs/development/python-modules/ossapi/default.nix b/pkgs/development/python-modules/ossapi/default.nix index c2da288d9687..ad0e774d3d56 100644 --- a/pkgs/development/python-modules/ossapi/default.nix +++ b/pkgs/development/python-modules/ossapi/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "ossapi"; - version = "5.3.0"; + version = "5.3.1"; pyproject = true; src = fetchFromGitHub { owner = "tybug"; repo = "ossapi"; tag = "v${version}"; - hash = "sha256-mBR+4zpY7PprjAWy17vSRdKa8uE4VjyAIwDpr0ZJrnY="; + hash = "sha256-5a2kSdOHF0BM/ZjhtPc9O/BiZXeLuZFlXwVOJHnKYLI="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pebble/default.nix b/pkgs/development/python-modules/pebble/default.nix index 471e88b912f4..6a40280f023c 100644 --- a/pkgs/development/python-modules/pebble/default.nix +++ b/pkgs/development/python-modules/pebble/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pebble"; - version = "5.1.1"; + version = "5.1.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "noxdafox"; repo = "pebble"; tag = version; - hash = "sha256-x0jvqH1wSAkOgxYNcXr+TL5dqZE0Vai0ZaxdnDSqRNI="; + hash = "sha256-VQ6611HMj19Sq5IXqKNqVHEau8OZu8HEYFRe5LKivaI="; }; build-system = [ diff --git a/pkgs/development/python-modules/py-schluter/default.nix b/pkgs/development/python-modules/py-schluter/default.nix new file mode 100644 index 000000000000..329d34603cb7 --- /dev/null +++ b/pkgs/development/python-modules/py-schluter/default.nix @@ -0,0 +1,34 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + requests, + setuptools, +}: + +buildPythonPackage rec { + pname = "py-schluter"; + version = "0.1.7"; + pyproject = true; + + src = fetchPypi { + inherit pname version; + hash = "sha256-FS6aflpRDoIHsE4XIf93Q6MsO9ApRbU+efm7zWpw/dY="; + }; + + build-system = [ setuptools ]; + + dependencies = [ requests ]; + + # Package has no tests + doCheck = false; + + pythonImportsCheck = [ "schluter" ]; + + meta = { + description = "Python API for Schluter DITRA-HEAT thermostat"; + homepage = "https://github.com/prairieapps/py-schluter"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.jamiemagee ]; + }; +} diff --git a/pkgs/development/python-modules/pyathena/default.nix b/pkgs/development/python-modules/pyathena/default.nix index ccfbde940234..d815df7d70a9 100644 --- a/pkgs/development/python-modules/pyathena/default.nix +++ b/pkgs/development/python-modules/pyathena/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "pyathena"; - version = "3.14.1"; + version = "3.15.0"; pyproject = true; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-/2KCYVlbUrwrdICcQu+JiG90vgE3FQbiif2wvE9lOZM="; + hash = "sha256-F3XquRYvwWFLqGHokxaRxsNM4pANemCweU3tVmhn0M4="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/python-linkplay/default.nix b/pkgs/development/python-modules/python-linkplay/default.nix index 78a1bd3638d0..c96258aa49cd 100644 --- a/pkgs/development/python-modules/python-linkplay/default.nix +++ b/pkgs/development/python-modules/python-linkplay/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "python-linkplay"; - version = "0.2.13"; + version = "0.2.14"; pyproject = true; src = fetchFromGitHub { owner = "Velleman"; repo = "python-linkplay"; tag = "v${version}"; - hash = "sha256-E9KuIHLaA7XQC2XH8a1oeTuQh7Q4YxmswoaVKEJU4VE="; + hash = "sha256-UGYvaprqwEDxLQZUqyl0NXaDvwx1pDRoTjpRRS1KJPc="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/reolink-aio/default.nix b/pkgs/development/python-modules/reolink-aio/default.nix index f95d848d5f6c..c63bcc948e10 100644 --- a/pkgs/development/python-modules/reolink-aio/default.nix +++ b/pkgs/development/python-modules/reolink-aio/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "reolink-aio"; - version = "0.14.2"; + version = "0.14.3"; pyproject = true; disabled = pythonOlder "3.11"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "starkillerOG"; repo = "reolink_aio"; tag = version; - hash = "sha256-DsxYkXRxEZ1DJRBpDUNd6b/3XiyUoetSSXfNUO+jVCY="; + hash = "sha256-RH6elFdv51OqFvJjTGG+ZEuQNI3tpWj6gYU7XsfOUiU="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/scancode-toolkit/default.nix b/pkgs/development/python-modules/scancode-toolkit/default.nix index 91330b55d48e..bd89b5a31047 100644 --- a/pkgs/development/python-modules/scancode-toolkit/default.nix +++ b/pkgs/development/python-modules/scancode-toolkit/default.nix @@ -61,14 +61,14 @@ buildPythonPackage rec { pname = "scancode-toolkit"; - version = "32.4.0"; + version = "32.4.1"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-kTIDmaXOQusDy0XIDui7cKnR1RcjMeQDjDijufh07cQ="; + hash = "sha256-qZUILeB1lGv0V9Uq81/aOI9pJTtayfZH/O5kwNnpf28="; }; dontConfigure = true; diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix index d615bae0d72f..fadb0f84f71e 100644 --- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix +++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "tencentcloud-sdk-python"; - version = "3.0.1429"; + version = "3.0.1430"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "TencentCloud"; repo = "tencentcloud-sdk-python"; tag = version; - hash = "sha256-icA5CuDkGYipXXcL1ePODBC8CMmMLLmBwD/X/nykqL8="; + hash = "sha256-8ccjMWruE+6CYVj0MnO51sDUqeC68qAqNI1sW3+KGaI="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/whool/default.nix b/pkgs/development/python-modules/whool/default.nix index 50e860e89b51..2d040d4dcf72 100644 --- a/pkgs/development/python-modules/whool/default.nix +++ b/pkgs/development/python-modules/whool/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "whool"; - version = "1.2"; + version = "1.3"; pyproject = true; src = fetchFromGitHub { owner = "sbidoul"; repo = "whool"; tag = "v${version}"; - hash = "sha256-uIHtygDeFbtIZLn0YwGzAHD7B+EZQ3JAovuNMZ5YMxc="; + hash = "sha256-vY7MPTBjNy3LY29k0MjMDnPiU7l9lUvPvTCrji8A5Cw="; }; build-system = [ hatch-vcs ]; @@ -43,7 +43,7 @@ buildPythonPackage rec { meta = { description = "Standards-compliant Python build backend to package Odoo addons"; homepage = "https://github.com/sbidoul/whool"; - changelog = "https://github.com/sbidoul/whool/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/sbidoul/whool/blob/${src.tag}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = [ lib.maintainers.yajo ]; }; diff --git a/pkgs/development/rocm-modules/6/rocdbgapi/default.nix b/pkgs/development/rocm-modules/6/rocdbgapi/default.nix index 16ef4b115bdd..cd07af5d4cdf 100644 --- a/pkgs/development/rocm-modules/6/rocdbgapi/default.nix +++ b/pkgs/development/rocm-modules/6/rocdbgapi/default.nix @@ -37,6 +37,15 @@ let helvetic wasy courier + # FIXME: The following packages are used in the Doxygen table + # workaround, can be removed once + # https://github.com/doxygen/doxygen/issues/11634 is fixed, depending + # on what the fix is + tabularray + ninecolors + codehigh + catchfile + environ ] ) ); @@ -59,6 +68,16 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-6itfBrWVspobU47aiJAOQoxT8chwrq9scRn0or3bXto="; }; + # FIXME: remove once https://github.com/doxygen/doxygen/issues/11634 is resolved + # Applies workaround based on what was suggested in + # https://github.com/doxygen/doxygen/issues/11634#issuecomment-3027000655, + # but rewritten to use the `tabularray` LaTeX package. Unfortunately, + # verbatim code snippets in the documentation are not formatted very nicely + # with this workaround. + postPatch = '' + substituteInPlace doc/Doxyfile.in --replace 'LATEX_EXTRA_STYLESHEET =' 'LATEX_EXTRA_STYLESHEET = ${./override_doxygen_tables.sty}' + ''; + nativeBuildInputs = [ cmake rocm-cmake diff --git a/pkgs/development/rocm-modules/6/rocdbgapi/override_doxygen_tables.sty b/pkgs/development/rocm-modules/6/rocdbgapi/override_doxygen_tables.sty new file mode 100644 index 000000000000..6732649570ad --- /dev/null +++ b/pkgs/development/rocm-modules/6/rocdbgapi/override_doxygen_tables.sty @@ -0,0 +1,89 @@ +\NeedsTeXFormat{LaTeX2e} + +% Packages used by this style file +\RequirePackage{doxygen} +\RequirePackage{tabularray} +\UseTblrLibrary{varwidth} +\RequirePackage{codehigh} +\RequirePackage{environ} + +% Used by parameter lists +\renewenvironment{DoxyParams}[2][]{% + \par% + \ifthenelse{\equal{#1}{}}% + {\begin{longtblr}[l]{rowhead=1,measure=vbox,colspec={|X[-1,l]|X[-1,l]|}}}% name + description + {\ifthenelse{\equal{#1}{1}}% + {\begin{longtblr}[l]{rowhead=1,measure=vbox,colspec={|X[-1,l]|X[-1,l]|X[-1,l]|}}}% in/out + name + desc + {\begin{longtblr}[l]{rowhead=1,measure=vbox,colspec={|X[-1,l]|X[-1,l]|X[-1,l]|X[-1,l]|}}}% in/out + type + name + desc + } + \SetCell[c=2]{l} \hspace{-6pt}\bfseries\fontseries{bc}\selectfont\color{darkgray} #2 \\[1ex]% + \hline% +}{% + \end{longtblr}% + \vspace{6pt}% +} + +% Used for fields of simple structs +\renewenvironment{DoxyFields}[1]{% + \par% + \begin{longtblr}[l]{rowhead=1,measure=vbox,colspec={|X[-1,r]|X[-1,l]|X[-1,l]|}}% + \SetCell[c=3]{l} \hspace{-6pt}\bfseries\fontseries{bc}\selectfont\color{darkgray} #1 \\[1ex]% + \hline% +}{% + \end{longtblr}% + \vspace{6pt}% +} + +% Used for fields simple class style enums +\renewenvironment{DoxyEnumFields}[2][]{% + \par% + \ifthenelse{\equal{#1}{2}}% + {\begin{longtblr}[l]{rowhead=1,measure=vbox,colspec={|X[-1,r]|X[-1,l]|}}}% + {\begin{longtblr}[l]{rowhead=1,measure=vbox,colspec={|X[-1,l]|X[-1,r]|X[-1,l]|}}}% with init value + \SetCell[c=2]{l} \hspace{-6pt}\bfseries\fontseries{bc}\selectfont\color{darkgray} #2 \\[1ex]% + \hline% +}{% + \end{longtblr}% + \vspace{6pt}% +} + +% Used by return value lists +\renewenvironment{DoxyRetVals}[1]{% + \par% + \begin{longtblr}[l]{rowhead=1,measure=vbox,colspec={|X[-1,r]|X[-1,l]|}}% + \SetCell[c=2]{l} \hspace{-6pt}\bfseries\fontseries{bc}\selectfont\color{darkgray} #1 \\[1ex]% + \hline% +}{% + \end{longtblr}% + \vspace{6pt}% +} + +% Used by exception lists +\renewenvironment{DoxyExceptions}[1]{% + \par% + \begin{longtblr}[l]{rowhead=1,measure=vbox,colspec={|l[-1,r]|l[-1,l]|}}% + \SetCell[c=2]{l} \hspace{-6pt}\bfseries\fontseries{bc}\selectfont\color{darkgray} #1 \\[1ex]% + \hline% +}{% + \end{longtblr}% + \vspace{6pt}% +} + +% Used by template parameter lists +\renewenvironment{DoxyTemplParams}[1]{% + \par% + \begin{longtblr}[l]{rowhead=1,measure=vbox,colspec={|X[-1,r]|X[-1,l]|}}% + \SetCell[c=2]{l} \hspace{-6pt}\bfseries\fontseries{bc}\selectfont\color{darkgray} #1 \\[1ex]% + \hline% +}{% + \end{longtblr}% + \vspace{6pt}% +} + +% NOTE: this is not a perfect workaround, and known to loose linebreaks, repeated spaces, etc +\RenewEnviron{DoxyVerb}{% + \par% + \footnotesize% + \ExpandArgs{o}\fakeverb{\BODY}% + \normalsize% +} diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 8e1af9be886f..a1a5824877c2 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -5093,7 +5093,8 @@ ]; "schluter" = ps: with ps; [ - ]; # missing inputs: py-schluter + py-schluter + ]; "scl" = ps: with ps; [ ]; diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/zigbee2mqtt-networkmap/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/zigbee2mqtt-networkmap/package.nix index b93b44ae96b5..2a16391ef221 100644 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/zigbee2mqtt-networkmap/package.nix +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/zigbee2mqtt-networkmap/package.nix @@ -24,8 +24,12 @@ mkYarnPackage rec { }; configurePhase = '' + runHook preConfigure + cp -r $node_modules node_modules chmod +w node_modules + + runHook postConfigure ''; buildPhase = '' diff --git a/pkgs/servers/irc/charybdis/default.nix b/pkgs/servers/irc/charybdis/default.nix index 1b9dc0757466..52235a2e3a97 100644 --- a/pkgs/servers/irc/charybdis/default.nix +++ b/pkgs/servers/irc/charybdis/default.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchurl, autoreconfHook, bison, flex, @@ -20,6 +21,13 @@ stdenv.mkDerivation rec { sha256 = "1lndk0yp27qm8bds4jd204ynxcq92fqmpfb0kkcla5zgky3miks3"; }; + patches = [ + (fetchurl { + url = "https://gitlab.alpinelinux.org/alpine/aports/-/raw/d13eb723d7e9512fb2f2516e5934bd927a92eb2c/community/charybdis/fix-missing-include.patch"; + hash = "sha256-8JXYuIjoHQg+l33OjseF5nnd5ZPagBA2/bSa3Il5Te4="; + }) + ]; + postPatch = '' substituteInPlace include/defaults.h --replace 'PKGLOCALSTATEDIR "' '"/var/lib/charybdis' substituteInPlace include/defaults.h --replace 'ETCPATH "' '"/etc/charybdis' diff --git a/pkgs/tools/misc/steampipe-packages/steampipe-plugin-github/default.nix b/pkgs/tools/misc/steampipe-packages/steampipe-plugin-github/default.nix index 67ae7810541b..b5c9def30c3a 100644 --- a/pkgs/tools/misc/steampipe-packages/steampipe-plugin-github/default.nix +++ b/pkgs/tools/misc/steampipe-packages/steampipe-plugin-github/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "steampipe-plugin-github"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "turbot"; repo = "steampipe-plugin-github"; tag = "v${version}"; - hash = "sha256-Xz8sUCfxKDEN14bVBzPLO7OVAZjXrdreeCK0IOtuA20="; + hash = "sha256-+RHYPeVY19zRWhI4U4dWuHJseBO9r7hms7XsLrknA2I="; }; vendorHash = "sha256-vZDXLfo9EtPKSLE8hHA5lR/RgJtWESdOqOjpFywXKbs="; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c3f0a10cb4a1..db70ed116274 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10146,9 +10146,7 @@ with pkgs; dnsutils = bind.dnsutils; dig = lib.addMetaAttrs { mainProgram = "dig"; } bind.dnsutils; - charybdis = callPackage ../servers/irc/charybdis { - autoreconfHook = buildPackages.autoreconfHook269; - }; + charybdis = callPackage ../servers/irc/charybdis { }; clickhouse-cli = with python3Packages; toPythonApplication clickhouse-cli; @@ -15690,7 +15688,6 @@ with pkgs; boinc-headless = callPackage ../applications/science/misc/boinc { headless = true; }; celestia = callPackage ../applications/science/astronomy/celestia { - autoreconfHook = buildPackages.autoreconfHook269; inherit (gnome2) gtkglext; }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6bd5dcdea974..49f6550cd3a3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5897,7 +5897,7 @@ self: super: with self; { gmsh = toPythonModule ( pkgs.gmsh.override { - inherit (self) python; + python3Packages = self; enablePython = true; } ); @@ -12249,6 +12249,8 @@ self: super: with self; { py-rust-stemmers = callPackage ../development/python-modules/py-rust-stemmers { }; + py-schluter = callPackage ../development/python-modules/py-schluter { }; + py-scrypt = callPackage ../development/python-modules/py-scrypt { }; py-serializable = callPackage ../development/python-modules/py-serializable { };