diff --git a/lib/licenses.nix b/lib/licenses.nix index 7a594d9d26f0..9ca884c690cc 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -1416,7 +1416,7 @@ lib.mapAttrs mkLicense ( tsl = { shortName = "TSL"; - fullName = "Timescale License Agreegment"; + fullName = "Timescale License Agreement"; url = "https://github.com/timescale/timescaledb/blob/main/tsl/LICENSE-TIMESCALE"; free = false; }; diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 8b701c9decbb..fdba52e7b39f 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -5799,12 +5799,6 @@ name = "Daniil Berendeev"; keys = [ { fingerprint = "60D7 0EE0 3BD4 A415 B255 1938 6556 0668 006B 4906"; } ]; }; - danbst = { - email = "abcz2.uprola@gmail.com"; - github = "danbst"; - githubId = 743057; - name = "Danylo Hlynskyi"; - }; danbulant = { name = "Daniel Bulant"; email = "danbulant@gmail.com"; @@ -25294,6 +25288,11 @@ githubId = 20484159; keys = [ { fingerprint = "F246 425A 7650 6F37 0552 BA8D DEA9 C405 09D9 65F5"; } ]; }; + squishykid = { + github = "squishykid"; + githubId = 2177912; + name = "squishykid"; + }; srgom = { github = "SRGOM"; githubId = 8103619; diff --git a/nixos/modules/services/audio/spotifyd.nix b/nixos/modules/services/audio/spotifyd.nix index 2264d7c39c6b..74cc60fce0f7 100644 --- a/nixos/modules/services/audio/spotifyd.nix +++ b/nixos/modules/services/audio/spotifyd.nix @@ -23,6 +23,8 @@ in services.spotifyd = { enable = lib.mkEnableOption "spotifyd, a Spotify playing daemon"; + package = lib.mkPackageOption pkgs "spotifyd" { }; + config = lib.mkOption { default = ""; type = lib.types.lines; @@ -43,6 +45,7 @@ in . ''; }; + }; }; @@ -64,7 +67,7 @@ in description = "spotifyd, a Spotify playing daemon"; environment.SHELL = "/bin/sh"; serviceConfig = { - ExecStart = "${pkgs.spotifyd}/bin/spotifyd --no-daemon --cache-path /var/cache/spotifyd --config-path ${spotifydConf}"; + ExecStart = "${cfg.package}/bin/spotifyd --no-daemon --cache-path /var/cache/spotifyd --config-path ${spotifydConf}"; Restart = "always"; RestartSec = 12; DynamicUser = true; diff --git a/nixos/modules/services/web-servers/tomcat.nix b/nixos/modules/services/web-servers/tomcat.nix index db3b3ac8d90f..22d2b274d290 100644 --- a/nixos/modules/services/web-servers/tomcat.nix +++ b/nixos/modules/services/web-servers/tomcat.nix @@ -14,7 +14,6 @@ in { meta = { maintainers = with lib.maintainers; [ - danbst anthonyroussel ]; }; diff --git a/nixos/tests/containers-reloadable.nix b/nixos/tests/containers-reloadable.nix index 9854db830550..3d6803143a85 100644 --- a/nixos/tests/containers-reloadable.nix +++ b/nixos/tests/containers-reloadable.nix @@ -2,7 +2,7 @@ { name = "containers-reloadable"; meta = { - maintainers = with lib.maintainers; [ danbst ]; + maintainers = [ ]; }; nodes = { diff --git a/nixos/tests/nginx.nix b/nixos/tests/nginx.nix index 476824e3a9ec..821ece83c73e 100644 --- a/nixos/tests/nginx.nix +++ b/nixos/tests/nginx.nix @@ -10,7 +10,6 @@ meta = with pkgs.lib.maintainers; { maintainers = [ mbbx6spp - danbst ]; }; diff --git a/pkgs/applications/editors/vim/plugins/non-generated/zig-vim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/zig-vim/default.nix index 5452298f4916..619c421cf81c 100644 --- a/pkgs/applications/editors/vim/plugins/non-generated/zig-vim/default.nix +++ b/pkgs/applications/editors/vim/plugins/non-generated/zig-vim/default.nix @@ -6,13 +6,13 @@ }: vimUtils.buildVimPlugin { pname = "zig.vim"; - version = "0-unstable-2026-01-24"; + version = "0-unstable-2026-02-13"; src = fetchFromCodeberg { owner = "ziglang"; repo = "zig.vim"; - rev = "2f53c35bee0d64a1d417d47c894a3cbb6663dff4"; - hash = "sha256-vrtcUAp/YWpZtf6lyg2l0GR62YdHprAb8sAHzZ89F48="; + rev = "f65b43b90cbc3e179b3146d2237f503783119ab8"; + hash = "sha256-4Ssde+vLYn/NnL24sDW6Z+yDN2dWKaOFgrFYm1oVQjg="; }; passthru.updateScript = nix-update-script { diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 9cdacea547cd..e2cda36c9e76 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -3093,8 +3093,8 @@ let mktplcRef = { name = "compare-folders"; publisher = "moshfeu"; - version = "0.25.3"; - hash = "sha256-QrSh8/AycC5nKbZ1+E3V/lJu/7Skket8b05yPnZg68s="; + version = "0.27.0"; + hash = "sha256-v4ZIcrYa+5RXSX0OM5atXMcmN/EgAH6qqWS1vksxXpI="; }; meta = { @@ -4340,8 +4340,8 @@ let mktplcRef = { publisher = "sonarsource"; name = "sonarlint-vscode"; - version = "4.42.0"; - hash = "sha256-jWw5vbORdi/qW8L4D1qbue8tdeiyof01FzJtcZUKs3Y="; + version = "4.43.0"; + hash = "sha256-cpd8+fbp57l+XYBuDnz95lmKzJ8IUHu937KWHsLXrPk="; }; meta.license = lib.licenses.lgpl3Only; }; @@ -4788,8 +4788,8 @@ let mktplcRef = { name = "emacs-mcx"; publisher = "tuttieee"; - version = "0.107.1"; - hash = "sha256-x2WoDoYE4at2G8yuefc5evHRpCiJXh5WTTkNzW454N0="; + version = "0.107.2"; + hash = "sha256-Id8pKACGLtRXas1Tb2dZrw+ZrZvAQLbWcI3Q1gYpXos="; }; meta = { changelog = "https://github.com/whitphx/vscode-emacs-mcx/blob/main/CHANGELOG.md"; diff --git a/pkgs/applications/emulators/libretro/cores/dosbox-pure.nix b/pkgs/applications/emulators/libretro/cores/dosbox-pure.nix index 7ccf48d09dfd..2faed5d89a62 100644 --- a/pkgs/applications/emulators/libretro/cores/dosbox-pure.nix +++ b/pkgs/applications/emulators/libretro/cores/dosbox-pure.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "dosbox-pure"; - version = "0-unstable-2026-02-05"; + version = "0-unstable-2026-02-17"; src = fetchFromGitHub { owner = "schellingb"; repo = "dosbox-pure"; - rev = "6fe60a669e8781d738150ad2353b87c1e1de7dd4"; - hash = "sha256-6hIevmWusjg8Wr9A5ov6RLovirtOIEhHtEYLQ7EHVh0="; + rev = "f587236b2d016f4f16d672e9ce2829bdf507bf9b"; + hash = "sha256-OS6iY8b8pvqkJpDQO9DHRUh7ckjov5t1GZldOR+qg0Y="; }; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/emulators/wine/base.nix b/pkgs/applications/emulators/wine/base.nix index 734cc4cf2815..db34318d5545 100644 --- a/pkgs/applications/emulators/wine/base.nix +++ b/pkgs/applications/emulators/wine/base.nix @@ -17,13 +17,13 @@ makeWrapper, pkg-config, nixosTests, - supportFlags, pnameSuffix ? "", patches, moltenvk, buildScript ? null, configureFlags ? [ ], mainProgram ? "wine", + # Staging support useStaging ? false, autoconf, @@ -31,6 +31,39 @@ perl, python3, gitMinimal, + + # Support flags + gettextSupport ? false, + fontconfigSupport ? false, + alsaSupport ? false, + gtkSupport ? false, + openglSupport ? false, + tlsSupport ? false, + gstreamerSupport ? false, + cupsSupport ? false, + dbusSupport ? false, + openclSupport ? false, + cairoSupport ? false, + odbcSupport ? false, + netapiSupport ? false, + cursesSupport ? false, + vaSupport ? false, + pcapSupport ? false, + v4lSupport ? false, + saneSupport ? false, + gphoto2Support ? false, + krb5Support ? false, + pulseaudioSupport ? false, + udevSupport ? false, + xineramaSupport ? false, + vulkanSupport ? false, + sdlSupport ? false, + usbSupport ? false, + mingwSupport ? stdenv.hostPlatform.isDarwin, + waylandSupport ? false, + x11Support ? false, + ffmpegSupport ? false, + embedInstallers ? false, }: let @@ -47,26 +80,23 @@ let }; } ./setup-hook-darwin.sh; - # Building Wine with these flags isn’t supported on Darwin. Using any of them will result in an evaluation failures + # Building Wine with these flags isn't supported on Darwin. Using any of them will result in an evaluation failures # because they will put Darwin in `meta.badPlatforms`. - darwinUnsupportedFlags = [ - "alsaSupport" - "cairoSupport" - "dbusSupport" - "fontconfigSupport" - "gtkSupport" - "netapiSupport" - "pulseaudioSupport" - "udevSupport" - "v4lSupport" - "vaSupport" - "waylandSupport" - "x11Support" - "xineramaSupport" - ]; - badPlatforms = lib.optional ( - !supportFlags.mingwSupport || lib.any (flag: supportFlags.${flag}) darwinUnsupportedFlags + !mingwSupport + || alsaSupport + || cairoSupport + || dbusSupport + || fontconfigSupport + || gtkSupport + || netapiSupport + || pulseaudioSupport + || udevSupport + || v4lSupport + || vaSupport + || waylandSupport + || x11Support + || xineramaSupport ) "x86_64-darwin"; # Staging patches (from src.staging when useStaging is true) @@ -101,7 +131,6 @@ stdenv.mkDerivation ( strictDeps = true; nativeBuildInputs = - with supportFlags; lib.optionals useStaging [ autoconf hexdump @@ -134,7 +163,6 @@ stdenv.mkDerivation ( ) ) ++ toBuildInputs pkgArches ( - with supportFlags; pkgs: [ pkgs.freetype @@ -242,11 +270,11 @@ stdenv.mkDerivation ( configureFlags = prevConfigFlags - ++ lib.optionals supportFlags.waylandSupport [ "--with-wayland" ] - ++ lib.optionals supportFlags.vulkanSupport [ "--with-vulkan" ] - ++ lib.optionals ( - (stdenv.hostPlatform.isDarwin && !supportFlags.xineramaSupport) || !supportFlags.x11Support - ) [ "--without-x" ]; + ++ lib.optionals waylandSupport [ "--with-wayland" ] + ++ lib.optionals vulkanSupport [ "--with-vulkan" ] + ++ lib.optionals ((stdenv.hostPlatform.isDarwin && !xineramaSupport) || !x11Support) [ + "--without-x" + ]; # Wine locates a lot of libraries dynamically through dlopen(). Add # them to the RPATH so that the user doesn't have to set them in @@ -255,10 +283,10 @@ stdenv.mkDerivation ( map (path: "-rpath " + path) ( map (x: "${lib.getLib x}/lib") ([ stdenv.cc.cc ] ++ finalAttrs.buildInputs) # libpulsecommon.so is linked but not found otherwise - ++ lib.optionals supportFlags.pulseaudioSupport ( + ++ lib.optionals pulseaudioSupport ( map (x: "${lib.getLib x}/lib/pulseaudio") (toBuildInputs pkgArches (pkgs: [ pkgs.libpulseaudio ])) ) - ++ lib.optionals supportFlags.waylandSupport ( + ++ lib.optionals waylandSupport ( map (x: "${lib.getLib x}/share/wayland-protocols") ( toBuildInputs pkgArches (pkgs: [ pkgs.wayland-protocols ]) ) @@ -281,13 +309,13 @@ stdenv.mkDerivation ( let links = prefix: pkg: "ln -s ${pkg} $out/${prefix}/${pkg.name}"; in - lib.optionalString supportFlags.embedInstallers '' + lib.optionalString embedInstallers '' mkdir -p $out/share/wine/gecko $out/share/wine/mono/ ${lib.strings.concatStringsSep "\n" ( (map (links "share/wine/gecko") geckos) ++ (map (links "share/wine/mono") monos) )} '' - + lib.optionalString supportFlags.gstreamerSupport '' + + lib.optionalString gstreamerSupport '' # Wrapping Wine is tricky. # https://github.com/NixOS/nixpkgs/issues/63170 # https://github.com/NixOS/nixpkgs/issues/28486 @@ -320,8 +348,8 @@ stdenv.mkDerivation ( "bindnow" "stackclashprotection" ] - ++ lib.optional (stdenv.hostPlatform.isDarwin) "fortify" - ++ lib.optional (supportFlags.mingwSupport) "format"; + ++ lib.optional stdenv.hostPlatform.isDarwin "fortify" + ++ lib.optional mingwSupport "format"; passthru = { inherit pkgArches; diff --git a/pkgs/applications/emulators/wine/default.nix b/pkgs/applications/emulators/wine/default.nix index 5244bc9ea7e5..ca3f2e9bbc44 100644 --- a/pkgs/applications/emulators/wine/default.nix +++ b/pkgs/applications/emulators/wine/default.nix @@ -6,7 +6,7 @@ # }; # Make additional configurations on demand: # wine.override { wineBuild = "wine32"; wineRelease = "staging"; }; -{ +args@{ lib, stdenv, callPackage, @@ -50,6 +50,18 @@ let sources = callPackage ./sources.nix { }; + supportFlags = lib.filterAttrs ( + name: _: + !builtins.elem name [ + "lib" + "stdenv" + "callPackage" + "darwin" + "wineRelease" + "wineBuild" + ] + ) args; + # Map user-facing release names to sources, pname suffix, and staging flag releaseInfo = { stable = { @@ -77,47 +89,7 @@ let }; baseWine = lib.getAttr wineBuild ( - callPackage ./packages.nix ( - releaseInfo.${wineRelease} - // { - supportFlags = { - inherit - alsaSupport - cairoSupport - cupsSupport - cursesSupport - dbusSupport - embedInstallers - fontconfigSupport - gettextSupport - gphoto2Support - gstreamerSupport - gtkSupport - krb5Support - mingwSupport - netapiSupport - odbcSupport - openclSupport - openglSupport - pcapSupport - pulseaudioSupport - saneSupport - sdlSupport - tlsSupport - udevSupport - usbSupport - v4lSupport - vaSupport - vulkanSupport - waylandSupport - x11Support - ffmpegSupport - xineramaSupport - ; - }; - inherit moltenvk; - } - ) + callPackage ./packages.nix (releaseInfo.${wineRelease} // supportFlags) ); in if wineRelease == "yabridge" then diff --git a/pkgs/applications/emulators/wine/packages.nix b/pkgs/applications/emulators/wine/packages.nix index af9082a7d8f9..4ca991320cd5 100644 --- a/pkgs/applications/emulators/wine/packages.nix +++ b/pkgs/applications/emulators/wine/packages.nix @@ -10,14 +10,14 @@ src, pnameSuffix ? "", useStaging ? false, - supportFlags, # Staging native build deps autoconf, hexdump, perl, python3, gitMinimal, -}: + ... +}@args: let inherit (src) @@ -27,118 +27,110 @@ let gecko64 mono ; + + # Args to pass through to base.nix (support flags, etc.) + baseArgs = removeAttrs args [ + "stdenv_32bit" + "lib" + "pkgs" + "pkgsi686Linux" + "pkgsCross" + "callPackage" + "replaceVars" + ]; in { - wine32 = pkgsi686Linux.callPackage ./base.nix { - pname = "wine"; - inherit - src - version - supportFlags - patches - moltenvk - pnameSuffix - useStaging + wine32 = pkgsi686Linux.callPackage ./base.nix ( + baseArgs + // { + pname = "wine"; + inherit version patches; # Forcing these `nativeBuildInputs` used in the `staging` to come # from ambient `pkgs`, rather than being provided by # `pkgsi686Linux.callPackage` for that platform. - autoconf - hexdump - perl - python3 - gitMinimal - ; - pkgArches = [ pkgsi686Linux ]; - geckos = [ gecko32 ]; - mingwGccs = with pkgsCross; [ mingw32.buildPackages.gcc ]; - monos = [ mono ]; - platforms = [ - "i686-linux" - "x86_64-linux" - ]; - }; - wine64 = callPackage ./base.nix { - pname = "wine64"; - inherit - src - version - supportFlags - patches - moltenvk - pnameSuffix - useStaging - ; - pkgArches = [ pkgs ]; - mingwGccs = with pkgsCross; [ mingwW64.buildPackages.gcc ]; - geckos = [ gecko64 ]; - monos = [ mono ]; - configureFlags = [ "--enable-win64" ]; - platforms = [ - "x86_64-linux" - "x86_64-darwin" - ]; - mainProgram = "wine"; - }; - wineWow = callPackage ./base.nix { - pname = "wine-wow"; - inherit - src - version - supportFlags - patches - moltenvk - pnameSuffix - useStaging - ; - stdenv = stdenv_32bit; - pkgArches = [ - pkgs - pkgsi686Linux - ]; - geckos = [ - gecko32 - gecko64 - ]; - mingwGccs = with pkgsCross; [ - mingw32.buildPackages.gcc - mingwW64.buildPackages.gcc - ]; - monos = [ mono ]; - buildScript = replaceVars ./builder-wow.sh { - # pkgconfig has trouble picking the right architecture - pkgconfig64remove = lib.makeSearchPathOutput "dev" "lib/pkgconfig" [ - pkgs.glib - pkgs.gst_all_1.gstreamer + inherit + autoconf + hexdump + perl + python3 + gitMinimal + ; + pkgArches = [ pkgsi686Linux ]; + geckos = [ gecko32 ]; + mingwGccs = with pkgsCross; [ mingw32.buildPackages.gcc ]; + monos = [ mono ]; + platforms = [ + "i686-linux" + "x86_64-linux" ]; - }; - platforms = [ "x86_64-linux" ]; - mainProgram = "wine"; - }; - wineWow64 = callPackage ./base.nix { - pname = "wine-wow64"; - inherit - src - version - patches - moltenvk - pnameSuffix - useStaging - ; - supportFlags = supportFlags // { - mingwSupport = true; - }; # Required because we request "--enable-archs=x86_64" - pkgArches = [ pkgs ]; - mingwGccs = with pkgsCross; [ - mingw32.buildPackages.gcc - mingwW64.buildPackages.gcc - ]; - geckos = [ gecko64 ]; - monos = [ mono ]; - configureFlags = [ "--enable-archs=x86_64,i386" ]; - platforms = [ - "x86_64-linux" - "x86_64-darwin" - ]; - mainProgram = "wine"; - }; + } + ); + wine64 = callPackage ./base.nix ( + baseArgs + // { + pname = "wine64"; + inherit version patches; + pkgArches = [ pkgs ]; + mingwGccs = with pkgsCross; [ mingwW64.buildPackages.gcc ]; + geckos = [ gecko64 ]; + monos = [ mono ]; + configureFlags = [ "--enable-win64" ]; + platforms = [ + "x86_64-linux" + "x86_64-darwin" + ]; + mainProgram = "wine"; + } + ); + wineWow = callPackage ./base.nix ( + baseArgs + // { + pname = "wine-wow"; + inherit version patches; + stdenv = stdenv_32bit; + pkgArches = [ + pkgs + pkgsi686Linux + ]; + geckos = [ + gecko32 + gecko64 + ]; + mingwGccs = with pkgsCross; [ + mingw32.buildPackages.gcc + mingwW64.buildPackages.gcc + ]; + monos = [ mono ]; + buildScript = replaceVars ./builder-wow.sh { + # pkgconfig has trouble picking the right architecture + pkgconfig64remove = lib.makeSearchPathOutput "dev" "lib/pkgconfig" [ + pkgs.glib + pkgs.gst_all_1.gstreamer + ]; + }; + platforms = [ "x86_64-linux" ]; + mainProgram = "wine"; + } + ); + wineWow64 = callPackage ./base.nix ( + baseArgs + // { + pname = "wine-wow64"; + inherit version patches; + mingwSupport = true; # Required because we request "--enable-archs=x86_64" + pkgArches = [ pkgs ]; + mingwGccs = with pkgsCross; [ + mingw32.buildPackages.gcc + mingwW64.buildPackages.gcc + ]; + geckos = [ gecko64 ]; + monos = [ mono ]; + configureFlags = [ "--enable-archs=x86_64,i386" ]; + platforms = [ + "x86_64-linux" + "x86_64-darwin" + ]; + mainProgram = "wine"; + } + ); } diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 10c5e59f7ccd..0a1eca0e16c4 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -63,14 +63,14 @@ "vendorHash": "sha256-AO6reoqxDcPAMXKlqjJLGmhsgFrekaQXjMPm9fxhpFA=" }, "argoproj-labs_argocd": { - "hash": "sha256-xIEl9SsiwJp3X7hyVPE/Z9qHGTL9ZotvzIz7Zx5bdEc=", + "hash": "sha256-2QatWxaR5lO4+0RxUMOQjyLp8XG6O0vwCYc8jHKL+48=", "homepage": "https://registry.terraform.io/providers/argoproj-labs/argocd", "owner": "argoproj-labs", "proxyVendor": true, "repo": "terraform-provider-argocd", - "rev": "v7.12.5", + "rev": "v7.13.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-gVzj5x95MNgCbxwqiqakrUnhF/x+vXnAurv4pUt8kV4=" + "vendorHash": "sha256-OBXAl3MRAtnYYATHD0UWEuB1dJozG7al9csGYLClaYw=" }, "auth0_auth0": { "hash": "sha256-d93MvkFn2+slFh2yvllcwthVTY15ezLn+q8Jm3MPQ+0=", @@ -652,13 +652,13 @@ "vendorHash": "sha256-GlkqFg9Bgs+Hi59PYAxqq3YW9ji1qeuX4vz59wQ4pRw=" }, "hashicorp_tfe": { - "hash": "sha256-U58uWRmLMI9XfYT89wfNuwhok+PaWCanz23RjQYyL98=", + "hash": "sha256-+FIiatVTff/MNk1Ik0vZDii7yjeWQLO5BLqSrs2bGME=", "homepage": "https://registry.terraform.io/providers/hashicorp/tfe", "owner": "hashicorp", "repo": "terraform-provider-tfe", - "rev": "v0.73.0", + "rev": "v0.74.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-n+by9Z0JhLOk/td8Or5IUQIapy9TTHnf9QJSVddTL2Y=" + "vendorHash": "sha256-GAwAGw8N4B/jCtcR2ok3g/0j//CHK9yPaBj+otJLjKc=" }, "hashicorp_time": { "hash": "sha256-ZArYfbzbrkxGlL1BRFM7PN3hLzdssIL4COsUBdLVMYY=", @@ -1418,13 +1418,13 @@ "vendorHash": null }, "vancluever_acme": { - "hash": "sha256-Fjn1eNqB0Ye5MRg8+YsPwMBdkvsVELTzf2wvHluFzN8=", + "hash": "sha256-hviw2syXALi3B47jwfvEn61sOOZ1qvUMWJE7Ob6M36U=", "homepage": "https://registry.terraform.io/providers/vancluever/acme", "owner": "vancluever", "repo": "terraform-provider-acme", - "rev": "v2.43.0", + "rev": "v2.44.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-LAM2pzTIRdspYnXboDA+iGwt7uaI+/ItXPAgOJUELps=" + "vendorHash": "sha256-FSyJ5ZCaGbMZbDop/Pj8TKaUAeOBNz/RSfV/rkVYbD0=" }, "venafi_venafi": { "hash": "sha256-wpAckNRqZjSDt7KpCRpLSYkn6Gm+QPzn5sIJ90wRXjI=", diff --git a/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-vtwheel/default.nix b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-vtwheel/default.nix index 408d275c8a2d..5942037f861a 100644 --- a/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-vtwheel/default.nix +++ b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-vtwheel/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { description = "Pass mouse wheel commands to secondary screens (screen, less, nano, etc)"; homepage = "https://aur.archlinux.org/packages/urxvt-vtwheel"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ danbst ]; + maintainers = [ ]; platforms = with lib.platforms; unix; }; diff --git a/pkgs/by-name/an/ananicy-rules-cachyos/package.nix b/pkgs/by-name/an/ananicy-rules-cachyos/package.nix index 14b448863dfa..42380081cb39 100644 --- a/pkgs/by-name/an/ananicy-rules-cachyos/package.nix +++ b/pkgs/by-name/an/ananicy-rules-cachyos/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation { pname = "ananicy-rules-cachyos"; - version = "0-unstable-2026-02-10"; + version = "0-unstable-2026-02-18"; src = fetchFromGitHub { owner = "CachyOS"; repo = "ananicy-rules"; - rev = "061314309227b08b5acf8ff2963fc3ce976539e9"; - hash = "sha256-Kn+m6evpaB4r/a11+6ItfhnCveB8iC6ZJGgkvvPWulc="; + rev = "e9108a0d71d7197d42f0315d8bc72147737ebc4a"; + hash = "sha256-SgcmCsHnZtsMzYeVfb4tUkm9+KARVTZP+weOLHoYdtc="; }; dontConfigure = true; diff --git a/pkgs/by-name/au/auth0-cli/package.nix b/pkgs/by-name/au/auth0-cli/package.nix index 9459f19b2745..e5731c8d83ef 100644 --- a/pkgs/by-name/au/auth0-cli/package.nix +++ b/pkgs/by-name/au/auth0-cli/package.nix @@ -8,13 +8,13 @@ buildGoModule (finalAttrs: { pname = "auth0-cli"; - version = "1.27.0"; + version = "1.27.2"; src = fetchFromGitHub { owner = "auth0"; repo = "auth0-cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-DrQCbuVFfbhobF3lppQg/a0J/ZSMuP+wbLrMsLcKSRE="; + hash = "sha256-Se3jLcMU+KDkaF5UY18KWs/Q+YK3782e7cKc9BxaYqY="; }; vendorHash = "sha256-Us6NJiSfOK1BBRyrYil26HGaZAgum6k3B5LdV60rCeA="; diff --git a/pkgs/by-name/au/autosuspend/package.nix b/pkgs/by-name/au/autosuspend/package.nix index bc8dfbc8a694..fe75c939e0d2 100644 --- a/pkgs/by-name/au/autosuspend/package.nix +++ b/pkgs/by-name/au/autosuspend/package.nix @@ -11,7 +11,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: { pname = "autosuspend"; - version = "10.0.0"; + version = "10.1.0"; pyproject = true; outputs = [ @@ -24,7 +24,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: { owner = "languitar"; repo = "autosuspend"; tag = "v${finalAttrs.version}"; - hash = "sha256-o9Jpb4i2/SJ3s3h5sclNjpaN/UFk1YbpPf7b3rGXLRg="; + hash = "sha256-4mByuJ75hd5TEoKxVglAHlYXZSlbAldMwnIianSw8O4="; }; postPatch = '' diff --git a/pkgs/by-name/aw/aws-vault/package.nix b/pkgs/by-name/aw/aws-vault/package.nix index bec04b6ac281..c227e6892718 100644 --- a/pkgs/by-name/aw/aws-vault/package.nix +++ b/pkgs/by-name/aw/aws-vault/package.nix @@ -10,17 +10,17 @@ }: buildGoModule (finalAttrs: { pname = "aws-vault"; - version = "7.9.4"; + version = "7.9.5"; src = fetchFromGitHub { owner = "ByteNess"; repo = "aws-vault"; rev = "v${finalAttrs.version}"; - hash = "sha256-Tdi2kGoJ0ZwEnBvjkjZuoTTIdmsJjdMi75gwBmy+5N4="; + hash = "sha256-MVeYKeFpGKk0asO7u5RE3arpX3x4EpF4xRCav5oj9J4="; }; proxyVendor = true; - vendorHash = "sha256-rY7UbAgv+dLnZBLFptPp7D+gYBsCj7QYM4VvH/HBdq4="; + vendorHash = "sha256-6JgcU+NRQSQjoGxF0ByaY2h9/HZUdg8BdbHazz5m8VM="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/ba/bazecor/package.nix b/pkgs/by-name/ba/bazecor/package.nix index 62a80d461b6a..2b9aa00f1d90 100644 --- a/pkgs/by-name/ba/bazecor/package.nix +++ b/pkgs/by-name/ba/bazecor/package.nix @@ -44,7 +44,7 @@ appimageTools.wrapAppImage { --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" install -m 444 -D ${src}/Bazecor.desktop -t $out/share/applications - install -m 444 -D ${src}/bazecor.png -t $out/share/pixmaps + install -m 444 -D ${src}/bazecor.png -t $out/share/icons/hicolor/512x512/apps mkdir -p $out/lib/udev/rules.d install -m 444 -D ${./60-dygma.rules} $out/lib/udev/rules.d/60-dygma.rules diff --git a/pkgs/by-name/bi/bisq2/package.nix b/pkgs/by-name/bi/bisq2/package.nix index 6e8e2073dc0c..6118b432d20d 100644 --- a/pkgs/by-name/bi/bisq2/package.nix +++ b/pkgs/by-name/bi/bisq2/package.nix @@ -24,7 +24,7 @@ }: let - version = "2.1.7"; + version = "2.1.9"; jdk = zulu25.override { enableJavaFX = true; }; @@ -69,7 +69,7 @@ stdenv.mkDerivation (finalAttrs: rec { # nixpkgs-update: no auto update src = fetchurl { url = "https://github.com/bisq-network/bisq2/releases/download/v${version}/Bisq-${version}.deb"; - hash = "sha256-kNQbTZoHFR2qFw/Jjc9iaEews/oUOYoJanmbVH/vs44="; + hash = "sha256-E7GV4YGbF0Nj6aWVqJNUUpwLH1G5v5bEQamHP7OUzQY="; # Verify the upstream Debian package prior to extraction. # See https://bisq.wiki/Bisq_2#Installation @@ -94,7 +94,7 @@ stdenv.mkDerivation (finalAttrs: rec { signature = fetchurl { url = "https://github.com/bisq-network/bisq2/releases/download/v${version}/Bisq-${version}.deb.asc"; - hash = "sha256-Cl9EIp+ycD8Tp/bx5dXQK206jZzrYJkI/U9ItfXDRWw="; + hash = "sha256-bNZNRbm9uNGfLzGvshXNaRLUNX38Uz58GGy6WqJwV1E="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/bl/bluebubbles/package.nix b/pkgs/by-name/bl/bluebubbles/package.nix index 4f7d48334438..777f06610383 100644 --- a/pkgs/by-name/bl/bluebubbles/package.nix +++ b/pkgs/by-name/bl/bluebubbles/package.nix @@ -54,7 +54,7 @@ flutter329.buildFlutterApplication rec { postInstall = '' sed -i 's#Icon=.*/bluebubbles.png#Icon=bluebubbles#g' snap/gui/bluebubbles.desktop install -Dm0644 snap/gui/bluebubbles.desktop $out/share/applications/bluebubbles.desktop - install -Dm0644 snap/gui/bluebubbles.png $out/share/pixmaps/bluebubbles.png + install -Dm0644 snap/gui/bluebubbles.png -t $out/share/icons/hicolor/1024x1024/apps ''; extraWrapProgramArgs = '' diff --git a/pkgs/by-name/bo/boilr/package.nix b/pkgs/by-name/bo/boilr/package.nix index 9708c601a424..72b2765b4048 100644 --- a/pkgs/by-name/bo/boilr/package.nix +++ b/pkgs/by-name/bo/boilr/package.nix @@ -60,7 +60,7 @@ rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } rec { postInstall = '' patchelf --add-rpath "${lib.makeLibraryPath rpathLibs}" $out/bin/boilr install -Dpm 0644 flatpak/io.github.philipk.boilr.desktop $out/share/applications/boilr.desktop - install -Dpm 0644 resources/io.github.philipk.boilr.png $out/share/pixmaps/io.github.philipk.boilr.png + install -Dpm 0644 resources/io.github.philipk.boilr.png -t $out/share/icons/hicolor/32x32/apps ''; dontPatchELF = true; diff --git a/pkgs/by-name/bu/bugdom/package.nix b/pkgs/by-name/bu/bugdom/package.nix index a3d3054f3a96..c2f40e2c262e 100644 --- a/pkgs/by-name/bu/bugdom/package.nix +++ b/pkgs/by-name/bu/bugdom/package.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: { install -Dm755 {.,$out/bin}/Bugdom wrapProgram $out/bin/Bugdom --run "cd $out/share/bugdom" install -Dm644 $src/packaging/io.jor.bugdom.desktop $out/share/applications/io.jor.bugdom.desktop - install -Dm644 $src/packaging/io.jor.bugdom.png $out/share/pixmaps/io.jor.bugdom.png + install -Dm644 $src/packaging/io.jor.bugdom.png -t $out/share/icons/hicolor/512x512/apps '' ) + '' diff --git a/pkgs/by-name/ca/cargo-lambda/package.nix b/pkgs/by-name/ca/cargo-lambda/package.nix index ec87d7a95376..6d6bc5a3b780 100644 --- a/pkgs/by-name/ca/cargo-lambda/package.nix +++ b/pkgs/by-name/ca/cargo-lambda/package.nix @@ -51,7 +51,7 @@ rustPlatform.buildRustPackage (finalAttrs: { wrapProgram $out/bin/cargo-lambda --prefix PATH : ${lib.makeBinPath [ zig_0_13 ]} ''; - CARGO_LAMBDA_BUILD_INFO = "(nixpkgs)"; + env.CARGO_LAMBDA_BUILD_INFO = "(nixpkgs)"; cargoBuildFlags = [ "--features=skip-build-banner" ]; cargoCheckFlags = [ "--features=skip-build-banner" ]; diff --git a/pkgs/by-name/cc/ccemux/package.nix b/pkgs/by-name/cc/ccemux/package.nix index 9337a0ecec56..de4ab522b583 100644 --- a/pkgs/by-name/cc/ccemux/package.nix +++ b/pkgs/by-name/cc/ccemux/package.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: { cp -r ${desktopItem}/share/applications $out/share/applications install -D ${finalAttrs.src} $out/share/ccemux/ccemux.jar - install -D ${desktopIcon} $out/share/pixmaps/ccemux.png + install -D ${desktopIcon} $out/share/icons/hicolor/256x256/apps/ccemux.png makeWrapper ${jre}/bin/java $out/bin/ccemux \ --add-flags "-jar $out/share/ccemux/ccemux.jar" diff --git a/pkgs/by-name/ch/chatmcp/package.nix b/pkgs/by-name/ch/chatmcp/package.nix index 31c4db7ccf7e..4fa6fcaa8305 100644 --- a/pkgs/by-name/ch/chatmcp/package.nix +++ b/pkgs/by-name/ch/chatmcp/package.nix @@ -40,7 +40,7 @@ flutter332.buildFlutterApplication rec { ]; postInstall = '' - install -Dm0644 assets/logo.png $out/share/pixmaps/chatmcp.png + install -Dm0644 assets/logo.png $out/share/icons/hicolor/1024x1024/apps/chatmcp.png ''; passthru = { diff --git a/pkgs/by-name/ch/cherry-studio/package.nix b/pkgs/by-name/ch/cherry-studio/package.nix index db726a700ba4..17e876d9c427 100644 --- a/pkgs/by-name/ch/cherry-studio/package.nix +++ b/pkgs/by-name/ch/cherry-studio/package.nix @@ -112,7 +112,7 @@ stdenv.mkDerivation (finalAttrs: { else "cp -r dist/linux-unpacked/{resources,LICENSE*} $out/opt/cherry-studio" } - install -Dm644 build/icon.png $out/share/pixmaps/cherry-studio.png + install -Dm644 build/icon.png $out/share/icons/hicolor/1024x1024/apps/cherry-studio.png makeWrapper ${lib.getExe electron} $out/bin/cherry-studio \ --inherit-argv0 \ --add-flags $out/opt/cherry-studio/resources/app.asar \ diff --git a/pkgs/by-name/ch/chromium-bsu/package.nix b/pkgs/by-name/ch/chromium-bsu/package.nix index c7ccee6ad7f0..3bfed040f706 100644 --- a/pkgs/by-name/ch/chromium-bsu/package.nix +++ b/pkgs/by-name/ch/chromium-bsu/package.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: { ]; postInstall = '' - install -D misc/chromium-bsu.png $out/share/pixmaps/chromium-bsu.png + install -D misc/chromium-bsu.png -t $out/share/icons/hicolor/64x64/apps install -D misc/chromium-bsu.desktop $out/share/applications/chromium-bsu.desktop ''; diff --git a/pkgs/by-name/cl/clapgrep/package.nix b/pkgs/by-name/cl/clapgrep/package.nix index 874d0995ca62..f64e4e7df6e0 100644 --- a/pkgs/by-name/cl/clapgrep/package.nix +++ b/pkgs/by-name/cl/clapgrep/package.nix @@ -24,13 +24,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "clapgrep"; - version = "25.10"; + version = "26.02"; src = fetchFromGitHub { owner = "luleyleo"; repo = "clapgrep"; tag = "v${finalAttrs.version}"; - hash = "sha256-Y7XwS4jOj8WHi3ntLwPne86/ZVkdBaWrDtPmUcUG4XE="; + hash = "sha256-8OG3yVfmvAJN/e07r/2rij0tairE/hOdERDwqDt8fbk="; }; cargoDeps = rustPlatform.fetchCargoVendor { diff --git a/pkgs/by-name/co/code-cursor/sources.json b/pkgs/by-name/co/code-cursor/sources.json index 52f0853f5154..1dd1459bd012 100644 --- a/pkgs/by-name/co/code-cursor/sources.json +++ b/pkgs/by-name/co/code-cursor/sources.json @@ -1,22 +1,22 @@ { - "version": "2.4.31", + "version": "2.5.17", "vscodeVersion": "1.105.1", "sources": { "x86_64-linux": { - "url": "https://downloads.cursor.com/production/3578107fdf149b00059ddad37048220e4168100f/linux/x64/Cursor-2.4.31-x86_64.AppImage", - "hash": "sha256-4cEa5SsbE2QFfmcndnVI5QQIS9DPjFQ6u/iQO9P8SEk=" + "url": "https://downloads.cursor.com/production/7b98dcb824ea96c9c62362a5e80dbf0d1aae4775/linux/x64/Cursor-2.5.17-x86_64.AppImage", + "hash": "sha256-tUVqfxkUUMXGFzI2lGgoIDuQxI9LSrspDuz4xPGpQig=" }, "aarch64-linux": { - "url": "https://downloads.cursor.com/production/3578107fdf149b00059ddad37048220e4168100f/linux/arm64/Cursor-2.4.31-aarch64.AppImage", - "hash": "sha256-b66KmFN92HZRyZnlFVMxCCgX0bWBktfKojtnXF7c+Qg=" + "url": "https://downloads.cursor.com/production/7b98dcb824ea96c9c62362a5e80dbf0d1aae4775/linux/arm64/Cursor-2.5.17-aarch64.AppImage", + "hash": "sha256-yXr/sNyhsGbO1Coj7jI/LyRtyNfRuzOlaLuMAXNAI7g=" }, "x86_64-darwin": { - "url": "https://downloads.cursor.com/production/3578107fdf149b00059ddad37048220e4168100f/darwin/x64/Cursor-darwin-x64.dmg", - "hash": "sha256-JQq73IqSAlkedhCuxr+uIpWPEAslnMPxciDDQYHWU6o=" + "url": "https://downloads.cursor.com/production/7b98dcb824ea96c9c62362a5e80dbf0d1aae4775/darwin/x64/Cursor-darwin-x64.dmg", + "hash": "sha256-w738cXHYcckDtnOYYcuL3xxUH/rAcHS/nQG78npJ6IQ=" }, "aarch64-darwin": { - "url": "https://downloads.cursor.com/production/3578107fdf149b00059ddad37048220e4168100f/darwin/arm64/Cursor-darwin-arm64.dmg", - "hash": "sha256-xXzWWDfU00IDx3vqnB0A4mItSyvfRqasUhqOAj8U5aE=" + "url": "https://downloads.cursor.com/production/7b98dcb824ea96c9c62362a5e80dbf0d1aae4775/darwin/arm64/Cursor-darwin-arm64.dmg", + "hash": "sha256-zHQJb/FNV2jLMrtDzMSMVs09+FvZj1ndSWB7HnB9lsU=" } } } diff --git a/pkgs/by-name/co/codebook/package.nix b/pkgs/by-name/co/codebook/package.nix index f918d785faf0..3da924bec58e 100644 --- a/pkgs/by-name/co/codebook/package.nix +++ b/pkgs/by-name/co/codebook/package.nix @@ -20,8 +20,10 @@ rustPlatform.buildRustPackage (finalAttrs: { buildAndTestSubdir = "crates/codebook-lsp"; cargoHash = "sha256-hxPgYGBq+KZfEyFiHQG31cNEN6A6hUgKRgZXIHOGalw="; - CARGO_PROFILE_RELEASE_LTO = "fat"; - CARGO_PROFILE_RELEASE_CODEGEN_UNITS = "1"; + env = { + CARGO_PROFILE_RELEASE_LTO = "fat"; + CARGO_PROFILE_RELEASE_CODEGEN_UNITS = "1"; + }; # Integration tests require internet access for dictionaries doCheck = false; diff --git a/pkgs/by-name/di/discordo/package.nix b/pkgs/by-name/di/discordo/package.nix index d152977a0444..82f752c089fa 100644 --- a/pkgs/by-name/di/discordo/package.nix +++ b/pkgs/by-name/di/discordo/package.nix @@ -11,16 +11,16 @@ buildGoModule (finalAttrs: { pname = "discordo"; - version = "0-unstable-2026-02-09"; + version = "0-unstable-2026-02-17"; src = fetchFromGitHub { owner = "ayn2op"; repo = "discordo"; - rev = "4c61e7c67a78d0906ffa77794deeb45e53d659d2"; - hash = "sha256-3UHQJDi+9TW7yD2yWfD+1hr8iSvyd1HLGqbtk0iYlVg="; + rev = "f1650a0df751e40a589ceda4ec19626e109bac2b"; + hash = "sha256-+1XK5Zri7DiKzaqsFHYjzde1XEFlp4cj878+FzLaibg="; }; - vendorHash = "sha256-8Le/d6sXXH0dCORWLOFUjHlbGcKr0yqQ2l8GQzLaYt0="; + vendorHash = "sha256-eltE7RkxqjYMWMv8/YmCC+WlntBTF8zO7UE0MQsG8Is="; env.CGO_ENABLED = 1; diff --git a/pkgs/by-name/dm/dms-shell/package.nix b/pkgs/by-name/dm/dms-shell/package.nix index 63122d0d9aaa..6fbef771c73d 100644 --- a/pkgs/by-name/dm/dms-shell/package.nix +++ b/pkgs/by-name/dm/dms-shell/package.nix @@ -28,13 +28,13 @@ buildGoModule ( in { pname = "dms-shell"; - version = "1.4.0"; + version = "1.4.1"; src = fetchFromGitHub { owner = "AvengeMedia"; repo = "DankMaterialShell"; tag = "v${finalAttrs.version}"; - hash = "sha256-O9NIJqfuSjwY//7OyFH3FqxRHe5M0vmmsXcryOi/bAE="; + hash = "sha256-abNemkJQxp8E9bCNyTlAcFxKx+t1Wsc49J5NRZuyCgs="; }; sourceRoot = "${finalAttrs.src.name}/core"; diff --git a/pkgs/by-name/do/dolt/package.nix b/pkgs/by-name/do/dolt/package.nix index cd571f791097..cbfff0b01c04 100644 --- a/pkgs/by-name/do/dolt/package.nix +++ b/pkgs/by-name/do/dolt/package.nix @@ -26,6 +26,6 @@ buildGoModule (finalAttrs: { mainProgram = "dolt"; homepage = "https://github.com/dolthub/dolt"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ danbst ]; + maintainers = [ ]; }; }) diff --git a/pkgs/by-name/ec/ecc/package.nix b/pkgs/by-name/ec/ecc/package.nix index 5ad96e6cd549..aee4052f8132 100644 --- a/pkgs/by-name/ec/ecc/package.nix +++ b/pkgs/by-name/ec/ecc/package.nix @@ -78,7 +78,7 @@ rustPlatform.buildRustPackage (finalAttrs: { zlib ]; - CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER = "gcc"; + env.CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER = "gcc"; preBuild = '' # `SANDBOX` defined by upstream to disable build-time network access diff --git a/pkgs/by-name/en/entire/package.nix b/pkgs/by-name/en/entire/package.nix index fc16fa0e2833..d4788d2bf6f0 100644 --- a/pkgs/by-name/en/entire/package.nix +++ b/pkgs/by-name/en/entire/package.nix @@ -5,6 +5,7 @@ installShellFiles, git, stdenv, + writableTmpDirAsHomeHook, }: buildGoModule (finalAttrs: { @@ -29,11 +30,16 @@ buildGoModule (finalAttrs: { ldflags = [ "-s" "-w" + "-X=github.com/entireio/cli/cmd/entire/cli/buildinfo.Version=${finalAttrs.version}" + "-X=github.com/entireio/cli/cmd/entire/cli/buildinfo.Commit=${finalAttrs.src.rev}" ]; nativeBuildInputs = [ installShellFiles ]; - nativeCheckInputs = [ git ]; + nativeCheckInputs = [ + git + writableTmpDirAsHomeHook + ]; postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd entire \ @@ -50,9 +56,12 @@ buildGoModule (finalAttrs: { of how code was written in your repo. ''; homepage = "https://github.com/entireio/cli"; - changelog = "https://github.com/entireio/cli/releases/tag/v${finalAttrs.version}"; + changelog = "https://github.com/entireio/cli/blob/${finalAttrs.src.rev}/CHANGELOG.md"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ sheeeng ]; + maintainers = with lib.maintainers; [ + sheeeng + squishykid + ]; mainProgram = "entire"; }; }) diff --git a/pkgs/by-name/go/google-chrome/package.nix b/pkgs/by-name/go/google-chrome/package.nix index 038223219dc8..bbc405d2b785 100644 --- a/pkgs/by-name/go/google-chrome/package.nix +++ b/pkgs/by-name/go/google-chrome/package.nix @@ -184,11 +184,11 @@ let linux = stdenvNoCC.mkDerivation (finalAttrs: { inherit pname meta passthru; - version = "145.0.7632.75"; + version = "145.0.7632.109"; src = fetchurl { url = "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${finalAttrs.version}-1_amd64.deb"; - hash = "sha256-4hFjRhkURRq1NXdAUPesS32t/NyG9eb784/sW75DlCU="; + hash = "sha256-VNvx/3l3gzj8HjeeK3v/Hj05E9t2PvsiP8pnIOq1AEA="; }; # With strictDeps on, some shebangs were not being patched correctly @@ -302,11 +302,11 @@ let darwin = stdenvNoCC.mkDerivation (finalAttrs: { inherit pname meta passthru; - version = "145.0.7632.76"; + version = "145.0.7632.110"; src = fetchurl { - url = "http://dl.google.com/release2/chrome/n6e44i3vvn55x7sajqc7tgrlx4_145.0.7632.76/GoogleChrome-145.0.7632.76.dmg"; - hash = "sha256-auSCvJ0r3OyXjDICmgFAeD/MFveOmEZD3fnuryI5ozU="; + url = "http://dl.google.com/release2/chrome/odn6jvyow6owsodlm42m33k7ta_145.0.7632.110/GoogleChrome-145.0.7632.110.dmg"; + hash = "sha256-siBn+vaSvvgrMEF1Da74nu1WGvyM1QUggarrEuqcGy4="; }; dontPatch = true; diff --git a/pkgs/by-name/go/goredo/package.nix b/pkgs/by-name/go/goredo/package.nix index 81f5eb303931..cd4bdde31003 100644 --- a/pkgs/by-name/go/goredo/package.nix +++ b/pkgs/by-name/go/goredo/package.nix @@ -24,12 +24,14 @@ buildGoModule (finalAttrs: { nativeBuildInputs = [ zstd ]; - nativeCheckInputs = lib.optionals finalAttrs.doCheck [ + nativeCheckInputs = lib.optionals finalAttrs.finalPackage.doCheck [ python3 perl ]; - inherit (sharness) SHARNESS_TEST_SRCDIR; + env = { + inherit (sharness) SHARNESS_TEST_SRCDIR; + }; vendorHash = null; diff --git a/pkgs/by-name/gr/grafana-loki/package.nix b/pkgs/by-name/gr/grafana-loki/package.nix index bd2e4f118fc6..4f720d19ee72 100644 --- a/pkgs/by-name/gr/grafana-loki/package.nix +++ b/pkgs/by-name/gr/grafana-loki/package.nix @@ -12,14 +12,14 @@ }: buildGoModule (finalAttrs: { - version = "3.6.5"; + version = "3.6.6"; pname = "grafana-loki"; src = fetchFromGitHub { owner = "grafana"; repo = "loki"; rev = "v${finalAttrs.version}"; - hash = "sha256-f9YijC8MH+vPxh6N/LKQIhsSWM6uEqIyHY+5J3mu+aQ="; + hash = "sha256-Mdopa7Nhdcwn4VBz/R5zI3Zccuht2hIdnAeCsAS6B+0="; }; vendorHash = null; diff --git a/pkgs/by-name/in/incus-ui-canonical/package.nix b/pkgs/by-name/in/incus-ui-canonical/package.nix index 56cffab8eb33..7928a8510c45 100644 --- a/pkgs/by-name/in/incus-ui-canonical/package.nix +++ b/pkgs/by-name/in/incus-ui-canonical/package.nix @@ -20,14 +20,14 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "incus-ui-canonical"; - version = "0.19.4"; + version = "0.19.5"; src = fetchFromGitHub { owner = "zabbly"; repo = "incus-ui-canonical"; # only use tags prefixed by incus- they are the tested fork versions tag = "incus-${finalAttrs.version}"; - hash = "sha256-B/05tQbiqpi5gzoHjFVTS7CHwuO2xSHHSu76/fNjRug="; + hash = "sha256-dwQshNQrP/3AWsFtDeMpUIm3l3Oqjj1jkKw98KT4u9M="; }; offlineCache = fetchYarnDeps { diff --git a/pkgs/by-name/in/infrastructure-agent/package.nix b/pkgs/by-name/in/infrastructure-agent/package.nix index 4225e088e21c..ebf45d0c99b8 100644 --- a/pkgs/by-name/in/infrastructure-agent/package.nix +++ b/pkgs/by-name/in/infrastructure-agent/package.nix @@ -6,13 +6,13 @@ }: buildGoModule (finalAttrs: { pname = "infrastructure-agent"; - version = "1.72.2"; + version = "1.72.4"; src = fetchFromGitHub { owner = "newrelic"; repo = "infrastructure-agent"; rev = finalAttrs.version; - hash = "sha256-GcQ/UUznuWdAtOyCC4qLQfItm81zwryV2gDDlYKFONI="; + hash = "sha256-qhw21kOspIyAyFQYXy56NhGCSesjkPrhagXfcfyiBRQ="; }; vendorHash = "sha256-H41FxeJLrlaL/KbcBAS1WuMfVn6d+4So3egXb6E46/o="; diff --git a/pkgs/by-name/ki/kiro/package.nix b/pkgs/by-name/ki/kiro/package.nix index b76861d6e2bf..fec52abf278c 100644 --- a/pkgs/by-name/ki/kiro/package.nix +++ b/pkgs/by-name/ki/kiro/package.nix @@ -14,7 +14,7 @@ in inherit useVSCodeRipgrep; commandLineArgs = extraCommandLineArgs; - version = "0.9.2"; + version = "0.9.47"; pname = "kiro"; # You can find the current VSCode version in the About dialog: diff --git a/pkgs/by-name/ki/kiro/sources.json b/pkgs/by-name/ki/kiro/sources.json index 67563b7be2e5..27ddca4b561c 100644 --- a/pkgs/by-name/ki/kiro/sources.json +++ b/pkgs/by-name/ki/kiro/sources.json @@ -1,14 +1,14 @@ { "x86_64-linux": { - "url": "https://prod.download.desktop.kiro.dev/releases/stable/linux-x64/signed/0.9.2/tar/kiro-ide-0.9.2-stable-linux-x64.tar.gz", - "hash": "sha256-/dMABkSiselaWuLQOnxB4dCt0VnLMzKn2LkKMLSG9MM=" + "url": "https://prod.download.desktop.kiro.dev/releases/stable/linux-x64/signed/0.9.47/tar/kiro-ide-0.9.47-stable-linux-x64.tar.gz", + "hash": "sha256-30hUVXqudiwKAKQp8BtVBpjniGEMEH6CafPbjH5x+30=" }, "x86_64-darwin": { - "url": "https://prod.download.desktop.kiro.dev/releases/stable/darwin-x64/signed/0.9.2/kiro-ide-0.9.2-stable-darwin-x64.dmg", - "hash": "sha256-3y2pmmjETqcTuQ85Nz/pK0m+UjjF+TzU+vhbuCsVzp8=" + "url": "https://prod.download.desktop.kiro.dev/releases/stable/darwin-x64/signed/0.9.47/kiro-ide-0.9.47-stable-darwin-x64.dmg", + "hash": "sha256-K78V0LTO1HlQSW8+Ot0ysYvDm9O4wRghBw89MlpQbMg=" }, "aarch64-darwin": { - "url": "https://prod.download.desktop.kiro.dev/releases/stable/darwin-arm64/signed/0.9.2/kiro-ide-0.9.2-stable-darwin-arm64.dmg", - "hash": "sha256-YN8OT3w9ztMP+He53VBHVVA+0Yp8FBHZRpizEFQ84AU=" + "url": "https://prod.download.desktop.kiro.dev/releases/stable/darwin-arm64/signed/0.9.47/kiro-ide-0.9.47-stable-darwin-arm64.dmg", + "hash": "sha256-ovEsvLyfb8iI7hlrSyFjkJrzPxX5F/eltDcROKZfw2M=" } } diff --git a/pkgs/by-name/ku/kuttl/package.nix b/pkgs/by-name/ku/kuttl/package.nix index 1ab982a7b184..40feb7b5ddb0 100644 --- a/pkgs/by-name/ku/kuttl/package.nix +++ b/pkgs/by-name/ku/kuttl/package.nix @@ -6,17 +6,17 @@ buildGoModule (finalAttrs: { pname = "kuttl"; - version = "0.24.0"; + version = "0.25.0"; cli = "kubectl-kuttl"; src = fetchFromGitHub { owner = "kudobuilder"; repo = "kuttl"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-Hkq1VukyImRLSQrOtH7IJyt2S8Zl+SNiWJfX4HpiOI4="; + sha256 = "sha256-ptF6T83PZY3avFnFeMdS6voZXRYVXFDxER03rNEX+s0="; }; - vendorHash = "sha256-et/52c++8pgVgguCbPidVg0zFm9p7SVYI97N8sQ2KYQ="; + vendorHash = "sha256-UgFf+iKtJDeBxILCfshgqTU9ecALLyJwwOULsTKcjjk="; subPackages = [ "cmd/kubectl-kuttl" ]; diff --git a/pkgs/by-name/li/lichess-bot/package.nix b/pkgs/by-name/li/lichess-bot/package.nix index d6bad7aa9b34..0efd1d770106 100644 --- a/pkgs/by-name/li/lichess-bot/package.nix +++ b/pkgs/by-name/li/lichess-bot/package.nix @@ -11,14 +11,14 @@ python3Packages.buildPythonApplication { pname = "lichess-bot"; - version = "2026.1.28.1"; + version = "2026.2.13.1"; pyproject = false; src = fetchFromGitHub { owner = "lichess-bot-devs"; repo = "lichess-bot"; - rev = "6bc42182f959b83cda1e711fb752179807834e13"; - hash = "sha256-kSNGOyL9vNDWOD80a3LOCf+DTWv2poS2EQ+xce8knTs="; + rev = "960bcad4ec5069547cc5fcfd496c47a70280ff56"; + hash = "sha256-Dc6R9OufJCcTN32Hx2BVauTwaO9/gWRq24hJ4pWRObY="; }; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/by-name/me/mesos-dns/package.nix b/pkgs/by-name/me/mesos-dns/package.nix index db370a3b8393..c97a4dccbedf 100644 --- a/pkgs/by-name/me/mesos-dns/package.nix +++ b/pkgs/by-name/me/mesos-dns/package.nix @@ -6,13 +6,13 @@ buildGoModule (finalAttrs: { pname = "mesos-dns"; - version = "0.10.0"; + version = "0.10.1"; src = fetchFromGitHub { owner = "m3scluster"; repo = "mesos-dns"; tag = "v${finalAttrs.version}"; - hash = "sha256-o0I+pTgN9fb//Q1s9UfpVLUzq5DQVR/qKsr6CYypvsc="; + hash = "sha256-922FWRqKGBFB8zQf9nAtlym3b7Fjcg+uaIqEKeRZSro="; }; vendorHash = "sha256-l1y3CaGG1ykJnGit81D+E+jB4RUYneQzRMTvOPCH+jk="; diff --git a/pkgs/by-name/mh/mhost/package.nix b/pkgs/by-name/mh/mhost/package.nix index ef08dc884b0f..48364f3abca1 100644 --- a/pkgs/by-name/mh/mhost/package.nix +++ b/pkgs/by-name/mh/mhost/package.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoHash = "sha256-08pvkBa2PD7/uko1OOBg6/dCcOM3z9Cp//8mylFCMcE="; - CARGO_CRATE_NAME = "mhost"; + env.CARGO_CRATE_NAME = "mhost"; doCheck = false; diff --git a/pkgs/by-name/nb/nbytes/package.nix b/pkgs/by-name/nb/nbytes/package.nix index 6ab3d850ce3c..38b45611d4db 100644 --- a/pkgs/by-name/nb/nbytes/package.nix +++ b/pkgs/by-name/nb/nbytes/package.nix @@ -12,24 +12,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "nbytes"; - version = "0.1.2"; + version = "0.1.3"; src = fetchFromGitHub { owner = "nodejs"; repo = "nbytes"; tag = "v${finalAttrs.version}"; - hash = "sha256-lsd1Qrv1HEz/5ry10s7Pq7unoh3y9ZmwCaT+6nTlxkc="; + hash = "sha256-10l/YrvZPwEdEh/Q170WhZUQzdFEpjy7zeKKzYfyoYc="; }; patches = [ # Use `gtest` from Nixpkgs to allow an offline build ./use-nix-googletest.patch - # Add support for pkgconfig for use as a shared lib - # TODO: remove when included in the next release - (fetchpatch2 { - url = "https://github.com/nodejs/nbytes/commit/00f48a0620cef800054d4aab061f09d89990a1b9.patch?full_index=1"; - hash = "sha256-uOPEI70Dq446K56BSFHVyxDHNaYY5OASu3QeWGCLQmI="; - }) ]; outputs = [ diff --git a/pkgs/by-name/ne/networkmanager/package.nix b/pkgs/by-name/ne/networkmanager/package.nix index 542ce9d60633..fa7bfdfec1d8 100644 --- a/pkgs/by-name/ne/networkmanager/package.nix +++ b/pkgs/by-name/ne/networkmanager/package.nix @@ -123,6 +123,7 @@ stdenv.mkDerivation (finalAttrs: { # almost cross-compiles, however fails with # ** (process:9234): WARNING **: Failed to load shared library '/nix/store/...-networkmanager-aarch64-unknown-linux-gnu-1.38.2/lib/libnm.so.0' referenced by the typelib: /nix/store/...-networkmanager-aarch64-unknown-linux-gnu-1.38.2/lib/libnm.so.0: cannot open shared object file: No such file or directory "-Ddocs=${lib.boolToString (stdenv.buildPlatform == stdenv.hostPlatform)}" + "-Dman=${lib.boolToString (stdenv.buildPlatform == stdenv.hostPlatform)}" "-Dtests=no" "-Dcrypto=gnutls" "-Dmobile_broadband_provider_info_database=${mobile-broadband-provider-info}/share/mobile-broadband-provider-info/serviceproviders.xml" diff --git a/pkgs/by-name/no/noctalia-shell/package.nix b/pkgs/by-name/no/noctalia-shell/package.nix index b00e603fdb97..ad18205b0b15 100644 --- a/pkgs/by-name/no/noctalia-shell/package.nix +++ b/pkgs/by-name/no/noctalia-shell/package.nix @@ -9,6 +9,7 @@ quickshell, # runtime deps + bluez, brightnessctl, cava, cliphist, @@ -29,6 +30,7 @@ json-glib, gobject-introspection, + bluetoothSupport ? true, brightnessctlSupport ? true, cavaSupport ? true, cliphistSupport ? true, @@ -45,6 +47,7 @@ let wget (python3.withPackages (pp: lib.optional calendarSupport pp.pygobject3)) ] + ++ lib.optional bluetoothSupport bluez ++ lib.optional brightnessctlSupport brightnessctl ++ lib.optional cavaSupport cava ++ lib.optional cliphistSupport cliphist @@ -65,13 +68,13 @@ let in stdenvNoCC.mkDerivation (finalAttrs: { pname = "noctalia-shell"; - version = "4.4.3"; + version = "4.5.0"; src = fetchFromGitHub { owner = "noctalia-dev"; repo = "noctalia-shell"; tag = "v${finalAttrs.version}"; - hash = "sha256-5HqCE5qfW6ItA+ZeFGfTT7/+12QYp/1j93EPdn+nlK0="; + hash = "sha256-Y5P0RYO9NKxa4UZBoGmmxtz3mEwJrBOfvdLJRGjV2Os="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/nu/numix-icon-theme-square/package.nix b/pkgs/by-name/nu/numix-icon-theme-square/package.nix index d615722dc8b9..b4a28eff8ba5 100644 --- a/pkgs/by-name/nu/numix-icon-theme-square/package.nix +++ b/pkgs/by-name/nu/numix-icon-theme-square/package.nix @@ -10,13 +10,13 @@ stdenvNoCC.mkDerivation rec { pname = "numix-icon-theme-square"; - version = "26.01.11"; + version = "26.02.11"; src = fetchFromGitHub { owner = "numixproject"; repo = "numix-icon-theme-square"; rev = version; - sha256 = "sha256-fj7CaEUms7w+apaXW+6zMwqCwaLWlU2RJalGzFIaDNg="; + sha256 = "sha256-7UDjXJtmHI3FKAvuvHtppqkVIfochwXSvfaM50Mm3R8="; }; nativeBuildInputs = [ gtk3 ]; diff --git a/pkgs/by-name/oh/oha/package.nix b/pkgs/by-name/oh/oha/package.nix index 9ea88a485e73..aabfc749ac94 100644 --- a/pkgs/by-name/oh/oha/package.nix +++ b/pkgs/by-name/oh/oha/package.nix @@ -22,8 +22,10 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoHash = "sha256-v+OfQEfAwHxX+FfC0UK2F8/e2tJKaI3zQpg+3hk2hV4="; - CARGO_PROFILE_RELEASE_LTO = "fat"; - CARGO_PROFILE_RELEASE_CODEGEN_UNITS = "1"; + env = { + CARGO_PROFILE_RELEASE_LTO = "fat"; + CARGO_PROFILE_RELEASE_CODEGEN_UNITS = "1"; + }; nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config diff --git a/pkgs/by-name/op/openfga/package.nix b/pkgs/by-name/op/openfga/package.nix index eb6004f49660..57af4fb5e5d7 100644 --- a/pkgs/by-name/op/openfga/package.nix +++ b/pkgs/by-name/op/openfga/package.nix @@ -7,13 +7,13 @@ buildGoModule (finalAttrs: { pname = "openfga"; - version = "1.11.4"; + version = "1.11.5"; src = fetchFromGitHub { owner = "openfga"; repo = "openfga"; rev = "v${finalAttrs.version}"; - hash = "sha256-MhxDlJzAScmf8J42WrsgVzSasiIhzqprrU9TqoY2bzk="; + hash = "sha256-5VS3sx4sHiJvWFDFw929Q5n6OZfCSHPgqtHgLEEeqHQ="; }; vendorHash = "sha256-m2ddB7yfZmTwWKvf/lTzmc2D4lR1JXc5sFlRgAi+q+s="; diff --git a/pkgs/by-name/pa/paperless-ngx/package.nix b/pkgs/by-name/pa/paperless-ngx/package.nix index 8c7ca8df2d8a..5e59d3204026 100644 --- a/pkgs/by-name/pa/paperless-ngx/package.nix +++ b/pkgs/by-name/pa/paperless-ngx/package.nix @@ -29,13 +29,13 @@ lndir, }: let - version = "2.20.6"; + version = "2.20.7"; src = fetchFromGitHub { owner = "paperless-ngx"; repo = "paperless-ngx"; tag = "v${version}"; - hash = "sha256-rTkkvSkgYQtT9KglXsyf4SWwjoJWtX5YwcVUbEbLac0="; + hash = "sha256-NVlV+iHtUx05EIuHx/WePRf558DH977oZ7C8iNW0QR4="; }; python = python3.override { diff --git a/pkgs/by-name/pa/patch2pr/package.nix b/pkgs/by-name/pa/patch2pr/package.nix index e37ad28a5a84..1078ab396b75 100644 --- a/pkgs/by-name/pa/patch2pr/package.nix +++ b/pkgs/by-name/pa/patch2pr/package.nix @@ -8,16 +8,16 @@ buildGoModule (finalAttrs: { pname = "patch2pr"; - version = "0.41.0"; + version = "0.42.0"; src = fetchFromGitHub { owner = "bluekeyes"; repo = "patch2pr"; rev = "v${finalAttrs.version}"; - hash = "sha256-mln6MVPZRbW2XgTaVAGiK87MkHPPEzFgHaNnacKym8g="; + hash = "sha256-3VrUp9JmZLHIknXneMa5IixRkjWFzTLanVGhSagSams="; }; - vendorHash = "sha256-nLpS0JbdqFMK2+ycZZC93HWPCS0+k7tyl1pB/T6fPjA="; + vendorHash = "sha256-zpyyz0C+lJKFjKgaUnO3R5kmujIXCzM16UvcXcNQnVw="; ldflags = [ "-X main.version=${finalAttrs.version}" diff --git a/pkgs/by-name/pi/pihole-web/package.nix b/pkgs/by-name/pi/pihole-web/package.nix index 9eac557b8f20..d3a0d978d8cf 100644 --- a/pkgs/by-name/pi/pihole-web/package.nix +++ b/pkgs/by-name/pi/pihole-web/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "pihole-web"; - version = "6.4"; + version = "6.4.1"; src = fetchFromGitHub { owner = "pi-hole"; repo = "web"; tag = "v${finalAttrs.version}"; - hash = "sha256-zIuDqDL6JO8JLr+u+XWBRxweK67KBztvqUp00MshbYQ="; + hash = "sha256-0nhMbOEZ4Q4XxOvskcEbDkK4HqdosgAzdRF4sT9+zjQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/by-name/pi/pik/package.nix b/pkgs/by-name/pi/pik/package.nix index f205b64999b2..a0b13b5161f3 100644 --- a/pkgs/by-name/pi/pik/package.nix +++ b/pkgs/by-name/pi/pik/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "pik"; - version = "0.28.1"; + version = "0.29.0"; src = fetchFromGitHub { owner = "jacek-kurlit"; repo = "pik"; rev = finalAttrs.version; - hash = "sha256-pDfqqQcYrK78OylwOiKc/Orul03MjdZxEHhpr8obm84="; + hash = "sha256-SXSMYvpFLT4sYb1UxC4SoOXL5J2V0/hSL5p2Wa/Ba00="; }; - cargoHash = "sha256-/2E5VZt2/xWtPy4Zpo8lVn4sXR4Gq6+NJkKpNM7hOVg="; + cargoHash = "sha256-+7sUlqi3cv3GksVMMCgrcbGgkCIQZCWEco5LpXo7p2w="; passthru.tests.version = testers.testVersion { package = pik; }; diff --git a/pkgs/by-name/pr/prisma_6/package.nix b/pkgs/by-name/pr/prisma_6/package.nix index bf2ac5b5fc27..6dbd49fde35e 100644 --- a/pkgs/by-name/pr/prisma_6/package.nix +++ b/pkgs/by-name/pr/prisma_6/package.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: { # Fetch CLI workspace dependencies deps_json=$(pnpm list --filter ./packages/cli --prod --depth Infinity --json) - deps=$(jq -r '[.. | strings | select(startswith("link:../")) | sub("^link:../"; "")] | unique[]' <<< "$deps_json") + deps=$(jq -r '[del(.. | .unsavedDependencies?) | .. | strings | select(startswith("link:../")) | sub("^link:../"; "")] | unique[]' <<< "$deps_json") # Remove unnecessary external dependencies find . -name node_modules -type d -prune -exec rm -rf {} + diff --git a/pkgs/by-name/pr/prisma_7/package.nix b/pkgs/by-name/pr/prisma_7/package.nix index 786df96e015a..93fc219f2092 100644 --- a/pkgs/by-name/pr/prisma_7/package.nix +++ b/pkgs/by-name/pr/prisma_7/package.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation (finalAttrs: { # Fetch CLI workspace dependencies deps_json=$(pnpm list --filter ./packages/cli --prod --depth Infinity --json) - deps=$(jq -r '[.. | strings | select(startswith("link:../")) | sub("^link:../"; "")] | unique[]' <<< "$deps_json") + deps=$(jq -r '[del(.. | .unsavedDependencies?) | .. | strings | select(startswith("link:../")) | sub("^link:../"; "")] | unique[]' <<< "$deps_json") # Remove unnecessary external dependencies find . -name node_modules -type d -prune -exec rm -rf {} + diff --git a/pkgs/by-name/pr/protoc-gen-validate/package.nix b/pkgs/by-name/pr/protoc-gen-validate/package.nix index 841c6b503a53..ae0e787357c0 100644 --- a/pkgs/by-name/pr/protoc-gen-validate/package.nix +++ b/pkgs/by-name/pr/protoc-gen-validate/package.nix @@ -6,16 +6,16 @@ buildGoModule (finalAttrs: { pname = "protoc-gen-validate"; - version = "1.3.0"; + version = "1.3.2"; src = fetchFromGitHub { owner = "bufbuild"; repo = "protoc-gen-validate"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-225D0iHM+fTYIu/+HPkGZ8IcqbP4FMkf7Lw1wI02rZw="; + sha256 = "sha256-4KmYDfitAYLfdgTUg3SlQLjWoYBnGOuF7C3xHWm/lNM="; }; - vendorHash = "sha256-R9zcjoMiq69pPbXAahOp1RJNvlgsASuCwbxkwLbMomg="; + vendorHash = "sha256-r4oT4Jd21hQccvGEqOXpEKqUy6lvMKN+vF8e2KxY6oQ="; excludedPackages = [ "tests" ]; diff --git a/pkgs/by-name/ps/pspg/package.nix b/pkgs/by-name/ps/pspg/package.nix index 8be74b56c532..122007e0448f 100644 --- a/pkgs/by-name/ps/pspg/package.nix +++ b/pkgs/by-name/ps/pspg/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "pspg"; - version = "5.8.15"; + version = "5.8.16"; src = fetchFromGitHub { owner = "okbob"; repo = "pspg"; rev = finalAttrs.version; - sha256 = "sha256-wYGU9vaAgY87RTbOXOGBVV37ZN/+NceXWgoEaY95md4="; + sha256 = "sha256-7x1hTEl2WoOXZTbPfb/t0w4tl09paDD/uIPuyhLlMbk="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/pu/pulumi-bin/data.nix b/pkgs/by-name/pu/pulumi-bin/data.nix index ab55547f25c1..874830705129 100644 --- a/pkgs/by-name/pu/pulumi-bin/data.nix +++ b/pkgs/by-name/pu/pulumi-bin/data.nix @@ -1,16 +1,16 @@ # DO NOT EDIT! This file is generated automatically by update.sh { }: { - version = "3.220.0"; + version = "3.221.0"; pulumiPkgs = { x86_64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.220.0-linux-x64.tar.gz"; - sha256 = "1zs5mpy4rcgv0fadbb6pv95kq75152rpngch676j2n63w2awa03g"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.221.0-linux-x64.tar.gz"; + sha256 = "1bdrblxcyai88a52qw2zq998ar0yl3fk83l7b7w98gqmnj8nywzy"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.48.0-linux-amd64.tar.gz"; - sha256 = "02ffwlprcqn8n7ghpmb6s33gfg03vizvah4zxkqi69dp6q3l3hws"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.49.0-linux-amd64.tar.gz"; + sha256 = "0rz3bfdpy20f82cj2ja5nag829l01cy5kpc2qshl1i6sh70f2q0y"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v10.3.0-linux-amd64.tar.gz"; @@ -57,8 +57,8 @@ sha256 = "1k0ssdiby049ycl0q2bym94vx3apnxqkay61iyv3b0ssh6447zp0"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.57.0-linux-amd64.tar.gz"; - sha256 = "0b7naqlw20v2hllc48y485ypcaw2qsi5ng0kwmm0zg6zdjx6and7"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.58.0-linux-amd64.tar.gz"; + sha256 = "0v533qvfsibdmw17p0byk1xcl290kljryd6fd6j0mkg3gyw7gbx0"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.11.0-linux-amd64.tar.gz"; @@ -73,8 +73,8 @@ sha256 = "0lh7qzaxqplnc6liqvgccczyl7fhgnnmxv1ivwf88pmrpzq2l1n0"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v9.11.0-linux-amd64.tar.gz"; - sha256 = "0yaxcpc5zrl31jyrwl7yfyva27nxsjcgx6cinvhq3rhisknsz8xp"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v9.12.0-linux-amd64.tar.gz"; + sha256 = "167mfp0h67s3ma5idl81mlqpsbflnrs4z7xg035clwg0lwq6m00j"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.12.1-linux-amd64.tar.gz"; @@ -89,8 +89,8 @@ sha256 = "1zra1ck64gs4nwqf62ksfmpbx24lxw6vsgi47j4v8q051m89fgq3"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.32.0-linux-amd64.tar.gz"; - sha256 = "0324c2x4x7gfyg3xis3fi7qy8j1ccw8871b8qyh09cndwlh4ghg1"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.32.1-linux-amd64.tar.gz"; + sha256 = "19k79m8dhkiy4x4rs6dq4zkfczjsnmc0mvbh57b5l52imsv7ks7m"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.25.0-linux-amd64.tar.gz"; @@ -163,12 +163,12 @@ ]; x86_64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.220.0-darwin-x64.tar.gz"; - sha256 = "1vly2arzfn69a92v5mpf6yc1a15rnc4bh1f20zpcsq7mvfdjrfr1"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.221.0-darwin-x64.tar.gz"; + sha256 = "0szvz9wwvr6ijv45sbmkxawnbyph8pknnly99bf909ra3kr5y9vc"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.48.0-darwin-amd64.tar.gz"; - sha256 = "1zjs31cdhc9wryxigf5x1r88hkcvqsizkxdwydd1cn2svlc1pkik"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.49.0-darwin-amd64.tar.gz"; + sha256 = "14zxzrjcmyjg0fvdmm9jf4lb4zx6vlj125j2hy0m99yy1ngqrw4c"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v10.3.0-darwin-amd64.tar.gz"; @@ -215,8 +215,8 @@ sha256 = "0bj5mb05sakzmar8g5bymamfyixkdl99ccw4xglb4syxhv97cp91"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.57.0-darwin-amd64.tar.gz"; - sha256 = "1bxvgri8ics1x84kh7l7lqw558x1pgbxhp6c9ph0ma56acbhv2x7"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.58.0-darwin-amd64.tar.gz"; + sha256 = "12pr6haz9s304aws4id4csvalh2ifqack5mp7lz3l2f8gy6aa4xb"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.11.0-darwin-amd64.tar.gz"; @@ -231,8 +231,8 @@ sha256 = "1qr6395rkb2bfd2qi3aifi1z78mlp5kap5kb605j9l0ml5q4ybb4"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v9.11.0-darwin-amd64.tar.gz"; - sha256 = "1a6xw351y2x1aadbrww4j8zwyfvhbs71wbyrkkp8br806yq0ysdp"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v9.12.0-darwin-amd64.tar.gz"; + sha256 = "1y5bhjzv7pcnk6h2rhl0lib8nlvbfdh87ilgfydy757gn99wqi03"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.12.1-darwin-amd64.tar.gz"; @@ -247,8 +247,8 @@ sha256 = "0ddd0pgpyywq291r9q8w6bn41r2px595017iihx4n2cnb1c4v6d5"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.32.0-darwin-amd64.tar.gz"; - sha256 = "1zpc8gdjgj7if0cv1vmn9m2p4x0mc9ab6a1x3k16xmq0qcd4by2p"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.32.1-darwin-amd64.tar.gz"; + sha256 = "04rmlydspvgbcgn7qd9sk0bd70axz2rmpiydfw383352bxrinlvs"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.25.0-darwin-amd64.tar.gz"; @@ -321,12 +321,12 @@ ]; aarch64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.220.0-linux-arm64.tar.gz"; - sha256 = "0sznqiqc5n3y8spdixmp3fb4dcprchcc75mssmb3gk6q8c7yw016"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.221.0-linux-arm64.tar.gz"; + sha256 = "0dvsymd37g9vxli5mzh9fy3kzi7yaq5qcd343zys87c5idx0gbxs"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.48.0-linux-arm64.tar.gz"; - sha256 = "0l2chxskd3lafgg7b04zv8y9p4hm3q29v1vjlky99anbcg0wjknw"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.49.0-linux-arm64.tar.gz"; + sha256 = "18km9lhzyvvlcx97yyxnh0mfrfr9sc6c9ypj6asksvjz3fsmgjkb"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v10.3.0-linux-arm64.tar.gz"; @@ -373,8 +373,8 @@ sha256 = "0wzfnvckhl1xq66j2kic3hzi1spvyz2mi2cj8rbhywilb429llhk"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.57.0-linux-arm64.tar.gz"; - sha256 = "161jv9dxwihgigyc6y349l4dyqax54p44ayb14mdrnxjjiy8wlmz"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.58.0-linux-arm64.tar.gz"; + sha256 = "107i65fd2j5f08bwzwdjjhdhvn7ghy64m63mzbjrqssawma0r3wc"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.11.0-linux-arm64.tar.gz"; @@ -389,8 +389,8 @@ sha256 = "1vl4mszkbh0m2vf55rx5bb5bkjd72nf4npmp21878fdhyrq23p3r"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v9.11.0-linux-arm64.tar.gz"; - sha256 = "08178lhqkxcl2016xhd7zhiqzhm8cvj9kzmbaz187h0cj1db697q"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v9.12.0-linux-arm64.tar.gz"; + sha256 = "1a57fvnl1wixghs4gvv534rj5qy8z9zjb1nc6gg02ayn4q5720cy"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.12.1-linux-arm64.tar.gz"; @@ -405,8 +405,8 @@ sha256 = "0d8m2krbzxjhfm82dgf8p4vm3kk9gk98l798q4ayjrddqqb4mxq4"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.32.0-linux-arm64.tar.gz"; - sha256 = "00hk4bl7vdw39ygxzzgp1a90fa2gm4x0phvppfg748m8dm0wp1mb"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.32.1-linux-arm64.tar.gz"; + sha256 = "094pmichc66fnd38vfn4hb2dl3v88vqfx00smk0b19fdbrafcp5j"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.25.0-linux-arm64.tar.gz"; @@ -479,12 +479,12 @@ ]; aarch64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.220.0-darwin-arm64.tar.gz"; - sha256 = "0pjvlyllqg9pbs2w5am10nza67wwnhbdyhir2zld45zfyak9sbjb"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.221.0-darwin-arm64.tar.gz"; + sha256 = "14k0q3q5mkni934gxrbg44hwhwy6knhzjk6hr6n0qi1i87r28c2d"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.48.0-darwin-arm64.tar.gz"; - sha256 = "027y13r0f84kqcpfirwzyilnsmbn9240dsbdk1jl97m04zp0djhn"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.49.0-darwin-arm64.tar.gz"; + sha256 = "1295bxz4n7mmi0ijiq6nx1hv7n9vbwcwi0wfrj27fbipwpkbk2wb"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v10.3.0-darwin-arm64.tar.gz"; @@ -531,8 +531,8 @@ sha256 = "0nw2mcn03mnrvlhc3ykf43im1nmnwc5c2707nqzl9fwxhm25dhc9"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.57.0-darwin-arm64.tar.gz"; - sha256 = "0gi3cnlcyqy2aq7vxi4kpgl1bfqbax58fawjxg93qjr405g9ilih"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.58.0-darwin-arm64.tar.gz"; + sha256 = "08j85v5i4f5jj0kg816bhxc20br8a9i6hd3i1x0p7g7qvm7ypjvr"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.11.0-darwin-arm64.tar.gz"; @@ -547,8 +547,8 @@ sha256 = "068bdlp98cp1lfhbigkw16hqyflb95kh7my2s8wgb7hjnf580xwv"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v9.11.0-darwin-arm64.tar.gz"; - sha256 = "17mdijhdi1w8b00y5rn86l61jd3ib8p7xda3zhhc8b288c9qwjlk"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v9.12.0-darwin-arm64.tar.gz"; + sha256 = "0d77pwhqmvm4g4ix86g566jakja6y59b0s57mxnffyfsvirm2m61"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.12.1-darwin-arm64.tar.gz"; @@ -563,8 +563,8 @@ sha256 = "0caz4kgnnrmdr7n571xc7yqscac9jnjwwpjzbnvx4ib6a91wvsdn"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.32.0-darwin-arm64.tar.gz"; - sha256 = "18k8g8dh9rkmkn9d68m21wh27g5ynliafzs8ljg6svkg0vmiyw7k"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.32.1-darwin-arm64.tar.gz"; + sha256 = "150kg8brpsazpdd6laywwvbrjmzl4n3w7saf9vidiwsv01zpl90m"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.25.0-darwin-arm64.tar.gz"; diff --git a/pkgs/by-name/ra/rainfrog/package.nix b/pkgs/by-name/ra/rainfrog/package.nix index 5b67d06b8697..6d5cc8e2e568 100644 --- a/pkgs/by-name/ra/rainfrog/package.nix +++ b/pkgs/by-name/ra/rainfrog/package.nix @@ -7,7 +7,7 @@ rainfrog, }: let - version = "0.3.15"; + version = "0.3.16"; in rustPlatform.buildRustPackage { inherit version; @@ -17,10 +17,10 @@ rustPlatform.buildRustPackage { owner = "achristmascarl"; repo = "rainfrog"; tag = "v${version}"; - hash = "sha256-XW2jMiQif0Q9IV8rDw44n/7OTfPkO+XpAb0AVobddDM="; + hash = "sha256-Bz1YNR3/RnCZgU4rZWU6ATclkuUamYE3Umja4qXlmXk="; }; - cargoHash = "sha256-+B5hPtgXoe3mNiOsarivk8sZ6RS6re3Cw/LO4fzuX9o="; + cargoHash = "sha256-qpUUInE0XmyAXWZcqXNyNHy5SDKR+M7DG2YRNlr8rug="; passthru = { tests.version = testers.testVersion { diff --git a/pkgs/by-name/rc/rclone-ui/package.nix b/pkgs/by-name/rc/rclone-ui/package.nix index 63ce6f60ee9f..44ccca867e5c 100644 --- a/pkgs/by-name/rc/rclone-ui/package.nix +++ b/pkgs/by-name/rc/rclone-ui/package.nix @@ -20,26 +20,26 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "rclone-ui"; - version = "3.4.1"; + version = "3.4.2"; src = fetchFromGitHub { owner = "rclone-ui"; repo = "rclone-ui"; tag = "v${finalAttrs.version}"; - hash = "sha256-d4qJtb8eDZ2txeZxGuweK4tuZaq7E7cRNW5wHdNBalY="; + hash = "sha256-aDwtRZGs2JhD2xbzVR3wDdSIjWied9BKknt5WETefvU="; }; npmDeps = fetchNpmDeps { name = "${finalAttrs.pname}-${finalAttrs.version}-npm-deps"; inherit (finalAttrs) src; forceGitDeps = true; - hash = "sha256-xnF7c3g3CpMlW3s1UbJHN+R5K+dzV9/IFZ8T/LoT3fk="; + hash = "sha256-iyO9Eg+rWV3T50uWyrPHjGcvREnMgSyr0Gq8dxOMPWg="; }; cargoRoot = "src-tauri"; buildAndTestSubdir = finalAttrs.cargoRoot; - cargoHash = "sha256-lemjmsxZsplfC1/nFn84be0JXuKcub5ORkQLL5HQCHY="; + cargoHash = "sha256-sCsH+jjHMR3zsPoFfDq2vVuTc8PvYuR/3ZY5bcW7X0o="; # Disable tauri bundle updater, can be removed when #389107 is merged patches = [ ./remove_updater.patch ]; diff --git a/pkgs/by-name/ri/rinf_cli/package.nix b/pkgs/by-name/ri/rinf_cli/package.nix index 6c0f887dac0f..05eeec62af8c 100644 --- a/pkgs/by-name/ri/rinf_cli/package.nix +++ b/pkgs/by-name/ri/rinf_cli/package.nix @@ -5,17 +5,17 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "rinf_cli"; - version = "8.9.0"; + version = "8.9.1"; src = fetchFromGitHub { owner = "cunarist"; repo = "rinf"; tag = "v${finalAttrs.version}"; - hash = "sha256-UHYYpNlhXRYysQlo3EWDUe4Fwp7PMifrQuZcMAGJp6Q="; + hash = "sha256-N34Lys5P/3Os2yEl8x1LOJXhcTxp07V8J3B+DMlK3qk="; }; sourceRoot = "${finalAttrs.src.name}/rust_crate_cli"; - cargoHash = "sha256-T1reyeoaGBb+Wyn8WX/u7Kf9B01GwWUcYntb7PlIfCk="; + cargoHash = "sha256-vnJloz0wUsJbLbAoiIMNxSUZmibRIF/eLIuqkEXbZp8="; meta = { description = "Framework for creating cross-platform Rust apps leveraging Flutter"; diff --git a/pkgs/by-name/ru/rutabaga_gfx/package.nix b/pkgs/by-name/ru/rutabaga_gfx/package.nix index bbd6c3ef1512..5caaa90d1ed4 100644 --- a/pkgs/by-name/ru/rutabaga_gfx/package.nix +++ b/pkgs/by-name/ru/rutabaga_gfx/package.nix @@ -58,8 +58,10 @@ stdenv.mkDerivation (finalAttrs: { (lib.mesonBool "gfxstream" withGfxstream) ]; - CARGO_BUILD_TARGET = stdenv.hostPlatform.rust.rustcTargetSpec; - "CARGO_TARGET_${stdenv.hostPlatform.rust.cargoEnvVarTarget}_LINKER" = "${stdenv.cc.targetPrefix}cc"; + env = { + CARGO_BUILD_TARGET = stdenv.hostPlatform.rust.rustcTargetSpec; + "CARGO_TARGET_${stdenv.hostPlatform.rust.cargoEnvVarTarget}_LINKER" = "${stdenv.cc.targetPrefix}cc"; + }; preConfigure = '' cd rutabaga_gfx/ffi diff --git a/pkgs/by-name/sa/saleae-logic-2/package.nix b/pkgs/by-name/sa/saleae-logic-2/package.nix index 116ee9e316df..b51a4872b23e 100644 --- a/pkgs/by-name/sa/saleae-logic-2/package.nix +++ b/pkgs/by-name/sa/saleae-logic-2/package.nix @@ -31,9 +31,12 @@ appimageTools.wrapType2 { '' mkdir -p $out/etc/udev/rules.d cp ${appimageContents}/resources/linux-x64/99-SaleaeLogic.rules $out/etc/udev/rules.d/ - mkdir -p $out/share/pixmaps + mkdir $out/share ln -s ${desktopItem}/share/applications $out/share/ - cp ${appimageContents}/usr/share/icons/hicolor/256x256/apps/Logic.png $out/share/pixmaps/Logic.png + for size in 16 32 48 64 128 256; do + install -Dm644 -t $out/share/icons/hicolor/"$size"x"$size"/apps \ + ${appimageContents}/usr/share/icons/hicolor/"$size"x"$size"/apps/Logic.png + done ''; extraPkgs = diff --git a/pkgs/by-name/sc/scalr-cli/package.nix b/pkgs/by-name/sc/scalr-cli/package.nix index e0285f8b1e42..adbd58b2a811 100644 --- a/pkgs/by-name/sc/scalr-cli/package.nix +++ b/pkgs/by-name/sc/scalr-cli/package.nix @@ -6,13 +6,13 @@ buildGoModule (finalAttrs: { pname = "scalr-cli"; - version = "0.17.6"; + version = "0.17.7"; src = fetchFromGitHub { owner = "Scalr"; repo = "scalr-cli"; rev = "v${finalAttrs.version}"; - hash = "sha256-TcgNWtyXadbrE43ZmTLC+d9eXUzgp7zhHxjf2vTsuBk="; + hash = "sha256-ZGq76TPMNrlyuHs5yUgw3pJ+a2wVNwBTTSgzIofD4io="; }; vendorHash = "sha256-TUf+0Z0yBDOpzMuETn+FCAPXWvQltjRhwQ3Xz0X6YOI="; diff --git a/pkgs/by-name/sc/scryer-prolog/package.nix b/pkgs/by-name/sc/scryer-prolog/package.nix index 1fba7059afdd..2c3fe35fa29e 100644 --- a/pkgs/by-name/sc/scryer-prolog/package.nix +++ b/pkgs/by-name/sc/scryer-prolog/package.nix @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage (finalAttrs: { buildInputs = [ openssl ]; - CARGO_FEATURE_USE_SYSTEM_LIBS = true; + env.CARGO_FEATURE_USE_SYSTEM_LIBS = true; meta = { description = "Modern Prolog implementation written mostly in Rust"; diff --git a/pkgs/by-name/se/seabird/package.nix b/pkgs/by-name/se/seabird/package.nix index 9e03bbcd7cc1..7fb8b16b1968 100644 --- a/pkgs/by-name/se/seabird/package.nix +++ b/pkgs/by-name/se/seabird/package.nix @@ -57,7 +57,7 @@ buildGoModule (finalAttrs: { ''; postInstall = '' - install -Dm644 internal/icon/seabird.svg $out/share/pixmaps/dev.skynomads.Seabird.svg + install -Dm644 internal/icon/seabird.svg $out/share/icons/hicolor/scalable/dev.skynomads.Seabird.svg ''; desktopItems = [ "dev.skynomads.Seabird.desktop" ]; diff --git a/pkgs/by-name/sh/shipwright/package.nix b/pkgs/by-name/sh/shipwright/package.nix index a02db407cb4c..5ea17b1edb64 100644 --- a/pkgs/by-name/sh/shipwright/package.nix +++ b/pkgs/by-name/sh/shipwright/package.nix @@ -239,7 +239,7 @@ stdenv.mkDerivation (finalAttrs: { lib.optionalString stdenv.hostPlatform.isLinux '' mkdir -p $out/bin ln -s $out/lib/soh.elf $out/bin/soh - install -Dm644 ../soh/macosx/sohIcon.png $out/share/pixmaps/soh.png + install -Dm644 ../soh/macosx/sohIcon.png $out/share/icons/hicolor/1024x1024/apps/soh.png '' + lib.optionalString stdenv.hostPlatform.isDarwin '' # Recreate the macOS bundle (without using cpack) diff --git a/pkgs/by-name/si/signalbackup-tools/package.nix b/pkgs/by-name/si/signalbackup-tools/package.nix index 6676c5003c6f..40f710c88140 100644 --- a/pkgs/by-name/si/signalbackup-tools/package.nix +++ b/pkgs/by-name/si/signalbackup-tools/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "signalbackup-tools"; - version = "20260208"; + version = "20260217"; src = fetchFromGitHub { owner = "bepaald"; repo = "signalbackup-tools"; tag = finalAttrs.version; - hash = "sha256-rRj8r2uJ6hbvhqzmjOdjBMGj/FlSbnI3tucnCn6oji4="; + hash = "sha256-Pd9Hqepm/vxUSKePymi2V6UG8UB3Aj0Jz/UORdYn1J8="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/si/simple-live-app/package.nix b/pkgs/by-name/si/simple-live-app/package.nix index 608a7ea09772..ebc2cab18324 100644 --- a/pkgs/by-name/si/simple-live-app/package.nix +++ b/pkgs/by-name/si/simple-live-app/package.nix @@ -44,7 +44,7 @@ flutter332.buildFlutterApplication rec { ]; postInstall = '' - install -Dm644 assets/logo.png $out/share/pixmaps/simple-live-app.png + install -Dm644 assets/logo.png $out/share/icons/hicolor/1024x1024/apps/simple-live-app.png ''; extraWrapProgramArgs = '' diff --git a/pkgs/by-name/si/sioyek/package.nix b/pkgs/by-name/si/sioyek/package.nix index f34350d17091..62604e8ee377 100644 --- a/pkgs/by-name/si/sioyek/package.nix +++ b/pkgs/by-name/si/sioyek/package.nix @@ -15,13 +15,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "sioyek"; - version = "2.0.0-unstable-2026-02-04"; + version = "2.0.0-unstable-2026-02-12"; src = fetchFromGitHub { owner = "ahrm"; repo = "sioyek"; - rev = "bd081b343ec43a702429e934901902ddc51f8b66"; - hash = "sha256-OmOHIk38s1CVno4LHQegWRZUbMf3KEsOD2VaFCEM55E="; + rev = "7b2b26547da4b644d646686a53b087d26ac7413f"; + hash = "sha256-5ObudXMbUD37LbbtGKW9SDxPHaZx6QBMh+66fyY3NGo="; }; buildInputs = [ diff --git a/pkgs/by-name/sn/snx-rs/package.nix b/pkgs/by-name/sn/snx-rs/package.nix index 9253ab78d42f..61974e2758e8 100644 --- a/pkgs/by-name/sn/snx-rs/package.nix +++ b/pkgs/by-name/sn/snx-rs/package.nix @@ -15,13 +15,13 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "snx-rs"; - version = "5.0.5"; + version = "5.1.0"; src = fetchFromGitHub { owner = "ancwrd1"; repo = "snx-rs"; tag = "v${finalAttrs.version}"; - hash = "sha256-M0F5mJAVPWjT00jmgRC5rlWlN5Q5G5B63DETwJz0TfU="; + hash = "sha256-whmZM6OYdHtcTJzzR4aqDMBVpFuRvJKLFVGCQNDjRw8="; }; passthru.updateScript = nix-update-script { }; @@ -49,7 +49,7 @@ rustPlatform.buildRustPackage (finalAttrs: { versionCheckHook ]; - cargoHash = "sha256-zOKXs4bw1JF2uZN0qvID2lYtH4/d5hOihENFSeq9oe8="; + cargoHash = "sha256-gAOxwmsPo0XpFxNe3EObNlgiTJ0krMAlVaTDorrYUqg="; doInstallCheck = true; versionCheckProgram = "${placeholder "out"}/bin/snx-rs"; diff --git a/pkgs/by-name/so/socalabs-papu/package.nix b/pkgs/by-name/so/socalabs-papu/package.nix index b65f96418d21..62f974c1390d 100644 --- a/pkgs/by-name/so/socalabs-papu/package.nix +++ b/pkgs/by-name/so/socalabs-papu/package.nix @@ -7,6 +7,7 @@ alsa-lib, copyDesktopItems, makeDesktopItem, + imagemagick, libx11, libxcomposite, libxcursor, @@ -60,6 +61,7 @@ stdenv.mkDerivation (finalAttrs: { cmake pkg-config copyDesktopItems + imagemagick ninja ]; @@ -113,7 +115,8 @@ stdenv.mkDerivation (finalAttrs: { install -Dm555 PAPU_artefacts/Release/Standalone/PAPU $out/bin - install -Dm444 $src/plugin/Resources/icon.png $out/share/pixmaps/PAPU.png + mkdir -p $out/share/icons/hicolor/256x256/apps + magick $src/plugin/Resources/icon.png -resize 256x256 $out/share/icons/hicolor/256x256/apps/PAPU.png runHook postInstall ''; diff --git a/pkgs/by-name/so/socalabs-sid/package.nix b/pkgs/by-name/so/socalabs-sid/package.nix index 792b529a75b4..b25ab3d9cf24 100644 --- a/pkgs/by-name/so/socalabs-sid/package.nix +++ b/pkgs/by-name/so/socalabs-sid/package.nix @@ -7,6 +7,7 @@ alsa-lib, copyDesktopItems, makeDesktopItem, + imagemagick, libxtst, libxrandr, libxinerama, @@ -73,6 +74,7 @@ stdenv.mkDerivation { cmake pkg-config copyDesktopItems + imagemagick ninja ]; @@ -147,7 +149,8 @@ stdenv.mkDerivation { install -Dm755 SID_artefacts/Release/Standalone/SID $out/bin - install -Dm444 $src/plugin/Resources/icon.png $out/share/pixmaps/SID.png + mkdir -p $out/share/icons/hicolor/256x256/apps + magick $src/plugin/Resources/icon.png -resize 256x256 $out/share/icons/hicolor/256x256/apps/SID.png runHook postInstall ''; diff --git a/pkgs/by-name/so/sonobus/package.nix b/pkgs/by-name/so/sonobus/package.nix index 89c44f0326da..7ad0b14b6e66 100644 --- a/pkgs/by-name/so/sonobus/package.nix +++ b/pkgs/by-name/so/sonobus/package.nix @@ -97,7 +97,7 @@ stdenv.mkDerivation (finalAttrs: { cd ../linux ./install.sh "$out" - install -Dm444 $src/images/sonobus_logo_96.png $out/share/pixmaps/sonobus.png + install -Dm444 $src/images/sonobus_logo_96.png $out/share/icons/hicolor/96x96/apps/sonobus.png runHook postInstall ''; diff --git a/pkgs/by-name/sp/spaghettikart/package.nix b/pkgs/by-name/sp/spaghettikart/package.nix index 409e1758a667..b65b5372f7f5 100644 --- a/pkgs/by-name/sp/spaghettikart/package.nix +++ b/pkgs/by-name/sp/spaghettikart/package.nix @@ -252,7 +252,7 @@ stdenv.mkDerivation (finalAttrs: { cp -r ../yamls $out/share/spaghettikart/ cp -r ../meta $out/share/spaghettikart/ install -Dm644 -t $out/share/spaghettikart {spaghetti.o2r,config.yml,gamecontrollerdb.txt} - install -Dm644 ../icon.png $out/share/pixmaps/spaghettikart.png + install -Dm644 ../icon.png $out/share/icons/hicolor/256x256/apps/spaghettikart.png install -Dm644 -t $out/share/licenses/spaghettikart/libgfxd ${libgfxd}/LICENSE install -Dm644 -t $out/share/licenses/spaghettikart/libultraship ../libultraship/LICENSE install -Dm644 -t $out/share/licenses/spaghettikart/thread_pool ${thread_pool}/LICENSE.txt diff --git a/pkgs/by-name/sq/sqlcl/package.nix b/pkgs/by-name/sq/sqlcl/package.nix index 6a0b3aebb078..5d4019cfd3b6 100644 --- a/pkgs/by-name/sq/sqlcl/package.nix +++ b/pkgs/by-name/sq/sqlcl/package.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "sqlcl"; - version = "25.4.1.022.0618"; + version = "25.4.2.044.1837"; src = fetchurl { url = "https://download.oracle.com/otn_software/java/sqldeveloper/sqlcl-${finalAttrs.version}.zip"; - hash = "sha256-txfYOqGnraLKOOfIvls2nqai+fUMX9tV4Y0mO0ceyrk="; + hash = "sha256-VHLCJZWSGEJVih1hyCLmv94YoWgEPNdKoVvHDCgDpQw="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/st/stoat-desktop/package.nix b/pkgs/by-name/st/stoat-desktop/package.nix index 7fafd0cf3132..2d4a06437c51 100644 --- a/pkgs/by-name/st/stoat-desktop/package.nix +++ b/pkgs/by-name/st/stoat-desktop/package.nix @@ -1,72 +1,136 @@ { - stdenvNoCC, lib, - asar, - fetchurl, - fetchzip, + stdenvNoCC, + fetchFromGitHub, + fetchPnpmDeps, makeDesktopItem, - copyDesktopItems, + desktopToDarwinBundle, + pnpmConfigHook, makeWrapper, - electron, + removeReferencesTo, + copyDesktopItems, + pnpm_10, + nodejs, + electron_38, + zip, }: - -stdenvNoCC.mkDerivation rec { +let + electron = electron_38; + stdenv = stdenvNoCC; +in +stdenv.mkDerivation (finalAttrs: { pname = "stoat-desktop"; - version = "1.1.12"; + version = "1.2.0"; - src = fetchzip { - url = "https://github.com/stoatchat/for-desktop/releases/download/v${version}/Stoat-linux-x64-${version}.zip"; - hash = "sha256-S3uJ4ADzDgrpKVxBdEpz73Q6bqOakzk9bObaoRZopbM="; - stripRoot = false; + src = fetchFromGitHub { + owner = "stoatchat"; + repo = "for-desktop"; + tag = "v${finalAttrs.version}"; + fetchSubmodules = true; + hash = "sha256-Q1FKQBxtlrGmdfx7gLd0aQx/5Pqd4atFdMykxK997Rw="; }; - dontConfigure = true; - dontBuild = true; + postPatch = '' + # Disable auto-updates + substituteInPlace src/main.ts \ + --replace-fail "updateElectronApp();" "" + ''; + + strictDeps = true; + __structuredAttrs = true; + doCheck = true; nativeBuildInputs = [ - copyDesktopItems + pnpmConfigHook + removeReferencesTo makeWrapper - asar + copyDesktopItems + nodejs + pnpm_10 + zip + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + desktopToDarwinBundle ]; - installPhase = '' - runHook preInstall - set -euo pipefail + pnpmDeps = fetchPnpmDeps { + inherit (finalAttrs) pname version src; + fetcherVersion = 3; + pnpm = pnpm_10; + hash = "sha256-m0EuM8qTCFLxxO0RNze5WgMkuHZXeIi+U/Jiuv91eCg="; + }; - mkdir -p "$out/bin" "$out/share/applications" "$out/share/stoat-desktop" + env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; - asarPath="$(find "$src" -type f -path '*/resources/app.asar' -print -quit || true)" - if [ -z "$asarPath" ]; then - echo "ERROR: could not find resources/app.asar in $src" >&2 - exit 1 - fi + buildPhase = '' + runHook preBuild - resDir="$(dirname "$asarPath")" - appDir="$(dirname "$resDir")" + export npm_config_nodedir=${electron.headers} - cp -a "$resDir" "$out/share/stoat-desktop/resources" - if [ -d "$appDir/locales" ]; then - cp -a "$appDir/locales" "$out/share/stoat-desktop/locales" - fi + # override the detected electron version + substituteInPlace node_modules/@electron-forge/core-utils/dist/electron-version.js \ + --replace-fail "return version" "return '${electron.version}'" - mkdir -p "$out/share/icons/hicolor/scalable/apps" - install -m644 ${ - fetchurl { - url = "https://raw.githubusercontent.com/stoatchat/assets/628eb2f8255c215148007f4227d2e0d5d1a67582/desktop/icon.svg"; - hash = "sha256-EMDwnAtfTZqhw8hMGTbMjZUrnVkP+2HkyHlSy6pZmik="; - } - } "$out/share/icons/hicolor/scalable/apps/stoat-desktop.svg" + # create the electron archive to be used by electron-packager + cp -r ${electron.dist} electron-dist + chmod -R u+w electron-dist - runHook postInstall + pushd electron-dist + zip -0Xqr ../electron.zip . + popd + + rm -r electron-dist + + # force @electron/packager to use our electron instead of downloading it + substituteInPlace node_modules/@electron/packager/dist/packager.js \ + --replace-fail "await this.getElectronZipPath(downloadOpts)" "'$(pwd)/electron.zip'" + + + pnpm make \ + --arch "${stdenv.hostPlatform.node.arch}" \ + --platform "${stdenv.hostPlatform.node.platform}" \ + --targets "@electron-forge/maker-zip" + + runHook postBuild ''; + installPhase = lib.concatStringsSep "\n" [ + "runHook preInstall" + # Make freedesktop stuff, then the convert hook should make them for Darwin + '' + install -Dm444 "assets/desktop/icon.svg" "$out/share/icons/hicolor/scalable/apps/stoat-desktop.svg" + '' + (lib.optionalString stdenv.hostPlatform.isLinux '' + # remove references to nodejs + find out/*/resources/app/node_modules -type f -executable -exec remove-references-to -t ${nodejs} '{}' \; + + mkdir -p "$out/share/stoat-desktop" + cp -r out/*/resources{,.pak} "$out/share/stoat-desktop" + + makeWrapper ${lib.getExe electron} "$out/bin/stoat-desktop" \ + --add-flag $out/share/stoat-desktop/resources/app.asar \ + --set ELECTRON_FORCE_IS_PACKAGED 1 \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \ + --inherit-argv0 + '') + (lib.optionalString stdenv.hostPlatform.isDarwin '' + mkdir -p "$out/Applications" + cp -r out/*/Stoat.app + + makeWrapper "$out/Applications/Stoat.app/Contents/MacOS/stoat-desktop" "$out/bin/stoat-desktop" \ + --set ELECTRON_FORCE_IS_PACKAGED 1 \ + --inherit-argv0 + '') + "runHook postInstall" + ]; + desktopItems = [ (makeDesktopItem { name = "Stoat"; - exec = "stoat-desktop %u"; - icon = "stoat-desktop"; + exec = "${finalAttrs.meta.mainProgram} %u"; + icon = "${finalAttrs.meta.mainProgram}"; desktopName = "Stoat"; - genericName = meta.description; + genericName = "Chat Client"; categories = [ "Network" "Chat" @@ -76,24 +140,18 @@ stdenvNoCC.mkDerivation rec { }) ]; - postFixup = '' - makeWrapper ${electron}/bin/electron "$out/bin/stoat-desktop" \ - --add-flags "$out/share/stoat-desktop/resources/app.asar" \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" - ''; - meta = { description = "Open source user-first chat platform"; homepage = "https://stoat.chat/"; - changelog = "https://github.com/stoatchat/for-desktop/releases/tag/v${version}"; + changelog = "https://github.com/stoatchat/for-desktop/releases/tag/v${finalAttrs.version}"; license = lib.licenses.agpl3Only; maintainers = with lib.maintainers; [ heyimnova magistau v3rm1n0 + RossSmyth ]; - platforms = lib.platforms.linux; - sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + platforms = with lib.platforms; linux ++ darwin; mainProgram = "stoat-desktop"; }; -} +}) diff --git a/pkgs/by-name/sy/systemd-manager-tui/package.nix b/pkgs/by-name/sy/systemd-manager-tui/package.nix index 97b94ad871dd..041348f7afe0 100644 --- a/pkgs/by-name/sy/systemd-manager-tui/package.nix +++ b/pkgs/by-name/sy/systemd-manager-tui/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "systemd-manager-tui"; - version = "1.2.0"; + version = "1.2.2"; src = fetchFromGitHub { owner = "Matheus-git"; repo = "systemd-manager-tui"; tag = "v${finalAttrs.version}"; - hash = "sha256-/KtvQBye5Z7xfCO57YhM/s+XOAT4ZIBU6Ycu398haXw="; + hash = "sha256-hPsHsa4eY7kOxKj9YiDK3uQyVOp2/JcR53ygFZXrkO4="; }; - cargoHash = "sha256-g6ES+A73E6k/TPw73azeYXj5R91Y98Im1enYKDqKTVk="; + cargoHash = "sha256-/8QN/QU6Ayx8FAI4bwaWqOoL9fYIT5m65908zXpm3gk="; meta = { homepage = "https://github.com/Matheus-git/systemd-manager-tui"; diff --git a/pkgs/by-name/te/teeworlds/package.nix b/pkgs/by-name/te/teeworlds/package.nix index 4f69c4f9f014..6808477dbf63 100644 --- a/pkgs/by-name/te/teeworlds/package.nix +++ b/pkgs/by-name/te/teeworlds/package.nix @@ -101,8 +101,8 @@ stdenv.mkDerivation (finalAttrs: { postInstall = lib.optionalString buildClient ( lib.optionalString stdenv.hostPlatform.isLinux '' # Convert and install desktop icon - mkdir -p $out/share/pixmaps - icotool --extract --index 1 --output $out/share/pixmaps/teeworlds.png $src/other/icons/teeworlds.ico + mkdir -p $out/share/icons/hicolor/256x256/apps + icotool --extract --index 1 --output $out/share/icons/hicolor/256x256/apps/teeworlds.png $src/other/icons/teeworlds.ico # Install menu item install -D $src/other/teeworlds.desktop $out/share/applications/teeworlds.desktop diff --git a/pkgs/by-name/te/termius/package.nix b/pkgs/by-name/te/termius/package.nix index 3986fca47b99..185ef5e7660c 100644 --- a/pkgs/by-name/te/termius/package.nix +++ b/pkgs/by-name/te/termius/package.nix @@ -73,9 +73,9 @@ stdenv.mkDerivation rec { mkdir -p $out/opt/termius cp -r ./ $out/opt/termius - mkdir -p "$out/share/applications" "$out/share/pixmaps" + mkdir -p $out/share/applications cp "${desktopItem}/share/applications/"* "$out/share/applications" - cp meta/gui/icon.png $out/share/pixmaps/termius-app.png + install -Dm644 meta/gui/icon.png $out/share/icons/hicolor/1024x1024/termius-app.png runHook postInstall ''; diff --git a/pkgs/by-name/th/threema-desktop/package.nix b/pkgs/by-name/th/threema-desktop/package.nix index b8862855da58..9045cf2ef85a 100644 --- a/pkgs/by-name/th/threema-desktop/package.nix +++ b/pkgs/by-name/th/threema-desktop/package.nix @@ -111,8 +111,7 @@ buildNpmPackage rec { ln -s $out/opt/threema/$dir $out/opt/threema/dist/src/$dir done - mkdir -p $out/share/pixmaps - cp $out/opt/threema/assets/icons/svg/consumer.svg $out/share/pixmaps/threema.svg + install -Dm644 $out/opt/threema/assets/icons/svg/consumer.svg $out/share/icons/hicolor/scalable/threema.svg makeWrapper ${electron}/bin/electron $out/bin/threema \ --add-flags $out/opt/threema/dist/src/main.js diff --git a/pkgs/by-name/ti/tiny-rdm/package.nix b/pkgs/by-name/ti/tiny-rdm/package.nix index 19b2a16717f8..8079762886d8 100644 --- a/pkgs/by-name/ti/tiny-rdm/package.nix +++ b/pkgs/by-name/ti/tiny-rdm/package.nix @@ -3,6 +3,7 @@ buildGoModule, fetchFromGitHub, fetchNpmDeps, + imagemagick, npmHooks, nodejs, wails, @@ -48,6 +49,7 @@ buildGoModule (finalAttrs: { nodejs npmHooks.npmConfigHook copyDesktopItems + imagemagick ]; buildInputs = [ webkitgtk_4_1 ]; @@ -79,7 +81,8 @@ buildGoModule (finalAttrs: { runHook preInstall install -Dm 0755 build/bin/tiny-rdm $out/bin/tiny-rdm - install -Dm 0644 frontend/src/assets/images/icon.png $out/share/pixmaps/tiny-rdm.png + mkdir -p $out/share/icons/hicolor/96x96/apps + magick frontend/src/assets/images/icon.png -resize 96x96 $out/share/icons/hicolor/96x96/apps/tiny-rdm.png runHook postInstall ''; diff --git a/pkgs/by-name/to/todoist-electron/package.nix b/pkgs/by-name/to/todoist-electron/package.nix index 9edcaebe2efe..f0fd3a508b8a 100644 --- a/pkgs/by-name/to/todoist-electron/package.nix +++ b/pkgs/by-name/to/todoist-electron/package.nix @@ -37,7 +37,7 @@ appimageTools.wrapAppImage { # Add desktop convencience stuff extraInstallCommands = '' install -D --mode 0644 ${appimageContents}/todoist.desktop -t $out/share/applications - install -D --mode 0644 ${appimageContents}/todoist.png -t $out/share/pixmaps + install -D --mode 0644 ${appimageContents}/todoist.png -t $out/share/icons/hicolor/512x512/apps substituteInPlace $out/share/applications/todoist.desktop \ --replace-fail "Exec=AppRun" "Exec=todoist-electron --" \ --replace-fail "Exec=todoist" "Exec=todoist-electron --" diff --git a/pkgs/by-name/to/tokstat/package.nix b/pkgs/by-name/to/tokstat/package.nix new file mode 100644 index 000000000000..4b6911afb78a --- /dev/null +++ b/pkgs/by-name/to/tokstat/package.nix @@ -0,0 +1,56 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + pkg-config, + installShellFiles, + openssl, + dbus, + stdenv, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "tokstat"; + version = "0.5.0"; + + src = fetchFromGitHub { + owner = "pbek"; + repo = "tokstat"; + tag = "v${finalAttrs.version}"; + hash = "sha256-J144les0gxAFt34+r2hcikIyLKm+A1p8zNg+FljZ41o="; + }; + + cargoHash = "sha256-llS2UrJ9B+JSNkBUYioEEbe36lGgIr3ifjBXgPhTRnE="; + + nativeBuildInputs = [ + pkg-config + installShellFiles + ]; + + buildInputs = [ + openssl + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + dbus + ]; + + # For keyring support + PKG_CONFIG_PATH = lib.optionalString stdenv.hostPlatform.isLinux "${dbus.dev}/lib/pkgconfig"; + + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + # Generate shell completions + installShellCompletion --cmd tokstat \ + --bash <($out/bin/tokstat --generate bash 2>/dev/null) \ + --fish <($out/bin/tokstat --generate fish 2>/dev/null) \ + --zsh <($out/bin/tokstat --generate zsh 2>/dev/null) + ''; + + meta = { + description = "CLI application to monitor token quotas across multiple AI providers"; + homepage = "https://github.com/pbek/tokstat"; + changelog = "https://github.com/pbek/tokstat/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ pbek ]; + mainProgram = "tokstat"; + }; +}) diff --git a/pkgs/by-name/to/torcs/package.nix b/pkgs/by-name/to/torcs/package.nix index e35e35932e0b..9ab747770b84 100644 --- a/pkgs/by-name/to/torcs/package.nix +++ b/pkgs/by-name/to/torcs/package.nix @@ -1,4 +1,5 @@ { + imagemagick, stdenv, symlinkJoin, torcs-without-data, @@ -20,7 +21,11 @@ let installTargets = "export datainstall"; postInstall = '' - install -D -m644 Ticon.png $out/share/pixmaps/torcs.png + mkdir -p $out/share/icons/hicolor/64x64/apps + ${imagemagick}/bin/magick Ticon.png -resize 64x64 $out/share/icons/hicolor/64x64/apps/torcs.png + + substituteInPlace torcs.desktop \ + --replace-fail "Icon=torcs.png" "Icon=torcs" install -D -m644 torcs.desktop $out/share/applications/torcs.desktop ''; diff --git a/pkgs/by-name/to/tortoisehg/package.nix b/pkgs/by-name/to/tortoisehg/package.nix index e44d4d6fdda8..23781b426af6 100644 --- a/pkgs/by-name/to/tortoisehg/package.nix +++ b/pkgs/by-name/to/tortoisehg/package.nix @@ -76,7 +76,6 @@ python3Packages.buildPythonApplication { license = lib.licenses.gpl2Only; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ - danbst gbtb ]; }; diff --git a/pkgs/by-name/tr/transito/package.nix b/pkgs/by-name/tr/transito/package.nix index 1d546087b41e..db5d3856d771 100644 --- a/pkgs/by-name/tr/transito/package.nix +++ b/pkgs/by-name/tr/transito/package.nix @@ -45,11 +45,9 @@ buildGoModule (finalAttrs: { postInstall = '' install -Dm644 -t $out/share/applications assets/transito.desktop - install -Dm644 -t $out/share/pixmaps assets/transito.png - for icon in assets/transito_*.png - do + for icon in assets/transito_*.png; do name=$(basename $icon .png) - install -Dm644 -t $out/share/icons/hicolor/''${name#transito_}/apps $icon + install -Dm644 $icon $out/share/icons/hicolor/''${name#transito_}/apps/transito.png done ''; diff --git a/pkgs/by-name/tr/trigger/package.nix b/pkgs/by-name/tr/trigger/package.nix index 8ea93fcdd54e..25d93bfef1fb 100644 --- a/pkgs/by-name/tr/trigger/package.nix +++ b/pkgs/by-name/tr/trigger/package.nix @@ -64,8 +64,7 @@ stdenv.mkDerivation (finalAttrs: { EOF chmod +x $out/bin/trigger-rally - mkdir -p $out/share/pixmaps/ - ln -s $out/share/games/trigger-rally/icon/trigger-rally-icons.svg $out/share/pixmaps/trigger.svg + install -Dm644 $out/share/games/trigger-rally/icon/trigger-rally-icons.svg $out/share/icons/hicolor/scalable/trigger.svg ''; desktopItems = [ diff --git a/pkgs/by-name/tw/twilio-cli/package.nix b/pkgs/by-name/tw/twilio-cli/package.nix index ba0ebb5cd323..c9b0f08576ac 100644 --- a/pkgs/by-name/tw/twilio-cli/package.nix +++ b/pkgs/by-name/tw/twilio-cli/package.nix @@ -8,11 +8,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "twilio-cli"; - version = "6.2.3"; + version = "6.2.4"; src = fetchzip { url = "https://twilio-cli-prod.s3.amazonaws.com/twilio-v${finalAttrs.version}/twilio-v${finalAttrs.version}.tar.gz"; - hash = "sha256-a5eTxtcC3cGZ+8MMMfE9UKrxAQ7pfivWMss4NMKbf9s="; + hash = "sha256-ty5KBMXOo8MHF++xTFDC5IK+zAhXKEJ4XRAF/HHjkX0="; }; buildInputs = [ nodejs-slim ]; diff --git a/pkgs/by-name/un/unpoller/package.nix b/pkgs/by-name/un/unpoller/package.nix index c020617af2ad..22e23deead1f 100644 --- a/pkgs/by-name/un/unpoller/package.nix +++ b/pkgs/by-name/un/unpoller/package.nix @@ -7,16 +7,16 @@ buildGoModule (finalAttrs: { pname = "unpoller"; - version = "2.33.0"; + version = "2.34.0"; src = fetchFromGitHub { owner = "unpoller"; repo = "unpoller"; rev = "v${finalAttrs.version}"; - hash = "sha256-RPhM1oAQhwyNr4CjtxhrhVxw5NfO0lzOq3kx2OqzlwY="; + hash = "sha256-zsWPXO0JgzMJwCvpWA/UzyXyrNJL2wFDstrVKeAZvPo="; }; - vendorHash = "sha256-Z7Wb4nQMPr3og0wWWJp3jU8lTR6hhxMz7XENkanIgQg="; + vendorHash = "sha256-yh2ErDf3YMvA+y52LfdB8u+uR/tW29h35UGB9r5bh8E="; ldflags = [ "-w" diff --git a/pkgs/by-name/uv/uv/package.nix b/pkgs/by-name/uv/uv/package.nix index 2403de4fca48..68045d93623f 100644 --- a/pkgs/by-name/uv/uv/package.nix +++ b/pkgs/by-name/uv/uv/package.nix @@ -18,16 +18,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "uv"; - version = "0.10.2"; + version = "0.10.4"; src = fetchFromGitHub { owner = "astral-sh"; repo = "uv"; tag = finalAttrs.version; - hash = "sha256-7huzemS9BLCOmfzr2cSd8Tc4PtTJV0peYQ5FN2VaPKw="; + hash = "sha256-+6u8rmTLwZlEvbnF7Ng/06uYcs6HJGAEyOhEwzYVHVE="; }; - cargoHash = "sha256-kSpRcliQpCCjpZUSCwd9THszOSmdXDIooJA4ZPtRjvo="; + cargoHash = "sha256-jpaOD98n0FBnYzexDiLhtHLRLmzSOZN38KKzcc+o5WQ="; buildInputs = [ rust-jemalloc-sys diff --git a/pkgs/by-name/vo/voxinput/package.nix b/pkgs/by-name/vo/voxinput/package.nix index 02f324c509fe..c8c74a36c71c 100644 --- a/pkgs/by-name/vo/voxinput/package.nix +++ b/pkgs/by-name/vo/voxinput/package.nix @@ -22,16 +22,16 @@ buildGoModule (finalAttrs: { pname = "voxinput"; - version = "0.9.0"; + version = "1.0.0"; src = fetchFromGitHub { owner = "richiejp"; repo = "VoxInput"; tag = "v${finalAttrs.version}"; - hash = "sha256-0fdzL8J84XNpriuIUfMUzYpopyDqNMwCYAlzw68pMN4="; + hash = "sha256-Zb3tz8YuS2VJWXbr8+yBuL89vlDXadFowSzWuZ5a0WI="; }; - vendorHash = "sha256-Ngb5fXHeQLDhCFHICH7Uj57GOQcMPxF2eIJaDIhl7S0="; + vendorHash = "sha256-NMuHvhN1A6TQ18Z1H8k8Sy7Py9744Xv95MZz0QvExQY="; nativeBuildInputs = [ makeWrapper diff --git a/pkgs/by-name/wa/wasm-tools/package.nix b/pkgs/by-name/wa/wasm-tools/package.nix index 37ed34f5bf70..124a474ab3ab 100644 --- a/pkgs/by-name/wa/wasm-tools/package.nix +++ b/pkgs/by-name/wa/wasm-tools/package.nix @@ -6,20 +6,20 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "wasm-tools"; - version = "1.245.0"; + version = "1.245.1"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = "wasm-tools"; tag = "v${finalAttrs.version}"; - hash = "sha256-hGWKDy84Ok7uwzuMA2lg+Osd9JomMUXqInVSl4j+C94="; + hash = "sha256-0x3RcGd8OB/XNvKnHihvc0DOnCqB3gxTQAxLK7HIWMI="; fetchSubmodules = true; }; # Disable cargo-auditable until https://github.com/rust-secure-code/cargo-auditable/issues/124 is solved. auditable = false; - cargoHash = "sha256-K7b6Ine3/reAjQc6WwWXWHK2gR74u8MaY4rE0jDjFVs="; + cargoHash = "sha256-5CIKmfa/hqR1Ge7reiTzyx0D4JMjBsxg2xqxzzZxl4s="; cargoBuildFlags = [ "--package" "wasm-tools" diff --git a/pkgs/by-name/we/weasis/package.nix b/pkgs/by-name/we/weasis/package.nix index 99dc623a9753..664e45982fba 100644 --- a/pkgs/by-name/we/weasis/package.nix +++ b/pkgs/by-name/we/weasis/package.nix @@ -81,10 +81,10 @@ stdenv.mkDerivation (finalAttrs: { runHook preInstall '' + lib.optionalString stdenv.isLinux '' - mkdir -p $out/{bin,opt/Weasis,share/{applications,pixmaps}} + mkdir -p $out/{bin,opt/Weasis,share/{applications,icons/hicolor/64x64/apps}} mv weasis-${platform}-jdk${lib.versions.major jdk25.version}-${finalAttrs.version}/Weasis/* $out/opt/Weasis - mv $out/opt/Weasis/lib/*.png $out/share/pixmaps/ + mv $out/opt/Weasis/lib/*.png $out/share/icons/hicolor/64x64/apps for bin in $out/opt/Weasis/bin/*; do makeWrapper $bin $out/bin/$(basename $bin) \ diff --git a/pkgs/by-name/wh/whatsapp-electron/package.nix b/pkgs/by-name/wh/whatsapp-electron/package.nix index 53bf250488d3..d06527c789ba 100644 --- a/pkgs/by-name/wh/whatsapp-electron/package.nix +++ b/pkgs/by-name/wh/whatsapp-electron/package.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation (finalAttrs: { mkdir -p "$out/share/whatsapp-electron" cp -r dist/*-unpacked/{locales,resources{,.pak}} "$out/share/whatsapp-electron" - install -D assets/whatsapp-icon-512x512.png $out/share/pixmaps/whatsapp.png + install -D assets/whatsapp-icon-512x512.png $out/share/icons/hicolor/512x512/apps/whatsapp.png install -D assets/whatsapp-icon-512x512.svg $out/share/icons/hicolor/scalable/apps/whatsapp.svg runHook postInstall ''; diff --git a/pkgs/by-name/wi/windsend-rs/package.nix b/pkgs/by-name/wi/windsend-rs/package.nix index b8ff0967ad3a..a6698fd64774 100644 --- a/pkgs/by-name/wi/windsend-rs/package.nix +++ b/pkgs/by-name/wi/windsend-rs/package.nix @@ -11,6 +11,7 @@ xdotool, makeDesktopItem, libayatana-appindicator, + imagemagick, nix-update-script, }: @@ -32,6 +33,7 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeBuildInputs = [ copyDesktopItems pkg-config + imagemagick ]; buildInputs = [ @@ -52,7 +54,8 @@ rustPlatform.buildRustPackage (finalAttrs: { ]; postInstall = '' - install -Dm644 icon-192.png $out/share/pixmaps/windsend-rs.png + mkdir -p $out/share/icons/hicolor/128x128/apps + magick icon-192.png -resize 128x128 $out/share/icons/hicolor/128x128/apps/windsend-rs.png ''; postFixup = '' diff --git a/pkgs/by-name/wi/windsend/package.nix b/pkgs/by-name/wi/windsend/package.nix index e67a3beae31c..dc8ba2e404a9 100644 --- a/pkgs/by-name/wi/windsend/package.nix +++ b/pkgs/by-name/wi/windsend/package.nix @@ -35,7 +35,7 @@ flutter338.buildFlutterApplication rec { ]; postInstall = '' - install -Dm644 ../../app_icon/web/icon-512.png $out/share/pixmaps/windsend.png + install -Dm644 ../../app_icon/web/icon-512.png $out/share/icons/hicolor/512x512/apps/windsend.png ''; passthru.updateScript = ./update.sh; diff --git a/pkgs/by-name/wi/windterm/package.nix b/pkgs/by-name/wi/windterm/package.nix index e99250c70a85..9a9db4d4af50 100644 --- a/pkgs/by-name/wi/windterm/package.nix +++ b/pkgs/by-name/wi/windterm/package.nix @@ -73,13 +73,13 @@ stdenv.mkDerivation (finalAttrs: { installPhase = '' runHook preInstall - mkdir -p $out/app $out/share/applications $out/share/pixmaps $out/share/licenses/windterm + mkdir -p $out/app $out/share/applications $out/share/licenses/windterm cp --recursive --no-preserve=mode . $out/app/windterm cat > $out/app/windterm/profiles.config < 1.3.1 + (fetchpatch { + name = "0001-lomiri-notifications-Properly-include-lomiri-shell-api-includedirs.patch"; + url = "https://gitlab.com/ubports/development/core/lomiri-notifications/-/commit/b68e51db6df1ed2637692dbff704374ab4c53fa7.patch"; + hash = "sha256-GWGlKQgOEy7HgzgA6H2Dmp0tB5amVcb3lj4LDT9dJCE="; + }) + ]; + postPatch = '' substituteInPlace CMakeLists.txt \ --replace-fail "\''${CMAKE_INSTALL_LIBDIR}/qt5/qml" "\''${CMAKE_INSTALL_PREFIX}/${qtbase.qtQmlPrefix}" diff --git a/pkgs/desktops/lomiri/services/lomiri-content-hub/default.nix b/pkgs/desktops/lomiri/services/lomiri-content-hub/default.nix index e174ec60d954..36194fe15587 100644 --- a/pkgs/desktops/lomiri/services/lomiri-content-hub/default.nix +++ b/pkgs/desktops/lomiri/services/lomiri-content-hub/default.nix @@ -2,6 +2,7 @@ stdenv, lib, fetchFromGitLab, + fetchpatch, gitUpdater, nixosTests, testers, @@ -48,6 +49,15 @@ stdenv.mkDerivation (finalAttrs: { "examples" ]; + patches = [ + # Remove when version > 2.2.2 + (fetchpatch { + name = "0001-lomiri-content-hub-Properly-include-lomiri-api-includedirs.patch"; + url = "https://gitlab.com/ubports/development/core/lomiri-content-hub/-/commit/dab1854e5ec0a91fd28c9d84f06dcdd0af39518b.patch"; + hash = "sha256-aQB8kLL2ZkKUOvFoDQ9rottFsCSNJ66wUjUZxP+kr5k="; + }) + ]; + postPatch = '' substituteInPlace import/*/Content/CMakeLists.txt \ --replace-fail "\''${CMAKE_INSTALL_LIBDIR}/qt\''${QT_VERSION_MAJOR}/qml" "\''${CMAKE_INSTALL_PREFIX}/${qtbase.qtQmlPrefix}" diff --git a/pkgs/desktops/lomiri/services/lomiri-download-manager/default.nix b/pkgs/desktops/lomiri/services/lomiri-download-manager/default.nix index 85e05783d4fb..cd2dc035498a 100644 --- a/pkgs/desktops/lomiri/services/lomiri-download-manager/default.nix +++ b/pkgs/desktops/lomiri/services/lomiri-download-manager/default.nix @@ -2,6 +2,7 @@ stdenv, lib, fetchFromGitLab, + fetchpatch, gitUpdater, testers, boost, @@ -43,6 +44,15 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals withDocumentation [ "doc" ]; + patches = [ + # Remove when version > 0.3.0 + (fetchpatch { + name = "0001-lomiri-download-manager-Properly-include-lomiri-api-includedirs.patch"; + url = "https://gitlab.com/ubports/development/core/lomiri-download-manager/-/commit/b847aca92cea6f729b96f7a55f765ae4d9fbf741.patch"; + hash = "sha256-hx/b80P5nbonlP3B8ekjZjxUGV3Ofm/lai0RU1ak9Gs="; + }) + ]; + postPatch = '' # Substitute systemd's prefix in pkg-config call substituteInPlace CMakeLists.txt \ diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix index bee518b5a758..798be764047c 100644 --- a/pkgs/development/libraries/ncurses/default.nix +++ b/pkgs/development/libraries/ncurses/default.nix @@ -8,7 +8,11 @@ pkg-config, abiVersion ? "6", enableStatic ? stdenv.hostPlatform.isStatic, - withCxx ? !stdenv.hostPlatform.useAndroidPrebuilt, + # Disabled for static FreeBSD: libc++ headers come after C library headers, + # breaking C++ compilation. No current consumers need the C++ bindings. + withCxx ? + !stdenv.hostPlatform.useAndroidPrebuilt + && !(stdenv.hostPlatform.isFreeBSD && stdenv.hostPlatform.isStatic), mouseSupport ? false, gpm, withTermlib ? false, diff --git a/pkgs/development/python-modules/aioshutil/default.nix b/pkgs/development/python-modules/aioshutil/default.nix deleted file mode 100644 index 89943276b87b..000000000000 --- a/pkgs/development/python-modules/aioshutil/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchFromGitHub, - pytest-asyncio, - pytest-cov-stub, - pytestCheckHook, - setuptools-scm, -}: - -buildPythonPackage rec { - pname = "aioshutil"; - version = "1.6"; - pyproject = true; - - src = fetchFromGitHub { - owner = "kumaraditya303"; - repo = "aioshutil"; - tag = "v${version}"; - hash = "sha256-+8BpL9CVH0X/9H7vL4xuV5CdA3A10a2A1q4wt1x1sSM="; - }; - - build-system = [ setuptools-scm ]; - - nativeCheckInputs = [ - pytest-asyncio - pytest-cov-stub - pytestCheckHook - ]; - - pythonImportsCheck = [ "aioshutil" ]; - - meta = { - description = "Asynchronous version of function of shutil module"; - homepage = "https://github.com/kumaraditya303/aioshutil"; - changelog = "https://github.com/kumaraditya303/aioshutil/releases/tag/${src.tag}"; - license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ fab ]; - }; -} diff --git a/pkgs/development/python-modules/cohere/default.nix b/pkgs/development/python-modules/cohere/default.nix index 1c9530598bc3..bad029613fe8 100644 --- a/pkgs/development/python-modules/cohere/default.nix +++ b/pkgs/development/python-modules/cohere/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "cohere"; - version = "5.20.4"; + version = "5.20.5"; pyproject = true; src = fetchFromGitHub { owner = "cohere-ai"; repo = "cohere-python"; tag = version; - hash = "sha256-rIyiqlh8gnkHGJQs9EqNruVTvaScFwoEtF5YaEPzhXQ="; + hash = "sha256-eVifLH1IG3O4OlXWkKV6nS4UB1W5cbQPGkrxuz8IF7Q="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/cyvest/default.nix b/pkgs/development/python-modules/cyvest/default.nix index 839ab85198d1..fdd7759ac663 100644 --- a/pkgs/development/python-modules/cyvest/default.nix +++ b/pkgs/development/python-modules/cyvest/default.nix @@ -15,14 +15,14 @@ buildPythonPackage (finalAttrs: { pname = "cyvest"; - version = "5.2.1"; + version = "5.3.0"; pyproject = true; src = fetchFromGitHub { owner = "PakitoSec"; repo = "cyvest"; tag = "v${finalAttrs.version}"; - hash = "sha256-fYFYIcjbO9dyOFiuKU077T/88fo6A6nIr04kZgL8ta0="; + hash = "sha256-FoQxhQHV1VuLfCsi3eRtxhFhuiHOtRDQc8+bhln+MOQ="; }; pythonRelaxDeps = [ "pydantic" ]; diff --git a/pkgs/development/python-modules/dbt-common/default.nix b/pkgs/development/python-modules/dbt-common/default.nix index 1e1d0ee67d18..ef8b3b25c92c 100644 --- a/pkgs/development/python-modules/dbt-common/default.nix +++ b/pkgs/development/python-modules/dbt-common/default.nix @@ -30,14 +30,14 @@ buildPythonPackage rec { pname = "dbt-common"; - version = "1.37.2-unstable-2026-01-22"; + version = "1.37.2-unstable-2026-02-16"; pyproject = true; src = fetchFromGitHub { owner = "dbt-labs"; repo = "dbt-common"; - rev = "5b331b9c50ca5fee959a9e4fa9ecca964549930c"; # They don't tag releases - hash = "sha256-OF4zKmKVHa9SdiQ1WRLvNoqQd3FWCUr5hK9ZYls9EsY="; + rev = "db568b8aa2d7c081f36a144c379668dd65007803"; # They don't tag releases + hash = "sha256-FIc98xjdmEQ8QJQwvEktj7oT/hJwwqCg4agpR4gaZIc="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/docling-core/default.nix b/pkgs/development/python-modules/docling-core/default.nix index d50320e3f4d1..e19e098dcbde 100644 --- a/pkgs/development/python-modules/docling-core/default.nix +++ b/pkgs/development/python-modules/docling-core/default.nix @@ -64,6 +64,7 @@ buildPythonPackage (finalAttrs: { pythonRelaxDeps = [ "pillow" + "typer" ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/emulated-roku/default.nix b/pkgs/development/python-modules/emulated-roku/default.nix index 22933e51d6b2..0854add08ed6 100644 --- a/pkgs/development/python-modules/emulated-roku/default.nix +++ b/pkgs/development/python-modules/emulated-roku/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "emulated-roku"; - version = "0.4.0"; + version = "0.5.1"; pyproject = true; src = fetchFromGitHub { owner = "mindigmarton"; repo = "emulated_roku"; tag = version; - hash = "sha256-lPe0mXtl1IQx//IydnmddpV11CpOi/MKq9TUOAKuoeU="; + hash = "sha256-KwDEajkrEEgobORetM/rROMDLZvw9AJmmr1jmXAJJbk="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/functions-framework/default.nix b/pkgs/development/python-modules/functions-framework/default.nix index be1135a67db1..d80198bfd1ce 100644 --- a/pkgs/development/python-modules/functions-framework/default.nix +++ b/pkgs/development/python-modules/functions-framework/default.nix @@ -23,14 +23,14 @@ buildPythonPackage rec { pname = "functions-framework"; - version = "3.10.0"; + version = "3.10.1"; pyproject = true; src = fetchFromGitHub { owner = "GoogleCloudPlatform"; repo = "functions-framework-python"; tag = "v${version}"; - hash = "sha256-wH/6EOxdmEHq799MWcDyqdrgiurOHFFv7+cE9mWHhl0="; + hash = "sha256-CEH0PokH3lhyJl7OPIpJkaKZxAUp1fYVia89DtGoJ7k="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/iniparse/default.nix b/pkgs/development/python-modules/iniparse/default.nix index 18d922c90e48..36efa6761449 100644 --- a/pkgs/development/python-modules/iniparse/default.nix +++ b/pkgs/development/python-modules/iniparse/default.nix @@ -29,6 +29,6 @@ buildPythonPackage rec { description = "Accessing and Modifying INI files"; homepage = "https://github.com/candlepin/python-iniparse"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ danbst ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/parfive/default.nix b/pkgs/development/python-modules/parfive/default.nix index 5c2dbb3dab69..23c3cde1767d 100644 --- a/pkgs/development/python-modules/parfive/default.nix +++ b/pkgs/development/python-modules/parfive/default.nix @@ -23,21 +23,16 @@ buildPythonPackage (finalAttrs: { pname = "parfive"; - version = "2.2.0"; + version = "2.3.1"; pyproject = true; src = fetchFromGitHub { owner = "Cadair"; repo = "parfive"; tag = "v${finalAttrs.version}"; - hash = "sha256-DIjS2q/SOrnLspomLHk8ZJ+krdzMyQfbIpXxad30s1k="; + hash = "sha256-i9B860A27KDUJKlE/eQNiGVPEPvnmvmNqMjjdOeBcyY="; }; - patches = [ - # SyntaxError: 'return' in a 'finally' block - ./fix-python-3-14-compat.patch - ]; - build-system = [ setuptools-scm ]; dependencies = [ @@ -57,11 +52,17 @@ buildPythonPackage (finalAttrs: { pytestCheckHook ]; + pytestFlags = [ + # https://github.com/Cadair/parfive/issues/65 + "-Wignore::ResourceWarning" + ]; + disabledTests = [ # Requires network access "test_ftp" "test_ftp_pasv_command" "test_ftp_http" + "test_problematic_http_urls" # flaky comparison between runtime types "test_http_callback_fail" diff --git a/pkgs/development/python-modules/parfive/fix-python-3-14-compat.patch b/pkgs/development/python-modules/parfive/fix-python-3-14-compat.patch deleted file mode 100644 index c4be169bf6dd..000000000000 --- a/pkgs/development/python-modules/parfive/fix-python-3-14-compat.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/parfive/downloader.py b/parfive/downloader.py -index 7a4116b..370ea78 100644 ---- a/parfive/downloader.py -+++ b/parfive/downloader.py -@@ -317,8 +317,7 @@ class Downloader: - task.cancel() - dl_results = await asyncio.gather(*tasks, return_exceptions=True) - -- finally: -- return self._format_results(dl_results, main_pb) -+ return self._format_results(dl_results, main_pb) - - def _format_results(self, retvals, main_pb): - # Squash all nested lists into a single flat list diff --git a/pkgs/development/python-modules/psycopg/default.nix b/pkgs/development/python-modules/psycopg/default.nix index f877a8cd4e67..021393718212 100644 --- a/pkgs/development/python-modules/psycopg/default.nix +++ b/pkgs/development/python-modules/psycopg/default.nix @@ -32,14 +32,14 @@ let pname = "psycopg"; - version = "3.3.2"; + version = "3.3.3"; pyproject = true; src = fetchFromGitHub { owner = "psycopg"; repo = "psycopg"; tag = version; - hash = "sha256-ynzXQkTnCCkJK3EZrGHSpzgMeeX92U6+08m8QtNfAc4="; + hash = "sha256-hWiclfvimp6WldcDQPx7RFLx+XYRR9wPagAe0oZg7Pw="; }; patches = [ diff --git a/pkgs/development/python-modules/pyannote-metrics/default.nix b/pkgs/development/python-modules/pyannote-metrics/default.nix index 1a62250667d8..e4242aad2130 100644 --- a/pkgs/development/python-modules/pyannote-metrics/default.nix +++ b/pkgs/development/python-modules/pyannote-metrics/default.nix @@ -17,6 +17,7 @@ # undeclared cli dependencies docopt, tabulate, + typing-extensions, # tests pytestCheckHook, @@ -57,6 +58,8 @@ buildPythonPackage rec { # Imported in pyannote/metrics/cli.py docopt tabulate + # Imporrted in pyannote/metrics/types.py + typing-extensions ]; pythonImportsCheck = [ "pyannote.metrics" ]; diff --git a/pkgs/development/python-modules/spacy/default.nix b/pkgs/development/python-modules/spacy/default.nix index 3f13dfc9c48f..41fb2a9ecf06 100644 --- a/pkgs/development/python-modules/spacy/default.nix +++ b/pkgs/development/python-modules/spacy/default.nix @@ -45,7 +45,7 @@ callPackage, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "spacy"; version = "3.8.11"; pyproject = true; @@ -53,10 +53,15 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "explosion"; repo = "spaCy"; - tag = "release-v${version}"; + tag = "release-v${finalAttrs.version}"; hash = "sha256-pLn3fq6SDstkRIv+1fj1yEGTlAd1IAiVgRu25CnEV8E="; }; + postPatch = '' + substituteInPlace requirements.txt setup.cfg \ + --replace-fail typer-slim typer + ''; + build-system = [ cymem cython @@ -147,9 +152,9 @@ buildPythonPackage rec { meta = { description = "Industrial-strength Natural Language Processing (NLP)"; homepage = "https://github.com/explosion/spaCy"; - changelog = "https://github.com/explosion/spaCy/releases/tag/${src.tag}"; + changelog = "https://github.com/explosion/spaCy/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ sarahec ]; mainProgram = "spacy"; }; -} +}) diff --git a/pkgs/development/python-modules/sphinx-autoapi/default.nix b/pkgs/development/python-modules/sphinx-autoapi/default.nix index d1b8e9d288e6..5f52f0718c71 100644 --- a/pkgs/development/python-modules/sphinx-autoapi/default.nix +++ b/pkgs/development/python-modules/sphinx-autoapi/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "sphinx-autoapi"; - version = "3.6.1"; + version = "3.7.0"; pyproject = true; src = fetchFromGitHub { owner = "readthedocs"; repo = "sphinx-autoapi"; tag = "v${version}"; - hash = "sha256-dafrvrTl4bVBBaAhTCIPVrSA1pdNlbT5Rou3T//fmKQ="; + hash = "sha256-yUWjL+42wju0C+vlZrH30nqTNFCt57TPOZTuefNhaj0="; }; build-system = [ flit-core ]; diff --git a/pkgs/development/python-modules/torch/source/default.nix b/pkgs/development/python-modules/torch/source/default.nix index b7504df075d1..d78c4ddba654 100644 --- a/pkgs/development/python-modules/torch/source/default.nix +++ b/pkgs/development/python-modules/torch/source/default.nix @@ -277,7 +277,7 @@ let # From here on, `stdenv` shall be `stdenv'`. stdenv = stdenv'; in -buildPythonPackage.override { inherit stdenv; } rec { +buildPythonPackage.override { inherit stdenv; } (finalAttrs: { pname = "torch"; # Don't forget to update torch-bin to the same version. version = "2.9.1"; @@ -293,11 +293,13 @@ buildPythonPackage.override { inherit stdenv; } rec { src = callPackage ./src.nix { inherit - version fetchFromGitHub fetchFromGitLab runCommand ; + inherit (finalAttrs) + version + ; }; patches = [ @@ -420,35 +422,76 @@ buildPythonPackage.override { inherit stdenv; } rec { # causes possible redefinition of _FORTIFY_SOURCE hardeningDisable = [ "fortify3" ]; - BUILD_NAMEDTENSOR = setBool true; - BUILD_DOCS = setBool buildDocs; + env = { + BUILD_NAMEDTENSOR = setBool true; + BUILD_DOCS = setBool buildDocs; - # We only do an imports check, so do not build tests either. - BUILD_TEST = setBool false; + # We only do an imports check, so do not build tests either. + BUILD_TEST = setBool false; - # ninja hook doesn't automatically turn on ninja - # because pytorch setup.py is responsible for this - CMAKE_GENERATOR = "Ninja"; + # ninja hook doesn't automatically turn on ninja + # because pytorch setup.py is responsible for this + CMAKE_GENERATOR = "Ninja"; - # Unlike MKL, oneDNN (née MKLDNN) is FOSS, so we enable support for - # it by default. PyTorch currently uses its own vendored version - # of oneDNN through Intel iDeep. - USE_MKLDNN = setBool mklDnnSupport; - USE_MKLDNN_CBLAS = setBool mklDnnSupport; + # Unlike MKL, oneDNN (née MKLDNN) is FOSS, so we enable support for + # it by default. PyTorch currently uses its own vendored version + # of oneDNN through Intel iDeep. + USE_MKLDNN = setBool mklDnnSupport; + USE_MKLDNN_CBLAS = setBool mklDnnSupport; - # Avoid using pybind11 from git submodule - # Also avoids pytorch exporting the headers of pybind11 - USE_SYSTEM_PYBIND11 = true; + # Avoid using pybind11 from git submodule + # Also avoids pytorch exporting the headers of pybind11 + USE_SYSTEM_PYBIND11 = true; - # Multicore CPU convnet support - USE_NNPACK = 1; + # Multicore CPU convnet support + USE_NNPACK = 1; - # Explicitly enable MPS for Darwin - USE_MPS = setBool stdenv.hostPlatform.isDarwin; + # Explicitly enable MPS for Darwin + USE_MPS = setBool stdenv.hostPlatform.isDarwin; - # building torch.distributed on Darwin is disabled by default - # https://pytorch.org/docs/stable/distributed.html#torch.distributed.is_available - USE_DISTRIBUTED = setBool true; + # building torch.distributed on Darwin is disabled by default + # https://pytorch.org/docs/stable/distributed.html#torch.distributed.is_available + USE_DISTRIBUTED = setBool true; + + # Override the (weirdly) wrong version set by default. See + # https://github.com/NixOS/nixpkgs/pull/52437#issuecomment-449718038 + # https://github.com/pytorch/pytorch/blob/v1.0.0/setup.py#L267 + PYTORCH_BUILD_VERSION = finalAttrs.version; + PYTORCH_BUILD_NUMBER = 0; + + # In-tree builds of NCCL are not supported. + # Use NCCL when cudaSupport is enabled and nccl is available. + USE_NCCL = setBool useSystemNccl; + USE_SYSTEM_NCCL = finalAttrs.env.USE_NCCL; + USE_STATIC_NCCL = finalAttrs.env.USE_NCCL; + + # Set the correct Python library path, broken since + # https://github.com/pytorch/pytorch/commit/3d617333e + PYTHON_LIB_REL_PATH = "${placeholder "out"}/${python.sitePackages}"; + # disable warnings as errors as they break the build on every compiler + # bump, among other things. + # Also of interest: pytorch ignores CXXFLAGS uses CFLAGS for both C and C++: + # https://github.com/pytorch/pytorch/blob/v1.11.0/setup.py#L17 + NIX_CFLAGS_COMPILE = toString ( + [ + "-Wno-error" + ] + # fix build aarch64-linux build failure with GCC14 + ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [ + "-Wno-error=incompatible-pointer-types" + ] + ); + USE_VULKAN = setBool vulkanSupport; + } + // lib.optionalAttrs vulkanSupport { + VULKAN_SDK = shaderc.bin; + } + // lib.optionalAttrs rocmSupport { + AOTRITON_INSTALLED_PREFIX = "${rocmPackages.aotriton}"; + # Broken HIP flag setup, fails to compile due to not finding rocthrust + # Only supports gfx942 so let's turn it off for now + USE_FBGEMM_GENAI = setBool false; + }; cmakeFlags = [ (lib.cmakeFeature "PYTHON_SIX_SOURCE_DIR" "${six.src}") @@ -482,48 +525,6 @@ buildPythonPackage.override { inherit stdenv; } rec { done ''; - # Override the (weirdly) wrong version set by default. See - # https://github.com/NixOS/nixpkgs/pull/52437#issuecomment-449718038 - # https://github.com/pytorch/pytorch/blob/v1.0.0/setup.py#L267 - PYTORCH_BUILD_VERSION = version; - PYTORCH_BUILD_NUMBER = 0; - - # In-tree builds of NCCL are not supported. - # Use NCCL when cudaSupport is enabled and nccl is available. - USE_NCCL = setBool useSystemNccl; - USE_SYSTEM_NCCL = USE_NCCL; - USE_STATIC_NCCL = USE_NCCL; - - # Set the correct Python library path, broken since - # https://github.com/pytorch/pytorch/commit/3d617333e - PYTHON_LIB_REL_PATH = "${placeholder "out"}/${python.sitePackages}"; - - env = { - # disable warnings as errors as they break the build on every compiler - # bump, among other things. - # Also of interest: pytorch ignores CXXFLAGS uses CFLAGS for both C and C++: - # https://github.com/pytorch/pytorch/blob/v1.11.0/setup.py#L17 - NIX_CFLAGS_COMPILE = toString ( - [ - "-Wno-error" - ] - # fix build aarch64-linux build failure with GCC14 - ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [ - "-Wno-error=incompatible-pointer-types" - ] - ); - USE_VULKAN = setBool vulkanSupport; - } - // lib.optionalAttrs vulkanSupport { - VULKAN_SDK = shaderc.bin; - } - // lib.optionalAttrs rocmSupport { - AOTRITON_INSTALLED_PREFIX = "${rocmPackages.aotriton}"; - # Broken HIP flag setup, fails to compile due to not finding rocthrust - # Only supports gfx942 so let's turn it off for now - USE_FBGEMM_GENAI = setBool false; - }; - nativeBuildInputs = [ cmake which @@ -650,7 +651,7 @@ buildPythonPackage.override { inherit stdenv; } rec { # ^^^^^^^^^^^^ NOTE: while test_dataloader does return errors, these are acceptable errors and do not interfere with the build # tensorboard has acceptable failures for pytorch 1.3.x due to dependencies on tensorboard-plugins - (optionalString (majorMinor version == "1.3") "tensorboard") + (optionalString (majorMinor finalAttrs.version == "1.3") "tensorboard") ]) "runHook postCheck" ]; @@ -692,7 +693,7 @@ buildPythonPackage.override { inherit stdenv; } rec { --replace-fail "\''${_IMPORT_PREFIX}/lib64" "$lib/lib" substituteInPlace $dev/share/cmake/ATen/ATenConfig.cmake \ - --replace-fail "/build/${src.name}/torch/include" "$dev/include" + --replace-fail "/build/${finalAttrs.src.name}/torch/include" "$dev/include" ''; postFixup = '' @@ -751,7 +752,7 @@ buildPythonPackage.override { inherit stdenv; } rec { }; meta = { - changelog = "https://github.com/pytorch/pytorch/releases/tag/v${version}"; + changelog = "https://github.com/pytorch/pytorch/releases/tag/v${finalAttrs.version}"; # keep PyTorch in the description so the package can be found under that name on search.nixos.org description = "PyTorch: Tensors and Dynamic neural networks in Python with strong GPU acceleration"; homepage = "https://pytorch.org/"; @@ -767,4 +768,4 @@ buildPythonPackage.override { inherit stdenv; } rec { lib.platforms.linux ++ lib.optionals (!cudaSupport && !rocmSupport) lib.platforms.darwin; broken = builtins.any trivial.id (builtins.attrValues brokenConditions); }; -} +}) diff --git a/pkgs/development/python-modules/types-aiobotocore/default.nix b/pkgs/development/python-modules/types-aiobotocore/default.nix index c4b1302c8216..9b9c22767be0 100644 --- a/pkgs/development/python-modules/types-aiobotocore/default.nix +++ b/pkgs/development/python-modules/types-aiobotocore/default.nix @@ -371,13 +371,13 @@ buildPythonPackage (finalAttrs: { pname = "types-aiobotocore"; - version = "3.1.2"; + version = "3.1.3"; pyproject = true; src = fetchPypi { pname = "types_aiobotocore"; inherit (finalAttrs) version; - hash = "sha256-gsGbtvpNcMymvv/MSa5fKJkMkXjtX9PvPIbWnwYu58I="; + hash = "sha256-4Zs7kdnaRsxftMCunlGm8C4WhgjbhMu8vCajxBnPOGo="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/uiprotect/default.nix b/pkgs/development/python-modules/uiprotect/default.nix index bfb7a1b1ecb2..37ef1c99419e 100644 --- a/pkgs/development/python-modules/uiprotect/default.nix +++ b/pkgs/development/python-modules/uiprotect/default.nix @@ -9,8 +9,6 @@ # dependencies aiofiles, aiohttp, - aioshutil, - async-timeout, av, convertertools, dateparser, @@ -52,11 +50,14 @@ buildPythonPackage (finalAttrs: { build-system = [ poetry-core ]; + pythonRemoveDeps = [ + "aioshutil" + "async-timeout" + ]; + dependencies = [ aiofiles aiohttp - aioshutil - async-timeout av convertertools dateparser diff --git a/pkgs/development/tools/pnpm/default.nix b/pkgs/development/tools/pnpm/default.nix index 7c108f91c9e3..161d304739e6 100644 --- a/pkgs/development/tools/pnpm/default.nix +++ b/pkgs/development/tools/pnpm/default.nix @@ -15,8 +15,8 @@ let hash = "sha256-z4anrXZEBjldQoam0J1zBxFyCsxtk+nc6ax6xNxKKKc="; }; "10" = { - version = "10.28.0"; - hash = "sha256-mwsE5ueZRVZpF/hBG7b2X9Lz4VkEJpBOhQDhrMSzNWE="; + version = "10.30.0"; + hash = "sha256-/ePOu9TtDW0UCxmDdDv1dc3UsV5NXlsldCUVLc5bG2o="; }; }; diff --git a/pkgs/servers/home-assistant/custom-components/fellow/package.nix b/pkgs/servers/home-assistant/custom-components/fellow/package.nix index 416bea768d9f..ef9db5551b64 100644 --- a/pkgs/servers/home-assistant/custom-components/fellow/package.nix +++ b/pkgs/servers/home-assistant/custom-components/fellow/package.nix @@ -10,13 +10,13 @@ buildHomeAssistantComponent rec { owner = "NewsGuyTor"; domain = "fellow"; - version = "1.2.1"; + version = "1.3.2"; src = fetchFromGitHub { owner = "NewsGuyTor"; repo = "FellowAiden-HomeAssistant"; tag = "v${version}"; - hash = "sha256-cGyGobR0lMNReWCxK7RzeqsnYJZQNRPjYqirLHjeCFI="; + hash = "sha256-qJizRqHcYQxcONke/++Hjh6yzHNCxfytvAJYXJWoHu8="; }; passthru.updateScript = unstableGitUpdater { }; diff --git a/pkgs/servers/home-assistant/custom-components/ha_mcp_tools/package.nix b/pkgs/servers/home-assistant/custom-components/ha_mcp_tools/package.nix index c5ed20e7c1ca..669438df7426 100644 --- a/pkgs/servers/home-assistant/custom-components/ha_mcp_tools/package.nix +++ b/pkgs/servers/home-assistant/custom-components/ha_mcp_tools/package.nix @@ -8,13 +8,13 @@ buildHomeAssistantComponent rec { owner = "homeassistant-ai"; domain = "ha_mcp_tools"; - version = "6.6.1"; + version = "6.7.0"; src = fetchFromGitHub { owner = "homeassistant-ai"; repo = "ha-mcp"; tag = "v${version}"; - hash = "sha256-yAJbvfIH5ewRTip8whbOKxE479qAihESaiLFTnhpRkY="; + hash = "sha256-zHa6wfRVmLfKrbAts5Fwe9rCCk57v1GoEIBxQaDAhm0="; }; passthru.updateScript = nix-update-script { diff --git a/pkgs/servers/home-assistant/custom-components/valetudo/package.nix b/pkgs/servers/home-assistant/custom-components/valetudo/package.nix index ec7076d543d4..d1b7e0717600 100644 --- a/pkgs/servers/home-assistant/custom-components/valetudo/package.nix +++ b/pkgs/servers/home-assistant/custom-components/valetudo/package.nix @@ -6,13 +6,13 @@ buildHomeAssistantComponent rec { owner = "Hypfer"; domain = "valetudo"; - version = "2025.12.0"; + version = "2026.01.1"; src = fetchFromGitHub { owner = "Hypfer"; repo = "hass-valetudo"; tag = "${version}"; - hash = "sha256-dHrN9Bbmm3J47MRmwExZH6Mi4RvRBZdQ4R1xeCewcSc="; + hash = "sha256-xJ8kA+ujWuen5660GWZSo90WsHpfwQVStIheaIRxAg8="; }; meta = { description = "Valetudo for Home Assistant"; diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-metricsdrilldown-app/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-metricsdrilldown-app/default.nix index c974d995696a..e4ff1e9545d0 100644 --- a/pkgs/servers/monitoring/grafana/plugins/grafana-metricsdrilldown-app/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/grafana-metricsdrilldown-app/default.nix @@ -2,8 +2,8 @@ grafanaPlugin { pname = "grafana-metricsdrilldown-app"; - version = "1.0.29"; - zipHash = "sha256-Z26GlIlk9RJze++VqqCwgcveewuXGAZhlOkXOp/pbKU="; + version = "1.0.31"; + zipHash = "sha256-DNWeFchied8MME9dZNp776RtGnzBe1iTZbFGWCKBWHM="; meta = { description = "Queryless experience for browsing Prometheus-compatible metrics. Quickly find related metrics without writing PromQL queries"; license = lib.licenses.agpl3Only; diff --git a/pkgs/servers/sql/postgresql/ext/pg_repack.nix b/pkgs/servers/sql/postgresql/ext/pg_repack.nix index d56ef90deba4..87850a7d20a6 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_repack.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_repack.nix @@ -45,7 +45,7 @@ postgresqlBuildExtension (finalAttrs: { ''; homepage = "https://github.com/reorg/pg_repack"; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ danbst ]; + maintainers = [ ]; inherit (postgresql.meta) platforms; mainProgram = "pg_repack"; }; diff --git a/pkgs/servers/sql/postgresql/ext/pg_search.nix b/pkgs/servers/sql/postgresql/ext/pg_search.nix new file mode 100644 index 000000000000..38cafe5e9e3a --- /dev/null +++ b/pkgs/servers/sql/postgresql/ext/pg_search.nix @@ -0,0 +1,110 @@ +{ + buildPgrxExtension, + cargo-pgrx_0_16_1, + fetchFromGitHub, + fetchurl, + lib, + nix-update-script, + pkg-config, + postgresql, + stdenv, +}: + +let + # https://github.com/paradedb/paradedb/blob/v0.21.8/Cargo.lock#L3316-L3346 + linderaVersion = "1.4.1"; + linderaWebsite = "https://lindera.dev"; + + # pg_search's tokenizer uses several language dictionaries used by the Lindera crate + dictionaries = { + # https://github.com/lindera/lindera/blob/v1.4.1/lindera-ko-dic/build.rs#L15-L22 + lindera-ko-dic = rec { + language = "Korean"; + filename = "mecab-ko-dic-2.1.1-20180720.tar.gz"; + source = fetchurl { + url = "${linderaWebsite}/${filename}"; + hash = "sha256-cCztIcYWfp2a68Z0q17lSvWNREOXXylA030FZ8AgWRo="; + }; + }; + + # https://github.com/lindera/lindera/blob/v1.4.1/lindera-cc-cedict/build.rs#L15-L22 + lindera-cc-cedict = rec { + language = "Chinese"; + filename = "CC-CEDICT-MeCab-0.1.0-20200409.tar.gz"; + source = fetchurl { + url = "${linderaWebsite}/${filename}"; + hash = "sha256-7Tz54+yKgGR/DseD3Ana1DuMytLplPXqtv8TpB0JFsg="; + }; + }; + + # https://github.com/lindera/lindera/blob/v1.4.1/lindera-ipadic/build.rs#L15-L22 + lindera-ipadic = rec { + language = "Japanese"; + filename = "mecab-ipadic-2.7.0-20250920.tar.gz"; + source = fetchurl { + url = "${linderaWebsite}/${filename}"; + hash = "sha256-p7qfZF/+cJTlauHEqB0QDfj7seKLvheSYi6XKOFi2z0="; + }; + }; + }; +in +buildPgrxExtension (finalAttrs: { + pname = "pg_search"; + version = "0.21.8"; + + src = fetchFromGitHub { + owner = "paradedb"; + repo = "paradedb"; + tag = "v${finalAttrs.version}"; + hash = "sha256-gvQOfyFU8SVtAJTGw0EuRatfDVZRqpv7WhIqYYZYbgc="; + }; + + cargoHash = "sha256-NRrDmswQ+oiVNeIbhfhDA7k4wOxotTLsOuT7WMewX6Y="; + + inherit postgresql; + + # Lindera dictionaries are copied to a temporary directory and the + # LINDERA_CACHE environment variable prevents the build.rs files in + # the Lindera crates from downloading their dictionary from an + # external URL, which doesn't work in the Nix sandbox + preConfigure = '' + export LINDERA_CACHE=$TMPDIR/lindera-cache + mkdir -p $LINDERA_CACHE/${linderaVersion} + + ${lib.concatMapStringsSep "\n" (dict: '' + echo "Copying ${dict.language} dictionary to Lindera cache" + cp ${dict.source} $LINDERA_CACHE/${linderaVersion}/${dict.filename} + '') (lib.attrValues dictionaries)} + + echo "Lindera cache prepared at $LINDERA_CACHE" + ''; + + # https://github.com/paradedb/paradedb/blob/v0.21.8/Cargo.toml#L38-L39 + cargo-pgrx = cargo-pgrx_0_16_1; + + # https://github.com/paradedb/paradedb/tree/v0.21.8/pg_search + cargoPgrxFlags = [ + "--package" + "pg_search" + ]; + + nativeBuildInputs = [ + pkg-config + ]; + + # pgrx tests try to install the extension into postgresql nix store + doCheck = false; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Transactional Elasticsearch alternative as a PostgreSQL extension"; + homepage = "https://paradedb.com"; + changelog = "https://github.com/paradedb/paradedb/releases/tag/${finalAttrs.version}"; + license = lib.licenses.agpl3Only; + maintainers = [ lib.maintainers.lucperkins ]; + # https://github.com/paradedb/paradedb/blob/v0.21.8/pg_search/Cargo.toml#L14-L18 + broken = lib.versionOlder postgresql.version "14"; + platforms = postgresql.meta.platforms; + }; +}) diff --git a/pkgs/servers/sql/postgresql/ext/pg_similarity.nix b/pkgs/servers/sql/postgresql/ext/pg_similarity.nix index 4b2b2266e65f..6caa133c36b1 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_similarity.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_similarity.nix @@ -38,6 +38,6 @@ postgresqlBuildExtension { ''; platforms = postgresql.meta.platforms; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ danbst ]; + maintainers = [ ]; }; } diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 071c5217e4d9..bb1f0fb861c8 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -78,6 +78,7 @@ mapAliases { abodepy = throw "'abodepy' has been renamed to/replaced by 'jaraco-abode'"; # Converted to throw 2025-10-29 aioinflux = throw "'aioinflux' was removed because it is abandonned upstream. For InfluxDB v2+ support, please use the official Python client library"; # Added 2026-01-15 aiosenz = throw "aiosenz was removed because Home Assistant switched to pysenz"; # added 2025-12-29 + aioshutil = throw "'aioshutil' was removed because uiprotect no longer depends on it"; # added 2026-02-16 amazon-kclpy = throw "amazon-kclpy has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-03 amazon_kclpy = throw "'amazon_kclpy' has been renamed to/replaced by 'amazon-kclpy'"; # Converted to throw 2025-10-29 amqplib = throw "amqplib has been removed as it was unmaintained upstream"; # Added 2025-11-22 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 874096bd07fe..aac72bf66f60 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -494,8 +494,6 @@ self: super: with self; { aioshelly = callPackage ../development/python-modules/aioshelly { }; - aioshutil = callPackage ../development/python-modules/aioshutil { }; - aiosignal = callPackage ../development/python-modules/aiosignal { }; aioskybell = callPackage ../development/python-modules/aioskybell { };