diff --git a/nixos/modules/services/monitoring/osquery.nix b/nixos/modules/services/monitoring/osquery.nix index a54f4f4ecbbf..5f9638ce8992 100644 --- a/nixos/modules/services/monitoring/osquery.nix +++ b/nixos/modules/services/monitoring/osquery.nix @@ -25,17 +25,20 @@ let ({ config_path = conf; } // cfg.flags) ) ); - + osquery = cfg.package; osqueryi = pkgs.runCommand "osqueryi" { nativeBuildInputs = [ pkgs.makeWrapper ]; } '' mkdir -p $out/bin - makeWrapper ${pkgs.osquery}/bin/osqueryi $out/bin/osqueryi \ + makeWrapper ${osquery}/bin/osqueryi $out/bin/osqueryi \ --add-flags "--flagfile ${flagfile} --disable-database" ''; + in { options.services.osquery = { enable = lib.mkEnableOption "osqueryd daemon"; + package = lib.mkPackageOption pkgs "osquery" { }; + settings = lib.mkOption { default = { }; description = '' @@ -108,7 +111,7 @@ in ]; description = "The osquery daemon"; serviceConfig = { - ExecStart = "${pkgs.osquery}/bin/osqueryd --flagfile ${flagfile}"; + ExecStart = "${osquery}/bin/osqueryd --flagfile ${flagfile}"; PIDFile = cfg.flags.pidfile; LogsDirectory = lib.mkIf (cfg.flags.logger_path == "/var/log/osquery") [ "osquery" ]; StateDirectory = lib.mkIf (cfg.flags.database_path == "/var/lib/osquery/osquery.db") [ "osquery" ]; @@ -116,7 +119,7 @@ in }; wantedBy = [ "multi-user.target" ]; }; - systemd.tmpfiles.settings."10-osquery".${dirname (cfg.flags.pidfile)}.d = { + systemd.tmpfiles.settings."10-osquery".${dirname cfg.flags.pidfile}.d = { user = "root"; group = "root"; mode = "0755"; diff --git a/nixos/tests/osquery.nix b/nixos/tests/osquery.nix index 5faf2f343740..e0ac28e68e90 100644 --- a/nixos/tests/osquery.nix +++ b/nixos/tests/osquery.nix @@ -1,5 +1,5 @@ import ./make-test-python.nix ( - { lib, pkgs, ... }: + { lib, ... }: let config_refresh = "10"; @@ -13,19 +13,17 @@ import ./make-test-python.nix ( lewo ]; - nodes.machine = - { config, pkgs, ... }: - { - services.osquery = { - enable = true; + nodes.machine = _: { + services.osquery = { + enable = true; - settings.options = { inherit nullvalue utc; }; - flags = { - inherit config_refresh; - nullvalue = "IGNORED"; - }; + settings.options = { inherit nullvalue utc; }; + flags = { + inherit config_refresh; + nullvalue = "IGNORED"; }; }; + }; testScript = { nodes, ... }: diff --git a/pkgs/by-name/ad/adslib/package.nix b/pkgs/by-name/ad/adslib/package.nix index 8c7849ed6344..f29815505912 100644 --- a/pkgs/by-name/ad/adslib/package.nix +++ b/pkgs/by-name/ad/adslib/package.nix @@ -2,17 +2,18 @@ lib, stdenv, fetchFromGitHub, + unstableGitUpdater, }: stdenv.mkDerivation { pname = "adslib"; - version = "unstable-2020-08-28"; + version = "0-unstable-2021-11-07"; src = fetchFromGitHub { owner = "stlehmann"; repo = "ADS"; - rev = "c457b60d61d73325837ca50be2cc997c4792d481"; - sha256 = "11r86xa8fr4z957hd0abn8x7182nz30a198d02y7gzpbhpi3z43k"; + rev = "a894d4512a51f3ada026efbf9553e75ba9351e2e"; + sha256 = "SEh4yneTM1dfbWRdWlb5gP/uSeoOeE3g7g/rJWSTba8="; }; installPhase = '' @@ -20,6 +21,8 @@ stdenv.mkDerivation { cp adslib.so $out/lib/adslib.so ''; + passthru.updateScript = unstableGitUpdater { }; + meta = { description = "Beckhoff protocol to communicate with TwinCAT devices"; homepage = "https://github.com/stlehmann/ADS"; diff --git a/pkgs/by-name/ag/agg/package.nix b/pkgs/by-name/ag/agg/package.nix index 247d4caec288..d027f6215301 100644 --- a/pkgs/by-name/ag/agg/package.nix +++ b/pkgs/by-name/ag/agg/package.nix @@ -75,7 +75,7 @@ stdenv.mkDerivation (finalAttrs: { ''; license = lib.licenses.gpl2Plus; - homepage = "http://www.antigrain.com/"; + homepage = "https://agg.sourceforge.net/antigrain.com/index.html"; platforms = lib.platforms.unix; hydraPlatforms = lib.platforms.linux; # build hangs on both Darwin platforms, needs investigation }; diff --git a/pkgs/by-name/as/assetripper/deps.json b/pkgs/by-name/as/assetripper/deps.json index 961c7e4f691e..fa09f39dc7f7 100644 --- a/pkgs/by-name/as/assetripper/deps.json +++ b/pkgs/by-name/as/assetripper/deps.json @@ -56,8 +56,8 @@ }, { "pname": "AssetRipper.GUI.Web.Dependencies", - "version": "1.0.0", - "hash": "sha256-vRaU7qR5u2TKk1RdP4ZyTbe+/rJ02ffeC8YkqMp+W4E=" + "version": "1.1.0", + "hash": "sha256-ZsUjsQO2X6YuQfwkhmDQUlJLOGzkvdB73aE9oWpw/xY=" }, { "pname": "AssetRipper.HashAlgorithms", @@ -66,8 +66,8 @@ }, { "pname": "AssetRipper.ICSharpCode.Decompiler", - "version": "10.0.0.8273-preview2", - "hash": "sha256-FI+I2MZfFG6iHVW7ykNIO6WOSxTqmRSEtWx3CQNlRBY=" + "version": "10.0.0.8284-preview3", + "hash": "sha256-ae4zvCXkE9EgOdKy4LWI89laUtkAaPkdtf4YyQOZ4vA=" }, { "pname": "AssetRipper.IO.Endian", @@ -86,8 +86,8 @@ }, { "pname": "AssetRipper.NativeDialogs", - "version": "1.0.1", - "hash": "sha256-fLUIHFnyurjuM5YhV9G4KbwIY0oooSNY/OLglG038Cs=" + "version": "1.1.1", + "hash": "sha256-6ShudCx1WwuzmbElus3NxyxuNY5e8NthujoKkkgLFyE=" }, { "pname": "AssetRipper.Primitives", @@ -121,8 +121,8 @@ }, { "pname": "AssetRipper.SourceGenerated", - "version": "1.3.9", - "hash": "sha256-YjaQJNyRY+HM4qzlGYPFxjQstibVY5IB94DJoks1upo=" + "version": "1.3.10", + "hash": "sha256-CU8mSe7+vEmQ7QjRv0UDE9REOWniFz38BAtiKAtGsvo=" }, { "pname": "AssetRipper.Text.Html", @@ -136,8 +136,8 @@ }, { "pname": "AssetRipper.TextureDecoder", - "version": "2.5.0", - "hash": "sha256-Jxy6sjAnB0fVzlZ7TeKb8H45aNftiZe8gMTNQyefouU=" + "version": "2.6.0", + "hash": "sha256-qoecWzCXQq82wUTaw6A65pJYId/GxxkiKGZZ9AlbgWo=" }, { "pname": "AssetRipper.Tpk", @@ -172,13 +172,13 @@ }, { "pname": "Microsoft.AspNetCore.OpenApi", - "version": "10.0.1", - "hash": "sha256-O31K6+++fM7XWd0JGrzmzLrtydYGiI4efzv+WqAdnQA=" + "version": "10.0.2", + "hash": "sha256-FU57fPXL4NUDRqi+rLresi4yKttv1KcAnLuEdPCyTos=" }, { "pname": "Microsoft.Bcl.AsyncInterfaces", - "version": "10.0.1", - "hash": "sha256-aHoslRGmAot/z1GCCqSzjAxT/hltxOOIZ1/oti4WbGY=" + "version": "10.0.2", + "hash": "sha256-3lrCf7HOpbkZkQx4/JSpKi8Rl+hp9NAaRi9dp6xqMaQ=" }, { "pname": "Microsoft.CodeAnalysis.Analyzers", @@ -217,8 +217,8 @@ }, { "pname": "Microsoft.OpenApi", - "version": "2.4.1", - "hash": "sha256-DXdbXq5Gpg3MJVBM0C8uF6mcLczVJAUFp6LAdFojgPs=" + "version": "2.6.1", + "hash": "sha256-cRA2net+NnfJUde1i3NRGvOxT8ycXq9+W+eerXKCapc=" }, { "pname": "NAudio.Core", @@ -282,8 +282,8 @@ }, { "pname": "SharpCompress", - "version": "0.42.1", - "hash": "sha256-cHQM/AKOZtH0dgWQaoNlLQobq4/1f/+MpXAAKHHuOxU=" + "version": "0.44.4", + "hash": "sha256-woh8cQz+Qc6MiYhCSXmMERxzhqYDWoqo7qDfRh3Od/o=" }, { "pname": "SourceGenerator.Foundations", @@ -337,8 +337,8 @@ }, { "pname": "System.IO.Pipelines", - "version": "10.0.1", - "hash": "sha256-3NHQjvO1mSPo8Hq9vMM5QeKJeS9/y3UpznideAf5pJA=" + "version": "10.0.2", + "hash": "sha256-Guh0w9aMQ5wNSI9ecuoH4tGOX4VFnlNgepvBTPGFgzc=" }, { "pname": "System.Memory", @@ -402,13 +402,13 @@ }, { "pname": "System.Text.Encodings.Web", - "version": "10.0.1", - "hash": "sha256-dBN9Rpe+J1F8/cdzwNxLHYiqvzgSX1r9128YXyb2DKM=" + "version": "10.0.2", + "hash": "sha256-DWbSR+d8DJtkMclrKKbS5Ghlvi6YYrrxgHGfyDJx50o=" }, { "pname": "System.Text.Json", - "version": "10.0.1", - "hash": "sha256-WfSgOpRL4DKfIry/H+eHxJHHrj6ENZ3+P6Q2ol3R2XM=" + "version": "10.0.2", + "hash": "sha256-Gf6L3mxsdvmN8gDyoUhfZDSFWKpmn9UjJ2v/p1CDFmk=" }, { "pname": "System.Threading.Tasks.Extensions", @@ -422,8 +422,8 @@ }, { "pname": "TerraFX.Interop.Windows", - "version": "10.0.26100.2", - "hash": "sha256-dIyetiPHgFg3cXN620ur3O/O3c+7Piw+KKzr88SlpHw=" + "version": "10.0.26100.6", + "hash": "sha256-oC1WDA7w1kVB9adGZh2KDCvJisRcOkw4Cy87wDjh2qc=" }, { "pname": "ZstdSharp.Port", @@ -432,7 +432,7 @@ }, { "pname": "ZstdSharp.Port", - "version": "0.8.6", - "hash": "sha256-rc3YWP80fykqujDsD72SXOA1tBDoy2KrvVETOC8eTx8=" + "version": "0.8.7", + "hash": "sha256-WsuDTZOv3TgiE8NV/TXbKRMHBsZKgWB8iDdKKr9OvAo=" } ] diff --git a/pkgs/by-name/as/assetripper/package.nix b/pkgs/by-name/as/assetripper/package.nix index 583231463211..116a1cc9a6d8 100644 --- a/pkgs/by-name/as/assetripper/package.nix +++ b/pkgs/by-name/as/assetripper/package.nix @@ -10,13 +10,13 @@ buildDotnetModule (finalAttrs: { pname = "assetripper"; - version = "1.3.9"; + version = "1.3.10"; src = fetchFromGitHub { owner = "AssetRipper"; repo = "AssetRipper"; tag = finalAttrs.version; - hash = "sha256-cQt0udU2IjsKPwTpBZLFmw1kGv2DfRt7ecdh2ilQtN8="; + hash = "sha256-sqlZsUTeLyHHESNtC07F2FjgLXnuqgoPYRcgE57sq5k="; }; buildInputs = [ diff --git a/pkgs/by-name/ba/basedpyright/package.nix b/pkgs/by-name/ba/basedpyright/package.nix index 5fa1d6a58a09..28cf35927d28 100644 --- a/pkgs/by-name/ba/basedpyright/package.nix +++ b/pkgs/by-name/ba/basedpyright/package.nix @@ -18,13 +18,13 @@ buildNpmPackage rec { pname = "basedpyright"; - version = "1.37.1"; + version = "1.37.2"; src = fetchFromGitHub { owner = "detachhead"; repo = "basedpyright"; tag = "v${version}"; - hash = "sha256-lBCCd9t6E0lUHOKc+5G1Ab3FmD/zj6g6SPoJ0Lh6oDE="; + hash = "sha256-xFbVeNfOse7FfivTFwBnEZ0XUU2uUXqe1im6MncZwyY="; }; npmDepsHash = "sha256-aZ9kfkW+S6Hjt59Z4Fc5joghs7OQ32354IYevFuKNeo="; diff --git a/pkgs/by-name/be/bearer/package.nix b/pkgs/by-name/be/bearer/package.nix index e47b2559b8a8..c3702dcd7457 100644 --- a/pkgs/by-name/be/bearer/package.nix +++ b/pkgs/by-name/be/bearer/package.nix @@ -2,43 +2,40 @@ lib, buildGoModule, fetchFromGitHub, - testers, - bearer, + versionCheckHook, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "bearer"; - version = "1.51.1"; + version = "2.0.0"; src = fetchFromGitHub { owner = "bearer"; repo = "bearer"; - tag = "v${version}"; - hash = "sha256-s1AUVpmSJYRoidEH4qM4mHPsbTsn2Uo9HfcNG2oMIXA="; + tag = "v${finalAttrs.version}"; + hash = "sha256-kWs8NiuOroKgQC0Duvef9O7TqQnqgEd28EQZVf4y4oQ="; }; - vendorHash = "sha256-9OU0pqztGM5hmPCcMGCR6IdO/5XJE1MVcCCX+vH3us0="; + vendorHash = "sha256-uMu5CL/VAlSd2yZzbkr0ceQdUVJvhs9R+IoyZbtZPk8="; subPackages = [ "cmd/bearer" ]; + nativeInstallCheckInputs = [ versionCheckHook ]; + ldflags = [ "-s" "-w" - "-X=github.com/bearer/bearer/cmd/bearer/build.Version=${version}" + "-X=github.com/bearer/bearer/cmd/bearer/build.Version=${finalAttrs.version}" ]; - passthru.tests = { - version = testers.testVersion { - package = bearer; - command = "bearer version"; - }; - }; + doInstallCheck = true; meta = { description = "Code security scanning tool (SAST) to discover, filter and prioritize security and privacy risks"; homepage = "https://github.com/bearer/bearer"; - changelog = "https://github.com/Bearer/bearer/releases/tag/v${version}"; - license = with lib.licenses; [ elastic20 ]; + changelog = "https://github.com/Bearer/bearer/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.elastic20; maintainers = with lib.maintainers; [ fab ]; + mainProgram = "bearer"; }; -} +}) diff --git a/pkgs/by-name/ea/easyrpg-player/package.nix b/pkgs/by-name/ea/easyrpg-player/package.nix index 7174c5be81c5..7938b789d073 100644 --- a/pkgs/by-name/ea/easyrpg-player/package.nix +++ b/pkgs/by-name/ea/easyrpg-player/package.nix @@ -126,6 +126,6 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl3Plus; maintainers = [ ]; platforms = lib.platforms.all; - mainProgram = lib.optionalString stdenv.hostPlatform.isDarwin "EasyRPG Player"; + mainProgram = if stdenv.hostPlatform.isDarwin then "EasyRPG Player" else "easyrpg-player"; }; } diff --git a/pkgs/by-name/em/emmylua-doc-cli/package.nix b/pkgs/by-name/em/emmylua-doc-cli/package.nix index 54acc7547db2..f41baf09ac01 100644 --- a/pkgs/by-name/em/emmylua-doc-cli/package.nix +++ b/pkgs/by-name/em/emmylua-doc-cli/package.nix @@ -6,18 +6,18 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "emmylua_doc_cli"; - version = "0.19.0"; + version = "0.20.0"; src = fetchFromGitHub { owner = "EmmyLuaLs"; repo = "emmylua-analyzer-rust"; tag = finalAttrs.version; - hash = "sha256-bdvJInMuWJq7MZa+4wrKBn0myLTHCayhDAhB8Stjp6A="; + hash = "sha256-aC7NrmzL6Ri7oB7jW+uSzbWTXfAUrk0zXH7t6ewukLU="; }; buildAndTestSubdir = "crates/emmylua_doc_cli"; - cargoHash = "sha256-bF6bdTbcHDecj+wVoNsaKBzsz96d3vo6cqp5MjSbT4E="; + cargoHash = "sha256-znpZt/1ss3EcimFSADQi2/14z2etKbv78QQoT823U9Y="; nativeInstallCheckInputs = [ versionCheckHook diff --git a/pkgs/by-name/en/envoy-bin/package.nix b/pkgs/by-name/en/envoy-bin/package.nix index 22e6d087b77f..9cd4f036a6cc 100644 --- a/pkgs/by-name/en/envoy-bin/package.nix +++ b/pkgs/by-name/en/envoy-bin/package.nix @@ -1,15 +1,14 @@ { lib, - stdenv, + stdenvNoCC, autoPatchelfHook, fetchurl, - makeWrapper, nixosTests, versionCheckHook, }: let version = "1.37.0"; - inherit (stdenv.hostPlatform) system; + inherit (stdenvNoCC.hostPlatform) system; throwSystem = throw "envoy-bin is not available for ${system}."; plat = @@ -26,7 +25,7 @@ let } .${system} or throwSystem; in -stdenv.mkDerivation { +stdenvNoCC.mkDerivation { pname = "envoy-bin"; inherit version; @@ -36,21 +35,24 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ autoPatchelfHook ]; - buildInputs = [ makeWrapper ]; + + strictDeps = true; dontUnpack = true; + dontConfigure = true; dontBuild = true; installPhase = '' runHook preInstall + mkdir -p $out/bin install -m755 $src $out/bin/envoy + runHook postInstall ''; nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; - versionCheckProgram = "${placeholder "out"}/bin/envoy"; passthru = { tests.envoy-bin = nixosTests.envoy-bin; diff --git a/pkgs/by-name/ev/everest-bin/package.nix b/pkgs/by-name/ev/everest-bin/package.nix index 7981f9df002d..1ce3c238d3f6 100644 --- a/pkgs/by-name/ev/everest-bin/package.nix +++ b/pkgs/by-name/ev/everest-bin/package.nix @@ -8,15 +8,15 @@ let pname = "everest"; - version = "6129"; + version = "6157"; phome = "$out/lib/Celeste"; in stdenvNoCC.mkDerivation { inherit pname version; src = fetchzip { - url = "https://github.com/EverestAPI/Everest/releases/download/stable-1.6129.0/main.zip"; + url = "https://github.com/EverestAPI/Everest/releases/download/stable-1.6157.0/main.zip"; extension = "zip"; - hash = "sha256-6Pvnvt7ZVQRIKpyBZt18rcqy8DL42WGhR7IF2O9zFLc="; + hash = "sha256-glGxQGp1zLg2wHeJBZUEbzTkCd3hU0GKBJo5SVuqXw4="; }; buildInputs = [ icu diff --git a/pkgs/by-name/ev/everest/package.nix b/pkgs/by-name/ev/everest/package.nix index d33b7a1d7dd7..e48d43c7de60 100644 --- a/pkgs/by-name/ev/everest/package.nix +++ b/pkgs/by-name/ev/everest/package.nix @@ -11,7 +11,7 @@ let pname = "everest"; - version = "6129"; + version = "6157"; phome = "$out/lib/Celeste"; in buildDotnetModule { @@ -20,11 +20,11 @@ buildDotnetModule { src = fetchFromGitHub { owner = "EverestAPI"; repo = "Everest"; - rev = "04aa4228786ba8448455f1962f9714c08ad28383"; + rev = "44350f94f150bfa9b0ffb3cf979eeaf6146cab34"; fetchSubmodules = true; # TODO: use leaveDotGit = true and modify external/MonoMod in postFetch to please SourceLink # Microsoft.SourceLink.Common.targets(53,5): warning : Source control information is not available - the generated source link is empty. - hash = "sha256-p/zcqqKOwqumEY6RRH26FV3j7VQ3q2uFWm6IBEtLrgA="; + hash = "sha256-2cbeheBQLcGBUS20CUMNuDgVHqgtWFRAObkTcRZ4xCk="; }; nativeBuildInputs = [ autoPatchelfHook ]; diff --git a/pkgs/by-name/fi/filtr/package.nix b/pkgs/by-name/fi/filtr/package.nix index 07d318c5ae7f..09738ab1d6cd 100644 --- a/pkgs/by-name/fi/filtr/package.nix +++ b/pkgs/by-name/fi/filtr/package.nix @@ -16,6 +16,9 @@ libXrandr, libXtst, writableTmpDirAsHomeHook, + + buildVST3 ? true, + buildLV2 ? true, }: stdenv.mkDerivation (finalAttrs: { @@ -56,7 +59,10 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ (lib.cmakeBool "COPY_PLUGIN_AFTER_BUILD" false) - (lib.cmakeFeature "BUILD_STANDALONE" "OFF") + + (lib.cmakeBool "BUILD_STANDALONE" false) + (lib.cmakeBool "BUILD_VST3" buildVST3) + (lib.cmakeBool "BUILD_LV2" buildLV2) ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-DCMAKE_OSX_ARCHITECTURES=${stdenv.hostPlatform.darwinArch}" @@ -76,10 +82,17 @@ stdenv.mkDerivation (finalAttrs: { installPhase = '' runHook preInstall - mkdir -p $out/lib/vst3 $out/lib/lv2 + pushd FILTR_artefacts/Release + ${lib.optionalString buildVST3 '' + mkdir -p $out/lib/vst3 + cp -r VST3/FILT-R.vst3 $out/lib/vst3 + ''} - cp -r "FILTR_artefacts/Release/LV2/FILT-R.lv2" $out/lib/lv2 - cp -r "FILTR_artefacts/Release/VST3/FILT-R.vst3" $out/lib/vst3 + ${lib.optionalString buildLV2 '' + mkdir -p $out/lib/lv2 + cp -r LV2/FILT-R.lv2 $out/lib/lv2 + ''} + popd runHook postInstall ''; @@ -89,7 +102,10 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/tiagolr/filtr"; changelog = "https://github.com/tiagolr/filtr/releases/tag/v${finalAttrs.version}"; license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [ magnetophon ]; + maintainers = with lib.maintainers; [ + magnetophon + mrtnvgr + ]; platforms = lib.platforms.all; }; }) diff --git a/pkgs/by-name/fl/fly/package.nix b/pkgs/by-name/fl/fly/package.nix index ed17abbf1141..bcc2ec0a419f 100644 --- a/pkgs/by-name/fl/fly/package.nix +++ b/pkgs/by-name/fl/fly/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "fly"; - version = "8.0.0"; + version = "8.0.1"; src = fetchFromGitHub { owner = "concourse"; repo = "concourse"; rev = "v${version}"; - hash = "sha256-rJpmFO5kpn9It1j8EKb2ZyMnKQ+n4iCuAVFB8nVk6+k="; + hash = "sha256-fwWYZHtirrH0neNMFJzgjxUFAggBRWzFjQVJg68Tfrs="; }; vendorHash = "sha256-Ymxe64xtstMKISIHHCY5Z8RX3FxoS/8ocSZomcr4NXA="; diff --git a/pkgs/by-name/fp/fping/package.nix b/pkgs/by-name/fp/fping/package.nix index 4b89421fd401..2fe6932db5aa 100644 --- a/pkgs/by-name/fp/fping/package.nix +++ b/pkgs/by-name/fp/fping/package.nix @@ -18,6 +18,11 @@ stdenv.mkDerivation (finalAttrs: { "--enable-ipv4" ]; + outputs = [ + "out" + "man" + ]; + meta = { description = "Send ICMP echo probes to network hosts"; homepage = "http://fping.org/"; diff --git a/pkgs/by-name/ga/gate12/package.nix b/pkgs/by-name/ga/gate12/package.nix index 835daa5ad547..8b58b9ce722f 100644 --- a/pkgs/by-name/ga/gate12/package.nix +++ b/pkgs/by-name/ga/gate12/package.nix @@ -16,6 +16,9 @@ libXrandr, libXtst, writableTmpDirAsHomeHook, + + buildVST3 ? true, + buildLV2 ? true, }: stdenv.mkDerivation (finalAttrs: { @@ -56,7 +59,10 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ (lib.cmakeBool "COPY_PLUGIN_AFTER_BUILD" false) - (lib.cmakeFeature "BUILD_STANDALONE" "OFF") + + (lib.cmakeBool "BUILD_STANDALONE" false) + (lib.cmakeBool "BUILD_VST3" buildVST3) + (lib.cmakeBool "BUILD_LV2" buildLV2) ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-DCMAKE_OSX_ARCHITECTURES=${stdenv.hostPlatform.darwinArch}" @@ -76,10 +82,17 @@ stdenv.mkDerivation (finalAttrs: { installPhase = '' runHook preInstall - mkdir -p $out/lib/vst3 $out/lib/lv2 + pushd GATE12_artefacts/Release + ${lib.optionalString buildVST3 '' + mkdir -p $out/lib/vst3 + cp -r VST3/GATE-12.vst3 $out/lib/vst3 + ''} - cp -r "GATE12_artefacts/Release/LV2/GATE-12.lv2" $out/lib/lv2 - cp -r "GATE12_artefacts/Release/VST3/GATE-12.vst3" $out/lib/vst3 + ${lib.optionalString buildLV2 '' + mkdir -p $out/lib/lv2 + cp -r LV2/GATE-12.lv2 $out/lib/lv2 + ''} + popd runHook postInstall ''; @@ -89,7 +102,10 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/tiagolr/gate12"; changelog = "https://github.com/tiagolr/gate12/releases/tag/v${finalAttrs.version}"; license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [ magnetophon ]; + maintainers = with lib.maintainers; [ + magnetophon + mrtnvgr + ]; platforms = lib.platforms.all; }; }) diff --git a/pkgs/by-name/ge/gemini-cli/package.nix b/pkgs/by-name/ge/gemini-cli/package.nix index 444b62acaa4d..c41366b22c02 100644 --- a/pkgs/by-name/ge/gemini-cli/package.nix +++ b/pkgs/by-name/ge/gemini-cli/package.nix @@ -14,18 +14,20 @@ buildNpmPackage (finalAttrs: { pname = "gemini-cli"; - version = "0.23.0"; + version = "0.25.2"; src = fetchFromGitHub { owner = "google-gemini"; repo = "gemini-cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-tl9Iy1M0YxPvUpbIQRl7/P2iRIb5n1cvHEqK2k3OR5I="; + hash = "sha256-2Fl6bkoAgu+KvwVIkQEIAPYKQRYyEQPWMRv3vsfnNA4="; }; nodejs = nodejs_22; - npmDepsHash = "sha256-gPmH/Ym6+UxbpH8CEuDmdZtbR6HqWPjMchs1zlDELDU="; + npmDepsHash = "sha256-4peAAxCws5IjWaiNwkRBiaL+n1fE+zsK0qbk1owueeY="; + + dontPatchElf = stdenv.isDarwin; nativeBuildInputs = [ jq @@ -77,7 +79,13 @@ buildNpmPackage (finalAttrs: { mkdir -p $out/{bin,share/gemini-cli} npm prune --omit=dev - rm node_modules/shell-quote/print.py # remove python demo to prevent python from getting into the closure + + # Remove python files to prevent python from getting into the closure + find node_modules -name "*.py" -delete + # keytar/build has gyp-mac-tool with a Python shebang that gets patched, + # creating a python3 reference in the closure + rm -rf node_modules/keytar/build + cp -r node_modules $out/share/gemini-cli/ rm -f $out/share/gemini-cli/node_modules/@google/gemini-cli @@ -94,6 +102,11 @@ buildNpmPackage (finalAttrs: { ln -s $out/share/gemini-cli/node_modules/@google/gemini-cli/dist/index.js $out/bin/gemini chmod +x "$out/bin/gemini" + # Clean up any remaining references to npmDeps in node_modules metadata + find $out/share/gemini-cli/node_modules -name "package-lock.json" -delete + find $out/share/gemini-cli/node_modules -name ".package-lock.json" -delete + find $out/share/gemini-cli/node_modules -name "config.gypi" -delete + runHook postInstall ''; diff --git a/pkgs/by-name/gr/grc/package.nix b/pkgs/by-name/gr/grc/package.nix index 3483916652e1..a7ec70c0b522 100644 --- a/pkgs/by-name/gr/grc/package.nix +++ b/pkgs/by-name/gr/grc/package.nix @@ -39,6 +39,11 @@ python3Packages.buildPythonApplication rec { runHook postInstall ''; + outputs = [ + "out" + "man" + ]; + meta = { homepage = "http://kassiopeia.juls.savba.sk/~garabik/software/grc.html"; description = "Generic text colouriser"; diff --git a/pkgs/by-name/ln/lnav/package.nix b/pkgs/by-name/ln/lnav/package.nix index d69ed07aaa3e..b59d8ea3c0ae 100644 --- a/pkgs/by-name/ln/lnav/package.nix +++ b/pkgs/by-name/ln/lnav/package.nix @@ -82,6 +82,11 @@ stdenv.mkDerivation (finalAttrs: { extraArgs = [ "--version-regex=^v(\\d+(?:\\.\\d+)*)$" ]; }; + outputs = [ + "out" + "man" + ]; + meta = { homepage = "https://github.com/tstack/lnav"; description = "Logfile Navigator"; diff --git a/pkgs/by-name/lu/lux-cli/package.nix b/pkgs/by-name/lu/lux-cli/package.nix index d2558db26135..ac222b857b56 100644 --- a/pkgs/by-name/lu/lux-cli/package.nix +++ b/pkgs/by-name/lu/lux-cli/package.nix @@ -18,18 +18,18 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "lux-cli"; - version = "0.22.4"; + version = "0.25.1"; src = fetchFromGitHub { owner = "lumen-oss"; repo = "lux"; tag = "v${finalAttrs.version}"; - hash = "sha256-f0FNl7VAG5e1rlmVYQci6jBA5udiXQpmI2cFnp6g8DI="; + hash = "sha256-0VPXRO8ApVKToP1/2xJlOxi5UTXSfXkCuHV0hECv4VA="; }; buildAndTestSubdir = "lux-cli"; - cargoHash = "sha256-tf92/GIKCA+KRmN/l5/Sw7qew9oiWna38WgfjRwnQlk="; + cargoHash = "sha256-GkzTN4DjbzyvLAuiXONyMXm8Bgd9t6tj2cqTi/ir268="; nativeInstallCheckInputs = [ versionCheckHook diff --git a/pkgs/by-name/ma/magic-vlsi/package.nix b/pkgs/by-name/ma/magic-vlsi/package.nix index 3ab4aaac897b..6103be6f22ff 100644 --- a/pkgs/by-name/ma/magic-vlsi/package.nix +++ b/pkgs/by-name/ma/magic-vlsi/package.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "magic-vlsi"; - version = "8.3.593"; + version = "8.3.597"; src = fetchFromGitHub { owner = "RTimothyEdwards"; repo = "magic"; tag = finalAttrs.version; - hash = "sha256-o9x29CDOtSQpQvTach6RaTJxRd2iTjyYi94ZjffUxVI="; + hash = "sha256-aFT/uTs/nMb8srf0Hjit03qM7+x1yZasIrSv8cjLS88="; leaveDotGit = true; }; @@ -37,9 +37,9 @@ stdenv.mkDerivation (finalAttrs: { }) (fetchpatch { - name = "neuer-fix-name.patch"; - url = "https://github.com/RTimothyEdwards/magic/commit/a70ca249c3a4e7a256a4482bd887452267c8cd52.patch"; - hash = "sha256-sNQDz4/hBtwJeDrOCe+LfJkuaB0zRzX7w1aDv8ZD7Pw="; + name = "fix_txinput_termbits.patch"; + url = "https://github.com/RTimothyEdwards/magic/commit/790f0196d4fef21dc8a3f5646ccf87a531c4d6aa.patch"; + hash = "sha256-zpmFT813USxX3PDpi6TGlWpWX4xfdirVrVtAlBtkSF0="; }) ]; diff --git a/pkgs/by-name/mi/microsoft-edge/package.nix b/pkgs/by-name/mi/microsoft-edge/package.nix index 4782101959d6..f4165829168f 100644 --- a/pkgs/by-name/mi/microsoft-edge/package.nix +++ b/pkgs/by-name/mi/microsoft-edge/package.nix @@ -162,11 +162,11 @@ let in stdenvNoCC.mkDerivation (finalAttrs: { pname = "microsoft-edge"; - version = "144.0.3719.92"; + version = "144.0.3719.104"; src = fetchurl { url = "https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-stable/microsoft-edge-stable_${finalAttrs.version}-1_amd64.deb"; - hash = "sha256-fi1vQIc069HS7t/pF+bC/QBbyZbpQvggUyt9pjKZUBo="; + hash = "sha256-x+p8wte4KFoWiH9aIk9ym282Hb+Y1369YoxEXtgokVA="; }; # With strictDeps on, some shebangs were not being patched correctly diff --git a/pkgs/by-name/mo/mongodb-tools/package.nix b/pkgs/by-name/mo/mongodb-tools/package.nix index d6022fd4614c..9c75176afdf6 100644 --- a/pkgs/by-name/mo/mongodb-tools/package.nix +++ b/pkgs/by-name/mo/mongodb-tools/package.nix @@ -10,13 +10,13 @@ buildGoModule rec { pname = "mongo-tools"; - version = "100.14.0"; + version = "100.14.1"; src = fetchFromGitHub { owner = "mongodb"; repo = "mongo-tools"; tag = version; - hash = "sha256-QJ1pew6Lg9KAxMJ2XyVXlnRdatbgXesKKmoHCiXQb0c="; + hash = "sha256-+3Cmaa0913TKj/nMmTxXQeegPEZ1NUdusTbKZ86LqLY="; }; vendorHash = null; diff --git a/pkgs/by-name/mo/most/package.nix b/pkgs/by-name/mo/most/package.nix index 9eb6bb6d42d0..12f5d1cb2866 100644 --- a/pkgs/by-name/mo/most/package.nix +++ b/pkgs/by-name/mo/most/package.nix @@ -17,6 +17,7 @@ stdenv.mkDerivation (finalAttrs: { outputs = [ "out" + "man" "doc" ]; diff --git a/pkgs/by-name/or/or-tools/gscip-scip10.patch b/pkgs/by-name/or/or-tools/gscip-scip10.patch deleted file mode 100644 index 529cb39632bb..000000000000 --- a/pkgs/by-name/or/or-tools/gscip-scip10.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/ortools/gscip/gscip.cc -+++ b/ortools/gscip/gscip.cc -@@ -48,7 +48,13 @@ - #include "scip/cons_indicator.h" - #include "scip/cons_linear.h" - #include "scip/cons_or.h" -+#if SCIP_VERSION_MAJOR >= 10 -+#include "scip/cons_nonlinear.h" -+#define SCIPcreateConsBasicQuadratic SCIPcreateConsBasicQuadraticNonlinear -+#define SCIPcreateConsQuadratic SCIPcreateConsQuadraticNonlinear -+#else - #include "scip/cons_quadratic.h" -+#endif // SCIP_VERSION_MAJOR >= 10 - #include "scip/cons_sos1.h" - #include "scip/cons_sos2.h" diff --git a/pkgs/by-name/or/or-tools/package.nix b/pkgs/by-name/or/or-tools/package.nix index eb334bcd0b4d..abe374ea642f 100644 --- a/pkgs/by-name/or/or-tools/package.nix +++ b/pkgs/by-name/or/or-tools/package.nix @@ -3,7 +3,7 @@ lib, callPackage, - abseil-cpp_202505, + abseil-cpp_202508, bzip2, cbc, cmake, @@ -16,7 +16,8 @@ glpk, highs, pkg-config, - protobuf_31, + protobuf_32, + protobuf-matchers, python3, re2, swig, @@ -32,9 +33,14 @@ let # protobuf. Do not un-pin these, even if you're upgrading them to # what might happen to be the latest version at the current moment; # future upgrades *will* break the build. - abseil-cpp' = abseil-cpp_202505; - protobuf' = protobuf_31.override { abseil-cpp = abseil-cpp'; }; - python-protobuf' = python3.pkgs.protobuf5.override { protobuf = protobuf'; }; + abseil-cpp' = abseil-cpp_202508; + gtest' = gtest.override { + withAbseil = true; + abseil-cpp = abseil-cpp'; + }; + protobuf' = protobuf_32.override { abseil-cpp = abseil-cpp'; }; + protobuf-matchers' = protobuf-matchers.override { protobuf = protobuf'; }; + python-protobuf' = python3.pkgs.protobuf6.override { protobuf = protobuf'; }; pybind11' = callPackage ./pybind11-2.13.6.nix { inherit (python3.pkgs) @@ -76,13 +82,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "or-tools"; - version = "9.14"; + version = "9.15"; src = fetchFromGitHub { owner = "google"; repo = "or-tools"; tag = "v${finalAttrs.version}"; - hash = "sha256-FxKe3uY4L33mavwC2aanji3fY9dPqpkwVqi6PNjovSA="; + hash = "sha256-9+tvgP/+/VY6wu7lzTdP4xfiJIgPSLVR9lEdZjQCZkE="; }; patches = [ @@ -94,40 +100,14 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-BNB3KlgjpWcZtb9e68Jkc/4xC4K0c+Iisw0eS6ltYXE="; }) ./0001-Fix-up-broken-CMake-rules-for-bundled-pybind-stuff.patch - (fetchpatch { - name = "math_opt-only-run-SCIP-tests-if-enabled.patch"; - url = "https://github.com/google/or-tools/commit/b5a2f8ac40dd4bfa4359c35570733171454ec72b.patch"; - hash = "sha256-h96zJkqTtwfBd+m7Lm9r/ks/n8uvY4iSPgxMZe8vtXI="; - }) - # Fix tests on aarch64-linux - # https://github.com/google/or-tools/issues/4746 - (fetchpatch { - url = "https://github.com/google/or-tools/commit/8442c7b1c219b0c8d58ee96d266d81b7c3a19ad2.patch"; - hash = "sha256-HrV9wU3PFMdb3feGt8i5UJNgHuitMRBF9cNrH5RRENQ="; - }) - # Fix compatibility with highs 1.12.0 - # https://github.com/google/or-tools/issues/4911 - (fetchpatch { - url = "https://github.com/google/or-tools/commit/6c7c1e7cb5bab2701e5b3b00c0f8397273654d2b.patch"; - includes = [ "ortools/math_opt/solvers/highs_solver_test.cc" ]; - hash = "sha256-/dFk/F/3/BwH5IwIwNU4Ua+4sROPXYCjO8R6jpoZpgo="; - }) - # Fix compatibility with SCIP 10.0 - # https://github.com/google/or-tools/issues/4912 - (fetchpatch { - url = "https://github.com/google/or-tools/pull/4932.patch"; - includes = [ "ortools/linear_solver/proto_solver/scip_proto_solver.cc" ]; - hash = "sha256-1jw/r3yAjIpq9o8mqAbNorQgmT1E5nt809N+Gb+D9ZI="; - }) - # Compatibility with SCIP 10.0 also needs the following patch adjusted for or-tools 9.14 - # https://github.com/google/or-tools/pull/4932/files#diff-9559febee3c6051bab4def3c102cb78cbf8a57fc2be4058ace32f89436c784a9 - ./gscip-scip10.patch ]; # or-tools normally attempts to build Protobuf for the build platform when # cross-compiling. Instead, just tell it where to find protoc. postPatch = '' echo "set(PROTOC_PRG $(type -p protoc))" > cmake/host.cmake + substituteInPlace CMakeLists.txt \ + --replace-fail 'set(BUILD_protobuf_matchers ON)' 'set(BUILD_protobuf_matchers OFF)' '' # Patches from OpenSUSE: # https://build.opensuse.org/projects/science/packages/google-or-tools/files/google-or-tools.spec?expand=1 @@ -147,7 +127,6 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeFeature "CMAKE_INSTALL_LIBDIR" "lib") (lib.cmakeBool "FETCH_PYTHON_DEPS" false) # not packaged in nixpkgs - (lib.cmakeBool "USE_fuzztest" false) (lib.cmakeBool "USE_GLPK" true) (lib.cmakeBool "USE_SCIP" withScip) (lib.cmakeFeature "Python3_EXECUTABLE" "${python3.pythonOnBuildForHost.interpreter}") @@ -182,8 +161,9 @@ stdenv.mkDerivation (finalAttrs: { eigen glpk gbenchmark - gtest + gtest' highs + protobuf-matchers' python3.pkgs.absl-py pybind11' pybind11-abseil' @@ -222,6 +202,7 @@ stdenv.mkDerivation (finalAttrs: { doCheck = stdenv.hostPlatform.isLinux; preCheck = '' + patchShebangs examples/python export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD/lib ''; diff --git a/pkgs/by-name/or/or-tools/pybind11-protobuf.nix b/pkgs/by-name/or/or-tools/pybind11-protobuf.nix index a93268e9358d..32947bbc038f 100644 --- a/pkgs/by-name/or/or-tools/pybind11-protobuf.nix +++ b/pkgs/by-name/or/or-tools/pybind11-protobuf.nix @@ -4,7 +4,7 @@ buildPythonPackage, fetchFromGitHub, cmake, - abseil-cpp_202505, + abseil-cpp_202508, protobuf, pybind11, zlib, @@ -36,7 +36,7 @@ buildPythonPackage { nativeBuildInputs = [ cmake ]; buildInputs = [ - abseil-cpp_202505 + abseil-cpp_202508 protobuf pybind11 zlib diff --git a/pkgs/by-name/pa/panoply/package.nix b/pkgs/by-name/pa/panoply/package.nix index 82b2051379ce..016d2a3a0f21 100644 --- a/pkgs/by-name/pa/panoply/package.nix +++ b/pkgs/by-name/pa/panoply/package.nix @@ -8,11 +8,11 @@ stdenvNoCC.mkDerivation rec { pname = "panoply"; - version = "5.8.1"; + version = "5.9.0"; src = fetchurl { url = "https://www.giss.nasa.gov/tools/panoply/download/PanoplyJ-${version}.tgz"; - hash = "sha256-pdlJGr4zwHiBP9BujALNPBe9m9UIwNQLgOURomxlnjU="; + hash = "sha256-OCxplchCBx5hCbihg4WNu/RrcYBo5Jfdm1VDIr9swRU="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/pr/protobuf-matchers/package.nix b/pkgs/by-name/pr/protobuf-matchers/package.nix new file mode 100644 index 000000000000..c245607cee26 --- /dev/null +++ b/pkgs/by-name/pr/protobuf-matchers/package.nix @@ -0,0 +1,46 @@ +{ + cmake, + fetchFromGitHub, + gtest, + lib, + protobuf, + stdenv, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "protobuf-matchers"; + version = "0.1.1"; + + src = fetchFromGitHub { + owner = "inazarenko"; + repo = "protobuf-matchers"; + tag = "v${finalAttrs.version}"; + hash = "sha256-aIEqmA4JwnGHY80Ehr9tgyxzhAk1nAdiVtPbsI0P0Aw="; + }; + + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail \ + 'target_include_directories(protobuf-matchers PUBLIC ''${CMAKE_CURRENT_SOURCE_DIR})' \ + 'target_include_directories(protobuf-matchers PUBLIC $ $)' + echo 'target_sources(protobuf-matchers PUBLIC FILE_SET HEADERS + FILES protobuf-matchers/protocol-buffer-matchers.h)' >> CMakeLists.txt + echo 'install(TARGETS protobuf-matchers + FILE_SET HEADERS DESTINATION include)' >> CMakeLists.txt + ''; + + nativeBuildInputs = [ + cmake + ]; + buildInputs = [ + gtest + protobuf + ]; + + meta = { + description = "Protocol buffer matchers for gMock/gTest"; + homepage = "https://github.com/inazarenko/protobuf-matchers"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ andersk ]; + }; +}) diff --git a/pkgs/by-name/py/pyradio/package.nix b/pkgs/by-name/py/pyradio/package.nix index 01d038ea440f..1336a849cd8c 100644 --- a/pkgs/by-name/py/pyradio/package.nix +++ b/pkgs/by-name/py/pyradio/package.nix @@ -7,14 +7,14 @@ python3Packages.buildPythonApplication rec { pname = "pyradio"; - version = "0.9.3.11.22"; + version = "0.9.3.11.25"; pyproject = true; src = fetchFromGitHub { owner = "coderholic"; repo = "pyradio"; tag = version; - hash = "sha256-JUVlaKKprgnGiZzZ0J6VSePrSdCWuWQzhuTTiCeB12U="; + hash = "sha256-+0anoFhbADIMAMBQUqDfI7liui+7sDgUtG9+ZwFg+nI="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/qd/qdelay/package.nix b/pkgs/by-name/qd/qdelay/package.nix index 356578b372c2..fb57bbc10d6a 100644 --- a/pkgs/by-name/qd/qdelay/package.nix +++ b/pkgs/by-name/qd/qdelay/package.nix @@ -16,6 +16,9 @@ libXrandr, libXtst, writableTmpDirAsHomeHook, + + buildVST3 ? true, + buildLV2 ? stdenv.isLinux, }: stdenv.mkDerivation (finalAttrs: { @@ -56,7 +59,10 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ (lib.cmakeBool "COPY_PLUGIN_AFTER_BUILD" false) - (lib.cmakeFeature "BUILD_STANDALONE" "OFF") + + (lib.cmakeBool "BUILD_STANDALONE" false) + (lib.cmakeBool "BUILD_VST3" buildVST3) + (lib.cmakeBool "BUILD_LV2" buildLV2) ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-DCMAKE_OSX_ARCHITECTURES=${stdenv.hostPlatform.darwinArch}" @@ -76,10 +82,17 @@ stdenv.mkDerivation (finalAttrs: { installPhase = '' runHook preInstall - mkdir -p $out/lib/vst3 $out/lib/lv2 + pushd QDelay_artefacts/Release + ${lib.optionalString buildVST3 '' + mkdir -p $out/lib/vst3 + cp -r VST3/QDelay.vst3 $out/lib/vst3 + ''} - cp -r "QDelay_artefacts/Release/LV2/QDelay.lv2" $out/lib/lv2 - cp -r "QDelay_artefacts/Release/VST3/QDelay.vst3" $out/lib/vst3 + ${lib.optionalString buildLV2 '' + mkdir -p $out/lib/lv2 + cp -r LV2/QDelay.lv2 $out/lib/lv2 + ''} + popd runHook postInstall ''; @@ -89,7 +102,10 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/tiagolr/qdelay"; changelog = "https://github.com/tiagolr/qdelay/releases/tag/v${finalAttrs.version}"; license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [ magnetophon ]; + maintainers = with lib.maintainers; [ + magnetophon + mrtnvgr + ]; platforms = lib.platforms.all; }; }) diff --git a/pkgs/by-name/re/reevr/package.nix b/pkgs/by-name/re/reevr/package.nix index fcb5ad389792..33576e1ccabf 100644 --- a/pkgs/by-name/re/reevr/package.nix +++ b/pkgs/by-name/re/reevr/package.nix @@ -16,6 +16,9 @@ libXrandr, libXtst, writableTmpDirAsHomeHook, + + buildVST3 ? true, + buildLV2 ? true, }: stdenv.mkDerivation (finalAttrs: { @@ -56,7 +59,10 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ (lib.cmakeBool "COPY_PLUGIN_AFTER_BUILD" false) - (lib.cmakeFeature "BUILD_STANDALONE" "OFF") + + (lib.cmakeBool "BUILD_STANDALONE" false) + (lib.cmakeBool "BUILD_VST3" buildVST3) + (lib.cmakeBool "BUILD_LV2" buildLV2) ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ (lib.cmakeFeature "CMAKE_OSX_ARCHITECTURES" "${stdenv.hostPlatform.darwinArch}") @@ -76,10 +82,17 @@ stdenv.mkDerivation (finalAttrs: { installPhase = '' runHook preInstall - mkdir -p $out/lib/vst3 $out/lib/lv2 + pushd REEVR_artefacts/Release + ${lib.optionalString buildVST3 '' + mkdir -p $out/lib/vst3 + cp -r VST3/REEV-R.vst3 $out/lib/vst3 + ''} - cp -r "REEVR_artefacts/Release/LV2/REEV-R.lv2" $out/lib/lv2 - cp -r "REEVR_artefacts/Release/VST3/REEV-R.vst3" $out/lib/vst3 + ${lib.optionalString buildLV2 '' + mkdir -p $out/lib/lv2 + cp -r LV2/REEV-R.lv2 $out/lib/lv2 + ''} + popd runHook postInstall ''; @@ -89,7 +102,10 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/tiagolr/reevr"; changelog = "https://github.com/tiagolr/reevr/releases/tag/v${finalAttrs.version}"; license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [ magnetophon ]; + maintainers = with lib.maintainers; [ + magnetophon + mrtnvgr + ]; platforms = lib.platforms.all; }; }) diff --git a/pkgs/by-name/re/renovate/package.nix b/pkgs/by-name/re/renovate/package.nix index aa6d3cdbc192..1b9bf92e8b3c 100644 --- a/pkgs/by-name/re/renovate/package.nix +++ b/pkgs/by-name/re/renovate/package.nix @@ -3,7 +3,7 @@ stdenv, fetchFromGitHub, makeWrapper, - nodejs_22, + nodejs_24, pnpm_10, fetchPnpmDeps, pnpmConfigHook, @@ -15,7 +15,7 @@ yq-go, }: let - nodejs = nodejs_22; + nodejs = nodejs_24; in stdenv.mkDerivation (finalAttrs: { pname = "renovate"; @@ -62,8 +62,9 @@ stdenv.mkDerivation (finalAttrs: { find -name 'node_modules' -type d -exec rm -rf {} \; || true pnpm install --offline --prod --ignore-scripts '' - # The optional dependency re2 is not built by pnpm and needs to be built manually. + # The optional dependencies re2 and better-sqlite3 are not built by pnpm and need to be built manually. # If re2 is not built, you will get an annoying warning when you run renovate. + # better-sqlite3 is required. + '' pushd node_modules/.pnpm/re2*/node_modules/re2 @@ -72,6 +73,13 @@ stdenv.mkDerivation (finalAttrs: { ln -sfv ${nodejs}/include $HOME/.node-gyp/${nodejs.version} export npm_config_nodedir=${nodejs} npm run rebuild + rm -rf build/Release/{obj.target,.deps} vendor + + popd + + pushd node_modules/.pnpm/better-sqlite3*/node_modules/better-sqlite3 + npm run build-release + rm -rf build/Release/{obj.target,sqlite3.a,.deps} deps popd diff --git a/pkgs/by-name/re/resterm/package.nix b/pkgs/by-name/re/resterm/package.nix index b599876df361..fd1b0e708ab7 100644 --- a/pkgs/by-name/re/resterm/package.nix +++ b/pkgs/by-name/re/resterm/package.nix @@ -8,13 +8,13 @@ buildGoModule (finalAttrs: { pname = "resterm"; - version = "0.19.1"; + version = "0.20.2"; src = fetchFromGitHub { owner = "unkn0wn-root"; repo = "resterm"; tag = "v${finalAttrs.version}"; - sha256 = "sha256-vpFwiVLF3ekPgjxTEl4UlY/oGK03prHRtt15k5i+M6I="; + sha256 = "sha256-30iof50NA2wXMpRsgHbUhYyEx7Gzb/mPkKvLLf2yUQ8="; }; vendorHash = "sha256-E/Y4kW5xy7YamUP5bxFmDCAK6RqiqGN7DpEPG1MaCHc="; diff --git a/pkgs/by-name/ri/rime-latex/package.nix b/pkgs/by-name/ri/rime-latex/package.nix new file mode 100644 index 000000000000..3f9ac9a86cdb --- /dev/null +++ b/pkgs/by-name/ri/rime-latex/package.nix @@ -0,0 +1,52 @@ +{ + lib, + fetchFromGitHub, + stdenvNoCC, + nix-update-script, +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "rime-latex"; + version = "0-unstable-2025-04-04"; + + src = fetchFromGitHub { + owner = "shenlebantongying"; + repo = "rime_latex"; + rev = "858f2abc645f0e459e468e98122470ce20b16b30"; + hash = "sha256-i8Rgze+tQhbE+nl+JSj09ILXeUvf6MOS9Eqsuqis1n0="; + }; + + installPhase = '' + runHook preInstall + + rm -rf README.md .git* LICENSE .script + + mkdir -p $out/share + cp -r . $out/share/rime-data + + runHook postInstall + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Typing LaTeX math symbols in RIME"; + longDescription = '' + Typing LaTeX math symbols in RIME. + + Add those lines to `default.custom.yaml`: + + ```yaml + patch: + schema_list: + - schema: latex + ``` + + Press `\` key then input latex symbol's name: `\lambda` will automatically become `λ`. + ''; + homepage = "https://github.com/shenlebantongying/rime_latex"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ rc-zb ]; + platforms = lib.platforms.all; + }; +}) diff --git a/pkgs/by-name/ro/rootbar/package.nix b/pkgs/by-name/ro/rootbar/package.nix index 9b0fc884bef4..64099d166d76 100644 --- a/pkgs/by-name/ro/rootbar/package.nix +++ b/pkgs/by-name/ro/rootbar/package.nix @@ -1,6 +1,6 @@ { lib, - stdenv, + gcc14Stdenv, fetchhg, pkg-config, meson, @@ -12,14 +12,14 @@ wrapGAppsHook3, }: -stdenv.mkDerivation { +gcc14Stdenv.mkDerivation { pname = "rootbar"; - version = "unstable-2020-11-13"; + version = "unstable-2024-08-07"; src = fetchhg { url = "https://hg.sr.ht/~scoopta/rootbar"; - rev = "a018e10cfc5e"; - sha256 = "sha256-t6oDIYCVaCxaYy4bS1vxESaFDNxsx5JQLQK77eVuafE="; + rev = "36333af9fd8d"; + sha256 = "sha256-CpORCSJyHZhcK14EhjxoPt/h0026NU5J/kicL1dX96o="; }; nativeBuildInputs = [ @@ -38,15 +38,15 @@ stdenv.mkDerivation { meta = { homepage = "https://hg.sr.ht/~scoopta/rootbar"; - description = "Bar for Wayland WMs"; + description = "Bar for wlroots-based Wayland compositors"; mainProgram = "rootbar"; longDescription = '' - Root Bar is a bar for wlroots based wayland compositors such as sway and - was designed to address the lack of good bars for wayland. + Root Bar is a bar for wlroots-based Wayland compositors such as Sway and + was designed to address the lack of good bars for Wayland. ''; license = lib.licenses.gpl3Plus; maintainers = [ ]; platforms = lib.platforms.unix; - broken = stdenv.hostPlatform.isDarwin; + broken = gcc14Stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/by-name/sa/saldo/package.nix b/pkgs/by-name/sa/saldo/package.nix index d745890b300b..7a862b8c8725 100644 --- a/pkgs/by-name/sa/saldo/package.nix +++ b/pkgs/by-name/sa/saldo/package.nix @@ -2,7 +2,7 @@ lib, fetchFromGitLab, python3, - appstream-glib, + appstream, blueprint-compiler, desktop-file-utils, glib, @@ -20,14 +20,14 @@ python3.pkgs.buildPythonApplication rec { pname = "saldo"; - version = "0.8.3"; + version = "0.8.4"; pyproject = false; src = fetchFromGitLab { owner = "tabos"; repo = "saldo"; tag = version; - hash = "sha256-ItdEse9ab5spvxcWn1FTAl7ppfjohRr0CXI4ImiSe+g="; + hash = "sha256-QOhHDbXq+QHq6XV/ejt5+Si1bXRZZxLjsRlWVw7Zsuk="; }; postPatch = '' @@ -35,7 +35,7 @@ python3.pkgs.buildPythonApplication rec { ''; nativeBuildInputs = [ - appstream-glib # for appstream-util + appstream # for appstreamcli blueprint-compiler desktop-file-utils # for desktop-file-validate glib # for glib-compile-resources @@ -65,6 +65,7 @@ python3.pkgs.buildPythonApplication rec { passthru.updateScript = gitUpdater { }; meta = { + changelog = "https://gitlab.com/tabos/saldo/-/blob/${src.tag}/NEWS"; description = "Banking application for small screens"; homepage = "https://www.tabos.org/projects/saldo/"; license = lib.licenses.gpl3Plus; diff --git a/pkgs/by-name/sc/screen/package.nix b/pkgs/by-name/sc/screen/package.nix index 5d0e4ecf87d2..8d77c5e6eac8 100644 --- a/pkgs/by-name/sc/screen/package.nix +++ b/pkgs/by-name/sc/screen/package.nix @@ -4,6 +4,7 @@ fetchurl, fetchpatch, autoreconfHook, + texinfo, ncurses, libxcrypt, pam ? null, @@ -24,6 +25,25 @@ stdenv.mkDerivation (finalAttrs: { stripLen = 1; hash = "sha256-q3jQQrzweLf2T/V5X9iL4ZZK342QEXLG5fZTaMOB4tY="; }) + # Following 3 commits fix screen.info file issues + (fetchpatch { + name = "screen.info-1st.patch"; + url = "https://cgit.git.savannah.gnu.org/cgit/screen.git/patch/?id=7333452aa52d61a170b1fc199869ea6059849058"; + stripLen = 1; + hash = "sha256-fYkljMNefDJtf+uA9qPotQEOxwhlQj0nZfTszhl/oik="; + }) + (fetchpatch { + name = "screen.info-2nd.patch"; + url = "https://cgit.git.savannah.gnu.org/cgit/screen.git/patch/?id=6790fb8e1931783646c07a364657fadb5c9d1e63"; + stripLen = 1; + hash = "sha256-+fRPfCbJKYUW/ZE6C63xB2WEtTv6KPi8waXLt9N+AuU="; + }) + (fetchpatch { + name = "screen.info-3rd.patch"; + url = "https://cgit.git.savannah.gnu.org/cgit/screen.git/patch/?id=94c3e1fd81826ce3b677d49f7a452e6fe77ed63b"; + stripLen = 1; + hash = "sha256-Wq4Bx5wCqsOWtrfUON5wTuhpBH8JxyoOiHHfDT2CsHw="; + }) ]; configureFlags = [ @@ -36,6 +56,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ autoreconfHook + texinfo ]; buildInputs = [ ncurses @@ -43,6 +64,12 @@ stdenv.mkDerivation (finalAttrs: { pam ]; + outputs = [ + "out" + "info" + "man" + ]; + meta = { homepage = "https://www.gnu.org/software/screen/"; description = "Window manager that multiplexes a physical terminal"; diff --git a/pkgs/applications/science/chemistry/siesta/default.nix b/pkgs/by-name/si/siesta/package.nix similarity index 88% rename from pkgs/applications/science/chemistry/siesta/default.nix rename to pkgs/by-name/si/siesta/package.nix index 348fdaee60f4..36a6c07e3b82 100644 --- a/pkgs/applications/science/chemistry/siesta/default.nix +++ b/pkgs/by-name/si/siesta/package.nix @@ -13,11 +13,12 @@ readline, ninja, elpa, + nix-update-script, }: stdenv.mkDerivation (finalAttrs: { pname = "siesta"; - version = "5.2.2"; + version = "5.4.1"; src = fetchFromGitLab { owner = "siesta-project"; @@ -29,6 +30,7 @@ stdenv.mkDerivation (finalAttrs: { passthru = { inherit mpi; + updateScript = nix-update-script { }; }; nativeBuildInputs = [ @@ -59,14 +61,7 @@ stdenv.mkDerivation (finalAttrs: { enableParallelBuilding = false; # Started making trouble with gcc-11 - preBuild = '' - # See https://gitlab.com/siesta-project/siesta/-/commit/a10bf1628e7141ba263841889c3503c263de1582 - # This may be fixed in the next release. - makeFlagsArray=( - FFLAGS="-fallow-argument-mismatch" - ) - '' - + ( + preBuild = if useMpi then '' makeFlagsArray+=( @@ -80,8 +75,7 @@ stdenv.mkDerivation (finalAttrs: { makeFlagsArray+=( COMP_LIBS="" LIBS="-lblas -llapack" ); - '' - ); + ''; meta = { description = "First-principles materials simulation code using DFT"; diff --git a/pkgs/by-name/si/signal-desktop/libsignal-node.nix b/pkgs/by-name/si/signal-desktop/libsignal-node.nix index ab6305a1bff5..372c2dea4433 100644 --- a/pkgs/by-name/si/signal-desktop/libsignal-node.nix +++ b/pkgs/by-name/si/signal-desktop/libsignal-node.nix @@ -24,23 +24,23 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "libsignal-node"; - version = "0.86.9"; + version = "0.86.12"; src = fetchFromGitHub { owner = "signalapp"; repo = "libsignal"; tag = "v${finalAttrs.version}"; - hash = "sha256-WQdaE9RqRn0/DldUC8FgLALagVGit0Cd3n90t0nEgUs="; + hash = "sha256-XVq1fvhUF0WqSs1lJRCBRuhOW4idY6Nm21UdX4/6TE8="; }; - cargoHash = "sha256-2vIEBQmMBLppk4/t8mvR1n2K/YWUtUaxNl9SpUCNVM8="; + cargoHash = "sha256-vat7vjL9HDY/m7CLUJNpU3NZ79nCVHxLO5tEtaEDBnE="; npmRoot = "node"; npmDeps = fetchNpmDeps { name = "${finalAttrs.pname}-npm-deps"; inherit (finalAttrs) version src; sourceRoot = "${finalAttrs.src.name}/${finalAttrs.npmRoot}"; - hash = "sha256-a7TNY+oe7bBLE5D3WYn75Su7RK/xl6UEkv7sosc/TBU="; + hash = "sha256-O2dMH45YfPlwgqYtQK7HGBgAtfePb6YIrnwqbGIGcnA="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/si/signal-desktop/package.nix b/pkgs/by-name/si/signal-desktop/package.nix index e5e639216a48..944c358ad9c1 100644 --- a/pkgs/by-name/si/signal-desktop/package.nix +++ b/pkgs/by-name/si/signal-desktop/package.nix @@ -54,13 +54,13 @@ let ''; }); - version = "7.86.0"; + version = "7.87.0"; src = fetchFromGitHub { owner = "signalapp"; repo = "Signal-Desktop"; tag = "v${version}"; - hash = "sha256-TnblDCYUhwvnKiq3klMRw0+bj4hKPrwmEDzCGSLyt8I="; + hash = "sha256-7Pb8CCCibs/T3Cjx4+Tx1U5Fb4mmbb6P3zmLZ/+zoxc="; }; sticker-creator = stdenv.mkDerivation (finalAttrs: { @@ -147,15 +147,15 @@ stdenv.mkDerivation (finalAttrs: { fetcherVersion = 1; hash = if withAppleEmojis then - "sha256-EqDHhfpdnj4ZhTVnmVmyiRjTUIGX5fpdAsxqRY/tzQI=" + "sha256-NWzGyoj1BafRe9LxLkhpWWjGaT0gfQGHnxYDMpvRLYE=" else - "sha256-Vfs1/J3R6O0Ct4gAPO/mVCwr6EaMBpltOImPrRHLkFM="; + "sha256-XZ0XivOvZ4yormMgLK5vtV63t4CtNaZ1l0eexTUbbPg="; }; env = { ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; SIGNAL_ENV = "production"; - SOURCE_DATE_EPOCH = 1769033121; + SOURCE_DATE_EPOCH = 1769636497; }; preBuild = '' diff --git a/pkgs/by-name/si/signal-desktop/ringrtc.nix b/pkgs/by-name/si/signal-desktop/ringrtc.nix index dba9823cff51..1f0f43d907db 100644 --- a/pkgs/by-name/si/signal-desktop/ringrtc.nix +++ b/pkgs/by-name/si/signal-desktop/ringrtc.nix @@ -19,16 +19,16 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "ringrtc"; - version = "2.61.0"; + version = "2.62.0"; src = fetchFromGitHub { owner = "signalapp"; repo = "ringrtc"; tag = "v${finalAttrs.version}"; - hash = "sha256-84QqCfz+NKVLr2FAEDSFAvCm4RhHhq+174M2rxD/D0s="; + hash = "sha256-wNtaN6z+Q7zVzaoeoUUDr6+syxKi6gcdhtJ1c2XrhgM="; }; - cargoHash = "sha256-LpYjNXc/HzV3OYSIyCxDTlL3UZYbOiRkPCBeIqW2hB8="; + cargoHash = "sha256-zB5Xt5NeKUIa4W2MZrltINXyvm0+UXs6Fm0gm1MGRD0="; preConfigure = '' # Check for matching webrtc version diff --git a/pkgs/by-name/si/signal-desktop/webrtc-sources.json b/pkgs/by-name/si/signal-desktop/webrtc-sources.json index 6b824925c682..36529a592cd7 100644 --- a/pkgs/by-name/si/signal-desktop/webrtc-sources.json +++ b/pkgs/by-name/si/signal-desktop/webrtc-sources.json @@ -1,10 +1,10 @@ { "src": { "args": { - "hash": "sha256-M9cwhO7CbaqdffJgFguKkX1WN0q1m/INpb/+B4km15c=", + "hash": "sha256-TmiD7c4pIqjaN9pMSUJMJggSKNbRcsz13Y8YnRjw4t0=", "owner": "signalapp", "repo": "webrtc", - "tag": "7444a" + "tag": "7444c" }, "fetcher": "fetchFromGitHub" }, diff --git a/pkgs/by-name/sy/synology-drive-client/package.nix b/pkgs/by-name/sy/synology-drive-client/package.nix index 9991da0558a5..ebac377e719c 100644 --- a/pkgs/by-name/sy/synology-drive-client/package.nix +++ b/pkgs/by-name/sy/synology-drive-client/package.nix @@ -17,8 +17,8 @@ let pname = "synology-drive-client"; baseUrl = "https://global.synologydownload.com/download/Utility/SynologyDriveClient"; - version = "4.0.1-17885"; - buildNumber = lib.last (lib.splitString "-" version); + version = "4.0.2-17889"; + buildNumberFn = ver: lib.last (lib.splitString "-" ver); meta = { description = "Desktop application to synchronize files and folders between the computer and the Synology Drive server"; homepage = "https://www.synology.com/en-global/dsm/feature/drive"; @@ -36,34 +36,18 @@ let ]; mainProgram = "synology-drive"; }; - passthru.updateScript = writeScript "update-synology-drive-client" '' - #!/usr/bin/env nix-shell - #!nix-shell -i bash -p curl jq common-updater-scripts + updateScript = ./update.sh; - set -eu -o pipefail - - version=$(curl -s "https://www.synology.com/api/releaseNote/findChangeLog?identify=SynologyDriveClient&lang=en-uk" \ - | jq -r '.info.versions | to_entries | .[0].value.all_versions[0].version') - - if [[ "$version" =~ ^[0-9.]+(-[0-9]+)?$ ]]; then - update-source-version synology-drive-client "$version" - else - echo "Error: Invalid version format: '$version'" - exit 1 - fi - ''; - - linux = stdenv.mkDerivation { + linux = stdenv.mkDerivation (finalAttrs: { inherit pname version meta - passthru ; src = fetchurl { - url = "${baseUrl}/${version}/Ubuntu/Installer/synology-drive-client-${buildNumber}.x86_64.deb"; - sha256 = "sha256-DMHqh8o0RknWTycANSbMpJj133/MZ8uZ18ytDZVaKMg="; + url = "${baseUrl}/${finalAttrs.version}/Ubuntu/Installer/synology-drive-client-${buildNumberFn finalAttrs.version}.x86_64.deb"; + sha256 = "sha256-refsAzqYmKAr107D4HiJViBQE1Qa6QoOECtX+TPjSwU="; }; nativeBuildInputs = [ @@ -99,19 +83,20 @@ let postInstall = '' substituteInPlace $out/bin/synology-drive --replace /opt $out/opt ''; - }; - darwin = stdenv.mkDerivation { + passthru = { inherit updateScript; }; + }); + + darwin = stdenv.mkDerivation (finalAttrs: { inherit pname version meta - passthru ; src = fetchurl { - url = "${baseUrl}/${version}/Mac/Installer/synology-drive-client-${buildNumber}.dmg"; - sha256 = "sha256-0rK7w4/RCv4qml+8XYPwLQmxHen3pB793Co4DvnDVuU="; + url = "${baseUrl}/${finalAttrs.version}/Mac/Installer/synology-drive-client-${buildNumberFn finalAttrs.version}.dmg"; + sha256 = "sha256-KAoc31Y2RTHu7RWgC61brtoeFR1c+pNi4Odub2JHrfQ="; }; nativeBuildInputs = [ @@ -132,6 +117,8 @@ let mkdir -p $out/Applications/ cp -R 'Synology Drive Client.app' $out/Applications/ ''; - }; + + passthru = { inherit updateScript; }; + }); in if stdenv.hostPlatform.isDarwin then darwin else linux diff --git a/pkgs/by-name/sy/synology-drive-client/update.sh b/pkgs/by-name/sy/synology-drive-client/update.sh new file mode 100755 index 000000000000..a72dfbed866e --- /dev/null +++ b/pkgs/by-name/sy/synology-drive-client/update.sh @@ -0,0 +1,22 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl jq common-updater-scripts + +set -euo pipefail + +version=$(curl -s "https://www.synology.com/api/releaseNote/findChangeLog?identify=SynologyDriveClient&lang=en-uk" | jq -r '.info.versions | to_entries[0].value.all_versions[0].version') +build="${version##*-}" + +update_hash() { + local system=$1 + if [[ "$system" == *"linux"* ]]; then + url="https://global.synologydownload.com/download/Utility/SynologyDriveClient/$version/Ubuntu/Installer/synology-drive-client-$build.x86_64.deb" + else + url="https://global.synologydownload.com/download/Utility/SynologyDriveClient/$version/Mac/Installer/synology-drive-client-$build.dmg" + fi + + hash=$(nix --extra-experimental-features nix-command hash to-sri --type sha256 $(nix-prefetch-url --type sha256 "$url")) + update-source-version synology-drive-client "$version" "$hash" --system="$system" --ignore-same-version +} + +update_hash x86_64-linux +update_hash aarch64-darwin diff --git a/pkgs/by-name/te/teams-for-linux/package.nix b/pkgs/by-name/te/teams-for-linux/package.nix index 0ff28e5d6342..6a47d8fbad2a 100644 --- a/pkgs/by-name/te/teams-for-linux/package.nix +++ b/pkgs/by-name/te/teams-for-linux/package.nix @@ -16,16 +16,16 @@ buildNpmPackage rec { pname = "teams-for-linux"; - version = "2.7.0"; + version = "2.7.2"; src = fetchFromGitHub { owner = "IsmaelMartinez"; repo = "teams-for-linux"; tag = "v${version}"; - hash = "sha256-WGxbUekGJ8P5D0WrI6ZC1z5ZQneH+ruo6CDQWOmsKzM="; + hash = "sha256-I9z61dbGBEw21WfU4oWFTbqHHMG634lKuO4UMm5+V+U="; }; - npmDepsHash = "sha256-VBvQbAiZ7aOIQB6ab9zzIarPU8BVlIbZeKZdJ6vL+LQ="; + npmDepsHash = "sha256-IVZmkBxbeVlQKNyXhbuUP1XMg/1chCTQK3wsKzwxXgA="; nativeBuildInputs = [ makeWrapper diff --git a/pkgs/by-name/ti/time12/package.nix b/pkgs/by-name/ti/time12/package.nix index 810377c81c07..e6f067ea2bb4 100644 --- a/pkgs/by-name/ti/time12/package.nix +++ b/pkgs/by-name/ti/time12/package.nix @@ -16,6 +16,9 @@ libXrandr, libXtst, writableTmpDirAsHomeHook, + + buildVST3 ? true, + buildLV2 ? true, }: stdenv.mkDerivation (finalAttrs: { @@ -56,7 +59,10 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ (lib.cmakeBool "COPY_PLUGIN_AFTER_BUILD" false) - (lib.cmakeFeature "BUILD_STANDALONE" "OFF") + + (lib.cmakeBool "BUILD_STANDALONE" false) + (lib.cmakeBool "BUILD_VST3" buildVST3) + (lib.cmakeBool "BUILD_LV2" buildLV2) ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-DCMAKE_OSX_ARCHITECTURES=${stdenv.hostPlatform.darwinArch}" @@ -76,10 +82,17 @@ stdenv.mkDerivation (finalAttrs: { installPhase = '' runHook preInstall - mkdir -p $out/lib/vst3 $out/lib/lv2 + pushd TIME12_artefacts/Release + ${lib.optionalString buildVST3 '' + mkdir -p $out/lib/vst3 + cp -r VST3/TIME-12.vst3 $out/lib/vst3 + ''} - cp -r "TIME12_artefacts/Release/LV2/TIME-12.lv2" $out/lib/lv2 - cp -r "TIME12_artefacts/Release/VST3/TIME-12.vst3" $out/lib/vst3 + ${lib.optionalString buildLV2 '' + mkdir -p $out/lib/lv2 + cp -r LV2/TIME-12.lv2 $out/lib/lv2 + ''} + popd runHook postInstall ''; @@ -89,7 +102,10 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/tiagolr/time12"; changelog = "https://github.com/tiagolr/time12/releases/tag/v${finalAttrs.version}"; license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [ magnetophon ]; + maintainers = with lib.maintainers; [ + magnetophon + mrtnvgr + ]; platforms = lib.platforms.all; }; }) diff --git a/pkgs/by-name/to/tombi/package.nix b/pkgs/by-name/to/tombi/package.nix index 5252a177387c..2385f26bd20b 100644 --- a/pkgs/by-name/to/tombi/package.nix +++ b/pkgs/by-name/to/tombi/package.nix @@ -9,19 +9,19 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "tombi"; - version = "0.7.12"; + version = "0.7.25"; src = fetchFromGitHub { owner = "tombi-toml"; repo = "tombi"; tag = "v${finalAttrs.version}"; - hash = "sha256-UeccD8fsph9y054vGDQMwGEeoaHEY0lPL0/X3QIn97g="; + hash = "sha256-tZBQE1hyKF4osDQIiqwpnhT9dxDxCPrvrOhn+Yhr86w="; }; # Tests relies on the presence of network doCheck = false; cargoBuildFlags = [ "--package tombi-cli" ]; - cargoHash = "sha256-Gp8wU0+jIcFYqtFWVXfLmEx28jLcFwtMsGzDbvo/O8s="; + cargoHash = "sha256-+Gs9+vAbYzbz/wcNApcxXahwdzCZay+vdJhFFGT5gjI="; postPatch = '' substituteInPlace Cargo.toml \ diff --git a/pkgs/by-name/tr/trivy/package.nix b/pkgs/by-name/tr/trivy/package.nix index 0ed7493d4f31..4ed0f45e95c9 100644 --- a/pkgs/by-name/tr/trivy/package.nix +++ b/pkgs/by-name/tr/trivy/package.nix @@ -10,19 +10,19 @@ }: buildGoModule rec { pname = "trivy"; - version = "0.68.2"; + version = "0.69.0"; src = fetchFromGitHub { owner = "aquasecurity"; repo = "trivy"; tag = "v${version}"; - hash = "sha256-0s9N7BHLJOTnOfa9tQ70D5tfTDSEHsiLUYHpWZjuoEU="; + hash = "sha256-auCbZmVr7LzYrw+IOpXBZPUs2YmcPAzr5fo12vSyHeM="; }; # Hash mismatch on across Linux and Darwin proxyVendor = true; - vendorHash = "sha256-0HbMMzkxDbDb/Q7s490JfjK63tPdWDuEbV2oQjvD1zI="; + vendorHash = "sha256-GLHr2bLAt3jIOz+E38fryca3r9QqC31sjSOXXk3UP0w="; subPackages = [ "cmd/trivy" ]; diff --git a/pkgs/by-name/un/unciv/package.nix b/pkgs/by-name/un/unciv/package.nix index 9f809ab42ccc..5c7fa33bb892 100644 --- a/pkgs/by-name/un/unciv/package.nix +++ b/pkgs/by-name/un/unciv/package.nix @@ -12,7 +12,7 @@ nix-update-script, }: let - version = "4.19.9"; + version = "4.19.10"; desktopItem = makeDesktopItem { name = "unciv"; @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/yairm210/Unciv/releases/download/${version}/Unciv.jar"; - hash = "sha256-+HVpzm60hyJhD1b7VlDLpa5NY48ffBIPF54SHqDYfF8="; + hash = "sha256-4y1tsAyomjygJ+DwcCAG8fiEIljVm159qU/Y+kfkShc="; }; dontUnpack = true; diff --git a/pkgs/by-name/ve/verilator/package.nix b/pkgs/by-name/ve/verilator/package.nix index b7711b0551cc..6447dcf6ce70 100644 --- a/pkgs/by-name/ve/verilator/package.nix +++ b/pkgs/by-name/ve/verilator/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, perl, flex, bison, @@ -20,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "verilator"; - version = "5.040"; + version = "5.044"; # Verilator gets the version from this environment variable # if it can't do git describe while building. @@ -30,17 +29,9 @@ stdenv.mkDerivation (finalAttrs: { owner = "verilator"; repo = "verilator"; tag = "v${finalAttrs.version}"; - hash = "sha256-S+cDnKOTPjLw+sNmWL3+Ay6+UM8poMadkyPSGd3hgnc="; + hash = "sha256-z3jYNzhnZ+OocDAbmsRBWHNNPXLLvExKK1TLDi9JzPQ="; }; - patches = [ - (fetchpatch { - name = "clang-V3hash-overload-fix.patch"; - url = "https://github.com/verilator/verilator/commit/2aa260a03b67d3fe86bc64b8a59183f8dc21e117.patch"; - hash = "sha256-waUsctWiAMG3lCpQi+VUUZ7qMw/kJGu/wNXPHZGuAoU="; - }) - ]; - enableParallelBuilding = true; buildInputs = [ perl diff --git a/pkgs/by-name/vi/virtnbdbackup/package.nix b/pkgs/by-name/vi/virtnbdbackup/package.nix index 79bd8d72f604..f5c36473266a 100644 --- a/pkgs/by-name/vi/virtnbdbackup/package.nix +++ b/pkgs/by-name/vi/virtnbdbackup/package.nix @@ -7,14 +7,14 @@ python3Packages.buildPythonApplication rec { pname = "virtnbdbackup"; - version = "2.44"; + version = "2.45"; pyproject = true; src = fetchFromGitHub { owner = "abbbi"; repo = "virtnbdbackup"; tag = "v${version}"; - hash = "sha256-p3oTd0RT/bw9C73QO83OD21/BHH2E3qX2KS687NyN9Q="; + hash = "sha256-lX0zXNSwSOeNZSL+6UScxKK5zg3kQ91zRDA+wDSiu6Q="; }; build-system = with python3Packages; [ diff --git a/pkgs/by-name/xf/xfce4-power-manager/package.nix b/pkgs/by-name/xf/xfce4-power-manager/package.nix index b32bb82307cb..b7c95754b531 100644 --- a/pkgs/by-name/xf/xfce4-power-manager/package.nix +++ b/pkgs/by-name/xf/xfce4-power-manager/package.nix @@ -56,12 +56,15 @@ stdenv.mkDerivation (finalAttrs: { # using /run/current-system/sw/bin instead of nix store path prevents polkit permission errors on # rebuild. See https://github.com/NixOS/nixpkgs/issues/77485 postPatch = '' - substituteInPlace src/org.xfce.power.policy.in.in --replace-fail "@sbindir@" "/run/current-system/sw/bin" substituteInPlace common/xfpm-brightness-polkit.c --replace-fail "SBINDIR" "\"/run/current-system/sw/bin\"" substituteInPlace src/xfpm-suspend.c --replace-fail "SBINDIR" "\"/run/current-system/sw/bin\"" ''; - configureFlags = [ "--enable-maintainer-mode" ]; + configureFlags = [ + "--enable-maintainer-mode" + "--sbindir=\${out}/bin" + ]; + enableParallelBuilding = true; passthru.updateScript = gitUpdater { diff --git a/pkgs/tools/misc/yafetch/default.nix b/pkgs/by-name/ya/yafetch/package.nix similarity index 84% rename from pkgs/tools/misc/yafetch/default.nix rename to pkgs/by-name/ya/yafetch/package.nix index b9a453737bff..a52d9d0660cb 100644 --- a/pkgs/tools/misc/yafetch/default.nix +++ b/pkgs/by-name/ya/yafetch/package.nix @@ -1,18 +1,18 @@ { lib, - stdenv, + clangStdenv, fetchFromGitHub, }: -stdenv.mkDerivation rec { +clangStdenv.mkDerivation (finalAttrs: { pname = "yafetch"; version = "unstable-2022-04-20"; src = fetchFromGitHub { owner = "kira64xyz"; - repo = pname; + repo = "yafetch"; rev = "a118cfc13f0b475db7c266105c10138d838788b8"; - sha256 = "bSJlerfbJG6h5dDwWQKHnVLH6DEuvuUyqaRuJ7jvOsA="; + hash = "sha256-bSJlerfbJG6h5dDwWQKHnVLH6DEuvuUyqaRuJ7jvOsA="; }; # Use the provided NixOS logo automatically @@ -34,4 +34,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "yafetch"; }; -} +}) diff --git a/pkgs/by-name/yt/yt-dlp/package.nix b/pkgs/by-name/yt/yt-dlp/package.nix index 1dc56dd327cb..6b66743d7c9d 100644 --- a/pkgs/by-name/yt/yt-dlp/package.nix +++ b/pkgs/by-name/yt/yt-dlp/package.nix @@ -21,23 +21,19 @@ python3Packages.buildPythonApplication rec { # The websites yt-dlp deals with are a very moving target. That means that # downloads break constantly. Because of that, updates should always be backported # to the latest stable release. - version = "2025.12.08"; + version = "2026.01.29"; pyproject = true; src = fetchFromGitHub { owner = "yt-dlp"; repo = "yt-dlp"; tag = version; - hash = "sha256-y06MDP+CrlHGrell9hcLOGlHp/gU2OOxs7can4hbj+g="; + hash = "sha256-nw/L71aoAJSCbW1y8ir8obrFPSbVlBA0UtlrxL6YtCQ="; }; postPatch = '' substituteInPlace yt_dlp/version.py \ --replace-fail "UPDATE_HINT = None" 'UPDATE_HINT = "Nixpkgs/NixOS likely already contain an updated version.\n To get it run nix-channel --update or nix flake update in your config directory."' - # Until yt-dlp supports curl-cffi 0.14.x, this patch is needed: - substituteInPlace yt_dlp/networking/_curlcffi.py \ - --replace-fail "if curl_cffi_version != (0, 5, 10) and not (0, 10) <= curl_cffi_version < (0, 14)" \ - "if curl_cffi_version != (0, 5, 10) and not (0, 10) <= curl_cffi_version" ${lib.optionalString javascriptSupport '' # deno is required for full YouTube support (since 2025.11.12). # This makes yt-dlp find deno even if it is used as a python dependency, i.e. in kodiPackages.sendtokodi. @@ -104,7 +100,10 @@ python3Packages.buildPythonApplication rec { ++ lib.optional rtmpSupport rtmpdump; in lib.optionals (packagesToBinPath != [ ]) [ - ''--prefix PATH : "${lib.makeBinPath packagesToBinPath}"'' + "--prefix" + "PATH" + ":" + ''"${lib.makeBinPath packagesToBinPath}"'' ]; checkPhase = '' diff --git a/pkgs/development/compilers/swift/compiler/default.nix b/pkgs/development/compilers/swift/compiler/default.nix index 5bb32d8496cd..8c1437f80a28 100644 --- a/pkgs/development/compilers/swift/compiler/default.nix +++ b/pkgs/development/compilers/swift/compiler/default.nix @@ -339,6 +339,7 @@ stdenv.mkDerivation { inherit (builtins) storeDir; } } + patch -p1 -d swift -i ${./patches/swift-Frontend-Fix-a-small-unique_ptr-array-access.patch} # This patch needs to know the lib output location, so must be substituted # in the same derivation as the compiler. diff --git a/pkgs/development/compilers/swift/compiler/patches/swift-Frontend-Fix-a-small-unique_ptr-array-access.patch b/pkgs/development/compilers/swift/compiler/patches/swift-Frontend-Fix-a-small-unique_ptr-array-access.patch new file mode 100644 index 000000000000..0059c7f7c9ee --- /dev/null +++ b/pkgs/development/compilers/swift/compiler/patches/swift-Frontend-Fix-a-small-unique_ptr-array-access.patch @@ -0,0 +1,35 @@ +From 1a2293c7593e4eeb3fbad74fa8d362abafb43b56 Mon Sep 17 00:00:00 2001 +From: Tony Allevato +Date: Wed, 9 Oct 2024 13:54:43 -0400 +Subject: [PATCH] [Frontend] Fix a small `unique_ptr` array access. + +When the size of the array accessed here is zero, retrieving the +address of the zero-th element here is undefined. When the frontend +is linked against a libc++ that has the `unique_ptr` hardening in +[this commit](https://github.com/llvm/llvm-project/commit/18df9d23ea390eaa50b41f3083a42f700a2b0e39) +enabled, it traps here. + +Instead, simply call `.get()` to retrieve the address of the +array, which works even when it is a zero-byte allocation. + +(cherry picked from commit bdf40184ab40eb59642cd825781d71d0711493eb) +--- + lib/FrontendTool/FrontendTool.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/FrontendTool/FrontendTool.cpp b/lib/FrontendTool/FrontendTool.cpp +index afbc57cdf2f..ba64a306494 100644 +--- a/lib/FrontendTool/FrontendTool.cpp ++++ b/lib/FrontendTool/FrontendTool.cpp +@@ -2202,7 +2202,7 @@ int swift::performFrontend(ArrayRef Args, + std::make_unique[]>( + configurationFileBuffers.size()); + for_each(configurationFileBuffers.begin(), configurationFileBuffers.end(), +- &configurationFileStackTraces[0], ++ configurationFileStackTraces.get(), + [](const std::unique_ptr &buffer, + llvm::Optional &trace) { + trace.emplace(*buffer); +-- +2.52.0 + diff --git a/pkgs/development/cuda-modules/packages/nvpl_blas.nix b/pkgs/development/cuda-modules/packages/nvpl_blas.nix index 94661a67067d..114bb9a436f8 100644 --- a/pkgs/development/cuda-modules/packages/nvpl_blas.nix +++ b/pkgs/development/cuda-modules/packages/nvpl_blas.nix @@ -1,6 +1,6 @@ { buildRedist }: buildRedist { - redistName = "cuda"; + redistName = "nvpl"; pname = "nvpl_blas"; outputs = [ diff --git a/pkgs/development/cuda-modules/packages/nvpl_common.nix b/pkgs/development/cuda-modules/packages/nvpl_common.nix index 86330f5187ed..2a391d5f4f36 100644 --- a/pkgs/development/cuda-modules/packages/nvpl_common.nix +++ b/pkgs/development/cuda-modules/packages/nvpl_common.nix @@ -1,6 +1,6 @@ { buildRedist }: buildRedist { - redistName = "cuda"; + redistName = "nvpl"; pname = "nvpl_common"; outputs = [ diff --git a/pkgs/development/cuda-modules/packages/nvpl_fft.nix b/pkgs/development/cuda-modules/packages/nvpl_fft.nix index 30eb09ff9a11..624eac9d7724 100644 --- a/pkgs/development/cuda-modules/packages/nvpl_fft.nix +++ b/pkgs/development/cuda-modules/packages/nvpl_fft.nix @@ -1,6 +1,6 @@ { buildRedist }: buildRedist { - redistName = "cuda"; + redistName = "nvpl"; pname = "nvpl_fft"; outputs = [ diff --git a/pkgs/development/cuda-modules/packages/nvpl_lapack.nix b/pkgs/development/cuda-modules/packages/nvpl_lapack.nix index 64637f45d9b5..f51a3c01632a 100644 --- a/pkgs/development/cuda-modules/packages/nvpl_lapack.nix +++ b/pkgs/development/cuda-modules/packages/nvpl_lapack.nix @@ -1,6 +1,6 @@ { buildRedist, nvpl_blas }: buildRedist { - redistName = "cuda"; + redistName = "nvpl"; pname = "nvpl_lapack"; outputs = [ diff --git a/pkgs/development/cuda-modules/packages/nvpl_rand.nix b/pkgs/development/cuda-modules/packages/nvpl_rand.nix index f65e6f15f0ee..5a5e93f07343 100644 --- a/pkgs/development/cuda-modules/packages/nvpl_rand.nix +++ b/pkgs/development/cuda-modules/packages/nvpl_rand.nix @@ -1,6 +1,6 @@ { buildRedist }: buildRedist { - redistName = "cuda"; + redistName = "nvpl"; pname = "nvpl_rand"; outputs = [ diff --git a/pkgs/development/cuda-modules/packages/nvpl_scalapack.nix b/pkgs/development/cuda-modules/packages/nvpl_scalapack.nix index d9bf55082b6c..ba9aa0719e4e 100644 --- a/pkgs/development/cuda-modules/packages/nvpl_scalapack.nix +++ b/pkgs/development/cuda-modules/packages/nvpl_scalapack.nix @@ -1,6 +1,6 @@ { buildRedist }: buildRedist { - redistName = "cuda"; + redistName = "nvpl"; pname = "nvpl_scalapack"; outputs = [ diff --git a/pkgs/development/cuda-modules/packages/nvpl_sparse.nix b/pkgs/development/cuda-modules/packages/nvpl_sparse.nix index 3bd6985e66e0..007b14447dc4 100644 --- a/pkgs/development/cuda-modules/packages/nvpl_sparse.nix +++ b/pkgs/development/cuda-modules/packages/nvpl_sparse.nix @@ -1,6 +1,6 @@ { buildRedist }: buildRedist { - redistName = "cuda"; + redistName = "nvpl"; pname = "nvpl_sparse"; outputs = [ @@ -8,7 +8,6 @@ buildRedist { "dev" "include" "lib" - "static" ]; meta = { diff --git a/pkgs/development/cuda-modules/packages/nvpl_tensor.nix b/pkgs/development/cuda-modules/packages/nvpl_tensor.nix index 177c267465bd..e5ed3fb52144 100644 --- a/pkgs/development/cuda-modules/packages/nvpl_tensor.nix +++ b/pkgs/development/cuda-modules/packages/nvpl_tensor.nix @@ -1,6 +1,6 @@ { buildRedist, nvpl_blas }: buildRedist { - redistName = "cuda"; + redistName = "nvpl"; pname = "nvpl_tensor"; outputs = [ diff --git a/pkgs/development/libraries/opencolorio/default.nix b/pkgs/development/libraries/opencolorio/default.nix index 97bab2a6df9a..963d642fa0ad 100644 --- a/pkgs/development/libraries/opencolorio/default.nix +++ b/pkgs/development/libraries/opencolorio/default.nix @@ -67,6 +67,9 @@ stdenv.mkDerivation rec { openexr ]; + # Gcc blindly tries to optimize all float operations instead of just marked ones. + # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=122304 + CXXFLAGS = "-ffp-contract=on"; cmakeFlags = [ "-DOCIO_INSTALL_EXT_PACKAGES=NONE" "-DOCIO_USE_SSE2NEON=OFF" diff --git a/pkgs/development/python-modules/fastbencode/default.nix b/pkgs/development/python-modules/fastbencode/default.nix index 25112d0dab63..268ec30ab89d 100644 --- a/pkgs/development/python-modules/fastbencode/default.nix +++ b/pkgs/development/python-modules/fastbencode/default.nix @@ -12,19 +12,19 @@ buildPythonPackage rec { pname = "fastbencode"; - version = "0.3.8"; + version = "0.3.9"; pyproject = true; src = fetchFromGitHub { owner = "breezy-team"; repo = "fastbencode"; tag = "v${version}"; - hash = "sha256-vpo8OVhIm9/niMY6A878FRJ+zU98z9CJe/p5UxmvrLo="; + hash = "sha256-TZGIFcWm037h4Xs6e5a9j24FqhNxP9H71QVtL1homjQ="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; - hash = "sha256-N4diwjHZkJk+Tzu609ueRipfIXyNhXhLG7hpnG1gRa4="; + hash = "sha256-4DP8WOho4CKESfQHynZlosafcGPFqjpaOiZfLkcML3A="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/yt-dlp-ejs/default.nix b/pkgs/development/python-modules/yt-dlp-ejs/default.nix index 156b6cd48f8b..ad015a8fbcf3 100644 --- a/pkgs/development/python-modules/yt-dlp-ejs/default.nix +++ b/pkgs/development/python-modules/yt-dlp-ejs/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "yt-dlp-ejs"; - version = "0.3.2"; + version = "0.4.0"; pyproject = true; src = fetchFromGitHub { owner = "yt-dlp"; repo = "ejs"; tag = version; - hash = "sha256-o6qf4rfj42mCyvCBb+wyJmZKg3Q+ojsqbCcBfIJnTPg="; + hash = "sha256-/qq069SD7ESg+7pK4PC1EGLLI8zqjWUse7cArN4YuXE="; }; pnpmDeps = fetchPnpmDeps { diff --git a/pkgs/servers/home-assistant/custom-components/prometheus_sensor/package.nix b/pkgs/servers/home-assistant/custom-components/prometheus_sensor/package.nix index fc61d6cdd648..3fc46de15789 100644 --- a/pkgs/servers/home-assistant/custom-components/prometheus_sensor/package.nix +++ b/pkgs/servers/home-assistant/custom-components/prometheus_sensor/package.nix @@ -7,13 +7,13 @@ buildHomeAssistantComponent rec { owner = "mweinelt"; domain = "prometheus_sensor"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "mweinelt"; repo = "ha-prometheus-sensor"; tag = version; - hash = "sha256-ju63ptI1fXycbsE/26LxF/9Dxn93JixvDwb+hTXX/O4="; + hash = "sha256-uXPUBNxF9DnVBTIPYS/3P1JK78Vozodmf7Ds7C6p+nQ="; }; meta = { diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix index 1dbfd1528467..1560e32c89b5 100644 --- a/pkgs/servers/samba/4.x.nix +++ b/pkgs/servers/samba/4.x.nix @@ -81,11 +81,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "samba"; - version = "4.22.6"; + version = "4.22.7"; src = fetchurl { url = "https://download.samba.org/pub/samba/stable/samba-${finalAttrs.version}.tar.gz"; - hash = "sha256-jmvrDM6H+zx2OvlMLcIf1HuP0C1Gs8sd6ypy35JZxCU="; + hash = "sha256-EhlYEdRUL2YVNukFW0TVjFMCBBK+r6riBeInv3L2pJc="; }; outputs = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e91e7a64102d..5e8478037ee8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1089,10 +1089,6 @@ with pkgs; wine = wineWowPackages.yabridge; }; - yafetch = callPackage ../tools/misc/yafetch { - stdenv = clangStdenv; - }; - ### APPLICATIONS/VERSION-MANAGEMENT # The full-featured Git. @@ -12421,9 +12417,7 @@ with pkgs; hdf5 = hdf5-fortran; }; - siesta = callPackage ../applications/science/chemistry/siesta { }; - - siesta-mpi = callPackage ../applications/science/chemistry/siesta { useMpi = true; }; + siesta-mpi = callPackage ../by-name/si/siesta/package.nix { useMpi = true; }; ### SCIENCE/BIOLOGY