diff --git a/nixos/modules/services/networking/nats.nix b/nixos/modules/services/networking/nats.nix index 0ab9d9f015c2..d6e1a326a751 100644 --- a/nixos/modules/services/networking/nats.nix +++ b/nixos/modules/services/networking/nats.nix @@ -17,14 +17,17 @@ let validateConfig = file: - pkgs.runCommand "validate-nats-conf" - { - nativeBuildInputs = [ pkgs.nats-server ]; - } - '' - nats-server --config "${configFile}" -t - ln -s "${configFile}" "$out" - ''; + pkgs.callPackage ( + { runCommand, nats-server }: + runCommand "validate-nats-conf" + { + nativeBuildInputs = [ nats-server ]; + } + '' + nats-server --config "${configFile}" -t + ln -s "${configFile}" "$out" + '' + ) { }; in { diff --git a/pkgs/applications/editors/vim/plugins/non-generated/gitlab-vim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/gitlab-vim/default.nix index e8908af5bf8e..58eb2a7fabff 100644 --- a/pkgs/applications/editors/vim/plugins/non-generated/gitlab-vim/default.nix +++ b/pkgs/applications/editors/vim/plugins/non-generated/gitlab-vim/default.nix @@ -6,7 +6,7 @@ }: vimUtils.buildVimPlugin { pname = "gitlab.vim"; - version = "unstable-2025-01-23"; + version = "0.1.1"; src = fetchFromGitLab { owner = "gitlab-org/editor-extensions"; diff --git a/pkgs/applications/editors/vim/plugins/non-generated/lsp_lines-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/lsp_lines-nvim/default.nix index 34fa410f2b46..67d16f368e40 100644 --- a/pkgs/applications/editors/vim/plugins/non-generated/lsp_lines-nvim/default.nix +++ b/pkgs/applications/editors/vim/plugins/non-generated/lsp_lines-nvim/default.nix @@ -6,7 +6,7 @@ }: vimUtils.buildVimPlugin { pname = "lsp_lines.nvim"; - version = "unstable-2024-12-10"; + version = "3.0.0"; src = fetchFromSourcehut { owner = "~whynothugo"; diff --git a/pkgs/applications/editors/vim/plugins/non-generated/sniprun/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/sniprun/default.nix index ac7643443ee8..4594b378744a 100644 --- a/pkgs/applications/editors/vim/plugins/non-generated/sniprun/default.nix +++ b/pkgs/applications/editors/vim/plugins/non-generated/sniprun/default.nix @@ -1,9 +1,9 @@ { lib, fetchFromGitHub, - nix-update-script, + + # sniprun-bin rustPlatform, - vimUtils, makeWrapper, bashInteractive, coreutils, @@ -11,21 +11,26 @@ gnugrep, gnused, procps, + + # sniprun + vimUtils, + substituteAll, + nix-update-script, }: let - version = "1.3.16"; + version = "1.3.17"; src = fetchFromGitHub { owner = "michaelb"; repo = "sniprun"; tag = "v${version}"; - hash = "sha256-2rVeBUkdLXUiHkd8slyiLTYQBKwgMQvIi/uyCToVBYA="; + hash = "sha256-o8U3GXg61dfEzQxrs9zCgRDWonhr628aSPd/l+HxS70="; }; sniprun-bin = rustPlatform.buildRustPackage { pname = "sniprun-bin"; inherit version src; useFetchCargoVendor = true; - cargoHash = "sha256-j3i86I5Lmt0+fQONikHnxfeLEbiyFSairgjHXmjZfTk="; + cargoHash = "sha256-HLPTt0JCmCM4SRmP8o435ilM1yxoxpAnf8hg3+8C54I="; nativeBuildInputs = [ makeWrapper ]; @@ -44,17 +49,20 @@ let ''; doCheck = false; + + meta.mainProgram = "sniprun"; }; in vimUtils.buildVimPlugin { pname = "sniprun"; inherit version src; - patches = [ ./fix-paths.patch ]; - - postPatch = '' - substituteInPlace lua/sniprun.lua --replace '@sniprun_bin@' ${sniprun-bin} - ''; + patches = [ + (substituteAll { + src = ./fix-paths.patch; + sniprun = lib.getExe sniprun-bin; + }) + ]; propagatedBuildInputs = [ sniprun-bin ]; @@ -69,7 +77,7 @@ vimUtils.buildVimPlugin { meta = { homepage = "https://github.com/michaelb/sniprun/"; - changelog = "https://github.com/michaelb/sniprun/blob/${src.tag}/CHANGELOG.md"; + changelog = "https://github.com/michaelb/sniprun/blob/v${version}/CHANGELOG.md"; maintainers = with lib.maintainers; [ GaetanLepage ]; license = lib.licenses.mit; }; diff --git a/pkgs/applications/editors/vim/plugins/non-generated/sniprun/fix-paths.patch b/pkgs/applications/editors/vim/plugins/non-generated/sniprun/fix-paths.patch index f444a80437bc..003a8014b598 100644 --- a/pkgs/applications/editors/vim/plugins/non-generated/sniprun/fix-paths.patch +++ b/pkgs/applications/editors/vim/plugins/non-generated/sniprun/fix-paths.patch @@ -1,5 +1,5 @@ diff --git a/lua/sniprun.lua b/lua/sniprun.lua -index 49be442..1834566 100644 +index 49be442..9342351 100644 --- a/lua/sniprun.lua +++ b/lua/sniprun.lua @@ -3,9 +3,7 @@ M.ping_anwsered = 0 @@ -9,7 +9,7 @@ index 49be442..1834566 100644 -local binary_path = vim.fn.fnamemodify( - vim.api.nvim_get_runtime_file("lua/sniprun.lua", false)[1], ":h:h") - .. "/target/release/sniprun" -+local binary_path = "@sniprun_bin@/bin/sniprun" ++local binary_path = "@sniprun@" local sniprun_path = vim.fn.fnamemodify(vim.api.nvim_get_runtime_file("lua/sniprun.lua", false)[1], ":p:h") .. "/.." diff --git a/pkgs/applications/version-management/git-machete/default.nix b/pkgs/applications/version-management/git-machete/default.nix index 46802d5157ea..0612b06e9aef 100644 --- a/pkgs/applications/version-management/git-machete/default.nix +++ b/pkgs/applications/version-management/git-machete/default.nix @@ -11,13 +11,13 @@ buildPythonApplication rec { pname = "git-machete"; - version = "3.31.1"; + version = "3.32.1"; src = fetchFromGitHub { owner = "virtuslab"; repo = pname; rev = "v${version}"; - hash = "sha256-OirzHEAHDiImgQoniBNaTjUgNm0I2azaPhjEnAavbNg="; + hash = "sha256-G62KCL0l1WTJoSXfJoQd1HXWleKPC8OjX39AD9NOgV0="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/build-support/php/builders/v2/hooks/composer-vendor-hook.sh b/pkgs/build-support/php/builders/v2/hooks/composer-vendor-hook.sh index 29bc95909d6f..d978c2800f40 100644 --- a/pkgs/build-support/php/builders/v2/hooks/composer-vendor-hook.sh +++ b/pkgs/build-support/php/builders/v2/hooks/composer-vendor-hook.sh @@ -96,9 +96,23 @@ composerVendorInstallHook() { mkdir -p $out cp -ar composer.json $(composer config vendor-dir) $out/ + mapfile -t installer_paths < <(jq -r 'try((.extra."installer-paths") | keys[])' composer.json) + + for installer_path in "${installer_paths[@]}"; do + # Remove everything after {$name} placeholder + installer_path="${installer_path/\{\$name\}*/}"; + out_installer_path="$out/${installer_path/\{\$name\}*/}"; + # Copy the installer path if it exists + if [[ -d "$installer_path" ]]; then + mkdir -p $(dirname "$out_installer_path") + cp -ar "$installer_path" "$out_installer_path" + # Strip out the git repositories + find $out_installer_path -name .git -type d -prune -print -exec rm -rf {} ";" + fi + done if [[ -f "composer.lock" ]]; then - cp -ar composer.lock $(composer config vendor-dir) $out/ + cp -ar composer.lock $out/ fi echo "Finished composerVendorInstallHook" diff --git a/pkgs/by-name/_3/_389-ds-base/package.nix b/pkgs/by-name/_3/_389-ds-base/package.nix index 6eb041873cd8..a31f30360c7c 100644 --- a/pkgs/by-name/_3/_389-ds-base/package.nix +++ b/pkgs/by-name/_3/_389-ds-base/package.nix @@ -40,13 +40,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "389-ds-base"; - version = "3.0.5"; + version = "3.1.2"; src = fetchFromGitHub { owner = "389ds"; repo = "389-ds-base"; rev = "389-ds-base-${finalAttrs.version}"; - hash = "sha256-OPtyeF1D46X6DslP3NewbjVgqPXngWUz943UsTqgWRo="; + hash = "sha256-FIx+ZW3K5KevU+wAiwPbDAQ6q7rPFEHFa+5eKqtgzpQ="; }; cargoDeps = rustPlatform.fetchCargoVendor { @@ -97,8 +97,7 @@ stdenv.mkDerivation (finalAttrs: { ''; preBuild = '' - mkdir -p ./vendor - tar -xzf ${finalAttrs.cargoDeps} -C ./vendor --strip-components=1 + ln -s ${finalAttrs.cargoDeps} ./vendor ''; configureFlags = diff --git a/pkgs/by-name/ad/adrs/package.nix b/pkgs/by-name/ad/adrs/package.nix index a64f07771437..44473edfff22 100644 --- a/pkgs/by-name/ad/adrs/package.nix +++ b/pkgs/by-name/ad/adrs/package.nix @@ -6,17 +6,17 @@ rustPlatform.buildRustPackage rec { pname = "adrs"; - version = "0.2.9"; + version = "0.3.0"; src = fetchFromGitHub { owner = "joshrotenberg"; repo = "adrs"; rev = "v${version}"; - hash = "sha256-a1vxo2Zw2fvCJeGaatNqf2h74t7pvWppYS2l2gbCF5k="; + hash = "sha256-BnbI5QsrnyEQFpTWqOPrbZnVa7J3vaByO9fnKd5t64o="; }; useFetchCargoVendor = true; - cargoHash = "sha256-VtMgvUifHddSncsKxtT5v44sDhihLgpbq38szvHVrVk="; + cargoHash = "sha256-Ep1Y2PDNesaDzEc2JNoKZjFSay1utZiNR5eQYhdqiUU="; meta = { description = "Command-line tool for managing Architectural Decision Records"; diff --git a/pkgs/by-name/bd/bdf2psf/package.nix b/pkgs/by-name/bd/bdf2psf/package.nix index b5f4f7bb5146..4a36ba4d0e67 100644 --- a/pkgs/by-name/bd/bdf2psf/package.nix +++ b/pkgs/by-name/bd/bdf2psf/package.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "bdf2psf"; - version = "1.233"; + version = "1.234"; src = fetchurl { url = "mirror://debian/pool/main/c/console-setup/bdf2psf_${version}_all.deb"; - sha256 = "sha256-DCP8kswoc/zQqf+C/S41f6LyuxoAkG39Oi5y9A56S3k="; + sha256 = "sha256-NML5KphZqTko6ez6NaTEXvbA1D9saPBYKGk8TD/HvRc="; }; nativeBuildInputs = [ dpkg ]; diff --git a/pkgs/by-name/bi/bitwarden-cli/package.nix b/pkgs/by-name/bi/bitwarden-cli/package.nix index 5ce79f0e5f98..9a460216e6c4 100644 --- a/pkgs/by-name/bi/bitwarden-cli/package.nix +++ b/pkgs/by-name/bi/bitwarden-cli/package.nix @@ -13,13 +13,13 @@ buildNpmPackage rec { pname = "bitwarden-cli"; - version = "2024.12.0"; + version = "2025.1.2"; src = fetchFromGitHub { owner = "bitwarden"; repo = "clients"; rev = "cli-v${version}"; - hash = "sha256-3aN2t8/qhN0sjACvtip45efHQJl8nEMNre0+oBL1/go="; + hash = "sha256-Ibf25+aaEKFUCp5uiqmHySfdZq2JPAu2nBzfiS4Sc/k="; }; postPatch = '' @@ -29,7 +29,7 @@ buildNpmPackage rec { nodejs = nodejs_20; - npmDepsHash = "sha256-EtIcqbubAYN9I9wbw17oHiVshd3GtQayFtdgqWP7Pgg="; + npmDepsHash = "sha256-+LpF5zxC4TG5tF+RNgimLyEmGYyUfFDXHqs2RH9oQLY="; nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ cctools @@ -50,6 +50,14 @@ buildNpmPackage rec { npmFlags = [ "--legacy-peer-deps" ]; + # FIXME temporarily disable the symlink check as there are symlink after the build in the `node_modules/@bitwarden` directory linking to `../../`. + dontCheckForBrokenSymlinks = true; + + npmRebuildFlags = [ + # FIXME one of the esbuild versions fails to download @esbuild/linux-x64 + "--ignore-scripts" + ]; + postConfigure = '' # we want to build everything from source shopt -s globstar diff --git a/pkgs/by-name/br/brlaser/package.nix b/pkgs/by-name/br/brlaser/package.nix index deeda18924ec..2cc36dd9d4ed 100644 --- a/pkgs/by-name/br/brlaser/package.nix +++ b/pkgs/by-name/br/brlaser/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "brlaser"; - version = "6-unstable-2023-02-30"; + version = "6.2.7"; src = fetchFromGitHub { - owner = "pdewacht"; + owner = "Owl-Maintain"; repo = "brlaser"; - rev = "2a49e3287c70c254e7e3ac9dabe9d6a07218c3fa"; - sha256 = "sha256-1fvO9F7ifbYQHAy54mOx052XutfKXSK6iT/zj4Mhbww="; + tag = "v${version}"; + hash = "sha256-a+TjLmjqBz0b7v6kW1uxh4BGzrYOQ8aMdVo4orZeMT4="; }; nativeBuildInputs = [ @@ -38,42 +38,13 @@ stdenv.mkDerivation rec { longDescription = '' Although most Brother printers support a standard printer language such as PCL or PostScript, not all do. If you have a monochrome Brother laser printer (or multi-function device) and the other open source drivers don't work, this one might help. - This driver is known to work with these printers: - - Brother DCP-1510 - Brother DCP-1602 - Brother DCP-7030 - Brother DCP-7040 - Brother DCP-7055 - Brother DCP-7055W - Brother DCP-7060D - Brother DCP-7065DN - Brother DCP-7080 - Brother DCP-L2500D - Brother DCP-L2520D - Brother DCP-L2540DW - Brother HL-1110 - Brother HL-1200 - Brother HL-2030 - Brother HL-2140 - Brother HL-2220 - Brother HL-2270DW - Brother HL-5030 - Brother HL-L2300D - Brother HL-L2320D - Brother HL-L2340D - Brother HL-L2360D - Brother MFC-1910W - Brother MFC-7240 - Brother MFC-7360N - Brother MFC-7365DN - Brother MFC-7840W - Brother MFC-L2710DW - Lenovo M7605D + This driver is known to work with many printers in the DCP, HL and MFC series, along with a few others. + See the homepage for a full list. ''; - homepage = "https://github.com/pdewacht/brlaser"; + homepage = "https://github.com/Owl-Maintain/brlaser"; + changelog = "https://github.com/Owl-Maintain/brlaser/releases/tag/v${version}"; license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ StijnDW ]; + maintainers = with lib.maintainers; [ onny ]; }; } diff --git a/pkgs/by-name/ca/cargo-mutants/package.nix b/pkgs/by-name/ca/cargo-mutants/package.nix index 04ffbf2ff0d6..f97aa1bdf8a7 100644 --- a/pkgs/by-name/ca/cargo-mutants/package.nix +++ b/pkgs/by-name/ca/cargo-mutants/package.nix @@ -6,17 +6,17 @@ rustPlatform.buildRustPackage rec { pname = "cargo-mutants"; - version = "25.0.0"; + version = "25.0.1"; src = fetchFromGitHub { owner = "sourcefrog"; repo = "cargo-mutants"; rev = "v${version}"; - hash = "sha256-JwRMXFXYXPg/grFqeGIcWpDPI5/wFIldx4ORE8ODyk8="; + hash = "sha256-aTGuCkPk1GYUlRXCdNIy94d5zHxUPpNNFN4aapf8s0U="; }; useFetchCargoVendor = true; - cargoHash = "sha256-K3O5o69ogkCFs6sjTPLLRq2CmBaH2eeFXBjvvwBBhQE="; + cargoHash = "sha256-Vrh8N29EWIwVgAR6aEQcnkbrs/+llCx+GfiV0WlZOqw="; # too many tests require internet access doCheck = false; diff --git a/pkgs/by-name/ca/cargo-temp/package.nix b/pkgs/by-name/ca/cargo-temp/package.nix index 816b000c9432..e43d0a1903d5 100644 --- a/pkgs/by-name/ca/cargo-temp/package.nix +++ b/pkgs/by-name/ca/cargo-temp/package.nix @@ -2,17 +2,17 @@ rustPlatform.buildRustPackage rec { pname = "cargo-temp"; - version = "0.3.1"; + version = "0.3.2"; src = fetchFromGitHub { owner = "yozhgoor"; repo = "cargo-temp"; rev = "v${version}"; - hash = "sha256-fy4bG+UoN/51hiveYecl3ciJPV1g8/fC2dTFnUJZqAY="; + hash = "sha256-ejcqgfnvIGUhidhJpAh6uJrm8oFb8rS98wRI3iQBP9I="; }; useFetchCargoVendor = true; - cargoHash = "sha256-E7msh553ijldpVI2OJ6PL0Wp+Z4eLbv8Oexl7NtBdYc="; + cargoHash = "sha256-lfahdQtv35VH9XTApcu/GIR2QOqXKlb8Gpy6X58LmpA="; meta = with lib; { description = "CLI tool that allow you to create a temporary new Rust project using cargo with already installed dependencies"; diff --git a/pkgs/by-name/ci/circt/package.nix b/pkgs/by-name/ci/circt/package.nix index 8c54990b6ba8..eacf44702b47 100644 --- a/pkgs/by-name/ci/circt/package.nix +++ b/pkgs/by-name/ci/circt/package.nix @@ -19,12 +19,12 @@ let in stdenv.mkDerivation rec { pname = "circt"; - version = "1.104.0"; + version = "1.105.0"; src = fetchFromGitHub { owner = "llvm"; repo = "circt"; rev = "firtool-${version}"; - hash = "sha256-r5UYoeqrXSWvWtR0IgjrH67RIgul3vpNoN+4lWlGrHw="; + hash = "sha256-1LnCvXcGDQ1pBEux2yX6crPaWdcoWbLHFALtjoGJGL0="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/ci/cirrus-cli/package.nix b/pkgs/by-name/ci/cirrus-cli/package.nix index 548a364c28b8..0a9feac0215d 100644 --- a/pkgs/by-name/ci/cirrus-cli/package.nix +++ b/pkgs/by-name/ci/cirrus-cli/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "cirrus-cli"; - version = "0.135.0"; + version = "0.137.3"; src = fetchFromGitHub { owner = "cirruslabs"; repo = "cirrus-cli"; rev = "v${version}"; - hash = "sha256-s7nJ6fhmVZf/+uuN7rW+lq0Xvlz9p425yQNzoTRxTLo="; + hash = "sha256-7yI0dcE6hxfAZeZ5ylw5s6CBye1hTSW/nLtFZs4k/xw="; }; - vendorHash = "sha256-FMUBwrY5PJLsd507340PC+f0f9PzPblFYpnNi6hiNeM="; + vendorHash = "sha256-GjCwH0Xe9wyacfokI5EzF2TKUnSMKCdOljahChPBlso="; ldflags = [ "-X github.com/cirruslabs/cirrus-cli/internal/version.Version=v${version}" diff --git a/pkgs/by-name/cl/clap/package.nix b/pkgs/by-name/cl/clap/package.nix index 15543b4c50b7..421f0cbdec45 100644 --- a/pkgs/by-name/cl/clap/package.nix +++ b/pkgs/by-name/cl/clap/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "clap"; - version = "1.2.2"; + version = "1.2.3"; src = fetchFromGitHub { owner = "free-audio"; repo = "clap"; rev = finalAttrs.version; - hash = "sha256-W3cvAtBrd+zyGj7xNSuFFChUUVjRadH6aCv5Zcvq/qs="; + hash = "sha256-c8mG6X++13yO+Ggdlw9YOtDes1XaT00C16evv7swsoU="; }; postPatch = '' diff --git a/pkgs/by-name/cp/cppreference-doc/package.nix b/pkgs/by-name/cp/cppreference-doc/package.nix index 33827e12132e..abb5931e7323 100644 --- a/pkgs/by-name/cp/cppreference-doc/package.nix +++ b/pkgs/by-name/cp/cppreference-doc/package.nix @@ -6,11 +6,11 @@ stdenvNoCC.mkDerivation rec { pname = "cppreference-doc"; - version = "20241110"; + version = "20250209"; src = fetchurl { url = "https://github.com/PeterFeicht/${pname}/releases/download/v${version}/html-book-${version}.tar.xz"; - hash = "sha256-Qx6Ahi63D9R5OmDX07bBPIYFKEl4+eoFKVcuj9FWLMY="; + hash = "sha256-rFBnGh9S1/CrCRHRRFDrNejC+BLt0OQmss0ePZ25HW8="; }; sourceRoot = "."; diff --git a/pkgs/by-name/dr/dragmap/boost-iterator-range.patch b/pkgs/by-name/dr/dragmap/boost-iterator-range.patch new file mode 100644 index 000000000000..bd70eab43f49 --- /dev/null +++ b/pkgs/by-name/dr/dragmap/boost-iterator-range.patch @@ -0,0 +1,12 @@ +diff --git a/src/lib/map/Mapper.cpp b/src/lib/map/Mapper.cpp +index 6eaa2c5..781988c 100644 +--- a/src/lib/map/Mapper.cpp ++++ b/src/lib/map/Mapper.cpp +@@ -22,6 +22,7 @@ + //#include "common/Crc32Hw.hpp" + #include "common/DragenLogger.hpp" + #include "map/Mapper.hpp" ++#include + + namespace dragenos { + namespace map { diff --git a/pkgs/by-name/dr/dragmap/package.nix b/pkgs/by-name/dr/dragmap/package.nix index 9f61cbb3e5e4..2408b01be91d 100644 --- a/pkgs/by-name/dr/dragmap/package.nix +++ b/pkgs/by-name/dr/dragmap/package.nix @@ -33,6 +33,10 @@ stdenv.mkDerivation (finalAttrs: { # Add missing include cstdint. Upstream does not accept PR. Issue opened at # https://github.com/Illumina/DRAGMAP/issues/63 ./cstdint.patch + + # Missing import in Mapper.cpp + # Issue opened upstream https://github.com/Illumina/DRAGMAP/pull/66 + ./boost-iterator-range.patch ]; env = { @@ -53,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: { # Tests are launched by default from makefile doCheck = false; - meta = with lib; { + meta = { description = "Open Source version of Dragen mapper for genomics"; mainProgram = "dragen-os"; longDescription = '' @@ -61,8 +65,10 @@ stdenv.mkDerivation (finalAttrs: { which the Illumina team created to procude the same results as their proprietary DRAGEN hardware. ''; - license = licenses.gpl3; - platforms = platforms.unix; - maintainers = with maintainers; [ apraga ]; + homepage = "https://github.com/Illumina/DRAGMAP"; + changelog = "https://github.com/Illumina/DRAGMAP/releases/tag/${finalAttrs.version}"; + license = lib.licenses.gpl3; + platforms = [ "x86_64-linux" ]; + maintainers = with lib.maintainers; [ apraga ]; }; }) diff --git a/pkgs/by-name/fa/fastfetch/package.nix b/pkgs/by-name/fa/fastfetch/package.nix index e5bd1138f0fc..b2e09f04e23e 100644 --- a/pkgs/by-name/fa/fastfetch/package.nix +++ b/pkgs/by-name/fa/fastfetch/package.nix @@ -45,13 +45,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "fastfetch"; - version = "2.35.0"; + version = "2.36.0"; src = fetchFromGitHub { owner = "fastfetch-cli"; repo = "fastfetch"; tag = finalAttrs.version; - hash = "sha256-ChuK5DHRj1qJIjRo3oB5gdCxox2mDffCVM0wRGc5t1o="; + hash = "sha256-pSPXSvomvQBps8ctF/PXaOP+7xBIRxNlRVIFVy8nxwY="; }; outputs = [ diff --git a/pkgs/by-name/fu/fusuma/Gemfile.lock b/pkgs/by-name/fu/fusuma/Gemfile.lock index b89e3c94971d..8b4fe181b2ec 100644 --- a/pkgs/by-name/fu/fusuma/Gemfile.lock +++ b/pkgs/by-name/fu/fusuma/Gemfile.lock @@ -1,7 +1,7 @@ GEM remote: https://rubygems.org/ specs: - fusuma (3.5.0) + fusuma (3.7.0) fusuma-plugin-appmatcher (0.7.1) fusuma (>= 3.0) rexml diff --git a/pkgs/by-name/fu/fusuma/gemset.nix b/pkgs/by-name/fu/fusuma/gemset.nix index f1664a2149cc..4361532705fc 100644 --- a/pkgs/by-name/fu/fusuma/gemset.nix +++ b/pkgs/by-name/fu/fusuma/gemset.nix @@ -4,10 +4,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0vxlfda4mgff9kindrmr47xvn6b591hzvzzsx2y88zq20sn340vy"; + sha256 = "1h8lj3g5q6cg6lf5axnbw4bpvml3xkf3ipbviw5mg1jh9r3apk5m"; type = "gem"; }; - version = "3.5.0"; + version = "3.7.0"; }; fusuma-plugin-appmatcher = { dependencies = [ diff --git a/pkgs/by-name/ga/gat/package.nix b/pkgs/by-name/ga/gat/package.nix index c13f6bf7543b..952f2c035fe8 100644 --- a/pkgs/by-name/ga/gat/package.nix +++ b/pkgs/by-name/ga/gat/package.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "gat"; - version = "0.20.0"; + version = "0.20.3"; src = fetchFromGitHub { owner = "koki-develop"; repo = "gat"; tag = "v${version}"; - hash = "sha256-xO0MUbryuglbRIbBEbKJGYPPaJD8j4hNpIR+Kqc302s="; + hash = "sha256-97rFnJPdnLv8RLI5ZGMpdEX2UwLUNBVn3Fe4vv5MFRY="; }; - vendorHash = "sha256-z2Hbn1debyJn/nTKVC2y3vd6V7XQyHFPNA6hCVuYzgU="; + vendorHash = "sha256-C3iUsS1p/+8U1KO/B5htYwCKnQThOusjE/jhOqoCFQo="; env.CGO_ENABLED = 0; diff --git a/pkgs/by-name/go/goat-cli/package.nix b/pkgs/by-name/go/goat-cli/package.nix index 36776314d6b7..3a2fc296436a 100644 --- a/pkgs/by-name/go/goat-cli/package.nix +++ b/pkgs/by-name/go/goat-cli/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "goat-cli"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { repo = "goat"; owner = "studio-b12"; rev = "v${version}"; - hash = "sha256-g5iS0XCRv97uX45BMqyFNodjjZ3Q9OeMJXAdsPwLCEg="; + hash = "sha256-7inoRBVR7zmt0jUFAGYjoYT2cdda0qgzyXLL+GiBFMg="; }; - vendorHash = "sha256-MOsxM8CSjK5j/guEwRFWHZ4+gdAHa5txVXw67jzwyLQ="; + vendorHash = "sha256-b/v27pHA9LcFe4TC/EpelJVSkAg4sq7b8p2gk0bWsQc="; ldflags = [ "-s" diff --git a/pkgs/by-name/go/google-alloydb-auth-proxy/package.nix b/pkgs/by-name/go/google-alloydb-auth-proxy/package.nix index 37fa2e16a675..13c822cd88e2 100644 --- a/pkgs/by-name/go/google-alloydb-auth-proxy/package.nix +++ b/pkgs/by-name/go/google-alloydb-auth-proxy/package.nix @@ -7,18 +7,18 @@ buildGoModule rec { pname = "google-alloydb-auth-proxy"; - version = "1.12.0"; + version = "1.12.1"; src = fetchFromGitHub { owner = "GoogleCloudPlatform"; repo = "alloydb-auth-proxy"; tag = "v${version}"; - hash = "sha256-Z1sTArR6usEkoI/Dp5FUXhjsPeDHVG88GaSbrb9KaaA="; + hash = "sha256-FnYVkZxdWFxY0aIUbHTSDLJ+AgYE2L03vNya1K2e3SI="; }; subPackages = [ "." ]; - vendorHash = "sha256-jEs1oI4Ka87vbFbxt7cLm042wO2Rl5NaISmHBrCHZGw="; + vendorHash = "sha256-0VksnkdN7E6VEzzxSIc6AfOvxlPm67vEj+HVR6N+BqA="; checkFlags = [ "-short" diff --git a/pkgs/by-name/go/gowall/package.nix b/pkgs/by-name/go/gowall/package.nix index 2053137ec69f..581840505d15 100644 --- a/pkgs/by-name/go/gowall/package.nix +++ b/pkgs/by-name/go/gowall/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "gowall"; - version = "0.1.9"; + version = "0.2.0"; src = fetchFromGitHub { owner = "Achno"; repo = "gowall"; rev = "v${version}"; - hash = "sha256-BBalJADhQ7D7p5PeafddkqQmHGhLsq1DlF1FUoazJGg="; + hash = "sha256-QKukWA8TB0FoNHu0Wyco55x4oBY+E33qdoT/SaXW6DE="; }; vendorHash = "sha256-H2Io1K2LEFmEPJYVcEaVAK2ieBrkV6u+uX82XOvNXj4="; diff --git a/pkgs/by-name/li/libmpcdec/package.nix b/pkgs/by-name/li/libmpcdec/package.nix index b7613dc2ab94..55d33a2327f9 100644 --- a/pkgs/by-name/li/libmpcdec/package.nix +++ b/pkgs/by-name/li/libmpcdec/package.nix @@ -13,6 +13,9 @@ stdenv.mkDerivation rec { sha256 = "1a0jdyga1zfi4wgkg3905y6inghy3s4xfs5m4x7pal08m0llkmab"; }; + # needed for cross builds + configureFlags = [ "ac_cv_func_memcmp_working=yes" ]; + meta = { description = "Musepack SV7 decoder library"; platforms = lib.platforms.unix; diff --git a/pkgs/by-name/li/liborcus/package.nix b/pkgs/by-name/li/liborcus/package.nix index 4e3a48d10b8b..d50b469fc91e 100644 --- a/pkgs/by-name/li/liborcus/package.nix +++ b/pkgs/by-name/li/liborcus/package.nix @@ -25,6 +25,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config + python3.pythonOnBuildForHost ]; buildInputs = [ @@ -35,6 +36,26 @@ stdenv.mkDerivation rec { zlib ]; + preCheck = + '' + patchShebangs test/python + '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' + export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH''${DYLD_LIBRARY_PATH:+:}${ + lib.concatMapStringsSep ":" (d: "$(pwd)/src/${d}/.libs") [ + "liborcus" + "parser" + "python" + "spreadsheet" + ] + } + ''; + + strictDeps = true; + doCheck = true; + enableParallelBuilding = true; + enableParallelChecking = true; + meta = with lib; { description = "Collection of parsers and import filters for spreadsheet documents"; homepage = "https://gitlab.com/orcus/orcus"; diff --git a/pkgs/by-name/li/libtorrent-rasterbar-2_0_x/package.nix b/pkgs/by-name/li/libtorrent-rasterbar-2_0_x/package.nix index 236b930a994d..b544b1c6f77e 100644 --- a/pkgs/by-name/li/libtorrent-rasterbar-2_0_x/package.nix +++ b/pkgs/by-name/li/libtorrent-rasterbar-2_0_x/package.nix @@ -12,7 +12,7 @@ }: let - version = "2.0.10"; + version = "2.0.11"; # Make sure we override python, so the correct version is chosen boostPython = boost.override { @@ -29,7 +29,7 @@ stdenv.mkDerivation { owner = "arvidn"; repo = "libtorrent"; rev = "v${version}"; - hash = "sha256-JrAYtoS8wNmmhbgnprD7vNz1N64ekIryjK77rAKTyaQ="; + hash = "sha256-iph42iFEwP+lCWNPiOJJOejISFF6iwkGLY9Qg8J4tyo="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/li/limbo/package.nix b/pkgs/by-name/li/limbo/package.nix index 9b1b7685905a..38f31582183f 100644 --- a/pkgs/by-name/li/limbo/package.nix +++ b/pkgs/by-name/li/limbo/package.nix @@ -7,17 +7,17 @@ }: rustPlatform.buildRustPackage rec { pname = "limbo"; - version = "0.0.13"; + version = "0.0.14"; src = fetchFromGitHub { owner = "tursodatabase"; repo = "limbo"; tag = "v${version}"; - hash = "sha256-zIjtuATXlqFh2IoM9cqWysZdRFaVgJTcZFWUsK+NtsQ="; + hash = "sha256-t3bIW+HuuZzj3NOw2lnTZw9qxj7lGWtR8RbZF0rVbQ4="; }; useFetchCargoVendor = true; - cargoHash = "sha256-Bb293Amn1S4QARtWrtRkWFHF5FisIcbrfJTsOV6aUQo="; + cargoHash = "sha256-DDUl/jojhDmSQY7iI/Dn+Lg4eNuNhj8jyakPtgg4d2k="; cargoBuildFlags = [ "-p" diff --git a/pkgs/by-name/ma/mackerel-agent/package.nix b/pkgs/by-name/ma/mackerel-agent/package.nix index e64e46c4f979..8ecd81bc961c 100644 --- a/pkgs/by-name/ma/mackerel-agent/package.nix +++ b/pkgs/by-name/ma/mackerel-agent/package.nix @@ -10,20 +10,20 @@ buildGoModule rec { pname = "mackerel-agent"; - version = "0.83.0"; + version = "0.84.0"; src = fetchFromGitHub { owner = "mackerelio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-hxABrgUdEQDj8NJxZgChGgB2/3J1/ChTdIYkFQtGsuY="; + sha256 = "sha256-kLrZ+oTb27g2Lzb65cVyxu1Ou5wGXXMSUvod+IBnoPA="; }; nativeBuildInputs = [ makeWrapper ]; nativeCheckInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ nettools ]; buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ iproute2 ]; - vendorHash = "sha256-JIqQXS2iw3opeotpfqC16w7hdu+7XjxhIyVj2M+98ec="; + vendorHash = "sha256-DPxkZp46AsUiThQC9OwL24uKfJrUhgo8IvvE4fLo1yg="; subPackages = [ "." ]; diff --git a/pkgs/by-name/ma/mas/package.nix b/pkgs/by-name/ma/mas/package.nix index 1926bf254742..db4fa214b380 100644 --- a/pkgs/by-name/ma/mas/package.nix +++ b/pkgs/by-name/ma/mas/package.nix @@ -2,27 +2,44 @@ lib, stdenvNoCC, fetchurl, - installShellFiles, + libarchive, + p7zip, testers, mas, }: stdenvNoCC.mkDerivation rec { pname = "mas"; - version = "1.8.6"; + version = "1.9.0"; src = fetchurl { - # Use the tarball until https://github.com/mas-cli/mas/issues/452 is fixed. - # Even though it looks like an OS/arch specific build it is actually a universal binary. - url = "https://github.com/mas-cli/mas/releases/download/v${version}/mas-${version}.monterey.bottle.tar.gz"; - sha256 = "0q4skdhymgn5xrwafyisfshx327faia682yv83mf68r61m2jl10d"; + url = "https://github.com/mas-cli/mas/releases/download/v${version}/mas-${version}.pkg"; + hash = "sha256-MiSrCHLby3diTAzDPCYX1ZwdmzcHwOx/UJuWrlRJe54="; }; - nativeBuildInputs = [ installShellFiles ]; + nativeBuildInputs = [ + libarchive + p7zip + ]; + + unpackPhase = '' + runHook preUnpack + + 7z x $src + bsdtar -xf Payload~ + + runHook postUnpack + ''; + + dontBuild = true; installPhase = '' - install -D './${version}/bin/mas' "$out/bin/mas" - installShellCompletion --cmd mas --bash './${version}/etc/bash_completion.d/mas' + runHook preInstall + + mkdir -p $out/bin + cp mas $out/bin + + runHook postInstall ''; passthru.tests = { diff --git a/pkgs/by-name/ma/mattermost-desktop/package.nix b/pkgs/by-name/ma/mattermost-desktop/package.nix index 8dc369dd08b9..ad141c593e89 100644 --- a/pkgs/by-name/ma/mattermost-desktop/package.nix +++ b/pkgs/by-name/ma/mattermost-desktop/package.nix @@ -86,7 +86,9 @@ buildNpmPackage rec { # Invoking with `--version` insists on being able to write to a log file. command = "env HOME=/tmp ${meta.mainProgram} --version"; }; - updateScript = nix-update-script { }; + updateScript = nix-update-script { + extraArgs = [ "--version-regex=^(\\d+\\.\\d+\\.\\d+)$" ]; + }; }; meta = { diff --git a/pkgs/by-name/md/mdbook-d2/package.nix b/pkgs/by-name/md/mdbook-d2/package.nix index 5129da5484b6..b948c7a2cb0b 100644 --- a/pkgs/by-name/md/mdbook-d2/package.nix +++ b/pkgs/by-name/md/mdbook-d2/package.nix @@ -7,17 +7,17 @@ rustPlatform.buildRustPackage rec { pname = "mdbook-d2"; - version = "0.3.1"; + version = "0.3.2"; src = fetchFromGitHub { owner = "danieleades"; repo = "mdbook-d2"; rev = "v${version}"; - hash = "sha256-5/vChjSYMlCcieA10jncoXZw9Gpeol+Am7mUo78Zqho="; + hash = "sha256-d3PKwvTpOpqp6J1i53T7FYSEGO+yuL+wtpAwNjrPZcQ="; }; useFetchCargoVendor = true; - cargoHash = "sha256-MxeSgSwBOQ5Eb/2mPtacNNX8MBSToon31egrbfxZjZg="; + cargoHash = "sha256-nV0VBbAivS6Qj62H1Uk/alDEPnryRmEfY3LZIIvDEKE="; doCheck = false; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ diff --git a/pkgs/by-name/mi/mihomo/package.nix b/pkgs/by-name/mi/mihomo/package.nix index c6a314d2027b..ef456ae69c95 100644 --- a/pkgs/by-name/mi/mihomo/package.nix +++ b/pkgs/by-name/mi/mihomo/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "mihomo"; - version = "1.19.1"; + version = "1.19.2"; src = fetchFromGitHub { owner = "MetaCubeX"; repo = "mihomo"; rev = "v${version}"; - hash = "sha256-leeD/lra0ZA7in5ZX+uZwWRyHEaE9WzC8UEigI+Z+aA="; + hash = "sha256-lTrUM4/t7GP8IhuyMqit7Iv4AX2I8tlMJWvgx2tDbgE="; }; - vendorHash = "sha256-0CStTmN2+bXJuoolVM8Spfj2HKYK7a8krxlA0uwHOOw="; + vendorHash = "sha256-/YW3IRdDHcOrwUkXt/ORhN3OrwwV5H63WP6ioTFDR+c="; excludedPackages = [ "./test" ]; diff --git a/pkgs/by-name/mi/mini-calc/package.nix b/pkgs/by-name/mi/mini-calc/package.nix index ffdbed969b55..60784157b60c 100644 --- a/pkgs/by-name/mi/mini-calc/package.nix +++ b/pkgs/by-name/mi/mini-calc/package.nix @@ -9,17 +9,17 @@ }: rustPlatform.buildRustPackage rec { pname = "mini-calc"; - version = "3.3.5"; + version = "3.4.1"; src = fetchFromGitHub { owner = "vanilla-extracts"; repo = "calc"; rev = version; - hash = "sha256-A5nD1SuV2p2o+WRTHr9tqhyqfeZMiGWi9QUXFSSM7C0="; + hash = "sha256-p3McMsMo+l9fqLd6PZz4GBxoac4aZkJ3b4bQdmnooKI="; }; useFetchCargoVendor = true; - cargoHash = "sha256-TFAt0JcPX8EKTSwyxF5efYJC5LbSPBr2f9L4DaQ1ebI="; + cargoHash = "sha256-VOv1CqUpsvRY0Zln7grGBRLegtJ3NhiuIxiEoBKe2eQ="; nativeBuildInputs = [ makeWrapper ]; postFixup = '' diff --git a/pkgs/by-name/oh/oh-my-zsh/package.nix b/pkgs/by-name/oh/oh-my-zsh/package.nix index a6042b18ed2a..9ad72a614144 100644 --- a/pkgs/by-name/oh/oh-my-zsh/package.nix +++ b/pkgs/by-name/oh/oh-my-zsh/package.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { chmod -R +w templates # Change the path to oh-my-zsh dir and disable auto-updating. - sed -i -e "s#ZSH=\$HOME/.oh-my-zsh#ZSH=$outdir#" \ + sed -i -e "s#ZSH=\"\$HOME/.oh-my-zsh\"#ZSH=\"$outdir\"#" \ -e 's/\# \(DISABLE_AUTO_UPDATE="true"\)/\1/' \ $template diff --git a/pkgs/by-name/om/omnictl/package.nix b/pkgs/by-name/om/omnictl/package.nix index fd5e990e117e..333d7f0c7875 100644 --- a/pkgs/by-name/om/omnictl/package.nix +++ b/pkgs/by-name/om/omnictl/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "omnictl"; - version = "0.46.0"; + version = "0.46.3"; src = fetchFromGitHub { owner = "siderolabs"; repo = "omni"; rev = "v${version}"; - hash = "sha256-3ew/iyMR1BI5/4Rct+DqY0Tqy0lg1kv7rCTck7i+C70="; + hash = "sha256-pVi27A8U3+nDMMmVAV/7HXXXydWFxB8M/PiEJCnqdwo="; }; - vendorHash = "sha256-VR2k1r1bP9QSkcjwGnFUER+E3WIKrdCID4zewJyDd9A="; + vendorHash = "sha256-5+15d7QcjajZ6yOSQgN4D0Lzy2Bljk0ih/KKG1SGtX8="; ldflags = [ "-s" diff --git a/pkgs/by-name/q2/q2pro/package.nix b/pkgs/by-name/q2/q2pro/package.nix index bfbc24297da3..814414616190 100644 --- a/pkgs/by-name/q2/q2pro/package.nix +++ b/pkgs/by-name/q2/q2pro/package.nix @@ -30,18 +30,18 @@ stdenv.mkDerivation (finalAttrs: rec { pname = "q2pro"; - version = "0-unstable-2025-01-02"; + version = "0-unstable-2025-02-05"; src = fetchFromGitHub { owner = "skullernet"; repo = "q2pro"; - rev = "5b2d9f29aa9fb07cfe2b4ba9ee628a0153e759c2"; - hash = "sha256-vz7f6isv3pcMtr3hO96sV1G2F94/w431FxtB6DcpCVU="; + rev = "6e505b11f570c6f3fcce05959d789cec5da87c2d"; + hash = "sha256-ioqUCNulUs7oSQVc9ElJu72sY838bEFvAbFZV+2UFRU="; }; # build date and rev number is displayed in the game's console - revCount = "3660"; # git rev-list --count ${src.rev} - SOURCE_DATE_EPOCH = "1735838714"; # git show -s --format=%ct ${src.rev} + revCount = "3671"; # git rev-list --count ${src.rev} + SOURCE_DATE_EPOCH = "1738774402"; # git show -s --format=%ct ${src.rev} nativeBuildInputs = [ diff --git a/pkgs/by-name/re/redpanda-client/package.nix b/pkgs/by-name/re/redpanda-client/package.nix index 2fa9953df4ee..0b2a0b17e416 100644 --- a/pkgs/by-name/re/redpanda-client/package.nix +++ b/pkgs/by-name/re/redpanda-client/package.nix @@ -7,12 +7,12 @@ stdenv, }: let - version = "24.3.4"; + version = "24.3.5"; src = fetchFromGitHub { owner = "redpanda-data"; repo = "redpanda"; rev = "v${version}"; - sha256 = "sha256-2VBichdsUM5cBAyRjMP2bECeMIQ60EYp832QNQ9UClk="; + sha256 = "sha256-Ev0eEZ3EHtSoNUr6MsYsd71riWq77+XrU5EPano08Rc="; }; in buildGoModule rec { @@ -20,7 +20,7 @@ buildGoModule rec { inherit doCheck src version; modRoot = "./src/go/rpk"; runVend = false; - vendorHash = "sha256-RoUrLJqGpXgFGMG5kLdwIxGTePiOFCM9QeX68vq/HrI="; + vendorHash = "sha256-D+hDDJb01LCyD6IjlycsRD5kqtQeavNbl4MaAVAVA14="; ldflags = [ ''-X "github.com/redpanda-data/redpanda/src/go/rpk/pkg/cli/cmd/version.version=${version}"'' diff --git a/pkgs/by-name/re/repomix/package.nix b/pkgs/by-name/re/repomix/package.nix index be56c6e68e75..6586d5c240d5 100644 --- a/pkgs/by-name/re/repomix/package.nix +++ b/pkgs/by-name/re/repomix/package.nix @@ -8,16 +8,16 @@ buildNpmPackage rec { pname = "repomix"; - version = "0.2.24"; + version = "0.2.25"; src = fetchFromGitHub { owner = "yamadashy"; repo = "repomix"; tag = "v${version}"; - hash = "sha256-AP9wwx836AoIMnOc8JB06Kl9vfk9CQArLTsoYYdv3Rs="; + hash = "sha256-Iuf2BJjJGYLw8J2UQzbAK50BZPaMa/3E3gXswWVRxn0="; }; - npmDepsHash = "sha256-TYDqy2itdgCO0N3WyE56txLmiTE+ZhUeWRgxHf+mvec="; + npmDepsHash = "sha256-p/8/8o0BiHBsBaMtduEd1z6HYi3TerU6wuzOTq3oitg="; nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; diff --git a/pkgs/by-name/rs/rss-bridge/package.nix b/pkgs/by-name/rs/rss-bridge/package.nix index 8593786f8bee..0baedb8dc21e 100644 --- a/pkgs/by-name/rs/rss-bridge/package.nix +++ b/pkgs/by-name/rs/rss-bridge/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "rss-bridge"; - version = "2025-01-02"; + version = "2025-01-26"; src = fetchFromGitHub { owner = "RSS-Bridge"; repo = "rss-bridge"; rev = version; - sha256 = "sha256-6Ise+qptY2wLkNveT/mzL0nWrX6OhxAlOJkF2+BmSTE="; + sha256 = "sha256-b8mBojtNbQ9QSsFT2PTwyHJIOhoOpTxd6c2ldMy/g5g="; }; installPhase = '' diff --git a/pkgs/by-name/ru/ruff-lsp/package.nix b/pkgs/by-name/ru/ruff-lsp/package.nix index e29469ca5c82..7b6bdc411aa8 100644 --- a/pkgs/by-name/ru/ruff-lsp/package.nix +++ b/pkgs/by-name/ru/ruff-lsp/package.nix @@ -12,14 +12,14 @@ python3Packages.buildPythonApplication rec { pname = "ruff-lsp"; - version = "0.0.61"; + version = "0.0.62"; pyproject = true; src = fetchFromGitHub { owner = "astral-sh"; repo = "ruff-lsp"; tag = "v${version}"; - hash = "sha256-gyrmustYJAwjO7YbBl76f/IvcEy2ffb9Se7idcyxsYg="; + hash = "sha256-aYhNvT4rcaEzuqwql7TpFkCoyH77uSG7r6uY5aIzhrk="; }; build-system = with python3Packages; [ hatchling ]; diff --git a/pkgs/by-name/ru/ruff/package.nix b/pkgs/by-name/ru/ruff/package.nix index e1a6077365c0..86ab891ee860 100644 --- a/pkgs/by-name/ru/ruff/package.nix +++ b/pkgs/by-name/ru/ruff/package.nix @@ -17,17 +17,17 @@ rustPlatform.buildRustPackage rec { pname = "ruff"; - version = "0.9.5"; + version = "0.9.6"; src = fetchFromGitHub { owner = "astral-sh"; repo = "ruff"; tag = version; - hash = "sha256-VoYV13GsTaAWoLcSfuadLR2l8Xbn0MEd/Uh9EP/DgjE="; + hash = "sha256-xKlvj+8ox5UdkH3s9IOIMOVPCDQMLnGUKDOhKAZZgg4="; }; useFetchCargoVendor = true; - cargoHash = "sha256-d6fLVmg7mbCQqDiNeXRwGHc/a0+RYlmqnkyiUJuM8xY="; + cargoHash = "sha256-m9U4OFefSumTT6heNz4qOdRBhsJvP3wcXeZcMVD+NqA="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/sa/saucectl/package.nix b/pkgs/by-name/sa/saucectl/package.nix index 237935072cfd..83c5640d3c67 100644 --- a/pkgs/by-name/sa/saucectl/package.nix +++ b/pkgs/by-name/sa/saucectl/package.nix @@ -5,7 +5,7 @@ }: let pname = "saucectl"; - version = "0.192.0"; + version = "0.193.0"; in buildGoModule { inherit pname version; @@ -14,7 +14,7 @@ buildGoModule { owner = "saucelabs"; repo = "saucectl"; tag = "v${version}"; - hash = "sha256-p7NWIjiaXM96PfmBohkfc1PQ6ZtE0pEeBVLemJiowXg="; + hash = "sha256-f4OtXjqtqcMIIssXq5UjPX450Ji2objhOcgm82m52V0="; }; ldflags = [ diff --git a/pkgs/by-name/si/sipexer/package.nix b/pkgs/by-name/si/sipexer/package.nix index 47933243e0dc..ca194801d204 100644 --- a/pkgs/by-name/si/sipexer/package.nix +++ b/pkgs/by-name/si/sipexer/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "sipexer"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "miconda"; repo = pname; rev = "v${version}"; - hash = "sha256-/AVOC8Tx5XMDiKmLBq2xUiJaA3K3TnWVXPE+Vzx862I="; + hash = "sha256-7L29nyFOc/5XAHpzGsFSngxMTwwIDkmwhIKIjHYGszc="; }; vendorHash = "sha256-q2uNqKZc6Zye7YimPDrg40o68Fo4ux4fygjVjJdhqQU="; diff --git a/pkgs/by-name/sk/sketchybar-app-font/package.nix b/pkgs/by-name/sk/sketchybar-app-font/package.nix index 7d4e6df724cc..d447a2500fc2 100644 --- a/pkgs/by-name/sk/sketchybar-app-font/package.nix +++ b/pkgs/by-name/sk/sketchybar-app-font/package.nix @@ -9,13 +9,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "sketchybar-app-font"; - version = "2.0.30"; + version = "2.0.31"; src = fetchFromGitHub { owner = "kvndrsslr"; repo = "sketchybar-app-font"; - rev = "v2.0.30"; - hash = "sha256-Kx7Uazrmyn7yQedqnY1YJXSY2QFe0nCEIFLFUZwS9Tk="; + rev = "v2.0.31"; + hash = "sha256-ELe6ZKdNyhHcgktZtWZlgqoHlhagliK4bXw1SH/g9HU="; }; pnpmDeps = pnpm_9.fetchDeps { diff --git a/pkgs/by-name/so/sonar-scanner-cli/package.nix b/pkgs/by-name/so/sonar-scanner-cli/package.nix index 7eebc2693c9d..241e649095b5 100644 --- a/pkgs/by-name/so/sonar-scanner-cli/package.nix +++ b/pkgs/by-name/so/sonar-scanner-cli/package.nix @@ -11,16 +11,16 @@ maven.buildMavenPackage rec { pname = "sonar-scanner-cli"; - version = "6.2.1.4610"; + version = "7.0.1.4817"; src = fetchFromGitHub { owner = "SonarSource"; repo = "sonar-scanner-cli"; tag = version; - hash = "sha256-k1gZO3h6ZGwxJNQ5QwUH96aDPGpJuEn6HYUsYOpqo+g="; + hash = "sha256-gXThWkkDZbGMdEMfeDrcCGrRV0+Yv/kXVNJARgGIvXA="; }; - mvnHash = "sha256-RNWE9wjX2CP6G/Hoh/vJExUkTEsSh5D+1PAMZ9TuIh0="; + mvnHash = "sha256-YYoqBawqM63HNNgFENsgAXhURBBUlekn4mABtISz+LQ="; mvnParameters = "-Dproject.build.outputTimestamp=1980-01-01T00:00:02Z"; diff --git a/pkgs/by-name/sp/spdlog/package.nix b/pkgs/by-name/sp/spdlog/package.nix index da33fbf60333..8ed1455206c4 100644 --- a/pkgs/by-name/sp/spdlog/package.nix +++ b/pkgs/by-name/sp/spdlog/package.nix @@ -1,25 +1,27 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, fmt -, catch2_3 -, staticBuild ? stdenv.hostPlatform.isStatic +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + fmt, + catch2_3, + staticBuild ? stdenv.hostPlatform.isStatic, -# tests -, bear -, tiledb + # passthru + bear, + tiledb, + nix-update-script, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "spdlog"; version = "1.15.1"; src = fetchFromGitHub { owner = "gabime"; - repo = "spdlog"; - rev = "v${version}"; - hash = "sha256-4QZVCounDbtkP+58fejHGWjquWT3b03b9TNGs45dN7c="; + repo = "spdlog"; + tag = "v${finalAttrs.version}"; + hash = "sha256-4QZVCounDbtkP+58fejHGWjquWT3b03b9TNGs45dN7c="; }; nativeBuildInputs = [ cmake ]; @@ -28,15 +30,19 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ fmt ]; cmakeFlags = [ - "-DSPDLOG_BUILD_SHARED=${if staticBuild then "OFF" else "ON"}" - "-DSPDLOG_BUILD_STATIC=${if staticBuild then "ON" else "OFF"}" - "-DSPDLOG_BUILD_EXAMPLE=OFF" - "-DSPDLOG_BUILD_BENCH=OFF" - "-DSPDLOG_BUILD_TESTS=ON" - "-DSPDLOG_FMT_EXTERNAL=ON" + (lib.cmakeBool "SPDLOG_BUILD_SHARED" (!staticBuild)) + (lib.cmakeBool "SPDLOG_BUILD_STATIC" staticBuild) + (lib.cmakeBool "SPDLOG_BUILD_EXAMPLE" false) + (lib.cmakeBool "SPDLOG_BUILD_BENCH" false) + (lib.cmakeBool "SPDLOG_BUILD_TESTS" true) + (lib.cmakeBool "SPDLOG_FMT_EXTERNAL" true) ]; - outputs = [ "out" "doc" "dev" ] ; + outputs = [ + "out" + "doc" + "dev" + ]; postInstall = '' mkdir -p $out/share/doc/spdlog @@ -50,15 +56,19 @@ stdenv.mkDerivation rec { doCheck = true; - passthru.tests = { - inherit bear tiledb; + passthru = { + tests = { + inherit bear tiledb; + }; + updateScript = nix-update-script { }; }; - meta = with lib; { - description = "Very fast, header only, C++ logging library"; - homepage = "https://github.com/gabime/spdlog"; - license = licenses.mit; - maintainers = with maintainers; [ obadz ]; - platforms = platforms.all; + meta = { + description = "Very fast, header only, C++ logging library"; + homepage = "https://github.com/gabime/spdlog"; + changelog = "https://github.com/gabime/spdlog/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ obadz ]; + platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/sq/squid/package.nix b/pkgs/by-name/sq/squid/package.nix index 376621268646..5d2803944dcf 100644 --- a/pkgs/by-name/sq/squid/package.nix +++ b/pkgs/by-name/sq/squid/package.nix @@ -24,7 +24,9 @@ stdenv.mkDerivation (finalAttrs: { version = "6.13"; src = fetchurl { - url = "http://www.squid-cache.org/Versions/v6/squid-${finalAttrs.version}.tar.xz"; + url = "https://github.com/squid-cache/squid/releases/download/SQUID_${ + builtins.replaceStrings [ "." ] [ "_" ] finalAttrs.version + }/squid-${finalAttrs.version}.tar.xz"; hash = "sha256-Iy4FZ5RszAEVZTw8GPAeg/LZzEnEPZ3q2LMZrws1rVI="; }; diff --git a/pkgs/by-name/st/stats/package.nix b/pkgs/by-name/st/stats/package.nix index 4a9c31379d0d..ada8ab1d47b0 100644 --- a/pkgs/by-name/st/stats/package.nix +++ b/pkgs/by-name/st/stats/package.nix @@ -8,11 +8,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "stats"; - version = "2.11.26"; + version = "2.11.30"; src = fetchurl { url = "https://github.com/exelban/stats/releases/download/v${finalAttrs.version}/Stats.dmg"; - hash = "sha256-WRbBqgjNn9W9qRFlbuNAOr8L6lzI1DpTsTCgCQiKSnU="; + hash = "sha256-WkNiZZq2PfGp65d82YHupiczojSktDAe4p4WiUj5xWM="; }; sourceRoot = "."; diff --git a/pkgs/by-name/ut/ut1999/package.nix b/pkgs/by-name/ut/ut1999/package.nix index 2d86e22b8cbe..3301ac5668ec 100644 --- a/pkgs/by-name/ut/ut1999/package.nix +++ b/pkgs/by-name/ut/ut1999/package.nix @@ -6,6 +6,7 @@ undmg, fetchurl, makeDesktopItem, + makeWrapper, copyDesktopItems, libarchive, imagemagick, @@ -67,7 +68,7 @@ let } .${stdenv.hostPlatform.system} or (throw "unsupported system: ${stdenv.hostPlatform.system}"); in -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { name = "ut1999"; inherit version; sourceRoot = "."; @@ -91,23 +92,32 @@ stdenv.mkDerivation { autoPatchelfHook ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + makeWrapper undmg ]; installPhase = let outPrefix = - if stdenv.hostPlatform.isDarwin then "$out/UnrealTournament.app/Contents/MacOS" else "$out"; + if stdenv.hostPlatform.isDarwin then + "$out/Applications/UnrealTournament.app/Contents/MacOS" + else + "$out"; in '' runHook preInstall - mkdir -p $out - '' - + lib.optionalString (stdenv.hostPlatform.isLinux) '' mkdir -p $out/bin '' + + lib.optionalString (stdenv.hostPlatform.isLinux) '' + cp -r ./* $out + '' + + lib.optionalString (stdenv.hostPlatform.isDarwin) '' + mkdir -p $out/Applications/ + cp -r "UnrealTournament.app" $out/Applications/ + makeWrapper $out/Applications/UnrealTournament.app/Contents/MacOS/UnrealTournament \ + $out/bin/${finalAttrs.meta.mainProgram} + '' + '' - cp -r ${if stdenv.hostPlatform.isDarwin then "UnrealTournament.app" else "./*"} $out chmod -R 755 $out cd ${outPrefix} # NOTE: OldUnreal patch doesn't include these folders on linux but could in the future @@ -181,4 +191,4 @@ stdenv.mkDerivation { sourceProvenance = with sourceTypes; [ binaryNativeCode ]; mainProgram = "ut1999"; }; -} +}) diff --git a/pkgs/by-name/we/websurfx/package.nix b/pkgs/by-name/we/websurfx/package.nix index ebe1ce4ac311..5c76c9d13462 100644 --- a/pkgs/by-name/we/websurfx/package.nix +++ b/pkgs/by-name/we/websurfx/package.nix @@ -6,7 +6,7 @@ pkg-config, }: let - version = "1.23.0"; + version = "1.23.6"; in rustPlatform.buildRustPackage { pname = "websurfx"; @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage { owner = "neon-mmd"; repo = "websurfx"; tag = "v${version}"; - hash = "sha256-+29Q963+CdYgy8JmhZwG22CElliYpFyEtOj8pHZj8XY="; + hash = "sha256-tTwY+cmGUmqaTBHjZl/MA8wVBH/2CpoTcZZitZEKxJo="; }; nativeBuildInputs = [ @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage { useFetchCargoVendor = true; - cargoHash = "sha256-16u9pb8+qjoQPK5xipJAFCMIpebJRTiGtv1gFn3xyj8="; + cargoHash = "sha256-/cfpj1/PvJ6lkVyfdzrMXiG1d3Fg5p6eui3QuRlrnNw="; postPatch = '' substituteInPlace src/handler/mod.rs \ diff --git a/pkgs/by-name/wg/wgo/package.nix b/pkgs/by-name/wg/wgo/package.nix index c6c007e6e339..594da9ebab83 100644 --- a/pkgs/by-name/wg/wgo/package.nix +++ b/pkgs/by-name/wg/wgo/package.nix @@ -6,7 +6,7 @@ let pname = "wgo"; - version = "0.5.7"; + version = "0.5.9"; in buildGoModule { inherit pname version; @@ -15,7 +15,7 @@ buildGoModule { owner = "bokwoon95"; repo = "wgo"; rev = "v${version}"; - hash = "sha256-4nVDpvMmhw6t6BmQoOssef2V5uUb3jwmn8oU1W7UbUw="; + hash = "sha256-IC8v4Hsnhp6RFoYE0eBsl3r9oQyUBoUfdkJKYIjCXlA="; }; vendorHash = "sha256-w6UJxZToHbbQmuXkyqFzyssFcE+7uVNqOuIF/XKdEsU="; diff --git a/pkgs/by-name/wh/whitesur-icon-theme/package.nix b/pkgs/by-name/wh/whitesur-icon-theme/package.nix index 4eae52fabac3..33ea5180ba81 100644 --- a/pkgs/by-name/wh/whitesur-icon-theme/package.nix +++ b/pkgs/by-name/wh/whitesur-icon-theme/package.nix @@ -32,13 +32,13 @@ lib.checkListOfEnum "${pname}: theme variants" stdenvNoCC.mkDerivation rec { inherit pname; - version = "2024-09-07"; + version = "2025-02-10"; src = fetchFromGitHub { owner = "vinceliuice"; - repo = pname; - rev = version; - hash = "sha256-/cW/ymT9MjB07Sw7ifpr6x8oaaeI4PSyaOdLci7AncY="; + repo = "WhiteSur-icon-theme"; + tag = "v${version}"; + hash = "sha256-spTmS9Cn/HAnbgf6HppwME63cxWEbcKwWYMMj8ajFyY="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ya/yabai/package.nix b/pkgs/by-name/ya/yabai/package.nix index edf78130738c..9fa0a5e86093 100644 --- a/pkgs/by-name/ya/yabai/package.nix +++ b/pkgs/by-name/ya/yabai/package.nix @@ -14,7 +14,7 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "yabai"; - version = "7.1.6"; + version = "7.1.8"; src = finalAttrs.passthru.sources.${stdenv.hostPlatform.system} @@ -66,13 +66,13 @@ stdenv.mkDerivation (finalAttrs: { # See the comments on https://github.com/NixOS/nixpkgs/pull/188322 for more information. "aarch64-darwin" = fetchzip { url = "https://github.com/koekeishiya/yabai/releases/download/v${finalAttrs.version}/yabai-v${finalAttrs.version}.tar.gz"; - hash = "sha256-6cHOHL73BB2UaZKLPxnc6n0bo7XwhxehDj+m+s1dGqk="; + hash = "sha256-lD+n3QYI53AiCi32Ci06bNulwdyhRG7xQDVqJqlHOcs="; }; "x86_64-darwin" = fetchFromGitHub { owner = "koekeishiya"; repo = "yabai"; rev = "v${finalAttrs.version}"; - hash = "sha256-yigpGy4n7QS1WvWyxESmSPNWqGWh7Mqp/NrmvdMhPdY="; + hash = "sha256-nbPs8xPh1TW6HU1yl0gStSzsj6yxsBhHUI63y1GGGW0="; }; }; diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index 00856f3ef29d..216e99f5a4f1 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -355,6 +355,7 @@ stdenv.mkDerivation rec { --replace 'ON_BOOT="start"' 'ON_BOOT=''${ON_BOOT:-start}' \ --replace 'ON_SHUTDOWN="suspend"' 'ON_SHUTDOWN=''${ON_SHUTDOWN:-suspend}' \ --replace 'PARALLEL_SHUTDOWN=0' 'PARALLEL_SHUTDOWN=''${PARALLEL_SHUTDOWN:-0}' \ + --replace 'SHUTDOWN_TIMEOUT=300' 'SHUTDOWN_TIMEOUT=''${SHUTDOWN_TIMEOUT:-300}' \ --replace "$out/bin" '${gettext}/bin' \ --replace 'lock/subsys' 'lock' \ --replace 'gettext.sh' 'gettext.sh diff --git a/pkgs/development/python-modules/ax-platform/default.nix b/pkgs/development/python-modules/ax-platform/default.nix index 513e6ec00184..80b8990474e6 100644 --- a/pkgs/development/python-modules/ax-platform/default.nix +++ b/pkgs/development/python-modules/ax-platform/default.nix @@ -13,17 +13,19 @@ pyfakefs, pyre-extensions, pytestCheckHook, + pythonAtLeast, pythonOlder, setuptools-scm, setuptools, sqlalchemy, + tabulate, typeguard, yappi, }: buildPythonPackage rec { pname = "ax-platform"; - version = "0.4.3"; + version = "0.5.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -32,7 +34,7 @@ buildPythonPackage rec { owner = "facebook"; repo = "ax"; tag = version; - hash = "sha256-jmBjrtxqg4Iu3Qr0HRqjVfwURXzbJaGm+DBFNHYk/vA="; + hash = "sha256-CMKdnPvzQ9tvU9/01mRaWi/Beuyo19CtaXNJCoiwLOw="; }; env.ALLOW_BOTORCH_LATEST = "1"; @@ -62,16 +64,13 @@ buildPythonPackage rec { mercurial pyfakefs pytestCheckHook + tabulate yappi - ] ++ lib.flatten (builtins.attrValues optional-dependencies); + ] ++ lib.flatten (lib.attrValues optional-dependencies); disabledTestPaths = [ "ax/benchmark" "ax/runners/tests/test_torchx.py" - # requires pyre_extensions - "ax/telemetry/tests" - "ax/core/tests/test_utils.py" - "ax/early_stopping/tests/test_strategies.py" # broken with sqlalchemy 2 "ax/core/tests/test_experiment.py" "ax/service/tests/test_ax_client.py" @@ -80,16 +79,30 @@ buildPythonPackage rec { "ax/storage" ]; - disabledTests = [ - # exact comparison of floating points - "test_optimize_l0_homotopy" - # AssertionError: 5 != 2 - "test_get_standard_plots_moo" - # AssertionError: Expected 'warning' to be called once. Called 3 times - "test_validate_kwarg_typing" - # uses torch.equal - "test_convert_observations" - ]; + disabledTests = + [ + # exact comparison of floating points + "test_optimize_l0_homotopy" + # AssertionError: 5 != 2 + "test_get_standard_plots_moo" + # AssertionError: Expected 'warning' to be called once. Called 3 times + "test_validate_kwarg_typing" + # uses torch.equal + "test_convert_observations" + # broken with sqlalchemy 2 + "test_sql_storage" + ] + ++ lib.optionals (pythonAtLeast "3.13") [ + # Both `metric_aggregation` and `criterion` must be `ReductionCriterion` + "test_SingleDiagnosticBestModelSelector_max_mean" + "test_SingleDiagnosticBestModelSelector_min_mean" + "test_SingleDiagnosticBestModelSelector_min_min" + "test_SingleDiagnosticBestModelSelector_model_cv_kwargs" + "test_init" + "test_gen" + # "use MIN or MAX" does not match "Both `metric_aggregation` and `criterion` must be `ReductionCriterion` + "test_user_input_error" + ]; pythonImportsCheck = [ "ax" ]; diff --git a/pkgs/development/python-modules/bidsschematools/default.nix b/pkgs/development/python-modules/bidsschematools/default.nix index d9e75b998db7..4d9f19504a1f 100644 --- a/pkgs/development/python-modules/bidsschematools/default.nix +++ b/pkgs/development/python-modules/bidsschematools/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "bidsschematools"; - version = "1.0.0"; + version = "1.0.2"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "bidsschematools"; inherit version; - hash = "sha256-XqtCKtg3oqLCz5KihW9yk96fJ1uDcgag6qKCU9Bdqe4="; + hash = "sha256-JLm+iIyHPK0o1RtRM/Q1HNc6oCpPl/UaNhJO1xsXzT4="; }; build-system = [ diff --git a/pkgs/development/python-modules/botorch/default.nix b/pkgs/development/python-modules/botorch/default.nix index 65db0322ba9d..a36e88faa5d0 100644 --- a/pkgs/development/python-modules/botorch/default.nix +++ b/pkgs/development/python-modules/botorch/default.nix @@ -6,24 +6,26 @@ gpytorch, linear-operator, multipledispatch, + pyre-extensions, pyro-ppl, setuptools, setuptools-scm, torch, scipy, pytestCheckHook, + pythonAtLeast, }: buildPythonPackage rec { pname = "botorch"; - version = "0.12.0"; + version = "0.13.0"; pyproject = true; src = fetchFromGitHub { owner = "pytorch"; repo = "botorch"; tag = "v${version}"; - hash = "sha256-CKlerCUadObpPq4jQAiFDBOZMHZ4QccAKQz30OFe64E="; + hash = "sha256-Hik0HPHFoN1+uIeVxG7UPKc1ADBoTTBkL2+LhHDrr+s="; }; build-system = [ @@ -35,16 +37,12 @@ buildPythonPackage rec { gpytorch linear-operator multipledispatch + pyre-extensions pyro-ppl scipy torch ]; - pythonRelaxDeps = [ - "gpytorch" - "linear-operator" - ]; - nativeCheckInputs = [ pytestCheckHook ]; pytestFlagsArray = [ @@ -55,10 +53,18 @@ buildPythonPackage rec { disabledTests = [ "test_all_cases_covered" ] + ++ lib.optionals (pythonAtLeast "3.13") [ + # RuntimeError: Boolean value of Tensor with more than one value is ambiguous + "test_optimize_acqf_mixed_binary_only" + ] ++ lib.optionals (stdenv.buildPlatform.system == "x86_64-linux") [ # stuck tests on hydra "test_moo_predictive_entropy_search" ] + ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ + # RuntimeError: required keyword attribute 'value' has the wrong type + "test_posterior_in_trace_mode" + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ # Numerical error slightly above threshold # AssertionError: Tensor-likes are not close! diff --git a/pkgs/development/python-modules/dalle-mini/default.nix b/pkgs/development/python-modules/dalle-mini/default.nix index 2ea9b0c2d0c1..9c227162d351 100644 --- a/pkgs/development/python-modules/dalle-mini/default.nix +++ b/pkgs/development/python-modules/dalle-mini/default.nix @@ -3,13 +3,17 @@ buildPythonPackage, fetchPypi, fetchpatch, + + # dependencies einops, emoji, flax, ftfy, jax, jaxlib, + orbax-checkpoint, pillow, + pydantic, transformers, unidecode, wandb, @@ -18,7 +22,7 @@ buildPythonPackage rec { pname = "dalle-mini"; version = "0.1.5"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; @@ -34,14 +38,26 @@ buildPythonPackage rec { }) ]; - propagatedBuildInputs = [ + pythonRelaxDeps = [ + "transformers" + "jax" + "flax" + ]; + + pythonRemoveDeps = [ + "orbax" + ]; + + dependencies = [ einops emoji flax ftfy jax jaxlib + orbax-checkpoint pillow + pydantic transformers unidecode wandb @@ -51,10 +67,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "dalle_mini" ]; - meta = with lib; { + meta = { description = "Generate images from a text prompt"; homepage = "https://github.com/borisdayma/dalle-mini"; - license = licenses.asl20; - maintainers = with maintainers; [ r-burns ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ r-burns ]; }; } diff --git a/pkgs/development/python-modules/databricks-sdk/default.nix b/pkgs/development/python-modules/databricks-sdk/default.nix index 3e544760d2fd..63c6b8e74a78 100644 --- a/pkgs/development/python-modules/databricks-sdk/default.nix +++ b/pkgs/development/python-modules/databricks-sdk/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { pname = "databricks-sdk"; - version = "0.41.0"; + version = "0.43.0"; pyproject = true; src = fetchFromGitHub { owner = "databricks"; repo = "databricks-sdk-py"; tag = "v${version}"; - hash = "sha256-mKytUMPipee/sg5VWBTfCg0sZwNg69pI+Uuqu1EhNIc="; + hash = "sha256-UdGkHstRelFxlJ5zIm5PeFM7p0JQCPWD2zVS2XOlVq4="; }; build-system = [ diff --git a/pkgs/development/python-modules/flammkuchen/default.nix b/pkgs/development/python-modules/flammkuchen/default.nix index 8af55dfe7c02..eabc1277fe7e 100644 --- a/pkgs/development/python-modules/flammkuchen/default.nix +++ b/pkgs/development/python-modules/flammkuchen/default.nix @@ -1,6 +1,7 @@ { lib, buildPythonPackage, + fetchpatch2, fetchPypi, numpy, pandas, @@ -13,16 +14,24 @@ buildPythonPackage rec { pname = "flammkuchen"; version = "1.0.3"; - format = "pyproject"; + pyproject = true; src = fetchPypi { inherit pname version; hash = "sha256-z68HBsU9J6oe8+YL4OOQiMYQRs3TZUDM+e2ssqo6BFI="; }; - nativeBuildInputs = [ setuptools ]; + patches = [ + (fetchpatch2 { + name = "numpy-v2-compat.patch"; + url = "https://github.com/portugueslab/flammkuchen/commit/c523ea78e10facd98d4893f045249c68bae17940.patch?full_index=1"; + hash = "sha256-/goNkiEBrcprywQYf2oKvGbu5j12hmalPuB45wNNt+I="; + }) + ]; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ numpy scipy tables diff --git a/pkgs/development/python-modules/ghome-foyer-api/default.nix b/pkgs/development/python-modules/ghome-foyer-api/default.nix new file mode 100644 index 000000000000..d171953e2983 --- /dev/null +++ b/pkgs/development/python-modules/ghome-foyer-api/default.nix @@ -0,0 +1,42 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + grpcio, + hatchling, + hatch-vcs, + protobuf, +}: + +buildPythonPackage rec { + pname = "ghome-foyer-api"; + version = "1.1.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "KapJI"; + repo = "ghome-foyer-api"; + tag = "v${version}"; + hash = "sha256-sup+j9GFGTR+HimpkpvvAqtgYWtJt2qCPZzLvMG8hzI="; + }; + + buildInputs = [ + hatchling + hatch-vcs + ]; + + propagatedBuildInputs = [ + grpcio + protobuf + ]; + + meta = { + description = "Generated Python protobuf stubs for Google Home internal API"; + homepage = "https://github.com/KapJI/ghome-foyer-api"; + changelog = "https://github.com/KapJI/ghome-foyer-api/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + hensoko + ]; + }; +} diff --git a/pkgs/development/python-modules/gpytorch/default.nix b/pkgs/development/python-modules/gpytorch/default.nix index fd81ffcf897b..275dda93c06a 100644 --- a/pkgs/development/python-modules/gpytorch/default.nix +++ b/pkgs/development/python-modules/gpytorch/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "gpytorch"; - version = "1.13"; + version = "1.14"; pyproject = true; src = fetchFromGitHub { owner = "cornellius-gp"; repo = pname; tag = "v${version}"; - hash = "sha256-jdEJdUFIyM7TTKUHY8epjyZCGolH8nrr7FCyfw+x56s="; + hash = "sha256-whZjqAs3nyjKMzAGi+OnyBtboq0UuV8m11A4IzkWtec="; }; build-system = [ diff --git a/pkgs/development/python-modules/gurobipy/default.nix b/pkgs/development/python-modules/gurobipy/default.nix index f4f5aae68df4..57b817440c09 100644 --- a/pkgs/development/python-modules/gurobipy/default.nix +++ b/pkgs/development/python-modules/gurobipy/default.nix @@ -10,21 +10,22 @@ let format = "wheel"; pyShortVersion = "cp" + builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion; platforms = rec { - aarch64-darwin = "macosx_10_9_universal2"; + aarch64-darwin = + if pyShortVersion == "cp313" then "macosx_10_13_universal2" else "macosx_10_9_universal2"; aarch64-linux = "manylinux2014_aarch64.manylinux_2_17_aarch64"; x86_64-darwin = aarch64-darwin; x86_64-linux = "manylinux2014_x86_64.manylinux_2_17_x86_64"; }; platform = platforms.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}"); hashes = rec { - cp311-aarch64-darwin = "sha256-KRC3fY7KUVCfI4u+TQQjgqLLIEunkzgIZxiuTol2/50="; - cp311-aarch64-linux = "sha256-/DiS49iND4oB2nXxL3QCPTmO9Zmp4a3WbtdjE3M+MPs="; - cp311-x86_64-darwin = cp311-aarch64-darwin; - cp311-x86_64-linux = "sha256-oI+0Kl58sCzbmTwTgci4xaO67tyt1W5yiNhFile4FEI="; - cp312-aarch64-darwin = "sha256-tcNcuYGmFScBaFUyTgVMrkc0lnhdtX8Ggr1W1YSpbu4="; - cp312-aarch64-linux = "sha256-+Ch951NcO5yX9KqHFpadcDAqlyvQnp07b71yZsoOq3I="; + cp312-aarch64-darwin = "sha256-ZCrGAEiKZ/u/gmVmEanbVJPXDmzglk4ZHER6ZBBsMlw="; + cp312-aarch64-linux = "sha256-Rf8dzgH3hbL7XPfqYtqQSkSSC7JulID7/t8dL2fawa4="; cp312-x86_64-darwin = cp312-aarch64-darwin; - cp312-x86_64-linux = "sha256-kLukle+yXP9aOCYViv974pY30ugKzMOompjLhjCFYQY="; + cp312-x86_64-linux = "sha256-42xX3wMwxCdylNCQVlpWxWoIPYPXDDCvjpxETYCoVKU="; + cp313-aarch64-darwin = "sha256-ykkK56TacwNhszVkNQqUwK1gXL9wvnMwcbHHtSJmU1U="; + cp313-aarch64-linux = "sha256-yXHkDdzhdR4HfhYFk+0412pz0pg2X9P5BzfBVDEEQk0="; + cp313-x86_64-darwin = cp313-aarch64-darwin; + cp313-x86_64-linux = "sha256-bgB87cLGn1oXkY0P406I6V8WcLXCSsgooN8rFxY0NFk="; }; hash = hashes."${pyShortVersion}-${stdenv.system}" @@ -32,7 +33,7 @@ let in buildPythonPackage rec { pname = "gurobipy"; - version = "12.0.0"; + version = "12.0.1"; inherit format; src = fetchPypi { diff --git a/pkgs/development/python-modules/habiticalib/default.nix b/pkgs/development/python-modules/habiticalib/default.nix index 8f6ec569a7d4..d10e2ca5760e 100644 --- a/pkgs/development/python-modules/habiticalib/default.nix +++ b/pkgs/development/python-modules/habiticalib/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "habiticalib"; - version = "0.3.5"; + version = "0.3.7"; pyproject = true; disabled = pythonOlder "3.12"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "tr4nt0r"; repo = "habiticalib"; tag = "v${version}"; - hash = "sha256-r0wpWd6hFPwo5S0ft0srL1a74rODWDH0elkY1BN74Gs="; + hash = "sha256-i2yGPTZiinErWK7vX/3mwBtO4rjUhoEORhnXkFplUcM="; }; build-system = [ diff --git a/pkgs/development/python-modules/holoviews/default.nix b/pkgs/development/python-modules/holoviews/default.nix index 6b9fb81cb3d4..15c610848a87 100644 --- a/pkgs/development/python-modules/holoviews/default.nix +++ b/pkgs/development/python-modules/holoviews/default.nix @@ -18,7 +18,7 @@ # tests pytestCheckHook, - pytest-cov, + pytest-asyncio, flaky, }: @@ -34,6 +34,11 @@ buildPythonPackage rec { hash = "sha256-KdGDBF+vo9hG3tqZnZaHuZuKvcGowGcS5Ur6V2uwKz4="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace '"ignore:No data was collected:coverage.exceptions.CoverageWarning",' "" + ''; + build-system = [ hatch-vcs hatchling @@ -50,7 +55,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - pytest-cov + pytest-asyncio flaky ]; diff --git a/pkgs/development/python-modules/moviepy/default.nix b/pkgs/development/python-modules/moviepy/default.nix index 4665e1f9bca5..81b45f7fdeff 100644 --- a/pkgs/development/python-modules/moviepy/default.nix +++ b/pkgs/development/python-modules/moviepy/default.nix @@ -1,24 +1,32 @@ { lib, + stdenv, buildPythonPackage, - decorator, fetchFromGitHub, + + # build-system + setuptools, + + # dependencies + decorator, imageio, imageio-ffmpeg, - matplotlib, numpy, proglog, python-dotenv, - pytest-timeout, - pytestCheckHook, - pythonOlder, requests, + tqdm, + + # optional-dependencies + matplotlib, scikit-image, scikit-learn, scipy, - setuptools, - tqdm, yt-dlp, + + # tests + pytest-timeout, + pytestCheckHook, }: buildPythonPackage rec { @@ -26,8 +34,6 @@ buildPythonPackage rec { version = "2.1.2"; pyproject = true; - disabled = pythonOlder "3.7"; - src = fetchFromGitHub { owner = "Zulko"; repo = "moviepy"; @@ -69,20 +75,25 @@ buildPythonPackage rec { pythonImportsCheck = [ "moviepy" ]; - disabledTests = [ - # stalls - "test_doc_examples" - # video orientation mismatch, 0 != 180 - "test_PR_529" - # video orientation [1920, 1080] != [1080, 1920] - "test_ffmpeg_parse_video_rotation" - "test_correct_video_rotation" - # media duration mismatch: assert 230.0 == 30.02 - "test_ffmpeg_parse_infos_decode_file" - # Failed: DID NOT RAISE - "test_ffmpeg_resize" - "test_ffmpeg_stabilize_video" - ]; + disabledTests = + [ + # stalls + "test_doc_examples" + # video orientation mismatch, 0 != 180 + "test_PR_529" + # video orientation [1920, 1080] != [1080, 1920] + "test_ffmpeg_parse_video_rotation" + "test_correct_video_rotation" + # media duration mismatch: assert 230.0 == 30.02 + "test_ffmpeg_parse_infos_decode_file" + # Failed: DID NOT RAISE + "test_ffmpeg_resize" + "test_ffmpeg_stabilize_video" + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # Failed: Timeout >30.0s + "test_issue_1682" + ]; disabledTestPaths = [ "tests/test_compositing.py" @@ -93,11 +104,11 @@ buildPythonPackage rec { "tests/test_videotools.py" ]; - meta = with lib; { + meta = { description = "Video editing with Python"; homepage = "https://zulko.github.io/moviepy/"; - changelog = "https://github.com/Zulko/moviepy/blob/${src.tag}/CHANGELOG.md"; - license = licenses.mit; + changelog = "https://github.com/Zulko/moviepy/blob/v${version}/CHANGELOG.md"; + license = lib.licenses.mit; maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/ohme/default.nix b/pkgs/development/python-modules/ohme/default.nix index 37e3938493f1..8e66c9b1f6c9 100644 --- a/pkgs/development/python-modules/ohme/default.nix +++ b/pkgs/development/python-modules/ohme/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "ohme"; - version = "1.2.8"; + version = "1.2.9"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "dan-r"; repo = "ohmepy"; tag = "v${version}"; - hash = "sha256-T9xULo1kN/JZGlYKTbTue8/RH2CFOAzuFeDGM6+76rE="; + hash = "sha256-wsYANCe32LG2rAWhMt8x51pHVTZVcgR+0aBTjY56tnE="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/onedrive-personal-sdk/default.nix b/pkgs/development/python-modules/onedrive-personal-sdk/default.nix index ef227f1b993c..b65780d601b8 100644 --- a/pkgs/development/python-modules/onedrive-personal-sdk/default.nix +++ b/pkgs/development/python-modules/onedrive-personal-sdk/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "onedrive-personal-sdk"; - version = "0.0.8"; + version = "0.0.10"; pyproject = true; src = fetchFromGitHub { owner = "zweckj"; repo = "onedrive-personal-sdk"; tag = "v${version}"; - hash = "sha256-sA+1yqRcx7WUJFuMIIuPQm7ggVbrlSCufqq0jyhDDdA="; + hash = "sha256-8enxmHc4s6bfxeIqOqc9DpT3pKIwocIsO3hYrK3G7CM="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/optuna/default.nix b/pkgs/development/python-modules/optuna/default.nix index 0c9b03f4a0e9..aff26527574f 100644 --- a/pkgs/development/python-modules/optuna/default.nix +++ b/pkgs/development/python-modules/optuna/default.nix @@ -6,43 +6,34 @@ pythonOlder, alembic, boto3, - botorch, - catboost, - cma, cmaes, colorlog, - distributed, fakeredis, + fvcore, google-cloud-storage, - lightgbm, + grpcio, + kaleido, matplotlib, - mlflow, moto, numpy, packaging, pandas, plotly, + protobuf, pytest-xdist, - pytorch-lightning, pyyaml, redis, scikit-learn, scipy, setuptools, - shap, sqlalchemy, - tensorflow, torch, - torchaudio, - torchvision, tqdm, - wandb, - xgboost, }: buildPythonPackage rec { pname = "optuna"; - version = "4.1.0"; + version = "4.2.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -51,7 +42,7 @@ buildPythonPackage rec { owner = "optuna"; repo = "optuna"; tag = "v${version}"; - hash = "sha256-wIgYExxJEWFxEadBuCsxEIcW2/J6EVybW1jp83gIMjY="; + hash = "sha256-NNlwrVrGg2WvkC42nmW7K/mRktE3B97GaL8GaSOKF1Y="; }; build-system = [ @@ -69,60 +60,46 @@ buildPythonPackage rec { ]; optional-dependencies = { - integration = [ - botorch - catboost - cma - distributed - lightgbm - mlflow - pandas - # pytorch-ignite - pytorch-lightning - scikit-learn - shap - tensorflow - torch - torchaudio - torchvision - wandb - xgboost - ]; optional = [ boto3 - botorch cmaes + fvcore google-cloud-storage + grpcio matplotlib pandas plotly + protobuf redis scikit-learn + scipy ]; }; preCheck = '' export PATH=$out/bin:$PATH + + # grpc tests are racy + sed -i '/"grpc",/d' optuna/testing/storages.py ''; nativeCheckInputs = [ fakeredis + kaleido moto pytest-xdist pytestCheckHook - scipy + torch ] ++ fakeredis.optional-dependencies.lua ++ optional-dependencies.optional; - pytestFlagsArray = [ "-m 'not integration'" ]; - - disabledTestPaths = [ - # require unpackaged kaleido and building it is a bit difficult - "tests/visualization_tests" - # ImportError: cannot import name 'mock_s3' from 'moto' - "tests/artifacts_tests/test_boto3.py" + disabledTests = [ + # ValueError: Transform failed with error code 525: error creating static canvas/context for image server + "test_get_pareto_front_plot" + # too narrow time limit + "test_get_timeline_plot_with_killed_running_trials" ]; pythonImportsCheck = [ "optuna" ]; diff --git a/pkgs/development/python-modules/publicsuffixlist/default.nix b/pkgs/development/python-modules/publicsuffixlist/default.nix index 26ff52f85857..b37d8a649d23 100644 --- a/pkgs/development/python-modules/publicsuffixlist/default.nix +++ b/pkgs/development/python-modules/publicsuffixlist/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "publicsuffixlist"; - version = "1.0.2.20250202"; + version = "1.0.2.20250207"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-zYOlYyR/tJvY9EouLHyVjaK8ELwRBf8cowhsfd6pilI="; + hash = "sha256-wYOFcyEO9wH0lpEtrTCCDJKb4NQJ51BnJ8dysjsZwSM="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/py-synologydsm-api/default.nix b/pkgs/development/python-modules/py-synologydsm-api/default.nix index 741942f12a4b..2d5b39a48fc2 100644 --- a/pkgs/development/python-modules/py-synologydsm-api/default.nix +++ b/pkgs/development/python-modules/py-synologydsm-api/default.nix @@ -1,5 +1,6 @@ { lib, + aiofiles, aiohttp, buildPythonPackage, fetchFromGitHub, @@ -11,7 +12,7 @@ buildPythonPackage rec { pname = "py-synologydsm-api"; - version = "2.6.0"; + version = "2.6.2"; pyproject = true; disabled = pythonOlder "3.9"; @@ -20,12 +21,15 @@ buildPythonPackage rec { owner = "mib1185"; repo = "py-synologydsm-api"; tag = "v${version}"; - hash = "sha256-CjsSn9kbSOSiia47gDHUbMCgJs3pDJaJfQOwMPP+5WI="; + hash = "sha256-mkwHw10IzVWtuLGbpY/v7yCJgI6TBIJEo1XSB/NlZKs="; }; build-system = [ setuptools ]; - dependencies = [ aiohttp ]; + dependencies = [ + aiofiles + aiohttp + ]; nativeCheckInputs = [ pytest-asyncio diff --git a/pkgs/development/python-modules/pyannote-audio/default.nix b/pkgs/development/python-modules/pyannote-audio/default.nix index 80998ea1f1d7..9e239ec88fdc 100644 --- a/pkgs/development/python-modules/pyannote-audio/default.nix +++ b/pkgs/development/python-modules/pyannote-audio/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pname = "pyannote-audio"; - version = "3.3.1"; + version = "3.3.2"; pyproject = true; disabled = pythonOlder "3.9"; @@ -40,7 +40,7 @@ buildPythonPackage rec { owner = "pyannote"; repo = "pyannote-audio"; tag = version; - hash = "sha256-85whRoc3JoDSE4DqivY/3hfvLHcvgsubR/DLCPtLEP0="; + hash = "sha256-Qx7NDXkT3eQr9PZXlYuoJD01dzsVCvfq6HNPnyLzyAQ="; fetchSubmodules = true; }; diff --git a/pkgs/development/python-modules/pyheos/default.nix b/pkgs/development/python-modules/pyheos/default.nix index 3f71351530e4..33f4de33833a 100644 --- a/pkgs/development/python-modules/pyheos/default.nix +++ b/pkgs/development/python-modules/pyheos/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pyheos"; - version = "1.0.1"; + version = "1.0.2"; pyproject = true; src = fetchFromGitHub { owner = "andrewsayre"; repo = "pyheos"; - tag = version; - hash = "sha256-2hrWK3nRFnRtv4dfXXELOxKwttG9Oo2I2+eSXcfgUi8="; + tag = "1.02"; # TODO: https://github.com/andrewsayre/pyheos/issues/104 + hash = "sha256-1JybtE5wweuIgZ8eFUX9XYPji7FzxbRFPKy75Fp1nw0="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pyobjc-core/default.nix b/pkgs/development/python-modules/pyobjc-core/default.nix new file mode 100644 index 000000000000..5dd7959940ca --- /dev/null +++ b/pkgs/development/python-modules/pyobjc-core/default.nix @@ -0,0 +1,61 @@ +{ + buildPythonPackage, + darwin, + fetchFromGitHub, + lib, + setuptools, +}: + +buildPythonPackage rec { + pname = "pyobjc-core"; + version = "11.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "ronaldoussoren"; + repo = "pyobjc"; + tag = "v${version}"; + hash = "sha256-RhB0Ht6vyDxYwDGS+A9HZL9ySIjWlhdB4S+gHxvQQBg="; + }; + + sourceRoot = "source/pyobjc-core"; + + build-system = [ setuptools ]; + + buildInputs = [ + darwin.DarwinTools + darwin.libffi + ]; + + nativeBuildInputs = [ + darwin.DarwinTools # sw_vers + ]; + + # See https://github.com/ronaldoussoren/pyobjc/pull/641. Unfortunately, we + # cannot just pull that diff with fetchpatch due to https://discourse.nixos.org/t/how-to-apply-patches-with-sourceroot/59727. + postPatch = '' + for file in Modules/objc/test/*.m; do + substituteInPlace "$file" --replace "[[clang::suppress]]" "" + done + + substituteInPlace setup.py \ + --replace-fail "-buildversion" "-buildVersion" \ + --replace-fail "-productversion" "-productVersion" + ''; + + env.NIX_CFLAGS_COMPILE = toString [ + "-I${darwin.libffi.dev}/include" + "-Wno-error=cast-function-type-mismatch" + "-Wno-error=unused-command-line-argument" + ]; + + pythonImportsCheck = [ "objc" ]; + + meta = with lib; { + description = "Python <-> Objective-C bridge"; + homepage = "https://github.com/ronaldoussoren/pyobjc"; + license = licenses.mit; + platforms = platforms.darwin; + maintainers = with maintainers; [ samuela ]; + }; +} diff --git a/pkgs/development/python-modules/pyobjc-framework-Cocoa/default.nix b/pkgs/development/python-modules/pyobjc-framework-Cocoa/default.nix new file mode 100644 index 000000000000..004757337266 --- /dev/null +++ b/pkgs/development/python-modules/pyobjc-framework-Cocoa/default.nix @@ -0,0 +1,59 @@ +{ + buildPythonPackage, + darwin, + fetchFromGitHub, + lib, + pyobjc-core, + setuptools, +}: + +buildPythonPackage rec { + pname = "pyobjc-framework-Cocoa"; + version = "11.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "ronaldoussoren"; + repo = "pyobjc"; + tag = "v${version}"; + hash = "sha256-RhB0Ht6vyDxYwDGS+A9HZL9ySIjWlhdB4S+gHxvQQBg="; + }; + + sourceRoot = "source/pyobjc-framework-Cocoa"; + + build-system = [ setuptools ]; + + buildInputs = [ + darwin.libffi + darwin.DarwinTools + ]; + + nativeBuildInputs = [ + darwin.DarwinTools # sw_vers + ]; + + # See https://github.com/ronaldoussoren/pyobjc/pull/641. Unfortunately, we + # cannot just pull that diff with fetchpatch due to https://discourse.nixos.org/t/how-to-apply-patches-with-sourceroot/59727. + postPatch = '' + substituteInPlace pyobjc_setup.py \ + --replace-fail "-buildversion" "-buildVersion" \ + --replace-fail "-productversion" "-productVersion" + ''; + + dependencies = [ pyobjc-core ]; + + env.NIX_CFLAGS_COMPILE = toString [ + "-I${darwin.libffi.dev}/include" + "-Wno-error=unused-command-line-argument" + ]; + + pythonImportsCheck = [ "Cocoa" ]; + + meta = with lib; { + description = "PyObjC wrappers for the Cocoa frameworks on macOS"; + homepage = "https://github.com/ronaldoussoren/pyobjc"; + license = licenses.mit; + platforms = platforms.darwin; + maintainers = with maintainers; [ samuela ]; + }; +} diff --git a/pkgs/development/python-modules/pyproject-parser/default.nix b/pkgs/development/python-modules/pyproject-parser/default.nix index a3b6ca4b0319..4e8b54aa045a 100644 --- a/pkgs/development/python-modules/pyproject-parser/default.nix +++ b/pkgs/development/python-modules/pyproject-parser/default.nix @@ -5,10 +5,15 @@ setuptools, apeye-core, attrs, + click, + consolekit, + docutils, dom-toml, domdf-python-tools, natsort, packaging, + readme-renderer, + sdjson, shippinglabel, typing-extensions, }: @@ -34,6 +39,20 @@ buildPythonPackage rec { shippinglabel typing-extensions ]; + + optional-dependencies = { + all = lib.flatten (lib.attrValues (lib.filterAttrs (n: v: n != "all") optional-dependencies)); + cli = [ + click + consolekit + sdjson + ]; + readme = [ + docutils + readme-renderer + ] ++ readme-renderer.optional-dependencies.md; + }; + postPatch = '' substituteInPlace pyproject.toml \ --replace-fail '"setuptools!=61.*,<=67.1.0,>=40.6.0"' '"setuptools"' diff --git a/pkgs/development/python-modules/python-google-drive-api/default.nix b/pkgs/development/python-modules/python-google-drive-api/default.nix index 1cb239fb79ba..2bc002671006 100644 --- a/pkgs/development/python-modules/python-google-drive-api/default.nix +++ b/pkgs/development/python-modules/python-google-drive-api/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "python-google-drive-api"; - version = "0.0.2"; + version = "0.1.0"; pyproject = true; src = fetchFromGitHub { owner = "tronikos"; repo = "python-google-drive-api"; tag = "v${version}"; - hash = "sha256-JvPaMD7UHDqCQCoh1Q8jNFw4R7Jbp2YQDBI3xVp1L1g="; + hash = "sha256-3es2rmndahH+DMEEwjBxyZKd27qDZIocPbzScF7B5fA="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/resampy/default.nix b/pkgs/development/python-modules/resampy/default.nix index 7a4c3cf0dacd..f6ac5014be4a 100644 --- a/pkgs/development/python-modules/resampy/default.nix +++ b/pkgs/development/python-modules/resampy/default.nix @@ -1,19 +1,22 @@ { lib, + stdenv, buildPythonPackage, - cython, fetchFromGitHub, numba, numpy, + optuna, + pytest-cov-stub, pytestCheckHook, pythonOlder, + setuptools, scipy, }: buildPythonPackage rec { pname = "resampy"; version = "0.4.3"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -24,21 +27,26 @@ buildPythonPackage rec { hash = "sha256-LOWpOPAEK+ga7c3bR15QvnHmON6ARS1Qee/7U/VMlTY="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ numpy - cython numba ]; + optional-dependencies.design = [ optuna ]; + nativeCheckInputs = [ + pytest-cov-stub pytestCheckHook scipy - ]; + ] ++ optional-dependencies.design; - postPatch = '' - substituteInPlace setup.cfg \ - --replace " --cov-report term-missing --cov resampy --cov-report=xml" "" - ''; + disabledTests = lib.optionals (stdenv.hostPlatform.system == "aarch64-linux") [ + # crashing the interpreter + "test_quality_sine_parallel" + "test_resample_nu_quality_sine_parallel" + ]; pythonImportsCheck = [ "resampy" ]; diff --git a/pkgs/development/python-modules/rumps/default.nix b/pkgs/development/python-modules/rumps/default.nix new file mode 100644 index 000000000000..1fb1729de358 --- /dev/null +++ b/pkgs/development/python-modules/rumps/default.nix @@ -0,0 +1,33 @@ +{ + buildPythonPackage, + fetchFromGitHub, + lib, + pyobjc-framework-Cocoa, + setuptools, +}: + +buildPythonPackage rec { + pname = "rumps"; + version = "unstable-2025-02-02"; + pyproject = true; + + src = fetchFromGitHub { + owner = "jaredks"; + repo = "rumps"; + rev = "8730e7cff5768dfabecff478c0d5e3688862c1c6"; + hash = "sha256-oNJBpRaCGyOKCgBueRx4YhpNW1OnbIEWEEvlGfyoxUA="; + }; + + build-system = [ setuptools ]; + dependencies = [ pyobjc-framework-Cocoa ]; + + pythonImportsCheck = [ "rumps" ]; + + meta = with lib; { + description = "Ridiculously Uncomplicated macOS Python Statusbar apps"; + homepage = "https://github.com/jaredks/rumps"; + license = licenses.bsd2; + platforms = platforms.darwin; + maintainers = with maintainers; [ samuela ]; + }; +} diff --git a/pkgs/development/python-modules/sdjson/default.nix b/pkgs/development/python-modules/sdjson/default.nix new file mode 100644 index 000000000000..9df8b10dc5c1 --- /dev/null +++ b/pkgs/development/python-modules/sdjson/default.nix @@ -0,0 +1,40 @@ +{ + buildPythonPackage, + domdf-python-tools, + fetchFromGitHub, + lib, + typing-extensions, + whey, +}: + +buildPythonPackage rec { + pname = "sdjson"; + version = "0.5.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "domdfcoding"; + repo = "singledispatch-json"; + tag = "v${version}"; + hash = "sha256-7qwmPhij2X2GLtjeaoMCoOyT0qzYt9oFccWrQOq6LXw="; + }; + + build-system = [ whey ]; + + dependencies = [ + domdf-python-tools + typing-extensions + ]; + + pythonImportsCheck = [ "sdjson" ]; + + # missing dependency coincidence + doCheck = false; + + meta = { + description = "Custom JSON Encoder for Python utilising functools.singledispatch"; + homepage = "https://github.com/domdfcoding/singledispatch-json"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/stytra/default.nix b/pkgs/development/python-modules/stytra/default.nix index 5af44d463921..21520a78aaa7 100644 --- a/pkgs/development/python-modules/stytra/default.nix +++ b/pkgs/development/python-modules/stytra/default.nix @@ -27,6 +27,7 @@ qimage2ndarray, scikit-image, scipy, + setuptools, tables, }: @@ -46,7 +47,9 @@ buildPythonPackage rec { ./0000-workaround-pyqtgraph.patch ]; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ opencv4 pyqt5 pyqtgraph diff --git a/pkgs/development/python-modules/synergy/default.nix b/pkgs/development/python-modules/synergy/default.nix index 8d958862b675..2a60f4b23e5c 100644 --- a/pkgs/development/python-modules/synergy/default.nix +++ b/pkgs/development/python-modules/synergy/default.nix @@ -1,31 +1,36 @@ { lib, + stdenv, buildPythonPackage, fetchFromGitHub, - pytestCheckHook, pythonOlder, + setuptools, numpy, scipy, matplotlib, plotly, pandas, + hypothesis, + pytestCheckHook, }: buildPythonPackage rec { pname = "synergy"; version = "1.0.0"; - format = "setuptools"; + pyproject = true; + disabled = pythonOlder "3.5"; - # Pypi does not contain unit tests src = fetchFromGitHub { owner = "djwooten"; repo = "synergy"; tag = "v${version}"; - sha256 = "sha256-df5CBEcRx55/rSMc6ygMVrHbbEcnU1ISJheO+WoBSCI="; + hash = "sha256-df5CBEcRx55/rSMc6ygMVrHbbEcnU1ISJheO+WoBSCI="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ numpy scipy matplotlib @@ -33,7 +38,25 @@ buildPythonPackage rec { pandas ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + hypothesis + pytestCheckHook + ]; + + disabledTests = + [ + # flaky: hypothesis.errors.FailedHealthCheck + "test_asymptotic_limits" + "test_inverse" + # AssertionError: synthetic_BRAID_reference_1.csv + # E3=0 not in (0.10639582639915163, 1.6900177333904622) + "test_BRAID_fit_bootstrap" + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # AssertionError: np.False_ is not true + "test_fit_loewe_antagonism" + ]; + pythonImportsCheck = [ "synergy" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/torcheval/default.nix b/pkgs/development/python-modules/torcheval/default.nix new file mode 100644 index 000000000000..0e696603fdae --- /dev/null +++ b/pkgs/development/python-modules/torcheval/default.nix @@ -0,0 +1,113 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + setuptools, + + # dependencies + typing-extensions, + + # tests + cython, + numpy, + pytest-timeout, + pytest-xdist, + pytestCheckHook, + scikit-image, + scikit-learn, + torchtnt-nightly, + torchvision, +}: +let + pname = "torcheval"; + version = "0.0.7"; +in +buildPythonPackage { + inherit pname version; + pyproject = true; + + src = fetchFromGitHub { + owner = "pytorch"; + repo = "torcheval"; + # Upstream has not created a tag for this version + # https://github.com/pytorch/torcheval/issues/215 + rev = "f1bc22fc67ec2c77ee519aa4af8079f4fdaa41bb"; + hash = "sha256-aVr4qKKE+dpBcJEi1qZJBljFLUl8d7D306Dy8uOojJE="; + }; + + # Patches are only applied to usages of numpy within tests, + # which are only used for testing purposes (see dev-requirements.txt) + postPatch = + # numpy's `np.NAN` was changed to `np.nan` when numpy 2 was released + '' + substituteInPlace tests/metrics/classification/test_accuracy.py tests/metrics/functional/classification/test_accuracy.py \ + --replace-fail "np.NAN" "np.nan" + '' + + # `unittest.TestCase.assertEquals` does not exist; + # the correct symbol is `unittest.TestCase.assertEqual` + + '' + substituteInPlace tests/metrics/test_synclib.py \ + --replace-fail "tc.assertEquals" "tc.assertEqual" + ''; + + build-system = [ setuptools ]; + + dependencies = [ typing-extensions ]; + + pythonImportsCheck = [ "torcheval" ]; + + nativeCheckInputs = [ + cython + numpy + pytest-timeout + pytest-xdist + pytestCheckHook + scikit-image + scikit-learn + torchtnt-nightly + torchvision + ]; + + pytestFlagsArray = [ + "-v" + "tests/" + + # -- tests/metrics/audio/test_fad.py -- + # Touch filesystem and require network access. + # torchaudio.utils.download_asset("models/vggish.pt") -> PermissionError: [Errno 13] Permission denied: '/homeless-shelter' + "--deselect=tests/metrics/audio/test_fad.py::TestFAD::test_vggish_fad" + "--deselect=tests/metrics/audio/test_fad.py::TestFAD::test_vggish_fad_merge" + + # -- tests/metrics/image/test_fid.py -- + # Touch filesystem and require network access. + # models.inception_v3(weights=weights) -> PermissionError: [Errno 13] Permission denied: '/homeless-shelter' + "--deselect=tests/metrics/image/test_fid.py::TestFrechetInceptionDistance::test_fid_invalid_input" + "--deselect=tests/metrics/image/test_fid.py::TestFrechetInceptionDistance::test_fid_random_data_custom_model" + "--deselect=tests/metrics/image/test_fid.py::TestFrechetInceptionDistance::test_fid_random_data_default_model" + "--deselect=tests/metrics/image/test_fid.py::TestFrechetInceptionDistance::test_fid_with_dissimilar_inputs" + "--deselect=tests/metrics/image/test_fid.py::TestFrechetInceptionDistance::test_fid_with_similar_inputs" + + # -- tests/metrics/functional/text/test_perplexity.py -- + # AssertionError: Scalars are not close! + # Expected 3.537154912949 but got 3.53715443611145 + "--deselect=tests/metrics/functional/text/test_perplexity.py::Perplexity::test_perplexity_with_ignore_index" + + # -- tests/metrics/image/test_psnr.py -- + # AssertionError: Scalars are not close! + # Expected 7.781850814819336 but got 7.781772613525391 + "--deselect=tests/metrics/image/test_psnr.py::TestPeakSignalNoiseRatio::test_psnr_with_random_data" + ]; + + meta = { + description = "Rich collection of performant PyTorch model metrics and tools for PyTorch model evaluations"; + homepage = "https://pytorch.org/torcheval"; + changelog = "https://github.com/pytorch/torcheval/releases/tag/${version}"; + + platforms = lib.platforms.linux; + license = with lib.licenses; [ bsd3 ]; + maintainers = with lib.maintainers; [ bengsparks ]; + }; +} diff --git a/pkgs/development/python-modules/truststore/default.nix b/pkgs/development/python-modules/truststore/default.nix index b43bc451b071..ca3a254d3d37 100644 --- a/pkgs/development/python-modules/truststore/default.nix +++ b/pkgs/development/python-modules/truststore/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "truststore"; - version = "0.10.0"; + version = "0.10.1"; pyproject = true; disabled = pythonOlder "3.10"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "sethmlarson"; repo = "truststore"; tag = "v${version}"; - hash = "sha256-SzCeuc/tIOearYAXCK7s/Q99fK0JvJc1rSbsiE7m6+k="; + hash = "sha256-oVFNR8qxEmCZdTGqzb9Gj3XIUwPy6YWV3YJPkIDA8Cw="; }; build-system = [ flit-core ]; diff --git a/pkgs/development/tools/kustomize/kustomize-sops.nix b/pkgs/development/tools/kustomize/kustomize-sops.nix index 704754d945a2..9db6c4d19ccf 100644 --- a/pkgs/development/tools/kustomize/kustomize-sops.nix +++ b/pkgs/development/tools/kustomize/kustomize-sops.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "kustomize-sops"; - version = "4.3.2"; + version = "4.3.3"; src = fetchFromGitHub { owner = "viaduct-ai"; repo = pname; rev = "v${version}"; - hash = "sha256-FSRjPXS4Dk5oH8EO7TW6iHdGNvVhaQ7gZJ+qROXUU3U="; + hash = "sha256-qIYV0wDzBRPt6s6d2dL4FobBSMlmVm+Z0ogig3r0Q/c="; }; - vendorHash = "sha256-1qnNJltam04uLMhH8YftAl2jjEZP2UhVIMp9Vcy3jeg="; + vendorHash = "sha256-UyDW4WgDgEygMxrxbCATxlPk9KAuc9lO/ldSFyydZUA="; installPhase = '' mkdir -p $out/lib/viaduct.ai/v1/ksops/ diff --git a/pkgs/development/tools/rust/cargo-zigbuild/default.nix b/pkgs/development/tools/rust/cargo-zigbuild/default.nix index 4ba9eb792e98..c8147819969d 100644 --- a/pkgs/development/tools/rust/cargo-zigbuild/default.nix +++ b/pkgs/development/tools/rust/cargo-zigbuild/default.nix @@ -2,17 +2,17 @@ rustPlatform.buildRustPackage rec { pname = "cargo-zigbuild"; - version = "0.19.7"; + version = "0.19.8"; src = fetchFromGitHub { owner = "messense"; repo = pname; rev = "v${version}"; - hash = "sha256-kuzKW7ol4ZdxIhfAdvAKRb8fgwaU2LTO43dxrpke1Ow="; + hash = "sha256-S/Xx487z8LFjCSrB9tQTJy4+AQial2Dptg5xZqzPkVE="; }; useFetchCargoVendor = true; - cargoHash = "sha256-WsX1noIRlMRzNqJUxR55CxdTCxJ+DVddVRIbkLtWK1Q="; + cargoHash = "sha256-L9SoaXGzYHY6vOWESvovHNzSehOWD4RGAC/3K6qT6Ks="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/web/nodejs/v20.nix b/pkgs/development/web/nodejs/v20.nix index 8cc82cea4e40..d0679570f048 100644 --- a/pkgs/development/web/nodejs/v20.nix +++ b/pkgs/development/web/nodejs/v20.nix @@ -18,8 +18,8 @@ let in buildNodejs { inherit enableNpm; - version = "20.18.2"; - sha256 = "69bf81b70f3a95ae0763459f02860c282d7e3a47567c8afaf126cc778176a882"; + version = "20.18.3"; + sha256 = "0674f16f3bc284c11724cd3f7c2a43f7c2c13d2eb7a872dd0db198f3d588c5f2"; patches = [ ./configure-emulator.patch ./configure-armv6-vfpv2.patch @@ -35,16 +35,6 @@ buildNodejs { stripLen = 1; hash = "sha256-WVxsoEcJu0WBTyelNrVQFTZxJhnekQb1GrueeRBRdnY="; }) - # Fix for https://github.com/NixOS/nixpkgs/issues/355919 - # FIXME: remove after a minor point release - (fetchpatch2 { - url = "https://github.com/nodejs/node/commit/a094a8166cd772f89e92b5deef168e5e599fa815.patch?full_index=1"; - hash = "sha256-5FZfozYWRa1ZI/f+e+xpdn974Jg2DbiHbua13XUQP5E="; - }) - (fetchpatch2 { - url = "https://github.com/nodejs/node/commit/f270462c09ddfd770291a7c8a2cd204b2c63d730.patch?full_index=1"; - hash = "sha256-Err0i5g7WtXcnhykKgrS3ocX7/3oV9UrT0SNeRtMZNU="; - }) # Backport V8 fixes for LLVM 19. (fetchpatch2 { url = "https://chromium.googlesource.com/v8/v8/+/182d9c05e78b1ddb1cb8242cd3628a7855a0336f%5E%21/?format=TEXT"; @@ -60,10 +50,5 @@ buildNodejs { stripLen = 1; hash = "sha256-6y3aEqxNC4iTQEv1oewodJrhOHxjp5xZMq1P1QL94Rg="; }) - # fixes test failure, remove when included in release - (fetchpatch2 { - url = "https://github.com/nodejs/node/commit/b6fe731c55eb4cb9d14042a23e5002ed39b7c8b7.patch?full_index=1"; - hash = "sha256-KoKsQBFKUji0GeEPTR8ixBflCiHBhPqd2cPVPuKyua8="; - }) ] ++ gypPatches; } diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index ff0cca567b1f..85b12d7e2ac3 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2025.2.1"; + version = "2025.2.2"; components = { "3_day_blinds" = ps: with ps; [ diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 05c8a4f89acb..31a3ff97d0a4 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -369,7 +369,7 @@ let extraBuildInputs = extraPackages python.pkgs; # Don't forget to run update-component-packages.py after updating - hassVersion = "2025.2.1"; + hassVersion = "2025.2.2"; in python.pkgs.buildPythonApplication rec { @@ -390,13 +390,13 @@ python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = "refs/tags/${version}"; - hash = "sha256-iWOrBIKsN+fi5pzMzekmTBIk2FoM2HOsWujkuZ45lHE="; + hash = "sha256-aCGfxWJnDJ4V5FjrFV3TLHBtPQDyNh1qjDKFL/bHBz0="; }; # Secondary source is pypi sdist for translations sdist = fetchPypi { inherit pname version; - hash = "sha256-GToOHfDOWrjiQEcxgX9h2tCYqGUv3mXxVh1/GchiNRU="; + hash = "sha256-9bdkcDMTQtaRlyLK65fwVDlV4s1GpxqbTYDNxstST4w="; }; build-system = with python.pkgs; [ diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index 79914ed854f3..b9a0224adc46 100644 --- a/pkgs/servers/home-assistant/frontend.nix +++ b/pkgs/servers/home-assistant/frontend.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { # the frontend version corresponding to a specific home-assistant version can be found here # https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json pname = "home-assistant-frontend"; - version = "20250205.0"; + version = "20250210.0"; format = "wheel"; src = fetchPypi { @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "home_assistant_frontend"; dist = "py3"; python = "py3"; - hash = "sha256-9P2OqnPNPydBi4k9iN0hSyGTyBW4PohdgJwQqa8MlYg="; + hash = "sha256-Pm9lnD+3ywHtLWPbuIm7brWzY+804+V84pH6g561LAU="; }; # there is nothing to strip in this package diff --git a/pkgs/servers/http/nginx/generic.nix b/pkgs/servers/http/nginx/generic.nix index 3c0e87ab6c76..6563f5c1e159 100644 --- a/pkgs/servers/http/nginx/generic.nix +++ b/pkgs/servers/http/nginx/generic.nix @@ -170,6 +170,9 @@ stdenv.mkDerivation { [ "--with-http_geoip_module" ] ++ lib.optional withStream "--with-stream_geoip_module" ) ++ lib.optional (with stdenv.hostPlatform; isLinux || isFreeBSD) "--with-file-aio" + ++ lib.optional ( + stdenv.buildPlatform != stdenv.hostPlatform + ) "--crossbuild=${stdenv.hostPlatform.uname.system}::${stdenv.hostPlatform.uname.processor}" ++ configureFlags ++ map (mod: "--add-module=${mod.src}") modules; diff --git a/pkgs/servers/monitoring/grafana/plugins/plugins.nix b/pkgs/servers/monitoring/grafana/plugins/plugins.nix index 0a14dfab1559..2a18348cd68a 100644 --- a/pkgs/servers/monitoring/grafana/plugins/plugins.nix +++ b/pkgs/servers/monitoring/grafana/plugins/plugins.nix @@ -28,6 +28,7 @@ redis-datasource = callPackage ./redis-datasource { }; redis-explorer-app = callPackage ./redis-explorer-app { }; ventura-psychrometric-panel = callPackage ./ventura-psychrometric-panel { }; + victoriametrics-logs-datasource = callPackage ./victoriametrics-logs-datasource { }; volkovlabs-echarts-panel = callPackage ./volkovlabs-echarts-panel { }; volkovlabs-form-panel = callPackage ./volkovlabs-form-panel { }; volkovlabs-rss-datasource = callPackage ./volkovlabs-rss-datasource { }; diff --git a/pkgs/servers/monitoring/grafana/plugins/victoriametrics-logs-datasource/default.nix b/pkgs/servers/monitoring/grafana/plugins/victoriametrics-logs-datasource/default.nix new file mode 100644 index 000000000000..1bd5ea435b21 --- /dev/null +++ b/pkgs/servers/monitoring/grafana/plugins/victoriametrics-logs-datasource/default.nix @@ -0,0 +1,13 @@ +{ grafanaPlugin, lib }: + +grafanaPlugin { + pname = "victoriametrics-logs-datasource"; + version = "0.14.3"; + zipHash = "sha256-g/ntmNyWJ9h/eYpZ0gqiESvVfm2fU6/Ci8R7FHIV7AQ="; + meta = { + description = "Grafana datasource for VictoriaLogs"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ samw ]; + platforms = lib.platforms.unix; + }; +} diff --git a/pkgs/tools/admin/pulumi-bin/data.nix b/pkgs/tools/admin/pulumi-bin/data.nix index ad564a240eaf..b796b0befec8 100644 --- a/pkgs/tools/admin/pulumi-bin/data.nix +++ b/pkgs/tools/admin/pulumi-bin/data.nix @@ -1,12 +1,12 @@ # DO NOT EDIT! This file is generated automatically by update.sh { }: { - version = "3.148.0"; + version = "3.149.0"; pulumiPkgs = { x86_64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.148.0-linux-x64.tar.gz"; - sha256 = "1wjg4cilg3ycd95ajzsxdyaldz50paczbifar4xwnha6knsgd3j1"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.149.0-linux-x64.tar.gz"; + sha256 = "01q8q78q4f5d3nrv419lwsjrcvb1rbpjb2khwnrnijy808jgm5pz"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.33.0-linux-amd64.tar.gz"; @@ -25,12 +25,12 @@ sha256 = "105qpgq5kc1v82jks5v64i1jx9mw8spmj59dg74sil58lik5wpl8"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.13.0-linux-amd64.tar.gz"; - sha256 = "047hxl4wnqi4w3mv2cadpmwl0p1y6z3dn8hmlxrwlg4lghqp7wsw"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.14.0-linux-amd64.tar.gz"; + sha256 = "06kazf5r3r3cdr2cxk2afj1wjmjj0kda038j9vdpfirzpjyy47l3"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.67.0-linux-amd64.tar.gz"; - sha256 = "072f3jlbdlvygbk5yzrjqxib0dr3gn779yi1ny64h63v9kzym3w8"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.68.0-linux-amd64.tar.gz"; + sha256 = "0zg8vfqs8m87j6sp3hybzzx8ji6v3v404q5gpmfjrylfs7a4zw8w"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.2.0-linux-amd64.tar.gz"; @@ -41,8 +41,8 @@ sha256 = "0h3zym30gj8lyj294zj3dimdl2wdir2vmymvv6wr392f9i22m2yn"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.17.0-linux-amd64.tar.gz"; - sha256 = "1xrbkml34hdz5jv1df6ljk3ikgrpqw3xc6cpywy1z8sk19hrzq0c"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.18.0-linux-amd64.tar.gz"; + sha256 = "1brri4avf40fsa4374xil103mw9xm9s7vlcg6b44p9m3a9pczm5s"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.49.0-linux-amd64.tar.gz"; @@ -53,8 +53,8 @@ sha256 = "0fq1zzbr119zq8minj7rqw5y6552zqqf1lcgy0c059bvd633fxdq"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.42.0-linux-amd64.tar.gz"; - sha256 = "0qvpbgs7pvx15h9zh4jw2l87qzpya5w0ydkvd1mg1k76cxsjl9c2"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.43.0-linux-amd64.tar.gz"; + sha256 = "0dbvr0r7plvrh5yp03rsnjhhmnw7dl70pg29l216v4iz2ymrc5zk"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.39.1-linux-amd64.tar.gz"; @@ -69,12 +69,12 @@ sha256 = "0hnardid0kbzy65dmn7vz8ddy5hq78nf2871zz6srf2hfyiv7qa4"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v8.13.1-linux-amd64.tar.gz"; - sha256 = "0kk8c2a20ckvgx1afh6n7sm9z5cb3r6gs2c23yaq61yd6bkwklx5"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v8.14.0-linux-amd64.tar.gz"; + sha256 = "191j823pngyicvgvkjfik9n0nsws2zsqqzykzsad74w59i9cr90c"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v8.16.0-linux-amd64.tar.gz"; - sha256 = "109chpv3s7cbwk5ga9n982kn1nzrrvd222h9w5j242pdhbw4pc31"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v8.18.0-linux-amd64.tar.gz"; + sha256 = "08irlwbwy3c41rl90i85a50d3xy4ygsv4bswh3xwd9jdc32rs6xh"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.6.0-linux-amd64.tar.gz"; @@ -121,16 +121,16 @@ sha256 = "1pgyrrlx1skl137qsx944n3f6scj10vpslfa6fdqg3zcdn2191np"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v1.1.1-linux-amd64.tar.gz"; - sha256 = "19sb2ik7zsc0n9hrwiwi0dm1r3wkfa38isnc2f7sim1gjvvaha3k"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v1.1.2-linux-amd64.tar.gz"; + sha256 = "147dmg9gv8b3pifmqwjz9skvidryb8wkayvghdd6pziyqncbqwzb"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.109.0-linux-amd64.tar.gz"; - sha256 = "19bm0bx81dvjihv3z25la6f0aq9zb5z5pjvkhwhwjjr3rlrkk20v"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.110.0-linux-amd64.tar.gz"; + sha256 = "124pag54vhis0j0b5f35h95ljs5xh2mbq85933vadmzsds7lb884"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v1.0.2-linux-amd64.tar.gz"; - sha256 = "1n1fvkp7ls6qhc0p0sxl0kdva6v5qsw4df72wbhgmp25pclcxgbj"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v1.0.4-linux-amd64.tar.gz"; + sha256 = "0z0wggfg9s0x8wlvymsl030bby4id5rjhb3na0rmsjg3fjh71bsf"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.17.5-linux-amd64.tar.gz"; @@ -149,8 +149,8 @@ sha256 = "13v3vz76skral2lhv7ph9yb6im8zsiavis6qss6jzx8pdw8gq6a4"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.13.0-linux-amd64.tar.gz"; - sha256 = "17v9215sr41rvf1cpgndzd58aqk4llizxshkg9kdpj2p47pj57ix"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.13.1-linux-amd64.tar.gz"; + sha256 = "0h5pca5kgyjwdj9m8fd0wmygxhvjm6r5wss00wprad383mwp3s7v"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.1.7-linux-amd64.tar.gz"; @@ -163,8 +163,8 @@ ]; x86_64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.148.0-darwin-x64.tar.gz"; - sha256 = "1f2i3pvmbmm3aga7am4m2lmrhnacmiw5g5815m0bdp5ighagi6xm"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.149.0-darwin-x64.tar.gz"; + sha256 = "17j0ilhqx08avrllkf72lfrzzhrv6k551a1vdag5xvkcsakcy9ik"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.33.0-darwin-amd64.tar.gz"; @@ -183,12 +183,12 @@ sha256 = "0gpk3imvizrxsp1j6w17dvzzgpk05i979159l0wlgg9vc0xkbf2q"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.13.0-darwin-amd64.tar.gz"; - sha256 = "19ri539aify37qn35wlfr24171r151cnmmz88jgv3amb1fzb32f2"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.14.0-darwin-amd64.tar.gz"; + sha256 = "1yclkdpmm8y92wbyhb87h3vdhcibhcvfppv1nvwhqd3bbx3zk1rb"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.67.0-darwin-amd64.tar.gz"; - sha256 = "0vm0pifcajwbrawmz84snv514w4j8qrxvyv9i356hizk459c6y3s"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.68.0-darwin-amd64.tar.gz"; + sha256 = "1ck9377yshn8742k1757xmx2wkpybfdpbfq86nz7i83xnm67vwg4"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.2.0-darwin-amd64.tar.gz"; @@ -199,8 +199,8 @@ sha256 = "1j952sjqhp42a1s8fxn5li8mjfvl9as3ydhwdpslx8pzc8ykr2zj"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.17.0-darwin-amd64.tar.gz"; - sha256 = "0rcdhz4ap6h9yry1ma7ay7ak7ws01d50rb719phgrm1wd0ybw4vs"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.18.0-darwin-amd64.tar.gz"; + sha256 = "0m7h5dgwh2bz14lmncxaa7n97vgrp0fy65ll5q8jjw49s5a7jrnh"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.49.0-darwin-amd64.tar.gz"; @@ -211,8 +211,8 @@ sha256 = "15ym540lhzwi5k2nplcsxgf1yxxndiznmjda38wwky9hxxvgc260"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.42.0-darwin-amd64.tar.gz"; - sha256 = "1b2smzqxvrjxwpgr2wlhplgqj5n4yf7mbi52y1sc0cg0i70p01kf"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.43.0-darwin-amd64.tar.gz"; + sha256 = "16jmnc1mnxb652agd08qaqdzfqgnqd6al3wrvmac07gd4frq719k"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.39.1-darwin-amd64.tar.gz"; @@ -227,12 +227,12 @@ sha256 = "1m5lh59h7nck1flzxs9m4n0ag0klk3jmnpf7hc509vffxs89xnjq"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v8.13.1-darwin-amd64.tar.gz"; - sha256 = "1gk5i030y4jsdzsj8nl90xf0403mlkq1lhc8nqw9a8iyc6m60g3w"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v8.14.0-darwin-amd64.tar.gz"; + sha256 = "0qqzfdibgwzgnv79as3l6k8hh4nviq2i0xsgzsvjkklzf2szyh8k"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v8.16.0-darwin-amd64.tar.gz"; - sha256 = "1iaaiv58m6s45xhjdrzcnvw51wm92dknnl9sk3f0hq58bvapq9xy"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v8.18.0-darwin-amd64.tar.gz"; + sha256 = "001s7nrmhsbrz49ilphr5882mk7lqq4w6qdfi2i24jjcbbij8v9w"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.6.0-darwin-amd64.tar.gz"; @@ -279,16 +279,16 @@ sha256 = "179lqrf9ma51ghr1jl5pzg0jpc217qazrj3wdbf702qghacl0xaq"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v1.1.1-darwin-amd64.tar.gz"; - sha256 = "04v54852bwm54jiprkgpfkby5bxckw7rg09pqf8fw929hc59sw3g"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v1.1.2-darwin-amd64.tar.gz"; + sha256 = "02mq6mnjbfkhwfm9fsgixw8imnxyrgl3zjh2v7z6la0qn888k9yi"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.109.0-darwin-amd64.tar.gz"; - sha256 = "1j16ny68wb0ljqzl0q62dzf8l4knszl08v3a58ja4m10mhlq9ilf"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.110.0-darwin-amd64.tar.gz"; + sha256 = "17m6h1ign1b8rymidjk2lg0p43y0yzcgd8fvbjfmmxy6p4pcdjz4"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v1.0.2-darwin-amd64.tar.gz"; - sha256 = "1zpy7wvyjjxr41jg02n4py7zc5xppxd5pms91cf1xpdw5n0hpfdl"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v1.0.4-darwin-amd64.tar.gz"; + sha256 = "1rc717psnir7hpl9az29z232zgkp2dnzfjsph6v3lm44qd0yw9dq"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.17.5-darwin-amd64.tar.gz"; @@ -307,8 +307,8 @@ sha256 = "1w3wqx96qv0m7n0grr5sr4qdwrj56cghl3rg2hg75cx5yj00677y"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.13.0-darwin-amd64.tar.gz"; - sha256 = "1rdfxp2zlb6b8z6pzhkiph3fbndyrlp6i6ga9im61wggn6gqcp7a"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.13.1-darwin-amd64.tar.gz"; + sha256 = "1risgn050qs9yb0r7wx9z1xfw4ai50b5f6fzqchmaw4wpqj83j4h"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.1.7-darwin-amd64.tar.gz"; @@ -321,8 +321,8 @@ ]; aarch64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.148.0-linux-arm64.tar.gz"; - sha256 = "1jwxrdwp8vrg4rm3jfymzaqdi861pybx28z5ss0qb034dqi6sqmy"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.149.0-linux-arm64.tar.gz"; + sha256 = "09yvl92bxdnz1796rsqjw0dxkw84s4c0gv69acd358wc1lv6ff2m"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.33.0-linux-arm64.tar.gz"; @@ -341,12 +341,12 @@ sha256 = "1jbgwycdpixvz6cc8vm66akim9d2mlmbb7h241n3mjvdndhsjkab"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.13.0-linux-arm64.tar.gz"; - sha256 = "14z0zmmbcl0mxj599bffccyp7vb32sq4knx7mvzyx9qgisjip5hi"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.14.0-linux-arm64.tar.gz"; + sha256 = "0xpfjwdhapyfc1562pxbvgmcmljvvsxdiymrwvcfhn08sdgpmas2"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.67.0-linux-arm64.tar.gz"; - sha256 = "1hlr7adfarpay74iyi0qj4d924f55icdb8all31vsh36mml5xapr"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.68.0-linux-arm64.tar.gz"; + sha256 = "013bjgdd5ih4cznxf6b3nfhm9r3ah9s2z0w247c7ad14paiw1l21"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.2.0-linux-arm64.tar.gz"; @@ -357,8 +357,8 @@ sha256 = "1d4a5xyx55mscqq4wqgvilfagk8mg49xnhwp5vx1i274kgdq7a7z"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.17.0-linux-arm64.tar.gz"; - sha256 = "1snc0kls8hl41m1cnnxjz7j0s72zh2m9j5bk9pqx22dqppc1rcsn"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.18.0-linux-arm64.tar.gz"; + sha256 = "0m93phlw0ixxvlsnv3g425clh4bf0j14w409pgkzig23zjanxrr0"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.49.0-linux-arm64.tar.gz"; @@ -369,8 +369,8 @@ sha256 = "0i4hwjj4j4q9qrrzb47k243hgcs7rhdk2xir6af5h4nds9z0h4yh"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.42.0-linux-arm64.tar.gz"; - sha256 = "0s3k3a0y60py8yy9frx98gwdm6p8sjjaq63kd2476dqsn6jrfg0p"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.43.0-linux-arm64.tar.gz"; + sha256 = "0jb7m7x7m330ijn7v4720qi1ldbj9blkj50qzpxivazwa5s42dgk"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.39.1-linux-arm64.tar.gz"; @@ -385,12 +385,12 @@ sha256 = "111pia2f5xwkwaqs6p90ri29l5b3ivmahsa1bji4fwyyjyp22h4r"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v8.13.1-linux-arm64.tar.gz"; - sha256 = "12b7957wk70cw4miymav3asw7xddkx2ivk6v55d8izmiw2lkpfhm"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v8.14.0-linux-arm64.tar.gz"; + sha256 = "1dyg5k7giny2d26yw222kahdnbfwmhr8d1nkrn3i1ycqsb1g573j"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v8.16.0-linux-arm64.tar.gz"; - sha256 = "0z68qdrvfcxqd71rgz9zkcws5jqf8v4m5rin5mr03d000c7rv5lw"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v8.18.0-linux-arm64.tar.gz"; + sha256 = "1db1va4mf5brc6lhf4sj89pr6c6va2m6gb77dqnk2x6xf6qnffvx"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.6.0-linux-arm64.tar.gz"; @@ -437,16 +437,16 @@ sha256 = "1hvnbp5ip2smxlmr4crjz2m4qjd85aacq8lkq0g01slfjicm26hf"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v1.1.1-linux-arm64.tar.gz"; - sha256 = "1nyz5xpy82vzfiqps5qqaydpv300wqv9qvz97p5xjlb8szlk22xk"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v1.1.2-linux-arm64.tar.gz"; + sha256 = "1qghb1kj1flr36hcpk2r85ly833hm3z80lvwdw8rh2gz8ch6wi21"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.109.0-linux-arm64.tar.gz"; - sha256 = "07p5b2i2gx7rkmmd7vy8z6qalg0qq5dr3yjq2pmanrgskq0hnhh0"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.110.0-linux-arm64.tar.gz"; + sha256 = "0v70agspybl0qmcmhhjqr8k47vvvhvipfw17hm54pr4v4bi3irmz"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v1.0.2-linux-arm64.tar.gz"; - sha256 = "12r90yr81mphmymlrmp5yz4csi871jc7h6k0wn2qjn9qx3v5qx9c"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v1.0.4-linux-arm64.tar.gz"; + sha256 = "0f1zpcn0b0hd2kb1adigqp5zd2k7glxdav785yrg7zhq3gccmklw"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.17.5-linux-arm64.tar.gz"; @@ -465,8 +465,8 @@ sha256 = "0a0x7h17qxhh0wwn5b3a3p4caqjghax6y37hcxxxjy33r03l4ba4"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.13.0-linux-arm64.tar.gz"; - sha256 = "0vf2mg4v5g4z27zkpfawlfnlrylgakjnpishsswl2abq21s9lj4q"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.13.1-linux-arm64.tar.gz"; + sha256 = "1wkcrvyw9r0j4vy3nmgsypzak8ld2750rc3cd88m0q9qi22vi6hm"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.1.7-linux-arm64.tar.gz"; @@ -479,8 +479,8 @@ ]; aarch64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.148.0-darwin-arm64.tar.gz"; - sha256 = "0nn0jq82b2lc7fzapdl7ywz5jpbkbrmza55hh1hgn8yfcrdkp7s8"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.149.0-darwin-arm64.tar.gz"; + sha256 = "0k01fdxydlw488wqvisxabp82z0a954g8zzjyavi06lik5qkab7y"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.33.0-darwin-arm64.tar.gz"; @@ -499,12 +499,12 @@ sha256 = "0rzyr14v0cwrvwh383snh6sxdspszk8yi391h0vm0x8wvaq1a5ba"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.13.0-darwin-arm64.tar.gz"; - sha256 = "0l50wf0wcaahj12dj9948swxwzxapcadzhzahbm5fnzys1if6dk2"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.14.0-darwin-arm64.tar.gz"; + sha256 = "09ss5j92ra4bs5vmsqq2sgs30nalsb1bs3s0njn72fsc1cd6n0qz"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.67.0-darwin-arm64.tar.gz"; - sha256 = "1awp05r9l0mq20sj0cnxh7rsbshpb99a993gff63w4s327vdyhqi"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.68.0-darwin-arm64.tar.gz"; + sha256 = "1zs9vgmz9hwv1impdfibg0ks8i5mdc9pis676qcvs7phlbg3yvn4"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.2.0-darwin-arm64.tar.gz"; @@ -515,8 +515,8 @@ sha256 = "1x4ij8qv9jq39fbacirjvk96hc117da5ll3fzrmgpkvjc1mall01"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.17.0-darwin-arm64.tar.gz"; - sha256 = "1jngrwg1s27qizjpjfhjr6lw2jmra2nfb6h5zb1s3wvqc5j2fm32"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.18.0-darwin-arm64.tar.gz"; + sha256 = "095lx9kxhq564wlp4q7d58ma2llx3daiiq8q2svn25nc6gs527fx"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.49.0-darwin-arm64.tar.gz"; @@ -527,8 +527,8 @@ sha256 = "1ydh3yl29kpqxwsmrrrlghlpmww1s16rjc116wb000gnj60c0bx5"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.42.0-darwin-arm64.tar.gz"; - sha256 = "1bwm86aj2ghaqasfymc41v7a93i0fmiwk5ayhjm25d0j79lmqb6l"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.43.0-darwin-arm64.tar.gz"; + sha256 = "1hh85s0fkybq9g5lzyh7qvb5sm3kwv5ma8lzzkrm10pqvf2jv01f"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.39.1-darwin-arm64.tar.gz"; @@ -543,12 +543,12 @@ sha256 = "12bzicm43l7yvh02v5fx3z8v46l9i7a9f677735xi5rjbmd2an4c"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v8.13.1-darwin-arm64.tar.gz"; - sha256 = "02wcx7m64kifcd93bdfvbhw4fl7wakinwcr0bp739dqwywiz1bad"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v8.14.0-darwin-arm64.tar.gz"; + sha256 = "17cm719jsh6rc7lwd64kg7qdlxlclvwrky9598f85kbvnv6n0xa8"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v8.16.0-darwin-arm64.tar.gz"; - sha256 = "054iwr00d0l35yisxsc5fgrdml4qvi52h2dnim9bg1j084k7ci7m"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v8.18.0-darwin-arm64.tar.gz"; + sha256 = "10vjyhk84phr632s1ns2d6vkzi415ris1sh8az6jwnp510cnqmin"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.6.0-darwin-arm64.tar.gz"; @@ -595,16 +595,16 @@ sha256 = "1yh8jkdf61526gab5p07h923k1i8ib98xh6hx0ql241lpxjzr5l5"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v1.1.1-darwin-arm64.tar.gz"; - sha256 = "1cr5jqii0z3ifkml89s84z5gd28dhv4x7z0jximlk5grfij3g2xl"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v1.1.2-darwin-arm64.tar.gz"; + sha256 = "022x01wxl7zj65n25slijnb0is266xrg26sbb1z408bipv4svxgk"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.109.0-darwin-arm64.tar.gz"; - sha256 = "0idv97kp9n32fc89c9j82v2pqlwxvj1gfm06g4nb63cxybrxzany"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.110.0-darwin-arm64.tar.gz"; + sha256 = "1r2zcxm2lgxl7x7v7shmq6r2ain90shb53vxdgjcnzjh3mhi92f5"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v1.0.2-darwin-arm64.tar.gz"; - sha256 = "1xi625scmsbk1f4ckg8fdnxrk2bf0zh0g67dgmamhcl4d2b1j2mc"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v1.0.4-darwin-arm64.tar.gz"; + sha256 = "18iw3nkmygsdb0mjdgx5h2ny834vlnd5g1f5nm9gkrs5594sqgf3"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.17.5-darwin-arm64.tar.gz"; @@ -623,8 +623,8 @@ sha256 = "1jdgx5621xmhqcyfm4p85wbp23clv0ws2klk4dgfxkaqf27xhwva"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.13.0-darwin-arm64.tar.gz"; - sha256 = "019rsml6ywy336ldsy9dv2r31qms1hblf44v8g0hkmmg8zxasvrq"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.13.1-darwin-arm64.tar.gz"; + sha256 = "0xw51rfh9vv0dbdzkjz6yrhj86f691cdg40ax085zk0g31x2g1cm"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.1.7-darwin-arm64.tar.gz"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6d3685e2f6f6..9b02f57fad25 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14635,6 +14635,10 @@ with pkgs; obs-studio-plugins = recurseIntoAttrs (callPackage ../applications/video/obs-studio/plugins {}); wrapOBS = callPackage ../applications/video/obs-studio/wrapper.nix { }; + obsidian = callPackage ../by-name/ob/obsidian/package.nix { + electron = electron_33; + }; + okms-cli = callPackage ../by-name/ok/okms-cli/package.nix { buildGoModule = buildGo123Module; }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6aa4e131de57..7d72ecf8269e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5291,6 +5291,8 @@ self: super: with self; { ghdiff = callPackage ../development/python-modules/ghdiff { }; + ghome-foyer-api = callPackage ../development/python-modules/ghome-foyer-api { }; + ghp-import = callPackage ../development/python-modules/ghp-import { }; ghrepo-stats = callPackage ../development/python-modules/ghrepo-stats { }; @@ -12381,6 +12383,10 @@ self: super: with self; { pyobihai = callPackage ../development/python-modules/pyobihai { }; + pyobjc-core = callPackage ../development/python-modules/pyobjc-core { }; + + pyobjc-framework-Cocoa = callPackage ../development/python-modules/pyobjc-framework-Cocoa { }; + pyocd = callPackage ../development/python-modules/pyocd { }; pyocd-pemicro = callPackage ../development/python-modules/pyocd-pemicro { }; @@ -14505,6 +14511,8 @@ self: super: with self; { rules = callPackage ../development/python-modules/rules { }; + rumps = callPackage ../development/python-modules/rumps { }; + runs = callPackage ../development/python-modules/runs { }; runstats = callPackage ../development/python-modules/runstats { }; @@ -14719,6 +14727,8 @@ self: super: with self; { sdds = callPackage ../development/python-modules/sdds { }; + sdjson = callPackage ../development/python-modules/sdjson { }; + sdkmanager = callPackage ../development/python-modules/sdkmanager { }; sdnotify = callPackage ../development/python-modules/sdnotify { }; @@ -16514,6 +16524,8 @@ self: super: with self; { torchdiffeq = callPackage ../development/python-modules/torchdiffeq { }; + torcheval = callPackage ../development/python-modules/torcheval { }; + torchmetrics = callPackage ../development/python-modules/torchmetrics { }; torchio = callPackage ../development/python-modules/torchio { };