diff --git a/nixos/doc/manual/release-notes/rl-2605.section.md b/nixos/doc/manual/release-notes/rl-2605.section.md index 8e4856ec0cd1..6df69a143128 100644 --- a/nixos/doc/manual/release-notes/rl-2605.section.md +++ b/nixos/doc/manual/release-notes/rl-2605.section.md @@ -100,6 +100,12 @@ of pulling the upstream container image from Docker Hub. If you want the old beh - `services.oauth2-proxy.clientSecret` and `services.oauth2-proxy.cookie.secret` have been replaced with `services.oauth2-proxy.clientSecretFile` and `services.oauth2-proxy.cookie.secretFile` respectively. This was done to ensure secrets don't get made world-readable. +- [`services.grafana.settings.security.secret_key`](#opt-services.grafana.settings.security.secret_key) doesn't have a + default value anymore. Please generate your own key or hard-code the old one explicitly. + See the [upstream docs](https://grafana.com/docs/grafana/latest/setup-grafana/configure-grafana/#secret_key) and + the [instructions on how to rotate](https://grafana.com/docs/grafana/latest/setup-grafana/configure-security/configure-database-encryption/#re-encrypt-secrets) + for further information. + - Ethercalc and its associated module have been removed, as the package is unmaintained and cannot be installed from source with npm now. - `services.cgit` before always had the git-http-backend and its "export all" setting enabled, which sidestepped any access control configured in cgit's settings. Now you have to make a decision and either enable or disable `services.cgit.gitHttpBackend.checkExportOkFiles` (or disable the git-http-backend). diff --git a/nixos/modules/services/monitoring/grafana.nix b/nixos/modules/services/monitoring/grafana.nix index 9f458792c34b..96a725b3a844 100644 --- a/nixos/modules/services/monitoring/grafana.nix +++ b/nixos/modules/services/monitoring/grafana.nix @@ -889,7 +889,8 @@ in to work around that. Look at the documentation for details: ''; - type = types.str; + type = types.nullOr types.str; + default = null; }; disable_gravatar = mkOption { @@ -2060,6 +2061,17 @@ in || cfg.provision.alerting.muteTimings.path == null; message = "Cannot set both mute timings settings and mute timings path"; } + { + assertion = cfg.settings.security.secret_key != null; + message = '' + Grafana's secret key (services.grafana.settings.security.secret_key) doesn't have a default + value anymore. Please generate your own and use a file-provider on this option! See also + https://grafana.com/docs/grafana/latest/setup-grafana/configure-grafana/#secret_key + for more information. + + See https://grafana.com/docs/grafana/latest/setup-grafana/configure-security/configure-database-encryption/#re-encrypt-secrets on how to re-encrypt. + ''; + } ]; systemd.services.grafana = { diff --git a/nixos/tests/systemd-repart.nix b/nixos/tests/systemd-repart.nix index 01faf69d6a51..a991709a5c66 100644 --- a/nixos/tests/systemd-repart.nix +++ b/nixos/tests/systemd-repart.nix @@ -110,8 +110,7 @@ in machine.start() machine.wait_for_unit("multi-user.target") - systemd_repart_logs = machine.succeed("journalctl --boot --unit systemd-repart.service") - assert "Growing existing partition 1." in systemd_repart_logs + machine.succeed("journalctl --boot --grep 'Growing existing partition 1.' --identifier systemd-repart") ''; }; @@ -173,8 +172,7 @@ in machine.start() machine.wait_for_unit("multi-user.target") - systemd_repart_logs = machine.succeed("journalctl --boot --unit systemd-repart.service") - assert "Encrypting future partition 2" in systemd_repart_logs + machine.succeed("journalctl --boot --grep 'Encrypting future partition 2' --identifier systemd-repart") assert "/dev/mapper/created-crypt" in machine.succeed("mount") ''; @@ -205,8 +203,7 @@ in machine.start() machine.wait_for_unit("multi-user.target") - systemd_repart_logs = machine.succeed("journalctl --unit systemd-repart.service") - assert "Growing existing partition 1." in systemd_repart_logs + machine.succeed("journalctl --grep 'Growing existing partition 1.' --identifier systemd-repart") ''; }; @@ -273,8 +270,7 @@ in machine.start() machine.wait_for_unit("multi-user.target") - systemd_repart_logs = machine.succeed("journalctl --boot --unit systemd-repart.service") - assert "Adding new partition 2 to partition table." in systemd_repart_logs + machine.succeed("journalctl --boot --grep 'Adding new partition 2 to partition table.' --identifier systemd-repart") ''; }; diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 49fc1a56eb19..a43d10c6318b 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -186,15 +186,6 @@ let optionalString ; - notoSubset = - suffixes: - runCommand "noto-fonts-subset" { } '' - mkdir -p "$out/share/fonts/noto/" - ${concatMapStrings (x: '' - cp "${noto-fonts}/share/fonts/noto/NotoSans${x}["*.[ot]tf "$out/share/fonts/noto/" - '') suffixes} - ''; - fontsConf = makeFontsConf { fontDirectories = [ amiri @@ -207,9 +198,8 @@ let liberation_ttf_v2 libertine linux-libertine-g - # Font priority issues in some tests in Still noto-fonts-lgc-plus - (if variant == "fresh" then noto-fonts else (notoSubset [ "Arabic" ])) + noto-fonts noto-fonts-cjk-sans ]; }; diff --git a/pkgs/by-name/an/ansible-navigator/package.nix b/pkgs/by-name/an/ansible-navigator/package.nix index bf69dc2a68a9..829b749b8dff 100644 --- a/pkgs/by-name/an/ansible-navigator/package.nix +++ b/pkgs/by-name/an/ansible-navigator/package.nix @@ -8,13 +8,13 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "ansible-navigator"; - version = "25.12.0"; + version = "26.1.3"; pyproject = true; src = fetchPypi { inherit (finalAttrs) version; pname = "ansible_navigator"; - hash = "sha256-i6yw282NWUaCZBtAYi3rQsLk+GGyp8QHyqBi7nwwIlo="; + hash = "sha256-WWbx4/BARcmDnCZDt7v2uCCyZUNlS8Ur8HYiCf5A/vE="; }; build-system = with python3Packages; [ diff --git a/pkgs/by-name/bl/blocky/package.nix b/pkgs/by-name/bl/blocky/package.nix index 306d1a4fc036..72356272cf8e 100644 --- a/pkgs/by-name/bl/blocky/package.nix +++ b/pkgs/by-name/bl/blocky/package.nix @@ -7,20 +7,20 @@ buildGoModule (finalAttrs: { pname = "blocky"; - version = "0.28.2"; + version = "0.29.0"; src = fetchFromGitHub { owner = "0xERR0R"; repo = "blocky"; rev = "v${finalAttrs.version}"; - hash = "sha256-GLVyPb2Qyn1jnRz+e74dFzL/AMloKqSe1BUUAGTquWA="; + hash = "sha256-8eFLmgTqK+WqJCPwLJXJqz2XCcP/1JDWfQQfzme9ELw="; }; # needs network connection and fails at # https://github.com/0xERR0R/blocky/blob/development/resolver/upstream_resolver_test.go doCheck = false; - vendorHash = "sha256-AzfI4SElD7GFIG8/REB4PU0/Haj5x5HUNj/3/n1OXZE="; + vendorHash = "sha256-H8AaK1jcdv10218ftMOrjfHd0XfaN9q3I0z4pGFirWA="; ldflags = [ "-s" diff --git a/pkgs/by-name/ca/calendar-cli/package.nix b/pkgs/by-name/ca/calendar-cli/package.nix index b59dda3354ee..310aa702f60c 100644 --- a/pkgs/by-name/ca/calendar-cli/package.nix +++ b/pkgs/by-name/ca/calendar-cli/package.nix @@ -40,6 +40,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: { tzlocal click six + urllib3 vobject ]; diff --git a/pkgs/by-name/ca/cargo-binstall/package.nix b/pkgs/by-name/ca/cargo-binstall/package.nix index b7a2ed68812a..f22bb3c24011 100644 --- a/pkgs/by-name/ca/cargo-binstall/package.nix +++ b/pkgs/by-name/ca/cargo-binstall/package.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cargo-binstall"; - version = "1.17.5"; + version = "1.17.6"; src = fetchFromGitHub { owner = "cargo-bins"; repo = "cargo-binstall"; tag = "v${finalAttrs.version}"; - hash = "sha256-uYHaVNRq8iTeDs/EW5f5wp/fNBicNYzab4PgEHuY814="; + hash = "sha256-+O6Zv/IHrPynsrxJZQCdkru2bY9O1vTGTg1F+rY5Kek="; }; - cargoHash = "sha256-IFYY3bSqm2OfbjmIHXbc0vIRhiw6Wwss8Sa3fx5s1Pk="; + cargoHash = "sha256-WJLiq7t5suYYUP0oHcuCcOFTKzfLgzM6DEMAliHIRgM="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ca/cargo-chef/package.nix b/pkgs/by-name/ca/cargo-chef/package.nix index faf19cab50aa..e3b19a86c32d 100644 --- a/pkgs/by-name/ca/cargo-chef/package.nix +++ b/pkgs/by-name/ca/cargo-chef/package.nix @@ -6,14 +6,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-chef"; - version = "0.1.73"; + version = "0.1.75"; src = fetchCrate { inherit pname version; - hash = "sha256-zWyPVITx4wN0fd0bNVU5yt/ojsSVhbgIcoV6Z427RCA="; + hash = "sha256-FETYJrx5+yNOzMVIgJQ0yNLi2PB7cA128n8hAXIhx3E="; }; - cargoHash = "sha256-diox0Vafn8881tW4Z5Udm6U2lNQKe9m/H5bRTRN3aGs="; + cargoHash = "sha256-4dMBGCEoLICnTjrTeTiXBE+AMH2siT9WLqdUfWN4UkU="; meta = { description = "Cargo-subcommand to speed up Rust Docker builds using Docker layer caching"; diff --git a/pkgs/by-name/co/copilot-language-server/package.nix b/pkgs/by-name/co/copilot-language-server/package.nix index d052a906ca19..1fa9b543c59d 100644 --- a/pkgs/by-name/co/copilot-language-server/package.nix +++ b/pkgs/by-name/co/copilot-language-server/package.nix @@ -10,11 +10,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "copilot-language-server"; - version = "1.430.0"; + version = "1.434.0"; src = fetchzip { url = "https://github.com/github/copilot-language-server-release/releases/download/${finalAttrs.version}/copilot-language-server-js-${finalAttrs.version}.zip"; - hash = "sha256-b2NMh+9JcPrMu0JHL2vdWOJhUA+PoCmj7M21rS9MS3o="; + hash = "sha256-GxbSgKy2UgDNjVEwmNrZe4BMYM5VIgP3goubdpLVnIA="; stripRoot = false; }; diff --git a/pkgs/by-name/fa/fan2go/package.nix b/pkgs/by-name/fa/fan2go/package.nix index 7f5d3ceda0b8..4f3add865b92 100644 --- a/pkgs/by-name/fa/fan2go/package.nix +++ b/pkgs/by-name/fa/fan2go/package.nix @@ -10,13 +10,13 @@ buildGoModule (finalAttrs: { pname = "fan2go"; - version = "0.12.0"; + version = "0.13.0"; src = fetchFromGitHub { owner = "markusressel"; repo = "fan2go"; tag = finalAttrs.version; - hash = "sha256-tfIjMUaUMwBiEF9HgWFKm3ChvQJqYUIz/isyXSkptO0="; + hash = "sha256-JU6hk3JJwoiC3R+Qx6QKzALnvhTA0/luQzO5X6Cpb/I="; leaveDotGit = true; postFetch = '' cd $out @@ -25,7 +25,7 @@ buildGoModule (finalAttrs: { ''; }; - vendorHash = "sha256-JOScGakasPLZnWc2jGvG1rw0riuM3PqLCPkn/ja/P3A="; + vendorHash = "sha256-6rcU7Qtzz80WcygeLVftdpGYAuzGmWD0M+ZVxgGcgnI="; nativeBuildInputs = lib.optionals enableNVML [ autoAddDriverRunpath diff --git a/pkgs/by-name/fi/finit/package.nix b/pkgs/by-name/fi/finit/package.nix index 42f2cf63981c..8d6672388dc5 100644 --- a/pkgs/by-name/fi/finit/package.nix +++ b/pkgs/by-name/fi/finit/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "finit"; - version = "4.16-rc1"; + version = "4.16"; src = fetchFromGitHub { owner = "finit-project"; repo = "finit"; tag = finalAttrs.version; - hash = "sha256-hvTTvAxG0FnPpYepkw5Q1Fo59wx7w9MLjOj2h4WZsAo="; + hash = "sha256-DtocGgFvt7RLqwjHczwUbsszBD5MQI5fEuq9EB2tFp4="; }; postPatch = '' diff --git a/pkgs/by-name/fl/fleet/package.nix b/pkgs/by-name/fl/fleet/package.nix index 10f5fd899183..51ebfcc107c8 100644 --- a/pkgs/by-name/fl/fleet/package.nix +++ b/pkgs/by-name/fl/fleet/package.nix @@ -12,12 +12,12 @@ }: let pname = "fleet"; - version = "4.79.1"; + version = "4.81.0"; src = fetchFromGitHub { owner = "fleetdm"; repo = "fleet"; tag = "fleet-v${version}"; - hash = "sha256-o/exnUy5vXi+Ey8smd36588M8B7GQlG5ZqtGyYySkxQ="; + hash = "sha256-LPbMcaQ3YIfh5qwIBB7BwJFgMPurCJudrOzUPm5+VcM="; }; frontend = stdenvNoCC.mkDerivation { @@ -32,7 +32,7 @@ let yarnOfflineCache = fetchYarnDeps { yarnLock = src + "/yarn.lock"; - hash = "sha256-cCf0Q6g+VJaTCOZ12/7z8gcDf3+YT2LBTCJb39InJVw="; + hash = "sha256-9FuGmL9/hkPZo0ecneL4i9Hg6gkRbwhKGfIvn3/YpVo="; }; NODE_ENV = "production"; @@ -54,7 +54,7 @@ in buildGoModule (finalAttrs: { inherit pname version src; - vendorHash = "sha256-CYqg8kHGUu+wd9l5UYURqmoR8/13HX9t5xHwjzdgJhU="; + vendorHash = "sha256-kudomUa5c0OJA2LgqLQ2Az0mDH/s9go3jHdyeALGgs8="; subPackages = [ "cmd/fleet" diff --git a/pkgs/by-name/ge/gemini-cli/package.nix b/pkgs/by-name/ge/gemini-cli/package.nix index a3efd641b279..cdb9d1926a2b 100644 --- a/pkgs/by-name/ge/gemini-cli/package.nix +++ b/pkgs/by-name/ge/gemini-cli/package.nix @@ -14,18 +14,18 @@ buildNpmPackage (finalAttrs: { pname = "gemini-cli"; - version = "0.29.5"; + version = "0.30.0"; src = fetchFromGitHub { owner = "google-gemini"; repo = "gemini-cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-+gFSTq0CXMZa2OhP2gOuWa5WtteKW7Ys78lgnz7J72g="; + hash = "sha256-+w4w1cftPSj0gJ23Slw8Oexljmu0N/PZWH4IDjw75rs="; }; nodejs = nodejs_22; - npmDepsHash = "sha256-RGiWtJkLFV1UfFahHPzxtzJIsPCseEwfSsPdLfBkavI="; + npmDepsHash = "sha256-Nkd5Q2ugRqsTqaFbCSniC3Obl++uEjVUmoa8MVT5++8="; dontPatchElf = stdenv.isDarwin; @@ -90,6 +90,7 @@ buildNpmPackage (finalAttrs: { rm -f $out/share/gemini-cli/node_modules/@google/gemini-cli rm -f $out/share/gemini-cli/node_modules/@google/gemini-cli-core rm -f $out/share/gemini-cli/node_modules/@google/gemini-cli-a2a-server + rm -f $out/share/gemini-cli/node_modules/@google/gemini-cli-sdk rm -f $out/share/gemini-cli/node_modules/@google/gemini-cli-test-utils rm -f $out/share/gemini-cli/node_modules/gemini-cli-vscode-ide-companion cp -r packages/cli $out/share/gemini-cli/node_modules/@google/gemini-cli diff --git a/pkgs/by-name/gh/ghalint/package.nix b/pkgs/by-name/gh/ghalint/package.nix index ce95eb451a98..a6a755fe68bd 100644 --- a/pkgs/by-name/gh/ghalint/package.nix +++ b/pkgs/by-name/gh/ghalint/package.nix @@ -9,16 +9,16 @@ buildGoModule (finalAttrs: { pname = "ghalint"; - version = "1.5.4"; + version = "1.5.5"; src = fetchFromGitHub { owner = "suzuki-shunsuke"; repo = "ghalint"; tag = "v${finalAttrs.version}"; - hash = "sha256-pfLXnMbrxXAMpfmjctah85z5GHfI/+NZDrIu1LcBH8M="; + hash = "sha256-xAXcvvSwcJjdG2BCItBLdsu6vZiID5FmRYYF9PZe1QE="; }; - vendorHash = "sha256-VCv5ZCeUWHld+q7tkHSUyeVagMhSN9893vYHyO/VlAI="; + vendorHash = "sha256-XIalA/usvyvzrvGU7Ygf1DWSlTm1YYaN+X0Xm+YiiTI="; subPackages = [ "cmd/ghalint" ]; diff --git a/pkgs/by-name/gl/glaze/package.nix b/pkgs/by-name/gl/glaze/package.nix index f1d7fd657272..ceecfc8d4da0 100644 --- a/pkgs/by-name/gl/glaze/package.nix +++ b/pkgs/by-name/gl/glaze/package.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { }; nativeBuildInputs = [ cmake ]; - buildInputs = lib.optionals enableSSL [ openssl ]; + propagatedBuildInputs = lib.optionals enableSSL [ openssl ]; # https://github.com/stephenberry/glaze/blob/main/CMakeLists.txt cmakeFlags = [ diff --git a/pkgs/by-name/gu/guile-hoot/package.nix b/pkgs/by-name/gu/guile-hoot/package.nix index f0369e8521da..a3bca3085e05 100644 --- a/pkgs/by-name/gu/guile-hoot/package.nix +++ b/pkgs/by-name/gu/guile-hoot/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "guile-hoot"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromCodeberg { owner = "spritely"; repo = "hoot"; tag = "v${finalAttrs.version}"; - hash = "sha256-mthEqyVsBrFhwz29VwatbFp4QgGmZ9sDoyTpRIEsOmI="; + hash = "sha256-b372dMUsDTa+hYrOwvj+/YcwVP52BCJxwSGRaqSSWZs="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/hy/hyprland/info.json b/pkgs/by-name/hy/hyprland/info.json index 24b7ff15df25..a1f2a9a28589 100644 --- a/pkgs/by-name/hy/hyprland/info.json +++ b/pkgs/by-name/hy/hyprland/info.json @@ -1,7 +1,7 @@ { - "branch": "v0.53.3-b", - "commit_hash": "dd220efe7b1e292415bd0ea7161f63df9c95bfd3", - "commit_message": "version: bump to 0.53.3", - "date": "2026-01-24", - "tag": "v0.53.3" + "branch": "main", + "commit_hash": "0002f148c9a4fe421a9d33c0faa5528cdc411e62", + "commit_message": "version: bump to 0.54.0", + "date": "2026-02-27", + "tag": "v0.54.0" } diff --git a/pkgs/by-name/hy/hyprland/package.nix b/pkgs/by-name/hy/hyprland/package.nix index 36ffdb3fc71d..61dd6c073fbc 100644 --- a/pkgs/by-name/hy/hyprland/package.nix +++ b/pkgs/by-name/hy/hyprland/package.nix @@ -48,11 +48,6 @@ enableXWayland ? true, withSystemd ? lib.meta.availableOn gcc15Stdenv.hostPlatform systemd, wrapRuntimeDeps ? true, - # deprecated flags - nvidiaPatches ? false, - hidpiXWayland ? false, - enableNvidiaPatches ? false, - legacyRenderer ? false, }: let inherit (builtins) @@ -85,24 +80,16 @@ let customStdenv = foldl' (acc: adapter: adapter acc) gcc15Stdenv adapters; in -assert assertMsg (!nvidiaPatches) "The option `nvidiaPatches` has been removed."; -assert assertMsg (!enableNvidiaPatches) "The option `enableNvidiaPatches` has been removed."; -assert assertMsg (!hidpiXWayland) - "The option `hidpiXWayland` has been removed. Please refer https://wiki.hyprland.org/Configuring/XWayland"; -assert assertMsg ( - !legacyRenderer -) "The option `legacyRenderer` has been removed. Legacy renderer is no longer supported."; - customStdenv.mkDerivation (finalAttrs: { pname = "hyprland" + optionalString debug "-debug"; - version = "0.53.3"; + version = "0.54.0"; src = fetchFromGitHub { owner = "hyprwm"; repo = "hyprland"; fetchSubmodules = true; tag = "v${finalAttrs.version}"; - hash = "sha256-as2crdrJUVOawO8XkWJEZBUNaFdPS8QuQiccTkM1la0="; + hash = "sha256-wfiduannx1mWvsGAfuMk8ipOU3AAFuJYPNV4D++dhPY="; }; postPatch = '' @@ -140,9 +127,6 @@ customStdenv.mkDerivation (finalAttrs: { hyprwire makeWrapper cmake - # meson + ninja are used to build the hyprland-protocols submodule - meson - ninja pkg-config wayland-scanner # for udis86 @@ -166,10 +150,11 @@ customStdenv.mkDerivation (finalAttrs: { hyprutils libGL libdrm + libgbm libinput libuuid + libxcursor libxkbcommon - libgbm muparser pango pciutils @@ -177,15 +162,14 @@ customStdenv.mkDerivation (finalAttrs: { tomlplusplus wayland wayland-protocols - libxcursor ] (optionals customStdenv.hostPlatform.isBSD [ epoll-shim ]) (optionals customStdenv.hostPlatform.isMusl [ libexecinfo ]) (optionals enableXWayland [ libxcb - libxdmcp libxcb-errors libxcb-wm + libxdmcp xwayland ]) (optionals withSystemd [ systemd ]) @@ -202,7 +186,6 @@ customStdenv.mkDerivation (finalAttrs: { "NO_SYSTEMD" = !withSystemd; "CMAKE_DISABLE_PRECOMPILE_HEADERS" = true; "NO_UWSM" = !withSystemd; - "NO_HYPRPM" = true; "TRACY_ENABLE" = false; }; diff --git a/pkgs/by-name/hy/hyprviz/package.nix b/pkgs/by-name/hy/hyprviz/package.nix index f1afb113073d..dd7848aecc93 100644 --- a/pkgs/by-name/hy/hyprviz/package.nix +++ b/pkgs/by-name/hy/hyprviz/package.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "hyprviz"; - version = "0.8.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "timasoft"; repo = "hyprviz"; tag = "v${finalAttrs.version}"; - hash = "sha256-5w7+fkf2oB0x5N6xlKjSPbgsB7Ifr1NWW8qWDmGyFwU="; + hash = "sha256-CzuCBeJWtfHvCcWtV7X6suTagx0Sw+OagleHwwlyEms="; }; - cargoHash = "sha256-+8MKYruPjCTooiY7pxwz5oqIpk4ZidugPrVlMZ1yMI0="; + cargoHash = "sha256-fg4bPn/18Pu7LUorF3egCeBd9di+3OmCQxTeWr1Pybw="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/im/imagemagick6/package.nix b/pkgs/by-name/im/imagemagick6/package.nix deleted file mode 100644 index 539291870208..000000000000 --- a/pkgs/by-name/im/imagemagick6/package.nix +++ /dev/null @@ -1,196 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - pkg-config, - libtool, - bzip2Support ? true, - bzip2, - zlibSupport ? true, - zlib, - libX11Support ? !stdenv.hostPlatform.isMinGW, - libx11, - libXtSupport ? !stdenv.hostPlatform.isMinGW, - libxt, - fontconfigSupport ? true, - fontconfig, - freetypeSupport ? true, - freetype, - ghostscriptSupport ? false, - ghostscript, - libjpegSupport ? true, - libjpeg, - djvulibreSupport ? true, - djvulibre, - lcms2Support ? true, - lcms2, - openexrSupport ? !stdenv.hostPlatform.isMinGW, - openexr, - libpngSupport ? true, - libpng, - liblqr1Support ? true, - liblqr1, - librsvgSupport ? !stdenv.hostPlatform.isMinGW, - librsvg, - libtiffSupport ? true, - libtiff, - libxml2Support ? true, - libxml2, - openjpegSupport ? !stdenv.hostPlatform.isMinGW, - openjpeg, - libwebpSupport ? !stdenv.hostPlatform.isMinGW, - libwebp, - libheifSupport ? true, - libheif, - libde265Support ? true, - libde265, - fftw, - testers, -}: - -let - arch = - if stdenv.hostPlatform.system == "i686-linux" then - "i686" - else if - stdenv.hostPlatform.system == "x86_64-linux" || stdenv.hostPlatform.system == "x86_64-darwin" - then - "x86-64" - else if stdenv.hostPlatform.system == "armv7l-linux" then - "armv7l" - else if - stdenv.hostPlatform.system == "aarch64-linux" || stdenv.hostPlatform.system == "aarch64-darwin" - then - "aarch64" - else if stdenv.hostPlatform.system == "powerpc64le-linux" then - "ppc64le" - else - null; -in - -stdenv.mkDerivation (finalAttrs: { - pname = "imagemagick"; - version = "6.9.13-38"; - - src = fetchFromGitHub { - owner = "ImageMagick"; - repo = "ImageMagick6"; - rev = finalAttrs.version; - sha256 = "sha256-49o1jFFs7GrQMBvkoUvTmlI5TDnS1mVycghuaOfDrIc="; - }; - - outputs = [ - "out" - "dev" - "doc" - ]; # bin/ isn't really big - outputMan = "out"; # it's tiny - - enableParallelBuilding = true; - - configureFlags = [ - "--with-frozenpaths" - (lib.withFeatureAs (arch != null) "gcc-arch" arch) - (lib.withFeature librsvgSupport "rsvg") - (lib.withFeature liblqr1Support "lqr") - (lib.withFeatureAs ghostscriptSupport "gs-font-dir" "${ghostscript.fonts}/share/fonts") - (lib.withFeature ghostscriptSupport "gslib") - ] - ++ lib.optionals stdenv.hostPlatform.isMinGW [ - # due to libxml2 being without DLLs ATM - "--enable-static" - "--disable-shared" - ]; - - nativeBuildInputs = [ - pkg-config - libtool - ]; - - buildInputs = - [ ] - ++ lib.optional zlibSupport zlib - ++ lib.optional fontconfigSupport fontconfig - ++ lib.optional ghostscriptSupport ghostscript - ++ lib.optional liblqr1Support liblqr1 - ++ lib.optional libpngSupport libpng - ++ lib.optional libtiffSupport libtiff - ++ lib.optional libxml2Support libxml2 - ++ lib.optional libheifSupport libheif - ++ lib.optional libde265Support libde265 - ++ lib.optional djvulibreSupport djvulibre - ++ lib.optional openexrSupport openexr - ++ lib.optional librsvgSupport librsvg - ++ lib.optional openjpegSupport openjpeg; - - propagatedBuildInputs = [ - fftw - ] - ++ lib.optional bzip2Support bzip2 - ++ lib.optional freetypeSupport freetype - ++ lib.optional libjpegSupport libjpeg - ++ lib.optional lcms2Support lcms2 - ++ lib.optional libX11Support libx11 - ++ lib.optional libXtSupport libxt - ++ lib.optional libwebpSupport libwebp; - - doCheck = false; # fails 2 out of 76 tests - - postInstall = '' - (cd "$dev/include" && ln -s ImageMagick* ImageMagick) - moveToOutput "bin/*-config" "$dev" - moveToOutput "lib/ImageMagick-*/config-Q16" "$dev" # includes configure params - for file in "$dev"/bin/*-config; do - substituteInPlace "$file" --replace "${pkg-config}/bin/pkg-config -config" \ - ${pkg-config}/bin/${pkg-config.targetPrefix}pkg-config - substituteInPlace "$file" --replace ${pkg-config}/bin/pkg-config \ - "PKG_CONFIG_PATH='$dev/lib/pkgconfig' '${pkg-config}/bin/${pkg-config.targetPrefix}pkg-config'" - done - '' - + lib.optionalString ghostscriptSupport '' - for la in $out/lib/*.la; do - sed 's|-lgs|-L${lib.getLib ghostscript}/lib -lgs|' -i $la - done - ''; - - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - - meta = { - homepage = "https://legacy.imagemagick.org/"; - changelog = "https://legacy.imagemagick.org/script/changelog.php"; - description = "Software suite to create, edit, compose, or convert bitmap images"; - pkgConfigModules = [ - "ImageMagick" - "MagickWand" - ]; - platforms = lib.platforms.linux ++ lib.platforms.darwin; - maintainers = [ ]; - license = lib.licenses.asl20; - knownVulnerabilities = [ - "CVE-2019-13136" - "CVE-2019-17547" - "CVE-2020-25663" - "CVE-2020-27768" - "CVE-2020-27769" - "CVE-2020-27829" - "CVE-2021-20243" - "CVE-2021-20244" - "CVE-2021-20310" - "CVE-2021-20311" - "CVE-2021-20312" - "CVE-2021-20313" - "CVE-2021-3596" - "CVE-2022-0284" - "CVE-2022-2719" - "CVE-2023-1289" - "CVE-2023-2157" - "CVE-2023-34151" - "CVE-2023-34152" - "CVE-2023-34153" - "CVE-2023-3428" - "CVE-2023-34474" - "CVE-2023-34475" - "CVE-2023-5341" - ]; - }; -}) diff --git a/pkgs/by-name/io/iosevka/package.nix b/pkgs/by-name/io/iosevka/package.nix index 05687aa41ba2..c8c051d7d6ca 100644 --- a/pkgs/by-name/io/iosevka/package.nix +++ b/pkgs/by-name/io/iosevka/package.nix @@ -58,16 +58,16 @@ assert (extraParameters != null) -> set != null; buildNpmPackage rec { pname = "Iosevka${toString set}"; - version = "34.1.0"; + version = "34.2.0"; src = fetchFromGitHub { owner = "be5invis"; repo = "iosevka"; rev = "v${version}"; - hash = "sha256-vdjf2MkKP9DHl/hrz9xJMWMuT2AsonRdt14xQTSsVmU="; + hash = "sha256-AK1lIC16F2CKSfRtF4SwOLAZr+v6VdjZIEOrios1uaw="; }; - npmDepsHash = "sha256-YMfePtKg4kpZ4iCpkq7PxfyDB4MIRg/tgCNmLD31zKo="; + npmDepsHash = "sha256-N5IxbuwchR0hIaOVR5m3SQmkopCMhu86QqhD1pztoB4="; nativeBuildInputs = [ remarshal diff --git a/pkgs/by-name/jr/jreleaser-cli/package.nix b/pkgs/by-name/jr/jreleaser-cli/package.nix index 9caad3650ee5..1a98c44cc2c9 100644 --- a/pkgs/by-name/jr/jreleaser-cli/package.nix +++ b/pkgs/by-name/jr/jreleaser-cli/package.nix @@ -7,11 +7,11 @@ }: stdenv.mkDerivation rec { pname = "jreleaser-cli"; - version = "1.22.0"; + version = "1.23.0"; src = fetchurl { url = "https://github.com/jreleaser/jreleaser/releases/download/v${version}/jreleaser-tool-provider-${version}.jar"; - hash = "sha256-3EMv+yzn8eNFf9UIkKRXH72UKrfH2XtXGZZ+scbpvSU="; + hash = "sha256-NSJn4KSm8xC4HMXzh4m1EqlLUPGVu1SWfDUHT4umKTI="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/ka/karakeep/package.nix b/pkgs/by-name/ka/karakeep/package.nix index fbef3e1e096e..a84d759112c3 100644 --- a/pkgs/by-name/ka/karakeep/package.nix +++ b/pkgs/by-name/ka/karakeep/package.nix @@ -18,13 +18,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "karakeep"; - version = "0.30.0"; + version = "0.31.0"; src = fetchFromGitHub { owner = "karakeep-app"; repo = "karakeep"; tag = "cli/v${finalAttrs.version}"; - hash = "sha256-Ssr/KcQHRtEloz4YPAUfUmcbicMumkIQ+wOjxe9PTXM="; + hash = "sha256-++aNTkLOkwgkzRxg/WdrHfchXQwUUir0qqmb7WfdZJ0="; }; patches = [ @@ -65,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: { }; fetcherVersion = 3; - hash = "sha256-ZCsG+Zjiy3hmROgBKnqxGlJjvIYqAeQMlfXUnNQIsiI="; + hash = "sha256-+MbKG0h3cD0kZua0OkdQsUeTjAY4ysK41KXUSaOSKHA="; }; buildPhase = '' runHook preBuild diff --git a/pkgs/by-name/ka/kas/package.nix b/pkgs/by-name/ka/kas/package.nix index 8233e4bf1a8b..aefdb619ea41 100644 --- a/pkgs/by-name/ka/kas/package.nix +++ b/pkgs/by-name/ka/kas/package.nix @@ -8,14 +8,14 @@ python3.pkgs.buildPythonApplication (finalAttrs: { pname = "kas"; - version = "5.1"; + version = "5.2"; pyproject = true; src = fetchFromGitHub { owner = "siemens"; repo = "kas"; tag = finalAttrs.version; - hash = "sha256-SQeoRm2bjcQmhfMUJCSxgKu7/qcIEv9ItWcLWkkNwAs="; + hash = "sha256-lEhgEotQE5ceH1NEBlTzD33W09NQjzo4bCpZi9rcQE0="; }; patches = [ ./pass-terminfo-env.patch ]; diff --git a/pkgs/by-name/li/libpcap/package.nix b/pkgs/by-name/li/libpcap/package.nix index 4496557bd1d3..057d3e08e4dc 100644 --- a/pkgs/by-name/li/libpcap/package.nix +++ b/pkgs/by-name/li/libpcap/package.nix @@ -46,14 +46,14 @@ stdenv.mkDerivation (finalAttrs: { bash ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libnl ] - ++ lib.optionals withRemote [ libxcrypt ]; + ++ lib.optionals withRemote [ libxcrypt ] + ++ lib.optionals withBluez [ bluez ]; nativeBuildInputs = [ flex bison ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ] - ++ lib.optionals withBluez [ bluez.dev ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ]; # We need to force the autodetection because detection doesn't # work in pure build environments. diff --git a/pkgs/by-name/lo/logstalgia/package.nix b/pkgs/by-name/lo/logstalgia/package.nix index 4ef0ea836bf1..fae6ef8971b9 100644 --- a/pkgs/by-name/lo/logstalgia/package.nix +++ b/pkgs/by-name/lo/logstalgia/package.nix @@ -4,6 +4,7 @@ fetchurl, SDL2, ftgl, + autoreconfHook, pkg-config, libpng, libjpeg, @@ -27,7 +28,18 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-wEnv9AXpJANSIu2ya8xse18AoIkmq9t7Rn4kSSQnkKk="; }; - nativeBuildInputs = [ pkg-config ]; + postPatch = '' + # Fix build with boost 1.89 + rm m4/ax_boost_system.m4 + substituteInPlace configure.ac \ + --replace-fail "AX_BOOST_SYSTEM" "" + ''; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; + buildInputs = [ glew SDL2 diff --git a/pkgs/by-name/ma/manifold/package.nix b/pkgs/by-name/ma/manifold/package.nix index 6e008987a82d..1d6cc8a60677 100644 --- a/pkgs/by-name/ma/manifold/package.nix +++ b/pkgs/by-name/ma/manifold/package.nix @@ -5,27 +5,25 @@ cmake, clipper2, gtest, - glm, onetbb, python3Packages, }: stdenv.mkDerivation (finalAttrs: { pname = "manifold"; - version = "3.3.2"; + version = "3.4.0"; src = fetchFromGitHub { owner = "elalish"; repo = "manifold"; tag = "v${finalAttrs.version}"; - hash = "sha256-583/phb0boc5ASFJN+DDn6bogeNPVYPBTgtcD/d/AS8="; + hash = "sha256-9h1MLEcqLpiFg8U5rRkR9Qa+ohzehEDCn5rNsN6swlQ="; }; nativeBuildInputs = [ cmake ]; buildInputs = [ gtest - glm onetbb ]; @@ -38,13 +36,11 @@ stdenv.mkDerivation (finalAttrs: { "-DMANIFOLD_PAR=TBB" ]; - excludedTestPatterns = lib.optionals stdenv.isDarwin [ - # https://github.com/elalish/manifold/issues/1306 - "Manifold.Simplify" + excludedTestPatterns = [ ]; doCheck = true; checkPhase = '' - test/manifold_test --gtest_filter=-${builtins.concatStringsSep ":" finalAttrs.excludedTestPatterns} + test/manifold_test --gtest_filter=-${lib.escapeShellArg (builtins.concatStringsSep ":" finalAttrs.excludedTestPatterns)} ''; passthru = { diff --git a/pkgs/by-name/mc/mcp-grafana/package.nix b/pkgs/by-name/mc/mcp-grafana/package.nix index 57cb253362c2..52c12dd1ade4 100644 --- a/pkgs/by-name/mc/mcp-grafana/package.nix +++ b/pkgs/by-name/mc/mcp-grafana/package.nix @@ -6,13 +6,13 @@ buildGoModule (finalAttrs: { pname = "mcp-grafana"; - version = "0.11.0"; + version = "0.11.2"; src = fetchFromGitHub { owner = "grafana"; repo = "mcp-grafana"; tag = "v${finalAttrs.version}"; - hash = "sha256-oLhah+MHUeiARIul39Yt32cQgc9fUmdGv89MuZYEXrM="; + hash = "sha256-HqNKbpmZCrEST2wesUo/swkT5wcnV2ZOpwYmqq+2EzA="; }; vendorHash = "sha256-w4v1/RqnNfGFzapmWd96UTT4Sc18lSVX5HvsXWWmhSY="; diff --git a/pkgs/by-name/mu/museum/package.nix b/pkgs/by-name/mu/museum/package.nix index 75128482bdb9..4543ac8309fc 100644 --- a/pkgs/by-name/mu/museum/package.nix +++ b/pkgs/by-name/mu/museum/package.nix @@ -10,17 +10,17 @@ buildGoModule (finalAttrs: { pname = "museum"; - version = "1.3.13"; + version = "1.3.16"; src = fetchFromGitHub { owner = "ente-io"; repo = "ente"; sparseCheckout = [ "server" ]; tag = "photos-v${finalAttrs.version}"; - hash = "sha256-Wh4jAYMM71PEyjYPaKqJNs2rnBNbf+cR9+dP2ZpnuaU="; + hash = "sha256-0Ks29rlCAacOolVXcWX3zedrm6U90Dfe3Mr2uZYfUf4="; }; - vendorHash = "sha256-napF55nA/9P8l5lddnEHQMjLXWSyTzgblIQCbSZ20MA="; + vendorHash = "sha256-r/zAAWyLe6VYztsZuYlwg0jozGf8cScUKIcIdtZ0LvQ="; sourceRoot = "${finalAttrs.src.name}/server"; diff --git a/pkgs/by-name/ni/nickel/package.nix b/pkgs/by-name/ni/nickel/package.nix index 081dafa00ab5..8eeb37cf6d74 100644 --- a/pkgs/by-name/ni/nickel/package.nix +++ b/pkgs/by-name/ni/nickel/package.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "nickel"; - version = "1.15.1"; + version = "1.16.0"; src = fetchFromGitHub { owner = "tweag"; repo = "nickel"; tag = finalAttrs.version; - hash = "sha256-NGivq2V4wdJapzU5iLcuHrz2RDz2WhnikmCq+75a338="; + hash = "sha256-G+ik4tMr+WsDpiEFYv80ruBR/SpeEg9agUWqgXrq7UI="; }; - cargoHash = "sha256-uCy/Qo92yZ4pjjgW64nWYH21EbdMMwGXP5522tl8MAE="; + cargoHash = "sha256-E3UBkLxd7AC/Pk1Zgy+KvHTPXgATqIr7lZXPB8vlSWs="; cargoBuildFlags = [ "--package" diff --git a/pkgs/by-name/pe/peacock/package.nix b/pkgs/by-name/pe/peacock/package.nix index 01f9fb1213a3..b2ffe06fce40 100644 --- a/pkgs/by-name/pe/peacock/package.nix +++ b/pkgs/by-name/pe/peacock/package.nix @@ -13,13 +13,13 @@ in stdenv.mkDerivation (finalAttrs: { pname = "peacock"; - version = "8.3.0"; + version = "8.7.0"; src = fetchFromGitHub { owner = "thepeacockproject"; repo = "Peacock"; tag = "v${finalAttrs.version}"; - hash = "sha256-AegJ5h2sxs8iheBLbIBwZXjjZLk5GdcDVLbF4ldcmZ0="; + hash = "sha256-kDR2ObXzo8UudjfqU/lQl6dqblFhIEgnr20EKjiWKVw="; }; nativeBuildInputs = [ @@ -76,7 +76,7 @@ stdenv.mkDerivation (finalAttrs: { missingHashes = ./missing-hashes.json; offlineCache = yarn-berry.fetchYarnBerryDeps { inherit (finalAttrs) src missingHashes; - hash = "sha256-sB0oag0sheimho8pn25HSc8GMeuS1RTmHLZUPiSSDqE="; + hash = "sha256-Ecpls4iGBVqSLm/4kyY0EsRa6NINodHc05DtwOfZYG4="; }; meta = { diff --git a/pkgs/by-name/po/poptracker/package.nix b/pkgs/by-name/po/poptracker/package.nix index c542b9f09a8a..bd9e24f9b560 100644 --- a/pkgs/by-name/po/poptracker/package.nix +++ b/pkgs/by-name/po/poptracker/package.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "poptracker"; - version = "0.33.0"; + version = "0.34.0"; src = fetchFromGitHub { owner = "black-sliver"; repo = "PopTracker"; tag = "v${finalAttrs.version}"; - hash = "sha256-3JcE963GSAUs82OF59Yf7PjQV0FHKsCYx+q3TWQsHpY="; + hash = "sha256-4sdwW4P+5Y+JHy2dU55Fobedh0toXoU6pIWTN294GMc="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/pr/pretix-banktool/package.nix b/pkgs/by-name/pr/pretix-banktool/package.nix index 1223a21590ef..00634df8a597 100644 --- a/pkgs/by-name/pr/pretix-banktool/package.nix +++ b/pkgs/by-name/pr/pretix-banktool/package.nix @@ -4,7 +4,14 @@ fetchFromGitHub, }: -python3Packages.buildPythonApplication (finalAttrs: { +let + pythonPackages = python3Packages.overrideScope ( + self: super: { + fints = self.fints_4; + } + ); +in +pythonPackages.buildPythonApplication (finalAttrs: { pname = "pretix-banktool"; version = "1.1.0"; pyproject = true; @@ -16,9 +23,9 @@ python3Packages.buildPythonApplication (finalAttrs: { hash = "sha256-x6P+WqrOak5/gmMEmBkHrx6kPsbSOAXbKRbndFG3IJU="; }; - build-system = with python3Packages; [ setuptools ]; + build-system = with pythonPackages; [ setuptools ]; - dependencies = with python3Packages; [ + dependencies = with pythonPackages; [ click fints requests diff --git a/pkgs/by-name/ra/radicale/package.nix b/pkgs/by-name/ra/radicale/package.nix index 184764fd31c9..5cf9545e8bb0 100644 --- a/pkgs/by-name/ra/radicale/package.nix +++ b/pkgs/by-name/ra/radicale/package.nix @@ -7,14 +7,14 @@ python3.pkgs.buildPythonApplication (finalAttrs: { pname = "radicale"; - version = "3.6.0"; + version = "3.6.1"; pyproject = true; src = fetchFromGitHub { owner = "Kozea"; repo = "Radicale"; tag = "v${finalAttrs.version}"; - hash = "sha256-FzCNmmlQeka+Z7h1Dp631coKPF7gc0LOWnyca994bgs="; + hash = "sha256-NPebEqLSDsR+FSA3vM0k8JJ8ciIDaRs34z4DBvr5GOE="; }; build-system = with python3.pkgs; [ diff --git a/pkgs/by-name/ra/radicle-node/package.nix b/pkgs/by-name/ra/radicle-node/package.nix index ff4638e104d5..4cad77577500 100644 --- a/pkgs/by-name/ra/radicle-node/package.nix +++ b/pkgs/by-name/ra/radicle-node/package.nix @@ -14,17 +14,23 @@ stdenv, xdg-utils, versionCheckHook, + + version ? "1.6.1", + srcHash ? "sha256-7kwtWuYdYG3MDHThCkY5OZmx4pWaQXMYoOlJszmV2rM=", + cargoHash ? "sha256-59RyfSUJNoQ7EtQK3OSYOIO/YVEjeeM9ovbojHFX4pI=", + updateScript ? ./update.sh, }: rustPlatform.buildRustPackage (finalAttrs: { + inherit version cargoHash; + pname = "radicle-node"; - version = "1.6.1"; src = fetchFromRadicle { seed = "seed.radicle.xyz"; repo = "z3gqcJUoA1n9HaHKufZs5FCSGazv5"; tag = "releases/${finalAttrs.version}"; - hash = "sha256-7kwtWuYdYG3MDHThCkY5OZmx4pWaQXMYoOlJszmV2rM="; + hash = srcHash; leaveDotGit = true; postFetch = '' git -C $out rev-parse HEAD > $out/.git_head @@ -33,8 +39,6 @@ rustPlatform.buildRustPackage (finalAttrs: { ''; }; - cargoHash = "sha256-59RyfSUJNoQ7EtQK3OSYOIO/YVEjeeM9ovbojHFX4pI="; - env.RADICLE_VERSION = finalAttrs.version; nativeBuildInputs = [ @@ -112,34 +116,40 @@ rustPlatform.buildRustPackage (finalAttrs: { done ''; - passthru.updateScript = ./update.sh; - passthru.tests = { - basic = - runCommand "radicle-node-basic-test" - { - nativeBuildInputs = [ - jq - openssh - finalAttrs.finalPackage - ]; - } - '' - set -e - export RAD_HOME="$PWD/.radicle" - mkdir -p "$RAD_HOME/keys" - ssh-keygen -t ed25519 -N "" -f "$RAD_HOME/keys/radicle" > /dev/null - jq -n '.node.alias |= "nix"' > "$RAD_HOME/config.json" + passthru = { + inherit updateScript; + tests = { + basic = + runCommand "radicle-node-basic-test" + { + nativeBuildInputs = [ + jq + openssh + finalAttrs.finalPackage + ]; + } + '' + set -e + export RAD_HOME="$PWD/.radicle" + mkdir -p "$RAD_HOME/keys" + ssh-keygen -t ed25519 -N "" -f "$RAD_HOME/keys/radicle" > /dev/null + jq -n '.node.alias |= "nix"' > "$RAD_HOME/config.json" - rad config > /dev/null - rad debug | jq -e ' - (.sshVersion | contains("${openssh.version}")) - and - (.gitVersion | contains("${gitMinimal.version}")) - ' + rad config > /dev/null + rad debug | jq -e ' + (.sshVersion | contains("${openssh.version}")) + and + (.gitVersion | contains("${gitMinimal.version}")) + ' - touch $out - ''; - nixos-run = nixosTests.radicle; + touch $out + ''; + nixos-run = nixosTests.radicle.extendNixOS { + module = { + services.radicle.package = finalAttrs.finalPackage; + }; + }; + }; }; meta = { diff --git a/pkgs/by-name/ra/radicle-node/unstable.nix b/pkgs/by-name/ra/radicle-node/unstable.nix new file mode 100644 index 000000000000..2f2fd8f30a34 --- /dev/null +++ b/pkgs/by-name/ra/radicle-node/unstable.nix @@ -0,0 +1,8 @@ +{ radicle-node }: + +radicle-node.override { + version = "1.7.0-rc.1"; + srcHash = "sha256-eq7rUzTbmPb0pRfcFnWP4vrbCTbXW9N4BleDCMUnLH8="; + cargoHash = "sha256-OkgWdu+7FY1tq0bjMbhjqjlJT9ZUgR8i12LhqyFJi+A="; + updateScript = ./update-unstable.sh; +} diff --git a/pkgs/by-name/ra/radicle-node/update-unstable.sh b/pkgs/by-name/ra/radicle-node/update-unstable.sh new file mode 100755 index 000000000000..217b0c1d0677 --- /dev/null +++ b/pkgs/by-name/ra/radicle-node/update-unstable.sh @@ -0,0 +1,5 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p coreutils gnugrep common-updater-scripts nix-update + +version=$(list-git-tags | grep -oP '^releases/\K\d+\.\d+\.\d+.*' | sort -rV | head -1) +nix-update --version="$version" radicle-node-unstable --override-filename pkgs/by-name/ra/radicle-node/unstable.nix diff --git a/pkgs/by-name/ra/rapidraw/package.nix b/pkgs/by-name/ra/rapidraw/package.nix index 0db473243c87..b77102168e81 100644 --- a/pkgs/by-name/ra/rapidraw/package.nix +++ b/pkgs/by-name/ra/rapidraw/package.nix @@ -42,13 +42,13 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "rapidraw"; - version = "1.4.12"; + version = "1.5.0"; src = fetchFromGitHub { owner = "CyberTimon"; repo = "RapidRAW"; tag = "v${finalAttrs.version}"; - hash = "sha256-esNw3JmQZ0Qbqtwno5SREVwIxR7DBi50GS9BCjgNGuA="; + hash = "sha256-PzPw7TJQK6ojsdw8cypS/drtc/ec93IYGIjTEdpIraI="; fetchSubmodules = true; # darwin/linux hash mismatch in rawler submodule @@ -58,11 +58,11 @@ rustPlatform.buildRustPackage (finalAttrs: { ''; }; - cargoHash = "sha256-F5fN14dv8iFUub3bYci+MC8fuyLLZKuoF9W1cfJ7NLo="; + cargoHash = "sha256-cgqNGft6LK5XNGv1CDLw5v+m8a9xmu7albfoGJnkE34="; npmDeps = fetchNpmDeps { inherit (finalAttrs) src; - hash = "sha256-jenSEANarab/oQnC80NoM1jWmvdeXF3bJ9I/vOGcBb0="; + hash = "sha256-4PbNSM4BIMOpmPcys/Vt5gzy/Pu9L6rPcG0lGnTDvGo="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/re/resources/package.nix b/pkgs/by-name/re/resources/package.nix index 8d17c5910e33..8a365331f98c 100644 --- a/pkgs/by-name/re/resources/package.nix +++ b/pkgs/by-name/re/resources/package.nix @@ -23,18 +23,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "resources"; - version = "1.10.0"; + version = "1.10.1-1"; src = fetchFromGitHub { owner = "nokyan"; repo = "resources"; tag = "v${finalAttrs.version}"; - hash = "sha256-e8iUBmEqDlqwczpkkS9lI+oflyc95IxPhd8c9Vsw1LQ="; + hash = "sha256-NjzHGz90MhdjBHP88+qBI/5usCpPPrukSaVHoOJJXSI="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; - hash = "sha256-6xIyLNblcTzB3V/LfbJkEEVB5KiR/RZccFG1l1ahlr0="; + hash = "sha256-wATJxWemn5VxRsRat5I4uEnymsfMM6AX+hP422cUtBo="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/re/resterm/package.nix b/pkgs/by-name/re/resterm/package.nix index 17d05dbf3a33..43a6089d7f2d 100644 --- a/pkgs/by-name/re/resterm/package.nix +++ b/pkgs/by-name/re/resterm/package.nix @@ -8,16 +8,16 @@ buildGoModule (finalAttrs: { pname = "resterm"; - version = "0.23.3"; + version = "0.23.6"; src = fetchFromGitHub { owner = "unkn0wn-root"; repo = "resterm"; tag = "v${finalAttrs.version}"; - sha256 = "sha256-FS+pStcAuoslrso1kmriyKhr2I8MdvvUnH262hMKLEg="; + sha256 = "sha256-MVcLyPPnQIn0IZcGOoELRSQkI+BEIXSZfWeeZv6AILI="; }; - vendorHash = "sha256-UnjH2d0w+ttIE2QTsYvpvNVYT6m9d0TGcrIhNE0SjTI="; + vendorHash = "sha256-AjckKD6NScBa8w9nWMdVExuNadz3vHnK854XXg3nj84="; # modernc.org/libc (via modernc.org/sqlite) tries to read /etc/protocols modPostBuild = '' diff --git a/pkgs/by-name/si/siyuan/package.nix b/pkgs/by-name/si/siyuan/package.nix index 90818ab0739f..b5e30f38e30f 100644 --- a/pkgs/by-name/si/siyuan/package.nix +++ b/pkgs/by-name/si/siyuan/package.nix @@ -36,20 +36,20 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "siyuan"; - version = "3.5.5"; + version = "3.5.8"; src = fetchFromGitHub { owner = "siyuan-note"; repo = "siyuan"; rev = "v${finalAttrs.version}"; - hash = "sha256-iGwREddg5Pzr6fM/YTYj28g+p8tkQa9EiM6py94UlSc="; + hash = "sha256-mXDro4m2QZEUcljpQNC5JqhVbRZgBVU1Wfiq1JtS0B0="; }; kernel = buildGoModule { name = "${finalAttrs.pname}-${finalAttrs.version}-kernel"; inherit (finalAttrs) src; sourceRoot = "${finalAttrs.src.name}/kernel"; - vendorHash = "sha256-4yqUUP6b2KL+xLKQTiTPqIISyqdIsHpf+p1jsG/kquI="; + vendorHash = "sha256-i7eq8RDbuv+FzreClW8JFocUs7R8A02cOZ8NaAGBMfA="; patches = [ (replaceVars ./set-pandoc-path.patch { @@ -100,7 +100,7 @@ stdenv.mkDerivation (finalAttrs: { ; pnpm = pnpm_9; fetcherVersion = 1; - hash = "sha256-i11Hr/KA7Q27Z26AOmc6GNwSW/ZcwSyaNtNBJii5r2A="; + hash = "sha256-GLwREEnDf3NIbQsX+LA/n6zZYvTlyiJaozfKyk04go8="; }; sourceRoot = "${finalAttrs.src.name}/app"; diff --git a/pkgs/by-name/st/streamripper/package.nix b/pkgs/by-name/st/streamripper/package.nix index 0ce9845ea31e..907acb61087c 100644 --- a/pkgs/by-name/st/streamripper/package.nix +++ b/pkgs/by-name/st/streamripper/package.nix @@ -35,6 +35,13 @@ stdenv.mkDerivation rec { patch = "873964-http"; hash = "sha256-D6koUCbnJHtRuq2zZy9VrxymuGXN1COacbQhphgB8qo="; }) + # fix build with gcc 15 + (fetchDebianPatch { + inherit pname version; + debianRevision = "4"; + patch = "1097944-gcc15"; + hash = "sha256-yBFDxd2sNlavQDmg/MCORFdpJY8p1Lzo131T4sBby5g="; + }) # fix SR_ERROR_INVALID_METADATA caused by HTTP chunking # (https://sourceforge.net/p/streamripper/bugs/193/#6a82) (fetchpatch { @@ -57,5 +64,6 @@ stdenv.mkDerivation rec { description = "Application that lets you record streaming mp3 to your hard drive"; license = lib.licenses.gpl2; mainProgram = "streamripper"; + maintainers = with lib.maintainers; [ cybershadow ]; }; } diff --git a/pkgs/development/beam-modules/rebar3-release.nix b/pkgs/development/beam-modules/rebar3-release.nix index 11d1ebfd3ab4..e1af791cfa5a 100644 --- a/pkgs/development/beam-modules/rebar3-release.nix +++ b/pkgs/development/beam-modules/rebar3-release.nix @@ -74,7 +74,9 @@ let inherit src; - env.REBAR_IGNORE_DEPS = beamDeps != [ ]; + env = (attrs.env or { }) // { + REBAR_IGNORE_DEPS = beamDeps != [ ]; + }; configurePhase = '' runHook preConfigure diff --git a/pkgs/development/interpreters/php/8.2.nix b/pkgs/development/interpreters/php/8.2.nix deleted file mode 100644 index ecf54354a8b7..000000000000 --- a/pkgs/development/interpreters/php/8.2.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ callPackage, ... }@_args: - -let - base = callPackage ./generic.nix ( - _args - // { - version = "8.2.30"; - hash = "sha256-EEggtsj8lZ3eSzNCE19CvavyRuhpGKFjgaF9hEfIZvo="; - } - ); -in -base.withExtensions ( - { all, ... }: - with all; - [ - bcmath - calendar - curl - ctype - dom - exif - fileinfo - filter - ftp - gd - gettext - gmp - iconv - imap - intl - ldap - mbstring - mysqli - mysqlnd - opcache - openssl - pcntl - pdo - pdo_mysql - pdo_odbc - pdo_pgsql - pdo_sqlite - pgsql - posix - readline - session - simplexml - sockets - soap - sodium - sysvsem - sqlite3 - tokenizer - xmlreader - xmlwriter - zip - zlib - ] -) diff --git a/pkgs/development/interpreters/php/8.3.nix b/pkgs/development/interpreters/php/8.3.nix deleted file mode 100644 index 5421559bc7f2..000000000000 --- a/pkgs/development/interpreters/php/8.3.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ callPackage, ... }@_args: - -let - base = callPackage ./generic.nix ( - _args - // { - version = "8.3.30"; - hash = "sha256-gAt7btULc8jueETuXy98xhL6p4daCqfEUp6O1YZqUDA="; - } - ); -in -base.withExtensions ( - { all, ... }: - with all; - [ - bcmath - calendar - curl - ctype - dom - exif - fileinfo - filter - ftp - gd - gettext - gmp - iconv - imap - intl - ldap - mbstring - mysqli - mysqlnd - opcache - openssl - pcntl - pdo - pdo_mysql - pdo_odbc - pdo_pgsql - pdo_sqlite - pgsql - posix - readline - session - simplexml - sockets - soap - sodium - sysvsem - sqlite3 - tokenizer - xmlreader - xmlwriter - zip - zlib - ] -) diff --git a/pkgs/development/interpreters/php/8.4.nix b/pkgs/development/interpreters/php/8.4.nix deleted file mode 100644 index 3b1fcbd893c9..000000000000 --- a/pkgs/development/interpreters/php/8.4.nix +++ /dev/null @@ -1,58 +0,0 @@ -{ callPackage, ... }@_args: - -let - base = callPackage ./generic.nix ( - _args - // { - version = "8.4.18"; - hash = "sha256-WGsy2Szrz7yklcX2rRozZAVT0KnAv9LmcVM02VnPmFg="; - } - ); -in -base.withExtensions ( - { all, ... }: - with all; - [ - bcmath - calendar - curl - ctype - dom - exif - fileinfo - filter - ftp - gd - gettext - gmp - iconv - intl - ldap - mbstring - mysqli - mysqlnd - opcache - openssl - pcntl - pdo - pdo_mysql - pdo_odbc - pdo_pgsql - pdo_sqlite - pgsql - posix - readline - session - simplexml - sockets - soap - sodium - sysvsem - sqlite3 - tokenizer - xmlreader - xmlwriter - zip - zlib - ] -) diff --git a/pkgs/development/interpreters/php/8.5.nix b/pkgs/development/interpreters/php/8.5.nix deleted file mode 100644 index 6eecaf1b72cd..000000000000 --- a/pkgs/development/interpreters/php/8.5.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ callPackage, ... }@_args: - -let - base = callPackage ./generic.nix ( - _args - // { - version = "8.5.3"; - hash = "sha256-/F7KvBg862TZ/KPc04e9KbK2dEgyavmY/eADEkkWgjs="; - } - ); -in -base.withExtensions ( - { all, ... }: - with all; - [ - bcmath - calendar - curl - ctype - dom - exif - fileinfo - filter - ftp - gd - gettext - gmp - iconv - intl - ldap - mbstring - mysqli - mysqlnd - openssl - pcntl - pdo - pdo_mysql - pdo_odbc - pdo_pgsql - pdo_sqlite - pgsql - posix - readline - session - simplexml - sockets - soap - sodium - sysvsem - sqlite3 - tokenizer - xmlreader - xmlwriter - zip - zlib - ] -) diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index ba59bef5f802..4bc90e463d7c 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -1,4 +1,5 @@ { + lib, callPackage, stdenv, llvmPackages, @@ -6,16 +7,81 @@ }: let - commonArgs = { - stdenv = if stdenv.cc.isClang then llvmPackages.stdenv else stdenv; - pcre2 = pcre2.override { - withJitSealloc = false; # See https://bugs.php.net/bug.php?id=78927 and https://bugs.php.net/bug.php?id=78630 - }; - }; + mkPhp = + { version, hash }: + let + base = callPackage ./generic.nix { + stdenv = if stdenv.cc.isClang then llvmPackages.stdenv else stdenv; + pcre2 = pcre2.override { + withJitSealloc = false; # See https://bugs.php.net/bug.php?id=78927 and https://bugs.php.net/bug.php?id=78630 + }; + inherit version hash; + }; + in + base.withExtensions ( + { all, ... }: + with all; + [ + bcmath + calendar + curl + ctype + dom + exif + fileinfo + filter + ftp + gd + gettext + gmp + iconv + intl + ldap + mbstring + mysqli + mysqlnd + openssl + pcntl + pdo + pdo_mysql + pdo_odbc + pdo_pgsql + pdo_sqlite + pgsql + posix + readline + session + simplexml + sockets + soap + sodium + sysvsem + sqlite3 + tokenizer + xmlreader + xmlwriter + zip + zlib + ] + ++ lib.optionals (lib.versionOlder version "8.4") [ all.imap ] + ++ lib.optionals (lib.versionOlder version "8.5") [ all.opcache ] + ); in { - php82 = callPackage ./8.2.nix commonArgs; - php83 = callPackage ./8.3.nix commonArgs; - php84 = callPackage ./8.4.nix commonArgs; - php85 = callPackage ./8.5.nix commonArgs; + php82 = mkPhp { + version = "8.2.30"; + hash = "sha256-EEggtsj8lZ3eSzNCE19CvavyRuhpGKFjgaF9hEfIZvo="; + }; + php83 = mkPhp { + version = "8.3.30"; + hash = "sha256-gAt7btULc8jueETuXy98xhL6p4daCqfEUp6O1YZqUDA="; + }; + php84 = mkPhp { + version = "8.4.18"; + hash = "sha256-WGsy2Szrz7yklcX2rRozZAVT0KnAv9LmcVM02VnPmFg="; + }; + php85 = mkPhp { + version = "8.5.3"; + hash = "sha256-/F7KvBg862TZ/KPc04e9KbK2dEgyavmY/eADEkkWgjs="; + }; } diff --git a/pkgs/development/interpreters/php/generic.nix b/pkgs/development/interpreters/php/generic.nix index d1891d56fabf..b40972d7696f 100644 --- a/pkgs/development/interpreters/php/generic.nix +++ b/pkgs/development/interpreters/php/generic.nix @@ -382,14 +382,14 @@ let jq ] } - new_version=$(curl --silent "https://www.php.net/releases/active" | jq --raw-output '."${lib.versions.major version}"."${lib.versions.majorMinor version}".version') + new_version=$(curl --silent "https://www.php.net/releases/active.php" | jq --raw-output '."${lib.versions.major version}"."${lib.versions.majorMinor version}".version') update-source-version "$UPDATE_NIX_ATTR_PATH.unwrapped" "$new_version" "--file=$1" ''; in [ script # Passed as an argument so that update.nix can ensure it does not become a store path. - (./. + "/${lib.versions.majorMinor version}.nix") + ./default.nix ]; buildEnv = mkBuildEnv { } [ ]; withExtensions = mkWithExtensions { } [ ]; diff --git a/pkgs/development/python-modules/adblock/default.nix b/pkgs/development/python-modules/adblock/default.nix index 075c73e566cb..325032dac931 100644 --- a/pkgs/development/python-modules/adblock/default.nix +++ b/pkgs/development/python-modules/adblock/default.nix @@ -60,7 +60,7 @@ buildPythonPackage rec { libiconv ]; - PSL_PATH = "${publicsuffix-list}/share/publicsuffix/public_suffix_list.dat"; + env.PSL_PATH = "${publicsuffix-list}/share/publicsuffix/public_suffix_list.dat"; nativeCheckInputs = [ pytestCheckHook diff --git a/pkgs/development/python-modules/atproto/default.nix b/pkgs/development/python-modules/atproto/default.nix index 8d6ffc08b509..055acdf93f84 100644 --- a/pkgs/development/python-modules/atproto/default.nix +++ b/pkgs/development/python-modules/atproto/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { hash = "sha256-0NogKxYO+lCtNhK2ZWwRLQTV7rHU5Oz+lnE4awsoPsM="; }; - POETRY_DYNAMIC_VERSIONING_BYPASS = version; + env.POETRY_DYNAMIC_VERSIONING_BYPASS = version; build-system = [ poetry-core diff --git a/pkgs/development/python-modules/backrefs/default.nix b/pkgs/development/python-modules/backrefs/default.nix index fb1c6ef011f0..b2325309e232 100644 --- a/pkgs/development/python-modules/backrefs/default.nix +++ b/pkgs/development/python-modules/backrefs/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "backrefs"; - version = "6.1"; + version = "6.2"; pyproject = true; src = fetchFromGitHub { owner = "facelessuser"; repo = "backrefs"; tag = version; - hash = "sha256-MeQsEKHIB7WnITMUtRP4vLLr2DjvrorKHKWxgd07qko="; + hash = "sha256-y0scI6FBvjuvWLx1V3AHiGhtLB2Mk7jCx4hEjOv+ETA="; }; build-system = [ diff --git a/pkgs/development/python-modules/banks/default.nix b/pkgs/development/python-modules/banks/default.nix index 9798a2f50f93..2bb4a2189891 100644 --- a/pkgs/development/python-modules/banks/default.nix +++ b/pkgs/development/python-modules/banks/default.nix @@ -29,7 +29,7 @@ buildPythonPackage (finalAttrs: { hash = "sha256-wa3refEIYQIPmtl8NGtoyg2PTY3zQt6R4EgXUbcUgrk="; }; - SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt"; + env.SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt"; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/bimmer-connected/default.nix b/pkgs/development/python-modules/bimmer-connected/default.nix index 7ffc85411b0a..bb1e96e45099 100644 --- a/pkgs/development/python-modules/bimmer-connected/default.nix +++ b/pkgs/development/python-modules/bimmer-connected/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { setuptools ]; - PBR_VERSION = version; + env.PBR_VERSION = version; dependencies = [ httpx diff --git a/pkgs/development/python-modules/carbon/default.nix b/pkgs/development/python-modules/carbon/default.nix index 7ea88b54262f..86efd5ce79ff 100644 --- a/pkgs/development/python-modules/carbon/default.nix +++ b/pkgs/development/python-modules/carbon/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { # Carbon-s default installation is /opt/graphite. This env variable ensures # carbon is installed as a regular Python module. - GRAPHITE_NO_PREFIX = "True"; + env.GRAPHITE_NO_PREFIX = "True"; postPatch = '' substituteInPlace setup.py \ diff --git a/pkgs/development/python-modules/cassandra-driver/default.nix b/pkgs/development/python-modules/cassandra-driver/default.nix index bd577244aadf..d4a86bc566a7 100644 --- a/pkgs/development/python-modules/cassandra-driver/default.nix +++ b/pkgs/development/python-modules/cassandra-driver/default.nix @@ -66,7 +66,7 @@ buildPythonPackage rec { ++ lib.concatAttrValues optional-dependencies; # This is used to determine the version of cython that can be used - CASS_DRIVER_ALLOWED_CYTHON_VERSION = cython.version; + env.CASS_DRIVER_ALLOWED_CYTHON_VERSION = cython.version; preBuild = '' export CASS_DRIVER_BUILD_CONCURRENCY=$NIX_BUILD_CORES diff --git a/pkgs/development/python-modules/cppe/default.nix b/pkgs/development/python-modules/cppe/default.nix index 63c05e7998a7..5bbaffa08e05 100644 --- a/pkgs/development/python-modules/cppe/default.nix +++ b/pkgs/development/python-modules/cppe/default.nix @@ -42,7 +42,9 @@ buildPythonPackage { buildInputs = [ pybind11 ] ++ lib.optional stdenv.cc.isClang llvmPackages.openmp; - NIX_CFLAGS_LINK = lib.optional stdenv.cc.isClang "-lomp"; + env = lib.optionalAttrs stdenv.cc.isClang { + NIX_CFLAGS_LINK = "-lomp"; + }; hardeningDisable = lib.optional stdenv.cc.isClang "strictoverflow"; diff --git a/pkgs/development/python-modules/cython/0.nix b/pkgs/development/python-modules/cython/0.nix index a54ebfa8b156..53d0847d1d90 100644 --- a/pkgs/development/python-modules/cython/0.nix +++ b/pkgs/development/python-modules/cython/0.nix @@ -58,7 +58,7 @@ buildPythonPackage rec { ncurses ]; - LC_ALL = "en_US.UTF-8"; + env.LC_ALL = "en_US.UTF-8"; patches = [ # backport Cython 3.0 trashcan support (https://github.com/cython/cython/pull/2842) to 0.X series. diff --git a/pkgs/development/python-modules/django-annoying/default.nix b/pkgs/development/python-modules/django-annoying/default.nix index 5ececfb35041..efc39512ad25 100644 --- a/pkgs/development/python-modules/django-annoying/default.nix +++ b/pkgs/development/python-modules/django-annoying/default.nix @@ -28,7 +28,7 @@ buildPythonPackage (finalAttrs: { six ]; - DJANGO_SETTINGS_MODULE = "tests.settings"; + env.DJANGO_SETTINGS_MODULE = "tests.settings"; nativeCheckInputs = [ pytest-django diff --git a/pkgs/development/python-modules/django-cacheops/default.nix b/pkgs/development/python-modules/django-cacheops/default.nix index c6a046b2cd32..f0c7d41d02a5 100644 --- a/pkgs/development/python-modules/django-cacheops/default.nix +++ b/pkgs/development/python-modules/django-cacheops/default.nix @@ -54,7 +54,7 @@ buildPythonPackage rec { redisTestHook ]; - DJANGO_SETTINGS_MODULE = "tests.settings"; + env.DJANGO_SETTINGS_MODULE = "tests.settings"; meta = { description = "Slick ORM cache with automatic granular event-driven invalidation for Django"; diff --git a/pkgs/development/python-modules/django-celery-email/default.nix b/pkgs/development/python-modules/django-celery-email/default.nix index 258db03a52a1..368dce09ba1e 100644 --- a/pkgs/development/python-modules/django-celery-email/default.nix +++ b/pkgs/development/python-modules/django-celery-email/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { celery ]; - DJANGO_SETTINGS_MODULE = "tests.settings"; + env.DJANGO_SETTINGS_MODULE = "tests.settings"; nativeCheckInputs = [ pytest-django diff --git a/pkgs/development/python-modules/django-ckeditor/default.nix b/pkgs/development/python-modules/django-ckeditor/default.nix index 1c05c28ba54d..d33dae8bcff6 100644 --- a/pkgs/development/python-modules/django-ckeditor/default.nix +++ b/pkgs/development/python-modules/django-ckeditor/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pillow ]; - DJANGO_SETTINGS_MODULE = "ckeditor_demo.settings"; + env.DJANGO_SETTINGS_MODULE = "ckeditor_demo.settings"; checkInputs = [ django-extensions diff --git a/pkgs/development/python-modules/django-hierarkey/default.nix b/pkgs/development/python-modules/django-hierarkey/default.nix index f7bcb1f94938..f366fb3fa58c 100644 --- a/pkgs/development/python-modules/django-hierarkey/default.nix +++ b/pkgs/development/python-modules/django-hierarkey/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { pytestCheckHook ]; - DJANGO_SETTINGS_MODULE = "tests.settings"; + env.DJANGO_SETTINGS_MODULE = "tests.settings"; enabledTestPaths = [ "tests" ]; diff --git a/pkgs/development/python-modules/django-sekizai/default.nix b/pkgs/development/python-modules/django-sekizai/default.nix index 36c9ce04a0ec..f32a2a9f9cc7 100644 --- a/pkgs/development/python-modules/django-sekizai/default.nix +++ b/pkgs/development/python-modules/django-sekizai/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "sekizai" ]; - DJANGO_SETTINGS_MODULE = "tests.settings"; + env.DJANGO_SETTINGS_MODULE = "tests.settings"; meta = { description = "Define placeholders where your blocks get rendered and append to those blocks"; diff --git a/pkgs/development/python-modules/django-tinymce/default.nix b/pkgs/development/python-modules/django-tinymce/default.nix index 82d7e0b06374..9e66148afb6b 100644 --- a/pkgs/development/python-modules/django-tinymce/default.nix +++ b/pkgs/development/python-modules/django-tinymce/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { dependencies = [ django ]; - DJANGO_SETTINGS_MODULE = "tests.settings"; + env.DJANGO_SETTINGS_MODULE = "tests.settings"; checkInputs = [ pytest-django diff --git a/pkgs/development/python-modules/djmail/default.nix b/pkgs/development/python-modules/djmail/default.nix index 432e09e41aee..27884eac344d 100644 --- a/pkgs/development/python-modules/djmail/default.nix +++ b/pkgs/development/python-modules/djmail/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { nativeBuildInputs = [ glibcLocales ]; - LC_ALL = "en_US.UTF-8"; + env.LC_ALL = "en_US.UTF-8"; propagatedBuildInputs = [ celery diff --git a/pkgs/development/python-modules/ducc0/default.nix b/pkgs/development/python-modules/ducc0/default.nix index 7262ba256ab8..61e02af2b93d 100644 --- a/pkgs/development/python-modules/ducc0/default.nix +++ b/pkgs/development/python-modules/ducc0/default.nix @@ -30,8 +30,10 @@ buildPythonPackage rec { substituteInPlace pyproject.toml --replace-fail '"pybind11>=2.13.6", ' "" ''; - DUCC0_USE_NANOBIND = ""; - DUCC0_OPTIMIZATION = "portable"; + env = { + DUCC0_USE_NANOBIND = ""; + DUCC0_OPTIMIZATION = "portable"; + }; build-system = [ cmake diff --git a/pkgs/development/python-modules/emailthreads/default.nix b/pkgs/development/python-modules/emailthreads/default.nix index 21eced43f96c..fdb06f2436cc 100644 --- a/pkgs/development/python-modules/emailthreads/default.nix +++ b/pkgs/development/python-modules/emailthreads/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { nativeCheckInputs = [ unittestCheckHook ]; - PKGVER = version; + env.PKGVER = version; meta = { homepage = "https://github.com/emersion/python-emailthreads"; diff --git a/pkgs/development/python-modules/fints/4.nix b/pkgs/development/python-modules/fints/4.nix new file mode 100644 index 000000000000..089e022842eb --- /dev/null +++ b/pkgs/development/python-modules/fints/4.nix @@ -0,0 +1,53 @@ +{ + lib, + buildPythonPackage, + setuptools, + fetchFromGitHub, + bleach, + mt-940, + pretix-banktool, + requests, + sepaxml, + pytestCheckHook, + pytest-mock, +}: + +buildPythonPackage rec { + version = "4.2.4"; + pname = "fints"; + pyproject = true; + + src = fetchFromGitHub { + owner = "raphaelm"; + repo = "python-fints"; + tag = "v${version}"; + hash = "sha256-la5vpWBoZ7hZsAyjjCqHpFfOykDVosI/S9amox1dmzY="; + }; + + pythonRemoveDeps = [ "enum-tools" ]; + + build-system = [ setuptools ]; + + dependencies = [ + bleach + mt-940 + requests + sepaxml + ]; + + __darwinAllowLocalNetworking = true; + + pythonImportsCheck = [ "fints" ]; + + nativeCheckInputs = [ + pytestCheckHook + pytest-mock + ]; + + meta = { + homepage = "https://github.com/raphaelm/python-fints/"; + description = "Pure-python FinTS (formerly known as HBCI) implementation"; + license = lib.licenses.lgpl3Only; + inherit (pretix-banktool.meta) maintainers; + }; +} diff --git a/pkgs/development/python-modules/fints/default.nix b/pkgs/development/python-modules/fints/default.nix index ecd12bedf238..ff1fd5cd52a3 100644 --- a/pkgs/development/python-modules/fints/default.nix +++ b/pkgs/development/python-modules/fints/default.nix @@ -4,6 +4,7 @@ setuptools, fetchFromGitHub, bleach, + lxml, mt-940, requests, sepaxml, @@ -12,7 +13,7 @@ }: buildPythonPackage rec { - version = "4.2.4"; + version = "5.0.0"; pname = "fints"; pyproject = true; @@ -20,7 +21,7 @@ buildPythonPackage rec { owner = "raphaelm"; repo = "python-fints"; tag = "v${version}"; - hash = "sha256-la5vpWBoZ7hZsAyjjCqHpFfOykDVosI/S9amox1dmzY="; + hash = "sha256-ll2+PtcGQiY5nbQTKVetd2ecDBVSXgzWP4Vzzri1Trs="; }; pythonRemoveDeps = [ "enum-tools" ]; @@ -29,6 +30,7 @@ buildPythonPackage rec { dependencies = [ bleach + lxml mt-940 requests sepaxml diff --git a/pkgs/development/python-modules/flashinfer/default.nix b/pkgs/development/python-modules/flashinfer/default.nix index 5882d0ee8164..2e1119edc390 100644 --- a/pkgs/development/python-modules/flashinfer/default.nix +++ b/pkgs/development/python-modules/flashinfer/default.nix @@ -87,7 +87,7 @@ buildPythonPackage rec { export MAX_JOBS="$NIX_BUILD_CORES" ''; - FLASHINFER_CUDA_ARCH_LIST = lib.concatStringsSep ";" torch.cudaCapabilities; + env.FLASHINFER_CUDA_ARCH_LIST = lib.concatStringsSep ";" torch.cudaCapabilities; pythonRemoveDeps = [ "nvidia-cudnn-frontend" diff --git a/pkgs/development/python-modules/flatbuffers/default.nix b/pkgs/development/python-modules/flatbuffers/default.nix index db0405cc34d1..3c36197b7f3d 100644 --- a/pkgs/development/python-modules/flatbuffers/default.nix +++ b/pkgs/development/python-modules/flatbuffers/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { # flatbuffers needs VERSION environment variable for setting the correct # version, otherwise it uses the current date. - VERSION = version; + env.VERSION = version; pythonImportsCheck = [ "flatbuffers" ]; diff --git a/pkgs/development/python-modules/fs/default.nix b/pkgs/development/python-modules/fs/default.nix index c0c97a5849e6..27f9a6d79850 100644 --- a/pkgs/development/python-modules/fs/default.nix +++ b/pkgs/development/python-modules/fs/default.nix @@ -54,7 +54,7 @@ buildPythonPackage rec { glibcLocales ]; - LC_ALL = "en_US.utf-8"; + env.LC_ALL = "en_US.utf-8"; preCheck = '' HOME=$(mktemp -d) diff --git a/pkgs/development/python-modules/google-cloud-storage-control/default.nix b/pkgs/development/python-modules/google-cloud-storage-control/default.nix index d02438fd87d7..ba371f2ec0e2 100644 --- a/pkgs/development/python-modules/google-cloud-storage-control/default.nix +++ b/pkgs/development/python-modules/google-cloud-storage-control/default.nix @@ -16,14 +16,14 @@ buildPythonPackage (finalAttrs: { pname = "google-cloud-storage-control"; - version = "1.9.0"; + version = "1.10.0"; pyproject = true; src = fetchFromGitHub { owner = "googleapis"; repo = "google-cloud-python"; tag = "google-cloud-storage-control-v${finalAttrs.version}"; - hash = "sha256-5xQ4p9xi/6Y8oi7dWo+fdVT8X8U7UGmdKtSsoEanRso="; + hash = "sha256-dgQdfHyGHwdEaJllbz97J/xW4Y0LrpE6ad6LRdax1G4="; }; sourceRoot = "${finalAttrs.src.name}/packages/google-cloud-storage-control"; diff --git a/pkgs/development/python-modules/grpcio/default.nix b/pkgs/development/python-modules/grpcio/default.nix index 722d3990eafe..a7c59f6a2c4f 100644 --- a/pkgs/development/python-modules/grpcio/default.nix +++ b/pkgs/development/python-modules/grpcio/default.nix @@ -64,10 +64,12 @@ buildPythonPackage rec { unset AR ''; - GRPC_BUILD_WITH_BORING_SSL_ASM = ""; - GRPC_PYTHON_BUILD_SYSTEM_OPENSSL = 1; - GRPC_PYTHON_BUILD_SYSTEM_ZLIB = 1; - GRPC_PYTHON_BUILD_SYSTEM_CARES = 1; + env = { + GRPC_BUILD_WITH_BORING_SSL_ASM = ""; + GRPC_PYTHON_BUILD_SYSTEM_OPENSSL = 1; + GRPC_PYTHON_BUILD_SYSTEM_ZLIB = 1; + GRPC_PYTHON_BUILD_SYSTEM_CARES = 1; + }; # does not contain any tests doCheck = false; diff --git a/pkgs/development/python-modules/icalendar-searcher/default.nix b/pkgs/development/python-modules/icalendar-searcher/default.nix index 10925aecbec3..7745937d5720 100644 --- a/pkgs/development/python-modules/icalendar-searcher/default.nix +++ b/pkgs/development/python-modules/icalendar-searcher/default.nix @@ -1,10 +1,10 @@ { buildPythonPackage, fetchFromGitHub, + hatch-vcs, + hatchling, icalendar, lib, - poetry-core, - poetry-dynamic-versioning, pyicu, pytestCheckHook, recurring-ical-events, @@ -12,19 +12,19 @@ buildPythonPackage rec { pname = "icalendar-searcher"; - version = "1.0.4"; + version = "1.0.5"; pyproject = true; src = fetchFromGitHub { owner = "python-caldav"; repo = "icalendar-searcher"; tag = "v${version}"; - hash = "sha256-CHW1++VHoTfNw5GkRfDDTERZGA/RJxc8iME8OPx1q/o="; + hash = "sha256-x11gdW6FuSCktMGtPxTg39C98J0/0C7F07jIHN0ewbY="; }; build-system = [ - poetry-core - poetry-dynamic-versioning + hatch-vcs + hatchling ]; dependencies = [ diff --git a/pkgs/development/python-modules/ifcopenshell/default.nix b/pkgs/development/python-modules/ifcopenshell/default.nix index 37988bb8452e..09a67f05d542 100644 --- a/pkgs/development/python-modules/ifcopenshell/default.nix +++ b/pkgs/development/python-modules/ifcopenshell/default.nix @@ -130,7 +130,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "ifcopenshell" ]; - PYTHONUSERBASE = "."; + env.PYTHONUSERBASE = "."; # We still build with python to generate ifcopenshell_wrapper.py and ifcopenshell_wrapper.so cmakeFlags = [ diff --git a/pkgs/development/python-modules/jax/default.nix b/pkgs/development/python-modules/jax/default.nix index 97876cc1148f..d310e737c433 100644 --- a/pkgs/development/python-modules/jax/default.nix +++ b/pkgs/development/python-modules/jax/default.nix @@ -64,7 +64,7 @@ buildPythonPackage rec { # The version is automatically set to ".dev" if this variable is not set. # https://github.com/google/jax/commit/e01f2617b85c5bdffc5ffb60b3d8d8ca9519a1f3 - JAX_RELEASE = "1"; + env.JAX_RELEASE = "1"; dependencies = [ jaxlib diff --git a/pkgs/development/python-modules/kaldi-active-grammar/default.nix b/pkgs/development/python-modules/kaldi-active-grammar/default.nix index 192e48ab78f1..38c00df1b2db 100644 --- a/pkgs/development/python-modules/kaldi-active-grammar/default.nix +++ b/pkgs/development/python-modules/kaldi-active-grammar/default.nix @@ -34,8 +34,10 @@ buildPythonPackage rec { sha256 = "sha256-VyVshIEVp/ep4Ih7Kj66GF02JEZ4nwgJOtgR2DarzdY="; }; - KALDI_BRANCH = "foo"; - KALDIAG_SETUP_RAW = "1"; + env = { + KALDI_BRANCH = "foo"; + KALDIAG_SETUP_RAW = "1"; + }; patches = [ # Makes sure scikit-build doesn't try to build the dependencies for us diff --git a/pkgs/development/python-modules/libarchive-c/default.nix b/pkgs/development/python-modules/libarchive-c/default.nix index 9501f9bc7cbc..964032a0981a 100644 --- a/pkgs/development/python-modules/libarchive-c/default.nix +++ b/pkgs/development/python-modules/libarchive-c/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { }) ]; - LC_ALL = "en_US.UTF-8"; + env.LC_ALL = "en_US.UTF-8"; postPatch = '' substituteInPlace libarchive/ffi.py --replace-fail \ diff --git a/pkgs/development/python-modules/lunatone-rest-api-client/default.nix b/pkgs/development/python-modules/lunatone-rest-api-client/default.nix index 2f3329615a74..88bf20c2da58 100644 --- a/pkgs/development/python-modules/lunatone-rest-api-client/default.nix +++ b/pkgs/development/python-modules/lunatone-rest-api-client/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "lunatone-rest-api-client"; - version = "0.7.0"; + version = "0.7.2"; pyproject = true; src = fetchFromGitLab { owner = "lunatone-public"; repo = "lunatone-rest-api-client"; tag = "v${version}"; - hash = "sha256-Hw4sH2CYhE205iDc8QWvg9LJVHJSpqI1ziJZoQyXFts="; + hash = "sha256-x9L65L5wEbJMOGlNBoQfPjS8/Ijr+fzaISoDD+cMWzU="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/mail-parser/default.nix b/pkgs/development/python-modules/mail-parser/default.nix index 5f31ca8d35c5..c56abff52667 100644 --- a/pkgs/development/python-modules/mail-parser/default.nix +++ b/pkgs/development/python-modules/mail-parser/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { hash = "sha256-wwLUD/k26utugK/Yx9eXYEdSOvrk0Cy6RkXGDnzZ+fE="; }; - LC_ALL = "en_US.utf-8"; + env.LC_ALL = "en_US.utf-8"; nativeBuildInputs = [ glibcLocales ]; diff --git a/pkgs/development/python-modules/musicbrainzngs/default.nix b/pkgs/development/python-modules/musicbrainzngs/default.nix index 7992af9e1fbe..6b85437a7a1f 100644 --- a/pkgs/development/python-modules/musicbrainzngs/default.nix +++ b/pkgs/development/python-modules/musicbrainzngs/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { buildInputs = [ pkgs.glibcLocales ]; - LC_ALL = "en_US.UTF-8"; + env.LC_ALL = "en_US.UTF-8"; preCheck = '' # Remove tests that rely on networking (breaks sandboxed builds) diff --git a/pkgs/development/python-modules/mxnet/default.nix b/pkgs/development/python-modules/mxnet/default.nix index b42ba43501fe..5dcd11a257dd 100644 --- a/pkgs/development/python-modules/mxnet/default.nix +++ b/pkgs/development/python-modules/mxnet/default.nix @@ -30,7 +30,7 @@ buildPythonPackage { "numpy" ]; - LD_LIBRARY_PATH = lib.makeLibraryPath [ pkgs.mxnet ]; + env.LD_LIBRARY_PATH = toString (lib.makeLibraryPath [ pkgs.mxnet ]); postPatch = '' # Required to support numpy >=1.24 where np.bool is removed in favor of just bool diff --git a/pkgs/development/python-modules/mypyllant/default.nix b/pkgs/development/python-modules/mypyllant/default.nix index 82563845796b..dd08f34a91cc 100644 --- a/pkgs/development/python-modules/mypyllant/default.nix +++ b/pkgs/development/python-modules/mypyllant/default.nix @@ -26,14 +26,14 @@ buildPythonPackage rec { pname = "mypyllant"; - version = "0.9.9"; + version = "0.9.10"; pyproject = true; src = fetchFromGitHub { owner = "signalkraft"; repo = "myPyllant"; tag = "v${version}"; - hash = "sha256-wvqlTlcNy/ue2yfrQyS93vfRSOTsHbvARI+7BKuUuYs="; + hash = "sha256-hsuRoh8meAlPd5+WlYkjbGhNKDLV5XsKn27zQWnrELQ="; }; build-system = [ diff --git a/pkgs/development/python-modules/nbconflux/default.nix b/pkgs/development/python-modules/nbconflux/default.nix index 660e9f80fee5..9a6eae1e713d 100644 --- a/pkgs/development/python-modules/nbconflux/default.nix +++ b/pkgs/development/python-modules/nbconflux/default.nix @@ -47,7 +47,7 @@ buildPythonPackage rec { rm versioneer.py ''; - JUPYTER_PATH = "${nbconvert}/share/jupyter"; + env.JUPYTER_PATH = "${nbconvert}/share/jupyter"; disabledTests = [ "test_post_to_confluence" "test_optional_components" diff --git a/pkgs/development/python-modules/nbsphinx/default.nix b/pkgs/development/python-modules/nbsphinx/default.nix index 22501d467876..cb8470681163 100644 --- a/pkgs/development/python-modules/nbsphinx/default.nix +++ b/pkgs/development/python-modules/nbsphinx/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { # The package has not tests doCheck = false; - JUPYTER_PATH = "${nbconvert}/share/jupyter"; + env.JUPYTER_PATH = "${nbconvert}/share/jupyter"; pythonImportsCheck = [ "nbsphinx" ]; diff --git a/pkgs/development/python-modules/oslo-log/default.nix b/pkgs/development/python-modules/oslo-log/default.nix index c72df54a7976..c221fb175b4c 100644 --- a/pkgs/development/python-modules/oslo-log/default.nix +++ b/pkgs/development/python-modules/oslo-log/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { # Manually set version because prb wants to get it from the git upstream repository (and we are # installing from tarball instead) - PBR_VERSION = version; + env.PBR_VERSION = version; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/psycopg/default.nix b/pkgs/development/python-modules/psycopg/default.nix index e3e13ac78944..caa8eb862cc2 100644 --- a/pkgs/development/python-modules/psycopg/default.nix +++ b/pkgs/development/python-modules/psycopg/default.nix @@ -134,12 +134,6 @@ buildPythonPackage rec { sphinxRoot = "../docs"; - # Introduce this file necessary for the docs build via environment var - LIBPQ_DOCS_FILE = fetchurl { - url = "https://raw.githubusercontent.com/postgres/postgres/496a1dc44bf1261053da9b3f7e430769754298b4/doc/src/sgml/libpq.sgml"; - hash = "sha256-JwtCngkoi9pb0pqIdNgukY8GbG5pUDZvrGAHZqjFOw4"; - }; - inherit patches; # only move to sourceRoot after patching, makes patching easier @@ -185,6 +179,11 @@ buildPythonPackage rec { ++ optional-dependencies.pool; env = { + # Introduce this file necessary for the docs build via environment var + LIBPQ_DOCS_FILE = fetchurl { + url = "https://raw.githubusercontent.com/postgres/postgres/496a1dc44bf1261053da9b3f7e430769754298b4/doc/src/sgml/libpq.sgml"; + hash = "sha256-JwtCngkoi9pb0pqIdNgukY8GbG5pUDZvrGAHZqjFOw4"; + }; postgresqlEnableTCP = 1; PGUSER = "psycopg"; PGDATABASE = "psycopg"; diff --git a/pkgs/development/python-modules/pycontrol4/default.nix b/pkgs/development/python-modules/pycontrol4/default.nix index cfb699b9f270..6764e6c293d9 100644 --- a/pkgs/development/python-modules/pycontrol4/default.nix +++ b/pkgs/development/python-modules/pycontrol4/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "pycontrol4"; - version = "2.0.1"; + version = "2.0.2"; pyproject = true; src = fetchFromGitHub { owner = "lawtancool"; repo = "pyControl4"; tag = "v${version}"; - hash = "sha256-CDo2tphWN62ZHz2nWa6oWWfzcPDhSLCu0B2NxEI8yMw="; + hash = "sha256-4qgyn2ekxo0pjPixfNpRqHE+jgsNQGk9fbESbUTDxMg="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pycrypto/default.nix b/pkgs/development/python-modules/pycrypto/default.nix index 72000acad17e..c79abd49ec1d 100644 --- a/pkgs/development/python-modules/pycrypto/default.nix +++ b/pkgs/development/python-modules/pycrypto/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { format = "setuptools"; # Cannot build wheel otherwise (zip 1980 issue) - SOURCE_DATE_EPOCH = 315532800; + env.SOURCE_DATE_EPOCH = 315532800; # We need to have a dist-info folder, so let's create one with setuptools unpackPhase = '' diff --git a/pkgs/development/python-modules/pyerfa/default.nix b/pkgs/development/python-modules/pyerfa/default.nix index 0f3da6940a6d..5ed9dab2a770 100644 --- a/pkgs/development/python-modules/pyerfa/default.nix +++ b/pkgs/development/python-modules/pyerfa/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { ''; # See https://github.com/liberfa/pyerfa/issues/112#issuecomment-1721197483 - NIX_CFLAGS_COMPILE = "-O2"; + env.NIX_CFLAGS_COMPILE = "-O2"; nativeCheckInputs = [ pytestCheckHook pytest-doctestplus diff --git a/pkgs/development/python-modules/pygit2/default.nix b/pkgs/development/python-modules/pygit2/default.nix index 76673d096c22..0d793e367bf8 100644 --- a/pkgs/development/python-modules/pygit2/default.nix +++ b/pkgs/development/python-modules/pygit2/default.nix @@ -50,7 +50,7 @@ buildPythonPackage rec { # Tests require certificates # https://github.com/NixOS/nixpkgs/pull/72544#issuecomment-582674047 - SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt"; + env.SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt"; pythonImportsCheck = [ "pygit2" ]; diff --git a/pkgs/development/python-modules/pyhepmc/default.nix b/pkgs/development/python-modules/pyhepmc/default.nix index 28339c457468..4e34a3bc239c 100644 --- a/pkgs/development/python-modules/pyhepmc/default.nix +++ b/pkgs/development/python-modules/pyhepmc/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { dontUseCmakeConfigure = true; - CMAKE_ARGS = [ "-DEXTERNAL_PYBIND11=ON" ]; + env.CMAKE_ARGS = toString [ "-DEXTERNAL_PYBIND11=ON" ]; nativeCheckInputs = [ graphviz diff --git a/pkgs/development/python-modules/pylint-odoo/default.nix b/pkgs/development/python-modules/pylint-odoo/default.nix index a43cb6fa4825..f8aaec5864ac 100644 --- a/pkgs/development/python-modules/pylint-odoo/default.nix +++ b/pkgs/development/python-modules/pylint-odoo/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "pylint_odoo" ]; - BUILD_README = true; # Enables more tests + env.BUILD_README = true; # Enables more tests nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pynest2d/default.nix b/pkgs/development/python-modules/pynest2d/default.nix index 4e499fd47080..632101695f72 100644 --- a/pkgs/development/python-modules/pynest2d/default.nix +++ b/pkgs/development/python-modules/pynest2d/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { strictDeps = true; - CLIPPER_PATH = "${clipper.out}"; + env.CLIPPER_PATH = clipper.out; postPatch = '' sed -i 's#''${Python3_SITEARCH}#${placeholder "out"}/${python.sitePackages}#' cmake/SIPMacros.cmake diff --git a/pkgs/development/python-modules/pypdf3/default.nix b/pkgs/development/python-modules/pypdf3/default.nix index 78b230965674..2b44c409778e 100644 --- a/pkgs/development/python-modules/pypdf3/default.nix +++ b/pkgs/development/python-modules/pypdf3/default.nix @@ -18,7 +18,7 @@ buildPythonPackage (finalAttrs: { hash = "sha256-yUbzJzQZ43JY415yJz9JkEqxVyPYenYcERXvmXmfjF8="; }; - LC_ALL = "en_US.UTF-8"; + env.LC_ALL = "en_US.UTF-8"; buildInputs = [ glibcLocales ]; checkPhase = '' diff --git a/pkgs/development/python-modules/pyportainer/default.nix b/pkgs/development/python-modules/pyportainer/default.nix index 7d35c048959e..a52ea2d20d33 100644 --- a/pkgs/development/python-modules/pyportainer/default.nix +++ b/pkgs/development/python-modules/pyportainer/default.nix @@ -15,14 +15,14 @@ buildPythonPackage (finalAttrs: { pname = "pyportainer"; - version = "1.0.27"; + version = "1.0.29"; pyproject = true; src = fetchFromGitHub { owner = "erwindouna"; repo = "pyportainer"; tag = "v${finalAttrs.version}"; - hash = "sha256-h/z4CUPxOmcA57gkclEJdIWRFGfsG8v6VS8vNLneS3A="; + hash = "sha256-NfK6Ce99bXtI0QgObdsalpTf9MiaOBdWOp6nTrAipY4="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/pysptk/default.nix b/pkgs/development/python-modules/pysptk/default.nix index a84a3f090544..383c7fdccccb 100644 --- a/pkgs/development/python-modules/pysptk/default.nix +++ b/pkgs/development/python-modules/pysptk/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { hash = "sha256-eLHJM4v3laQc3D/wP81GmcQBwyP1RjC7caGXEAeNCz8="; }; - PYSPTK_BUILD_VERSION = 0; + env.PYSPTK_BUILD_VERSION = 0; nativeBuildInputs = [ cython ]; diff --git a/pkgs/development/python-modules/python-uinput/default.nix b/pkgs/development/python-modules/python-uinput/default.nix index 25af52c42652..d2598e60f84b 100644 --- a/pkgs/development/python-modules/python-uinput/default.nix +++ b/pkgs/development/python-modules/python-uinput/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { buildInputs = [ udev ]; - NIX_CFLAGS_LINK = "-ludev"; + env.NIX_CFLAGS_LINK = "-ludev"; doCheck = false; # no tests diff --git a/pkgs/development/python-modules/pytoolconfig/default.nix b/pkgs/development/python-modules/pytoolconfig/default.nix index 0f5ef30d7c15..687c05a30b15 100644 --- a/pkgs/development/python-modules/pytoolconfig/default.nix +++ b/pkgs/development/python-modules/pytoolconfig/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { "doc" ]; - PDM_PEP517_SCM_VERSION = version; + env.PDM_PEP517_SCM_VERSION = version; nativeBuildInputs = [ pdm-backend diff --git a/pkgs/development/python-modules/qstylizer/default.nix b/pkgs/development/python-modules/qstylizer/default.nix index 027e7c90c6eb..26e4012b189c 100644 --- a/pkgs/development/python-modules/qstylizer/default.nix +++ b/pkgs/development/python-modules/qstylizer/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { hash = "sha256-Is/kYkSX9fOX+pLv5g1ns2OxeLpSkaCfO2jPIbiuIxA="; }; - PBR_VERSION = version; + env.PBR_VERSION = version; build-system = [ pbr diff --git a/pkgs/development/python-modules/rpmfluff/default.nix b/pkgs/development/python-modules/rpmfluff/default.nix index 920b153b5577..c09407c9219f 100644 --- a/pkgs/development/python-modules/rpmfluff/default.nix +++ b/pkgs/development/python-modules/rpmfluff/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "19vnlzma8b0aghdiixk0q3wc10y6306hsnic0qvswaaiki94fss1"; }; - LC_ALL = "en_US.utf-8"; + env.LC_ALL = "en_US.utf-8"; buildInputs = [ glibcLocales ]; meta = { diff --git a/pkgs/development/python-modules/scikit-hep-testdata/default.nix b/pkgs/development/python-modules/scikit-hep-testdata/default.nix index cfab7955bb02..f85f92abc28b 100644 --- a/pkgs/development/python-modules/scikit-hep-testdata/default.nix +++ b/pkgs/development/python-modules/scikit-hep-testdata/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { requests ]; - SKHEP_DATA = 1; # install the actual root files + env.SKHEP_DATA = 1; # install the actual root files doCheck = false; # tests require networking diff --git a/pkgs/development/python-modules/scipy/default.nix b/pkgs/development/python-modules/scipy/default.nix index 3bbd316e8178..1673a33becc2 100644 --- a/pkgs/development/python-modules/scipy/default.nix +++ b/pkgs/development/python-modules/scipy/default.nix @@ -243,7 +243,7 @@ buildPythonPackage (finalAttrs: { }; }; - SCIPY_USE_G77_ABI_WRAPPER = 1; + env.SCIPY_USE_G77_ABI_WRAPPER = 1; meta = { changelog = "https://github.com/scipy/scipy/releases/tag/v${finalAttrs.version}"; diff --git a/pkgs/development/python-modules/scrapy/default.nix b/pkgs/development/python-modules/scrapy/default.nix index 0bc10158095b..0cacbda728d8 100644 --- a/pkgs/development/python-modules/scrapy/default.nix +++ b/pkgs/development/python-modules/scrapy/default.nix @@ -98,7 +98,7 @@ buildPythonPackage rec { uvloop ]; - LC_ALL = "en_US.UTF-8"; + env.LC_ALL = "en_US.UTF-8"; pytestFlags = [ # DeprecationWarning: There is no current event loop diff --git a/pkgs/development/python-modules/seccomp/default.nix b/pkgs/development/python-modules/seccomp/default.nix index 951e4b31722a..07c6989957ca 100644 --- a/pkgs/development/python-modules/seccomp/default.nix +++ b/pkgs/development/python-modules/seccomp/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { format = "setuptools"; src = libseccomp.pythonsrc; - VERSION_RELEASE = version; # used by build system + env.VERSION_RELEASE = version; # used by build system nativeBuildInputs = [ cython ]; buildInputs = [ libseccomp ]; diff --git a/pkgs/development/python-modules/seekpath/default.nix b/pkgs/development/python-modules/seekpath/default.nix index b2909dea51df..0c06dd06c405 100644 --- a/pkgs/development/python-modules/seekpath/default.nix +++ b/pkgs/development/python-modules/seekpath/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { hash = "sha256-mrutQCSSiiLPt0KEohZeYcQ8aw2Jhy02bEvn6Of8w6U="; }; - LC_ALL = "en_US.utf-8"; + env.LC_ALL = "en_US.utf-8"; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/shiboken2/default.nix b/pkgs/development/python-modules/shiboken2/default.nix index 998e04cc03fc..9adee3dd4187 100644 --- a/pkgs/development/python-modules/shiboken2/default.nix +++ b/pkgs/development/python-modules/shiboken2/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { head CMakeLists.txt ''; - CLANG_INSTALL_DIR = llvmPackages.libclang.out; + env.CLANG_INSTALL_DIR = llvmPackages.libclang.out; nativeBuildInputs = [ cmake diff --git a/pkgs/development/python-modules/svgdigitizer/default.nix b/pkgs/development/python-modules/svgdigitizer/default.nix index 99e363c86928..1e44d9a5f7d7 100644 --- a/pkgs/development/python-modules/svgdigitizer/default.nix +++ b/pkgs/development/python-modules/svgdigitizer/default.nix @@ -59,7 +59,7 @@ buildPythonPackage rec { svgwrite ]; # https://github.com/echemdb/svgdigitizer/issues/252 - MPLBACKEND = "Agg"; + env.MPLBACKEND = "Agg"; nativeCheckInputs = [ pytestCheckHook diff --git a/pkgs/development/python-modules/systembridgeconnector/default.nix b/pkgs/development/python-modules/systembridgeconnector/default.nix index 3b13e29dbce2..1f0245bc6955 100644 --- a/pkgs/development/python-modules/systembridgeconnector/default.nix +++ b/pkgs/development/python-modules/systembridgeconnector/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "systembridgeconnector"; - version = "5.3.1"; + version = "5.4.3"; pyproject = true; src = fetchFromGitHub { owner = "timmo001"; repo = "system-bridge-connector"; tag = version; - hash = "sha256-VM5Or2IiLN+ceUyCaCRxys9B12JSaSfDwaoII2X6q/A="; + hash = "sha256-gkZRvS0abfXFEz2oRuaGJRmhFoxe92F3czNkahNdTm8="; }; build-system = [ diff --git a/pkgs/development/python-modules/tiledb/default.nix b/pkgs/development/python-modules/tiledb/default.nix index 1ea6bd3d78ec..1b870af5d2c0 100644 --- a/pkgs/development/python-modules/tiledb/default.nix +++ b/pkgs/development/python-modules/tiledb/default.nix @@ -59,7 +59,7 @@ buildPythonPackage rec { pyarrow ]; - TILEDB_PATH = tiledb; + env.TILEDB_PATH = tiledb; disabled = !isPy3k; # Not bothering with python2 anymore diff --git a/pkgs/development/python-modules/tinycss/default.nix b/pkgs/development/python-modules/tinycss/default.nix index d1023487c715..5419f93a0010 100644 --- a/pkgs/development/python-modules/tinycss/default.nix +++ b/pkgs/development/python-modules/tinycss/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { ''; # Disable Cython tests - TINYCSS_SKIP_SPEEDUPS_TESTS = true; + env.TINYCSS_SKIP_SPEEDUPS_TESTS = true; pythonImportsCheck = [ "tinycss" ]; diff --git a/pkgs/development/python-modules/tmb/default.nix b/pkgs/development/python-modules/tmb/default.nix index ae9bc95d14f8..2481bdb8f71e 100644 --- a/pkgs/development/python-modules/tmb/default.nix +++ b/pkgs/development/python-modules/tmb/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { hash = "sha256-XuRhRmeTXAplb14UwISyzaqEIrFeg8/aCdMxUccMUos="; }; - VERSION = version; + env.VERSION = version; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/torchaudio/default.nix b/pkgs/development/python-modules/torchaudio/default.nix index 581f288a5236..4f5e02968940 100644 --- a/pkgs/development/python-modules/torchaudio/default.nix +++ b/pkgs/development/python-modules/torchaudio/default.nix @@ -99,16 +99,19 @@ buildPythonPackage.override { inherit stdenv; } (finalAttrs: { env = { TORCH_CUDA_ARCH_LIST = "${lib.concatStringsSep ";" torch.cudaCapabilities}"; - }; - - # https://github.com/pytorch/audio/blob/v2.1.0/docs/source/build.linux.rst#optional-build-torchaudio-with-a-custom-built-ffmpeg - FFMPEG_ROOT = symlinkJoin { - name = "ffmpeg"; - paths = [ - ffmpeg_6-full.bin - ffmpeg_6-full.dev - ffmpeg_6-full.lib - ]; + # https://github.com/pytorch/audio/blob/v2.1.0/docs/source/build.linux.rst#optional-build-torchaudio-with-a-custom-built-ffmpeg + FFMPEG_ROOT = symlinkJoin { + name = "ffmpeg"; + paths = [ + ffmpeg_6-full.bin + ffmpeg_6-full.dev + ffmpeg_6-full.lib + ]; + }; + BUILD_SOX = 0; + BUILD_KALDI = 0; + BUILD_RNNT = 0; + BUILD_CTC_DECODER = 0; }; nativeBuildInputs = [ @@ -136,11 +139,6 @@ buildPythonPackage.override { inherit stdenv; } (finalAttrs: { dependencies = [ torch ]; - BUILD_SOX = 0; - BUILD_KALDI = 0; - BUILD_RNNT = 0; - BUILD_CTC_DECODER = 0; - preConfigure = lib.optionalString rocmSupport '' export ROCM_PATH=${rocmtoolkit_joined} export PYTORCH_ROCM_ARCH="${gpuTargetString}" diff --git a/pkgs/development/python-modules/tqdm/default.nix b/pkgs/development/python-modules/tqdm/default.nix index 541a9510dea1..0ca33fd88fe7 100644 --- a/pkgs/development/python-modules/tqdm/default.nix +++ b/pkgs/development/python-modules/tqdm/default.nix @@ -50,7 +50,7 @@ buildPythonPackage rec { # Too sensitive for on Hydra. disabledTests = [ "perf" ]; - LC_ALL = "en_US.UTF-8"; + env.LC_ALL = "en_US.UTF-8"; pythonImportsCheck = [ "tqdm" ]; diff --git a/pkgs/development/python-modules/unrardll/default.nix b/pkgs/development/python-modules/unrardll/default.nix index 2eea89693ca8..1bacabbd1628 100644 --- a/pkgs/development/python-modules/unrardll/default.nix +++ b/pkgs/development/python-modules/unrardll/default.nix @@ -18,7 +18,9 @@ buildPythonPackage rec { buildInputs = [ unrar ]; - NIX_CFLAGS_LINK = lib.optionalString stdenv.hostPlatform.isDarwin "-headerpad_max_install_names"; + env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { + NIX_CFLAGS_LINK = "-headerpad_max_install_names"; + }; postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' install_name_tool -change libunrar.so ${unrar}/lib/libunrar.so $out/lib/python*/site-packages/unrardll/unrar.*-darwin.so diff --git a/pkgs/development/python-modules/weasyprint/default.nix b/pkgs/development/python-modules/weasyprint/default.nix index bf076964b914..40c26569dc1d 100644 --- a/pkgs/development/python-modules/weasyprint/default.nix +++ b/pkgs/development/python-modules/weasyprint/default.nix @@ -103,10 +103,10 @@ buildPythonPackage (finalAttrs: { "test_text_stroke" ]; - FONTCONFIG_FILE = "${fontconfig.out}/etc/fonts/fonts.conf"; + env.FONTCONFIG_FILE = "${fontconfig.out}/etc/fonts/fonts.conf"; # Set env variable explicitly for Darwin, but allow overriding when invoking directly - makeWrapperArgs = [ "--set-default FONTCONFIG_FILE ${finalAttrs.FONTCONFIG_FILE}" ]; + makeWrapperArgs = [ "--set-default FONTCONFIG_FILE ${finalAttrs.env.FONTCONFIG_FILE}" ]; pythonImportsCheck = [ "weasyprint" ]; diff --git a/pkgs/development/python-modules/weaviate-client/default.nix b/pkgs/development/python-modules/weaviate-client/default.nix index 7280abd02aba..210524d75e8a 100644 --- a/pkgs/development/python-modules/weaviate-client/default.nix +++ b/pkgs/development/python-modules/weaviate-client/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pname = "weaviate-client"; - version = "4.19.2"; + version = "4.20.1"; pyproject = true; disabled = pythonOlder "3.12"; @@ -36,7 +36,7 @@ buildPythonPackage rec { owner = "weaviate"; repo = "weaviate-python-client"; tag = "v${version}"; - hash = "sha256-LQLvMoj91+B4dU6z4oyxNy7eX+6C5cSL2IBCUVgZ05w="; + hash = "sha256-KnO+xXI6q5a3pJgZuDrjvWgH+civXZwWLtnEJmBWLt4="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/whichcraft/default.nix b/pkgs/development/python-modules/whichcraft/default.nix index 7c7ac4e269ae..b237513ef0f5 100644 --- a/pkgs/development/python-modules/whichcraft/default.nix +++ b/pkgs/development/python-modules/whichcraft/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "11yfkzyplizdgndy34vyd5qlmr1n5mxis3a3svxmx8fnccdvknxc"; }; - LC_ALL = "en_US.utf-8"; + env.LC_ALL = "en_US.utf-8"; buildInputs = [ glibcLocales ]; nativeCheckInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/xgrammar/default.nix b/pkgs/development/python-modules/xgrammar/default.nix index fb44ff711e69..adced646dc38 100644 --- a/pkgs/development/python-modules/xgrammar/default.nix +++ b/pkgs/development/python-modules/xgrammar/default.nix @@ -70,10 +70,12 @@ buildPythonPackage rec { writableTmpDirAsHomeHook ]; - NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isLinux (toString [ - # xgrammar hardcodes -flto=auto while using static linking, which can cause linker errors without this additional flag. - "-ffat-lto-objects" - ]); + env = lib.optionalAttrs stdenv.hostPlatform.isLinux { + NIX_CFLAGS_COMPILE = toString [ + # xgrammar hardcodes -flto=auto while using static linking, which can cause linker errors without this additional flag. + "-ffat-lto-objects" + ]; + }; disabledTests = [ # You are trying to access a gated repo. diff --git a/pkgs/development/python-modules/zstd/default.nix b/pkgs/development/python-modules/zstd/default.nix index a2b7a7ed3006..b2ad8de91863 100644 --- a/pkgs/development/python-modules/zstd/default.nix +++ b/pkgs/development/python-modules/zstd/default.nix @@ -33,10 +33,12 @@ buildPythonPackage rec { "--library-dirs=${zstd}/lib" ]; - # Running tests via setup.py triggers an attempt to recompile with the vendored zstd - ZSTD_EXTERNAL = 1; - VERSION = zstd.version; - PKG_VERSION = version; + env = { + # Running tests via setup.py triggers an attempt to recompile with the vendored zstd + ZSTD_EXTERNAL = 1; + VERSION = zstd.version; + PKG_VERSION = version; + }; nativeCheckInputs = [ pytest ]; checkPhase = '' diff --git a/pkgs/servers/home-assistant/custom-components/mypyllant/package.nix b/pkgs/servers/home-assistant/custom-components/mypyllant/package.nix index 2ba2941f7cc9..5a4dd545c493 100644 --- a/pkgs/servers/home-assistant/custom-components/mypyllant/package.nix +++ b/pkgs/servers/home-assistant/custom-components/mypyllant/package.nix @@ -19,13 +19,13 @@ buildHomeAssistantComponent rec { owner = "signalkraft"; domain = "mypyllant"; - version = "0.9.11"; + version = "0.9.12"; src = fetchFromGitHub { owner = "signalkraft"; repo = "mypyllant-component"; tag = "v${version}"; - hash = "sha256-wkUz5pPO50yfWbZBa+Z+9WKIZKCJhJVn8/HlzZwSZVY="; + hash = "sha256-vXzcVua2cGQXXeug6Zy4AAeTok+BLH5k+krq3UBuQjw="; }; dependencies = [ diff --git a/pkgs/servers/nextcloud/packages/32.json b/pkgs/servers/nextcloud/packages/32.json index 9b9d9349d0dd..b50f81c96f66 100644 --- a/pkgs/servers/nextcloud/packages/32.json +++ b/pkgs/servers/nextcloud/packages/32.json @@ -10,9 +10,9 @@ ] }, "calendar": { - "hash": "sha256-bj84s8bIDZp1/Buz2/5UPPMoM4FX5O3POr7NSX0aLsI=", - "url": "https://github.com/nextcloud-releases/calendar/releases/download/v6.2.0/calendar-v6.2.0.tar.gz", - "version": "6.2.0", + "hash": "sha256-DCitIgvlHfRGYqLJXhQ6UOY5vVmhbUiUQfBXkysc5Ps=", + "url": "https://github.com/nextcloud-releases/calendar/releases/download/v6.2.1/calendar-v6.2.1.tar.gz", + "version": "6.2.1", "description": "A Calendar app for Nextcloud. Easily sync events from various devices with your Nextcloud and edit them online.\n\n* πŸš€ **Integration with other Nextcloud apps!** Like Contacts, Talk, Tasks, Deck and Circles\n* 🌐 **WebCal Support!** Want to see your favorite team's matchdays in your calendar? No problem!\n* πŸ™‹ **Attendees!** Invite people to your events\n* ⌚ **Free/Busy!** See when your attendees are available to meet\n* ⏰ **Reminders!** Get alarms for events inside your browser and via email\n* πŸ” **Search!** Find your events at ease\n* β˜‘οΈ **Tasks!** See tasks or Deck cards with a due date directly in the calendar\n* πŸ”ˆ **Talk rooms!** Create an associated Talk room when booking a meeting with just one click\n* πŸ“† **Appointment booking** Send people a link so they can book an appointment with you [using this app](https://apps.nextcloud.com/apps/appointments)\n* πŸ“Ž **Attachments!** Add, upload and view event attachments\n* πŸ™ˆ **We’re not reinventing the wheel!** Based on the great [c-dav library](https://github.com/nextcloud/cdav-library), [ical.js](https://github.com/mozilla-comm/ical.js) and [fullcalendar](https://github.com/fullcalendar/fullcalendar) libraries.", "homepage": "https://github.com/nextcloud/calendar/", "licenses": [ @@ -30,9 +30,9 @@ ] }, "contacts": { - "hash": "sha256-ZbyDJDx/SCPMsdY2JT/kyrqbzxFxTm+5ZoSnrfANwzE=", - "url": "https://github.com/nextcloud-releases/contacts/releases/download/v8.3.3/contacts-v8.3.3.tar.gz", - "version": "8.3.3", + "hash": "sha256-h92B++PEJlGZn1wGjbOg1NFrVVFPpt3OocJZEqiAzZc=", + "url": "https://github.com/nextcloud-releases/contacts/releases/download/v8.3.4/contacts-v8.3.4.tar.gz", + "version": "8.3.4", "description": "The Nextcloud contacts app is a user interface for Nextcloud's CardDAV server. Easily sync contacts from various devices with your Nextcloud and edit them online.\n\n* πŸš€ **Integration with other Nextcloud apps!** Currently Mail and Calendar – more to come.\n* πŸŽ‰ **Never forget a birthday!** You can sync birthdays and other recurring events with your Nextcloud Calendar.\n* πŸ‘₯ **Sharing of Adressbooks!** You want to share your contacts with your friends or coworkers? No problem!\n* πŸ™ˆ **We’re not reinventing the wheel!** Based on the great and open SabreDAV library.", "homepage": "https://github.com/nextcloud/contacts#readme", "licenses": [ @@ -160,9 +160,9 @@ ] }, "integration_openai": { - "hash": "sha256-OimO9pyuv2O+NCvImAoarr8/aQr313duHmItr82PQLQ=", - "url": "https://github.com/nextcloud-releases/integration_openai/releases/download/v3.10.0/integration_openai-v3.10.0.tar.gz", - "version": "3.10.0", + "hash": "sha256-91/93BQyZVUrE21krXBTLp1nbdyoNxfDyDODf2hgdIM=", + "url": "https://github.com/nextcloud-releases/integration_openai/releases/download/v3.10.1/integration_openai-v3.10.1.tar.gz", + "version": "3.10.1", "description": "⚠️ The smart pickers have been removed from this app\nas they are now included in the [Assistant app](https://apps.nextcloud.com/apps/assistant).\n\nThis app implements:\n\n* Text generation providers: Free prompt, Summarize, Headline, Context Write, Chat, and Reformulate (using any available large language model)\n* A Translation provider (using any available language model)\n* A SpeechToText provider (using Whisper)\n* An image generation provider\n\n⚠️ Context Write, Summarize, Headline and Reformulate have mainly been tested with OpenAI.\nThey might work when connecting to other services, without any guarantee.\n\nInstead of connecting to the OpenAI API for these, you can also connect to a self-hosted [LocalAI](https://localai.io) instance or [Ollama](https://ollama.com/) instance\nor to any service that implements an API similar to the OpenAI one, for example:\n[IONOS AI Model Hub](https://docs.ionos.com/cloud/ai/ai-model-hub), [Plusserver](https://www.plusserver.com/en/ai-platform/) or [MistralAI](https://mistral.ai).\n\n⚠️ This app is mainly tested with OpenAI. We do not guarantee it works perfectly\nwith other services that implement OpenAI-compatible APIs with slight differences.\n\n## Improve AI task pickup speed\n\nTo avoid task processing execution delay, setup at 4 background job workers in the main server (where Nextcloud is installed). The setup process is documented here: https://docs.nextcloud.com/server/latest/admin_manual/ai/overview.html#improve-ai-task-pickup-speed\n\n## Ethical AI Rating\n### Rating for Text generation using ChatGPT via the OpenAI API: πŸ”΄\n\nNegative:\n* The software for training and inference of this model is proprietary, limiting running it locally or training by yourself\n* The trained model is not freely available, so the model can not be run on-premises\n* The training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the model's performance and CO2 usage.\n\n\n### Rating for Translation using ChatGPT via the OpenAI API: πŸ”΄\n\nNegative:\n* The software for training and inference of this model is proprietary, limiting running it locally or training by yourself\n* The trained model is not freely available, so the model can not be run on-premises\n* The training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the model's performance and CO2 usage.\n\n### Rating for Image generation using DALLΒ·E via the OpenAI API: πŸ”΄\n\nNegative:\n* The software for training and inferencing of this model is proprietary, limiting running it locally or training by yourself\n* The trained model is not freely available, so the model can not be ran on-premises\n* The training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the model’s performance and CO2 usage.\n\n\n### Rating for Speech-To-Text using Whisper via the OpenAI API: 🟑\n\nPositive:\n* The software for training and inferencing of this model is open source\n* The trained model is freely available, and thus can run on-premise\n\nNegative:\n* The training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the model’s performance and CO2 usage.\n\n### Rating for Text-To-Speech via the OpenAI API: πŸ”΄\n\nNegative:\n* The software for training and inferencing of this model is proprietary, limiting running it locally or training by yourself\n* The trained model is not freely available, so the model can not be ran on-premises\n* The training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the model’s performance and CO2 usage.\n\n### Rating for Text generation via LocalAI: 🟒\n\nPositive:\n* The software for training and inferencing of this model is open source\n* The trained model is freely available, and thus can be ran on-premises\n* The training data is freely available, making it possible to check or correct for bias or optimise the performance and CO2 usage.\n\n\n### Rating for Image generation using Stable Diffusion via LocalAI : 🟑\n\nPositive:\n* The software for training and inferencing of this model is open source\n* The trained model is freely available, and thus can be ran on-premises\n\nNegative:\n* The training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the model’s performance and CO2 usage.\n\n\n### Rating for Speech-To-Text using Whisper via LocalAI: 🟑\n\nPositive:\n* The software for training and inferencing of this model is open source\n* The trained model is freely available, and thus can be ran on-premises\n\nNegative:\n* The training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the model’s performance and CO2 usage.\n\nLearn more about the Nextcloud Ethical AI Rating [in our blog](https://nextcloud.com/blog/nextcloud-ethical-ai-rating/).", "homepage": "https://github.com/nextcloud/integration_openai", "licenses": [ @@ -180,9 +180,9 @@ ] }, "mail": { - "hash": "sha256-K1BPRiSHe3QMb8qiEqybXiVHA5WrExdK+OTDyyrdZ+E=", - "url": "https://github.com/nextcloud-releases/mail/releases/download/v5.7.0/mail-v5.7.0.tar.gz", - "version": "5.7.0", + "hash": "sha256-Aq+ISmrPNlH42KNqkxAqoTEgML2l36lhsAMS0GUYb+c=", + "url": "https://github.com/nextcloud-releases/mail/releases/download/v5.7.1/mail-v5.7.1.tar.gz", + "version": "5.7.1", "description": "**πŸ’Œ A mail app for Nextcloud**\n\n- **πŸš€ Integration with other Nextcloud apps!** Currently Contacts, Calendar & Files – more to come.\n- **πŸ“₯ Multiple mail accounts!** Personal and company account? No problem, and a nice unified inbox. Connect any IMAP account.\n- **πŸ”’ Send & receive encrypted mails!** Using the great [Mailvelope](https://mailvelope.com) browser extension.\n- **πŸ™ˆ We’re not reinventing the wheel!** Based on the great [Horde](https://www.horde.org) libraries.\n- **πŸ“¬ Want to host your own mail server?** We do not have to reimplement this as you could set up [Mail-in-a-Box](https://mailinabox.email)!\n\n## Ethical AI Rating\n\n### Priority Inbox\n\nPositive:\n* The software for training and inferencing of this model is open source.\n* The model is created and trained on-premises based on the user's own data.\n* The training data is accessible to the user, making it possible to check or correct for bias or optimise the performance and CO2 usage.\n\n### Thread Summaries (opt-in)\n\n**Rating:** 🟒/🟑/🟠/πŸ”΄\n\nThe rating depends on the installed text processing backend. See [the rating overview](https://docs.nextcloud.com/server/latest/admin_manual/ai/index.html) for details.\n\nLearn more about the Nextcloud Ethical AI Rating [in our blog](https://nextcloud.com/blog/nextcloud-ethical-ai-rating/).", "homepage": "https://github.com/nextcloud/mail#readme", "licenses": [ @@ -190,11 +190,11 @@ ] }, "music": { - "hash": "sha256-XxrpVge6T3vP9aAj9ZpxEaQMRvKYkTSt2fEREudbt2U=", - "url": "https://github.com/owncloud/music/releases/download/v2.5.1/music_2.5.1_for_nextcloud.tar.gz", - "version": "2.5.1", + "hash": "sha256-n1HsKmkXL8YSQywGlt3f9lqSDBYcxi3VWO8K9b0PZqY=", + "url": "https://github.com/nc-music/music/releases/download/v3.0.0/nc-music-3.0.0.tar.gz", + "version": "3.0.0", "description": "A stand-alone music player app and a \"lite\" player for the Files app\n\n- On modern browsers, supports audio types .mp3, .ogg, .m4a, .m4b, .flac, .wav, and more\n- Playlist support with import from .m3u, .m3u8, .pls, and .wpl files\n- Show lyrics from the file metadata or .lrc files\n- Browse by artists, albums, genres, or folders\n- Gapless play\n- Filter the shown content with the search function\n- Advanced search to freely use and combine dozens of search criteria\n- Play internet radio and podcast channels\n- Setup Last.fm connection to scrobble plays and/or see background information on artists, albums, and songs\n- Control with media control keys on the keyboard or OS\n- The app can handle libraries consisting of thousands of albums and tens of thousands of songs\n- Includes a server backend compatible with the Subsonic and Ampache protocols, allowing playback and browsing of your library on dozens of external apps on Android, iOS, Windows, Linux, etc.\n- Widget for the Nextcloud Dashboard", - "homepage": "https://github.com/owncloud/music", + "homepage": "https://github.com/nc-music/music", "licenses": [ "agpl" ] @@ -240,9 +240,9 @@ ] }, "onlyoffice": { - "hash": "sha256-lAe1J2QKsEWS4l4QOiISDi9iyVCEyO8tS94aNMjUUR4=", - "url": "https://github.com/ONLYOFFICE/onlyoffice-nextcloud/releases/download/v9.12.0/onlyoffice.tar.gz", - "version": "9.12.0", + "hash": "sha256-est6QHoBQRX1ounlwifjgELJ4f0wHz+FCMc8pMQ///s=", + "url": "https://github.com/ONLYOFFICE/onlyoffice-nextcloud/releases/download/v9.13.0/onlyoffice.tar.gz", + "version": "9.13.0", "description": "The ONLYOFFICE app for Nextcloud brings powerful document editing and collaboration tools directly to your Nextcloud environment. With this integration, you can seamlessly create, edit, and co-author text documents, spreadsheets, presentations, and PDFs, as well as build and fill out PDF forms.\n\nCollaborate with your team in real time, make use of Track Changes, version history, comments, integrated chat, and more. Work together on files with federated cloud sharing. Flexible access permissions allow you to control who can view, edit, or comment, ensuring secure role-based collaboration tailored to your needs. Documents can also be protected with watermarks, password settings, and encryption for added security.\n\nThe app offers support for over 50 file formats, including DOCX, XLSX, PPTX, PDF, RTF, TXT, CSV, ODT, ODS, ODP, EPUB, FB2, HTML, HWP, HWPX, Pages, Numbers, Keynote, etc. Seamless desktop and mobile app integration means you'll have access to your Nextcloud files wherever you go.\n\nFurthermore, you can seamlessly connect any AI assistant, including local ones, directly to the editors to work faster and more efficient. This allows you to leverage various AI models for tasks like chatbot interactions, translations, OCR, and more.\n\nWhether you’re working with internal teams or external collaborators, the ONLYOFFICE app for Nextcloud enhances productivity, simplifies workflows, and ensures your files remain secure.", "homepage": "https://www.onlyoffice.com", "licenses": [ @@ -250,10 +250,10 @@ ] }, "phonetrack": { - "hash": "sha256-2DO4bK1FlTaVS1xve/oU4xNnrA8j9mq7IuOcZPszJOY=", - "url": "https://github.com/julien-nc/phonetrack/releases/download/v1.0.0/phonetrack-1.0.0.tar.gz", - "version": "1.0.0", - "description": "# PhoneTrack Nextcloud application\n\nπŸ“± PhoneTrack is a Nextcloud application to track and store mobile device's locations.\n\nπŸ—Ί It receives information from mobile phone's logging apps and displays it dynamically on a map.\n\n🌍 Help us to translate this app on [PhoneTrack Crowdin project](https://crowdin.com/project/phonetrack).\n\nβš’ Check out other ways to help in the [contribution guidelines](https://gitlab.com/eneiluj/phonetrack-oc/blob/master/CONTRIBUTING.md).\n\nHow to use PhoneTrack :\n\n- Create a tracking session.\n- Give the logging link\\* to the mobile devices. Choose the [logging method](https://gitlab.com/eneiluj/phonetrack-oc/wikis/userdoc#logging-methods) you prefer.\n- Watch the session's devices location in real time (or not) in PhoneTrack or share it with public pages.\n\n(\\*) Don't forget to set the device name in the link (rather than in the logging app settings). Replace \"yourname\" with the desired device name.\nSetting the device name in logging app settings only works with Owntracks, Traccar and OpenGTS.\n\nOn PhoneTrack main page, while watching a session, you can :\n\n- πŸ“ Display location history\n- β›› Filter points\n- ✎ Manually edit/add/delete points\n- ✎ Edit devices (rename, change colour/shape, move to another session)\n- β›Ά Define geofencing zones for devices\n- βš‡ Define proximity alerts for device pairs\n- πŸ–§ Share a session to other Nextcloud users or with a public link (read-only)\n- πŸ”— Generate public share links with optional restrictions (filters, device name, last positions only, geofencing simplification)\n- πŸ–« Import/export a session in GPX format (one file with one track per device or one file per device)\n- πŸ—  Display sessions statistics\n- πŸ”’ [Reserve a device name](https://gitlab.com/eneiluj/phonetrack-oc/wikis/userdoc#device-name-reservation) to make sure only authorised user can log with this name\n- πŸ—“ Toggle session auto export and auto purge (daily/weekly/monthly)\n- β—” Choose what to do when point number quota is reached (block logging or delete oldest point)\n\nPublic page and public filtered page work like main page except there is only one session displayed, everything is read-only and there is no need to be logged in.\n\nThis app is tested on Nextcloud 17 with Firefox 57+ and Chromium.\n\nThis app is compatible with theming colours and accessibility themes !\n\nThis app is under development.\n\n## Install\n\nSee the [AdminDoc](https://gitlab.com/eneiluj/phonetrack-oc/wikis/admindoc) for installation details.\n\nCheck [CHANGELOG](https://gitlab.com/eneiluj/phonetrack-oc/blob/master/CHANGELOG.md#change-log) file to see what's new and what's coming in next release.\n\nCheck [AUTHORS](https://gitlab.com/eneiluj/phonetrack-oc/blob/master/AUTHORS.md#authors) file to see complete list of authors.\n\n## Known issues\n\n- PhoneTrack **now works** with Nextcloud group restriction activated. See [admindoc](https://gitlab.com/eneiluj/phonetrack-oc/wikis/admindoc#issue-with-phonetrack-restricted-to-some-groups-in-nextcloud).\n\nAny feedback will be appreciated.\n\n\n\n## Donation\n\nI develop this app during my free time.\n\n* [Donate with Paypal](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=66PALMY8SF5JE) (you don't need a paypal account)\n* [Donate with Liberapay : ![Donate using Liberapay](https://liberapay.com/assets/widgets/donate.svg)](https://liberapay.com/eneiluj/donate)", + "hash": "sha256-+JPK8Eh7RFHMreCdlA1F1jBUD04Fw0R952TBHOUXDQ0=", + "url": "https://github.com/julien-nc/phonetrack/releases/download/v1.0.1/phonetrack-1.0.1.tar.gz", + "version": "1.0.1", + "description": "# PhoneTrack Nextcloud application\n\nπŸ“± PhoneTrack is a Nextcloud application to track and store mobile device's locations.\n\nπŸ—Ί It receives information from mobile phone's logging apps and displays it dynamically on a map.\n\n🌍 Help us to translate this app on [PhoneTrack Crowdin project](https://crowdin.com/project/phonetrack).\n\nβš’ Check out other ways to help in the [contribution guidelines](https://gitlab.com/eneiluj/phonetrack-oc/blob/master/CONTRIBUTING.md).\n\nHow to use PhoneTrack :\n\n- Create a tracking session.\n- Give the logging link\\* to the mobile devices. Choose the [logging method](https://github.com/julien-nc/phonetrack/blob/main/doc/user.md#logging-methods) you prefer.\n- Watch the session's devices location in real time (or not) in PhoneTrack or share it with public pages.\n\n(\\*) Don't forget to set the device name in the link (rather than in the logging app settings). Replace \"yourname\" with the desired device name.\nSetting the device name in logging app settings only works with Owntracks, Traccar and OpenGTS.\n\nOn PhoneTrack main page, while watching a session, you can :\n\n- πŸ“ Display location history\n- β›› Filter points\n- ✎ Manually edit/add/delete points\n- ✎ Edit devices (rename, change colour/shape, move to another session)\n- β›Ά Define geofencing zones for devices\n- βš‡ Define proximity alerts for device pairs\n- πŸ–§ Share a session to other Nextcloud users or with a public link (read-only)\n- πŸ”— Generate public share links with optional restrictions (filters, device name, last positions only, geofencing simplification)\n- πŸ–« Import/export a session in GPX format (one file with one track per device or one file per device)\n- πŸ—  Display sessions statistics\n- πŸ”’ [Reserve a device name](https://github.com/julien-nc/phonetrack/blob/main/doc/user.md#device-name-reservation) to make sure only authorized user can log with this name\n- πŸ—“ Toggle session auto export and auto purge (daily/weekly/monthly)\n- β—” Choose what to do when point number quota is reached (block logging or delete oldest point)\n\nPublic page and public filtered page work like main page except there is only one session displayed, everything is read-only and there is no need to be logged in.\n\nThis app is under development.\n\n## Install\n\nSee the [AdminDoc](https://gitlab.com/eneiluj/phonetrack-oc/wikis/admindoc) for installation details.\n\nCheck [CHANGELOG](https://gitlab.com/eneiluj/phonetrack-oc/blob/master/CHANGELOG.md#change-log) file to see what's new and what's coming in next release.\n\nCheck [AUTHORS](https://gitlab.com/eneiluj/phonetrack-oc/blob/master/AUTHORS.md#authors) file to see complete list of authors.\n\n## Known issues\n\n- PhoneTrack **now works** with Nextcloud group restriction activated. See [admindoc](https://github.com/julien-nc/phonetrack/blob/main/doc/admin.md#issue-with-phonetrack-restricted-to-some-groups-in-nextcloud).\n\nAny feedback will be appreciated.\n\n\n\n## Donation\n\nI develop this app during my free time.\n\n* [Donate with Paypal](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=66PALMY8SF5JE) (you don't need a paypal account)\n* [Donate with Liberapay : ![Donate using Liberapay](https://liberapay.com/assets/widgets/donate.svg)](https://liberapay.com/eneiluj/donate)", "homepage": "https://github.com/julien-nc/phonetrack", "licenses": [ "agpl" @@ -440,9 +440,9 @@ ] }, "whiteboard": { - "hash": "sha256-thJL8fZCh7pIOt+GZT5TNVlVshyaxkPufIcHUdiVeRY=", - "url": "https://github.com/nextcloud-releases/whiteboard/releases/download/v1.5.6/whiteboard-v1.5.6.tar.gz", - "version": "1.5.6", + "hash": "sha256-h+CuftR+iLuRuEVVccp89fA34JYSbCkwobjBytwgwg0=", + "url": "https://github.com/nextcloud-releases/whiteboard/releases/download/v1.5.7/whiteboard-v1.5.7.tar.gz", + "version": "1.5.7", "description": "The official whiteboard app for Nextcloud. It allows users to create and share whiteboards with other users and collaborate in real-time.\n\n**Whiteboard requires a separate collaboration server to work.** Please see the [documentation](https://github.com/nextcloud/whiteboard?tab=readme-ov-file#backend) on how to install it.\n\n- 🎨 Drawing shapes, writing text, connecting elements\n- πŸ“ Real-time collaboration\n- πŸ–ΌοΈ Add images with drag and drop\n- πŸ“Š Easily add mermaid diagrams\n- ✨ Use the Smart Picker to embed other elements from Nextcloud\n- πŸ“¦ Image export\n- πŸ’ͺ Strong foundation: We use Excalidraw as our base library", "homepage": "https://github.com/nextcloud/whiteboard", "licenses": [ diff --git a/pkgs/servers/nextcloud/packages/33.json b/pkgs/servers/nextcloud/packages/33.json index a77e34d8efc3..58229b7a3b97 100644 --- a/pkgs/servers/nextcloud/packages/33.json +++ b/pkgs/servers/nextcloud/packages/33.json @@ -10,9 +10,9 @@ ] }, "calendar": { - "hash": "sha256-bj84s8bIDZp1/Buz2/5UPPMoM4FX5O3POr7NSX0aLsI=", - "url": "https://github.com/nextcloud-releases/calendar/releases/download/v6.2.0/calendar-v6.2.0.tar.gz", - "version": "6.2.0", + "hash": "sha256-DCitIgvlHfRGYqLJXhQ6UOY5vVmhbUiUQfBXkysc5Ps=", + "url": "https://github.com/nextcloud-releases/calendar/releases/download/v6.2.1/calendar-v6.2.1.tar.gz", + "version": "6.2.1", "description": "A Calendar app for Nextcloud. Easily sync events from various devices with your Nextcloud and edit them online.\n\n* πŸš€ **Integration with other Nextcloud apps!** Like Contacts, Talk, Tasks, Deck and Circles\n* 🌐 **WebCal Support!** Want to see your favorite team's matchdays in your calendar? No problem!\n* πŸ™‹ **Attendees!** Invite people to your events\n* ⌚ **Free/Busy!** See when your attendees are available to meet\n* ⏰ **Reminders!** Get alarms for events inside your browser and via email\n* πŸ” **Search!** Find your events at ease\n* β˜‘οΈ **Tasks!** See tasks or Deck cards with a due date directly in the calendar\n* πŸ”ˆ **Talk rooms!** Create an associated Talk room when booking a meeting with just one click\n* πŸ“† **Appointment booking** Send people a link so they can book an appointment with you [using this app](https://apps.nextcloud.com/apps/appointments)\n* πŸ“Ž **Attachments!** Add, upload and view event attachments\n* πŸ™ˆ **We’re not reinventing the wheel!** Based on the great [c-dav library](https://github.com/nextcloud/cdav-library), [ical.js](https://github.com/mozilla-comm/ical.js) and [fullcalendar](https://github.com/fullcalendar/fullcalendar) libraries.", "homepage": "https://github.com/nextcloud/calendar/", "licenses": [ @@ -30,9 +30,9 @@ ] }, "contacts": { - "hash": "sha256-ZbyDJDx/SCPMsdY2JT/kyrqbzxFxTm+5ZoSnrfANwzE=", - "url": "https://github.com/nextcloud-releases/contacts/releases/download/v8.3.3/contacts-v8.3.3.tar.gz", - "version": "8.3.3", + "hash": "sha256-jeE+tqP1fXW2mFMgoVTtR07DhzTO2rIbPkL38VzZRNM=", + "url": "https://github.com/nextcloud-releases/contacts/releases/download/v8.4.0/contacts-v8.4.0.tar.gz", + "version": "8.4.0", "description": "The Nextcloud contacts app is a user interface for Nextcloud's CardDAV server. Easily sync contacts from various devices with your Nextcloud and edit them online.\n\n* πŸš€ **Integration with other Nextcloud apps!** Currently Mail and Calendar – more to come.\n* πŸŽ‰ **Never forget a birthday!** You can sync birthdays and other recurring events with your Nextcloud Calendar.\n* πŸ‘₯ **Sharing of Adressbooks!** You want to share your contacts with your friends or coworkers? No problem!\n* πŸ™ˆ **We’re not reinventing the wheel!** Based on the great and open SabreDAV library.", "homepage": "https://github.com/nextcloud/contacts#readme", "licenses": [ @@ -130,9 +130,9 @@ ] }, "groupfolders": { - "hash": "sha256-TndRnnxX9hE1HtnTAy4vMx22S8J2CKXRUjFdQT+lyrg=", - "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v21.0.5/groupfolders-v21.0.5.tar.gz", - "version": "21.0.5", + "hash": "sha256-5V0gBRz6Q8HS3MxbsU+O7bRwv+765dS2SIbOnFVVERE=", + "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v21.0.6/groupfolders-v21.0.6.tar.gz", + "version": "21.0.6", "description": "Team Folders (formerly \"Group Folders\") allows administrators to create and manage shared folders that are accessible\n\t\t\tto selected teams within Nextcloud.\n\n\t\t\tAdmins can configure folders from the Team Folders section in the admin settings, where they can grant access to one\n\t\t\tor more teams, set custom permissions (such as read, write, and sharing rights), and assign storage quotas to each\n\t\t\tfolder.\n\n\t\t\tAs of Hub 10/Nextcloud 31, admins must be members of a team to assign it a Team Folder. The app supports advanced\n\t\t\tfeatures such as quota management, granular access control, and integration with Nextcloud’s trash and versioning\n\t\t\tsystems.", "homepage": "https://github.com/nextcloud/groupfolders", "licenses": [ @@ -160,9 +160,9 @@ ] }, "integration_openai": { - "hash": "sha256-qZMEllnKm4TAS810/WaDCUEXLbLN8yEVXIXw7p2zx2s=", - "url": "https://github.com/nextcloud-releases/integration_openai/releases/download/v4.2.0/integration_openai-v4.2.0.tar.gz", - "version": "4.2.0", + "hash": "sha256-emtbwOr5kqgslq3ISSTxdfDKP80rvfWj7gygfYpj7E4=", + "url": "https://github.com/nextcloud-releases/integration_openai/releases/download/v4.3.0/integration_openai-v4.3.0.tar.gz", + "version": "4.3.0", "description": "⚠️ The smart pickers have been removed from this app\nas they are now included in the [Assistant app](https://apps.nextcloud.com/apps/assistant).\n\nThis app implements:\n\n* Text generation providers: Free prompt, Summarize, Headline, Context Write, Chat, and Reformulate (using any available large language model)\n* A Translation provider (using any available language model)\n* A SpeechToText provider (using Whisper)\n* An image generation provider\n\n⚠️ Context Write, Summarize, Headline and Reformulate have mainly been tested with OpenAI.\nThey might work when connecting to other services, without any guarantee.\n\nInstead of connecting to the OpenAI API for these, you can also connect to a self-hosted [LocalAI](https://localai.io) instance or [Ollama](https://ollama.com/) instance\nor to any service that implements an API similar to the OpenAI one, for example:\n[IONOS AI Model Hub](https://docs.ionos.com/cloud/ai/ai-model-hub), [Plusserver](https://www.plusserver.com/en/ai-platform/) or [MistralAI](https://mistral.ai).\n\n⚠️ This app is mainly tested with OpenAI. We do not guarantee it works perfectly\nwith other services that implement OpenAI-compatible APIs with slight differences.\n\n## Improve AI task pickup speed\n\nTo avoid task processing execution delay, setup at 4 background job workers in the main server (where Nextcloud is installed). The setup process is documented here: https://docs.nextcloud.com/server/latest/admin_manual/ai/overview.html#improve-ai-task-pickup-speed\n\n## Ethical AI Rating\n### Rating for Text generation using ChatGPT via the OpenAI API: πŸ”΄\n\nNegative:\n* The software for training and inference of this model is proprietary, limiting running it locally or training by yourself\n* The trained model is not freely available, so the model can not be run on-premises\n* The training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the model's performance and CO2 usage.\n\n\n### Rating for Translation using ChatGPT via the OpenAI API: πŸ”΄\n\nNegative:\n* The software for training and inference of this model is proprietary, limiting running it locally or training by yourself\n* The trained model is not freely available, so the model can not be run on-premises\n* The training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the model's performance and CO2 usage.\n\n### Rating for Image generation using DALLΒ·E via the OpenAI API: πŸ”΄\n\nNegative:\n* The software for training and inferencing of this model is proprietary, limiting running it locally or training by yourself\n* The trained model is not freely available, so the model can not be ran on-premises\n* The training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the model’s performance and CO2 usage.\n\n\n### Rating for Speech-To-Text using Whisper via the OpenAI API: 🟑\n\nPositive:\n* The software for training and inferencing of this model is open source\n* The trained model is freely available, and thus can run on-premise\n\nNegative:\n* The training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the model’s performance and CO2 usage.\n\n### Rating for Text-To-Speech via the OpenAI API: πŸ”΄\n\nNegative:\n* The software for training and inferencing of this model is proprietary, limiting running it locally or training by yourself\n* The trained model is not freely available, so the model can not be ran on-premises\n* The training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the model’s performance and CO2 usage.\n\n### Rating for Text generation via LocalAI: 🟒\n\nPositive:\n* The software for training and inferencing of this model is open source\n* The trained model is freely available, and thus can be ran on-premises\n* The training data is freely available, making it possible to check or correct for bias or optimise the performance and CO2 usage.\n\n\n### Rating for Image generation using Stable Diffusion via LocalAI : 🟑\n\nPositive:\n* The software for training and inferencing of this model is open source\n* The trained model is freely available, and thus can be ran on-premises\n\nNegative:\n* The training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the model’s performance and CO2 usage.\n\n\n### Rating for Speech-To-Text using Whisper via LocalAI: 🟑\n\nPositive:\n* The software for training and inferencing of this model is open source\n* The trained model is freely available, and thus can be ran on-premises\n\nNegative:\n* The training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the model’s performance and CO2 usage.\n\nLearn more about the Nextcloud Ethical AI Rating [in our blog](https://nextcloud.com/blog/nextcloud-ethical-ai-rating/).", "homepage": "https://github.com/nextcloud/integration_openai", "licenses": [ @@ -180,15 +180,25 @@ ] }, "mail": { - "hash": "sha256-K1BPRiSHe3QMb8qiEqybXiVHA5WrExdK+OTDyyrdZ+E=", - "url": "https://github.com/nextcloud-releases/mail/releases/download/v5.7.0/mail-v5.7.0.tar.gz", - "version": "5.7.0", + "hash": "sha256-Aq+ISmrPNlH42KNqkxAqoTEgML2l36lhsAMS0GUYb+c=", + "url": "https://github.com/nextcloud-releases/mail/releases/download/v5.7.1/mail-v5.7.1.tar.gz", + "version": "5.7.1", "description": "**πŸ’Œ A mail app for Nextcloud**\n\n- **πŸš€ Integration with other Nextcloud apps!** Currently Contacts, Calendar & Files – more to come.\n- **πŸ“₯ Multiple mail accounts!** Personal and company account? No problem, and a nice unified inbox. Connect any IMAP account.\n- **πŸ”’ Send & receive encrypted mails!** Using the great [Mailvelope](https://mailvelope.com) browser extension.\n- **πŸ™ˆ We’re not reinventing the wheel!** Based on the great [Horde](https://www.horde.org) libraries.\n- **πŸ“¬ Want to host your own mail server?** We do not have to reimplement this as you could set up [Mail-in-a-Box](https://mailinabox.email)!\n\n## Ethical AI Rating\n\n### Priority Inbox\n\nPositive:\n* The software for training and inferencing of this model is open source.\n* The model is created and trained on-premises based on the user's own data.\n* The training data is accessible to the user, making it possible to check or correct for bias or optimise the performance and CO2 usage.\n\n### Thread Summaries (opt-in)\n\n**Rating:** 🟒/🟑/🟠/πŸ”΄\n\nThe rating depends on the installed text processing backend. See [the rating overview](https://docs.nextcloud.com/server/latest/admin_manual/ai/index.html) for details.\n\nLearn more about the Nextcloud Ethical AI Rating [in our blog](https://nextcloud.com/blog/nextcloud-ethical-ai-rating/).", "homepage": "https://github.com/nextcloud/mail#readme", "licenses": [ "agpl" ] }, + "music": { + "hash": "sha256-n1HsKmkXL8YSQywGlt3f9lqSDBYcxi3VWO8K9b0PZqY=", + "url": "https://github.com/nc-music/music/releases/download/v3.0.0/nc-music-3.0.0.tar.gz", + "version": "3.0.0", + "description": "A stand-alone music player app and a \"lite\" player for the Files app\n\n- On modern browsers, supports audio types .mp3, .ogg, .m4a, .m4b, .flac, .wav, and more\n- Playlist support with import from .m3u, .m3u8, .pls, and .wpl files\n- Show lyrics from the file metadata or .lrc files\n- Browse by artists, albums, genres, or folders\n- Gapless play\n- Filter the shown content with the search function\n- Advanced search to freely use and combine dozens of search criteria\n- Play internet radio and podcast channels\n- Setup Last.fm connection to scrobble plays and/or see background information on artists, albums, and songs\n- Control with media control keys on the keyboard or OS\n- The app can handle libraries consisting of thousands of albums and tens of thousands of songs\n- Includes a server backend compatible with the Subsonic and Ampache protocols, allowing playback and browsing of your library on dozens of external apps on Android, iOS, Windows, Linux, etc.\n- Widget for the Nextcloud Dashboard", + "homepage": "https://github.com/nc-music/music", + "licenses": [ + "agpl" + ] + }, "nextpod": { "hash": "sha256-aMdPr3EKTZLfCBMHwzfMf6rY0vE9a5DBHPtZH3Nh2w0=", "url": "https://github.com/pbek/nextcloud-nextpod/releases/download/v0.7.10/nextpod-nc.tar.gz", @@ -219,11 +229,21 @@ "agpl" ] }, + "onlyoffice": { + "hash": "sha256-YBg/rrXPZyd0pqaOez/GjfraCqS7kwNTAXjIwBvExLM=", + "url": "https://github.com/ONLYOFFICE/onlyoffice-nextcloud/releases/download/v10.0.0/onlyoffice.tar.gz", + "version": "10.0.0", + "description": "The ONLYOFFICE app for Nextcloud brings powerful document editing and collaboration tools directly to your Nextcloud environment. With this integration, you can seamlessly create, edit, and co-author text documents, spreadsheets, presentations, and PDFs, as well as build and fill out PDF forms.\n\nCollaborate with your team in real time, make use of Track Changes, version history, comments, integrated chat, and more. Work together on files with federated cloud sharing. Flexible access permissions allow you to control who can view, edit, or comment, ensuring secure role-based collaboration tailored to your needs. Documents can also be protected with watermarks, password settings, and encryption for added security.\n\nThe app offers support for over 50 file formats, including DOCX, XLSX, PPTX, PDF, RTF, TXT, CSV, ODT, ODS, ODP, EPUB, FB2, HTML, HWP, HWPX, Pages, Numbers, Keynote, etc. Seamless desktop and mobile app integration means you'll have access to your Nextcloud files wherever you go.\n\nFurthermore, you can seamlessly connect any AI assistant, including local ones, directly to the editors to work faster and more efficient. This allows you to leverage various AI models for tasks like chatbot interactions, translations, OCR, and more.\n\nWhether you’re working with internal teams or external collaborators, the ONLYOFFICE app for Nextcloud enhances productivity, simplifies workflows, and ensures your files remain secure.", + "homepage": "https://www.onlyoffice.com", + "licenses": [ + "agpl" + ] + }, "phonetrack": { - "hash": "sha256-2DO4bK1FlTaVS1xve/oU4xNnrA8j9mq7IuOcZPszJOY=", - "url": "https://github.com/julien-nc/phonetrack/releases/download/v1.0.0/phonetrack-1.0.0.tar.gz", - "version": "1.0.0", - "description": "# PhoneTrack Nextcloud application\n\nπŸ“± PhoneTrack is a Nextcloud application to track and store mobile device's locations.\n\nπŸ—Ί It receives information from mobile phone's logging apps and displays it dynamically on a map.\n\n🌍 Help us to translate this app on [PhoneTrack Crowdin project](https://crowdin.com/project/phonetrack).\n\nβš’ Check out other ways to help in the [contribution guidelines](https://gitlab.com/eneiluj/phonetrack-oc/blob/master/CONTRIBUTING.md).\n\nHow to use PhoneTrack :\n\n- Create a tracking session.\n- Give the logging link\\* to the mobile devices. Choose the [logging method](https://gitlab.com/eneiluj/phonetrack-oc/wikis/userdoc#logging-methods) you prefer.\n- Watch the session's devices location in real time (or not) in PhoneTrack or share it with public pages.\n\n(\\*) Don't forget to set the device name in the link (rather than in the logging app settings). Replace \"yourname\" with the desired device name.\nSetting the device name in logging app settings only works with Owntracks, Traccar and OpenGTS.\n\nOn PhoneTrack main page, while watching a session, you can :\n\n- πŸ“ Display location history\n- β›› Filter points\n- ✎ Manually edit/add/delete points\n- ✎ Edit devices (rename, change colour/shape, move to another session)\n- β›Ά Define geofencing zones for devices\n- βš‡ Define proximity alerts for device pairs\n- πŸ–§ Share a session to other Nextcloud users or with a public link (read-only)\n- πŸ”— Generate public share links with optional restrictions (filters, device name, last positions only, geofencing simplification)\n- πŸ–« Import/export a session in GPX format (one file with one track per device or one file per device)\n- πŸ—  Display sessions statistics\n- πŸ”’ [Reserve a device name](https://gitlab.com/eneiluj/phonetrack-oc/wikis/userdoc#device-name-reservation) to make sure only authorised user can log with this name\n- πŸ—“ Toggle session auto export and auto purge (daily/weekly/monthly)\n- β—” Choose what to do when point number quota is reached (block logging or delete oldest point)\n\nPublic page and public filtered page work like main page except there is only one session displayed, everything is read-only and there is no need to be logged in.\n\nThis app is tested on Nextcloud 17 with Firefox 57+ and Chromium.\n\nThis app is compatible with theming colours and accessibility themes !\n\nThis app is under development.\n\n## Install\n\nSee the [AdminDoc](https://gitlab.com/eneiluj/phonetrack-oc/wikis/admindoc) for installation details.\n\nCheck [CHANGELOG](https://gitlab.com/eneiluj/phonetrack-oc/blob/master/CHANGELOG.md#change-log) file to see what's new and what's coming in next release.\n\nCheck [AUTHORS](https://gitlab.com/eneiluj/phonetrack-oc/blob/master/AUTHORS.md#authors) file to see complete list of authors.\n\n## Known issues\n\n- PhoneTrack **now works** with Nextcloud group restriction activated. See [admindoc](https://gitlab.com/eneiluj/phonetrack-oc/wikis/admindoc#issue-with-phonetrack-restricted-to-some-groups-in-nextcloud).\n\nAny feedback will be appreciated.\n\n\n\n## Donation\n\nI develop this app during my free time.\n\n* [Donate with Paypal](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=66PALMY8SF5JE) (you don't need a paypal account)\n* [Donate with Liberapay : ![Donate using Liberapay](https://liberapay.com/assets/widgets/donate.svg)](https://liberapay.com/eneiluj/donate)", + "hash": "sha256-+JPK8Eh7RFHMreCdlA1F1jBUD04Fw0R952TBHOUXDQ0=", + "url": "https://github.com/julien-nc/phonetrack/releases/download/v1.0.1/phonetrack-1.0.1.tar.gz", + "version": "1.0.1", + "description": "# PhoneTrack Nextcloud application\n\nπŸ“± PhoneTrack is a Nextcloud application to track and store mobile device's locations.\n\nπŸ—Ί It receives information from mobile phone's logging apps and displays it dynamically on a map.\n\n🌍 Help us to translate this app on [PhoneTrack Crowdin project](https://crowdin.com/project/phonetrack).\n\nβš’ Check out other ways to help in the [contribution guidelines](https://gitlab.com/eneiluj/phonetrack-oc/blob/master/CONTRIBUTING.md).\n\nHow to use PhoneTrack :\n\n- Create a tracking session.\n- Give the logging link\\* to the mobile devices. Choose the [logging method](https://github.com/julien-nc/phonetrack/blob/main/doc/user.md#logging-methods) you prefer.\n- Watch the session's devices location in real time (or not) in PhoneTrack or share it with public pages.\n\n(\\*) Don't forget to set the device name in the link (rather than in the logging app settings). Replace \"yourname\" with the desired device name.\nSetting the device name in logging app settings only works with Owntracks, Traccar and OpenGTS.\n\nOn PhoneTrack main page, while watching a session, you can :\n\n- πŸ“ Display location history\n- β›› Filter points\n- ✎ Manually edit/add/delete points\n- ✎ Edit devices (rename, change colour/shape, move to another session)\n- β›Ά Define geofencing zones for devices\n- βš‡ Define proximity alerts for device pairs\n- πŸ–§ Share a session to other Nextcloud users or with a public link (read-only)\n- πŸ”— Generate public share links with optional restrictions (filters, device name, last positions only, geofencing simplification)\n- πŸ–« Import/export a session in GPX format (one file with one track per device or one file per device)\n- πŸ—  Display sessions statistics\n- πŸ”’ [Reserve a device name](https://github.com/julien-nc/phonetrack/blob/main/doc/user.md#device-name-reservation) to make sure only authorized user can log with this name\n- πŸ—“ Toggle session auto export and auto purge (daily/weekly/monthly)\n- β—” Choose what to do when point number quota is reached (block logging or delete oldest point)\n\nPublic page and public filtered page work like main page except there is only one session displayed, everything is read-only and there is no need to be logged in.\n\nThis app is under development.\n\n## Install\n\nSee the [AdminDoc](https://gitlab.com/eneiluj/phonetrack-oc/wikis/admindoc) for installation details.\n\nCheck [CHANGELOG](https://gitlab.com/eneiluj/phonetrack-oc/blob/master/CHANGELOG.md#change-log) file to see what's new and what's coming in next release.\n\nCheck [AUTHORS](https://gitlab.com/eneiluj/phonetrack-oc/blob/master/AUTHORS.md#authors) file to see complete list of authors.\n\n## Known issues\n\n- PhoneTrack **now works** with Nextcloud group restriction activated. See [admindoc](https://github.com/julien-nc/phonetrack/blob/main/doc/admin.md#issue-with-phonetrack-restricted-to-some-groups-in-nextcloud).\n\nAny feedback will be appreciated.\n\n\n\n## Donation\n\nI develop this app during my free time.\n\n* [Donate with Paypal](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=66PALMY8SF5JE) (you don't need a paypal account)\n* [Donate with Liberapay : ![Donate using Liberapay](https://liberapay.com/assets/widgets/donate.svg)](https://liberapay.com/eneiluj/donate)", "homepage": "https://github.com/julien-nc/phonetrack", "licenses": [ "agpl" @@ -390,9 +410,9 @@ ] }, "whiteboard": { - "hash": "sha256-thJL8fZCh7pIOt+GZT5TNVlVshyaxkPufIcHUdiVeRY=", - "url": "https://github.com/nextcloud-releases/whiteboard/releases/download/v1.5.6/whiteboard-v1.5.6.tar.gz", - "version": "1.5.6", + "hash": "sha256-h+CuftR+iLuRuEVVccp89fA34JYSbCkwobjBytwgwg0=", + "url": "https://github.com/nextcloud-releases/whiteboard/releases/download/v1.5.7/whiteboard-v1.5.7.tar.gz", + "version": "1.5.7", "description": "The official whiteboard app for Nextcloud. It allows users to create and share whiteboards with other users and collaborate in real-time.\n\n**Whiteboard requires a separate collaboration server to work.** Please see the [documentation](https://github.com/nextcloud/whiteboard?tab=readme-ov-file#backend) on how to install it.\n\n- 🎨 Drawing shapes, writing text, connecting elements\n- πŸ“ Real-time collaboration\n- πŸ–ΌοΈ Add images with drag and drop\n- πŸ“Š Easily add mermaid diagrams\n- ✨ Use the Smart Picker to embed other elements from Nextcloud\n- πŸ“¦ Image export\n- πŸ’ͺ Strong foundation: We use Excalidraw as our base library", "homepage": "https://github.com/nextcloud/whiteboard", "licenses": [ diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index d3eb2f1fc2df..3dab1883782f 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -905,6 +905,9 @@ mapAliases { ibm-sw-tpm2 = throw "ibm-sw-tpm2 has been removed, as it was broken"; # Added 2025-08-25 igvm-tooling = throw "'igvm-tooling' has been removed as it is poorly maintained upstream and a dependency has been marked insecure."; # Added 2025-09-03 ikos = throw "ikos has been removed, as it does not build with supported LLVM versions"; # Added 2025-08-10 + imagemagick6 = throw "'imagemagick6' was removed because it is outdated. Use 'imagemagick' instead."; # added 2026-02-27 + imagemagick6_light = throw "'imagemagick6_light' was removed because it is outdated. Use 'imagemagick_light' instead."; # added 2026-02-27 + imagemagick6Big = throw "'imagemagick6Big' was removed because it is outdated. Use 'imagemagickBig' instead."; # added 2026-02-27 imaginer = throw "'imaginer' has been removed due to lack of upstream maintenance"; # Added 2025-08-15 imapnotify = throw "'imapnotify' has been removed because it is unmaintained upstream"; # Added 2025-11-14 immersed-vr = throw "'immersed-vr' has been renamed to/replaced by 'immersed'"; # Converted to throw 2025-10-27 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f23d78fa371e..f31cf6131caa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9860,33 +9860,6 @@ with pkgs; inherit (darwin) autoSignDarwinBinariesHook; }; - imagemagick6_light = imagemagick6.override { - bzip2Support = false; - zlibSupport = false; - libX11Support = false; - libXtSupport = false; - fontconfigSupport = false; - freetypeSupport = false; - ghostscriptSupport = false; - libjpegSupport = false; - djvulibreSupport = false; - lcms2Support = false; - openexrSupport = false; - libpngSupport = false; - liblqr1Support = false; - librsvgSupport = false; - libtiffSupport = false; - libxml2Support = false; - openjpegSupport = false; - libwebpSupport = false; - libheifSupport = false; - libde265Support = false; - }; - - imagemagick6Big = imagemagick6.override { - ghostscriptSupport = true; - }; - imagemagick_light = lowPrio ( imagemagick.override { bzip2Support = false; @@ -12551,6 +12524,8 @@ with pkgs; xp-pen-deco-01-v2-driver = libsForQt5.xp-pen-deco-01-v2-driver; + radicle-node-unstable = callPackage ../by-name/ra/radicle-node/unstable.nix { }; + newlib-nano = newlib.override { nanoizeNewlib = true; }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 86e17acd313e..ddc5bbaa1e02 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5493,6 +5493,8 @@ self: super: with self; { fints = callPackage ../development/python-modules/fints { }; + fints_4 = callPackage ../development/python-modules/fints/4.nix { }; + finvizfinance = callPackage ../development/python-modules/finvizfinance { }; fiona = callPackage ../development/python-modules/fiona { };