diff --git a/lib/systems/parse.nix b/lib/systems/parse.nix index 6cec1a7229a2..cc787df92085 100644 --- a/lib/systems/parse.nix +++ b/lib/systems/parse.nix @@ -977,7 +977,7 @@ rec { # This is a function from parsed platforms (like stdenv.hostPlatform.parsed) # to parsed platforms. - makeMuslParsedPlatform = + mkMuslSystem = parsed: # The following line guarantees that the output of this function # is a well-formed platform with no missing fields. diff --git a/pkgs/applications/emulators/libretro/cores/play.nix b/pkgs/applications/emulators/libretro/cores/play.nix index 7bdb0142ac23..835f1574cf13 100644 --- a/pkgs/applications/emulators/libretro/cores/play.nix +++ b/pkgs/applications/emulators/libretro/cores/play.nix @@ -14,13 +14,13 @@ }: mkLibretroCore { core = "play"; - version = "0-unstable-2026-02-23"; + version = "0-unstable-2026-03-02"; src = fetchFromGitHub { owner = "jpd002"; repo = "Play-"; - rev = "8369490f332bc09d1c8f9e707ee34e01cf13e4cb"; - hash = "sha256-/cltskT4cJ8/tExSN324JVGVCOhOWrOJg+47RaGR3yE="; + rev = "7586f3a064b20f0b23325e460ab2122fb56aac80"; + hash = "sha256-MLpMkUHSIo+X7OWxjwGgs/xHsOBodmfwcF6PjAMzbRo="; fetchSubmodules = true; }; diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index ec61f992ead9..1e95db1e8c72 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -54,13 +54,13 @@ "vendorHash": "sha256-Hvk2jckla1LcMankcdUTct8Kea0OznyxDxTJ+UrJHy0=" }, "aminueza_minio": { - "hash": "sha256-2YR5Ez7T1OhuFAEsNp8IrXcZhepSteLqxYADU9sSP9s=", + "hash": "sha256-lGgoHMfdq2o/8mJAiNV2g9x63kMUcRZgDWhsSktVUNQ=", "homepage": "https://registry.terraform.io/providers/aminueza/minio", "owner": "aminueza", "repo": "terraform-provider-minio", - "rev": "v3.21.0", + "rev": "v3.27.0", "spdx": "AGPL-3.0", - "vendorHash": "sha256-AO6reoqxDcPAMXKlqjJLGmhsgFrekaQXjMPm9fxhpFA=" + "vendorHash": "sha256-t+UmcGy66JP2wCbXMe4EcIBkq5OJGBCodCCvXtvaOYo=" }, "argoproj-labs_argocd": { "hash": "sha256-OhuU3XGFRRn6oBiGaT4eRUB3+Lew1PonsshBXMcMA5k=", @@ -499,13 +499,13 @@ "vendorHash": "sha256-MYVkNvJ+rbwGw0htClIbmxk3YX2OK/ZO/QOTyMRFiug=" }, "hashicorp_aws": { - "hash": "sha256-oTYrC0XrzqHL5t/WeJw9V/vq7/G0Ra2De+TiTkmaWxk=", + "hash": "sha256-1mJ9Z5U+wwvKTP6QC9AJWSe9lpks/2KhBcNiHE04knk=", "homepage": "https://registry.terraform.io/providers/hashicorp/aws", "owner": "hashicorp", "repo": "terraform-provider-aws", - "rev": "v6.34.0", + "rev": "v6.35.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-ukDTmgzd4aJ2SJ27qofCtagRTWlP9foF/WwrTkmZEI4=" + "vendorHash": "sha256-LAte9NffWqGiIimDRyuQCfOoTpThWWHjFc72HhssDC0=" }, "hashicorp_awscc": { "hash": "sha256-nyHKE0bpu7vbOE8uDwqaFjeAdXeMf324FjPb6stRiFU=", diff --git a/pkgs/by-name/ap/application-title-bar/package.nix b/pkgs/by-name/ap/application-title-bar/package.nix index 688bc15383ee..feb968f2fde6 100644 --- a/pkgs/by-name/ap/application-title-bar/package.nix +++ b/pkgs/by-name/ap/application-title-bar/package.nix @@ -8,13 +8,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "application-title-bar"; - version = "0.8.7"; + version = "0.9.0"; src = fetchFromGitHub { owner = "antroids"; repo = "application-title-bar"; tag = "v${finalAttrs.version}"; - hash = "sha256-zcxZlQCLLtY5swqPpe0OvpJMykPEWPD4jrGslW7snP8="; + hash = "sha256-bnuMlssXALcFBnBY0iXhZO4QqW2hM9r0y8Ywe2X2/wA="; }; propagatedUserEnvPkgs = with kdePackages; [ kconfig ]; diff --git a/pkgs/by-name/bo/bogofilter/package.nix b/pkgs/by-name/bo/bogofilter/package.nix index e81a232154f3..9921e12c0262 100644 --- a/pkgs/by-name/bo/bogofilter/package.nix +++ b/pkgs/by-name/bo/bogofilter/package.nix @@ -2,11 +2,13 @@ lib, stdenv, fetchurl, - flex, db, + flex, + gnugrep, makeWrapper, pax, perl, + valgrind, database ? db, }: @@ -22,6 +24,12 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-MkihNzv/VSxQCDStvqS2yu4EIkUWrlgfslpMam3uieo="; }; + # bogofilter's test-cases hard-code the search path for grep. + postPatch = '' + substituteInPlace ./src/tests/t.frame \ + --replace-fail 'GREP=/bin/grep' 'GREP=${lib.getExe gnugrep}' + ''; + nativeBuildInputs = [ makeWrapper ]; buildInputs = [ @@ -34,7 +42,16 @@ stdenv.mkDerivation (finalAttrs: { "--with-database=${dbName}" ]; - doCheck = false; # needs "y" tool + nativeCheckInputs = [ + valgrind + ]; + + doCheck = true; + checkFlags = [ + "BF_RUN_VALGRIND=1" + "BF_CHECKTOOL=glibc" + "VERBOSE=-x" + ]; postInstall = '' wrapProgram "$out/bin/bf_tar" --prefix PATH : "${lib.makeBinPath [ pax ]}" @@ -56,6 +73,7 @@ stdenv.mkDerivation (finalAttrs: { ''; license = lib.licenses.gpl2Plus; mainProgram = "bogofilter"; + maintainers = with lib.maintainers; [ Stebalien ]; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/bo/borgmatic/package.nix b/pkgs/by-name/bo/borgmatic/package.nix index e4a1eadabdbb..917f17302cd0 100644 --- a/pkgs/by-name/bo/borgmatic/package.nix +++ b/pkgs/by-name/bo/borgmatic/package.nix @@ -15,12 +15,12 @@ }: python3Packages.buildPythonApplication rec { pname = "borgmatic"; - version = "2.0.13"; + version = "2.1.3"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-0Prjgh/L5nCo3CNXZccNW9Dz3d6jIfrXDZmy5fL6zrU="; + hash = "sha256-mWZQBoQUd+cwOV3QU62XyTCFdFpnBz2BsyImzVAozJE="; }; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/bu/budgie-analogue-clock-applet/package.nix b/pkgs/by-name/bu/budgie-analogue-clock-applet/package.nix index 67a757efa13d..f13a546fcc25 100644 --- a/pkgs/by-name/bu/budgie-analogue-clock-applet/package.nix +++ b/pkgs/by-name/bu/budgie-analogue-clock-applet/package.nix @@ -15,12 +15,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "budgie-analogue-clock-applet"; - version = "2.2-unstable-2026-01-13"; + version = "2.3"; src = fetchFromGitHub { owner = "samlane-ma"; repo = "analogue-clock-applet"; - rev = "22b04faeea8f95eb83ad96ae89529560811d76d9"; + tag = "v${finalAttrs.version}"; hash = "sha256-8ZFExgE1aJ8XN4+ugSzI34UjdPHbtbhJ+3xetcLZ6sg="; }; diff --git a/pkgs/by-name/co/codeblocks/package.nix b/pkgs/by-name/co/codeblocks/package.nix index f9deb48f9f77..43e4eaef86c3 100644 --- a/pkgs/by-name/co/codeblocks/package.nix +++ b/pkgs/by-name/co/codeblocks/package.nix @@ -10,10 +10,12 @@ gtk3, contribPlugins ? false, hunspell, - boost, + boost187, wrapGAppsHook3, }: - +let + boost' = boost187; +in stdenv.mkDerivation rec { name = "${pname}-${lib.optionalString contribPlugins "full-"}${version}"; pname = "codeblocks"; @@ -37,7 +39,7 @@ stdenv.mkDerivation rec { ] ++ lib.optionals contribPlugins [ hunspell - boost + boost' ]; enableParallelBuilding = true; @@ -56,7 +58,7 @@ stdenv.mkDerivation rec { "--with-contrib-plugins=all,-FileManager" + lib.optionalString stdenv.hostPlatform.isDarwin ",-NassiShneiderman" ) - "--with-boost-libdir=${boost}/lib" + "--with-boost-libdir=${boost'}/lib" ]; postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' diff --git a/pkgs/by-name/cr/croc/package.nix b/pkgs/by-name/cr/croc/package.nix index d2a7bf6c432e..3978fb8333c9 100644 --- a/pkgs/by-name/cr/croc/package.nix +++ b/pkgs/by-name/cr/croc/package.nix @@ -11,16 +11,16 @@ buildGoModule (finalAttrs: { pname = "croc"; - version = "10.3.1"; + version = "10.4.1"; src = fetchFromGitHub { owner = "schollz"; repo = "croc"; rev = "v${finalAttrs.version}"; - hash = "sha256-oNk4ReqteTeWKjsmVPC2yVRv1A9WN9jUbiT40flfM+o="; + hash = "sha256-BUwb/M4+iXffZt2285fjw2UYBeqA5QVqUgQPy74EOtg="; }; - vendorHash = "sha256-xEF1vjYQaeDYxcC3FTgR0zCFqvziNIrJVpJJT4o1cVU="; + vendorHash = "sha256-/qPBHpCdEu1uBFFwE7uzmCcm4EL8TxUWdjiaFlUSxIU="; subPackages = [ "." ]; diff --git a/pkgs/by-name/cs/csv2svg/package.nix b/pkgs/by-name/cs/csv2svg/package.nix index 3f3d5943d4ef..4de0dd206d49 100644 --- a/pkgs/by-name/cs/csv2svg/package.nix +++ b/pkgs/by-name/cs/csv2svg/package.nix @@ -2,24 +2,32 @@ lib, rustPlatform, fetchCrate, + versionCheckHook, + nix-update-script, }: rustPlatform.buildRustPackage (finalAttrs: { pname = "csv2svg"; - version = "0.1.9"; + version = "0.2.3"; src = fetchCrate { - inherit (finalAttrs) pname version; - hash = "sha256-3VebLFkeJLK97jqoPXt4Wt6QTR0Zyu+eQV9oaLBSeHE="; + pname = "csv2svg"; + inherit (finalAttrs) version; + hash = "sha256-DNnMYpzQTzGVsAp0YScqiO260mwShVTE/cwXkU/Q5IE="; }; - cargoHash = "sha256-RwpRxSD/oRAYD1udrHt3fy/SrrNUTVdGf+CdzQnJZ2U="; + cargoHash = "sha256-f6ZMCkMVkPi4XfzRUZq7JDhCBz57K58UqY69T9mNzrU="; + + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + + passthru.updateScript = nix-update-script { }; meta = { description = "Take a csv as input and outputs svg"; homepage = "https://github.com/Canop/csv2svg"; license = lib.licenses.mit; - maintainers = [ ]; + maintainers = [ lib.maintainers.progrm_jarvis ]; mainProgram = "csv2svg"; }; }) diff --git a/pkgs/by-name/cu/curv/package.nix b/pkgs/by-name/cu/curv/package.nix index eefa6b8d7523..331d6173b7d7 100644 --- a/pkgs/by-name/cu/curv/package.nix +++ b/pkgs/by-name/cu/curv/package.nix @@ -5,7 +5,7 @@ cmake, git, pkg-config, - boost, + boost188, eigen_5, glm, gcc, @@ -46,7 +46,7 @@ stdenv.mkDerivation { ]; buildInputs = [ - boost + boost188 eigen_5 glm libGL diff --git a/pkgs/by-name/fw/fw/package.nix b/pkgs/by-name/fw/fw/package.nix index a6f2fe70bb9b..560155b463c3 100644 --- a/pkgs/by-name/fw/fw/package.nix +++ b/pkgs/by-name/fw/fw/package.nix @@ -6,6 +6,8 @@ libgit2, openssl, zlib, + versionCheckHook, + nix-update-script, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -15,7 +17,7 @@ rustPlatform.buildRustPackage (finalAttrs: { src = fetchFromGitHub { owner = "brocode"; repo = "fw"; - rev = "v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-tqtiAw4+bnCJMF37SluAE9NM55MAjBGkJTvGLcmYFnA="; }; @@ -35,11 +37,16 @@ rustPlatform.buildRustPackage (finalAttrs: { OPENSSL_NO_VENDOR = true; }; + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + + passthru.updateScript = nix-update-script { }; + meta = { description = "Workspace productivity booster"; homepage = "https://github.com/brocode/fw"; license = lib.licenses.wtfpl; - maintainers = [ ]; + maintainers = [ lib.maintainers.progrm_jarvis ]; mainProgram = "fw"; }; }) diff --git a/pkgs/by-name/gn/gnome-control-center/package.nix b/pkgs/by-name/gn/gnome-control-center/package.nix index 947aefe87b30..95ba382789e3 100644 --- a/pkgs/by-name/gn/gnome-control-center/package.nix +++ b/pkgs/by-name/gn/gnome-control-center/package.nix @@ -76,11 +76,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-control-center"; - version = "49.4"; + version = "49.5"; src = fetchurl { url = "mirror://gnome/sources/gnome-control-center/${lib.versions.major finalAttrs.version}/gnome-control-center-${finalAttrs.version}.tar.xz"; - hash = "sha256-Exl15f3dII86MPdmocZn+Ms/FbaJqGjShaZBojQgSwI="; + hash = "sha256-wlPcn2awFets6E+PFXWkZ97tCs2fV1AecFIMpJSqxDA="; }; patches = [ diff --git a/pkgs/by-name/ki/kiro/package.nix b/pkgs/by-name/ki/kiro/package.nix index a9758f966cfc..6a4c76c1dc59 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.10.32"; + version = "0.10.78"; 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 d27fe150a3aa..a0e040a9139d 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.10.32/tar/kiro-ide-0.10.32-stable-linux-x64.tar.gz", - "hash": "sha256-m9c5QYJnHmJBtWuVTwg2iJldDOvtVVM2g9gDVxn6JOU=" + "url": "https://prod.download.desktop.kiro.dev/releases/stable/linux-x64/signed/0.10.78/tar/kiro-ide-0.10.78-stable-linux-x64.tar.gz", + "hash": "sha256-mnZy+FeN4PSUKBcopr/0NxrRd+DxFuJofm19gEZT+pI=" }, "x86_64-darwin": { - "url": "https://prod.download.desktop.kiro.dev/releases/stable/darwin-x64/signed/0.10.32/kiro-ide-0.10.32-stable-darwin-x64.dmg", - "hash": "sha256-h/k/yKAwguV35fNb83OnB8lXXhi5527O97Z6joP5ItQ=" + "url": "https://prod.download.desktop.kiro.dev/releases/stable/darwin-x64/signed/0.10.78/kiro-ide-0.10.78-stable-darwin-x64.dmg", + "hash": "sha256-8SU3Y6Bs/Igb6dByBE2KPRm5txfgag0oAYMuaWnW/V8=" }, "aarch64-darwin": { - "url": "https://prod.download.desktop.kiro.dev/releases/stable/darwin-arm64/signed/0.10.32/kiro-ide-0.10.32-stable-darwin-arm64.dmg", - "hash": "sha256-G45sPTlMnO2Dxd20gKcfEmw2zZ37vqk06dkxvJe/LJM=" + "url": "https://prod.download.desktop.kiro.dev/releases/stable/darwin-arm64/signed/0.10.78/kiro-ide-0.10.78-stable-darwin-arm64.dmg", + "hash": "sha256-KBYs1Kw+HB1mTSZ1L4ZxXiSUH+fNm6o75Iui68UfOMM=" } } diff --git a/pkgs/by-name/la/labymod-launcher/package.nix b/pkgs/by-name/la/labymod-launcher/package.nix index 04de4423d6d8..391a77ef9351 100644 --- a/pkgs/by-name/la/labymod-launcher/package.nix +++ b/pkgs/by-name/la/labymod-launcher/package.nix @@ -21,7 +21,7 @@ appimageTools.wrapType2 { extraInstallCommands = '' install -Dm444 ${appimageContents}/labymodlauncher.desktop $out/share/applications/labymod-launcher.desktop - install -Dm444 ${appimageContents}/resources/icons/icon.png $out/share/pixmaps/labymod-launcher.png + install -Dm444 ${appimageContents}/resources/icons/icon.png $out/share/icons/hicolor/512x512/apps/labymod-launcher.png substituteInPlace $out/share/applications/labymod-launcher.desktop \ --replace-fail 'Exec=labymodlauncher' 'Exec=labymod-launcher' \ --replace-fail 'Icon=labymodlauncher' 'Icon=labymod-launcher' diff --git a/pkgs/by-name/li/libtypec/package.nix b/pkgs/by-name/li/libtypec/package.nix new file mode 100644 index 000000000000..74f6dea699a4 --- /dev/null +++ b/pkgs/by-name/li/libtypec/package.nix @@ -0,0 +1,63 @@ +{ + lib, + stdenv, + fetchFromGitHub, + meson, + ninja, + pkg-config, + libusb1, + systemd, + libudev0-shim, + gtk3, # utils +}: + +stdenv.mkDerivation rec { + pname = "libtypec"; + version = "0.6.1"; + + src = fetchFromGitHub { + owner = "libtypec"; + repo = pname; + rev = "${pname}-${version}"; + hash = "sha256-XkT0bgBjoJTAFa9NLZdzbJSpchiXxKjeu88PeT/AlPY="; + }; + + outputs = [ + "out" + "lib" + "dev" + ]; + + nativeBuildInputs = [ + meson + ninja + pkg-config + ]; + + buildInputs = [ + libusb1 + libudev0-shim + systemd + gtk3 + ]; + + mesonFlags = [ + (lib.mesonBool "utils" true) + "--prefix=${placeholder "dev"}" + ]; + + # Don't propagate out to the dev output to avoid pulling in GUI dependencies + propagatedBuildOutputs = [ "lib" ]; + + meta = with lib; { + homepage = "https://github.com/libtypec/libtypec"; + description = "generic diagnostic tool interface for usb-c ports"; + longDescription = "libtypec is aimed to provide a generic interface abstracting all platform complexity for user space to develop tools for efficient USB-C port management. The library can also enable development of diagnostic and debug tools to debug system issues around USB-C/USB PD topology."; + platforms = platforms.linux; + license = with licenses; [ + mit + gpl2Only + ]; + maintainers = with maintainers; [ johnazoidberg ]; + }; +} diff --git a/pkgs/by-name/mu/multiviewer-for-f1/package.nix b/pkgs/by-name/mu/multiviewer-for-f1/package.nix index c1eb6b9a6203..ffc05433cd5b 100644 --- a/pkgs/by-name/mu/multiviewer-for-f1/package.nix +++ b/pkgs/by-name/mu/multiviewer-for-f1/package.nix @@ -100,7 +100,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { passthru.updateScript = writeScript "update-multiviewer-for-f1" '' #!/usr/bin/env nix-shell - #!nix-shell -i bash -p curl common-updater-scripts + #!nix-shell -i bash -p curl jq common-updater-scripts set -eu -o pipefail # Get latest API for packages, store so we only make one request @@ -114,10 +114,10 @@ stdenvNoCC.mkDerivation (finalAttrs: { if [ "$version" != "${finalAttrs.version}" ] then # Pre-calculate package hash - hash=$(nix-prefetch-url --type sha256 $link) + hash=$(nix-hash --type sha256 --to-sri $(nix-prefetch-url --type sha256 $link)) # Update ID and version in source - update-source-version ${finalAttrs.pname} "$id" --version-key=id + sed -i "s/id = \"[0-9]*\"/id = \"$id\"/" ${__curPos.file} update-source-version ${finalAttrs.pname} "$version" "$hash" --system=x86_64-linux fi ''; diff --git a/pkgs/by-name/nh/nheko/package.nix b/pkgs/by-name/nh/nheko/package.nix index c4fc89b2cd3e..7ec43a36fed8 100644 --- a/pkgs/by-name/nh/nheko/package.nix +++ b/pkgs/by-name/nh/nheko/package.nix @@ -105,6 +105,10 @@ stdenv.mkDerivation (finalAttrs: { qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0") ''; + postFixup = lib.optionalString stdenv.hostPlatform.isDarwin '' + makeWrapper "$out/Applications/nheko.app/Contents/MacOS/nheko" "$out/bin/nheko" + ''; + meta = { description = "Desktop client for the Matrix protocol"; homepage = "https://github.com/Nheko-Reborn/nheko"; diff --git a/pkgs/by-name/no/novelwriter/package.nix b/pkgs/by-name/no/novelwriter/package.nix index ebd01cd8c0c5..2db23a8950b9 100644 --- a/pkgs/by-name/no/novelwriter/package.nix +++ b/pkgs/by-name/no/novelwriter/package.nix @@ -36,7 +36,6 @@ python3.pkgs.buildPythonApplication { mkdir -p $out/share/icons cp -r setup/data/hicolor $out/share/icons - install -Dm644 setup/data/novelwriter.png -t $out/share/pixmaps install -Dm644 setup/data/novelwriter.desktop -t $out/share/applications install -Dm644 setup/data/x-novelwriter-project.xml -t $out/share/mime/packages ''; diff --git a/pkgs/by-name/nw/nwg-clipman/package.nix b/pkgs/by-name/nw/nwg-clipman/package.nix index 8770b6098145..806debb9e28d 100644 --- a/pkgs/by-name/nw/nwg-clipman/package.nix +++ b/pkgs/by-name/nw/nwg-clipman/package.nix @@ -50,7 +50,7 @@ python3Packages.buildPythonPackage rec { postInstall = '' install -Dm644 nwg-clipman.desktop -t $out/share/applications/ - install -Dm644 nwg-clipman.svg -t $out/share/pixmaps/ + install -Dm644 nwg-clipman.svg -t $out/share/icons/hicolor/scalable/apps/ ''; strictDeps = true; diff --git a/pkgs/by-name/nw/nwg-icon-picker/package.nix b/pkgs/by-name/nw/nwg-icon-picker/package.nix index 6a033e7a9b3d..0746fadc0915 100644 --- a/pkgs/by-name/nw/nwg-icon-picker/package.nix +++ b/pkgs/by-name/nw/nwg-icon-picker/package.nix @@ -30,7 +30,7 @@ python3Packages.buildPythonApplication (finalAttrs: { ]; postInstall = '' - install -Dm444 -t $out/share/pixmaps/ nwg-icon-picker.svg + install -Dm444 -t $out/share/icons/hicolor/scalable/apps/ nwg-icon-picker.svg install -Dm444 -t $out/share/applications/ nwg-icon-picker.desktop ''; diff --git a/pkgs/by-name/od/odamex/package.nix b/pkgs/by-name/od/odamex/package.nix index 05e03cee5c89..e0e69caf7afd 100644 --- a/pkgs/by-name/od/odamex/package.nix +++ b/pkgs/by-name/od/odamex/package.nix @@ -131,11 +131,8 @@ stdenv.mkDerivation (finalAttrs: { for name in odamex odalaunch odasrv; do for size in 96 128 256 512; do install -Dm644 ../media/icon_"$name"_"$size".png \ - $out/share/icons/hicolor/"$size"x"$size"/"$name".png + $out/share/icons/hicolor/"$size"x"$size"/apps/"$name".png done - - install -Dm644 ../media/icon_"$name"_128.png \ - $out/share/pixmaps/"$name".png done '' } diff --git a/pkgs/by-name/on/oneanime/package.nix b/pkgs/by-name/on/oneanime/package.nix index f1d47bb9765a..abe59d250a28 100644 --- a/pkgs/by-name/on/oneanime/package.nix +++ b/pkgs/by-name/on/oneanime/package.nix @@ -13,6 +13,7 @@ libpulseaudio, mpv-unwrapped, mimalloc, + imagemagick, runCommand, yq-go, _experimental-update-script-combinators, @@ -129,6 +130,7 @@ flutter338.buildFlutterApplication { nativeBuildInputs = [ autoPatchelfHook desktop-file-utils + imagemagick ]; buildInputs = [ @@ -141,8 +143,9 @@ flutter338.buildFlutterApplication { ]; postInstall = '' + mkdir -p $out/share/icons/hicolor/128x128/apps ln --symbolic --no-dereference --force ${mpv-unwrapped}/lib/libmpv.so.2 $out/app/oneanime/lib/libmpv.so.2 - install -D --mode=0644 assets/images/logo/logo_android_2.png $out/share/pixmaps/oneanime.png + magick assets/images/logo/logo_android_2.png -resize 128x128 $out/share/icons/hicolor/128x128/apps/oneanime.png desktop-file-edit oneAnime.desktop \ --set-key="Icon" --set-value="oneanime" install -D --mode=0644 oneAnime.desktop --target-directory $out/share/applications diff --git a/pkgs/by-name/op/open-scq30/package.nix b/pkgs/by-name/op/open-scq30/package.nix index 59c378c9e151..c7534d1914a1 100644 --- a/pkgs/by-name/op/open-scq30/package.nix +++ b/pkgs/by-name/op/open-scq30/package.nix @@ -26,13 +26,13 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "open-scq30"; - version = "2.5.0"; + version = "2.5.1"; src = fetchFromGitHub { owner = "Oppzippy"; repo = "OpenSCQ30"; rev = "v${finalAttrs.version}"; - hash = "sha256-mt6h5Kkx1lY1TSndtOS7AGiol24UQIWolBUNWALgA6I="; + hash = "sha256-XBK7KxuksQoYZs/uVkh6+8S20G05W9ftK9pviUFNJ8s="; }; nativeBuildInputs = [ @@ -65,7 +65,7 @@ rustPlatform.buildRustPackage (finalAttrs: { libxi ]; - cargoHash = "sha256-Gu7uh+qSBhm2qBX0wH3BJECN9n2KUv4XnzCuBu+ONlw="; + cargoHash = "sha256-P4r1MoFCkG80X0dJ1MpmjgedcpQ/HDTC3XikNUDKRaQ="; env.INSTALL_PREFIX = placeholder "out"; diff --git a/pkgs/by-name/pi/pied/package.nix b/pkgs/by-name/pi/pied/package.nix index b76499e7f527..5f80a844cd30 100644 --- a/pkgs/by-name/pi/pied/package.nix +++ b/pkgs/by-name/pi/pied/package.nix @@ -29,7 +29,7 @@ flutter329.buildFlutterApplication rec { postInstall = '' install -D flatpak/com.mikeasoft.pied.desktop -t $out/share/applications - install -D flatpak/com.mikeasoft.pied.png -t $out/share/pixmaps + install -D flatpak/com.mikeasoft.pied.png -t $out/share/icons/hicolor/256x256/apps ''; meta = { diff --git a/pkgs/by-name/pl/plugdata/package.nix b/pkgs/by-name/pl/plugdata/package.nix index 1d9613428c83..6b32e2b2f27c 100644 --- a/pkgs/by-name/pl/plugdata/package.nix +++ b/pkgs/by-name/pl/plugdata/package.nix @@ -131,7 +131,7 @@ stdenv.mkDerivation (finalAttrs: { cp -r Plugins/VST3/plugdata{,-fx}.vst3 $out/lib/vst3 cp -r Plugins/LV2/plugdata{,-fx}.lv2 $out/lib/lv2 - install -Dm444 $src/Resources/Icons/plugdata_logo_linux.png $out/share/pixmaps/plugdata_logo.png + install -Dm444 $src/Resources/Icons/plugdata_logo_linux.png $out/share/icons/hicolor/512x512/apps/plugdata_logo.png runHook postInstall ''; diff --git a/pkgs/by-name/po/portfolio/package.nix b/pkgs/by-name/po/portfolio/package.nix index b317a4507a58..03ae2a00fb21 100644 --- a/pkgs/by-name/po/portfolio/package.nix +++ b/pkgs/by-name/po/portfolio/package.nix @@ -11,6 +11,7 @@ stdenvNoCC, webkitgtk_4_1, wrapGAppsHook3, + imagemagick, gitUpdater, }: let @@ -44,6 +45,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { nativeBuildInputs = [ autoPatchelfHook wrapGAppsHook3 + imagemagick ]; dontConfigure = true; @@ -94,8 +96,8 @@ stdenvNoCC.mkDerivation (finalAttrs: { # Create desktop item mkdir -p $out/share/applications cp ${desktopItem}/share/applications/* $out/share/applications - mkdir -p $out/share/pixmaps - ln -s $out/portfolio/icon.xpm $out/share/pixmaps/portfolio.xpm + mkdir -p $out/share/icons/hicolor/256x256/apps + magick $out/portfolio/icon.xpm $out/share/icons/hicolor/256x256/apps/portfolio.png runHook postInstall ''; diff --git a/pkgs/by-name/pq/pqc-bench/package.nix b/pkgs/by-name/pq/pqc-bench/package.nix new file mode 100644 index 000000000000..d3f33833c77b --- /dev/null +++ b/pkgs/by-name/pq/pqc-bench/package.nix @@ -0,0 +1,43 @@ +{ + lib, + python3, + fetchFromGitHub, + writableTmpDirAsHomeHook, +}: + +python3.pkgs.buildPythonApplication (finalAttrs: { + pname = "pqc-bench"; + version = "0.3.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "csnp"; + repo = "pqc-bench"; + tag = "v${finalAttrs.version}"; + hash = "sha256-9f4BJ7TM7hpZ4Z8TGwvo4t8Rlgx2u9U7xsE+5aCxWI8="; + }; + + build-system = with python3.pkgs; [ hatchling ]; + + dependencies = with python3.pkgs; [ + rich + typer + ]; + + nativeCheckInputs = with python3.pkgs; [ + pytest-cov-stub + pytestCheckHook + writableTmpDirAsHomeHook + ]; + + pythonImportsCheck = [ "pqc_bench" ]; + + meta = { + description = "Post-Quantum Cryptography Recommendation Engine"; + homepage = "https://github.com/csnp/pqc-bench"; + changelog = "https://github.com/csnp/pqc-bench/releases/tag/${finalAttrs.src.rev}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ fab ]; + mainProgram = "pqc-bench"; + }; +}) diff --git a/pkgs/by-name/pr/prek/package.nix b/pkgs/by-name/pr/prek/package.nix index ccdcc12f943c..66b5cf72aebd 100644 --- a/pkgs/by-name/pr/prek/package.nix +++ b/pkgs/by-name/pr/prek/package.nix @@ -34,161 +34,9 @@ rustPlatform.buildRustPackage (finalAttrs: { uv ]; - preCheck = '' - export TEMP="$(mktemp -d)" - export TMP=$TEMP - export TMPDIR=$TEMP - export PREK_INTERNAL__TEST_DIR=$TEMP - - export UV_PROJECT_ENVIRONMENT="$(mktemp -d)" - cleanup() { - rm -rf "$UV_PROJECT_ENVIRONMENT" - rm -rf "$TEMP" - } - trap cleanup EXIT - ''; - - __darwinAllowLocalNetworking = true; - useNextest = true; - - # some python tests use uv, which in turn needs python - env = { - UV_PYTHON = "${python312}/bin/python"; - UV_NO_MANAGED_PYTHON = true; - UV_SYSTEM_PYTHON = true; - }; - - cargoTestFlags = [ "--no-fail-fast" ]; - - checkFlags = - lib.concatMap - (t: [ - "--skip" - "${t}" - ]) - [ - # these tests require internet access - "check_added_large_files_hook" - "check_json_hook" - "end_of_file_fixer_hook" - "mixed_line_ending_hook" - "install_hooks_only" - "install_with_hooks" - "golang" - "node" - "script" - "check_useless_excludes_remote" - "run_worktree" - "try_repo_relative_path" - "languages::tests::test_native_tls" - "rust::additional_dependencies_cli" - "rust::rustup_installer" - "rust::remote_hooks" - "rust::remote_hooks_with_lib_deps" - "unsupported::unsupported_language" - "remote_hook_non_workspace" - "bun::additional_dependencies" - "bun::basic_bun" - # "meta_hooks" - "reuse_env" - "docker::docker" - "docker::workspace_docker" - "docker_image::docker_image" - "pygrep::basic_case_sensitive" - "pygrep::case_insensitive" - "pygrep::case_insensitive_multiline" - "pygrep::complex_regex_patterns" - "pygrep::invalid_args" - "pygrep::invalid_regex" - "pygrep::multiline_mode" - "pygrep::negate_mode" - "pygrep::negate_multiline_mode" - "pygrep::pattern_not_found" - "pygrep::python_regex_quirks" - "python::additional_dependencies" - "python::can_not_download" - "python::hook_stderr" - "python::language_version" - "ruby::additional_gem_dependencies" - "ruby::environment_isolation" - "ruby::gemspec_workflow" - "ruby::language_version_default" - "ruby::local_hook_with_gemspec" - "ruby::native_gem_dependency" - "ruby::native_gem_dependency" - "ruby::process_files" - "ruby::specific_ruby_available" - "ruby::specific_ruby_unavailable" - "ruby::system_ruby" - # can't checkout pre-commit-hooks - "cjk_hook_name" - "fail_fast" - "file_types" - "files_and_exclude" - "git_commit_a" - "log_file" - "merge_conflicts" - "pass_env_vars" - "restore_on_interrupt" - "run_basic" - "run_last_commit" - "same_repo" - "skips" - "staged_files_only" - "subdirectory" - "check_yaml_hook" - "check_yaml_multiple_document" - "builtin_hooks_workspace_mode" - "fix_byte_order_marker_hook" - "fix_byte_order_marker" - "check_merge_conflict_hook" - "check_merge_conflict_without_assume_flag" - "check_symlinks_hook_unix" - "check_xml_hook" - "check_xml_with_features" - "detect_private_key_hook" - "no_commit_to_branch_hook" - "no_commit_to_branch_hook_with_custom_branches" - "no_commit_to_branch_hook_with_patterns" - "check_executables_have_shebangs_various_cases" - "check_executables_have_shebangs_hook" - "cache_gc_removes_unreferenced_entries" - # does not properly use TMP - "hook_impl" - # problems with environment - "try_repo_specific_hook" - "try_repo_specific_rev" - # lua path is hardcoded - "lua::additional_dependencies" - "lua::health_check" - "lua::hook_stderr" - "lua::lua_environment" - "lua::remote_hook" - # error message differs - "run_in_non_git_repo" - # depends on locale - "init_nonexistent_repo" - # https://github.com/astral-sh/uv/issues/8635 - "alternate_config_file" - "basic_discovery" - "cache_gc_keeps_local_hook_env" - "color" - "cookiecutter_template_directories_are_skipped" - "empty_entry" - "git_dir_respected" - "git_env_vars_not_leaked_to_pip_install" - "gitignore_respected" - "invalid_entry" - "local_python_hook" - "orphan_projects" - "run_with_selectors" - "run_with_stdin_closed" - "show_diff_on_failure" - "submodule_discovery" - "workspace_install_hooks" - # We don't have git info; we run versionCheckHook instead - "version_info" - ]; + # many tests just do not work, as they require network access + # best to disable all, as the upstream already tests everything + doCheck = false; postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd prek \ diff --git a/pkgs/by-name/pt/ptyxis/package.nix b/pkgs/by-name/pt/ptyxis/package.nix index 45ce4e5ae30e..f04e67e1b2fa 100644 --- a/pkgs/by-name/pt/ptyxis/package.nix +++ b/pkgs/by-name/pt/ptyxis/package.nix @@ -16,14 +16,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "ptyxis"; - version = "49.2"; + version = "49.3"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "chergert"; repo = "ptyxis"; tag = finalAttrs.version; - hash = "sha256-SyWZuohU8KPqPeQe5JN+CFv4kjftGmzsbBRgxu0ttcU="; + hash = "sha256-kBkLJdUN9WNP0HLiQQMWBC/49YaLmkgOuIj8jqkgLgY="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/py/pyfa/package.nix b/pkgs/by-name/py/pyfa/package.nix index f5ae3e1a16a0..fea373fc00e6 100644 --- a/pkgs/by-name/py/pyfa/package.nix +++ b/pkgs/by-name/py/pyfa/package.nix @@ -110,11 +110,9 @@ python3Packages.buildPythonApplication rec { runHook preInstall mkdir -p $out/bin - mkdir -p $out/share/pixmaps mkdir -p $out/share/icons/hicolor/64x64/apps/ cp -r dist/pyfa $out/share/ - cp imgs/gui/pyfa64.png $out/share/pixmaps/pyfa.png cp imgs/gui/pyfa64.png $out/share/icons/hicolor/64x64/apps/pyfa.png ln -sf $out/share/pyfa/pyfa $out/bin/pyfa diff --git a/pkgs/by-name/qb/qbom/package.nix b/pkgs/by-name/qb/qbom/package.nix new file mode 100644 index 000000000000..22a04b0b9470 --- /dev/null +++ b/pkgs/by-name/qb/qbom/package.nix @@ -0,0 +1,55 @@ +{ + lib, + python3, + fetchFromGitHub, + writableTmpDirAsHomeHook, +}: + +python3.pkgs.buildPythonApplication (finalAttrs: { + pname = "qbom"; + version = "0.1.0-unstable-2026-01-21"; + pyproject = true; + + src = fetchFromGitHub { + owner = "csnp"; + repo = "qbom"; + rev = "817414c311faac8da99042be82d9449019a8e9f9"; + hash = "sha256-qTcNoQZkcTaHQyZ0Lqbt1XlXsV15+tOcv7f+K7ydqmw="; + }; + + build-system = with python3.pkgs; [ hatchling ]; + + dependencies = with python3.pkgs; [ + click + pydantic + rich + xxhash + ]; + + optional-dependencies = with python3.pkgs; { + all = [ + cirq + pennylane + qiskit + ]; + cirq = [ cirq ]; + pennylane = [ pennylane ]; + qiskit = [ qiskit ]; + }; + + nativeCheckInputs = with python3.pkgs; [ + pytest-cov-stub + pytestCheckHook + writableTmpDirAsHomeHook + ]; + + pythonImportsCheck = [ "qbom" ]; + + meta = { + description = "Quantum Bill of Materials (QBOM) tool"; + homepage = "https://github.com/csnp/qbom"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ fab ]; + mainProgram = "qbom"; + }; +}) diff --git a/pkgs/by-name/re/resources/package.nix b/pkgs/by-name/re/resources/package.nix index 8a365331f98c..e246a11f51c2 100644 --- a/pkgs/by-name/re/resources/package.nix +++ b/pkgs/by-name/re/resources/package.nix @@ -23,18 +23,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "resources"; - version = "1.10.1-1"; + version = "1.10.2"; src = fetchFromGitHub { owner = "nokyan"; repo = "resources"; tag = "v${finalAttrs.version}"; - hash = "sha256-NjzHGz90MhdjBHP88+qBI/5usCpPPrukSaVHoOJJXSI="; + hash = "sha256-BkyWq3Cwt34lNQ/p1iQcfIlkCefE2YeiQMd1T6ODbxw="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; - hash = "sha256-wATJxWemn5VxRsRat5I4uEnymsfMM6AX+hP422cUtBo="; + hash = "sha256-zzSqwc+MoYoieOT0qmgfxKG8/HLGTVsTgcru5wZgn2M="; }; nativeBuildInputs = [ @@ -84,6 +84,7 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ lukas-heiligenbrunner ewuuwe + graysontinker ]; teams = [ lib.teams.gnome-circle ]; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/ri/ripdrag/package.nix b/pkgs/by-name/ri/ripdrag/package.nix index 1e0d7f1b6305..5adf25b0b4d3 100644 --- a/pkgs/by-name/ri/ripdrag/package.nix +++ b/pkgs/by-name/ri/ripdrag/package.nix @@ -5,6 +5,8 @@ pkg-config, wrapGAppsHook4, gtk4, + versionCheckHook, + nix-update-script, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -14,7 +16,7 @@ rustPlatform.buildRustPackage (finalAttrs: { src = fetchFromGitHub { owner = "nik012003"; repo = "ripdrag"; - rev = "v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-1IUS0PNzIoSrlBXQrUmw/lXUD8auVVKhu/irSoYoK6w="; }; @@ -27,12 +29,17 @@ rustPlatform.buildRustPackage (finalAttrs: { buildInputs = [ gtk4 ]; + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + + passthru.updateScript = nix-update-script { }; + meta = { description = "Application that lets you drag and drop files from and to the terminal"; homepage = "https://github.com/nik012003/ripdrag"; - changelog = "https://github.com/nik012003/ripdrag/releases/tag/${finalAttrs.src.rev}"; + changelog = "https://github.com/nik012003/ripdrag/releases/tag/v${finalAttrs.version}"; license = lib.licenses.gpl3Only; - maintainers = [ ]; + maintainers = [ lib.maintainers.progrm_jarvis ]; mainProgram = "ripdrag"; }; }) diff --git a/pkgs/by-name/ru/rune-languageserver/package.nix b/pkgs/by-name/ru/rune-languageserver/package.nix index 5d7cf2d7a205..6a0978f08900 100644 --- a/pkgs/by-name/ru/rune-languageserver/package.nix +++ b/pkgs/by-name/ru/rune-languageserver/package.nix @@ -11,7 +11,8 @@ rustPlatform.buildRustPackage (finalAttrs: { version = "0.14.1"; src = fetchCrate { - inherit (finalAttrs) pname version; + pname = "rune-languageserver"; + inherit (finalAttrs) version; hash = "sha256-0b8XGbMQqMolOdQEMjpwHAVI3A4fXemyCowN39qY16A="; }; @@ -39,7 +40,7 @@ rustPlatform.buildRustPackage (finalAttrs: { asl20 mit ]; - maintainers = [ ]; + maintainers = [ lib.maintainers.progrm_jarvis ]; mainProgram = "rune-languageserver"; }; }) diff --git a/pkgs/by-name/ru/rust-audit-info/package.nix b/pkgs/by-name/ru/rust-audit-info/package.nix index e9fd0c24fb99..a073e50ad78e 100644 --- a/pkgs/by-name/ru/rust-audit-info/package.nix +++ b/pkgs/by-name/ru/rust-audit-info/package.nix @@ -2,6 +2,7 @@ lib, rustPlatform, fetchCrate, + nix-update-script, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -9,12 +10,15 @@ rustPlatform.buildRustPackage (finalAttrs: { version = "0.5.4"; src = fetchCrate { - inherit (finalAttrs) pname version; + pname = "rust-audit-info"; + inherit (finalAttrs) version; hash = "sha256-zxdF65/9cgdDLM7HA30NCEZj1S5SogH+oM3aq55K0os="; }; cargoHash = "sha256-ygz9uYwuDI892kwYwJPTsTAkBfsnRN2unOgqv8VHXSA="; + passthru.updateScript = nix-update-script { }; + meta = { description = "Command-line tool to extract the dependency trees embedded in binaries by cargo-auditable"; mainProgram = "rust-audit-info"; @@ -23,6 +27,6 @@ rustPlatform.buildRustPackage (finalAttrs: { mit # or asl20 ]; - maintainers = [ ]; + maintainers = [ lib.maintainers.progrm_jarvis ]; }; }) diff --git a/pkgs/by-name/ru/rust-code-analysis/package.nix b/pkgs/by-name/ru/rust-code-analysis/package.nix index bd2558cdd8d2..8fcfc466848f 100644 --- a/pkgs/by-name/ru/rust-code-analysis/package.nix +++ b/pkgs/by-name/ru/rust-code-analysis/package.nix @@ -2,6 +2,8 @@ lib, rustPlatform, fetchCrate, + versionCheckHook, + nix-update-script, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -16,14 +18,20 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoHash = "sha256-HirLjKkfZfc9UmUcUF5WW7xAJuCu7ftJDH8+zTSYlxs="; + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + + passthru.updateScript = nix-update-script { }; + meta = { description = "Analyze and collect metrics on source code"; homepage = "https://github.com/mozilla/rust-code-analysis"; + changelog = "https://github.com/mozilla/rust-code-analysis/releases/tag/v${finalAttrs.version}"; license = with lib.licenses; [ mit # grammars mpl20 # code ]; - maintainers = [ ]; + maintainers = [ lib.maintainers.progrm_jarvis ]; mainProgram = "rust-code-analysis-cli"; }; }) diff --git a/pkgs/by-name/ru/rust-script/package.nix b/pkgs/by-name/ru/rust-script/package.nix index a0e46b6fd7e3..6a15e9ec0ae6 100644 --- a/pkgs/by-name/ru/rust-script/package.nix +++ b/pkgs/by-name/ru/rust-script/package.nix @@ -2,6 +2,8 @@ lib, rustPlatform, fetchFromGitHub, + versionCheckHook, + nix-update-script, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -20,6 +22,11 @@ rustPlatform.buildRustPackage (finalAttrs: { # tests require network access doCheck = false; + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + + passthru.updateScript = nix-update-script { }; + meta = { description = "Run Rust files and expressions as scripts without any setup or compilation step"; mainProgram = "rust-script"; @@ -29,6 +36,6 @@ rustPlatform.buildRustPackage (finalAttrs: { mit # or asl20 ]; - maintainers = [ ]; + maintainers = [ lib.maintainers.progrm_jarvis ]; }; }) diff --git a/pkgs/by-name/ru/rust-traverse/package.nix b/pkgs/by-name/ru/rust-traverse/package.nix index ed18ec7cfb3b..2741e5f87e76 100644 --- a/pkgs/by-name/ru/rust-traverse/package.nix +++ b/pkgs/by-name/ru/rust-traverse/package.nix @@ -5,6 +5,7 @@ pkg-config, bzip2, zstd, + nix-update-script, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -14,7 +15,7 @@ rustPlatform.buildRustPackage (finalAttrs: { src = fetchFromGitHub { owner = "dmcg310"; repo = "Rust-Traverse"; - rev = "v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-OcCWmBNDo4AA5Pk5TQqb8hen9LlHaY09Wrm4BkrU7qA="; }; @@ -33,12 +34,14 @@ rustPlatform.buildRustPackage (finalAttrs: { ZSTD_SYS_USE_PKG_CONFIG = true; }; + passthru.updateScript = nix-update-script { }; + meta = { description = "Terminal based file explorer"; homepage = "https://github.com/dmcg310/Rust-Traverse"; changelog = "https://github.com/dmcg310/Rust-Traverse/releases/tag/${finalAttrs.src.rev}"; license = lib.licenses.mit; - maintainers = [ ]; + maintainers = [ lib.maintainers.progrm_jarvis ]; mainProgram = "rt"; }; }) diff --git a/pkgs/by-name/ru/rustywind/package.nix b/pkgs/by-name/ru/rustywind/package.nix index 8c593888c1f9..c3026f881d1b 100644 --- a/pkgs/by-name/ru/rustywind/package.nix +++ b/pkgs/by-name/ru/rustywind/package.nix @@ -2,6 +2,8 @@ lib, rustPlatform, fetchFromGitHub, + versionCheckHook, + nix-update-script, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -11,18 +13,23 @@ rustPlatform.buildRustPackage (finalAttrs: { src = fetchFromGitHub { owner = "avencera"; repo = "rustywind"; - rev = "v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-qbOlU7kqVbB/sQg4b78CohOwQbraulZ8dRxeT+39rFk="; }; cargoHash = "sha256-eXTdPtcsWhsABZU6kRzZ6eF1VaabouZwLAFI9KpAx98="; + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + + passthru.updateScript = nix-update-script { }; + meta = { description = "CLI for organizing Tailwind CSS classes"; mainProgram = "rustywind"; homepage = "https://github.com/avencera/rustywind"; - changelog = "https://github.com/avencera/rustywind/blob/${finalAttrs.src.rev}/CHANGELOG.md"; + changelog = "https://github.com/avencera/rustywind/blob/v${finalAttrs.version}/CHANGELOG.md"; license = lib.licenses.asl20; - maintainers = [ ]; + maintainers = [ lib.maintainers.progrm_jarvis ]; }; }) diff --git a/pkgs/by-name/sa/safecloset/package.nix b/pkgs/by-name/sa/safecloset/package.nix index 271d5cc95e49..2342db5facee 100644 --- a/pkgs/by-name/sa/safecloset/package.nix +++ b/pkgs/by-name/sa/safecloset/package.nix @@ -4,6 +4,8 @@ fetchFromGitHub, stdenv, libxcb, + versionCheckHook, + nix-update-script, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -13,7 +15,7 @@ rustPlatform.buildRustPackage (finalAttrs: { src = fetchFromGitHub { owner = "Canop"; repo = "safecloset"; - rev = "v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-ZLAgSD03Qfoz+uGjVJF7vCkV1pUWqw6yG/9+redbQQ8="; }; @@ -28,12 +30,17 @@ rustPlatform.buildRustPackage (finalAttrs: { "--skip=timer::timer_tests::test_timer_reset" ]; + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + + passthru.updateScript = nix-update-script { }; + meta = { description = "Cross-platform secure TUI secret locker"; homepage = "https://github.com/Canop/safecloset"; - changelog = "https://github.com/Canop/safecloset/blob/${finalAttrs.src.rev}/CHANGELOG.md"; + changelog = "https://github.com/Canop/safecloset/releases/tag/v${finalAttrs.version}"; license = lib.licenses.agpl3Only; - maintainers = [ ]; + maintainers = [ lib.maintainers.progrm_jarvis ]; mainProgram = "safecloset"; }; }) diff --git a/pkgs/by-name/sc/scala-cli/sources.json b/pkgs/by-name/sc/scala-cli/sources.json index 7044d85a0280..060645f0bb02 100644 --- a/pkgs/by-name/sc/scala-cli/sources.json +++ b/pkgs/by-name/sc/scala-cli/sources.json @@ -1,21 +1,21 @@ { - "version": "1.12.3", + "version": "1.12.4", "assets": { "aarch64-darwin": { "asset": "scala-cli-aarch64-apple-darwin.gz", - "sha256": "036q4jxc0sx01qb7bfm1r1jfimkzjaijkdqh1yxbxc5vvna2pd34" + "sha256": "0hvgmj18xdmkpqh6595cqwkl2b0hrg9c2rchqp6g2nwlqqwas1y4" }, "aarch64-linux": { "asset": "scala-cli-aarch64-pc-linux.gz", - "sha256": "0avzzyvf59l4d63pl80wqfiw2l8gdfphz85a000ig3mfqqz3hrrg" + "sha256": "0j1v58r10pqlx3d1xhj8c9sxdgip2qylrcxwknxb9rza4kvsyww0" }, "x86_64-darwin": { "asset": "scala-cli-x86_64-apple-darwin.gz", - "sha256": "05xrq0gr13l337a7bjrz13f5kjbh1fv2w97lli9fqsyn4sghchrv" + "sha256": "19g9jsmkn1pagmgabqjpkhl65sl264c25wjdrf2dcd2gjkzpcvkd" }, "x86_64-linux": { "asset": "scala-cli-x86_64-pc-linux.gz", - "sha256": "022psrs9xhfpdx52fjygfxkn7mwpdvp8dbsvdn7v1km2gpdmvxdx" + "sha256": "1j6rkc9g0ljrf3svws1x03v28c4053d7bqg8ja6bjjld042c8d02" } } } diff --git a/pkgs/by-name/sh/shpool/package.nix b/pkgs/by-name/sh/shpool/package.nix index 62cf7ca2ba09..959dada5f2a0 100644 --- a/pkgs/by-name/sh/shpool/package.nix +++ b/pkgs/by-name/sh/shpool/package.nix @@ -1,5 +1,6 @@ { lib, + stdenv, rustPlatform, fetchFromGitHub, linux-pam, @@ -18,16 +19,14 @@ rustPlatform.buildRustPackage (finalAttrs: { hash = "sha256-r1bYcf5SPHbrPgxCvfbZNVhGj/gX8K5ucd8PH0WMgb8="; }; - postPatch = '' + postPatch = lib.optionalString stdenv.hostPlatform.isLinux '' substituteInPlace systemd/shpool.service \ --replace-fail '/usr/bin/shpool' "$out/bin/shpool" ''; cargoHash = "sha256-BeMIasnEFqeoHhNAlj/uBMtMoZvrLjyWDKi0n8BaSnU="; - buildInputs = [ - linux-pam - ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ linux-pam ]; # The majority of tests rely on impure environment # (such as systemd socket, ssh socket), and some of them @@ -35,7 +34,7 @@ rustPlatform.buildRustPackage (finalAttrs: { # tried skipping them but failed doCheck = false; - postInstall = '' + postInstall = lib.optionalString stdenv.hostPlatform.isLinux '' install -Dm444 systemd/shpool.service -t $out/lib/systemd/user install -Dm444 systemd/shpool.socket -t $out/lib/systemd/user ''; @@ -51,6 +50,6 @@ rustPlatform.buildRustPackage (finalAttrs: { license = lib.licenses.asl20; mainProgram = "shpool"; maintainers = with lib.maintainers; [ aleksana ]; - platforms = lib.platforms.linux; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; }) diff --git a/pkgs/by-name/si/simple-http-server/package.nix b/pkgs/by-name/si/simple-http-server/package.nix index d2452b28769b..6efe6dad629f 100644 --- a/pkgs/by-name/si/simple-http-server/package.nix +++ b/pkgs/by-name/si/simple-http-server/package.nix @@ -4,6 +4,8 @@ fetchFromGitHub, pkg-config, openssl, + versionCheckHook, + nix-update-script, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -26,6 +28,11 @@ rustPlatform.buildRustPackage (finalAttrs: { # Currently no tests are implemented, so we avoid building the package twice doCheck = false; + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + + passthru.updateScript = nix-update-script { }; + meta = { description = "Simple HTTP server in Rust"; homepage = "https://github.com/TheWaWaR/simple-http-server"; @@ -33,6 +40,7 @@ rustPlatform.buildRustPackage (finalAttrs: { license = lib.licenses.mit; maintainers = with lib.maintainers; [ mephistophiles + progrm_jarvis ]; mainProgram = "simple-http-server"; }; diff --git a/pkgs/development/python-modules/aiohttp-asgi-connector/default.nix b/pkgs/development/python-modules/aiohttp-asgi-connector/default.nix new file mode 100644 index 000000000000..e5e23d75d69d --- /dev/null +++ b/pkgs/development/python-modules/aiohttp-asgi-connector/default.nix @@ -0,0 +1,45 @@ +{ + lib, + aiohttp, + buildPythonPackage, + fastapi, + fetchFromGitHub, + pdm-backend, + pytest-asyncio, + pytestCheckHook, + python-multipart, +}: + +buildPythonPackage (finalAttrs: { + pname = "aiohttp-asgi-connector"; + version = "1.1.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "thearchitector"; + repo = "aiohttp-asgi-connector"; + tag = "v${finalAttrs.version}"; + hash = "sha256-kvHsn8avq0Fi4ceg3ispFoQp0HJKzBv4tgley7XWMrY="; + }; + + build-system = [ pdm-backend ]; + + dependencies = [ aiohttp ]; + + nativeCheckInputs = [ + fastapi + pytest-asyncio + pytestCheckHook + python-multipart + ]; + + pythonImportsCheck = [ "aiohttp_asgi_connector" ]; + + meta = { + description = "An AIOHTTP ClientSession connector for directly interacting with ASGI applications"; + homepage = "https://github.com/thearchitector/aiohttp-asgi-connector"; + changelog = "https://github.com/thearchitector/aiohttp-asgi-connector/releases/tag/v${finalAttrs.src.tag}"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ fab ]; + }; +}) diff --git a/pkgs/development/python-modules/asn1/default.nix b/pkgs/development/python-modules/asn1/default.nix index 4729a5712656..b2ede45e5a87 100644 --- a/pkgs/development/python-modules/asn1/default.nix +++ b/pkgs/development/python-modules/asn1/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "asn1"; - version = "3.1.0"; + version = "3.2.0"; pyproject = true; src = fetchFromGitHub { owner = "andrivet"; repo = "python-asn1"; tag = "v${version}"; - hash = "sha256-yDX2TydMtqIE4A4QUmKPJKLM1UdXxp0qFBJx08Ri2YQ="; + hash = "sha256-Ge4ffqew/cfYUoKSudCz4S3+In6nEUPOK6Zes//R4Ls="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/azure-mgmt-managementgroups/default.nix b/pkgs/development/python-modules/azure-mgmt-managementgroups/default.nix index 04b4af69a505..06b21e33ade7 100644 --- a/pkgs/development/python-modules/azure-mgmt-managementgroups/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-managementgroups/default.nix @@ -1,41 +1,41 @@ { lib, - buildPythonPackage, - fetchPypi, - msrest, - msrestazure, azure-common, azure-mgmt-core, - azure-mgmt-nspkg, - isPy3k, + buildPythonPackage, + fetchPypi, + isodate, + setuptools, + typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "azure-mgmt-managementgroups"; - version = "1.0.0"; - format = "setuptools"; + version = "1.1.0"; + pyproject = true; src = fetchPypi { - inherit pname version; - extension = "zip"; - sha256 = "bab9bd532a1c34557f5b0ab9950e431e3f00bb96e8a3ce66df0f6ce2ae19cd73"; + pname = "azure_mgmt_managementgroups"; + inherit (finalAttrs) version; + hash = "sha256-5hmbrxGIkLor2jXdqDqIhhwLG77xJjEbIOwS7tloGVE="; }; - propagatedBuildInputs = [ - msrest - msrestazure + build-system = [ setuptools ]; + + dependencies = [ azure-common azure-mgmt-core - ] - ++ lib.optionals (!isPy3k) [ azure-mgmt-nspkg ]; + isodate + typing-extensions + ]; # has no tests doCheck = false; meta = { description = "This is the Microsoft Azure Management Groups Client Library"; - homepage = "https://github.com/Azure/azure-sdk-for-python"; + homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/managementgroups/azure-mgmt-managementgroups"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ maxwilson ]; }; -} +}) diff --git a/pkgs/development/python-modules/bentoml/default.nix b/pkgs/development/python-modules/bentoml/default.nix index a50e9f70d991..797cfd2ebe49 100644 --- a/pkgs/development/python-modules/bentoml/default.nix +++ b/pkgs/development/python-modules/bentoml/default.nix @@ -3,6 +3,7 @@ stdenv, a2wsgi, aiohttp, + aiohttp-asgi-connector, aiosqlite, attrs, buildPythonPackage, @@ -158,6 +159,7 @@ buildPythonPackage { dependencies = [ a2wsgi aiohttp + aiohttp-asgi-connector aiosqlite attrs cattrs diff --git a/pkgs/development/python-modules/pyimg4/default.nix b/pkgs/development/python-modules/pyimg4/default.nix index eced828111dc..2afacff46928 100644 --- a/pkgs/development/python-modules/pyimg4/default.nix +++ b/pkgs/development/python-modules/pyimg4/default.nix @@ -66,6 +66,8 @@ buildPythonPackage rec { ]; meta = { + # https://github.com/m1stadev/PyIMG4/pull/59 + broken = lib.versionAtLeast asn1.version "3"; changelog = "https://github.com/m1stadev/PyIMG4/releases/tag/${src.tag}"; description = "Python library/CLI tool for parsing Apple's Image4 format"; homepage = "https://github.com/m1stadev/PyIMG4"; diff --git a/pkgs/development/python-modules/qh3/default.nix b/pkgs/development/python-modules/qh3/default.nix index a64c015f77dc..89d4c9cced14 100644 --- a/pkgs/development/python-modules/qh3/default.nix +++ b/pkgs/development/python-modules/qh3/default.nix @@ -13,19 +13,19 @@ buildPythonPackage rec { pname = "qh3"; - version = "1.5.6"; + version = "1.6.0"; pyproject = true; src = fetchFromGitHub { owner = "jawah"; repo = "qh3"; tag = "v${version}"; - hash = "sha256-QJfun9CjqdtVmn7Ws4+VJaeGCQgxnEy+L3SMCZFMK1o="; + hash = "sha256-/kmRTxXKoi7aSs4WzlhvoYHWfV60sjFkA+gwp4rqiwY="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; - hash = "sha256-4CLvkyOd0GYh4/v40Qtv3rPJXRwOPXHg9Oo+eWN0luA="; + hash = "sha256-1yaVYJ6+nmRvi8TUR/bWYEXlIdARk03SQv++28OOqIc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/saiph/default.nix b/pkgs/development/python-modules/saiph/default.nix index 33b088eda076..7a72a176aadd 100644 --- a/pkgs/development/python-modules/saiph/default.nix +++ b/pkgs/development/python-modules/saiph/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, - poetry-core, + hatchling, fetchFromGitHub, pytestCheckHook, doubles, @@ -28,7 +28,7 @@ buildPythonPackage rec { pyproject = true; build-system = [ - poetry-core + hatchling ]; dependencies = [ diff --git a/pkgs/development/python-modules/starlette-admin/0001-fix-pytest-pyproject-collision.patch b/pkgs/development/python-modules/starlette-admin/0001-fix-pytest-pyproject-collision.patch new file mode 100644 index 000000000000..90dd46dc2cad --- /dev/null +++ b/pkgs/development/python-modules/starlette-admin/0001-fix-pytest-pyproject-collision.patch @@ -0,0 +1,14 @@ +diff --git a/pyproject.toml b/pyproject.toml +index 3e170b4..e2c6c77 100644 +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -183,9 +183,6 @@ parallel = true + concurrency = ["thread", "greenlet"] + source = ["starlette_admin", "tests"] + +-[tool.pytest] +-asyncio_mode = "auto" +- + [tool.pytest.ini_options] + asyncio_mode="auto" + asyncio_default_fixture_loop_scope="function" diff --git a/pkgs/development/python-modules/starlette-admin/default.nix b/pkgs/development/python-modules/starlette-admin/default.nix index 5c341d6d7a4a..74ff7e1d48a0 100644 --- a/pkgs/development/python-modules/starlette-admin/default.nix +++ b/pkgs/development/python-modules/starlette-admin/default.nix @@ -51,6 +51,11 @@ buildPythonPackage rec { hash = "sha256-JVvrfbyKillkx6fOx4DEbHZoHIPxF1Gn3HzkxyJc66o="; }; + patches = [ + # "Cannot use both [tool.pytest] (native TOML types) and [tool.pytest.ini_options] (string-based INI format) simultaneously" + ./0001-fix-pytest-pyproject-collision.patch + ]; + build-system = [ hatchling ]; dependencies = [ diff --git a/pkgs/development/web/nodejs/v20.nix b/pkgs/development/web/nodejs/v20.nix index 977390b0dd67..8d201e3dc593 100644 --- a/pkgs/development/web/nodejs/v20.nix +++ b/pkgs/development/web/nodejs/v20.nix @@ -34,8 +34,8 @@ let ]; in buildNodejs { - version = "20.20.0"; - sha256 = "5294d9d2915620e819e6892fd7e545b98d650bad36dae54e6527eaac482add98"; + version = "20.20.1"; + sha256 = "e540efdd6750f838e867daf9ab9d90ea195423f915613d05d87105f4d2ecd186"; patches = [ ./configure-emulator.patch ./configure-armv6-vfpv2.patch diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 07f3805cb669..f3df14ac530c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -318,6 +318,8 @@ self: super: with self; { aiohttp-apispec = callPackage ../development/python-modules/aiohttp-apispec { }; + aiohttp-asgi-connector = callPackage ../development/python-modules/aiohttp-asgi-connector { }; + aiohttp-asyncmdnsresolver = callPackage ../development/python-modules/aiohttp-asyncmdnsresolver { }; aiohttp-basicauth = callPackage ../development/python-modules/aiohttp-basicauth { }; diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix index 1576ff3dc89d..be333d3bddc1 100644 --- a/pkgs/top-level/stage.nix +++ b/pkgs/top-level/stage.nix @@ -288,7 +288,7 @@ let isStatic = true; config = lib.systems.parse.tripleFromSystem ( if stdenv.hostPlatform.isLinux then - lib.systems.parse.makeMuslParsedPlatform stdenv.hostPlatform.parsed + lib.systems.parse.mkMuslSystem stdenv.hostPlatform.parsed else stdenv.hostPlatform.parsed ); diff --git a/pkgs/top-level/variants.nix b/pkgs/top-level/variants.nix index 9c5a60f9f003..1dee1a4a39a7 100644 --- a/pkgs/top-level/variants.nix +++ b/pkgs/top-level/variants.nix @@ -84,7 +84,7 @@ self: super: { ++ overlays; ${if stdenv.hostPlatform == stdenv.buildPlatform then "localSystem" else "crossSystem"} = { config = lib.systems.parse.tripleFromSystem ( - lib.systems.parse.makeMuslParsedPlatform stdenv.hostPlatform.parsed + lib.systems.parse.mkMuslSystem stdenv.hostPlatform.parsed ); }; }