diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 8767846306c0..5f63f53b5f37 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -14823,6 +14823,12 @@ githubId = 32649612; keys = [ { fingerprint = "65DF D21C 22A9 E4CD FD1A 0804 C3D7 16E7 29B3 C86A"; } ]; }; + keksnino = { + name = "KeksNino"; + email = "KeksNino@proton.me"; + github = "KeksNino"; + githubId = 87879013; + }; keldu = { email = "mail@keldu.de"; github = "keldu"; diff --git a/nixos/modules/image/repart-image.nix b/nixos/modules/image/repart-image.nix index 3a01a6dc80f1..b3458a414ba9 100644 --- a/nixos/modules/image/repart-image.nix +++ b/nixos/modules/image/repart-image.nix @@ -109,6 +109,7 @@ let "btrfs" = [ btrfs-progs ]; "xfs" = [ xfsprogs ]; "swap" = [ util-linux ]; + "empty" = [ ]; }; fileSystemTools = builtins.concatMap (f: fileSystemToolMapping."${f}") fileSystems; diff --git a/nixos/modules/services/misc/klipper.nix b/nixos/modules/services/misc/klipper.nix index 29497c15d22a..55c5a91e63fd 100644 --- a/nixos/modules/services/misc/klipper.nix +++ b/nixos/modules/services/misc/klipper.nix @@ -298,7 +298,7 @@ in popd ''; - restartTriggers = lib.optional (!cfg.mutableConfig) [ printerConfig ]; + restartTriggers = lib.optionals (!cfg.mutableConfig) [ printerConfig ]; serviceConfig = { ExecStart = "${cfg.package}/bin/klippy ${klippyArgs} ${cfg.configDir}/printer.cfg"; diff --git a/nixos/modules/services/misc/pinchflat.nix b/nixos/modules/services/misc/pinchflat.nix index 21b78ecde68e..bbdafc7d9fc1 100644 --- a/nixos/modules/services/misc/pinchflat.nix +++ b/nixos/modules/services/misc/pinchflat.nix @@ -16,6 +16,7 @@ let getExe literalExpression optional + optionals attrValues mapAttrs ; @@ -158,7 +159,7 @@ in "LOG_LEVEL=${cfg.logLevel}" "PHX_SERVER=true" ] - ++ optional cfg.selfhosted [ "RUN_CONTEXT=selfhosted" ] + ++ optionals cfg.selfhosted [ "RUN_CONTEXT=selfhosted" ] ++ optional (!isNull config.time.timeZone) "TZ=${config.time.timeZone}" ++ attrValues (mapAttrs (name: value: name + "=" + toString value) cfg.extraConfig); EnvironmentFile = optional (cfg.secretsFile != null) cfg.secretsFile; diff --git a/nixos/modules/services/monitoring/prometheus/exporters/restic.nix b/nixos/modules/services/monitoring/prometheus/exporters/restic.nix index 79d412bf0458..25f5d7f05373 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/restic.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/restic.nix @@ -16,7 +16,7 @@ let mapAttrs' splitString toUpper - optional + optionals optionalAttrs nameValuePair ; @@ -145,7 +145,7 @@ in LoadCredential = [ "RESTIC_PASSWORD_FILE:${cfg.passwordFile}" ] - ++ optional (cfg.repositoryFile != null) [ "RESTIC_REPOSITORY:${cfg.repositoryFile}" ]; + ++ optionals (cfg.repositoryFile != null) [ "RESTIC_REPOSITORY:${cfg.repositoryFile}" ]; }; environment = let diff --git a/nixos/modules/services/monitoring/vmagent.nix b/nixos/modules/services/monitoring/vmagent.nix index 0d451b4b96ed..d93cde0e9515 100644 --- a/nixos/modules/services/monitoring/vmagent.nix +++ b/nixos/modules/services/monitoring/vmagent.nix @@ -152,7 +152,7 @@ in startCLIList ++ lib.optionals (cfg.prometheusConfig != { }) [ "-promscrape.config=${prometheusConfigYml}" ] ); - LoadCredential = lib.optional (cfg.remoteWrite.basicAuthPasswordFile != null) [ + LoadCredential = lib.optionals (cfg.remoteWrite.basicAuthPasswordFile != null) [ "remote_write_basic_auth_password:${cfg.remoteWrite.basicAuthPasswordFile}" ]; }; diff --git a/nixos/modules/services/web-servers/garage.nix b/nixos/modules/services/web-servers/garage.nix index 66996312865c..31149b1d7ff3 100644 --- a/nixos/modules/services/web-servers/garage.nix +++ b/nixos/modules/services/web-servers/garage.nix @@ -133,7 +133,7 @@ in # if data_dir is a list, the actual path will in in the `path` attribute of each item # see https://garagehq.deuxfleurs.fr/documentation/reference-manual/configuration/#data_dir ++ lib.optional (lib.isList data_dir) (map (item: item.path) data_dir) - ++ lib.optional (lib.isString data_dir) [ data_dir ] + ++ lib.optionals (lib.isString data_dir) [ data_dir ] ); isDefault = lib.hasPrefix "/var/lib/garage"; isDefaultStateDirectory = lib.any isDefault paths; diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix index 264755d40277..7a0773e38514 100644 --- a/nixos/modules/services/web-servers/nginx/default.nix +++ b/nixos/modules/services/web-servers/nginx/default.nix @@ -1647,7 +1647,7 @@ in SystemCallFilter = [ "~@cpu-emulation @debug @keyring @mount @obsolete @privileged @setuid" ] - ++ optional cfg.enableQuicBPF [ "bpf" ]; + ++ optionals cfg.enableQuicBPF [ "bpf" ]; }; }; diff --git a/nixos/modules/services/web-servers/stargazer.nix b/nixos/modules/services/web-servers/stargazer.nix index cc16e0755ced..bd3a97f178a7 100644 --- a/nixos/modules/services/web-servers/stargazer.nix +++ b/nixos/modules/services/web-servers/stargazer.nix @@ -271,7 +271,7 @@ in "~CAP_SYS_BOOT" "~CAP_NET_ADMIN" ] - ++ lib.lists.optional (!cfg.allowCgiUser) [ + ++ lib.lists.optionals (!cfg.allowCgiUser) [ "~CAP_SETGID" "~CAP_SETUID" ]; @@ -279,7 +279,7 @@ in SystemCallFilter = [ "~@cpu-emulation @debug @keyring @mount @obsolete" ] - ++ lib.lists.optional (!cfg.allowCgiUser) [ "@privileged @setuid" ]; + ++ lib.lists.optionals (!cfg.allowCgiUser) [ "@privileged @setuid" ]; }; }; diff --git a/nixos/tests/appliance-repart-image.nix b/nixos/tests/appliance-repart-image.nix index 7422233828a3..d78637734b8f 100644 --- a/nixos/tests/appliance-repart-image.nix +++ b/nixos/tests/appliance-repart-image.nix @@ -90,7 +90,16 @@ in Minimize = "guess"; }; }; - }; + } + // (lib.genAttrs [ "squashfs" "erofs" "btrfs" "xfs" "swap" "empty" ] (fsType: { + repartConfig = { + Type = "linux-generic"; + Format = fsType; + + SizeMinBytes = "10M"; + SizeMaxBytes = "10M"; + }; + })); }; }; diff --git a/nixos/tests/kimai.nix b/nixos/tests/kimai.nix index 526aa7faeeb6..35a4e6c79b51 100644 --- a/nixos/tests/kimai.nix +++ b/nixos/tests/kimai.nix @@ -4,7 +4,7 @@ name = "kimai"; meta.maintainers = with lib.maintainers; [ peat-psuwit ]; - nodes.machine = + containers.machine = { ... }: { services.kimai.sites."localhost" = { diff --git a/pkgs/applications/editors/vscode/extensions/ms-windows-ai-studio.windows-ai-studio/default.nix b/pkgs/applications/editors/vscode/extensions/ms-windows-ai-studio.windows-ai-studio/default.nix index 5655402ef63c..4ee44d2104c1 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-windows-ai-studio.windows-ai-studio/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-windows-ai-studio.windows-ai-studio/default.nix @@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "windows-ai-studio"; publisher = "ms-windows-ai-studio"; - version = "1.6.10"; - hash = "sha256-ztzf1mrQT6/C89R5DkSNlxSXwyWgRi8uzawXAV7ZhSo="; + version = "1.6.11"; + hash = "sha256-J1hoK2yPkjl0NBy+7dzn3FJO54PQiBO52xt83N5B1QE="; }; meta = { diff --git a/pkgs/applications/gis/qgis/unwrapped-ltr.nix b/pkgs/applications/gis/qgis/unwrapped-ltr.nix index 8a836784edce..0c1289aa9d50 100644 --- a/pkgs/applications/gis/qgis/unwrapped-ltr.nix +++ b/pkgs/applications/gis/qgis/unwrapped-ltr.nix @@ -185,7 +185,7 @@ mkDerivation rec { "-DQGIS_MACAPP_BUNDLE=0" # Don't copy Qt into bundle; we fix paths in postFixup "-DSQLITE3_INCLUDE_DIR=${sqlite.dev}/include" # FindSqlite3.cmake incorrectly assumes framework ] - ++ lib.optional withServer [ + ++ lib.optionals withServer [ "-DWITH_SERVER=True" "-DQGIS_CGIBIN_SUBDIR=${placeholder "out"}/lib/cgi-bin" ] diff --git a/pkgs/applications/gis/qgis/unwrapped.nix b/pkgs/applications/gis/qgis/unwrapped.nix index 0a53e69ca588..cb0efdb25402 100644 --- a/pkgs/applications/gis/qgis/unwrapped.nix +++ b/pkgs/applications/gis/qgis/unwrapped.nix @@ -189,7 +189,7 @@ stdenv.mkDerivation rec { "-DSQLITE3_INCLUDE_DIR=${sqlite.dev}/include" "-DUSE_OPENCL=OFF" ] - ++ lib.optional withServer [ + ++ lib.optionals withServer [ "-DWITH_SERVER=True" "-DQGIS_CGIBIN_SUBDIR=${placeholder "out"}/lib/cgi-bin" ] diff --git a/pkgs/build-support/teleport/default.nix b/pkgs/build-support/teleport/default.nix index 8d51876e536a..22a686eb92f8 100644 --- a/pkgs/build-support/teleport/default.nix +++ b/pkgs/build-support/teleport/default.nix @@ -162,10 +162,10 @@ buildGoModule (finalAttrs: { ++ [ ./rdpclient.patch ] - ++ lib.optional (lib.versionOlder version "18.8.0") [ + ++ lib.optionals (lib.versionOlder version "18.8.0") [ ./0001-fix-add-nix-path-to-exec-env.patch ] - ++ lib.optional (lib.versionAtLeast version "18.8.0") [ + ++ lib.optionals (lib.versionAtLeast version "18.8.0") [ ./0001-fix-add-nix-path-to-exec-env-reexec.patch ]; diff --git a/pkgs/by-name/ai/airwin2rack/package.nix b/pkgs/by-name/ai/airwin2rack/package.nix index 1c330993fd43..14dc3fef16a5 100644 --- a/pkgs/by-name/ai/airwin2rack/package.nix +++ b/pkgs/by-name/ai/airwin2rack/package.nix @@ -192,7 +192,7 @@ stdenv.mkDerivation { license = with lib.licenses; [ mit ] - ++ lib.optional enableVCVRack [ + ++ lib.optionals enableVCVRack [ gpl3Plus cc-by-nc-40 unfreeRedistributable diff --git a/pkgs/by-name/ap/apache-orc/package.nix b/pkgs/by-name/ap/apache-orc/package.nix index 291eba91198b..0034206b1d3d 100644 --- a/pkgs/by-name/ap/apache-orc/package.nix +++ b/pkgs/by-name/ap/apache-orc/package.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "STOP_BUILD_ON_WARNING" false) (lib.cmakeBool "INSTALL_VENDORED_LIBS" false) ] - ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) [ + ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ # Fix (RiscV) cross-compilation # See https://github.com/apache/orc/issues/2334 (lib.cmakeFeature "HAS_PRE_1970_EXITCODE" "0") diff --git a/pkgs/by-name/ar/argo-workflows/package.nix b/pkgs/by-name/ar/argo-workflows/package.nix index a8f0b6fe331a..2a206fe6fb9b 100644 --- a/pkgs/by-name/ar/argo-workflows/package.nix +++ b/pkgs/by-name/ar/argo-workflows/package.nix @@ -9,16 +9,16 @@ buildGoModule (finalAttrs: { pname = "argo-workflows"; - version = "3.6.10"; + version = "4.0.5"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo-workflows"; tag = "v${finalAttrs.version}"; - hash = "sha256-TM/eK8biMxKV4SFJ1Lys+NPPeaHVjbBo83k2RH1Xi40="; + hash = "sha256-UmkUFuYFeuyqgdf/ByZkkulkVRregp53bvcyyEKgZQo="; }; - vendorHash = "sha256-Y/2+ykzcJdA5uwP1v9Z1wZtF3hBV2x7XZc7+FhPJP64="; + vendorHash = "sha256-UTBM1zd+HrC5bUadn0VSsO52HhqdPGzZwipQv7WOrNU="; doCheck = false; @@ -30,14 +30,23 @@ buildGoModule (finalAttrs: { installShellFiles ]; + preBuild = '' + mkdir -p ui/dist/app + # This build target could act as a web server, but this is just + # acting as a CLI. + # Provide a dummy UI file to allow the build to embed something + # without actually building the web content + echo "Built without static files" > ui/dist/app/index.html + ''; + ldflags = [ "-s" "-w" - "-X github.com/argoproj/argo-workflows/v3.buildDate=unknown" - "-X github.com/argoproj/argo-workflows/v3.gitCommit=${finalAttrs.src.rev}" - "-X github.com/argoproj/argo-workflows/v3.gitTag=${finalAttrs.src.rev}" - "-X github.com/argoproj/argo-workflows/v3.gitTreeState=clean" - "-X github.com/argoproj/argo-workflows/v3.version=${finalAttrs.version}" + "-X github.com/argoproj/argo-workflows/v4.buildDate=unknown" + "-X github.com/argoproj/argo-workflows/v4.gitCommit=${finalAttrs.src.rev}" + "-X github.com/argoproj/argo-workflows/v4.gitTag=${finalAttrs.src.rev}" + "-X github.com/argoproj/argo-workflows/v4.gitTreeState=clean" + "-X github.com/argoproj/argo-workflows/v4.version=${finalAttrs.version}" ]; postInstall = '' diff --git a/pkgs/by-name/ar/argo-workflows/staticfiles.go.mod b/pkgs/by-name/ar/argo-workflows/staticfiles.go.mod deleted file mode 100644 index 952de850dc72..000000000000 --- a/pkgs/by-name/ar/argo-workflows/staticfiles.go.mod +++ /dev/null @@ -1,3 +0,0 @@ -module bou.ke/staticfiles - -go 1.18 diff --git a/pkgs/by-name/ar/arti/package.nix b/pkgs/by-name/ar/arti/package.nix index 7f968b5902bf..34b9366e2a5d 100644 --- a/pkgs/by-name/ar/arti/package.nix +++ b/pkgs/by-name/ar/arti/package.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "arti"; - version = "2.5.1"; + version = "2.6.0"; src = fetchFromGitLab { domain = "gitlab.torproject.org"; @@ -21,18 +21,19 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "core"; repo = "arti"; tag = "arti-v${finalAttrs.version}"; - hash = "sha256-fPobYu2ADTeIwpeXyxQKh5yr1zw+yMQfqTkiZMMd8YY="; + hash = "sha256-ukGplnZz1O1Djh12COKk8FL/3rLmmWGyl0b816wRWBE="; }; # Working around a bug in cargo that appears with cargo-auditable, see # https://github.com/rust-secure-code/cargo-auditable/issues/124. postPatch = '' substituteInPlace crates/arti/Cargo.toml \ + --replace-fail '"http"' '"dep:http"' \ --replace-fail '"tokio-util"' '"dep:tokio-util"' ''; buildAndTestSubdir = "crates/arti"; - cargoHash = "sha256-+JQ+SkRLyLl4RUq69nIUn1zJ/DmYpVEICQO5o85FsNw="; + cargoHash = "sha256-/7sWTLeVolqliggn1Qw+kxqAeWENHgbCR6hK5Th2z+g="; nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ]; diff --git a/pkgs/by-name/as/astyle/package.nix b/pkgs/by-name/as/astyle/package.nix index 79078dd89637..dbd26c3d3c81 100644 --- a/pkgs/by-name/as/astyle/package.nix +++ b/pkgs/by-name/as/astyle/package.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { # upstream repo includes a build/ directory cmakeBuildDir = "_build"; - cmakeFlags = lib.optional asLibrary [ + cmakeFlags = lib.optionals asLibrary [ "-DBUILD_SHARED_LIBS=ON" ]; diff --git a/pkgs/by-name/ba/banjorecomp/package.nix b/pkgs/by-name/ba/banjorecomp/package.nix index 398a5df3a2bc..1427ed66730c 100644 --- a/pkgs/by-name/ba/banjorecomp/package.nix +++ b/pkgs/by-name/ba/banjorecomp/package.nix @@ -115,11 +115,9 @@ llvmPackages_21.stdenv.mkDerivation (finalAttrs: { runHook preInstall installBin BanjoRecompiled - install -Dm644 -t $out/share ../recompcontrollerdb.txt + install -Dm644 -t $out/share/banjorecomp ../recompcontrollerdb.txt install -Dm644 ../icons/app.png $out/share/icons/hicolor/512x512/apps/BanjoRecompiled.png - cp -r ../assets $out/share/ - ln -s $out/share/recompcontrollerdb.txt $out/bin/recompcontrollerdb.txt - ln -s $out/share/assets $out/bin/assets + cp -r ../assets $out/share/banjorecomp/ install -Dm644 -t $out/share/licenses/banjorecomp ../COPYING install -Dm644 -t $out/share/licenses/banjorecomp/N64ModernRuntime ../lib/N64ModernRuntime/COPYING @@ -134,9 +132,8 @@ llvmPackages_21.stdenv.mkDerivation (finalAttrs: { ) ''; - # The game will segfault when not run from the same directory as the binary. postFixup = '' - wrapProgram $out/bin/BanjoRecompiled --chdir "$out/bin/" + wrapProgram $out/bin/BanjoRecompiled --chdir "$out/share/banjorecomp" ''; meta = { diff --git a/pkgs/by-name/bb/bbedit/package.nix b/pkgs/by-name/bb/bbedit/package.nix index 018e8dedb6a7..e2a82850ce15 100644 --- a/pkgs/by-name/bb/bbedit/package.nix +++ b/pkgs/by-name/bb/bbedit/package.nix @@ -7,11 +7,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "bbedit"; - version = "15.5.5"; + version = "16.0.3"; src = fetchurl { url = "https://s3.amazonaws.com/BBSW-download/BBEdit_${finalAttrs.version}.dmg"; - hash = "sha256-DsrGj2id9XUf3n55s0OHoJnX4AQY5AqiP9skaXysghk="; + hash = "sha256-rPKunlxovqzf11NIYfqMmS4b3VORpxs8CLPth5wrNXI="; }; sourceRoot = "."; diff --git a/pkgs/by-name/be/berglas/package.nix b/pkgs/by-name/be/berglas/package.nix index 24fa07fa8766..382bc76c3312 100644 --- a/pkgs/by-name/be/berglas/package.nix +++ b/pkgs/by-name/be/berglas/package.nix @@ -35,16 +35,16 @@ in buildGoModule (finalAttrs: { pname = "berglas"; - version = "2.0.16"; + version = "2.0.17"; src = fetchFromGitHub { owner = "GoogleCloudPlatform"; repo = "berglas"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-I69p9xEWjIZAh5/1sk3G7ARuk0N5DCPTy2cnAA/9QB8="; + sha256 = "sha256-TRx152Xw26FpS6GcKjlC0hNsh/XAUp87h7QfhkYZr5M="; }; - vendorHash = "sha256-LOIQTUYippMd5P3m0mORJaTKhN89g9D6wksNPteG/NI="; + vendorHash = "sha256-gSa5ryDPhE0Sk4UXnaxWPdusIX8xeVykiH4lItfCFEs="; ldflags = [ "-s" diff --git a/pkgs/by-name/bo/bowtie2/package.nix b/pkgs/by-name/bo/bowtie2/package.nix index 5b1f4f3fc2e2..ce0f6e07f98d 100644 --- a/pkgs/by-name/bo/bowtie2/package.nix +++ b/pkgs/by-name/bo/bowtie2/package.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { perl ]; - cmakeFlags = lib.optional (!stdenv.hostPlatform.isx86) [ + cmakeFlags = lib.optionals (!stdenv.hostPlatform.isx86) [ "-DCMAKE_CXX_FLAGS=-I${finalAttrs.src}/third_party" ]; diff --git a/pkgs/by-name/bu/butane/package.nix b/pkgs/by-name/bu/butane/package.nix index 7897a9b2d95d..4a8fbd4085b4 100644 --- a/pkgs/by-name/bu/butane/package.nix +++ b/pkgs/by-name/bu/butane/package.nix @@ -6,23 +6,23 @@ buildGoModule (finalAttrs: { pname = "butane"; - version = "0.29.0"; + version = "2.27.0"; src = fetchFromGitHub { owner = "coreos"; - repo = "butane"; + repo = "ignition"; rev = "v${finalAttrs.version}"; - hash = "sha256-lijMfxhUBopwbfEP4fEgszXh7zaRz7Xy1Y8PmatXXTE="; + hash = "sha256-CjYiBcUdbfrQWpMzvKjFG53SPVkQyxbQ/8coQt7BuH8="; }; vendorHash = null; doCheck = false; - subPackages = [ "internal" ]; + subPackages = [ "butane/internal" ]; ldflags = [ - "-X github.com/coreos/butane/internal/version.Raw=v${finalAttrs.version}" + "-X github.com/coreos/ignition/v2/butane/internal/version.Raw=v${finalAttrs.version}" ]; postInstall = '' @@ -33,7 +33,7 @@ buildGoModule (finalAttrs: { description = "Translates human-readable Butane configs into machine-readable Ignition configs"; mainProgram = "butane"; license = lib.licenses.asl20; - homepage = "https://github.com/coreos/butane"; + homepage = "https://github.com/coreos/ignition"; maintainers = with lib.maintainers; [ elijahcaine ruuda diff --git a/pkgs/by-name/ca/catt/package.nix b/pkgs/by-name/ca/catt/package.nix index 3cb3aa427faa..1f2078c3ca4c 100644 --- a/pkgs/by-name/ca/catt/package.nix +++ b/pkgs/by-name/ca/catt/package.nix @@ -1,16 +1,21 @@ { lib, - fetchPypi, + fetchFromGitHub, + nix-update-script, python3Packages, + versionCheckHook, }: python3Packages.buildPythonApplication (finalAttrs: { pname = "catt"; - version = "0.13.1"; + version = "0.13.2"; pyproject = true; + __structuredAttrs = true; - src = fetchPypi { - inherit (finalAttrs) pname version; - hash = "sha256-hlCB06l4nzafvcnBNCXWiJsJNmP8n731bQgq5xvUZvM="; + src = fetchFromGitHub { + owner = "skorokithakis"; + repo = "catt"; + tag = "v${finalAttrs.version}"; + hash = "sha256-VjwYfaBoQ7HMKG6BztAB3mmQps42MoHSAiC2jHbRS/Q="; }; build-system = [ @@ -25,18 +30,33 @@ python3Packages.buildPythonApplication (finalAttrs: { python3Packages.yt-dlp ]; - doCheck = false; # attempts to access various URLs + nativeCheckInputs = [ + python3Packages.pytestCheckHook + ]; + + disabledTests = [ + # Require network access. + "test_stream_info_youtube_video" + "test_stream_info_youtube_playlist" + "test_stream_info_other_video" + "test_stream_info_direct_link" + ]; + + nativeInstallCheckInputs = [ versionCheckHook ]; + doInstallCheck = true; pythonImportsCheck = [ "catt" ]; + passthru.updateScript = nix-update-script { }; + meta = { - description = "Send media from online sources to Chromecast devices"; + description = "Allows you to send videos from many, many online sources to your Chromecast"; homepage = "https://github.com/skorokithakis/catt"; changelog = "https://github.com/skorokithakis/catt/releases/tag/v${finalAttrs.version}"; license = lib.licenses.bsd2; - maintainers = [ ]; + maintainers = [ lib.maintainers.aaravrav ]; mainProgram = "catt"; }; }) diff --git a/pkgs/by-name/cd/cdparanoia-iii/package.nix b/pkgs/by-name/cd/cdparanoia-iii/package.nix index de38e46763c3..88b11e8aae98 100644 --- a/pkgs/by-name/cd/cdparanoia-iii/package.nix +++ b/pkgs/by-name/cd/cdparanoia-iii/package.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: { ./freebsd.patch ] ++ lib.optional stdenv.hostPlatform.isMusl ./utils.patch - ++ lib.optional (!stdenv.hostPlatform.isDarwin) [ + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ (fetchpatch { url = "https://raw.githubusercontent.com/freebsd/freebsd-ports/42da4cdf2d9161fea8f7cdfc19aefda7707fadf4/audio/cdparanoia/files/patch-interface_low__interface.h"; hash = "sha256-bXrcRFCbU7/7/N+J8VGKGSxIB1m8XwoAlc/KTnt9wN0="; diff --git a/pkgs/by-name/cn/cnspec/package.nix b/pkgs/by-name/cn/cnspec/package.nix index 7977f3056694..07abce93d91c 100644 --- a/pkgs/by-name/cn/cnspec/package.nix +++ b/pkgs/by-name/cn/cnspec/package.nix @@ -9,18 +9,18 @@ buildGoModule (finalAttrs: { pname = "cnspec"; - version = "13.37.0"; + version = "13.38.1"; src = fetchFromGitHub { owner = "mondoohq"; repo = "cnspec"; tag = "v${finalAttrs.version}"; - hash = "sha256-/LV74WKk3UJeRJwtpCUEpDz5bnSVLZB7+nuALVvpR4g="; + hash = "sha256-I05Ud0aYvWmKsBq68G0jze0rqxYPnZUunLGEUHVQThQ="; }; proxyVendor = true; - vendorHash = "sha256-NvBJPHd86zIIipTUApiKYmXFLwNt1ZQrP+f2UEWTL9Q="; + vendorHash = "sha256-4ZhjlQqgf2k9KQ8GA4ZoFFl7KyH/zgGYTQwPJhKRsoo="; subPackages = [ "apps/cnspec" ]; diff --git a/pkgs/by-name/co/cogl/package.nix b/pkgs/by-name/co/cogl/package.nix index 07574e7282ac..95421d038559 100644 --- a/pkgs/by-name/co/cogl/package.nix +++ b/pkgs/by-name/co/cogl/package.nix @@ -116,11 +116,11 @@ stdenv.mkDerivation rec { ); NIX_CFLAGS_COMPILE = toString ( [ ] - ++ lib.optional stdenv.cc.isGNU [ + ++ lib.optionals stdenv.cc.isGNU [ # Fix build with gcc15 "-std=gnu17" ] - ++ lib.optional stdenv.cc.isClang [ + ++ lib.optionals stdenv.cc.isClang [ "-Wno-error=implicit-function-declaration" ] ); diff --git a/pkgs/by-name/co/commafeed/package.nix b/pkgs/by-name/co/commafeed/package.nix index 07f90cee6a01..54044fd9ff75 100644 --- a/pkgs/by-name/co/commafeed/package.nix +++ b/pkgs/by-name/co/commafeed/package.nix @@ -10,6 +10,7 @@ nixosTests, writeText, stdenv, + nix-update-script, }: let version = "7.3.0"; @@ -93,7 +94,16 @@ maven.buildMavenPackage { runHook postInstall ''; - passthru.tests = nixosTests.commafeed; + passthru = { + inherit frontend; + updateScript = nix-update-script { + extraArgs = [ + "--subpackage" + "frontend" + ]; + }; + tests = nixosTests.commafeed; + }; meta = { description = "Google Reader inspired self-hosted RSS reader"; diff --git a/pkgs/by-name/co/cosmic-ext-calculator/package.nix b/pkgs/by-name/co/cosmic-ext-calculator/package.nix index 34fe72dee161..c4d50d553ba6 100644 --- a/pkgs/by-name/co/cosmic-ext-calculator/package.nix +++ b/pkgs/by-name/co/cosmic-ext-calculator/package.nix @@ -15,24 +15,16 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-ext-calculator"; - version = "0.2.0"; + version = "0.2.1"; src = fetchFromGitHub { owner = "cosmic-utils"; repo = "calculator"; tag = finalAttrs.version; - hash = "sha256-qPo+Qi6P0m3rNA6Qo6iNsgzGyirPqzXk4nj3OG6IuZ0="; + hash = "sha256-t8xuM0B2eh2AbAhDgSOGapTwmmm9eC+wHsqwq4Jn5yU="; }; - cargoHash = "sha256-Pq1E4O6lZMe+wKJgQKDBmgdsJJsJTyK0FDXU53n+Di4="; - - # TODO: Remove in the next release - patches = [ - (fetchpatch { - url = "https://github.com/cosmic-utils/calculator/commit/fc176a8d5d8af7fd808d450a78635432db6b64e6.patch"; - hash = "sha256-amSB+67rwCUqfqOTFGCkInvoZmA//wAR0viuvNdPkuc="; - }) - ]; + cargoHash = "sha256-a4WckNyKXS71dT0uYbO7tUUmD0Dw8vSzrPp29O4aiAk="; nativeBuildInputs = [ libcosmicAppHook diff --git a/pkgs/by-name/cr/crispy-doom/package.nix b/pkgs/by-name/cr/crispy-doom/package.nix index c16b06157b8e..31a013f1ec56 100644 --- a/pkgs/by-name/cr/crispy-doom/package.nix +++ b/pkgs/by-name/cr/crispy-doom/package.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { for script in $(grep -lr '^#!/usr/bin/env python3$'); do patchShebangs $script; done ''; - configureFlags = lib.optional enableTruecolor [ "--enable-truecolor" ]; + configureFlags = lib.optionals enableTruecolor [ "--enable-truecolor" ]; nativeBuildInputs = [ autoreconfHook diff --git a/pkgs/by-name/ct/ctags-lsp/package.nix b/pkgs/by-name/ct/ctags-lsp/package.nix index 02e7e5fbb8c7..43f45e98c655 100644 --- a/pkgs/by-name/ct/ctags-lsp/package.nix +++ b/pkgs/by-name/ct/ctags-lsp/package.nix @@ -11,17 +11,18 @@ }: buildGoModule (finalAttrs: { pname = "ctags-lsp"; - version = "0.10.2"; + version = "0.11.0"; vendorHash = null; src = fetchFromGitHub { owner = "netmute"; repo = "ctags-lsp"; tag = "v${finalAttrs.version}"; - hash = "sha256-8cknVcXIuV7mmRMm87jn2l3qrfaY3CGzCZ0VW5Vb9xk="; + hash = "sha256-9VKXdffK46gl7MLN1kpSpQRIoJzu4nTS9C1r//qsOuo="; }; nativeBuildInputs = [ makeWrapper ]; + nativeCheckInputs = [ universal-ctags ]; ldflags = [ "-s" diff --git a/pkgs/by-name/de/deezer-desktop/package.nix b/pkgs/by-name/de/deezer-desktop/package.nix index 480c23654c53..1f12e1b5720b 100644 --- a/pkgs/by-name/de/deezer-desktop/package.nix +++ b/pkgs/by-name/de/deezer-desktop/package.nix @@ -8,15 +8,15 @@ }: let - version = "7.1.310"; + version = "7.1.320"; srcs = { x86_64-linux = fetchurl { url = "https://github.com/aunetx/deezer-linux/releases/download/v${version}/deezer-desktop-${version}-x64.tar.xz"; - hash = "sha256-G1nrkyQR3pduZulFE30DTCTfVMmZe7X6nl6bcDfSf8E="; + hash = "sha256-qCi7Yi2phMtN4IWo8eR0SFIe90TpOk2jqJKj3URSeNQ="; }; aarch64-linux = fetchurl { url = "https://github.com/aunetx/deezer-linux/releases/download/v${version}/deezer-desktop-${version}-arm64.tar.xz"; - hash = "sha256-fMShKodtD8/icEcpRIVZZ9H3KlF/GEpMyuihcDkviWk="; + hash = "sha256-xgpdmrM3+v9o0sKyYv09MxdD6xoTNff3hPgD+loyhNE="; }; }; diff --git a/pkgs/by-name/dh/dhtbsign/package.nix b/pkgs/by-name/dh/dhtbsign/package.nix index 484937ba095c..d08aac80dae5 100644 --- a/pkgs/by-name/dh/dhtbsign/package.nix +++ b/pkgs/by-name/dh/dhtbsign/package.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { strictDeps = true; env.NIX_CFLAGS_COMPILE = toString ( - lib.optional stdenv.cc.isGNU [ + lib.optionals stdenv.cc.isGNU [ # Required with newer GCC "-Wno-error=stringop-overflow" ] diff --git a/pkgs/by-name/di/diesel-cli/package.nix b/pkgs/by-name/di/diesel-cli/package.nix index 6ceab95ea938..912d9f8c50ba 100644 --- a/pkgs/by-name/di/diesel-cli/package.nix +++ b/pkgs/by-name/di/diesel-cli/package.nix @@ -27,15 +27,15 @@ assert lib.assertMsg (lib.elem true [ rustPlatform.buildRustPackage rec { pname = "diesel-cli"; - version = "2.3.12"; + version = "2.3.13"; src = fetchCrate { inherit version; crateName = "diesel_cli"; - hash = "sha256-cWroMSZqNMTH1+Pbiu8WiU4by2OHnXTgBHKSKaM3NYI="; + hash = "sha256-qi8L8NDdVmvRR4b9Pgey6jJm2KrGwqJxgp2qXi+lTrQ="; }; - cargoHash = "sha256-0JZcDAWsZ1ojZbUhghQt4rDmm+I/naQ5tllFRnTWCnM="; + cargoHash = "sha256-DIjkEMwnKB/cOOsxXY6Jy4hIxxwJ4mkdZcllAGi+8M0="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/di/dipc/package.nix b/pkgs/by-name/di/dipc/package.nix index e5055ae9d055..cd2e483cc6a7 100644 --- a/pkgs/by-name/di/dipc/package.nix +++ b/pkgs/by-name/di/dipc/package.nix @@ -2,20 +2,35 @@ lib, rustPlatform, fetchFromGitHub, + fetchpatch, + versionCheckHook, }: -rustPlatform.buildRustPackage { +rustPlatform.buildRustPackage (finalAttrs: { pname = "dipc"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "doprz"; repo = "dipc"; - rev = "b111b8cb997e3337974f861f44a73b557fb3c294"; - hash = "sha256-qP7LRwNIM92p5xQeuvQ03kwBM/HnRH+BniiKeYoihKw="; + tag = "v${finalAttrs.version}"; + hash = "sha256-sK4wyrEr1RCdug6uDjFQvMlZzrhPAcXi6yTiiWiPQcc="; }; - cargoHash = "sha256-F6EYnkquvTsw4C7rl28Y1h9i9ChGccwZGkYSVrsEhVk="; + cargoHash = "sha256-BCJXROjsaztzv6HWi1+i2GYCoeEgdXbYrEjpEdUvGFg="; + + patches = [ + # TODO: Remove it once it goes to the next version (>1.2.0) + # feat(theme): add Kanagawa theme (#45) + (fetchpatch { + name = "kanagawa-theme"; + url = "https://github.com/doprz/dipc/commit/e5a7d851117ccef1250f2a7999ab05dfd9538c53.patch"; + hash = "sha256-OteBFaRT+HdDtWNe5nLaoIgNjapzNOdZfAttOA7G+2E="; + }) + ]; + + nativeInstallCheckInputs = [ versionCheckHook ]; + doInstallCheck = true; meta = { description = "Convert your favorite images and wallpapers with your favorite color palettes/themes"; @@ -30,4 +45,4 @@ rustPlatform.buildRustPackage { ]; mainProgram = "dipc"; }; -} +}) diff --git a/pkgs/by-name/fc/fcitx5-anthy/package.nix b/pkgs/by-name/fc/fcitx5-anthy/package.nix index afb6c4af67d4..919c6870b0d6 100644 --- a/pkgs/by-name/fc/fcitx5-anthy/package.nix +++ b/pkgs/by-name/fc/fcitx5-anthy/package.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "fcitx5-anthy"; - version = "5.1.10"; + version = "5.1.11"; src = fetchurl { url = "https://download.fcitx-im.org/fcitx5/fcitx5-anthy/${pname}-${version}.tar.zst"; - hash = "sha256-t4ZdPAPvUbd2iQvfUlFlpUTjC+RG4nYuDFPIfpBZB4Y="; + hash = "sha256-nlmhUat8OmE/zhN+09vSeKVu+H9ptsHsKVyDWxl381Y="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/fc/fcitx5-lua/package.nix b/pkgs/by-name/fc/fcitx5-lua/package.nix index 4be767a17220..9926feebc993 100644 --- a/pkgs/by-name/fc/fcitx5-lua/package.nix +++ b/pkgs/by-name/fc/fcitx5-lua/package.nix @@ -16,7 +16,7 @@ in stdenv.mkDerivation (finalAttrs: { pname = "fcitx5-lua"; - version = "5.0.17"; + version = "5.0.18"; __structuredAttrs = true; @@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "fcitx"; repo = "fcitx5-lua"; tag = finalAttrs.version; - hash = "sha256-uEWa1wprWT8vDSHKXHUHEmXBtNHgj94hFuKvBm5GXqc="; + hash = "sha256-YelfFE9RNQbsZm81TauleQxyiR3qOquLRHpQa9kyqEU="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/fc/fcitx5-m17n/package.nix b/pkgs/by-name/fc/fcitx5-m17n/package.nix index 576ca57ebcd7..96df2e7fcdf2 100644 --- a/pkgs/by-name/fc/fcitx5-m17n/package.nix +++ b/pkgs/by-name/fc/fcitx5-m17n/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "fcitx5-m17n"; - version = "5.1.6"; + version = "5.1.7"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - hash = "sha256-+sQu/P28XV2nkS7rxy+pTXijY1mLvmwbePaJLUtLaBg="; + hash = "sha256-3OhOLmJW5LwnFv1ZJVDdPSaktp14PkMGnwjvM7cZ9iA="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/fc/fcitx5-table-extra/package.nix b/pkgs/by-name/fc/fcitx5-table-extra/package.nix index fc7a71845f72..476e8e455920 100644 --- a/pkgs/by-name/fc/fcitx5-table-extra/package.nix +++ b/pkgs/by-name/fc/fcitx5-table-extra/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "fcitx5-table-extra"; - version = "5.1.12"; + version = "5.1.13"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - hash = "sha256-PNljzjvT5WWoEPH7HbOcO9lDRkZHqiNXbaCifBKw5LI="; + hash = "sha256-xEWLzLzhsK+nuHJ+qDs5AENqMMV2IyyHA/giQTmQgro="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/fc/fcitx5-table-other/package.nix b/pkgs/by-name/fc/fcitx5-table-other/package.nix index 427261053431..d7c81d049382 100644 --- a/pkgs/by-name/fc/fcitx5-table-other/package.nix +++ b/pkgs/by-name/fc/fcitx5-table-other/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "fcitx5-table-other"; - version = "5.1.7"; + version = "5.1.8"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - hash = "sha256-PoYDy0p/vflwVr5yCox2uSvr4ir6k2Yn1AQHmTw03Zk="; + hash = "sha256-WkofkNwT4qtcztspLXY/ysC03Y4PltoNpvvoYtuC2E4="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/fi/fireplace/package.nix b/pkgs/by-name/fi/fireplace/package.nix index 1a41a09d851a..0d5fff32bc74 100644 --- a/pkgs/by-name/fi/fireplace/package.nix +++ b/pkgs/by-name/fi/fireplace/package.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { hash = "sha256-2NUE/zaFoGwkZxgvVCYXxToiL23aVUFwFNlQzEq9GEc="; }; - makeFlags = lib.optional stdenv.hostPlatform.isDarwin [ "CC=cc" ]; + makeFlags = lib.optionals stdenv.hostPlatform.isDarwin [ "CC=cc" ]; meta = { description = "Cozy fireplace in your terminal"; diff --git a/pkgs/by-name/fr/frankenphp/package.nix b/pkgs/by-name/fr/frankenphp/package.nix index a8822810d1fb..06aea4fcac31 100644 --- a/pkgs/by-name/fr/frankenphp/package.nix +++ b/pkgs/by-name/fr/frankenphp/package.nix @@ -80,7 +80,7 @@ buildGoModule (finalAttrs: { "-X 'github.com/caddyserver/caddy/v2.CustomVersion=FrankenPHP ${finalAttrs.version} PHP ${phpUnwrapped.version} Caddy'" # pie mode is only available with pkgsMusl, it also automatically add -buildmode=pie to $GOFLAGS ] - ++ (lib.optional pieBuild [ "-static-pie" ]); + ++ (lib.optionals pieBuild [ "-static-pie" ]); preBuild = '' export CGO_CFLAGS="$(${phpConfig} --includes)" diff --git a/pkgs/by-name/fz/fzf-zsh-plugin/package.nix b/pkgs/by-name/fz/fzf-zsh-plugin/package.nix index 71b3f7e4a3df..856fd53e94c7 100644 --- a/pkgs/by-name/fz/fzf-zsh-plugin/package.nix +++ b/pkgs/by-name/fz/fzf-zsh-plugin/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation { pname = "fzf-zsh-plugin"; - version = "1.0.0-unstable-2026-08-01"; + version = "1.0.0-unstable-2026-09-07"; src = fetchFromGitHub { owner = "unixorn"; repo = "fzf-zsh-plugin"; - rev = "82c08aa8ed8d3cc2173d8b820af246634519b21d"; - hash = "sha256-rEd3c2KjmF9TY2jzDV1CI1ku6Hy+zQ8Z41TaYsS+uYc="; + rev = "e3894e83a3e8a3e8751456d56c51bb49b34e8d2b"; + hash = "sha256-MN5CbwzTT7G0zZIkXcZNrmcey7g85ODG28/fQq9+wbQ="; }; strictDeps = true; diff --git a/pkgs/by-name/gd/gdevelop/darwin.nix b/pkgs/by-name/gd/gdevelop/darwin.nix index 18ddbeaacbda..f8fb70d9fa56 100644 --- a/pkgs/by-name/gd/gdevelop/darwin.nix +++ b/pkgs/by-name/gd/gdevelop/darwin.nix @@ -18,7 +18,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { src = fetchurl { url = "https://github.com/4ian/GDevelop/releases/download/v${version}/GDevelop-5-${version}-universal-mac.zip"; - hash = "sha256-U1qcF7HMlD9VS/Fw3yDjNOhtvNrtPhjYFLIAb/0/AW0="; + hash = "sha256-I63Pdgyyck3x47Lb+p+92OfeKISxLI0Y8yVw4Hhor+A="; }; sourceRoot = "."; diff --git a/pkgs/by-name/gd/gdevelop/linux.nix b/pkgs/by-name/gd/gdevelop/linux.nix index 9cb3be3492ce..1716a6a59354 100644 --- a/pkgs/by-name/gd/gdevelop/linux.nix +++ b/pkgs/by-name/gd/gdevelop/linux.nix @@ -13,7 +13,7 @@ let if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { url = "https://github.com/4ian/GDevelop/releases/download/v${version}/GDevelop-5-${version}.AppImage"; - hash = "sha256-67tg09jIs2z2atI9i6W8jhMGhbjpHsfpgKklAkuXJEw="; + hash = "sha256-U5MW8NDJLDEcxFxYpRViv22YzRrdAlekE/JWUQIwzYQ="; } else throw "${pname}-${version} is not supported on ${stdenv.hostPlatform.system}"; diff --git a/pkgs/by-name/gd/gdevelop/package.nix b/pkgs/by-name/gd/gdevelop/package.nix index 3c95c94c4c97..be3f17c5b773 100644 --- a/pkgs/by-name/gd/gdevelop/package.nix +++ b/pkgs/by-name/gd/gdevelop/package.nix @@ -4,7 +4,7 @@ callPackage, }: let - version = "5.6.280"; + version = "5.6.281"; pname = "gdevelop"; meta = { description = "Graphical Game Development Studio"; diff --git a/pkgs/by-name/ge/gelly/package.nix b/pkgs/by-name/ge/gelly/package.nix index 7f06547a8787..9d062494d3fa 100644 --- a/pkgs/by-name/ge/gelly/package.nix +++ b/pkgs/by-name/ge/gelly/package.nix @@ -19,16 +19,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "gelly"; - version = "1.11.0"; + version = "1.11.1"; src = fetchFromGitHub { owner = "Fingel"; repo = "gelly"; tag = "v${finalAttrs.version}"; - hash = "sha256-uCUuFypeJKyJ726Y+xXlYGIxm8q/UCHzwNogE1Y+d8E="; + hash = "sha256-Won8IYaDbd6NljLZU+Ih/7gnUmXnhdpoCanwBbloVFU="; }; - cargoHash = "sha256-F05I8BvXXsLF8ApHBCHLxtY3KbBP6Nf+XG/LKvnFXiE="; + cargoHash = "sha256-yCJydR4BGd7HcKnOl4bquoD3QzI4l5WBrOeXiF5IdHI="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/go/go-arch-lint/package.nix b/pkgs/by-name/go/go-arch-lint/package.nix index e1c654d14fad..52497538eeb3 100644 --- a/pkgs/by-name/go/go-arch-lint/package.nix +++ b/pkgs/by-name/go/go-arch-lint/package.nix @@ -14,13 +14,13 @@ buildGo127Module (finalAttrs: { pname = "go-arch-lint"; - version = "1.18.0"; + version = "1.19.0"; src = fetchFromGitHub { owner = "fe3dback"; repo = "go-arch-lint"; tag = "v${finalAttrs.version}"; - hash = "sha256-Pmtp1pbRKmV6TK8oQV01OG/YPovU2Ch86EBwb7WWi4U="; + hash = "sha256-eA+xM7WSOyzj3uhVUT/6dHGoHx1tsBCCKXPLOintimE="; }; vendorHash = "sha256-USP8gFDd4ii8yO/dch3OHVrDsVUy4HgRxBvnFwAbHeU="; diff --git a/pkgs/by-name/go/go-grip/package.nix b/pkgs/by-name/go/go-grip/package.nix index f8f27f72eae3..c42c1ec987ad 100644 --- a/pkgs/by-name/go/go-grip/package.nix +++ b/pkgs/by-name/go/go-grip/package.nix @@ -5,13 +5,13 @@ }: buildGoModule (finalAttrs: { pname = "go-grip"; - version = "0.9.2"; + version = "0.10.0"; src = fetchFromGitHub { owner = "chrishrb"; repo = "go-grip"; tag = "v${finalAttrs.version}"; - hash = "sha256-O3f7kLlcWfpxZb2mw+nNjmsGX4YiuzIfN5e6KE+CJDs="; + hash = "sha256-xi9h9sykuhL2Wh08zhwE1ZT1ncd6GCmQF6uuLU0vpCI="; }; vendorHash = "sha256-QsLiCsFY6nI85jsEZtAgmObEKpBSZWhzZk+TlukM8JU="; diff --git a/pkgs/by-name/gt/gtest/package.nix b/pkgs/by-name/gt/gtest/package.nix index 6da6717c1e25..9e4fcabcb40a 100644 --- a/pkgs/by-name/gt/gtest/package.nix +++ b/pkgs/by-name/gt/gtest/package.nix @@ -70,6 +70,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/google/googletest"; license = lib.licenses.bsd3; platforms = lib.platforms.all; - maintainers = [ ]; + maintainers = with lib.maintainers; [ stephen-huan ]; }; }) diff --git a/pkgs/by-name/ha/handy/package.nix b/pkgs/by-name/ha/handy/package.nix index d6bb5d4b53f7..fd3e12199868 100644 --- a/pkgs/by-name/ha/handy/package.nix +++ b/pkgs/by-name/ha/handy/package.nix @@ -55,7 +55,7 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "handy"; - version = "0.9.1"; + version = "0.9.6"; __structuredAttrs = true; @@ -63,11 +63,11 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "cjpais"; repo = "Handy"; tag = "v${finalAttrs.version}"; - hash = "sha256-GuHMK98wmqv2ryrMF243CjRGMbjZ0ykX89RJbjwaP6U="; + hash = "sha256-6eNa9iNjwKgLL8t72GeMHTxjyHaeVl+9VF/QWjlHzts="; }; cargoRoot = "src-tauri"; - cargoHash = "sha256-CNHWa70nAYbdgXO62s1iaW6nBacorgEVZIgkMZx/CNs="; + cargoHash = "sha256-fzTklIGMCE2ugLc6KIj3XDqxB4qjhtm14LKBUb8kBWE="; nativeInstallInputs = [ jq ]; @@ -246,9 +246,9 @@ rustPlatform.buildRustPackage (finalAttrs: { outputHash = { - "x86_64-linux" = "sha256-1jZBFvX9Ch3jNGPgSnOE8yNCXlHru7tcMJZ5uNZtE1g="; - "aarch64-linux" = "sha256-MsY2tOdBg11OMyQLRkLoVKxyrcqa0yVddfcYuIVWSxw="; - "aarch64-darwin" = "sha256-Fw0va7mq0F36qa15bDFVL01Q5pEprWhza78CzurLoLg="; + "x86_64-linux" = "sha256-huOC2smHU0sGIxeyvWmzdewUEpKHfdSGNhf9xWpH9Jk="; + "aarch64-linux" = "sha256-UDn8nIgIx23ampe43Qr0j9h+hlU9g1QzzlIlbRH2CKs="; + "aarch64-darwin" = "sha256-8Rw4iNvqeq/sRvZpbtZo0f0iPAwu1TeB8Y+ut4kb9uw="; } .${stdenv.hostPlatform.system}; diff --git a/pkgs/by-name/hd/hdhomerun-config-gui/package.nix b/pkgs/by-name/hd/hdhomerun-config-gui/package.nix deleted file mode 100644 index b9388f958137..000000000000 --- a/pkgs/by-name/hd/hdhomerun-config-gui/package.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - libhdhomerun, - pkg-config, - gtk2, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "hdhomerun-config-gui"; - version = "20250506"; - - src = fetchurl { - url = "https://download.silicondust.com/hdhomerun/hdhomerun_config_gui_${finalAttrs.version}.tgz"; - sha256 = "sha256-bmAdPR5r2mKCncQSSHZ6GYtAk3scHpatnmXGy+a/654="; - }; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - gtk2 - libhdhomerun - ]; - - configureFlags = [ "CPPFLAGS=-I${libhdhomerun}/include/hdhomerun" ]; - makeFlags = [ "SUBDIRS=src" ]; - - installPhase = '' - runHook preInstall - install -vDm 755 src/hdhomerun_config_gui $out/bin/hdhomerun_config_gui - runHook postInstall - ''; - - meta = { - description = "GUI for configuring Silicondust HDHomeRun TV tuners"; - homepage = "https://www.silicondust.com/support/linux"; - license = lib.licenses.gpl3Only; - platforms = lib.platforms.linux; - maintainers = [ lib.maintainers.louisdk1 ]; - mainProgram = "hdhomerun_config_gui"; - }; -}) diff --git a/pkgs/by-name/hi/highlight/package.nix b/pkgs/by-name/hi/highlight/package.nix index 1e0ef0eea4e5..65109bbd4281 100644 --- a/pkgs/by-name/hi/highlight/package.nix +++ b/pkgs/by-name/hi/highlight/package.nix @@ -81,6 +81,7 @@ let changelog = "https://gitlab.com/saalen/highlight/-/blob/${finalAttrs.src.tag}/ChangeLog.adoc?ref_type=tags#user-content-highlight-${lib.versions.major finalAttrs.version}-${lib.versions.minor finalAttrs.version}"; platforms = lib.platforms.unix; maintainers = [ ]; + license = lib.licenses.gpl3Plus; }; }); diff --git a/pkgs/by-name/hj/hjson-go/package.nix b/pkgs/by-name/hj/hjson-go/package.nix index 98f1480ecd33..e75ab3fd7ea7 100644 --- a/pkgs/by-name/hj/hjson-go/package.nix +++ b/pkgs/by-name/hj/hjson-go/package.nix @@ -6,13 +6,13 @@ buildGoModule (finalAttrs: { pname = "hjson-go"; - version = "4.7.0"; + version = "4.7.1"; src = fetchFromGitHub { owner = "hjson"; repo = "hjson-go"; rev = "v${finalAttrs.version}"; - hash = "sha256-tQ4KvDS3f/EbCoONUWJpGqLOC9pMm1HO7eZXZ7xpVB8="; + hash = "sha256-PCDTXpTClOw9n8xiW5uKp7OhuG5uO9PeL70PR3I5/HM="; }; vendorHash = null; diff --git a/pkgs/by-name/in/incus-compose/package.nix b/pkgs/by-name/in/incus-compose/package.nix index 196e10e2f471..27109904d3b3 100644 --- a/pkgs/by-name/in/incus-compose/package.nix +++ b/pkgs/by-name/in/incus-compose/package.nix @@ -7,14 +7,14 @@ buildGoModule (finalAttrs: { pname = "incus-compose"; - version = "1.3.2"; + version = "1.3.3"; __structuredAttrs = true; src = fetchFromGitHub { owner = "lxc"; repo = "incus-compose"; tag = "v${finalAttrs.version}"; - hash = "sha256-2mKWKFcWxWFqJx2N8+dhhes1AxjfmGLPEQzgKW2Bo04="; + hash = "sha256-pti1Zj9a4IdySKQGF7buajz1JzFwer1Rl4gzPG+k42I="; }; vendorHash = "sha256-ji1QGBQWDpHJ+kMS/TK7cNFyqeEcBQK9fn1F5zenIBc="; diff --git a/pkgs/by-name/iv/ivpn-service/package.nix b/pkgs/by-name/iv/ivpn-service/package.nix index 7eae387ebe1a..981f995bab70 100644 --- a/pkgs/by-name/iv/ivpn-service/package.nix +++ b/pkgs/by-name/iv/ivpn-service/package.nix @@ -17,7 +17,7 @@ }: buildGoModule (finalAttrs: { pname = "ivpn-service"; - version = "3.15.13"; + version = "3.15.15"; buildInputs = [ wirelesstools @@ -29,7 +29,7 @@ buildGoModule (finalAttrs: { owner = "ivpn"; repo = "desktop-app"; tag = "v${finalAttrs.version}"; - hash = "sha256-F5MhJ09ioqL4Xf4r2cdXUKmkK8ebj/qRFWfxKuodH3k="; + hash = "sha256-CQOmVVTegOZVwWjGzSek6BehdJCQ5ddOR6M9seWqZRw="; }; strictDeps = true; diff --git a/pkgs/by-name/iv/ivpn-ui/package.nix b/pkgs/by-name/iv/ivpn-ui/package.nix index 0b15ed6ce53b..ddefb629d48e 100644 --- a/pkgs/by-name/iv/ivpn-ui/package.nix +++ b/pkgs/by-name/iv/ivpn-ui/package.nix @@ -11,18 +11,18 @@ }: buildNpmPackage (finalAttrs: { pname = "ivpn-ui"; - version = "3.15.13"; + version = "3.15.15"; src = fetchFromGitHub { owner = "ivpn"; repo = "desktop-app"; tag = "v${finalAttrs.version}"; - hash = "sha256-F5MhJ09ioqL4Xf4r2cdXUKmkK8ebj/qRFWfxKuodH3k="; + hash = "sha256-CQOmVVTegOZVwWjGzSek6BehdJCQ5ddOR6M9seWqZRw="; }; sourceRoot = "source/ui"; - npmDepsHash = "sha256-Q8qrAo7+GrbUUx33t89/N4WHnJLbdpMSpBm5rLclJC0="; + npmDepsHash = "sha256-n6O8yNGeYApew694jA26EGil9qdnwSd2ymfo2fIIrxU="; nativeBuildInputs = [ copyDesktopItems diff --git a/pkgs/by-name/iv/ivpn/package.nix b/pkgs/by-name/iv/ivpn/package.nix index bd802836e0cc..2a82ecc0e237 100644 --- a/pkgs/by-name/iv/ivpn/package.nix +++ b/pkgs/by-name/iv/ivpn/package.nix @@ -7,7 +7,7 @@ }: buildGoModule (finalAttrs: { pname = "ivpn"; - version = "3.15.13"; + version = "3.15.15"; buildInputs = [ wirelesstools ]; @@ -15,7 +15,7 @@ buildGoModule (finalAttrs: { owner = "ivpn"; repo = "desktop-app"; tag = "v${finalAttrs.version}"; - hash = "sha256-F5MhJ09ioqL4Xf4r2cdXUKmkK8ebj/qRFWfxKuodH3k="; + hash = "sha256-CQOmVVTegOZVwWjGzSek6BehdJCQ5ddOR6M9seWqZRw="; }; __structuredAttrs = true; diff --git a/pkgs/by-name/ji/jing-trang/package.nix b/pkgs/by-name/ji/jing-trang/package.nix index 8e03b7f8d8e1..ec92b36b561a 100644 --- a/pkgs/by-name/ji/jing-trang/package.nix +++ b/pkgs/by-name/ji/jing-trang/package.nix @@ -65,5 +65,6 @@ stdenv.mkDerivation (finalAttrs: { binaryBytecode # source bundles dependencies as jars ]; maintainers = [ lib.maintainers.bjornfor ]; + license = lib.licenses.bsd3; }; }) diff --git a/pkgs/by-name/k0/k0sctl/package.nix b/pkgs/by-name/k0/k0sctl/package.nix index 362098ed7d74..38341b097e71 100644 --- a/pkgs/by-name/k0/k0sctl/package.nix +++ b/pkgs/by-name/k0/k0sctl/package.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "k0sctl"; - version = "0.31.1"; + version = "0.32.2"; src = fetchFromGitHub { owner = "k0sproject"; repo = "k0sctl"; tag = "v${version}"; - hash = "sha256-AbSHyc+Orclm2Cun9QTBqC5AxN1+QOveNzBqzX62vBA="; + hash = "sha256-HD2jH9hQQBblewS57dYw8IBnumE2sbslHyX52fTn/tQ="; }; - vendorHash = "sha256-zc/6fC6VQJp7g2URWivaGW0APVHMa+uyHlBPM4b0bf8="; + vendorHash = "sha256-NHPFBlDtSA43OWnp7uWNIw6B7G1/EHuO8fwShg1Q9fI="; ldflags = [ "-s" @@ -28,6 +28,11 @@ buildGoModule rec { "-X=github.com/carlmjohnson/versioninfo.Revision=v${version}" ]; + checkFlags = [ + # requires sudo + "-skip=^TestLocalBinaryProviderCreatesParentDir$" + ]; + nativeBuildInputs = [ installShellFiles ]; postInstall = '' diff --git a/pkgs/by-name/k8/k8sgpt/package.nix b/pkgs/by-name/k8/k8sgpt/package.nix index acddfbda22bd..70c097a95e4b 100644 --- a/pkgs/by-name/k8/k8sgpt/package.nix +++ b/pkgs/by-name/k8/k8sgpt/package.nix @@ -8,7 +8,7 @@ buildGoModule (finalAttrs: { pname = "k8sgpt"; - version = "0.4.37"; + version = "0.4.38"; nativeBuildInputs = [ installShellFiles @@ -18,7 +18,7 @@ buildGoModule (finalAttrs: { owner = "k8sgpt-ai"; repo = "k8sgpt"; rev = "v${finalAttrs.version}"; - hash = "sha256-yXTLDMk9A+urFrjvgZQu6zdojuXUo3Vl49JalMveTr0="; + hash = "sha256-9u8cf/hmaOhYWjxOX5GLsz5sTXvAkTLhf1xO5OoQ1yg="; }; vendorHash = "sha256-OSpu+04r2Pn9D8TAKMIhAy5A4qbJQneoMQ19mr8RbRQ="; diff --git a/pkgs/by-name/ki/kicad/base.nix b/pkgs/by-name/ki/kicad/base.nix index 55976ff0e8c9..92b031670c6c 100644 --- a/pkgs/by-name/ki/kicad/base.nix +++ b/pkgs/by-name/ki/kicad/base.nix @@ -121,6 +121,7 @@ stdenv.mkDerivation (finalAttrs: { (cmakeBool "KICAD_SANITIZE_ADDRESS" sanitizeAddress) (cmakeBool "KICAD_SANITIZE_THREADS" sanitizeThreads) (cmakeBool "KICAD_SPICE" (!(stable && !withNgspice))) + (cmakeBool "KICAD_UPDATE_CHECK" false) ] ++ optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [ (cmakeFeature "CMAKE_CTEST_ARGUMENTS" "--exclude-regex;'qa_spice|qa_cli'") diff --git a/pkgs/by-name/kt/ktls-utils/package.nix b/pkgs/by-name/kt/ktls-utils/package.nix index f11dfffa4f47..5c8a02a09236 100644 --- a/pkgs/by-name/kt/ktls-utils/package.nix +++ b/pkgs/by-name/kt/ktls-utils/package.nix @@ -42,9 +42,9 @@ stdenv.mkDerivation (finalAttrs: { "man" ]; - configureFlags = lib.optional withSystemd [ "--with-systemd" ]; + configureFlags = lib.optionals withSystemd [ "--with-systemd" ]; - makeFlags = lib.optional withSystemd [ "unitdir=$(out)/lib/systemd/system" ]; + makeFlags = lib.optionals withSystemd [ "unitdir=$(out)/lib/systemd/system" ]; doCheck = true; diff --git a/pkgs/by-name/ku/kubeseal/package.nix b/pkgs/by-name/ku/kubeseal/package.nix index 0795477e27bd..3853f892f230 100644 --- a/pkgs/by-name/ku/kubeseal/package.nix +++ b/pkgs/by-name/ku/kubeseal/package.nix @@ -2,20 +2,21 @@ lib, buildGoModule, fetchFromGitHub, + versionCheckHook, }: buildGoModule (finalAttrs: { pname = "kubeseal"; - version = "0.38.4"; + version = "0.39.1"; src = fetchFromGitHub { owner = "bitnami"; repo = "sealed-secrets"; - rev = "v${finalAttrs.version}"; - sha256 = "sha256-cg9YEY78miw8BRX9CCIeWqdAeJDsFSr6VvgRJFYzREU="; + tag = "v${finalAttrs.version}"; + hash = "sha256-vmvKD6Rk/xCw0hpGmus9JOG2JBStqzTSl09QGYMcOjQ="; }; - vendorHash = "sha256-1RATVZIeWZFceLttnqnDgXHyUsjRvkHAnsypABW/WDE="; + vendorHash = "sha256-JzBl9jOGYstoimv8bdy2t1DSvchFMl73zdxeY1Vagog="; subPackages = [ "cmd/kubeseal" ]; @@ -25,6 +26,9 @@ buildGoModule (finalAttrs: { "-X main.VERSION=${finalAttrs.version}" ]; + nativeInstallCheckInputs = [ versionCheckHook ]; + doInstallCheck = true; + meta = { description = "Kubernetes controller and tool for one-way encrypted Secrets"; mainProgram = "kubeseal"; diff --git a/pkgs/by-name/li/libretroPackages/cores/dosbox.nix b/pkgs/by-name/li/libretroPackages/cores/dosbox.nix index a8f4d16bff88..82ab31c51be2 100644 --- a/pkgs/by-name/li/libretroPackages/cores/dosbox.nix +++ b/pkgs/by-name/li/libretroPackages/cores/dosbox.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "dosbox"; - version = "0-unstable-2026-04-20"; + version = "0-unstable-2026-09-05"; src = fetchFromGitHub { owner = "libretro"; repo = "dosbox-libretro"; - rev = "4024bf0048c261db58ef98cb5e16de291c429f4e"; - hash = "sha256-sHq4xObXvgpaEnqtjJikN8g/io6FQdZWztifzSGPdH4="; + rev = "988aa330d10b1423873ebfd8dcb6106df2538c44"; + hash = "sha256-yRipBvCzDyceBI35iHFMZPpl7md5fImRAQ8Azr7z9Rs="; }; env.CXXFLAGS = "-std=gnu++11"; diff --git a/pkgs/by-name/li/libretroPackages/cores/opera.nix b/pkgs/by-name/li/libretroPackages/cores/opera.nix index 30ad06509fb1..5170847d3600 100644 --- a/pkgs/by-name/li/libretroPackages/cores/opera.nix +++ b/pkgs/by-name/li/libretroPackages/cores/opera.nix @@ -6,13 +6,13 @@ }: mkLibretroCore { core = "opera"; - version = "0-unstable-2026-08-04"; + version = "0-unstable-2026-08-21"; src = fetchFromGitHub { owner = "libretro"; repo = "opera-libretro"; - rev = "636a8dd6340bce7073168ddefd29841fc5e2d213"; - hash = "sha256-s2pZ66rLt5aRPpl3J5ZeoGP2sibW7/PYO/ZnjeLjHV8="; + rev = "a501a278d057b952d1ad6165549c59ab178ca497"; + hash = "sha256-eDZ11SD6ZMeXfRZk24uIM/96t7bXVnSTzHmjRiSwuU0="; }; makefile = "Makefile"; diff --git a/pkgs/by-name/ma/mado/package.nix b/pkgs/by-name/ma/mado/package.nix index 1fb4a74ea43a..15125ef0deb6 100644 --- a/pkgs/by-name/ma/mado/package.nix +++ b/pkgs/by-name/ma/mado/package.nix @@ -10,16 +10,16 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "mado"; - version = "0.3.1"; + version = "0.3.2"; src = fetchFromGitHub { owner = "akiomik"; repo = "mado"; tag = "v${finalAttrs.version}"; - hash = "sha256-UpkzUeFSLpTjTcf5yEpQDJVDZXL9DEuvw0Hx4r0hG7o="; + hash = "sha256-lmgIvdGH+vO/fVPow1yATDn+SzOX7aatG8F6ZKZyZiU="; }; - cargoHash = "sha256-3Wtr+o59SqAjDPLZxTcjK92FF/+O0eXwehnJIRfV2zQ="; + cargoHash = "sha256-5qlpKlI/oJR/AzTrVNnIYFJb46k1YHVjRarqF6vUp6w="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ma/mariokart64recomp/package.nix b/pkgs/by-name/ma/mariokart64recomp/package.nix index 2f6ca9ff8149..ed08a573c88e 100644 --- a/pkgs/by-name/ma/mariokart64recomp/package.nix +++ b/pkgs/by-name/ma/mariokart64recomp/package.nix @@ -115,12 +115,10 @@ llvmPackages_19.stdenv.mkDerivation (finalAttrs: { runHook preInstall installBin MarioKart64Recompiled - install -Dm644 -t $out/share ../recompcontrollerdb.txt + install -Dm644 -t $out/share/mariokart64recomp ../recompcontrollerdb.txt install -Dm644 ../icons/512.png $out/share/icons/hicolor/512x512/apps/MarioKart64Recompiled.png install -Dm644 ../flatpak/io.github.mariokart64recomp.mariokart64recomp.desktop $out/share/applications/MarioKart64Recompiled.desktop - cp -r ../assets $out/share/ - ln -s $out/share/recompcontrollerdb.txt $out/bin/recompcontrollerdb.txt - ln -s $out/share/assets $out/bin/assets + cp -r ../assets $out/share/mariokart64recomp/ install -Dm644 -t $out/share/licenses/mariokart64recompiled ../COPYING install -Dm644 -t $out/share/licenses/mariokart64recompiled/N64ModernRuntime ../lib/N64ModernRuntime/COPYING @@ -137,9 +135,8 @@ llvmPackages_19.stdenv.mkDerivation (finalAttrs: { ) ''; - # The game will segfault when not run from the same directory as the binary. postFixup = '' - wrapProgram $out/bin/MarioKart64Recompiled --chdir "$out/bin/" + wrapProgram $out/bin/MarioKart64Recompiled --chdir "$out/share/mariokart64recomp" ''; meta = { diff --git a/pkgs/by-name/ma/masterpdfeditor/package.nix b/pkgs/by-name/ma/masterpdfeditor/package.nix index f9df3696180b..fa926431b0e1 100644 --- a/pkgs/by-name/ma/masterpdfeditor/package.nix +++ b/pkgs/by-name/ma/masterpdfeditor/package.nix @@ -14,10 +14,9 @@ nix-update, writeShellScript, }: - stdenv.mkDerivation (finalAttrs: { pname = "masterpdfeditor"; - version = "5.9.98"; + version = "5.9.99"; src = let @@ -29,8 +28,8 @@ stdenv.mkDerivation (finalAttrs: { aarch64-linux = "https://code-industry.net/public/master-pdf-editor-${finalAttrs.version}-qt5.arm64.tar.gz"; }; hash = selectSystem { - x86_64-linux = "sha256-KNAssyWLeMqtMyZQIF6Qr1K/9tioC4cD84lL9c1iMgM="; - aarch64-linux = "sha256-+jNXO4fbbkh9Uea0N+0fJbHRMu9zS/d7o8W4D2+7kMI="; + x86_64-linux = "sha256-ksVuJyuImstESVwHUmOUv6aERosg6g5bSsRvPSf5EVM="; + aarch64-linux = "sha256-IxWYzb1assCMBNjj5VZbfuhkzVrMpU5Oz/N+kd4CxHw="; }; }; diff --git a/pkgs/by-name/ma/matrix-tuwunel/package.nix b/pkgs/by-name/ma/matrix-tuwunel/package.nix index a89b5e00f446..4786e0a62312 100644 --- a/pkgs/by-name/ma/matrix-tuwunel/package.nix +++ b/pkgs/by-name/ma/matrix-tuwunel/package.nix @@ -140,7 +140,7 @@ rustPlatform.buildRustPackage (finalAttrs: { "url_preview" "zstd_compression" ] - ++ lib.optional enableJemalloc [ + ++ lib.optionals enableJemalloc [ "jemalloc" "jemalloc_conf" ] diff --git a/pkgs/by-name/md/mdp/package.nix b/pkgs/by-name/md/mdp/package.nix index 179976ef1114..7b3e76fb9d7e 100644 --- a/pkgs/by-name/md/mdp/package.nix +++ b/pkgs/by-name/md/mdp/package.nix @@ -6,14 +6,14 @@ }: stdenv.mkDerivation (finalAttrs: { - version = "1.0.18"; + version = "1.0.19"; pname = "mdp"; src = fetchFromGitHub { owner = "visit1985"; repo = "mdp"; rev = finalAttrs.version; - sha256 = "sha256-7ltqnvNzdr+sJiiiCQpp25dzhOrcUCOAgMTt1RIgVTw="; + sha256 = "sha256-qMxuhq6LqS1o5TqQAbmGYgISWzmcocaHEYTASUN6S2c="; }; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/by-name/me/meowlnir/package.nix b/pkgs/by-name/me/meowlnir/package.nix index 32f418546c13..bd1a13ef85d7 100644 --- a/pkgs/by-name/me/meowlnir/package.nix +++ b/pkgs/by-name/me/meowlnir/package.nix @@ -9,19 +9,19 @@ buildGoModule rec { pname = "meowlnir"; - version = "26.06"; - tag = "v0.2606.0"; + version = "26.08"; + tag = "v0.2608.0"; src = fetchFromGitHub { owner = "maunium"; repo = "meowlnir"; inherit tag; - hash = "sha256-mhm/CznhaQCgx0ZQ/GArmWrhDS0sPkIkJrP3cAOIFME="; + hash = "sha256-q9/pdKmJOav41P8Rm4ZzNgeEPJqui22HUbH4UBoa3tY="; }; buildInputs = [ olm ]; - vendorHash = "sha256-0PgI0m2EsfiZjpOQ9lTfVavHNzKWKFdlmkIz2gqUXM0="; + vendorHash = "sha256-HXXAQaBaWUjnBnoiyNZB51BnPuQg9BhlDU5x2CyCW1Y="; doCheck = true; doInstallCheck = true; diff --git a/pkgs/by-name/me/mermaid-cli/package.nix b/pkgs/by-name/me/mermaid-cli/package.nix index a8300fcdf519..a4321bf3eb9f 100644 --- a/pkgs/by-name/me/mermaid-cli/package.nix +++ b/pkgs/by-name/me/mermaid-cli/package.nix @@ -7,7 +7,7 @@ nix-update-script, }: let - version = "11.16.0"; + version = "11.17.0"; in buildNpmPackage { pname = "mermaid-cli"; @@ -17,14 +17,14 @@ buildNpmPackage { owner = "mermaid-js"; repo = "mermaid-cli"; rev = version; - hash = "sha256-jK87Ffsv9qeh0UPJaLTuIJYbnR9HVqjm7hWrwUaP5zA="; + hash = "sha256-Dujs0HNHVWOWlOhPkbAzooWrUqR1kNOdPUfe2f7rVLo="; }; patches = [ ./remove-puppeteer-from-dev-deps.patch # https://github.com/mermaid-js/mermaid-cli/issues/830 ]; - npmDepsHash = "sha256-sOEDz8ZT2zF+TH+ZJhb+LSyyUF1HWVVLzCqtYtg7A0E="; + npmDepsHash = "sha256-6s1q+d6V/5hyjXZaAOzoLMFmQ1flKDH+YH5oOYTaoCo="; env = { PUPPETEER_SKIP_DOWNLOAD = true; diff --git a/pkgs/by-name/mk/mkbootimg-osm0sis/package.nix b/pkgs/by-name/mk/mkbootimg-osm0sis/package.nix index f6ed4bc7824c..453bc35870d3 100644 --- a/pkgs/by-name/mk/mkbootimg-osm0sis/package.nix +++ b/pkgs/by-name/mk/mkbootimg-osm0sis/package.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { strictDeps = true; env.NIX_CFLAGS_COMPILE = toString ( - lib.optional stdenv.cc.isGNU [ + lib.optionals stdenv.cc.isGNU [ # Required with newer GCC "-Wstringop-overflow=0" ] diff --git a/pkgs/by-name/mo/monero-cli/package.nix b/pkgs/by-name/mo/monero-cli/package.nix index 1373f0892267..d5507ca1c550 100644 --- a/pkgs/by-name/mo/monero-cli/package.nix +++ b/pkgs/by-name/mo/monero-cli/package.nix @@ -92,7 +92,7 @@ stdenv.mkDerivation rec { "-Wno-dev" ] ++ lib.optional stdenv.hostPlatform.isDarwin "-DBoost_USE_MULTITHREADED=OFF" - ++ lib.optional trezorSupport [ + ++ lib.optionals trezorSupport [ "-DUSE_DEVICE_TREZOR=ON" ]; diff --git a/pkgs/by-name/mo/monero-gui/package.nix b/pkgs/by-name/mo/monero-gui/package.nix index d23e85658c1c..e73627158e07 100644 --- a/pkgs/by-name/mo/monero-gui/package.nix +++ b/pkgs/by-name/mo/monero-gui/package.nix @@ -104,7 +104,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DARCH=default" ] - ++ lib.optional trezorSupport [ + ++ lib.optionals trezorSupport [ # fix build on recent gcc versions "-DCMAKE_CXX_FLAGS=-fpermissive" ]; diff --git a/pkgs/by-name/mo/mozhi/package.nix b/pkgs/by-name/mo/mozhi/package.nix index 436137ee3adc..3ec7fa70f816 100644 --- a/pkgs/by-name/mo/mozhi/package.nix +++ b/pkgs/by-name/mo/mozhi/package.nix @@ -6,13 +6,13 @@ }: buildGoModule { pname = "mozhi"; - version = "0-unstable-2026-06-11"; + version = "0-unstable-2026-08-30"; src = fetchFromCodeberg { owner = "aryak"; repo = "mozhi"; - rev = "095c73f04bc24f51dcb4a0155a5f10f87f768a8c"; - hash = "sha256-c792IEMToojcLgsCpMizsszVwymZldvRVP9eWuEO5sY="; + rev = "ad53459f38e995eabdb5fd10352b0a2f57c278a2"; + hash = "sha256-Zn+3McD+uGO+Vk88gbq7sqU7OahWZmtwuHxwvMIM/gw="; }; vendorHash = "sha256-ZFbgq/zeBTK6wb5VHHyTNrq8RuNhWTy8PyA1mZcbKYc="; diff --git a/pkgs/by-name/op/open-dyslexic/package.nix b/pkgs/by-name/op/open-dyslexic/package.nix index bd23345f8379..0da7294be568 100644 --- a/pkgs/by-name/op/open-dyslexic/package.nix +++ b/pkgs/by-name/op/open-dyslexic/package.nix @@ -2,29 +2,26 @@ lib, stdenvNoCC, fetchFromGitHub, + installFonts, }: -let - version = "0.91.12"; -in -stdenvNoCC.mkDerivation { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "open-dyslexic"; - inherit version; + version = "0.91.12"; + + outputs = [ + "out" + "webfont" + ]; src = fetchFromGitHub { owner = "antijingoist"; repo = "opendyslexic"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-a8hh8NGt5djj9EC7ChO3SnnjuYMOryzbHWTK4gC/vIw="; }; - installPhase = '' - runHook preInstall - - install -Dm644 compiled/*.otf -t $out/share/fonts/opentype - - runHook postInstall - ''; + nativeBuildInputs = [ installFonts ]; meta = { homepage = "https://opendyslexic.org/"; @@ -33,4 +30,4 @@ stdenvNoCC.mkDerivation { platforms = lib.platforms.all; maintainers = [ lib.maintainers.rycee ]; }; -} +}) diff --git a/pkgs/by-name/op/open-scq30/package.nix b/pkgs/by-name/op/open-scq30/package.nix index e97fdbecbe8e..b683747dc683 100644 --- a/pkgs/by-name/op/open-scq30/package.nix +++ b/pkgs/by-name/op/open-scq30/package.nix @@ -25,13 +25,13 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "open-scq30"; - version = "2.11.0"; + version = "2.12.0"; src = fetchFromGitHub { owner = "Oppzippy"; repo = "OpenSCQ30"; rev = "v${finalAttrs.version}"; - hash = "sha256-jvmgHAp4Et3VrUhZfNuFAA9r8n215kNB6Ux04HYC+KI="; + hash = "sha256-5/b71nZrvN7Q/56FM/orMz6vb+FKf6k/qqYgusirTyI="; }; nativeBuildInputs = [ @@ -62,7 +62,7 @@ rustPlatform.buildRustPackage (finalAttrs: { libxi ]; - cargoHash = "sha256-/dj2LBNcYcewt3Rhz82lZuoyCzaa/QC49CxfKoGfF6w="; + cargoHash = "sha256-mLKK2J3CJ6qSM5EDjB6LkrFWKxijFl6jjcjrCgXVg8c="; # Requires headphones doCheck = false; diff --git a/pkgs/by-name/op/openslp/CVE-2016-4912.patch b/pkgs/by-name/op/openslp/CVE-2016-4912.patch deleted file mode 100644 index 06223deda89b..000000000000 --- a/pkgs/by-name/op/openslp/CVE-2016-4912.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/common/slp_xmalloc.c -+++ b/common/slp_xmalloc.c -@@ -206,7 +206,7 @@ void * _xrealloc(const char * file, int line, void * ptr, size_t size) - if (newptr == 0) - return 0; - memcpy(newptr, ptr, x->size); -- _xfree(file, line, x); -+ _xfree(file, line, ptr); - } - return newptr; - } diff --git a/pkgs/by-name/op/openslp/CVE-2019-5544.patch b/pkgs/by-name/op/openslp/CVE-2019-5544.patch deleted file mode 100644 index 2afc0aed3302..000000000000 --- a/pkgs/by-name/op/openslp/CVE-2019-5544.patch +++ /dev/null @@ -1,165 +0,0 @@ -diff -ur openslp-2.0.0.orig/common/slp_buffer.c openslp-2.0.0/common/slp_buffer.c ---- openslp-2.0.0.orig/common/slp_buffer.c 2012-12-10 15:31:53.000000000 -0800 -+++ openslp-2.0.0/common/slp_buffer.c 2019-11-26 21:54:20.000000000 -0800 -@@ -30,6 +30,13 @@ - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - *-------------------------------------------------------------------------*/ - -+/* Copyright (c) 2019 VMware, Inc. -+ * SPDX-License-Identifier: BSD-3-Clause -+ * This file is provided under the BSD-3-Clause license. -+ * See COPYING file for more details and other copyrights -+ * that may apply. -+ */ -+ - /** Functions for managing SLP message buffers. - * - * This file provides a higher level abstraction over malloc and free that -@@ -153,4 +160,20 @@ - xfree(buf); - } - -+/** Report remaining free buffer size in bytes. -+ * -+ * Check if buffer is allocated and if so return bytes left in a -+ * @c SLPBuffer object. -+ * -+ * @param[in] buf The SLPBuffer to be freed. -+ */ -+size_t -+RemainingBufferSpace(SLPBuffer buf) -+{ -+ if (buf->allocated == 0) { -+ return 0; -+ } -+ return buf->end - buf->curpos; -+} -+ - /*=========================================================================*/ -diff -ur openslp-2.0.0.orig/common/slp_buffer.h openslp-2.0.0/common/slp_buffer.h ---- openslp-2.0.0.orig/common/slp_buffer.h 2012-11-28 09:07:04.000000000 -0800 -+++ openslp-2.0.0/common/slp_buffer.h 2019-11-26 21:54:32.000000000 -0800 -@@ -30,6 +30,13 @@ - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - *-------------------------------------------------------------------------*/ - -+/* Copyright (c) 2019 VMware, Inc. -+ * SPDX-License-Identifier: BSD-3-Clause -+ * This file is provided under the BSD-3-Clause license. -+ * See COPYING file for more details and other copyrights -+ * that may apply. -+ */ -+ - /** Header file that defines SLP message buffer management routines. - * - * Includes structures, constants and functions that used to handle memory -@@ -78,6 +85,8 @@ - - SLPBuffer SLPBufferListAdd(SLPBuffer * list, SLPBuffer buf); - -+size_t RemainingBufferSpace(SLPBuffer buf); -+ - /*! @} */ - - #endif /* SLP_BUFFER_H_INCLUDED */ -diff -ur openslp-2.0.0.orig/slpd/slpd_process.c openslp-2.0.0/slpd/slpd_process.c ---- openslp-2.0.0.orig/slpd/slpd_process.c 2012-12-12 09:38:54.000000000 -0800 -+++ openslp-2.0.0/slpd/slpd_process.c 2019-11-26 21:55:10.000000000 -0800 -@@ -30,6 +30,13 @@ - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - *-------------------------------------------------------------------------*/ - -+/* Copyright (c) 2019 VMware, Inc. -+ * SPDX-License-Identifier: BSD-3-Clause -+ * This file is provided under the BSD-3-Clause license. -+ * See COPYING file for more details and other copyrights -+ * that may apply. -+ */ -+ - /** Processes incoming SLP messages. - * - * @file slpd_process.c -@@ -514,13 +521,27 @@ - { - for (i = 0; i < db->urlcount; i++) - { -- /* urlentry is the url from the db result */ - urlentry = db->urlarray[i]; -+ if (urlentry->opaque != NULL) { -+ const int64_t newsize = size + urlentry->opaquelen; -+ if (urlentry->opaquelen <= 0 || newsize > INT_MAX) -+ { -+ SLPDLog("Invalid opaquelen %d or sizeo of opaque url is too big, size=%d\n", -+ urlentry->opaquelen, size); -+ errorcode = SLP_ERROR_PARSE_ERROR; -+ goto FINISHED; -+ } -+ size += urlentry->opaquelen; -+ } -+ else -+ { -+ /* urlentry is the url from the db result */ -+ size += urlentry->urllen + 6; /* 1 byte for reserved */ -+ /* 2 bytes for lifetime */ -+ /* 2 bytes for urllen */ -+ /* 1 byte for authcount */ -+ } - -- size += urlentry->urllen + 6; /* 1 byte for reserved */ -- /* 2 bytes for lifetime */ -- /* 2 bytes for urllen */ -- /* 1 byte for authcount */ - #ifdef ENABLE_SLPv2_SECURITY - /* make room to include the authblock that was asked for */ - if (G_SlpdProperty.securityEnabled -@@ -594,7 +615,7 @@ - urlentry = db->urlarray[i]; - - #ifdef ENABLE_SLPv1 -- if (urlentry->opaque == 0) -+ if (urlentry->opaque == NULL) - { - /* url-entry reserved */ - *result->curpos++ = 0; -@@ -606,8 +627,18 @@ - PutUINT16(&result->curpos, urlentry->urllen); - - /* url-entry url */ -- memcpy(result->curpos, urlentry->url, urlentry->urllen); -- result->curpos += urlentry->urllen; -+ if (RemainingBufferSpace(result) >= urlentry->urllen) -+ { -+ memcpy(result->curpos, urlentry->url, urlentry->urllen); -+ result->curpos = result->curpos + urlentry->urllen; -+ } -+ else -+ { -+ SLPDLog("Url too big (ask: %d have %" PRId64 "), failing request\n", -+ urlentry->opaquelen, (int64_t) RemainingBufferSpace(result)); -+ errorcode = SLP_ERROR_PARSE_ERROR; -+ goto FINISHED; -+ } - - /* url-entry auths */ - *result->curpos++ = 0; -@@ -621,8 +652,18 @@ - - /* TRICKY: Fix up the lifetime. */ - TO_UINT16(urlentry->opaque + 1, urlentry->lifetime); -- memcpy(result->curpos, urlentry->opaque, urlentry->opaquelen); -- result->curpos += urlentry->opaquelen; -+ if (RemainingBufferSpace(result) >= urlentry->opaquelen) -+ { -+ memcpy(result->curpos, urlentry->opaque, urlentry->opaquelen); -+ result->curpos = result->curpos + urlentry->opaquelen; -+ } -+ else -+ { -+ SLPDLog("Opaque Url too big (ask: %d have %" PRId64 "), failing request\n", -+ urlentry->opaquelen, (int64_t) RemainingBufferSpace(result)); -+ errorcode = SLP_ERROR_PARSE_ERROR; -+ goto FINISHED; -+ } - } - } - } diff --git a/pkgs/by-name/op/openslp/package.nix b/pkgs/by-name/op/openslp/package.nix deleted file mode 100644 index 7186fb216958..000000000000 --- a/pkgs/by-name/op/openslp/package.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - fetchpatch, -}: - -stdenv.mkDerivation rec { - pname = "openslp"; - version = "2.0.0"; - - src = fetchurl { - url = "mirror://sourceforge/openslp/${version}/${version}/openslp-${version}.tar.gz"; - sha256 = "16splwmqp0400w56297fkipaq9vlbhv7hapap8z09gp5m2i3fhwj"; - }; - - patches = [ - (fetchpatch { - name = "openslp-2.0.0-null-pointer-deref.patch"; - url = "https://src.fedoraproject.org/rpms/openslp/raw/696fd55ae4fcea7beda0a25131dca8bfb14bbdf9/f/openslp-2.0.0-null-pointer-deref.patch"; - sha256 = "186f3rj3z2lf5h1lpbhqk0szj2a9far1p3mjqg6422f29yjfnz6a"; - }) - (fetchpatch { - name = "openslp-2.0.0-CVE-2016-7567.patch"; - url = "https://src.fedoraproject.org/rpms/openslp/raw/696fd55ae4fcea7beda0a25131dca8bfb14bbdf9/f/openslp-2.0.0-cve-2016-7567.patch"; - sha256 = "0zp61axx93b7nrbsyhn2x4dnw7n9y6g4rys21hyqxk4khrnc2yr9"; - }) - ./CVE-2016-4912.patch - ./CVE-2019-5544.patch - ]; - - meta = { - homepage = "http://www.openslp.org/"; - description = "Open-source implementation of the IETF Service Location Protocol"; - maintainers = [ ]; - license = lib.licenses.bsd3; - platforms = lib.platforms.all; - # never built on aarch64-darwin since first introduction in nixpkgs - broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64; - knownVulnerabilities = [ - "CVE-2023-29552: UDP Reflection Attack with ampliciation factor of up to 2200" - ]; - }; - -} diff --git a/pkgs/by-name/op/opentofu-mcp-server/package.nix b/pkgs/by-name/op/opentofu-mcp-server/package.nix index e074cd4361a6..471e4bfa8ab6 100644 --- a/pkgs/by-name/op/opentofu-mcp-server/package.nix +++ b/pkgs/by-name/op/opentofu-mcp-server/package.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "opentofu-mcp-server"; - version = "1.0.0-unstable-2026-07-15"; + version = "1.0.0-unstable-2026-09-04"; __structuredAttrs = true; strictDeps = true; @@ -20,8 +20,8 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "opentofu"; repo = "opentofu-mcp-server"; - rev = "ad9e50780d8ae56ee9a71ddea5f3f8c8f2da1020"; - hash = "sha256-bp1tY4ggHVSVFcU+b/TlWBHhjmrf32Q3a86GWgvkFOk="; + rev = "2ab816e75f0176fc764b67b12c9fd61cadd45d3b"; + hash = "sha256-sar4OB4FS47zzfF2zn5sWsSDWavWCDRzCAnCQnRtpzI="; }; pnpmDeps = fetchPnpmDeps { diff --git a/pkgs/by-name/op/openttd-ttf/package.nix b/pkgs/by-name/op/openttd-ttf/package.nix index f09cbd64e009..e8d445e88d46 100644 --- a/pkgs/by-name/op/openttd-ttf/package.nix +++ b/pkgs/by-name/op/openttd-ttf/package.nix @@ -3,6 +3,7 @@ stdenvNoCC, fetchFromGitHub, python3, + installFonts, }: stdenvNoCC.mkDerivation (finalAttrs: { @@ -17,6 +18,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { }; nativeBuildInputs = [ + installFonts (python3.withPackages ( pp: with pp; [ fontforge @@ -42,7 +44,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { installPhase = '' runHook preInstall - install -m444 -Dt $out/share/fonts/truetype */*.ttf + runHook postInstall ''; diff --git a/pkgs/by-name/ov/overturemaps/package.nix b/pkgs/by-name/ov/overturemaps/package.nix index 1e6f0daa5572..23ce371481a0 100644 --- a/pkgs/by-name/ov/overturemaps/package.nix +++ b/pkgs/by-name/ov/overturemaps/package.nix @@ -6,12 +6,12 @@ python3Packages.buildPythonPackage (finalAttrs: { pname = "overturemaps"; - version = "1.0.1"; + version = "1.0.2"; pyproject = true; src = fetchPypi { inherit (finalAttrs) pname version; - hash = "sha256-yKl13Y9kRCGHzoqeZIQEac/PrByTCtCQFaz8sUgeVIs="; + hash = "sha256-6SNV3MKWHaDOlauYN6WfLRW8w1e+UdDEFc6rPYEvyX0="; }; nativeBuildInputs = with python3Packages; [ diff --git a/pkgs/by-name/pa/parastoo-fonts/package.nix b/pkgs/by-name/pa/parastoo-fonts/package.nix index c9788cbf7ab7..d47ef3116187 100644 --- a/pkgs/by-name/pa/parastoo-fonts/package.nix +++ b/pkgs/by-name/pa/parastoo-fonts/package.nix @@ -2,32 +2,32 @@ lib, stdenvNoCC, fetchFromGitHub, + installFonts, }: -stdenvNoCC.mkDerivation rec { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "parastoo-fonts"; version = "2.0.1"; + outputs = [ + "out" + "webfont" + ]; + src = fetchFromGitHub { owner = "rastikerdar"; repo = "parastoo-font"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-E94B9R2h227D49dscCBsprmb7w0GrQ+2tWOWRf8FH30="; }; - installPhase = '' - runHook preInstall - - find . -name '*.ttf' -exec install -m444 -Dt $out/share/fonts/parastoo-fonts {} \; - - runHook postInstall - ''; + nativeBuildInputs = [ installFonts ]; meta = { homepage = "https://github.com/rastikerdar/parastoo-font"; description = "Persian (Farsi) Font - فونت ( قلم ) فارسی پرستو"; license = lib.licenses.ofl; platforms = lib.platforms.all; - maintainers = [ ]; + maintainers = with lib.maintainers; [ pancaek ]; }; -} +}) diff --git a/pkgs/by-name/pf/pferd/package.nix b/pkgs/by-name/pf/pferd/package.nix index b680cd7d61a8..6708d969742d 100644 --- a/pkgs/by-name/pf/pferd/package.nix +++ b/pkgs/by-name/pf/pferd/package.nix @@ -5,14 +5,14 @@ }: python3Packages.buildPythonApplication (finalAttrs: { pname = "pferd"; - version = "3.9.3"; + version = "3.9.4"; pyproject = true; src = fetchFromGitHub { owner = "Garmelon"; repo = "PFERD"; tag = "v${finalAttrs.version}"; - sha256 = "sha256-wzBWDpnftDantDDAjb1k5ukSeTUpXAvaETIQSrjpt8U="; + sha256 = "sha256-nkMo3RuzqJ1ukArzB4BBjTsTAsLbxZQvhHpHiyJkves="; }; nativeBuildInputs = with python3Packages; [ diff --git a/pkgs/by-name/pi/pioasm/package.nix b/pkgs/by-name/pi/pioasm/package.nix index 67cce5b2cf21..df6f638dad73 100644 --- a/pkgs/by-name/pi/pioasm/package.nix +++ b/pkgs/by-name/pi/pioasm/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "pioasm"; - version = "2.3.0"; + version = "2.3.1"; src = fetchFromGitHub { owner = "raspberrypi"; repo = "pico-sdk"; tag = finalAttrs.version; - hash = "sha256-QFKeOSYDuoSuVQsZ68fyQgVnGxZdBl8sehbQf665suM="; + hash = "sha256-UWWrZT7Mg2yei/LlDxgei3yXWaP9ETMlgiVOFFAEMZ8="; }; sourceRoot = "${finalAttrs.src.name}/tools/pioasm"; diff --git a/pkgs/by-name/pi/pixieditor/package.nix b/pkgs/by-name/pi/pixieditor/package.nix index 4c6f455b3dd0..9501e73b7d21 100644 --- a/pkgs/by-name/pi/pixieditor/package.nix +++ b/pkgs/by-name/pi/pixieditor/package.nix @@ -46,13 +46,13 @@ let in buildDotnetModule (finalAttrs: { pname = "pixieditor"; - version = "2.1.2.2"; + version = "2.1.2.4"; src = fetchFromGitHub { owner = "PixiEditor"; repo = "PixiEditor"; tag = finalAttrs.version; - hash = "sha256-k2dwz1VcXGs0Sh/6nc8Q3bs/dpsHiTnqRbXaGJojBz4="; + hash = "sha256-40oOf9dgHBsHd9fUhHctvmB1//aGD++snd+VwsgOxIU="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/po/powerstation/package.nix b/pkgs/by-name/po/powerstation/package.nix index 13dfd040d348..7bb17fa89fb6 100644 --- a/pkgs/by-name/po/powerstation/package.nix +++ b/pkgs/by-name/po/powerstation/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "powerstation"; - version = "0.8.2"; + version = "0.8.3"; src = fetchFromGitHub { owner = "ShadowBlip"; repo = "PowerStation"; tag = "v${finalAttrs.version}"; - hash = "sha256-vKRuO9IS01fwtAR81QGsnqzsggfzJWURc/l+QX6AkQM="; + hash = "sha256-/8NpEPHGqqx8Xkibfx8aZUzPfCXBC2JgLWaHmGuG8FU="; }; - cargoHash = "sha256-GOAD8Tu1WcZF1VhiRbBzGMAEowQIPT0sBZcI9EvJk/8="; + cargoHash = "sha256-qEOcXAHgYw/5HEPFHjILYcTuxVXjBMegiAajEGTUPSM="; nativeBuildInputs = [ cmake diff --git a/pkgs/by-name/pr/protonmail-desktop/package.nix b/pkgs/by-name/pr/protonmail-desktop/package.nix index 6124d565d2ac..56eda6fa3aa4 100644 --- a/pkgs/by-name/pr/protonmail-desktop/package.nix +++ b/pkgs/by-name/pr/protonmail-desktop/package.nix @@ -10,9 +10,9 @@ }: let mainProgram = "proton-mail"; - version = "1.13.4"; - linuxHash = "sha256-m6l2I/Lqr16+bAEEiAS//etsJeRFrr3J3K4E6xu3d1k="; - darwinHash = "sha256-4yEfNT89sOoAAhjjZVaY1yg6AFuYp6tM/ArnFX+1WZw="; + version = "1.14.0"; + linuxHash = "sha256-yB5eKXhW9bmGxHsjOKZlNI2JfN8CXFz1Pz2+77DPYog="; + darwinHash = "sha256-NDgCvgM0CM6RNklo2VuMRZb/oT5yaiW7QqyJVAr6hHo="; in stdenv.mkDerivation { pname = "protonmail-desktop"; diff --git a/pkgs/by-name/pr/protonplus/package.nix b/pkgs/by-name/pr/protonplus/package.nix index 24a255ae35eb..b1c217d7102d 100644 --- a/pkgs/by-name/pr/protonplus/package.nix +++ b/pkgs/by-name/pr/protonplus/package.nix @@ -23,13 +23,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "protonplus"; - version = "0.6.5"; + version = "0.6.6"; src = fetchFromGitHub { owner = "Vysp3r"; repo = "protonplus"; tag = "v${finalAttrs.version}"; - hash = "sha256-9KHtPG/gTtNjYCuStpb4tO3BiB09cSsTk7PpnX8o7qI="; + hash = "sha256-A7HsEeGPX0pdNdk9beZw+vqwS/WTHLHpeLp9X7Cz/nI="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/pr/proxysql/btree-cstdint.patch b/pkgs/by-name/pr/proxysql/btree-cstdint.patch deleted file mode 100644 index c5eae1c371d2..000000000000 --- a/pkgs/by-name/pr/proxysql/btree-cstdint.patch +++ /dev/null @@ -1,16 +0,0 @@ -The vendored copy of Google's cpp-btree relies on being pulled in -transitively. libstdc++ 15 no longer does so, which makes uint8_t/uint16_t -undeclared, and the resulting fallback to int trips the kNodeValues -COMPILE_ASSERT with a "1 << 32" shift. - -diff --git a/include/btree.h b/include/btree.h ---- a/include/btree.h -+++ b/include/btree.h -@@ -104,6 +104,7 @@ - #include - #include - #include -+#include - #include - #include - #include diff --git a/pkgs/by-name/pr/proxysql/dont-phone-home.patch b/pkgs/by-name/pr/proxysql/dont-phone-home.patch deleted file mode 100644 index 7c4244fd22f7..000000000000 --- a/pkgs/by-name/pr/proxysql/dont-phone-home.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/main.cpp b/src/main.cpp -index 382b4236..4e1ecc62 100644 ---- a/src/main.cpp -+++ b/src/main.cpp -@@ -201,6 +201,7 @@ static char * main_check_latest_version() { - * @return NULL. - */ - void * main_check_latest_version_thread(void *arg) { -+ return NULL; - set_thread_name("CheckLatestVers"); - // Fetch the latest version information - char * latest_version = main_check_latest_version(); diff --git a/pkgs/by-name/pr/proxysql/makefiles.patch b/pkgs/by-name/pr/proxysql/makefiles.patch deleted file mode 100644 index bc47db822b4a..000000000000 --- a/pkgs/by-name/pr/proxysql/makefiles.patch +++ /dev/null @@ -1,199 +0,0 @@ -diff --git a/Makefile b/Makefile -index 01aa5730..6c71b3a5 100644 ---- a/Makefile -+++ b/Makefile -@@ -81,10 +81,7 @@ endif - export MAKEOPT := -j${NPROCS} - - ### systemd --SYSTEMD := 0 --ifeq ($(wildcard /usr/lib/systemd/system), /usr/lib/systemd/system) -- SYSTEMD := 1 --endif -+SYSTEMD := 1 - - ### check user/group - USERCHECK := $(shell getent passwd proxysql) -@@ -415,16 +412,10 @@ cleanbuild: - - .PHONY: install - install: src/proxysql -- install -m 0755 src/proxysql /usr/bin -- install -m 0600 etc/proxysql.cnf /etc -- if [ ! -d /var/lib/proxysql ]; then mkdir /var/lib/proxysql ; fi --ifeq ($(findstring proxysql,$(USERCHECK)),) -- @echo "Creating proxysql user and group" -- useradd -r -U -s /bin/false proxysql --endif -+ install -m 0755 src/proxysql $(out)/bin -+ install -m 0600 etc/proxysql.cnf $(out)/etc - ifeq ($(SYSTEMD), 1) -- install -m 0644 systemd/system/proxysql.service /usr/lib/systemd/system/ -- systemctl enable proxysql.service -+ install -m 0644 systemd/system/proxysql.service $(out)/lib/systemd/system/ - else - install -m 0755 etc/init.d/proxysql /etc/init.d - ifeq ($(DISTRO),"CentOS Linux") -diff --git a/deps/Makefile b/deps/Makefile -index 87d2a20e..505e069a 100644 ---- a/deps/Makefile -+++ b/deps/Makefile -@@ -61,27 +61,22 @@ default: $(targets) - ### deps targets - - libinjection/libinjection/src/libinjection.a: -- cd libinjection && rm -rf libinjection-*/ || true -- cd libinjection && tar -zxf libinjection-3.10.0.tar.gz - ifneq ($(CENTOSVER),6) -- cd libinjection/libinjection && patch -p1 < ../update-build-py3.diff - cd libinjection/libinjection && patch -p1 < ../libinjection_sqli.c.patch - endif - ifeq ($(UNAME_S),Darwin) - sed -i '' 's/CC=/CC?=/' libinjection/libinjection/src/Makefile - else - sed -i -e 's/CC=/CC?=/' libinjection/libinjection/src/Makefile - endif - cd libinjection/libinjection && CC=${CC} CXX=${CXX} ${MAKE} - - libinjection: libinjection/libinjection/src/libinjection.a - - include ../common_mk/openssl_flags.mk - include ../common_mk/openssl_version_check.mk - - libhttpserver/libhttpserver/build/src/.libs/libhttpserver.a: libmicrohttpd/libmicrohttpd/src/microhttpd/.libs/libmicrohttpd.a re2/re2/obj/libre2.a -- cd libhttpserver && rm -rf libhttpserver-*/ || true -- cd libhttpserver && tar -zxf libhttpserver-*.tar.gz - cd libhttpserver/libhttpserver && patch -p1 < ../noexcept.patch - cd libhttpserver/libhttpserver && patch -p1 < ../re2_regex.patch - cd libhttpserver/libhttpserver && patch -p1 < ../final_val_post_process.patch -@@ -99,77 +94,66 @@ libhttpserver: libhttpserver/libhttpserver/build/src/.libs/libhttpserver.a - - - libev/libev/.libs/libev.a: -- cd libev && rm -rf libev-*/ || true -- cd libev && tar -zxf libev-*.tar.gz - cd libev/libev && patch ev.c < ../ev.c-multiplication-overflow.patch - cd libev/libev && ./configure - cd libev/libev && CC=${CC} CXX=${CXX} ${MAKE} - - ev: libev/libev/.libs/libev.a - - - coredumper/coredumper/src/libcoredumper.a: - cd coredumper && rm -rf coredumper-*/ || true - cd coredumper && tar -zxf coredumper-*.tar.gz - cd coredumper/coredumper && patch -p1 < ../includes.patch -- cd coredumper/coredumper && cmake . -DBUILD_TESTING=OFF -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=Debug -+ cd coredumper/coredumper && cmake . -DBUILD_TESTING=OFF -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=Debug -DCMAKE_POLICY_VERSION_MINIMUM=3.5 - cd coredumper/coredumper && CC=${CC} CXX=${CXX} ${MAKE} - coredumper: coredumper/coredumper/src/libcoredumper.a - - curl/curl/lib/.libs/libcurl.a: -- cd curl && rm -rf curl-*/ || true -- cd curl && tar -zxf curl-*.tar.gz - # cd curl/curl && ./configure --disable-debug --disable-ftp --disable-ldap --disable-ldaps --disable-rtsp --disable-proxy --disable-dict --disable-telnet --disable-tftp --disable-pop3 --disable-imap --disable-smb --disable-smtp --disable-gopher --disable-manual --disable-ipv6 --disable-sspi --disable-crypto-auth --disable-ntlm-wb --disable-tls-srp --without-nghttp2 --without-libidn2 --without-libssh2 --without-brotli --with-ssl=$(shell pwd)/../../libssl/openssl/ && CC=${CC} CXX=${CXX} ${MAKE} - cd curl/curl && autoreconf -fi - ifeq ($(UNAME_S),Darwin) - cd curl/curl && patch configure < ../configure.patch - endif - cd curl/curl && CPPFLAGS="-I$(SSL_IDIR)" LDFLAGS="$(LIB_SSL_PATH) $(LIB_CRYPTO_PATH)" ./configure --disable-debug --disable-ftp --disable-ldap --disable-ldaps --disable-rtsp --disable-proxy --disable-dict --disable-telnet --disable-tftp --disable-pop3 --disable-imap --disable-smb --disable-smtp --disable-gopher --disable-manual --disable-ipv6 --disable-sspi --disable-ntlm-wb --disable-tls-srp --without-nghttp2 --without-libidn2 --without-libssh2 --without-brotli --without-librtmp --without-libpsl --without-zstd --with-ssl --enable-shared=yes - cd curl/curl && CFLAGS=-fPIC CC=${CC} CXX=${CXX} ${MAKE} - - curl: curl/curl/lib/.libs/libcurl.a - - - libmicrohttpd/libmicrohttpd/src/microhttpd/.libs/libmicrohttpd.a: -- cd libmicrohttpd && rm -rf libmicrohttpd-*/ || true -- cd libmicrohttpd && tar -zxf libmicrohttpd-*.tar.gz --# cd libmicrohttpd/libmicrohttpd && patch src/microhttpd/connection.c < ../connection.c-snprintf-overflow.patch - cd libmicrohttpd/libmicrohttpd && ./configure --enable-https && CC=${CC} CXX=${CXX} ${MAKE} - - microhttpd: libmicrohttpd/libmicrohttpd/src/microhttpd/.libs/libmicrohttpd.a - - - cityhash/cityhash/src/.libs/libcityhash.a: - cd cityhash && rm -rf cityhash-*/ || true - cd cityhash && tar -zxf cityhash-*.tar.gz - cd cityhash/cityhash && cp ../config.guess . && chmod +x config.guess && cp ../config.sub . && chmod +x config.sub - cd cityhash/cityhash && ./configure && CC=${CC} CXX=${CXX} ${MAKE} - - cityhash: cityhash/cityhash/src/.libs/libcityhash.a - - - lz4/lz4/lib/liblz4.a: -- cd lz4 && rm -rf lz4-*/ || true -- cd lz4 && tar -zxf lz4-*.tar.gz - cd lz4/lz4 && CC=${CC} CXX=${CXX} ${MAKE} - - lz4: lz4/lz4/lib/liblz4.a - - - clickhouse-cpp/clickhouse-cpp/clickhouse/libclickhouse-cpp-lib-static.a: - cd clickhouse-cpp && rm -rf clickhouse-cpp-*/ || true - cd clickhouse-cpp && tar -zxf v2.3.0.tar.gz - cd clickhouse-cpp && ln -fs clickhouse-cpp-*/ clickhouse-cpp - cd clickhouse-cpp/clickhouse-cpp && patch clickhouse/base/wire_format.h < ../wire_format.patch -- cd clickhouse-cpp/clickhouse-cpp && cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo . -+ cd clickhouse-cpp/clickhouse-cpp && cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_POLICY_VERSION_MINIMUM=3.5 . - cd clickhouse-cpp/clickhouse-cpp && CC=${CC} CXX=${CXX} ${MAKE} - - clickhouse-cpp: clickhouse-cpp/clickhouse-cpp/clickhouse/libclickhouse-cpp-lib-static.a - - - libdaemon/libdaemon/libdaemon/.libs/libdaemon.a: -- cd libdaemon && rm -rf libdaemon-*/ || true -- cd libdaemon && tar -zxf libdaemon-0.14.tar.gz - cd libdaemon/libdaemon && patch -p0 < ../daemon_fork_umask.patch - cd libdaemon/libdaemon && cp ../config.guess . && chmod +x config.guess && cp ../config.sub . && chmod +x config.sub && ./configure --disable-examples - cd libdaemon/libdaemon && CC=${CC} CXX=${CXX} ${MAKE} -@@ -194,7 +178,7 @@ mariadb-client-library/mariadb_client/libmariadb/libmariadbclient.a: - cd mariadb-client-library && rm -rf mariadb-connector-c-*/ || true - cd mariadb-client-library && tar -zxf mariadb-connector-c-3.3.8-src.tar.gz - cd mariadb-client-library/mariadb_client && patch -p0 < ../plugin_auth_CMakeLists.txt.patch -- cd mariadb-client-library/mariadb_client && cmake . -Wno-dev -DCMAKE_BUILD_TYPE=RelWithDebInfo -DOPENSSL_ROOT_DIR=$(SSL_IDIR) -DOPENSSL_LIBRARIES=$(SSL_LDIR) -DICONV_LIBRARIES=$(brew --prefix libiconv)/lib -DICONV_INCLUDE=$(brew --prefix libiconv)/include . -+ cd mariadb-client-library/mariadb_client && cmake . -Wno-dev -DCMAKE_POLICY_VERSION_MINIMUM=3.5 -DCMAKE_C_FLAGS=-std=gnu17 -DCMAKE_BUILD_TYPE=RelWithDebInfo -DOPENSSL_ROOT_DIR=$(SSL_IDIR) -DOPENSSL_LIBRARIES=$(SSL_LDIR) -DICONV_LIBRARIES=$(brew --prefix libiconv)/lib -DICONV_INCLUDE=$(brew --prefix libiconv)/include . - ifeq ($(PROXYDEBUG),1) - cd mariadb-client-library/mariadb_client && patch -p0 < ../ma_context.h.patch - else ifeq ($(USEVALGRIND),1) -@@ -253,18 +237,13 @@ sqlite3/sqlite3/sqlite3.o: - sqlite3: sqlite3/sqlite3/sqlite3.o - - libconfig/libconfig/lib/.libs/libconfig++.a: -- cd libconfig && rm -rf libconfig-*/ || true -- cd libconfig && tar -zxf libconfig-*.tar.gz - cd libconfig/libconfig && ./configure --disable-examples - cd libconfig/libconfig && CC=${CC} CXX=${CXX} ${MAKE} - - libconfig: libconfig/libconfig/lib/.libs/libconfig++.a - - - prometheus-cpp/prometheus-cpp/lib/libprometheus-cpp-core.a: -- cd prometheus-cpp && rm -rf prometheus-cpp-*/ || true -- cd prometheus-cpp && tar -zxf prometheus-cpp-*.tar.gz -- cd prometheus-cpp && tar --strip-components=1 -zxf civetweb-*.tar.gz -C prometheus-cpp/3rdparty/civetweb - cd prometheus-cpp/prometheus-cpp && patch -p1 < ../serial_exposer.patch - cd prometheus-cpp/prometheus-cpp && patch -p1 < ../registry_counters_reset.patch - cd prometheus-cpp/prometheus-cpp && patch -p1 < ../fix_old_distros.patch -@@ -293,17 +272,13 @@ re2: re2/re2/obj/libre2.a - - - pcre/pcre/.libs/libpcre.a: -- cd pcre && rm -rf pcre-*/ || true -- cd pcre && tar -zxf pcre-*.tar.gz - cd pcre/pcre && patch pcretest.c < ../pcretest.c-multiplication-overflow.patch - cd pcre/pcre && ./configure - cd pcre/pcre && CC=${CC} CXX=${CXX} ${MAKE} - - pcre: pcre/pcre/.libs/libpcre.a - - postgresql/postgresql/src/interfaces/libpq/libpq.a: -- cd postgresql && rm -rf postgresql-*/ || true -- cd postgresql && tar -zxf postgresql-*.tar.gz - cd postgresql/postgresql && patch -p0 < ../get_result_from_pgconn.patch - cd postgresql/postgresql && patch -p0 < ../handle_row_data.patch - cd postgresql/postgresql && patch -p0 < ../fmt_err_msg.patch -@@ -361,4 +336,3 @@ cleanall: - cd libusual && rm -rf libusual-*/ || true - cd libscram && rm -rf lib/* obj/* || true - .PHONY: cleanall -- diff --git a/pkgs/by-name/pr/proxysql/package.nix b/pkgs/by-name/pr/proxysql/package.nix deleted file mode 100644 index e31b2d20537d..000000000000 --- a/pkgs/by-name/pr/proxysql/package.nix +++ /dev/null @@ -1,233 +0,0 @@ -{ - stdenv, - lib, - applyPatches, - fetchFromGitHub, - autoconf, - automake, - bison, - cmake, - pkg-config, - libtool, - civetweb, - coreutils, - curl, - flex, - gnutls, - libconfig, - libdaemon, - libev, - libgcrypt, - libinjection, - libmicrohttpd, - libuuid, - lz4, - nlohmann_json, - openssl, - pcre, - perl, - python3, - prometheus-cpp, - zlib, - texinfo, - postgresql_16, - icu, - libevent, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "proxysql"; - version = "3.0.2"; - - src = fetchFromGitHub { - owner = "sysown"; - repo = "proxysql"; - tag = "v${finalAttrs.version}"; - hash = "sha256-kbfuUulEDPx/5tpp7uOkIXQuyaFYzos3crCvkWHSmHg="; - }; - - patches = [ - ./makefiles.patch - ./dont-phone-home.patch - ./btree-cstdint.patch - ]; - - nativeBuildInputs = [ - autoconf - automake - cmake - libtool - perl - pkg-config - python3 - texinfo # for makeinfo - ]; - - buildInputs = [ - bison - curl - flex - gnutls - icu - libevent - libgcrypt - libuuid - openssl - zlib - ]; - - enableParallelBuilding = true; - - env.GIT_VERSION = finalAttrs.version; - - dontConfigure = true; - - # replace and fix some vendored dependencies - preBuild = # sh - '' - pushd deps - - function replace_dep() { - local folder="$1" - local src="$2" - local symlink="$3" - local name="$4" - - pushd "$folder" - - rm -rf "$symlink" - if [ -d "$src" ]; then - cp -R "$src"/. "$symlink" - chmod -R u+w "$symlink" - else - tar xf "$src" - ln -s "$name" "$symlink" - fi - - popd - } - - ${lib.concatMapStringsSep "\n" - ( - x: - ''replace_dep "${x.f}" "${x.p.src}" "${ - x.p.pname or (builtins.parseDrvName x.p.name).name - }" "${x.p.name}"'' - ) - ( - map - (x: { - inherit (x) f; - p = x.p // { - src = applyPatches { - inherit (x.p) src patches; - }; - }; - }) - [ - { - f = "curl"; - p = curl; - } - { - f = "libconfig"; - p = libconfig; - } - { - f = "libdaemon"; - p = libdaemon; - } - { - f = "libev"; - p = libev; - } - { - f = "libinjection"; - p = libinjection; - } - { - f = "libmicrohttpd"; - p = libmicrohttpd; - } - { - f = "lz4"; - p = lz4; - } - { - f = "pcre"; - p = pcre; - } - { - f = "prometheus-cpp"; - p = prometheus-cpp.overrideAttrs ( - finalAttrs: _: { - version = "1.1.0"; - - src = fetchFromGitHub { - owner = "jupp0r"; - repo = "prometheus-cpp"; - tag = "v${finalAttrs.version}"; - hash = "sha256-qx6oBxd0YrUyFq+7ArnKBqOwrl5X8RS9nErhRDUJ7+8="; - }; - } - ); - } - { - f = "postgresql"; - p = postgresql_16; - } - ] - ) - } - - pushd libhttpserver - tar xf libhttpserver-*.tar.gz - sed -i s_/bin/pwd_${coreutils}/bin/pwd_g libhttpserver/configure.ac - popd - - pushd json - rm json.hpp - ln -s ${nlohmann_json.src}/single_include/nlohmann/json.hpp . - popd - - pushd prometheus-cpp/prometheus-cpp/3rdparty - replace_dep . "${civetweb.src}" civetweb - popd - - pushd libmicrohttpd/libmicrohttpd - autoreconf - popd - - pushd libconfig/libconfig - autoreconf - popd - - pushd libdaemon/libdaemon - autoreconf - popd - - pushd pcre/pcre - autoreconf - popd - - popd - patchShebangs . - ''; - - preInstall = '' - mkdir -p $out/{etc,bin,lib/systemd/system} - ''; - - postInstall = '' - sed -i s_/usr/bin/proxysql_$out/bin/proxysql_ $out/lib/systemd/system/*.service - ''; - - meta = { - broken = stdenv.hostPlatform.isDarwin; - description = "High-performance MySQL proxy"; - mainProgram = "proxysql"; - homepage = "https://proxysql.com/"; - license = lib.licenses.gpl3Only; - platforms = lib.platforms.unix; - }; -}) diff --git a/pkgs/by-name/px/pxa-mkbootimg/package.nix b/pkgs/by-name/px/pxa-mkbootimg/package.nix index 5d0f032a7274..67b99cc13811 100644 --- a/pkgs/by-name/px/pxa-mkbootimg/package.nix +++ b/pkgs/by-name/px/pxa-mkbootimg/package.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = true; env.NIX_CFLAGS_COMPILE = toString ( - lib.optional stdenv.cc.isGNU [ + lib.optionals stdenv.cc.isGNU [ # Required with newer GCC "-Wno-error=stringop-overflow" ] diff --git a/pkgs/by-name/qg/qgo/fix-paths.patch b/pkgs/by-name/qg/qgo/fix-paths.patch deleted file mode 100644 index c1d1e399ec1a..000000000000 --- a/pkgs/by-name/qg/qgo/fix-paths.patch +++ /dev/null @@ -1,50 +0,0 @@ -diff --git a/src/defines.h b/src/defines.h -index 5d40955..82d0627 100644 ---- a/src/defines.h -+++ b/src/defines.h -@@ -48,7 +48,7 @@ - * GNUgo default level - */ - #define DEFAULT_ENGINE "gnugo" --#define DEFAULT_ENGINE_PATH "/usr/games/" -+#define DEFAULT_ENGINE_PATH "" - #define DEFAULT_ENGINE_OPTIONS "--mode gtp --quiet --level 10" - - -@@ -220,8 +220,8 @@ extern QString applicationPath; - #define SOUND_PATH_PREFIX "qGo.app/Contents/Resources/Sounds/" - #define TRANSLATIONS_PATH "qGo.app/Contents/Resources/Translations/" - #else -- #define SOUND_PATH_PREFIX "/usr/share/qgo/sounds/" -- #define TRANSLATIONS_PATH "/usr/share/qgo/languages" -+ #define SOUND_PATH_PREFIX "/@out@/share/qgo/sounds/" -+ #define TRANSLATIONS_PATH "/@out@/share/qgo/languages" - #endif - - #endif -diff --git a/src/src.pro b/src/src.pro -index f989ce7..b7d691f 100644 ---- a/src/src.pro -+++ b/src/src.pro -@@ -165,17 +165,17 @@ SOURCES += displayboard.cpp \ - newgamedialog.cpp - - unix*:!macx-* { -- QGO_INSTALL_PATH = /usr/share/qgo -- QGO_INSTALL_BIN_PATH = /usr/bin -+ QGO_INSTALL_PATH = @out@/share/qgo -+ QGO_INSTALL_BIN_PATH = /@out@/bin - -- icon.path = /usr/share/pixmaps -+ icon.path = @out@/share/pixmaps - icon.files = resources/pics/qgo.png - icon.files += resources/pics/qgo_16x16.xpm - icon.files += resources/pics/qgo_32x32.xpm - icon.files += resources/pics/qgo_48x48.png - icon.files += resources/pics/qgo_48x48.xpm - INSTALLS += icon -- desktopfile.path = /usr/share/applications -+ desktopfile.path = @out@/share/applications - desktopfile.files = qgo.desktop - INSTALLS += desktopfile - } diff --git a/pkgs/by-name/qg/qgo/package.nix b/pkgs/by-name/qg/qgo/package.nix deleted file mode 100644 index 0d4548016979..000000000000 --- a/pkgs/by-name/qg/qgo/package.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ - lib, - stdenv, - libsForQt5, - fetchFromGitHub, -}: - -stdenv.mkDerivation { - pname = "qgo"; - version = "unstable-2017-12-18"; - - meta = { - description = "Go client based on Qt5"; - mainProgram = "qgo"; - longDescription = '' - qGo is a Go Client based on Qt 5. It supports playing online at - IGS-compatible servers (including some special tweaks for WING and LGS, - also NNGS was reported to work) and locally against gnugo (or other - GTP-compliant engines). It also has rudimentary support for editing SGF - files and partial support for CyberORO/WBaduk, Tygem, Tom, and eWeiqi - (developers of these backends are currently inactive, everybody is welcome - to take them over). - - Go is an ancient Chinese board game. It's called "圍棋(Wei Qi)" in - Chinese, "囲碁(Yi Go)" in Japanese, "바둑(Baduk)" in Korean. - ''; - homepage = "https://github.com/pzorin/qgo"; - license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ zalakain ]; - }; - - src = fetchFromGitHub { - owner = "pzorin"; - repo = "qgo"; - rev = "bef526dda4c79686edd95c88cc68de24f716703c"; - sha256 = "1xzkayclmhsi07p9mnbf8185jw8n5ikxp2mik3x8qz1i6rmrfl5b"; - }; - - patches = [ ./fix-paths.patch ]; - postPatch = '' - sed -i 's|@out@|'"''${out}"'|g' src/src.pro src/defines.h - ''; - nativeBuildInputs = [ - libsForQt5.qmake - libsForQt5.qttools - libsForQt5.wrapQtAppsHook - ]; - buildInputs = [ - libsForQt5.qtbase - libsForQt5.qtmultimedia - ]; -} diff --git a/pkgs/by-name/re/refind/package.nix b/pkgs/by-name/re/refind/package.nix index 023bf239d5c5..893b87c66cbf 100644 --- a/pkgs/by-name/re/refind/package.nix +++ b/pkgs/by-name/re/refind/package.nix @@ -88,7 +88,7 @@ stdenv.mkDerivation (finalAttrs: { "HOSTARCH=${hostarch}" "ARCH=${hostarch}" ] - ++ lib.optional stdenv.hostPlatform.isAarch64 [ + ++ lib.optionals stdenv.hostPlatform.isAarch64 [ # aarch64 is special for GNU-EFI, see BUILDING.txt "GNUEFI_ARM64_TARGET_SUPPORT=y" ]; diff --git a/pkgs/by-name/ry/ryubing/package.nix b/pkgs/by-name/ry/ryubing/package.nix index 4551d4c6ffcc..76ce3417e3c2 100644 --- a/pkgs/by-name/ry/ryubing/package.nix +++ b/pkgs/by-name/ry/ryubing/package.nix @@ -100,7 +100,7 @@ buildDotnetModule rec { "Ryujinx" ]; - makeWrapperArgs = lib.optional stdenv.hostPlatform.isLinux [ + makeWrapperArgs = lib.optionals stdenv.hostPlatform.isLinux [ # Without this Ryujinx fails to start on wayland. See https://github.com/Ryujinx/Ryujinx/issues/2714 "--set SDL_VIDEODRIVER x11" ]; diff --git a/pkgs/by-name/s7/s7/package.nix b/pkgs/by-name/s7/s7/package.nix index aa059cd4f5f1..0e32e9da96bb 100644 --- a/pkgs/by-name/s7/s7/package.nix +++ b/pkgs/by-name/s7/s7/package.nix @@ -74,7 +74,7 @@ stdenv.mkDerivation (finalAttrs: { "-lpthread" "--export-all-symbols" ] - ++ lib.optional (!static && stdenv.hostPlatform.isMinGW) [ "--out-implib,libs7dll.a" ] + ++ lib.optionals (!static && stdenv.hostPlatform.isMinGW) [ "--out-implib,libs7dll.a" ] ++ lib.optional withArb "-lflint" ++ lib.optionals withGMP [ "-lgmp" diff --git a/pkgs/by-name/sa/samrewritten/package.nix b/pkgs/by-name/sa/samrewritten/package.nix index 0beb65ddafd9..ea8ab35d5ea7 100644 --- a/pkgs/by-name/sa/samrewritten/package.nix +++ b/pkgs/by-name/sa/samrewritten/package.nix @@ -48,6 +48,10 @@ rustPlatform.buildRustPackage (finalAttrs: { install -Dm644 assets/org.samrewritten.SamRewritten.gschema.xml \ $out/share/glib-2.0/schemas/org.samrewritten.SamRewritten.gschema.xml glib-compile-schemas $out/share/glib-2.0/schemas + substituteInPlace package/samrewritten.desktop \ + --replace-fail "/usr/bin/samrewritten" "samrewritten" + install -Dm644 package/samrewritten.desktop \ + $out/share/applications/samrewritten.desktop ''; env.PKG_CONFIG_PATH = "${openssl.dev}/lib/pkgconfig"; @@ -60,7 +64,10 @@ rustPlatform.buildRustPackage (finalAttrs: { homepage = "https://github.com/PaulCombal/SamRewritten"; changelog = "https://github.com/PaulCombal/SamRewritten/releases"; license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ ludovicopiero ]; + maintainers = with lib.maintainers; [ + ludovicopiero + keksnino + ]; platforms = [ "x86_64-linux" ]; }; }) diff --git a/pkgs/by-name/sf/sfml/package.nix b/pkgs/by-name/sf/sfml/package.nix index 9c5991f7801e..be2c10dd5d73 100644 --- a/pkgs/by-name/sf/sfml/package.nix +++ b/pkgs/by-name/sf/sfml/package.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { }; # Only unvendor miniaudio on non-Darwin as Darwin cannot build the miniaudio package. - patches = lib.optional (!stdenv.hostPlatform.isDarwin) [ + patches = lib.optionals (!stdenv.hostPlatform.isDarwin) [ # Not upstreamble in the near future, see https://github.com/SFML/SFML/pull/3555 ./unvendor-miniaudio.patch ]; diff --git a/pkgs/by-name/si/simple-completion-language-server/package.nix b/pkgs/by-name/si/simple-completion-language-server/package.nix index 22602c56ae39..88b48bde42d5 100644 --- a/pkgs/by-name/si/simple-completion-language-server/package.nix +++ b/pkgs/by-name/si/simple-completion-language-server/package.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage { cargoHash = "sha256-RgRmbQVZK/4U37CO8AjNQOqR/SXvL1TQU03LX7LnqPY="; - buildFeatures = lib.optional withCitation [ "citation" ]; + buildFeatures = lib.optionals withCitation [ "citation" ]; meta = { description = "Language server to enable word completion and snippets for Helix editor"; diff --git a/pkgs/by-name/sp/spla/package.nix b/pkgs/by-name/sp/spla/package.nix index cb9948f1b87e..0a42bb9fb10c 100644 --- a/pkgs/by-name/sp/spla/package.nix +++ b/pkgs/by-name/sp/spla/package.nix @@ -79,7 +79,7 @@ stdenv.mkDerivation (finalAttrs: { "-DCMAKE_INSTALL_INCLUDEDIR=include" ] ++ lib.optional (gpuBackend == "cuda") "-DSPLA_GPU_BACKEND=CUDA" - ++ lib.optional (gpuBackend == "rocm") [ "-DSPLA_GPU_BACKEND=ROCM" ]; + ++ lib.optionals (gpuBackend == "rocm") [ "-DSPLA_GPU_BACKEND=ROCM" ]; preFixup = '' substituteInPlace $out/lib/cmake/SPLA/SPLASharedTargets-release.cmake \ diff --git a/pkgs/by-name/sp/spruce/package.nix b/pkgs/by-name/sp/spruce/package.nix index 226edea9c650..76fb1c4ee933 100644 --- a/pkgs/by-name/sp/spruce/package.nix +++ b/pkgs/by-name/sp/spruce/package.nix @@ -6,13 +6,13 @@ buildGoModule (finalAttrs: { pname = "spruce"; - version = "1.35.17"; + version = "1.35.18"; src = fetchFromGitHub { owner = "geofffranks"; repo = "spruce"; rev = "v${finalAttrs.version}"; - hash = "sha256-n0rmK9UFMzLkvwREQE7iUPDC7WUO7uEAGiC+y8YkNTk="; + hash = "sha256-fq+7iJgSJz76KbZGFhCdT0sdswitxZwjluNOWuTUoZU="; }; vendorHash = null; diff --git a/pkgs/by-name/st/starfox64recomp/package.nix b/pkgs/by-name/st/starfox64recomp/package.nix index c5879213c491..0dd43b4cb79b 100644 --- a/pkgs/by-name/st/starfox64recomp/package.nix +++ b/pkgs/by-name/st/starfox64recomp/package.nix @@ -124,11 +124,9 @@ llvmPackages_19.stdenv.mkDerivation (finalAttrs: { runHook preInstall installBin Starfox64Recompiled - install -Dm644 -t $out/share ../recompcontrollerdb.txt + install -Dm644 -t $out/share/starfox64recomp ../recompcontrollerdb.txt install -Dm644 ../icons/512.png $out/share/icons/hicolor/512x512/apps/Starfox64Recompiled.png - cp -r ../assets $out/share/ - ln -s $out/share/recompcontrollerdb.txt $out/bin/recompcontrollerdb.txt - ln -s $out/share/assets $out/bin/assets + cp -r ../assets $out/share/starfox64recomp/ install -Dm644 -t $out/share/licenses/starfox64recompiled/N64ModernRuntime ../lib/N64ModernRuntime/COPYING install -Dm644 -t $out/share/licenses/starfox64recompiled/RmlUi ../lib/RmlUi/LICENSE.txt @@ -144,9 +142,8 @@ llvmPackages_19.stdenv.mkDerivation (finalAttrs: { ) ''; - # The game will segfault when not run from the same directory as the binary. postFixup = '' - wrapProgram $out/bin/Starfox64Recompiled --chdir "$out/bin/" + wrapProgram $out/bin/Starfox64Recompiled --chdir "$out/share/starfox64recomp" ''; meta = { diff --git a/pkgs/by-name/te/terraform/package.nix b/pkgs/by-name/te/terraform/package.nix index 57505ea009ea..2de4d9c64ab1 100644 --- a/pkgs/by-name/te/terraform/package.nix +++ b/pkgs/by-name/te/terraform/package.nix @@ -15,16 +15,16 @@ let package = buildGoModule rec { pname = "terraform"; - version = "1.16.0"; + version = "1.16.1"; src = fetchFromGitHub { owner = "hashicorp"; repo = "terraform"; rev = "v${version}"; - hash = "sha256-zVBnNDxQcN5mmqWBZQjeGXZDmWXNS4xrnimVc7TBgNc="; + hash = "sha256-0cCEQU+f6wVfcVqFoRA3hpf9Qwdxko2AraeCJQ/vkM4="; }; - vendorHash = "sha256-qcP6QJdq8l9S2wRJPANqanEu95qmb09BVpLjwJ95peM="; + vendorHash = "sha256-w/dtggDM8sDDA5rqzsRfuZHkBThu6JVvhr13R71E/d8="; patches = [ ./provider-path-0_15.patch ]; diff --git a/pkgs/by-name/te/terramate/package.nix b/pkgs/by-name/te/terramate/package.nix index 17d35e3375ad..d424b3ec9779 100644 --- a/pkgs/by-name/te/terramate/package.nix +++ b/pkgs/by-name/te/terramate/package.nix @@ -7,16 +7,16 @@ buildGoModule (finalAttrs: { pname = "terramate"; - version = "0.17.2"; + version = "0.17.3"; src = fetchFromGitHub { owner = "terramate-io"; repo = "terramate"; rev = "v${finalAttrs.version}"; - hash = "sha256-NoQLxvby0sUA/tcyfJUMuNQukfQINS+v1oJDS0+ehJ0="; + hash = "sha256-fYhPEGvHElHaeqeAudNLeSn3MvjGlCNHVw9qe1ZstXQ="; }; - vendorHash = "sha256-vmweLyq9lr2V4ou2mzVnIaI8p63D9c0IVLKo8vYLm54="; + vendorHash = "sha256-rk7kk+EhRaQjAnhExcJ5OeKuGult2cwFpkSZ3I1Bom0="; # required for version info nativeBuildInputs = [ git ]; diff --git a/pkgs/by-name/te/textadept/package.nix b/pkgs/by-name/te/textadept/package.nix index ef71798e3ab8..3fef036ff200 100644 --- a/pkgs/by-name/te/textadept/package.nix +++ b/pkgs/by-name/te/textadept/package.nix @@ -25,8 +25,8 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = lib.optionals withQt [ libsForQt5.qtbase ] ++ lib.optionals withCurses ncurses; cmakeFlags = - lib.optional withQt [ "-DQT=ON" ] - ++ lib.optional withCurses [ + lib.optionals withQt [ "-DQT=ON" ] + ++ lib.optionals withCurses [ "-DCURSES=ON" "-DQT=OFF" ]; diff --git a/pkgs/by-name/tr/traefik/package.nix b/pkgs/by-name/tr/traefik/package.nix index e374b498c568..1a8e5d596a62 100644 --- a/pkgs/by-name/tr/traefik/package.nix +++ b/pkgs/by-name/tr/traefik/package.nix @@ -8,16 +8,16 @@ buildGo126Module (finalAttrs: { pname = "traefik"; - version = "3.7.12"; + version = "3.7.13"; # Archive with static assets for webui src = fetchzip { url = "https://github.com/traefik/traefik/releases/download/v${finalAttrs.version}/traefik-v${finalAttrs.version}.src.tar.gz"; - hash = "sha256-DJ1ulAVXZbobJ2YxlhCb0Timtj0uBZmwgXU9VNvMKtA="; + hash = "sha256-xwq4iqD0UM9xClVN4OkntEio1jGXU0JTFkXj+kpFkwE="; stripRoot = false; }; - vendorHash = "sha256-bAFvEaB4OC+28d6XnchBBVy+hNy40u9Tdtb58Cckr2k="; + vendorHash = "sha256-jlrZ78urMkNoBtV1VcfAA++1H+XuUaUxMA8ZX4w1lhg="; proxyVendor = true; diff --git a/pkgs/by-name/tw/twingate/package.nix b/pkgs/by-name/tw/twingate/package.nix index b0abdad761ed..33f292df0e81 100644 --- a/pkgs/by-name/tw/twingate/package.nix +++ b/pkgs/by-name/tw/twingate/package.nix @@ -12,14 +12,25 @@ nixosTests, }: -stdenv.mkDerivation rec { - pname = "twingate"; +let version = "2026.160.6555"; - src = fetchurl { - url = "https://binaries.twingate.com/client/linux/DEB/x86_64/${version}/twingate-amd64.deb"; - hash = "sha256-Sk2pALZtcraNpca6wkDiPCvWgU0hYlSeiwwszfZeKeM="; + sources = { + x86_64-linux = { + url = "https://binaries.twingate.com/client/linux/DEB/x86_64/${version}/twingate-amd64.deb"; + hash = "sha256-Sk2pALZtcraNpca6wkDiPCvWgU0hYlSeiwwszfZeKeM="; + }; + aarch64-linux = { + url = "https://binaries.twingate.com/client/linux/DEB/aarch64/${version}/twingate-arm64.deb"; + hash = "sha256-rK6bSSdkCNWHpOpojHn+CtZejiy6jarCb34aumBbmbs="; + }; }; +in +stdenv.mkDerivation { + pname = "twingate"; + inherit version; + + src = fetchurl sources.${stdenv.hostPlatform.system}; buildInputs = [ dbus @@ -57,6 +68,9 @@ stdenv.mkDerivation rec { description = "Twingate Client"; homepage = "https://twingate.com"; license = lib.licenses.unfree; - platforms = [ "x86_64-linux" ]; + platforms = [ + "x86_64-linux" + "aarch64-linux" + ]; }; } diff --git a/pkgs/by-name/un/unpoller/package.nix b/pkgs/by-name/un/unpoller/package.nix index eabe045abba5..9a431a3537f2 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 = "5.1.0"; + version = "5.2.4"; src = fetchFromGitHub { owner = "unpoller"; repo = "unpoller"; rev = "v${finalAttrs.version}"; - hash = "sha256-P5rPbFuEbOMIGDpvIXLfPN64pYY3ggSsoHEhZVJSbGE="; + hash = "sha256-+WkvpyZzsM6sKnI2E/DxP4dqYtCn0ujYaL3f5iO6xOU="; }; - vendorHash = "sha256-vtCSNBACKB/JgOuWBPZnvWg5mLfpYWyYPGdn/I6QcI0="; + vendorHash = "sha256-RDvg9oJFIzUU4G6K6E2o14l403KL5a8EBHQQRyQd3DE="; ldflags = [ "-w" diff --git a/pkgs/by-name/uz/uzdoom/package.nix b/pkgs/by-name/uz/uzdoom/package.nix index 82b80023850f..ea5d9dee9019 100644 --- a/pkgs/by-name/uz/uzdoom/package.nix +++ b/pkgs/by-name/uz/uzdoom/package.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "uzdoom"; - version = "5.0.0"; + version = "5.0.1"; __structuredAttrs = true; strictDeps = true; @@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "UZDoom"; repo = "UZDoom"; tag = finalAttrs.version; - hash = "sha256-iNPpkAV1ED+BRqa2WmB6R0PFaCqpmTWDCZT9USbmZuY="; + hash = "sha256-JaAx3HlsHPFDILQrq9rz1FpO7dVsfoJgvCLvNx8+CJ0="; }; outputs = [ "out" ] ++ lib.optionals stdenv.hostPlatform.isLinux [ "doc" ]; diff --git a/pkgs/by-name/va/vassal/package.nix b/pkgs/by-name/va/vassal/package.nix index 1120cb659617..e6db068ed3a1 100644 --- a/pkgs/by-name/va/vassal/package.nix +++ b/pkgs/by-name/va/vassal/package.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "VASSAL"; - version = "3.7.26"; + version = "3.7.27"; src = fetchzip { url = "https://github.com/vassalengine/vassal/releases/download/${version}/${pname}-${version}-linux.tar.bz2"; - sha256 = "sha256-ZohCpX5ys2W/SLrlhrOYWQU3dXznpWkF9s55+0RxCZs="; + sha256 = "sha256-JhXphO9LxDajruvPT/lbzC9dHyhRAAdyY+lgPuoBkrI="; }; buildInputs = [ diff --git a/pkgs/by-name/ve/vendir/package.nix b/pkgs/by-name/ve/vendir/package.nix index b4c7af35fdc0..0703af6c1dbd 100644 --- a/pkgs/by-name/ve/vendir/package.nix +++ b/pkgs/by-name/ve/vendir/package.nix @@ -6,13 +6,13 @@ buildGoModule (finalAttrs: { pname = "vendir"; - version = "0.46.1"; + version = "0.46.2"; src = fetchFromGitHub { owner = "carvel-dev"; repo = "vendir"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-lct7hjzOXezU4jDcT2cljngjQXxjook3od/AGm+GiR0="; + sha256 = "sha256-1S6rxh0YD0Iui++CqiB0yQWDmU8l3p70B/h+6bjgSQ0="; }; vendorHash = null; diff --git a/pkgs/by-name/vg/vgmplay-libvgm/package.nix b/pkgs/by-name/vg/vgmplay-libvgm/package.nix index 9401b106c985..7a8f0766d287 100644 --- a/pkgs/by-name/vg/vgmplay-libvgm/package.nix +++ b/pkgs/by-name/vg/vgmplay-libvgm/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation { pname = "vgmplay-libvgm"; - version = "0.52.0-unstable-2026-06-07"; + version = "0.52.0-unstable-2026-08-24"; src = fetchFromGitHub { owner = "ValleyBell"; repo = "vgmplay-libvgm"; - rev = "01f8136fd5602a0041504d8e2ea15d46fc71b4ba"; - hash = "sha256-1fQgRgJC8wxON3ir8ru5wxVkcIIjMSMftYksHbRxln8="; + rev = "4208caf6b48a323db660f23f920c09dd4fff8957"; + hash = "sha256-0imOV2Yb16V/BOM+Ajj3q8S3Lun3V7MRU1dREbEOEnY="; }; # We don't want text files in bindir diff --git a/pkgs/by-name/vi/vista-fonts-chs/package.nix b/pkgs/by-name/vi/vista-fonts-chs/package.nix index bbac976571e5..9c00419c3a89 100644 --- a/pkgs/by-name/vi/vista-fonts-chs/package.nix +++ b/pkgs/by-name/vi/vista-fonts-chs/package.nix @@ -3,6 +3,7 @@ stdenvNoCC, fetchurl, cabextract, + installFonts, }: stdenvNoCC.mkDerivation { @@ -16,7 +17,10 @@ stdenvNoCC.mkDerivation { hash = "sha256-saMIBEDTt9Ijv8g1nQHRNTG1ykIbHrCxjzdhhRYYleM="; }; - nativeBuildInputs = [ cabextract ]; + nativeBuildInputs = [ + cabextract + installFonts + ]; unpackPhase = '' runHook preUnpack @@ -29,9 +33,6 @@ stdenvNoCC.mkDerivation { installPhase = '' runHook preInstall - mkdir -p $out/share/fonts/truetype - cp *.ttf $out/share/fonts/truetype - # Set up no-op font configs to override any aliases set up by # other packages. mkdir -p $out/etc/fonts/conf.d diff --git a/pkgs/by-name/vk/vkquake/package.nix b/pkgs/by-name/vk/vkquake/package.nix index 176dc4d2ac6c..32bd16a4de3c 100644 --- a/pkgs/by-name/vk/vkquake/package.nix +++ b/pkgs/by-name/vk/vkquake/package.nix @@ -1,5 +1,5 @@ { - SDL2, + sdl3, fetchFromGitHub, flac, glslang, @@ -24,13 +24,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "vkquake"; - version = "1.34.1"; + version = "1.36.0"; src = fetchFromGitHub { owner = "Novum"; repo = "vkQuake"; tag = finalAttrs.version; - hash = "sha256-vCjL8zDf+VJjYHQoXPY9kqrAiU7HA7avJcOx6v2Jujg="; + hash = "sha256-fdethtp6esp+44KBS9oeZ1To+B/WFVd/+bUUJGYPQ5E="; }; nativeBuildInputs = [ @@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - SDL2 + sdl3 flac gzip libmpg123 diff --git a/pkgs/by-name/vt/vtk-dicom/package.nix b/pkgs/by-name/vt/vtk-dicom/package.nix index f692db9a227d..dd49a48acc8b 100644 --- a/pkgs/by-name/vt/vtk-dicom/package.nix +++ b/pkgs/by-name/vt/vtk-dicom/package.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeFeature "CMAKE_INSTALL_LIBDIR" "lib") (lib.cmakeFeature "CMAKE_INSTALL_INCLUDEDIR" "include") ] - ++ lib.optional finalAttrs.finalPackage.doCheck [ + ++ lib.optionals finalAttrs.finalPackage.doCheck [ # vtkBool does not accept TRUE, we have to use STRING "ON" (lib.cmakeFeature "BUILD_TESTING" "ON") ]; diff --git a/pkgs/by-name/wa/wasmer/package.nix b/pkgs/by-name/wa/wasmer/package.nix index 2bce163759be..daed0ef54031 100644 --- a/pkgs/by-name/wa/wasmer/package.nix +++ b/pkgs/by-name/wa/wasmer/package.nix @@ -61,7 +61,7 @@ in stdenv.mkDerivation (finalAttrs: { pname = "wasmer"; - version = "7.3.0"; + version = "7.4.0"; __structuredAttrs = true; strictDeps = true; @@ -70,13 +70,13 @@ stdenv.mkDerivation (finalAttrs: { owner = "wasmerio"; repo = "wasmer"; tag = "v${finalAttrs.version}"; - hash = "sha256-9QAMeROq9b4LnvZiNJjMWTY7Su54zovasHsruSG7bAA="; + hash = "sha256-IfrwkJQEOHxXS/Ly/rn4xus7CROc9vv3MNDIHhzU7hU="; fetchSubmodules = true; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; - hash = "sha256-XzyukUuwPC15JpfvFMg13oT7Uwg56urM94vDFfEd15s="; + hash = "sha256-xIgF+RkbIcxv2Q8+Hy242X9BitVZq3QQ81SN2WbQ75w="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/xp/xpra/package.nix b/pkgs/by-name/xp/xpra/package.nix index da038f7556a2..707a90da3dc8 100644 --- a/pkgs/by-name/xp/xpra/package.nix +++ b/pkgs/by-name/xp/xpra/package.nix @@ -238,7 +238,7 @@ effectiveBuildPythonApplication rec { "--with-pam" "--with-vsock" ] - ++ lib.optional withNvenc [ + ++ lib.optionals withNvenc [ "--with-nvenc" "--with-nvjpeg_encoder" ]; diff --git a/pkgs/by-name/ze/zelda64recomp/package.nix b/pkgs/by-name/ze/zelda64recomp/package.nix index 53000e040a01..f38f86a5b23c 100644 --- a/pkgs/by-name/ze/zelda64recomp/package.nix +++ b/pkgs/by-name/ze/zelda64recomp/package.nix @@ -115,11 +115,9 @@ llvmPackages_19.stdenv.mkDerivation (finalAttrs: { runHook preInstall installBin Zelda64Recompiled - install -Dm644 -t $out/share ../recompcontrollerdb.txt + install -Dm644 -t $out/share/zelda64recomp ../recompcontrollerdb.txt install -Dm644 ../icons/512.png $out/share/icons/hicolor/scalable/apps/zelda64recomp.png - cp -r ../assets $out/share/ - ln -s $out/share/recompcontrollerdb.txt $out/bin/recompcontrollerdb.txt - ln -s $out/share/assets $out/bin/assets + cp -r ../assets $out/share/zelda64recomp/ install -Dm644 -t $out/share/licenses/zelda64recomp ../COPYING install -Dm644 -t $out/share/licenses/zelda64recomp/N64ModernRuntime ../lib/N64ModernRuntime/COPYING @@ -136,12 +134,11 @@ llvmPackages_19.stdenv.mkDerivation (finalAttrs: { ) ''; - # This is needed as Zelda64Recompiled will segfault when not run from the same - # directory as the binary. It also used to exit when run without X11. Recent rt64 - # updates enabled wayland support, but leave the option to disable this on the - # application level if desired. + # This is needed as Zelda64Recompiled used to exit when run without X11. + # Recent rt64 updates enabled wayland support, but leave the option to disable + # this on the application level if desired. postFixup = '' - wrapProgram $out/bin/Zelda64Recompiled --chdir "$out/bin/" \ + wrapProgram $out/bin/Zelda64Recompiled --chdir "$out/share/zelda64recomp" \ ${lib.optionalString forceX11 "--set SDL_VIDEODRIVER x11"} ''; diff --git a/pkgs/by-name/zo/zotero/build-fixes.patch b/pkgs/by-name/zo/zotero/build-fixes.patch index 73854217084a..c780f271d02a 100644 --- a/pkgs/by-name/zo/zotero/build-fixes.patch +++ b/pkgs/by-name/zo/zotero/build-fixes.patch @@ -2,6 +2,16 @@ diff --git a/app/build.sh b/app/build.sh index de092bde16..2e58b687e7 100755 --- a/app/build.sh +++ b/app/build.sh +@@ -241,7 +241,8 @@ if [ "$UPDATE_CHANNEL" == "beta" ] || [ "$UPDATE_CHANNEL" == "dev" ] || [ "$UPDA + DEVTOOLS=1 + fi + if [ -z "$UPDATE_CHANNEL" ]; then UPDATE_CHANNEL="default"; fi +-BUILD_ID=`date +%Y%m%d%H%M%S` ++# Keep the build reproducible by deriving the build ID from SOURCE_DATE_EPOCH ++BUILD_ID=${SOURCE_DATE_EPOCH:-0} + + # Paths to Gecko runtimes + MAC_RUNTIME_PATH="$CALLDIR/xulrunner/Firefox.app" @@ -644,11 +644,6 @@ if [ $BUILD_MAC == 1 ]; then cp "$MAC_RUNTIME_PATH/../MacOS/XUL" "$CONTENTSDIR/MacOS/" fi @@ -26,11 +36,3 @@ index de092bde16..2e58b687e7 100755 # Copy app files rsync -a "$base_dir/" "$APPDIR/" -@@ -1041,6 +1031,7 @@ if [ $BUILD_LINUX == 1 ]; then - cp -RH "$CALLDIR/modules/zotero-libreoffice-integration/install" "$APPDIR/integration/libreoffice" - - # Copy icons -+ mkdir -p "$APPDIR/icons/" - cp "$CALLDIR/linux/icons/icon32.png" "$APPDIR/icons/" - cp "$CALLDIR/linux/icons/icon64.png" "$APPDIR/icons/" - cp "$CALLDIR/linux/icons/icon128.png" "$APPDIR/icons/" diff --git a/pkgs/by-name/zo/zotero/package.nix b/pkgs/by-name/zo/zotero/package.nix index df71565bfcd6..679a1cdd8a2b 100644 --- a/pkgs/by-name/zo/zotero/package.nix +++ b/pkgs/by-name/zo/zotero/package.nix @@ -33,14 +33,14 @@ let nodejs = nodejs_22; pname = "zotero"; - version = "10.0.0"; + version = "10.0.1"; src = fetchFromGitHub { owner = "zotero"; repo = "zotero"; tag = version; fetchSubmodules = true; - hash = "sha256-lNeujToTGzOTG7aKycoZfnyZawM9EQFWSdRJ4/KEPqQ="; + hash = "sha256-ySFz91WD1KW2V0PETnMQLPm8Og69nbvlpmkf0PHWTQQ="; }; pdf-js = buildNpmPackage { @@ -223,6 +223,7 @@ buildNpmPackage (finalAttrs: { "should use BrowserRequest for 403 when enforcing file type" \ "should use BrowserRequest for a JS redirect page" \ "should throw error on broken symlink" \ + "should convert the target of a symlinked database file" \ "should mark every selected collection as current for a multiple-collection selection" \ ; do sed -i -E "s|it(\([\"']$test.*[\"'])|it.skip\1|" test/tests/*.js diff --git a/pkgs/development/interpreters/php/generic.nix b/pkgs/development/interpreters/php/generic.nix index 7e37b0dab5bd..98d73b639e79 100644 --- a/pkgs/development/interpreters/php/generic.nix +++ b/pkgs/development/interpreters/php/generic.nix @@ -292,7 +292,7 @@ let ++ lib.optional valgrindSupport "--with-valgrind=${valgrind.dev}" ++ lib.optional ztsSupport "--enable-zts" ++ lib.optional staticSupport "--enable-static" - ++ lib.optional (!zendSignalsSupport) [ "--disable-zend-signals" ] + ++ lib.optionals (!zendSignalsSupport) [ "--disable-zend-signals" ] ++ lib.optional zendMaxExecutionTimersSupport "--enable-zend-max-execution-timers" # Sendmail diff --git a/pkgs/development/libraries/libxmlxx/v3.nix b/pkgs/development/libraries/libxmlxx/v3.nix index 9794a16da5b0..aac2d74fc326 100644 --- a/pkgs/development/libraries/libxmlxx/v3.nix +++ b/pkgs/development/libraries/libxmlxx/v3.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { docbook5 docbook-xsl-ns ] - ++ lib.lists.optional withPDF [ + ++ lib.lists.optionals withPDF [ fop dblatex ]; diff --git a/pkgs/development/libraries/science/astronomy/indilib/default.nix b/pkgs/development/libraries/science/astronomy/indilib/default.nix index 3a98610d894c..40584308c4c4 100644 --- a/pkgs/development/libraries/science/astronomy/indilib/default.nix +++ b/pkgs/development/libraries/science/astronomy/indilib/default.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation (finalAttrs: { "-DCMAKE_INSTALL_LIBDIR=lib" "-DUDEVRULES_INSTALL_DIR=lib/udev/rules.d" ] - ++ lib.optional finalAttrs.finalPackage.doCheck [ + ++ lib.optionals finalAttrs.finalPackage.doCheck [ "-DINDI_BUILD_UNITTESTS=ON" "-DINDI_BUILD_INTEGTESTS=ON" ]; diff --git a/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix b/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix index a6ecb929538a..1ec080945db4 100644 --- a/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix +++ b/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix @@ -77,7 +77,7 @@ let "-DRULES_INSTALL_DIR=lib/udev/rules.d" "-DINDI_DATA_DIR=share/indi/" ] - ++ lib.optional doCheck [ + ++ lib.optionals doCheck [ "-DINDI_BUILD_UNITTESTS=ON" "-DINDI_BUILD_INTEGTESTS=ON" ] diff --git a/pkgs/development/libraries/wt/default.nix b/pkgs/development/libraries/wt/default.nix index a342c7603c94..67a607e3c73d 100644 --- a/pkgs/development/libraries/wt/default.nix +++ b/pkgs/development/libraries/wt/default.nix @@ -87,7 +87,7 @@ let in { wt4 = generic { - version = "4.14.1"; - hash = "sha256-9ABX6ZyZmiTjWskre4slbSVa/OHyvoLGANHtM04LBmY="; + version = "4.14.2"; + hash = "sha256-No8Gk04g6Kcb18uMqZeLVfE47ri+k4ff0CB7j174G5I="; }; } diff --git a/pkgs/development/python-modules/daff/default.nix b/pkgs/development/python-modules/daff/default.nix index fe2cdb94db0d..239b46660a09 100644 --- a/pkgs/development/python-modules/daff/default.nix +++ b/pkgs/development/python-modules/daff/default.nix @@ -2,18 +2,23 @@ lib, buildPythonPackage, fetchPypi, + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "daff"; version = "1.4.2"; - format = "setuptools"; + pyproject = true; + + __structuredAttrs = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-R/A5Htp+K1AR98ysAGuReKzLRlvLlKLJ8oQlf/9dJoY="; }; + build-system = [ setuptools ]; + # there are no tests doCheck = false; @@ -25,4 +30,4 @@ buildPythonPackage rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ turion ]; }; -} +}) diff --git a/pkgs/development/python-modules/dashing/default.nix b/pkgs/development/python-modules/dashing/default.nix index 8eb0720b4f22..30c4bd106c12 100644 --- a/pkgs/development/python-modules/dashing/default.nix +++ b/pkgs/development/python-modules/dashing/default.nix @@ -2,20 +2,27 @@ lib, buildPythonPackage, fetchPypi, + setuptools, blessed, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "dashing"; version = "0.1.0"; - format = "setuptools"; + pyproject = true; + + __structuredAttrs = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-JRRgjg8pp3Xb0bERFWEhnOg9U8+kuqL+QQH6uE/Vbxs="; }; - propagatedBuildInputs = [ blessed ]; + build-system = [ setuptools ]; + + dependencies = [ blessed ]; + + pythonImportsCheck = [ "dashing" ]; meta = { homepage = "https://github.com/FedericoCeratto/dashing"; @@ -23,4 +30,4 @@ buildPythonPackage rec { license = lib.licenses.gpl3; maintainers = with lib.maintainers; [ juliusrickert ]; }; -} +}) diff --git a/pkgs/development/python-modules/dbus-client-gen/default.nix b/pkgs/development/python-modules/dbus-client-gen/default.nix index 5991d695e8e6..7bc0ddb1e339 100644 --- a/pkgs/development/python-modules/dbus-client-gen/default.nix +++ b/pkgs/development/python-modules/dbus-client-gen/default.nix @@ -2,22 +2,29 @@ lib, buildPythonPackage, fetchPypi, + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "dbus-client-gen"; version = "0.5.1"; - format = "setuptools"; + pyproject = true; + + __structuredAttrs = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-vRXo72aWoreH/VwzdEAOgoGSRzRf7vy8Z/IA+lnLoWw="; }; + build-system = [ setuptools ]; + + pythonImportsCheck = [ "dbus_client_gen" ]; + meta = { description = "Python Library for Generating D-Bus Client Code"; homepage = "https://github.com/stratis-storage/dbus-client-gen"; license = lib.licenses.mpl20; maintainers = with lib.maintainers; [ nickcao ]; }; -} +}) diff --git a/pkgs/development/python-modules/dbus-python-client-gen/default.nix b/pkgs/development/python-modules/dbus-python-client-gen/default.nix index eb8b5ffd4ce7..7cba9920bc4c 100644 --- a/pkgs/development/python-modules/dbus-python-client-gen/default.nix +++ b/pkgs/development/python-modules/dbus-python-client-gen/default.nix @@ -2,24 +2,29 @@ lib, buildPythonPackage, fetchFromGitHub, + setuptools, into-dbus-python, dbus-python, pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "dbus-python-client-gen"; version = "0.8.4"; - format = "setuptools"; + pyproject = true; + + __structuredAttrs = true; src = fetchFromGitHub { owner = "stratis-storage"; repo = "dbus-python-client-gen"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-nmF6fdUgr7ACK7Pvy3ikc0Xjzfh6iTYNLc+rAf9I9Mg="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ into-dbus-python dbus-python ]; @@ -31,8 +36,8 @@ buildPythonPackage rec { meta = { description = "Python library for generating dbus-python client code"; homepage = "https://github.com/stratis-storage/dbus-python-client-gen"; - changelog = "https://github.com/stratis-storage/dbus-python-client-gen/blob/v${version}/CHANGES.txt"; + changelog = "https://github.com/stratis-storage/dbus-python-client-gen/blob/v${finalAttrs.version}/CHANGES.txt"; license = lib.licenses.mpl20; maintainers = with lib.maintainers; [ nickcao ]; }; -} +}) diff --git a/pkgs/development/python-modules/deal/default.nix b/pkgs/development/python-modules/deal/default.nix index 6b09fba641e8..b9addc5c7d55 100644 --- a/pkgs/development/python-modules/deal/default.nix +++ b/pkgs/development/python-modules/deal/default.nix @@ -72,7 +72,7 @@ buildPythonPackage rec { # assert basically correct but fails in string match due to '' removed "test_unknown_command" ] - ++ lib.optional (pythonAtLeast "3.13") [ + ++ lib.optionals (pythonAtLeast "3.13") [ # assert basically correct but string match fails in due to # ('pathlib._local', 'Path.write_text') != ('pathlib', 'Path.write_text') "test_infer" diff --git a/pkgs/development/python-modules/deemix/default.nix b/pkgs/development/python-modules/deemix/default.nix index 25a00bde327c..f431e762f5c5 100644 --- a/pkgs/development/python-modules/deemix/default.nix +++ b/pkgs/development/python-modules/deemix/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchPypi, + setuptools, spotipy, click, pycryptodomex, @@ -10,17 +11,21 @@ deezer-py, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "deemix"; version = "3.6.6"; - format = "setuptools"; + pyproject = true; + + __structuredAttrs = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-xEahzA1PIrGPfnnOcuXQLVQpSVOUFk6/0v9ViLgWCwk="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ spotipy click pycryptodomex @@ -41,4 +46,4 @@ buildPythonPackage rec { license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ natto1784 ]; }; -} +}) diff --git a/pkgs/development/python-modules/deezer-py/default.nix b/pkgs/development/python-modules/deezer-py/default.nix index 05f38db12fdf..762d090c4083 100644 --- a/pkgs/development/python-modules/deezer-py/default.nix +++ b/pkgs/development/python-modules/deezer-py/default.nix @@ -2,20 +2,25 @@ lib, buildPythonPackage, fetchPypi, + setuptools, requests, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "deezer-py"; version = "1.3.7"; - format = "setuptools"; + pyproject = true; + + __structuredAttrs = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-saMy+IeAy6H9SgS8XHnZ9klFerGyr+vQqhuCtimgbEo="; }; - propagatedBuildInputs = [ requests ]; + build-system = [ setuptools ]; + + dependencies = [ requests ]; # Project has no tests doCheck = false; @@ -27,4 +32,4 @@ buildPythonPackage rec { license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ natto1784 ]; }; -} +}) diff --git a/pkgs/development/python-modules/edk2-pytool-library/default.nix b/pkgs/development/python-modules/edk2-pytool-library/default.nix index 0ce874d57ba8..14b8e0fe8b75 100644 --- a/pkgs/development/python-modules/edk2-pytool-library/default.nix +++ b/pkgs/development/python-modules/edk2-pytool-library/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "edk2-pytool-library"; - version = "0.23.15"; + version = "0.23.16"; pyproject = true; src = fetchFromGitHub { owner = "tianocore"; repo = "edk2-pytool-library"; tag = "v${version}"; - hash = "sha256-ZWQvqhQb9mjvShWVER7iS5vTI8KUn7RefqyGhjpO9NI="; + hash = "sha256-Hjg43MCvoHDpB4wiVpsrS97sRQ09vq5waLPLPUzgoN0="; }; build-system = [ diff --git a/pkgs/development/python-modules/ffmpeg-progress-yield/default.nix b/pkgs/development/python-modules/ffmpeg-progress-yield/default.nix index e62703501685..99578f5919dc 100644 --- a/pkgs/development/python-modules/ffmpeg-progress-yield/default.nix +++ b/pkgs/development/python-modules/ffmpeg-progress-yield/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { procps ]; - disabledTests = lib.optional stdenv.hostPlatform.isDarwin [ + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ # cannot access /usr/bin/pgrep from the sandbox "test_context_manager" "test_context_manager_with_exception" diff --git a/pkgs/development/python-modules/inkex/default.nix b/pkgs/development/python-modules/inkex/default.nix index 6ac22fb3f76c..8b1a9e5a2f05 100644 --- a/pkgs/development/python-modules/inkex/default.nix +++ b/pkgs/development/python-modules/inkex/default.nix @@ -78,12 +78,12 @@ buildPythonPackage { "test_extract_multiple" "test_lookup_and" ] - ++ lib.optional stdenv.hostPlatform.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ "test_image_extract" "test_path_number_nodes" "test_plotter" # Hangs ] - ++ lib.optional stdenv.hostPlatform.isMusl [ + ++ lib.optionals stdenv.hostPlatform.isMusl [ "test_ellipse_arc" ]; diff --git a/pkgs/development/python-modules/isocodes/default.nix b/pkgs/development/python-modules/isocodes/default.nix index 0119cf53411e..5d6f88da1955 100644 --- a/pkgs/development/python-modules/isocodes/default.nix +++ b/pkgs/development/python-modules/isocodes/default.nix @@ -15,7 +15,7 @@ buildPythonPackage (finalAttrs: { pname = "isocodes"; - version = "2025.8.25"; + version = "2026.9.2"; pyproject = true; __structuredAttrs = true; @@ -23,7 +23,7 @@ buildPythonPackage (finalAttrs: { owner = "Atem18"; repo = "isocodes"; tag = finalAttrs.version; - hash = "sha256-rGARvUNaTZ8/CuQ2vhPRx4whYty8lJLSE+5AZTS3eQw="; + hash = "sha256-/B4DjJHgqmQZQTcHfd92zGBCtM2Vlg0sepBkObDuIj8="; }; build-system = [ diff --git a/pkgs/development/python-modules/nidaqmx/default.nix b/pkgs/development/python-modules/nidaqmx/default.nix index 60de3d7e2a85..e7afd3137b7d 100644 --- a/pkgs/development/python-modules/nidaqmx/default.nix +++ b/pkgs/development/python-modules/nidaqmx/default.nix @@ -8,6 +8,7 @@ fetchFromGitHub, grpcio, hightime, + nitypes, numpy, poetry-core, protobuf, @@ -16,6 +17,7 @@ sphinx-rtd-theme, sphinx, toml, + typing-extensions, tzlocal, }: @@ -37,9 +39,11 @@ buildPythonPackage rec { click deprecation hightime + nitypes numpy python-decouple requests + typing-extensions tzlocal ] ++ lib.optionals stdenv.hostPlatform.isLinux [ diff --git a/pkgs/development/python-modules/nitypes/default.nix b/pkgs/development/python-modules/nitypes/default.nix new file mode 100644 index 000000000000..50354c10b3c2 --- /dev/null +++ b/pkgs/development/python-modules/nitypes/default.nix @@ -0,0 +1,59 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + hightime, + numpy, + poetry-core, + pytest-benchmark, + pytest-cov-stub, + pytest-doctestplus, + pytest-mock, + pytestCheckHook, + tomlkit, + tzlocal, + typing-extensions, +}: + +buildPythonPackage (finalAttrs: { + pname = "nitypes"; + version = "1.1.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "ni"; + repo = "nitypes-python"; + tag = finalAttrs.version; + hash = "sha256-gUHu5Bp9qJGX3gTRVmE5J/86zpcSrlypKBkan9LZY2s="; + }; + + build-system = [ + poetry-core + ]; + + dependencies = [ + hightime + numpy + typing-extensions + ]; + + nativeCheckInputs = [ + pytestCheckHook + pytest-cov-stub + pytest-doctestplus + pytest-mock + pytest-benchmark + tomlkit + tzlocal + ]; + + pythonImportsCheck = [ "nitypes" ]; + + meta = { + changelog = "https://github.com/ni/nitypes-python/releases/tag/${finalAttrs.version}"; + description = "Data types for NI Python APIs"; + homepage = "https://github.com/ni/nitypes-python"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ zehuajun ]; + }; +}) diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix index ddc10d53eb8f..1b3520df7820 100644 --- a/pkgs/development/python-modules/pandas/default.nix +++ b/pkgs/development/python-modules/pandas/default.nix @@ -224,7 +224,7 @@ let # These tests are unreliable on aarch64-darwin. See https://github.com/pandas-dev/pandas/issues/38921. "test_rolling" ] - ++ lib.optional stdenv.hostPlatform.is32bit [ + ++ lib.optionals stdenv.hostPlatform.is32bit [ # https://github.com/pandas-dev/pandas/issues/37398 "test_rolling_var_numerical_issues" ]; diff --git a/pkgs/development/python-modules/pygount/default.nix b/pkgs/development/python-modules/pygount/default.nix index 92b7a8b62ee7..285857eff038 100644 --- a/pkgs/development/python-modules/pygount/default.nix +++ b/pkgs/development/python-modules/pygount/default.nix @@ -26,6 +26,10 @@ buildPythonPackage rec { hatchling ]; + pythonRelaxDeps = [ + "chardet" + ]; + dependencies = [ chardet gitpython diff --git a/pkgs/development/python-modules/pymupdf/default.nix b/pkgs/development/python-modules/pymupdf/default.nix index f5f81a8ef752..4fb535176598 100644 --- a/pkgs/development/python-modules/pymupdf/default.nix +++ b/pkgs/development/python-modules/pymupdf/default.nix @@ -152,7 +152,7 @@ buildPythonPackage (finalAttrs: { # Do not lint code "tests/test_typing.py" ] - ++ lib.optional stdenv.hostPlatform.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Trace/BPT trap: 5 when getting widget options "tests/test_4505.py" "tests/test_widgets.py" diff --git a/pkgs/development/python-modules/python-arango/default.nix b/pkgs/development/python-modules/python-arango/default.nix index c215dd2bd44d..4556c088cd91 100644 --- a/pkgs/development/python-modules/python-arango/default.nix +++ b/pkgs/development/python-modules/python-arango/default.nix @@ -31,14 +31,14 @@ in buildPythonPackage (finalAttrs: { pname = "python-arango"; - version = "8.3.4"; + version = "8.3.5"; pyproject = true; src = fetchFromGitHub { owner = "arangodb"; repo = "python-arango"; tag = finalAttrs.version; - hash = "sha256-yciuZy/xyRtyrK11CCfOBDI45kPZZ1Lb5P7aVQ1gx8s="; + hash = "sha256-GHpmWQKvF0gKoemytiAkMQfd3vBWlrRzSSveSE/5PAo="; }; build-system = [ diff --git a/pkgs/development/python-modules/python-debian/default.nix b/pkgs/development/python-modules/python-debian/default.nix index c359e4631dfa..c0e10c740f8c 100644 --- a/pkgs/development/python-modules/python-debian/default.nix +++ b/pkgs/development/python-modules/python-debian/default.nix @@ -11,7 +11,7 @@ buildPythonPackage (finalAttrs: { pname = "python-debian"; - version = "1.1.0"; + version = "1.1.1"; pyproject = true; src = fetchFromGitLab { @@ -19,7 +19,7 @@ buildPythonPackage (finalAttrs: { owner = "python-debian-team"; repo = "python-debian"; tag = finalAttrs.version; - hash = "sha256-v2b9xobxCrSz0tOEBo6awmQuTyykyJlsryPBMRU9EmM="; + hash = "sha256-K5i0zDZXeAgoAdblqp+f5QX9FIZYVpJ4wWk29hwVjfM="; }; build-system = [ @@ -27,7 +27,7 @@ buildPythonPackage (finalAttrs: { setuptools-scm ]; - dependencies = [ + optional-dependencies.encodings = [ charset-normalizer ]; diff --git a/pkgs/development/python-modules/python-keystoneclient/default.nix b/pkgs/development/python-modules/python-keystoneclient/default.nix index 1e0fc4b24283..8e48f0248aff 100644 --- a/pkgs/development/python-modules/python-keystoneclient/default.nix +++ b/pkgs/development/python-modules/python-keystoneclient/default.nix @@ -16,13 +16,13 @@ buildPythonPackage rec { pname = "python-keystoneclient"; - version = "5.8.0"; + version = "6.0.0"; pyproject = true; src = fetchPypi { pname = "python_keystoneclient"; inherit version; - hash = "sha256-PKh8Z8QEKYzoYjELVp9UWlis91zVaFCUyC81Mgs6NV0="; + hash = "sha256-1qw6Ca3yMZqqxXKOO/fL6vlSwpW9eDHx35pXOyX7z4I="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/python-octaviaclient/default.nix b/pkgs/development/python-modules/python-octaviaclient/default.nix index dd7574d829f8..0ee68d148126 100644 --- a/pkgs/development/python-modules/python-octaviaclient/default.nix +++ b/pkgs/development/python-modules/python-octaviaclient/default.nix @@ -18,13 +18,13 @@ buildPythonPackage rec { pname = "python-octaviaclient"; - version = "3.13.0"; + version = "3.15.0"; pyproject = true; src = fetchPypi { pname = "python_octaviaclient"; inherit version; - hash = "sha256-Iq1TdXMUDqrE33V+yh8H7yYPIW01NVEa6cPqFPq4Yv4="; + hash = "sha256-sJkCRjQ4b6JDtFVP1ex5lssC3zN8bcQTpKP/hHWuqjs="; }; # NOTE(vinetos): This explicit dependency is removed to avoid infinite recursion diff --git a/pkgs/development/python-modules/sqlite-fts4/default.nix b/pkgs/development/python-modules/sqlite-fts4/default.nix index c217544ea383..8e12e8327f0f 100644 --- a/pkgs/development/python-modules/sqlite-fts4/default.nix +++ b/pkgs/development/python-modules/sqlite-fts4/default.nix @@ -2,21 +2,26 @@ lib, buildPythonPackage, fetchFromGitHub, + setuptools, pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "sqlite-fts4"; version = "1.0.3"; - format = "setuptools"; + pyproject = true; + + __structuredAttrs = true; src = fetchFromGitHub { owner = "simonw"; repo = "sqlite-fts4"; - tag = version; + tag = finalAttrs.version; hash = "sha256-Ibiows3DSnzjIUv7U9tYNVnDaecBBxjXzDqxbIlNhhU="; }; + build-system = [ setuptools ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "sqlite_fts4" ]; @@ -27,4 +32,4 @@ buildPythonPackage rec { license = lib.licenses.asl20; maintainers = with lib.maintainers; [ meatcar ]; }; -} +}) diff --git a/pkgs/development/python-modules/static3/default.nix b/pkgs/development/python-modules/static3/default.nix index 45de611df216..1528afbd3930 100644 --- a/pkgs/development/python-modules/static3/default.nix +++ b/pkgs/development/python-modules/static3/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + setuptools, # optionals genshi, @@ -12,18 +13,22 @@ webtest, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "static3"; version = "0.7.0"; - format = "setuptools"; + pyproject = true; + + __structuredAttrs = true; src = fetchFromGitHub { owner = "rmohr"; repo = "static3"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-uFgv+57/UZs4KoOdkFxbvTEDQrJbb0iYJ5JoWWN4yFY="; }; + build-system = [ setuptools ]; + optional-dependencies = { KidMagic = [ # TODO: kid @@ -38,14 +43,14 @@ buildPythonPackage rec { pytest-cov-stub webtest ] - ++ lib.concatAttrValues optional-dependencies; + ++ lib.concatAttrValues finalAttrs.passthru.optional-dependencies; meta = { - changelog = "https://github.com/rmohr/static3/releases/tag/v${version}"; + changelog = "https://github.com/rmohr/static3/releases/tag/${finalAttrs.src.tag}"; description = "Really simple WSGI way to serve static (or mixed) content"; mainProgram = "static"; homepage = "https://github.com/rmohr/static3"; license = lib.licenses.lgpl21Only; maintainers = with lib.maintainers; [ hexa ]; }; -} +}) diff --git a/pkgs/development/python-modules/uqbar/default.nix b/pkgs/development/python-modules/uqbar/default.nix index f0df9aaed8f2..3e2be97dc0c7 100644 --- a/pkgs/development/python-modules/uqbar/default.nix +++ b/pkgs/development/python-modules/uqbar/default.nix @@ -63,11 +63,11 @@ buildPythonPackage (finalAttrs: { # https://github.com/supriya-project/uqbar/issues/107 "SummarizingRootDocumenter" ] - ++ lib.optional (pythonAtLeast "3.11") [ + ++ lib.optionals (pythonAtLeast "3.11") [ # assert not '\x1b[91m/build/uqbar-0.7.0/tests/fake_package/enums.py:docstring "test_sphinx_style" ] - ++ lib.optional (pythonAtLeast "3.12") [ + ++ lib.optionals (pythonAtLeast "3.12") [ # https://github.com/supriya-project/uqbar/issues/93 "objects.get_vars" ] diff --git a/pkgs/development/tools/godot/common.nix b/pkgs/development/tools/godot/common.nix index a0cba15c4584..30416a828ad9 100644 --- a/pkgs/development/tools/godot/common.nix +++ b/pkgs/development/tools/godot/common.nix @@ -325,7 +325,7 @@ let # stripping dlls results in: # Failed to load System.Private.CoreLib.dll (error code 0x8007000B) - stripExclude = lib.optional withMono [ "*.dll" ]; + stripExclude = lib.optionals withMono [ "*.dll" ]; runtimeDependencies = prev.runtimeDependencies or [ ] diff --git a/pkgs/os-specific/cygwin/newlib-cygwin/default.nix b/pkgs/os-specific/cygwin/newlib-cygwin/default.nix index c647a1999f19..511cef4b8aa4 100644 --- a/pkgs/os-specific/cygwin/newlib-cygwin/default.nix +++ b/pkgs/os-specific/cygwin/newlib-cygwin/default.nix @@ -41,7 +41,7 @@ # declared. Backport of https://cygwin.com/cgit/newlib-cygwin/commit/?id=73600d68227e125af24b7de7c3fccbd4eb66ee03 ./fix-winsize.patch ] - ++ lib.optional (!headersOnly) [ + ++ lib.optionals (!headersOnly) [ # https://cygwin.com/pipermail/cygwin-developers/2020-September/011970.html # This is required for boost coroutines to work. After we get to the point # where nix runs on cygwin, we can attempt to upstream this again. diff --git a/pkgs/servers/sql/postgresql/ext/vectorchord/package.nix b/pkgs/servers/sql/postgresql/ext/vectorchord/package.nix index 4df95e952937..31c8ea50ed76 100644 --- a/pkgs/servers/sql/postgresql/ext/vectorchord/package.nix +++ b/pkgs/servers/sql/postgresql/ext/vectorchord/package.nix @@ -26,7 +26,7 @@ buildPgrxExtension (finalAttrs: { cargoHash = "sha256-IXOCzKJArNOcb/2TcJbLz1XdCquUpyF/cLHYU5vmlko="; patches = - lib.optional (lib.versionOlder rustc.llvm.version "22.0.0" && stdenv.hostPlatform.isx86_64) + lib.optionals (lib.versionOlder rustc.llvm.version "22.0.0" && stdenv.hostPlatform.isx86_64) [ # Due to a bug in LLVM 21, build fails on x86_64 with: # `rustc-LLVM ERROR: Cannot select: intrinsic %llvm.x86.avx512.vpdpbusd.512`. diff --git a/pkgs/shells/fish/plugins/pure.nix b/pkgs/shells/fish/plugins/pure.nix index 2702fe45b963..71e1d46c0740 100644 --- a/pkgs/shells/fish/plugins/pure.nix +++ b/pkgs/shells/fish/plugins/pure.nix @@ -4,16 +4,17 @@ fetchFromGitHub, git, fishtape_3, + nix-update-script, }: buildFishPlugin (finalAttrs: { pname = "pure"; - version = "4.18.0"; + version = "4.19.0"; src = fetchFromGitHub { owner = "pure-fish"; repo = "pure"; tag = "v${finalAttrs.version}"; - hash = "sha256-KV43PlJmAjQxoNHWJRhAYUyzaqhKwLJSTeuo3cX98AA="; + hash = "sha256-8rxCmKu1pvBMm+/Ski7q3ikNnnX3gAqQ0jo0f2mIXrI="; }; nativeCheckInputs = [ git ]; @@ -25,6 +26,8 @@ buildFishPlugin (finalAttrs: { fishtape tests/*.test.fish ''; + passthru.updateScript = nix-update-script { }; + meta = { description = "Pretty, minimal and fast Fish prompt, ported from zsh"; homepage = "https://github.com/pure-fish/pure"; diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix index ac9471788ccf..42c66e084acb 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix @@ -27,13 +27,13 @@ stdenv.mkDerivation rec { pname = "fcitx5-configtool"; - version = "5.1.14"; + version = "5.1.15"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - hash = "sha256-+lpJlGaVGTcZpoGvcHAsb5N5M4Y3McV4GSZpSwZxX3Y="; + hash = "sha256-rXc+uUU0xuhlHWPGmHbZ9kSASgN/whfDsN4Td64Xe34="; }; cmakeFlags = [ diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-unikey.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-unikey.nix index 22b8a554d0b5..61a345394ed1 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-unikey.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-unikey.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "fcitx5-unikey"; - version = "5.1.11"; + version = "5.1.12"; src = fetchFromGitHub { owner = "fcitx"; repo = "fcitx5-unikey"; rev = version; - hash = "sha256-ekGZreXoc/8yM2+PNsSLcMIsSxbRmkCQcknAZtNC3kM="; + hash = "sha256-lZRmjtByg8SrO70EdssGtSQhod9byWi1e5a7WjgIdiI="; }; nativeBuildInputs = [ diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index f3b83d44a238..3c071c369a2b 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1127,6 +1127,7 @@ mapAliases { haxe_4_0 = throw "'haxe_4_0' has been removed as it reached its end of life. Migrate to 'haxe_4_3'."; haxe_4_1 = throw "'haxe_4_1' has been removed as it reached its end of life. Migrate to 'haxe_4_3'."; haxor-news = throw "'haxor-news' has been removed as it is unmaintained"; # Added 2026-06-16 + hdhomerun-config-gui = throw "'hdhomerun-config-gui' has been removed as its support was discontinued: https://forum.silicondust.com/forum/viewtopic.php?p=399766#p399766"; # Added 2026-08-30 helix-gpt = throw "helix-gpt was deprecated in January 2026 and has been since removed"; # Added 2026-02-05 heptabase = throw "'heptabase' bas been removed due to lack of maintenance."; # Added 2026-05-31 hexchat = throw "'hexchat' has been removed due to being archived upstream and relying on gtk2."; # Added 2026-07-28 @@ -1924,6 +1925,7 @@ mapAliases { openmodelica = throw "'openmodelica' has been removed as it was unmaintained in nixpkgs and depends on insecure&unmtaintained qtwebkit"; # Added 2026-04-26 openmpCheckPhaseHook = warnAlias "'openmpCheckPhaseHook' has been renamed to 'checkPhaseThreadLimitHook' to reflect its handling of all known thread-limiting mechanisms during check phase" checkPhaseThreadLimitHook; # Added 2026-07-09 openmw-tes3mp = throw "'openmw-tes3mp' has been removed due to lack of maintenance upstream"; # Added 2025-08-30 + openslp = throw "'openslp' has been removed because upstream has not released since 2013 and the package has an unfixable UDP reflection vulnerability (CVE-2023-29552)."; # Added 2026-09-02 openssl_1_1 = throw "'openssl_1_1' has been removed, because it was end of life'"; # Added 2026-07-24 openssl_3_0 = throw "'openssl_3_0' has been renamed to/replaced by 'openssl_3'"; # Converted to throw 2025-10-27 opensycl = throw "'opensycl' has been renamed to/replaced by 'adaptivecpp'"; # Converted to throw 2025-10-27 @@ -2109,6 +2111,7 @@ mapAliases { protonvpn-gui = warnAlias "'protonvpn-gui' has been renamed to/replaced by 'proton-vpn'" proton-vpn; # Added 2026-02-23 prototool = throw "'prototool' has been removed. Use 'buf' instead."; # Added 2026-09-04 proxmark3-rrg = throw "'proxmark3-rrg' has been renamed to/replaced by 'proxmark3'"; # Converted to throw 2025-10-27 + proxysql = throw "'proxysql' has been removed because it was unmaintained within nixpkgs"; # Added 2026-09-08 pscid = throw "'pscid' has been removed because it was unmaintained upstream"; # Added 2025-12-12 psi = throw "'psi' has been removed as it depended on EOL qt5 webengine. Consider moving to psi-plus, a somewhat more maintained fork."; # Added 2026-04-15 pulp = throw "'pulp' has been removed because it was unmaintained upstream"; # Added 2025-12-12 @@ -2153,6 +2156,7 @@ mapAliases { qcachegrind = throw "'qcachegrind' has been removed, as it depends on KDE Gear 5, which has reached EOL"; # Added 2025-08-20 qes = throw "'qes' has been removed, as it has been merged into shkd"; # Added 2025-12-21 qflipper = throw "'qflipper' has been renamed to/replaced by 'qFlipper'"; # Converted to throw 2025-10-27 + qgo = throw "'qgo' has been removed because upstream no longer develops it"; # Added 2026-09-02 qMasterPassword = warnAlias "'qMasterPassword' has been renamed to/replaced by 'qmasterpassword'" qmasterpassword; # Added 2026-02-01 qMasterPassword-wayland = warnAlias "'qMasterPassword-wayland' has been renamed to/replaced by 'qmasterpassword-wayland'" qmasterpassword-wayland; # Added 2026-02-01 qmenumodel = warnAlias "'qmenumodel' has been renamed to 'libsForQt5.qmenumodel'" libsForQt5.qmenumodel; # Added 2026-03-26 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 957fa2e6a271..62a7c54cd3e5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12042,6 +12042,8 @@ self: super: with self; { nitrokey = callPackage ../development/python-modules/nitrokey { }; + nitypes = callPackage ../development/python-modules/nitypes { }; + niworkflows = callPackage ../development/python-modules/niworkflows { }; nix-kernel = callPackage ../development/python-modules/nix-kernel { inherit (pkgs) nix; };