diff --git a/ci/OWNERS b/ci/OWNERS index e63c5a6c5f9d..c21cb14fe11e 100644 --- a/ci/OWNERS +++ b/ci/OWNERS @@ -387,9 +387,9 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt /pkgs/top-level/php-packages.nix @jtojnar @aanderse @globin @ma27 @talyz # Docker tools -/pkgs/build-support/docker @roberth -/nixos/tests/docker-tools* @roberth -/doc/build-helpers/images/dockertools.section.md @roberth +/pkgs/build-support/docker @roberth @jhol +/nixos/tests/docker-tools* @roberth @jhol +/doc/build-helpers/images/dockertools.section.md @roberth @jhol # Blockchains /pkgs/applications/blockchains @mmahut @RaghavSood diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md index f142ae8f6cfd..0894e34f28a9 100644 --- a/doc/release-notes/rl-2511.section.md +++ b/doc/release-notes/rl-2511.section.md @@ -326,3 +326,7 @@ See the neovim help page [`:help startup`](https://neovim.io/doc/user/starting.html#startup) for more information, as well as [the nixpkgs neovim wrapper documentation](#neovim-custom-configuration). - `cloudflare-ddns`: Added package cloudflare-ddns. + +- `nextcloud32`: Added for the Nextcloud 32 major release. + + See https://nextcloud.com/blog/nextcloud-hub25-autumn/ for more details on the new major version. diff --git a/lib/filesystem.nix b/lib/filesystem.nix index a950720602a7..afc4c2698291 100644 --- a/lib/filesystem.nix +++ b/lib/filesystem.nix @@ -239,16 +239,15 @@ in ``` */ listFilesRecursive = - dir: - lib.flatten ( - lib.mapAttrsToList ( - name: type: - if type == "directory" then - lib.filesystem.listFilesRecursive (dir + "/${name}") - else - dir + "/${name}" - ) (builtins.readDir dir) - ); + let + # We only flatten at the very end, as flatten is recursive. + internalFunc = + dir: + (lib.mapAttrsToList ( + name: type: if type == "directory" then internalFunc (dir + "/${name}") else dir + "/${name}" + ) (builtins.readDir dir)); + in + dir: lib.flatten (internalFunc dir); /** Transform a directory tree containing package files suitable for diff --git a/nixos/modules/services/web-apps/nextcloud.md b/nixos/modules/services/web-apps/nextcloud.md index eadc90a6a610..72cae63c8b22 100644 --- a/nixos/modules/services/web-apps/nextcloud.md +++ b/nixos/modules/services/web-apps/nextcloud.md @@ -5,7 +5,7 @@ self-hostable cloud platform. The server setup can be automated using [services.nextcloud](#opt-services.nextcloud.enable). A desktop client is packaged at `pkgs.nextcloud-client`. -The current default by NixOS is `nextcloud31` which is also the latest +The current default by NixOS is `nextcloud32` which is also the latest major version available. ## Basic usage {#module-services-nextcloud-basic-usage} diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix index cafa64b29e7a..da5e02e27479 100644 --- a/nixos/modules/services/web-apps/nextcloud.nix +++ b/nixos/modules/services/web-apps/nextcloud.nix @@ -320,6 +320,9 @@ in (lib.mkRemovedOptionModule [ "services" "nextcloud" "config" "dbport" ] '' Add port to services.nextcloud.config.dbhost instead. '') + (lib.mkRemovedOptionModule [ "services" "nextcloud" "nginx" "recommendedHttpHeaders" ] '' + This option has been removed to always follow upstream's security recommendation. + '') (lib.mkRenamedOptionModule [ "services" "nextcloud" "logLevel" ] [ "services" "nextcloud" "settings" "loglevel" ] @@ -438,10 +441,11 @@ in description = "Which package to use for the Nextcloud instance."; relatedPackages = [ "nextcloud31" + "nextcloud32" ]; }; phpPackage = lib.mkPackageOption pkgs "php" { - default = [ "php83" ]; + default = [ "php84" ]; example = "php82"; }; @@ -979,11 +983,6 @@ in }; nginx = { - recommendedHttpHeaders = lib.mkOption { - type = lib.types.bool; - default = true; - description = "Enable additional recommended HTTP response headers"; - }; hstsMaxAge = lib.mkOption { type = lib.types.ints.positive; default = 15552000; @@ -1030,7 +1029,7 @@ in { warnings = let - latest = 31; + latest = 32; upgradeWarning = major: nixos: '' A legacy Nextcloud install (from before NixOS ${nixos}) may be installed. @@ -1061,7 +1060,8 @@ in ++ (lib.optional (lib.versionOlder overridePackage.version "28") (upgradeWarning 27 "24.05")) ++ (lib.optional (lib.versionOlder overridePackage.version "29") (upgradeWarning 28 "24.11")) ++ (lib.optional (lib.versionOlder overridePackage.version "30") (upgradeWarning 29 "24.11")) - ++ (lib.optional (lib.versionOlder overridePackage.version "31") (upgradeWarning 30 "25.05")); + ++ (lib.optional (lib.versionOlder overridePackage.version "31") (upgradeWarning 30 "25.05")) + ++ (lib.optional (lib.versionOlder overridePackage.version "32") (upgradeWarning 31 "25.11")); services.nextcloud.package = lib.mkDefault ( if pkgs ? nextcloud then @@ -1076,8 +1076,10 @@ in pkgs.nextcloud29 else if lib.versionOlder stateVersion "25.05" then pkgs.nextcloud30 - else + else if lib.versionOlder stateVersion "25.11" then pkgs.nextcloud31 + else + pkgs.nextcloud32 ); services.nextcloud.phpOptions = lib.mkMerge [ @@ -1534,19 +1536,23 @@ in }; extraConfig = '' index index.php index.html /index.php$request_uri; - ${lib.optionalString (cfg.nginx.recommendedHttpHeaders) '' - add_header X-Content-Type-Options nosniff; - add_header X-Robots-Tag "noindex, nofollow"; - add_header X-Permitted-Cross-Domain-Policies none; - add_header X-Frame-Options sameorigin; - add_header Referrer-Policy no-referrer; - ''} + add_header X-Content-Type-Options nosniff; + add_header X-Robots-Tag "noindex, nofollow"; + add_header X-Permitted-Cross-Domain-Policies none; + add_header X-Frame-Options sameorigin; + add_header Referrer-Policy no-referrer; ${lib.optionalString (cfg.https) '' add_header Strict-Transport-Security "max-age=${toString cfg.nginx.hstsMaxAge}; includeSubDomains" always; ''} client_max_body_size ${cfg.maxUploadSize}; fastcgi_buffers 64 4K; fastcgi_hide_header X-Powered-By; + # mirror upstream htaccess file https://github.com/nextcloud/server/blob/v32.0.0/.htaccess#L40-L41 + fastcgi_hide_header Referrer-Policy; + fastcgi_hide_header X-Content-Type-Options; + fastcgi_hide_header X-Frame-Options; + fastcgi_hide_header X-Permitted-Cross-Domain-Policies; + fastcgi_hide_header X-Robots-Tag; gzip on; gzip_vary on; gzip_comp_level 4; diff --git a/nixos/modules/services/web-apps/pretalx.nix b/nixos/modules/services/web-apps/pretalx.nix index 652bccf287f3..f7eaf8d788a9 100644 --- a/nixos/modules/services/web-apps/pretalx.nix +++ b/nixos/modules/services/web-apps/pretalx.nix @@ -439,16 +439,23 @@ in "mysql.service" ]; wantedBy = [ "multi-user.target" ]; - preStart = '' - versionFile="${cfg.settings.filesystem.data}/.version" - version=$(cat "$versionFile" 2>/dev/null || echo 0) + preStart = + let + versionString = lib.concatStringsSep "\n" ( + [ "pretalx-${cfg.package.version}" ] + ++ map (plugin: "${plugin.pname}-${plugin.version}") cfg.plugins + ); + in + '' + versionFile="${cfg.settings.filesystem.data}/.version" + version="$(cat "$versionFile" 2>/dev/null || echo 0)" - if [[ $version != ${cfg.package.version} ]]; then - ${lib.getExe' pythonEnv "pretalx-manage"} migrate + if [[ "$version" != "${versionString}" ]]; then + ${lib.getExe' pythonEnv "pretalx-manage"} migrate - echo "${cfg.package.version}" > "$versionFile" - fi - ''; + echo "${versionString}" > "$versionFile" + fi + ''; serviceConfig = { ExecStart = "${lib.getExe' pythonEnv "gunicorn"} --bind unix:/run/pretalx/pretalx.sock ${cfg.gunicorn.extraArgs} pretalx.wsgi"; RuntimeDirectory = "pretalx"; diff --git a/nixos/tests/nextcloud/default.nix b/nixos/tests/nextcloud/default.nix index 31e889b58600..b69a520bf544 100644 --- a/nixos/tests/nextcloud/default.nix +++ b/nixos/tests/nextcloud/default.nix @@ -140,5 +140,6 @@ in listToAttrs ( concatMap genTests [ 31 + 32 ] ) diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index 0d6952465563..909dc1321b76 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -1270,11 +1270,11 @@ rec { staticPath = "${dirOf shell}:${lib.makeBinPath [ builder ]}"; - # https://github.com/NixOS/nix/blob/2.8.0/src/nix-build/nix-build.cc#L493-L526 + # https://github.com/NixOS/nix/blob/2.32.0/src/nix/nix-build/nix-build.cc#L617-L651 rcfile = writeText "nix-shell-rc" '' unset PATH dontAddDisableDepTrack=1 - # TODO: https://github.com/NixOS/nix/blob/2.8.0/src/nix-build/nix-build.cc#L506 + # TODO: https://github.com/NixOS/nix/blob/2.32.0/src/nix/nix-build/nix-build.cc#L628 [ -e $stdenv/setup ] && source $stdenv/setup PATH=${staticPath}:"$PATH" SHELL=${lib.escapeShellArg shell} @@ -1294,7 +1294,7 @@ rec { ''} ''; - # https://github.com/NixOS/nix/blob/2.8.0/src/libstore/globals.hh#L464-L465 + # https://github.com/NixOS/nix/blob/2.32.0/src/libstore/include/nix/store/globals.hh#L778-L788 sandboxBuildDir = "/build"; drvEnv = @@ -1311,18 +1311,18 @@ rec { SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt"; NIX_SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt"; - # https://github.com/NixOS/nix/blob/2.8.0/src/libstore/build/local-derivation-goal.cc#L1027-L1030 + # https://github.com/NixOS/nix/blob/2.32.0/src/libstore/unix/build/derivation-builder.cc#L1001-L1004 # PATH = "/path-not-set"; # Allows calling bash and `buildDerivation` as the Cmd PATH = staticPath; - # https://github.com/NixOS/nix/blob/2.8.0/src/libstore/build/local-derivation-goal.cc#L1032-L1038 + # https://github.com/NixOS/nix/blob/2.32.0/src/libstore/unix/build/derivation-builder.cc#L1006-L1012 HOME = homeDirectory; - # https://github.com/NixOS/nix/blob/2.8.0/src/libstore/build/local-derivation-goal.cc#L1040-L1044 + # https://github.com/NixOS/nix/blob/2.32.0/src/libstore/unix/build/derivation-builder.cc#L1014-L1018 NIX_STORE = storeDir; - # https://github.com/NixOS/nix/blob/2.8.0/src/libstore/build/local-derivation-goal.cc#L1046-L1047 + # https://github.com/NixOS/nix/blob/2.32.0/src/libstore/unix/build/derivation-builder.cc#L1020-L1021 # TODO: Make configurable? NIX_BUILD_CORES = "1"; @@ -1330,23 +1330,23 @@ rec { // drvEnv // { - # https://github.com/NixOS/nix/blob/2.8.0/src/libstore/build/local-derivation-goal.cc#L1008-L1010 + # https://github.com/NixOS/nix/blob/2.32.0/src/libstore/unix/build/derivation-builder.cc#L1035-L1037 NIX_BUILD_TOP = sandboxBuildDir; - # https://github.com/NixOS/nix/blob/2.8.0/src/libstore/build/local-derivation-goal.cc#L1012-L1013 + # https://github.com/NixOS/nix/blob/2.32.0/src/libstore/unix/build/derivation-builder.cc#L1039-L1040 TMPDIR = sandboxBuildDir; TEMPDIR = sandboxBuildDir; TMP = sandboxBuildDir; TEMP = sandboxBuildDir; - # https://github.com/NixOS/nix/blob/2.8.0/src/libstore/build/local-derivation-goal.cc#L1015-L1019 + # https://github.com/NixOS/nix/blob/2.32.0/src/libstore/unix/build/derivation-builder.cc#L1042-L1046 PWD = sandboxBuildDir; - # https://github.com/NixOS/nix/blob/2.8.0/src/libstore/build/local-derivation-goal.cc#L1071-L1074 + # https://github.com/NixOS/nix/blob/2.32.0/src/libstore/unix/build/derivation-builder.cc#L1079-L1082 # We don't set it here because the output here isn't handled in any special way # NIX_LOG_FD = "2"; - # https://github.com/NixOS/nix/blob/2.8.0/src/libstore/build/local-derivation-goal.cc#L1076-L1077 + # https://github.com/NixOS/nix/blob/2.32.0/src/libstore/unix/build/derivation-builder.cc#L1084-L1085 TERM = "xterm-256color"; }; @@ -1358,7 +1358,7 @@ rec { usrBinEnv (fakeNss.override { # Allows programs to look up the build user's home directory - # https://github.com/NixOS/nix/blob/ffe155abd36366a870482625543f9bf924a58281/src/libstore/build/local-derivation-goal.cc#L906-L910 + # https://github.com/NixOS/nix/blob/2.32.0/src/libstore/unix/build/linux-derivation-builder.cc#L409-L416 # Slightly differs however: We use the passed-in homeDirectory instead of sandboxBuildDir. # We're doing this because it's arguably a bug in Nix that sandboxBuildDir is used here: https://github.com/NixOS/nix/issues/6379 extraPasswdLines = [ @@ -1386,8 +1386,8 @@ rec { # Run this image as the given uid/gid config.User = "${toString uid}:${toString gid}"; config.Cmd = - # https://github.com/NixOS/nix/blob/2.8.0/src/nix-build/nix-build.cc#L185-L186 - # https://github.com/NixOS/nix/blob/2.8.0/src/nix-build/nix-build.cc#L534-L536 + # https://github.com/NixOS/nix/blob/2.32.0/src/nix/nix-build/nix-build.cc#L240-L241 + # https://github.com/NixOS/nix/blob/2.32.0/src/nix/nix-build/nix-build.cc#L659 if run == null then [ shell diff --git a/pkgs/build-support/replace-dependencies.nix b/pkgs/build-support/replace-dependencies.nix index fe325b175fe7..cd97e8b566ed 100644 --- a/pkgs/build-support/replace-dependencies.nix +++ b/pkgs/build-support/replace-dependencies.nix @@ -43,7 +43,7 @@ let inherit (builtins) unsafeDiscardStringContext appendContext; inherit (lib) listToAttrs - isStorePath + isStringLike readFile attrValues mapAttrs @@ -53,6 +53,16 @@ let ; inherit (lib.attrsets) mergeAttrsList; + isNonCaStorePath = + x: + if isStringLike x then + let + str = toString x; + in + builtins.substring 0 1 str == "/" && (dirOf str == builtins.storeDir) + else + false; + toContextlessString = x: unsafeDiscardStringContext (toString x); warn = if verbose then lib.warn else (x: y: y); @@ -90,7 +100,7 @@ let realisation = drv: - if isStorePath drv then + if isNonCaStorePath drv then # Input-addressed and fixed-output derivations have their realisation as outPath. toContextlessString drv else diff --git a/pkgs/build-support/replace-direct-dependencies.nix b/pkgs/build-support/replace-direct-dependencies.nix index 57036ebd74d1..3a51763282e5 100644 --- a/pkgs/build-support/replace-direct-dependencies.nix +++ b/pkgs/build-support/replace-direct-dependencies.nix @@ -12,20 +12,30 @@ }: let inherit (lib) - isStorePath + isStringLike substring stringLength optionalString escapeShellArgs concatMap ; + + isNonCaStorePath = + x: + if isStringLike x then + let + str = toString x; + in + builtins.substring 0 1 str == "/" && (dirOf str == builtins.storeDir) + else + false; in if replacements == [ ] then drv else let drvName = - if isStorePath drv then + if isNonCaStorePath drv then # Reconstruct the name from the actual store path if available. substring 33 (stringLength (baseNameOf drv)) (baseNameOf drv) else if drv ? drvAttrs.name then diff --git a/pkgs/by-name/an/animatch/package.nix b/pkgs/by-name/an/animatch/package.nix index 6d5952701f1e..e85ea5fe0253 100644 --- a/pkgs/by-name/an/animatch/package.nix +++ b/pkgs/by-name/an/animatch/package.nix @@ -18,6 +18,12 @@ stdenv.mkDerivation rec { hash = "sha256-zBV45WMAXtCpPPbDpr04K/a9UtZ4KLP9nUauBlbhrFo="; }; + postPatch = '' + substituteInPlace libsuperderpy/src/3rdparty/cimgui/CMakeLists.txt --replace-fail \ + 'cmake_minimum_required(VERSION 3.1)' \ + 'cmake_minimum_required(VERSION 4.0)' + ''; + nativeBuildInputs = [ cmake ]; @@ -32,6 +38,8 @@ stdenv.mkDerivation rec { "-DLIBSUPERDERPY_STATIC=ON" # recommended by upstream for coexistence with other superderpy games ]; + strictDeps = true; + meta = { homepage = "https://gitlab.com/HolyPangolin/animatch/"; description = "Cute match three game for the Librem 5 smartphone"; diff --git a/pkgs/by-name/ar/argtable/package.nix b/pkgs/by-name/ar/argtable/package.nix index 68b6d12d3891..cd9e5a103dd5 100644 --- a/pkgs/by-name/ar/argtable/package.nix +++ b/pkgs/by-name/ar/argtable/package.nix @@ -7,14 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "argtable"; - version = "3.2.2"; - srcVersion = "v${finalAttrs.version}.f25c624"; + version = "3.3.1"; src = fetchFromGitHub { owner = "argtable"; repo = "argtable3"; - rev = finalAttrs.srcVersion; - hash = "sha256-X89xFLDs6NEgjzzwy8kplvTgukQd/CV3Xa9A3JXecf4="; + tag = "v" + finalAttrs.version; + hash = "sha256-IW4pqOHKjwxQEmv/V40kIRLin+bQE6PAlfJemFgi5bQ="; }; nativeBuildInputs = [ cmake ]; @@ -25,6 +24,10 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' patchShebangs tools/build + + substituteInPlace pkgconfig.pc.in \ + --replace-fail "\''${prefix}/@CMAKE_INSTALL_INCLUDEDIR@" "@CMAKE_INSTALL_FULL_INCLUDEDIR@" \ + --replace-fail "\''${prefix}/@CMAKE_INSTALL_LIBDIR@" "@CMAKE_INSTALL_FULL_LIBDIR@" ''; meta = { diff --git a/pkgs/by-name/au/autobase/package.nix b/pkgs/by-name/au/autobase/package.nix index 50b6d28773a1..0b4f99fdcfbe 100644 --- a/pkgs/by-name/au/autobase/package.nix +++ b/pkgs/by-name/au/autobase/package.nix @@ -27,7 +27,11 @@ buildNpmPackage (finalAttrs: { cp ${./package-lock.json} ./package-lock.json ''; - passthru.updateScript = nix-update-script { }; + passthru.updateScript = nix-update-script { + extraArgs = [ + "--generate-lockfile" + ]; + }; meta = { description = "Concise multiwriter for data structures with Hypercore"; diff --git a/pkgs/by-name/bc/bcachefs-tools/package.nix b/pkgs/by-name/bc/bcachefs-tools/package.nix index 0f9da9bc2d07..e4f2f7659109 100644 --- a/pkgs/by-name/bc/bcachefs-tools/package.nix +++ b/pkgs/by-name/bc/bcachefs-tools/package.nix @@ -19,7 +19,6 @@ rustPlatform, makeWrapper, nix-update-script, - python3, testers, nixosTests, installShellFiles, @@ -29,13 +28,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "bcachefs-tools"; - version = "1.31.6"; + version = "1.31.7"; src = fetchFromGitHub { owner = "koverstreet"; repo = "bcachefs-tools"; tag = "v${finalAttrs.version}"; - hash = "sha256-9oiXMMrMMfu9VR0zSFM4yCAQaBgThDdEILSrxH9a84k="; + hash = "sha256-gKtOyaDN9hQo45Rk9hMabKRefOG+ooaCrtLBCPx0fT8="; }; nativeBuildInputs = [ @@ -66,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: { cargoDeps = rustPlatform.fetchCargoVendor { src = finalAttrs.src; - hash = "sha256-E2d9uAaja6OsCMhmWFyqIVbGdad5fJ+tw3S7+X7YzpM="; + hash = "sha256-INnv9kRgM8RRMwBnC6Vwj9S5FfI5gMscU//aNzHF+8w="; }; outputs = [ diff --git a/pkgs/by-name/bi/bili-live-tool/package.nix b/pkgs/by-name/bi/bili-live-tool/package.nix new file mode 100644 index 000000000000..4e00973669dd --- /dev/null +++ b/pkgs/by-name/bi/bili-live-tool/package.nix @@ -0,0 +1,61 @@ +{ + lib, + python3Packages, + fetchFromGitHub, + nix-update-script, +}: + +let + version = "0.3.9"; +in +python3Packages.buildPythonApplication { + pname = "bili-live-tool"; + inherit version; + + src = fetchFromGitHub { + owner = "chenxi-Eumenides"; + repo = "bilibili_live_tool"; + tag = "v${version}"; + hash = "sha256-gNzR9cDy4sixQOSWAXeX5qOoGkaFOjBU//+iHvG0lG8="; + }; + + postPatch = '' + tee >> pyproject.toml < $out/bin/bili-live-tool + chmod +x $out/bin/bili-live-tool + ''; + + nativeCheckInputs = with python3Packages; [ unittestCheckHook ]; + unittestFlags = [ + "-s" + "unittest" + "-v" + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Tool to start and stop streaming and getting streaming codes for Bilibili live"; + homepage = "https://github.com/chenxi-Eumenides/bilibili_live_tool"; + license = lib.licenses.mpl20; + maintainers = with lib.maintainers; [ ulysseszhan ]; + mainProgram = "bili-live-tool"; + }; +} diff --git a/pkgs/by-name/bp/bpp-core/package.nix b/pkgs/by-name/bp/bpp-core/package.nix index 546270e84766..0613fd293174 100644 --- a/pkgs/by-name/bp/bpp-core/package.nix +++ b/pkgs/by-name/bp/bpp-core/package.nix @@ -24,11 +24,16 @@ stdenv.mkDerivation rec { }) ]; + postPatch = '' + substituteInPlace CMakeLists.txt --replace-fail \ + 'cmake_minimum_required (VERSION 2.8.11)' 'cmake_minimum_required (VERSION 4.1)' + ''; + nativeBuildInputs = [ cmake ]; postFixup = '' substituteInPlace $out/lib/cmake/bpp-core/bpp-core-targets.cmake \ - --replace 'set(_IMPORT_PREFIX' '#set(_IMPORT_PREFIX' + --replace-fail 'set(_IMPORT_PREFIX' '#set(_IMPORT_PREFIX' ''; # prevents cmake from exporting incorrect INTERFACE_INCLUDE_DIRECTORIES # of form /nix/store/.../nix/store/.../include, diff --git a/pkgs/by-name/bp/bpp-phyl/package.nix b/pkgs/by-name/bp/bpp-phyl/package.nix index 78baac39b99c..d2078dfaf454 100644 --- a/pkgs/by-name/bp/bpp-phyl/package.nix +++ b/pkgs/by-name/bp/bpp-phyl/package.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { pname = "bpp-phyl"; - inherit (bpp-core) version; + inherit (bpp-core) version postPatch; src = fetchFromGitHub { owner = "BioPP"; diff --git a/pkgs/by-name/bp/bpp-popgen/package.nix b/pkgs/by-name/bp/bpp-popgen/package.nix index 72cee8055c1b..b62a86cd5c8f 100644 --- a/pkgs/by-name/bp/bpp-popgen/package.nix +++ b/pkgs/by-name/bp/bpp-popgen/package.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { pname = "bpp-popgen"; - inherit (bpp-core) version; + inherit (bpp-core) version postPatch; src = fetchFromGitHub { owner = "BioPP"; diff --git a/pkgs/by-name/bp/bpp-seq/package.nix b/pkgs/by-name/bp/bpp-seq/package.nix index 966b6f8d9065..59e92324395b 100644 --- a/pkgs/by-name/bp/bpp-seq/package.nix +++ b/pkgs/by-name/bp/bpp-seq/package.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { pname = "bpp-seq"; - inherit (bpp-core) version; + inherit (bpp-core) version postPatch; src = fetchFromGitHub { owner = "BioPP"; diff --git a/pkgs/by-name/bp/bppsuite/package.nix b/pkgs/by-name/bp/bppsuite/package.nix index 926b336f0c9f..1444767bac16 100644 --- a/pkgs/by-name/bp/bppsuite/package.nix +++ b/pkgs/by-name/bp/bppsuite/package.nix @@ -2,6 +2,7 @@ stdenv, fetchFromGitHub, cmake, + texinfo, bpp-core, bpp-seq, bpp-phyl, @@ -11,7 +12,7 @@ stdenv.mkDerivation rec { pname = "bppsuite"; - inherit (bpp-core) version; + inherit (bpp-core) version postPatch; src = fetchFromGitHub { owner = "BioPP"; @@ -20,7 +21,10 @@ stdenv.mkDerivation rec { sha256 = "1wdwcgczqbc3m116vakvi0129wm3acln3cfc7ivqnalwvi6lrpds"; }; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ + cmake + texinfo + ]; buildInputs = [ bpp-core bpp-seq diff --git a/pkgs/by-name/cm/cmakerc/0001-Fix-minimum-required-CMake-version-to-be-compatible-.patch b/pkgs/by-name/cm/cmakerc/0001-Fix-minimum-required-CMake-version-to-be-compatible-.patch new file mode 100644 index 000000000000..099b641246ee --- /dev/null +++ b/pkgs/by-name/cm/cmakerc/0001-Fix-minimum-required-CMake-version-to-be-compatible-.patch @@ -0,0 +1,25 @@ +From edba7fcb38457932337e442aac7d50528d2a5d71 Mon Sep 17 00:00:00 2001 +From: loner <2788892716@qq.com> +Date: Thu, 9 Oct 2025 07:19:53 +0800 +Subject: [PATCH] Fix minimum required CMake version to be compatible with + modern CMake + +--- + CMakeRC.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeRC.cmake b/CMakeRC.cmake +index 6a5147a..5d48bbc 100644 +--- a/CMakeRC.cmake ++++ b/CMakeRC.cmake +@@ -34,7 +34,7 @@ endif() + + set(_version 2.0.0) + +-cmake_minimum_required(VERSION 3.3) ++cmake_minimum_required(VERSION 3.5...3.30) + include(CMakeParseArguments) + + if(COMMAND cmrc_add_resource_library) +-- +2.51.0 diff --git a/pkgs/by-name/cm/cmakerc/package.nix b/pkgs/by-name/cm/cmakerc/package.nix index d7635c735f14..90d58afc4555 100644 --- a/pkgs/by-name/cm/cmakerc/package.nix +++ b/pkgs/by-name/cm/cmakerc/package.nix @@ -15,6 +15,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { hash = "sha256-++16WAs2K9BKk8384yaSI/YD1CdtdyXVBIjGhqi4JIk="; }; + # Fix the cmake_minimum_required version constraint in CMakeRC.cmake. + patches = [ + ./0001-Fix-minimum-required-CMake-version-to-be-compatible-.patch + ]; + installPhase = '' runHook preInstall diff --git a/pkgs/games/cutechess/default.nix b/pkgs/by-name/cu/cutechess/package.nix similarity index 76% rename from pkgs/games/cutechess/default.nix rename to pkgs/by-name/cu/cutechess/package.nix index 059c330f1a99..cac459a1656d 100644 --- a/pkgs/games/cutechess/default.nix +++ b/pkgs/by-name/cu/cutechess/package.nix @@ -3,8 +3,7 @@ fetchFromGitHub, cmake, pkg-config, - wrapQtAppsHook, - qtbase, + qt5, lib, }: @@ -15,17 +14,17 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "cutechess"; repo = "cutechess"; - rev = "v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-vhS3Eenxcq7D8E5WVON5C5hCTytcEVbYUeuCkfB0apA="; }; nativeBuildInputs = [ cmake pkg-config - wrapQtAppsHook + qt5.wrapQtAppsHook ]; buildInputs = [ - qtbase + qt5.qtbase ]; postInstall = '' @@ -35,12 +34,12 @@ stdenv.mkDerivation (finalAttrs: { install -Dm444 $src/docs/cutechess-engines.json.5 -t $out/share/man/man5/ ''; - meta = with lib; { + meta = { description = "GUI, CLI, and library for playing chess"; homepage = "https://cutechess.com/"; - license = licenses.gpl3Plus; - maintainers = [ ]; - platforms = with platforms; (linux ++ windows); + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ iedame ]; + platforms = with lib.platforms; (linux ++ windows); mainProgram = "cutechess"; }; }) diff --git a/pkgs/games/cutemaze/default.nix b/pkgs/by-name/cu/cutemaze/package.nix similarity index 62% rename from pkgs/games/cutemaze/default.nix rename to pkgs/by-name/cu/cutemaze/package.nix index cb4a66b3bf3c..7569510e6dfd 100644 --- a/pkgs/games/cutemaze/default.nix +++ b/pkgs/by-name/cu/cutemaze/package.nix @@ -3,34 +3,30 @@ stdenv, fetchurl, cmake, - qttools, - wrapQtAppsHook, - qtbase, - qtwayland, - qtsvg, + qt6, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "cutemaze"; version = "1.3.5"; src = fetchurl { - url = "https://gottcode.org/cutemaze/cutemaze-${version}.tar.bz2"; + url = "https://gottcode.org/cutemaze/cutemaze-${finalAttrs.version}.tar.bz2"; hash = "sha256-a+QIOD0TB0AGnqIUgtkMBZuPUCQbXp4NtZ6b0vk/J0c="; }; nativeBuildInputs = [ cmake - qttools - wrapQtAppsHook + qt6.qttools + qt6.wrapQtAppsHook ]; buildInputs = [ - qtbase - qtsvg + qt6.qtbase + qt6.qtsvg ] ++ lib.optionals stdenv.hostPlatform.isLinux [ - qtwayland + qt6.qtwayland ]; installPhase = @@ -47,13 +43,16 @@ stdenv.mkDerivation rec { else null; - meta = with lib; { - changelog = "https://github.com/gottcode/cutemaze/blob/v${version}/ChangeLog"; + meta = { + changelog = "https://github.com/gottcode/cutemaze/blob/v${finalAttrs.version}/ChangeLog"; description = "Simple, top-down game in which mazes are randomly generated"; mainProgram = "cutemaze"; homepage = "https://gottcode.org/cutemaze/"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ dotlambda ]; - platforms = platforms.unix; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ + dotlambda + iedame + ]; + platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/cv/cvc4/package.nix b/pkgs/by-name/cv/cvc4/package.nix index 8748d1e57926..bbdca9be0ac8 100644 --- a/pkgs/by-name/cv/cvc4/package.nix +++ b/pkgs/by-name/cv/cvc4/package.nix @@ -72,6 +72,10 @@ stdenv.mkDerivation rec { sed -i '/#define CVC4__UTIL__REGEXP_H/a\ #include ' src/util/regexp.h + + # Fix CMake 4 build + substituteInPlace CMakeLists.txt --replace-fail \ + "cmake_minimum_required(VERSION 3.2)" "cmake_minimum_required(VERSION 3.10)" ''; preConfigure = '' diff --git a/pkgs/by-name/di/discord-rpc/package.nix b/pkgs/by-name/di/discord-rpc/package.nix index d17df5b33080..97fe94cb559e 100644 --- a/pkgs/by-name/di/discord-rpc/package.nix +++ b/pkgs/by-name/di/discord-rpc/package.nix @@ -41,6 +41,12 @@ stdenv.mkDerivation rec { }) ]; + postPatch = '' + substituteInPlace CMakeLists.txt --replace-fail \ + "cmake_minimum_required (VERSION 3.2.0)" \ + "cmake_minimum_required (VERSION 3.10.0)" + ''; + meta = with lib; { description = "Official library to interface with the Discord client"; homepage = "https://github.com/discordapp/discord-rpc"; diff --git a/pkgs/by-name/di/dislocker/package.nix b/pkgs/by-name/di/dislocker/package.nix index d84ae19dbb0d..72984a914545 100644 --- a/pkgs/by-name/di/dislocker/package.nix +++ b/pkgs/by-name/di/dislocker/package.nix @@ -9,15 +9,15 @@ fuse, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "dislocker"; version = "0.7.3"; src = fetchFromGitHub { - owner = "aorimn"; + owner = "Aorimn"; repo = "dislocker"; - rev = "v${version}"; - sha256 = "1ak68s1v5dwh8y2dy5zjybmrh0pnqralmyqzis67y21m87g47h2k"; + tag = "v${finalAttrs.version}"; + hash = "sha256-U8BD3kE1CH+Mjh/7SlXG9gKY6/LyF9+ER5C3soNGZqo="; }; patches = [ @@ -28,8 +28,16 @@ stdenv.mkDerivation rec { # # https://github.com/Aorimn/dislocker/pull/246 (fetchpatch { - url = "https://github.com/Aorimn/dislocker/commit/7744f87c75fcfeeb414d0957771042b10fb64e62.diff"; - sha256 = "0bpyccbbfjsidsrd2q9qylb95nvi8g3glb3jss7xmhywj86bhzr5"; + name = "feat-support-the-latest-FUSE-on-macOS.patch"; + url = "https://github.com/Aorimn/dislocker/commit/7744f87c75fcfeeb414d0957771042b10fb64e62.patch"; + hash = "sha256-JX+4DJLcw9qP1nIs+sZDcduSFvU4YdGyblFLtxZj/i4="; + }) + # fix compatibility with CMake (https://cmake.org/cmake/help/v4.0/command/cmake_minimum_required.html) + # https://github.com/Aorimn/dislocker/pull/346 + (fetchpatch { + name = "cmake-raise-minimum-required-version-to-3.5.patch"; + url = "https://github.com/Aorimn/dislocker/commit/337d05dc7447436539f2fb481eef0e528a000b66.patch"; + hash = "sha256-6LTRjaZfyGS2BCdpcJy/qo0r8soXJSZqWjZRbaKvcQk="; }) ]; @@ -37,16 +45,18 @@ stdenv.mkDerivation rec { cmake pkg-config ]; + buildInputs = [ fuse mbedtls_2 ]; - meta = with lib; { + meta = { description = "Read BitLocker encrypted partitions in Linux"; - homepage = "https://github.com/aorimn/dislocker"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ elitak ]; - platforms = platforms.unix; + homepage = "https://github.com/Aorimn/dislocker"; + changelog = "https://github.com/Aorimn/dislocker/raw/${finalAttrs.src.rev}/CHANGELOG.md"; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ elitak ]; + platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/do/dokieli/package.nix b/pkgs/by-name/do/dokieli/package.nix index 20f9cae11f7d..4b0267558af3 100644 --- a/pkgs/by-name/do/dokieli/package.nix +++ b/pkgs/by-name/do/dokieli/package.nix @@ -1,8 +1,11 @@ { lib, fetchFromGitHub, + unstableGitUpdater, makeWrapper, - nix-update-script, + writeShellApplication, + _experimental-update-script-combinators, + nix, serve, stdenv, xsel, @@ -48,8 +51,20 @@ stdenv.mkDerivation (finalAttrs: { --chdir $out ''; - passthru.updateScript = nix-update-script { - extraArgs = [ "--version=branch" ]; + passthru = { + updateScriptSrc = unstableGitUpdater { }; + updateScriptDeps = writeShellApplication { + name = "update-dokieli-berry-deps"; + runtimeInputs = [ + nix + yarn-berry.yarn-berry-fetcher + ]; + text = lib.strings.readFile ./updateDeps.sh; + }; + updateScript = _experimental-update-script-combinators.sequence [ + finalAttrs.passthru.updateScriptSrc + (lib.getExe finalAttrs.passthru.updateScriptDeps) + ]; }; meta = { diff --git a/pkgs/by-name/do/dokieli/updateDeps.sh b/pkgs/by-name/do/dokieli/updateDeps.sh new file mode 100644 index 000000000000..a62459a058ff --- /dev/null +++ b/pkgs/by-name/do/dokieli/updateDeps.sh @@ -0,0 +1,28 @@ +#!usr/bin/env bash + +export UPDATE_NIX_ATTR_PATH="${UPDATE_NIX_ATTR_PATH:-dokieli}" + +oldversion="${UPDATE_NIX_OLD_VERSION-}" +newversion="$(nix-instantiate . --eval --strict -A "$UPDATE_NIX_ATTR_PATH.version" | cut -d'"' -f2)" + +if [ "$oldversion" == "$newversion" ]; then + echo "No new version." + exit 0 +fi + +workdir="$(mktemp -d)" + +# File to replace stuff in +fname="$(nix-instantiate --eval -E "with import ./. {}; (builtins.unsafeGetAttrPos \"version\" $UPDATE_NIX_ATTR_PATH).file" | cut -d'"' -f2)" + +oldhash="$(nix-instantiate . --eval --strict -A "$UPDATE_NIX_ATTR_PATH.offlineCache.outputHash" | cut -d'"' -f2)" + +newsource="$(nix-build -A "$UPDATE_NIX_ATTR_PATH".src)" + +yarn-berry-fetcher missing-hashes "$newsource"/yarn.lock > "$workdir"/missing-hashes.json +newhash="$(yarn-berry-fetcher prefetch "$newsource"/yarn.lock "$workdir"/missing-hashes.json)" + +sed -i "$fname" \ + -e "s|$oldhash|$newhash|g" + +mv "$workdir"/missing-hashes.json "$(dirname "$fname")"/missing-hashes.json diff --git a/pkgs/by-name/el/element-desktop/element-desktop-pin.nix b/pkgs/by-name/el/element-desktop/element-desktop-pin.nix index bc82f74708f5..b113722a0d9a 100644 --- a/pkgs/by-name/el/element-desktop/element-desktop-pin.nix +++ b/pkgs/by-name/el/element-desktop/element-desktop-pin.nix @@ -1,7 +1,7 @@ { - "version" = "1.12.0"; + "version" = "1.12.1"; "hashes" = { - "desktopSrcHash" = "sha256-Epkjv6tT0I65JTu4O5nHFRn0q18kE1+7joyTF1S3y+4="; - "desktopYarnHash" = "sha256-2zy2xNzamjTyGE+Vm/gacMnby5Z0KfIWbgkl5EI5zi4="; + "desktopSrcHash" = "sha256-4C4WJ3HjiXh24umt80lWujeiDvRaS1mf2IjCj6+n87U="; + "desktopYarnHash" = "sha256-CyP0zy/nJoGolmB/p81jL0qAoD7d5xe5kvlmKW7Yaw8="; }; } diff --git a/pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix b/pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix index bafd8b8ab7b1..1b8cdd761417 100644 --- a/pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix +++ b/pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix @@ -1,7 +1,7 @@ { - "version" = "1.12.0"; + "version" = "1.12.1"; "hashes" = { - "webSrcHash" = "sha256-4e76IFOY7YiBX/cGobJNj1epH/Bnak+BgVPSjWC/8+s="; - "webYarnHash" = "sha256-qZPHWPmcGFtwfOSCpft0hFLuS7smmq9w1JxJ+oqJZPA="; + "webSrcHash" = "sha256-c9VoR+F33xDvLn4PkPGBXW5+Yl9vX7FzedN6HfjfHEI="; + "webYarnHash" = "sha256-Bu0rrzPNRdY5G/nhSlhXpBMq6tcjuc16s0UQR64gUc8="; }; } diff --git a/pkgs/by-name/et/ettercap/package.nix b/pkgs/by-name/et/ettercap/package.nix index 8bd47cd8f085..518673ddc945 100644 --- a/pkgs/by-name/et/ettercap/package.nix +++ b/pkgs/by-name/et/ettercap/package.nix @@ -1,72 +1,68 @@ { lib, stdenv, - fetchFromGitHub, - fetchpatch2, + atk, + bison, cmake, - libpcap, - libnet, - zlib, curl, - pcre2, - openssl, - ncurses, + fetchFromGitHub, + flex, + geoip, glib, gtk3, - atk, - pango, - flex, - bison, - geoip, harfbuzz, + libmaxminddb, + libnet, + libpcap, + ncurses, + openssl, + pango, + pcre2, pkg-config, + zlib, }: stdenv.mkDerivation rec { pname = "ettercap"; - version = "0.8.3.1"; + version = "0.8.4-unstable-2025-07-16"; src = fetchFromGitHub { owner = "Ettercap"; repo = "ettercap"; - rev = "v${version}"; - sha256 = "1sdf1ssa81ib6k0mc5m2jzbjl4jd1yv6ahv5dwx2x9w4b2pyqg1c"; + rev = "26ef2d2e1432b866460f9c4ddf9e4dce3db1a5ab"; + hash = "sha256-T3LsOD2LGbk4f5un3l5Ybf5/kgYQJfw7lGa2UXB/brY="; }; - patches = [ - (fetchpatch2 { - name = "curl-8.patch"; - url = "https://github.com/Ettercap/ettercap/commit/9ec4066addc49483e40055e0738c2e0ef144702f.diff"; - sha256 = "6D8lIxub0OS52BFr42yWRyqS2Q5CrpTLTt6rcItXFMM="; - }) - ]; - strictDeps = true; + nativeBuildInputs = [ + bison cmake flex - bison pkg-config ]; + buildInputs = [ - libpcap - libnet - zlib + atk curl - pcre2 - openssl - ncurses + geoip glib gtk3 - atk - pango - geoip harfbuzz + libmaxminddb + libnet + libpcap + ncurses + openssl + pango + pcre2 + zlib ]; preConfigure = '' - substituteInPlace CMakeLists.txt --replace /etc \$\{INSTALL_PREFIX\}/etc \ - --replace /usr \$\{INSTALL_PREFIX\} + substituteInPlace CMakeLists.txt \ + --replace-fail /etc \$\{INSTALL_PREFIX\}/etc \ + --replace-fail /usr \$\{INSTALL_PREFIX\} ''; cmakeFlags = [ @@ -87,7 +83,8 @@ stdenv.mkDerivation rec { analysis. ''; homepage = "https://www.ettercap-project.org/"; - license = licenses.gpl2; + changelog = "https://github.com/Ettercap/ettercap/releases/tag/${version}"; + license = licenses.gpl2Plus; platforms = platforms.unix; maintainers = with maintainers; [ pSub ]; }; diff --git a/pkgs/by-name/fe/feyngame/package.nix b/pkgs/by-name/fe/feyngame/package.nix new file mode 100644 index 000000000000..3272bff07a0f --- /dev/null +++ b/pkgs/by-name/fe/feyngame/package.nix @@ -0,0 +1,60 @@ +{ + lib, + stdenvNoCC, + fetchFromGitLab, + jdk, + jre, + desktop-file-utils, + git, + nix-update-script, +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "feyngame"; + version = "3.0.0"; + + src = fetchFromGitLab { + owner = "feyngame"; + repo = "FeynGame"; + tag = finalAttrs.version; + leaveDotGit = true; # the build script uses git log to find last commit date + hash = "sha256-PhdspIr0Lnuv4e8bjMEAXnVDK1YVlrI5XI+rP9qXNQ0="; + }; + + postPatch = '' + patchShebangs buildfile + substituteInPlace buildfile \ + --replace-fail '$Prefix/bin/feyngame %U' 'feyngame %U' \ + --replace-fail '$Prefix/share/pixmaps/fglogo.png' 'fglogo' + ''; + + # The build script includes both building and installing steps. + dontBuild = true; + + installPhase = '' + runHook preInstall + + OSTYPE=${if stdenvNoCC.hostPlatform.isDarwin then "darwin" else "linux-gnu"} ./buildfile -i "$out" + + runHook postInstall + ''; + + nativeBuildInputs = [ + git + jdk + desktop-file-utils + ]; + buildInputs = [ jre ]; + strictDeps = true; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Java-based graphical tool for drawing Feynman diagrams"; + homepage = "https://gitlab.com/feyngame/FeynGame"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ ulysseszhan ]; + platforms = jre.meta.platforms; + mainProgram = "feyngame"; + }; +}) diff --git a/pkgs/by-name/gb/gbforth/package.nix b/pkgs/by-name/gb/gbforth/package.nix index 924068150f2d..4ad496b1cbc2 100644 --- a/pkgs/by-name/gb/gbforth/package.nix +++ b/pkgs/by-name/gb/gbforth/package.nix @@ -4,6 +4,7 @@ fetchFromGitHub, makeWrapper, gforth, + writableTmpDirAsHomeHook, unstableGitUpdater, }: @@ -35,6 +36,11 @@ stdenv.mkDerivation { ''; doInstallCheck = true; + + nativeInstallCheckInputs = [ + writableTmpDirAsHomeHook + ]; + installCheckPhase = '' runHook preInstallCheck $out/bin/gbforth examples/simon/simon.fs diff --git a/pkgs/by-name/gf/gforth/boot-forth.nix b/pkgs/by-name/gf/gforth/boot-forth.nix index 977e7ab5988c..13c0cd5955e2 100644 --- a/pkgs/by-name/gf/gforth/boot-forth.nix +++ b/pkgs/by-name/gf/gforth/boot-forth.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { meta = { description = "Forth implementation of the GNU project (outdated version used to bootstrap)"; homepage = "https://www.gnu.org/software/gforth/"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Plus; platforms = lib.platforms.all; }; } diff --git a/pkgs/by-name/gf/gforth/package.nix b/pkgs/by-name/gf/gforth/package.nix index 28862942a62a..81d57c1b3ff6 100644 --- a/pkgs/by-name/gf/gforth/package.nix +++ b/pkgs/by-name/gf/gforth/package.nix @@ -4,8 +4,10 @@ fetchFromGitHub, callPackage, autoreconfHook, + gitUpdater, texinfo, libffi, + writableTmpDirAsHomeHook, }: let @@ -13,24 +15,27 @@ let bootForth = callPackage ./boot-forth.nix { }; lispDir = "${placeholder "out"}/share/emacs/site-lisp"; in -stdenv.mkDerivation rec { - +stdenv.mkDerivation (finalAttrs: { pname = "gforth"; - version = "0.7.9_20230518"; + version = "0.7.9_20251001"; src = fetchFromGitHub { owner = "forthy42"; repo = "gforth"; - rev = version; - hash = "sha256-rXtmmENBt9RMdLPq8GDyndh4+CYnCmz6NYpe3kH5OwU="; + rev = finalAttrs.version; + hash = "sha256-u9snXcFa/YYvITgMBY8FRYyyLFhHCP6hWA5ljwdKGLk="; }; + patches = [ ./use-nproc-instead-of-fhs.patch ]; + nativeBuildInputs = [ + writableTmpDirAsHomeHook autoreconfHook texinfo bootForth swig ]; + buildInputs = [ libffi ]; @@ -48,11 +53,15 @@ stdenv.mkDerivation rec { mkdir -p ${lispDir} ''; + passthru.updateScript = gitUpdater { }; + meta = { description = "Forth implementation of the GNU project"; - homepage = "https://github.com/forthy42/gforth"; - license = lib.licenses.gpl3; + homepage = "https://www.gnu.org/software/gforth"; + downloadPage = "https://github.com/forthy42/gforth"; + license = lib.licenses.gpl3Plus; broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64; # segfault when running ./gforthmi platforms = lib.platforms.all; + mainProgram = "gforth"; }; -} +}) diff --git a/pkgs/by-name/gf/gforth/use-nproc-instead-of-fhs.patch b/pkgs/by-name/gf/gforth/use-nproc-instead-of-fhs.patch new file mode 100644 index 000000000000..b4dec2626a54 --- /dev/null +++ b/pkgs/by-name/gf/gforth/use-nproc-instead-of-fhs.patch @@ -0,0 +1,16 @@ +diff --git i/cilk.fs w/cilk.fs +index 9c675d06..df858f3d 100644 +--- i/cilk.fs ++++ w/cilk.fs +@@ -25,9 +25,8 @@ e? os-type 2dup s" darwin" string-prefix? -rot s" openbsd" string-prefix? or [IF + s>number drop + r> free throw + [ELSE] e? os-type s" linux" search nip nip [IF] +- s" /sys/devices/system/cpu/present" slurp-file over >r +- #lf -scan '-' $split 2nip +- s>number drop 1+ ++ s" nproc" r/o open-pipe throw slurp-fid over >r ++ s>number drop + r> free throw + [ELSE] + 1 \ we don't know diff --git a/pkgs/by-name/go/google-chrome/package.nix b/pkgs/by-name/go/google-chrome/package.nix index 215a55490c8c..714253da0d6c 100644 --- a/pkgs/by-name/go/google-chrome/package.nix +++ b/pkgs/by-name/go/google-chrome/package.nix @@ -170,11 +170,11 @@ let linux = stdenvNoCC.mkDerivation (finalAttrs: { inherit pname meta passthru; - version = "141.0.7390.54"; + version = "141.0.7390.65"; src = fetchurl { url = "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${finalAttrs.version}-1_amd64.deb"; - hash = "sha256-vJMHfwIPf+aM3uj3UlYGo/YxTerNLrVouKNNFApGl48="; + hash = "sha256-Vdjrfq53R6aPlH3jM3A8qJnlsUJs6mac/r+NAZqWlq0="; }; # With strictDeps on, some shebangs were not being patched correctly @@ -272,11 +272,11 @@ let darwin = stdenvNoCC.mkDerivation (finalAttrs: { inherit pname meta passthru; - version = "141.0.7390.55"; + version = "141.0.7390.66"; src = fetchurl { - url = "http://dl.google.com/release2/chrome/ft5t2atavjdcw35pqqr5b5rp6e_141.0.7390.55/GoogleChrome-141.0.7390.55.dmg"; - hash = "sha256-F0IAksB2PHdl4yRV9Pdyd2iRAM7vLF7fJVO7V+l4KTE="; + url = "http://dl.google.com/release2/chrome/pkzctxukoi3f5inudh2ua3hcnq_141.0.7390.66/GoogleChrome-141.0.7390.66.dmg"; + hash = "sha256-uh2WOBY6a6hE6xfHYPH1MnZsaNf8aTrt4JtUzKT2t+g="; }; dontPatch = true; diff --git a/pkgs/by-name/hy/hypercore/package.nix b/pkgs/by-name/hy/hypercore/package.nix index ad845b3360cf..c2a7bac4121d 100644 --- a/pkgs/by-name/hy/hypercore/package.nix +++ b/pkgs/by-name/hy/hypercore/package.nix @@ -24,7 +24,11 @@ buildNpmPackage (finalAttrs: { cp ${./package-lock.json} ./package-lock.json ''; - passthru.updateScript = nix-update-script { }; + passthru.updateScript = nix-update-script { + extraArgs = [ + "--generate-lockfile" + ]; + }; meta = { description = "Secure, distributed append-only log"; diff --git a/pkgs/by-name/hy/hyperswarm/package.nix b/pkgs/by-name/hy/hyperswarm/package.nix index e61f0fb2c3ec..a516c5ae40b9 100644 --- a/pkgs/by-name/hy/hyperswarm/package.nix +++ b/pkgs/by-name/hy/hyperswarm/package.nix @@ -24,7 +24,11 @@ buildNpmPackage (finalAttrs: { cp ${./package-lock.json} ./package-lock.json ''; - passthru.updateScript = nix-update-script { }; + passthru.updateScript = nix-update-script { + extraArgs = [ + "--generate-lockfile" + ]; + }; meta = { description = "Distributed Networking Stack for Connecting Peers"; diff --git a/pkgs/by-name/li/libmsym/package.nix b/pkgs/by-name/li/libmsym/package.nix index dd7000941f6a..1cf0e1ce6666 100644 --- a/pkgs/by-name/li/libmsym/package.nix +++ b/pkgs/by-name/li/libmsym/package.nix @@ -5,24 +5,26 @@ cmake, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libmsym"; version = "0.2.3"; src = fetchFromGitHub { owner = "mcodev31"; repo = "libmsym"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; sha256 = "k+OEwrA/saupP/wX6Ii5My0vffiJ0X9xMCTrliMSMik="; }; nativeBuildInputs = [ cmake ]; - meta = with lib; { + cmakeFlags = [ "-DCMAKE_POLICY_VERSION_MINIMUM=3.5" ]; + + meta = { description = "Molecular point group symmetry lib"; homepage = "https://github.com/mcodev31/libmsym"; - license = licenses.mit; - platforms = platforms.linux; - maintainers = [ maintainers.sheepforce ]; + license = lib.licenses.mit; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.sheepforce ]; }; -} +}) diff --git a/pkgs/by-name/li/libnick/package.nix b/pkgs/by-name/li/libnick/package.nix index 78580c2db7dd..e9a4a8be68a1 100644 --- a/pkgs/by-name/li/libnick/package.nix +++ b/pkgs/by-name/li/libnick/package.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libnick"; - version = "2025.9.2"; + version = "2025.10.0"; src = fetchFromGitHub { owner = "NickvisionApps"; repo = "libnick"; tag = finalAttrs.version; - hash = "sha256-Trz1SQxv/VplAKHO62aGxHb8k9KSUSReH+hYLaUagUY="; + hash = "sha256-nxh9WyIP86rnkUgFRMEbO2jw6dtfPR4mcHeGplmL6mc="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ma/magento-cloud/package.nix b/pkgs/by-name/ma/magento-cloud/package.nix index 7c93a6d9eb84..15ba8a455f98 100644 --- a/pkgs/by-name/ma/magento-cloud/package.nix +++ b/pkgs/by-name/ma/magento-cloud/package.nix @@ -9,11 +9,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "magento-cloud"; - version = "1.46.1"; + version = "1.47.0"; src = fetchurl { url = "https://accounts.magento.cloud/sites/default/files/magento-cloud-v${finalAttrs.version}.phar"; - hash = "sha256-QrrD5pz6Juov1u3QYcuLr6aEKe/4DX5wFKs+hp6KjJ8="; + hash = "sha256-/CzHWQa/O1gW4x+b0acR0Cj8AE8Olhpgn7YcaDrLk9E="; }; dontUnpack = true; diff --git a/pkgs/by-name/mi/miniz/package.nix b/pkgs/by-name/mi/miniz/package.nix index c47b49755916..d1af52d8a2d4 100644 --- a/pkgs/by-name/mi/miniz/package.nix +++ b/pkgs/by-name/mi/miniz/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "miniz"; - version = "3.0.2"; + version = "3.1.0"; src = fetchFromGitHub { owner = "richgel999"; repo = "miniz"; rev = finalAttrs.version; - hash = "sha256-3J0bkr2Yk+MJXilUqOCHsWzuykySv5B1nepmucvA4hg="; + hash = "sha256-DQbXz1ehBNGFhuaW5Nz509njpPe73QpMHyKDbpqX0aI="; }; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/mi/misskey/package.nix b/pkgs/by-name/mi/misskey/package.nix index 1fdff9d1b014..533058bab6c9 100644 --- a/pkgs/by-name/mi/misskey/package.nix +++ b/pkgs/by-name/mi/misskey/package.nix @@ -3,6 +3,7 @@ lib, nixosTests, fetchFromGitHub, + gitUpdater, nodejs, pnpm_9, makeWrapper, @@ -12,7 +13,6 @@ ffmpeg-headless, writeShellScript, xcbuild, - nix-update-script, }: stdenv.mkDerivation (finalAttrs: { @@ -123,7 +123,7 @@ stdenv.mkDerivation (finalAttrs: { passthru = { inherit (finalAttrs) pnpmDeps; tests.misskey = nixosTests.misskey; - updateScript = nix-update-script { }; + updateScript = gitUpdater { }; }; meta = { diff --git a/pkgs/by-name/ne/netcoredbg/package.nix b/pkgs/by-name/ne/netcoredbg/package.nix index fe5883c70264..4edb65220a0e 100644 --- a/pkgs/by-name/ne/netcoredbg/package.nix +++ b/pkgs/by-name/ne/netcoredbg/package.nix @@ -44,6 +44,15 @@ let hardeningDisable = [ "strictoverflow" ]; + postPatch = '' + substituteInPlace CMakeLists.txt --replace-fail \ + "cmake_minimum_required(VERSION 2.8.12.2)" \ + "cmake_minimum_required(VERSION 3.10)" + substituteInPlace third_party/linenoise-ng/CMakeLists.txt --replace-fail \ + "cmake_minimum_required(VERSION 2.6)" \ + "cmake_minimum_required(VERSION 3.10)" + ''; + preConfigure = '' export DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=1 ''; diff --git a/pkgs/by-name/ne/nexusmods-app/deps.json b/pkgs/by-name/ne/nexusmods-app/deps.json index a86b6071929b..8a7000283848 100644 --- a/pkgs/by-name/ne/nexusmods-app/deps.json +++ b/pkgs/by-name/ne/nexusmods-app/deps.json @@ -261,8 +261,8 @@ }, { "pname": "DuckDB.NativeBinaries", - "version": "1.3.2", - "hash": "sha256-wHFmXCpJI44wr1mgybl+4QKhX+CwME9+Smzhi5G9G4w=" + "version": "1.4.0", + "hash": "sha256-27G7ptdNsjebMOrcegl0tgR2pvfvLS4RxQmw21k5Zuc=" }, { "pname": "DynamicData", @@ -1926,23 +1926,23 @@ }, { "pname": "NexusMods.HyperDuck", - "version": "0.24.0", - "hash": "sha256-DQP/Jq+19282NbTrwiCEOFwtbagbVhc8tmtruBLV470=" + "version": "0.28.0", + "hash": "sha256-vJW/9DbnSIzxH6CR1CzMru0w/BA7HwxuJ0TiKt6NgcQ=" }, { "pname": "NexusMods.MnemonicDB", - "version": "0.24.0", - "hash": "sha256-QIuX3I/tAc37hmmvhrOQZcv5U40Sa6HeR00wTlmgFF0=" + "version": "0.28.0", + "hash": "sha256-AzSzn2mdp4sx1ntOfm03kWlfo/mxxURcEMmChxSyEAI=" }, { "pname": "NexusMods.MnemonicDB.Abstractions", - "version": "0.24.0", - "hash": "sha256-SaVCEfgG1d+4wAtBdq9i5atbZsyBe6OEXt367eMOj1A=" + "version": "0.28.0", + "hash": "sha256-c6hEojlKk8B//lpEyxrYBy/QlpixzDE4LJq+sk4XZDY=" }, { "pname": "NexusMods.MnemonicDB.SourceGenerator", - "version": "0.24.0", - "hash": "sha256-vEALZe2bs1fm2r7TyOG2UJNbeudadc3BtdE5ezppINg=" + "version": "0.28.0", + "hash": "sha256-o888EyOAzDypNzhZTtW8BZp0Ew/fOUsho6IeBbGlmNM=" }, { "pname": "NexusMods.Paths", diff --git a/pkgs/by-name/ne/nexusmods-app/game-hashes/default.nix b/pkgs/by-name/ne/nexusmods-app/game-hashes/default.nix index 99d3e349cbda..af6ac0775238 100644 --- a/pkgs/by-name/ne/nexusmods-app/game-hashes/default.nix +++ b/pkgs/by-name/ne/nexusmods-app/game-hashes/default.nix @@ -1,6 +1,6 @@ { fetchurl }: let - release = "vD0E6FC9F3A82C2E9"; + release = "vc2e27b8bf8632dca"; owner = "Nexus-Mods"; repo = "game-hashes"; repoURL = "https://github.com/${owner}/${repo}"; @@ -8,7 +8,7 @@ let # Define a binding so that `update-source-version` can find it src = fetchurl { url = "${repoURL}/releases/download/${release}/game_hashes_db.zip"; - hash = "sha256-ACwhWSoxe1CxBWhkgixZeLKpfdXAnavd/30ELInVtZM="; + hash = "sha256-lu/C/WkjXtGJuZrsTg9fc/aEyJSsj9unjz1Sym39/b8="; passthru = { inherit src # Also for `update-source-version` support diff --git a/pkgs/by-name/ne/nexusmods-app/package.nix b/pkgs/by-name/ne/nexusmods-app/package.nix index 80376f70fe0e..5bcea550ddf8 100644 --- a/pkgs/by-name/ne/nexusmods-app/package.nix +++ b/pkgs/by-name/ne/nexusmods-app/package.nix @@ -22,13 +22,13 @@ let in buildDotnetModule (finalAttrs: { inherit pname; - version = "0.17.2"; + version = "0.18.2"; src = fetchFromGitHub { owner = "Nexus-Mods"; repo = "NexusMods.App"; tag = "v${finalAttrs.version}"; - hash = "sha256-2B5n1yN42birMJ1YaUU/KjzhHIJTv8nwrupc0ULc8Hc="; + hash = "sha256-+ayYRNclxbBedH6gIWTh5wI/AIvMzSq4x5fQXzxOT5c="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/ne/nexusmods-app/vendored/games.json b/pkgs/by-name/ne/nexusmods-app/vendored/games.json index 3995eba3b599..1ee7cae625b9 100644 --- a/pkgs/by-name/ne/nexusmods-app/vendored/games.json +++ b/pkgs/by-name/ne/nexusmods-app/vendored/games.json @@ -6,12 +6,12 @@ "forum_url": "https://forums.nexusmods.com/games/19-stardew-valley/", "nexusmods_url": "https://www.nexusmods.com/stardewvalley", "genre": "Simulation", - "file_count": 141253, - "downloads": 614556730, + "file_count": 141993, + "downloads": 619854329, "domain_name": "stardewvalley", "approved_date": 1457432329, - "mods": 25471, - "collections": 2025 + "mods": 25658, + "collections": 2049 }, { "id": 1704, @@ -20,12 +20,12 @@ "forum_url": "https://forums.nexusmods.com/games/6-skyrim/", "nexusmods_url": "https://www.nexusmods.com/skyrimspecialedition", "genre": "RPG", - "file_count": 653576, - "downloads": 8992667521, + "file_count": 656636, + "downloads": 9072303822, "domain_name": "skyrimspecialedition", "approved_date": 1477480498, - "mods": 117157, - "collections": 4847 + "mods": 117768, + "collections": 4872 }, { "id": 3174, @@ -34,12 +34,12 @@ "forum_url": "https://forums.nexusmods.com/games/9-mount-blade-ii-bannerlord/", "nexusmods_url": "https://www.nexusmods.com/mountandblade2bannerlord", "genre": "Strategy", - "file_count": 50070, - "downloads": 114524055, + "file_count": 50300, + "downloads": 115343239, "domain_name": "mountandblade2bannerlord", "approved_date": 1582898627, - "mods": 6265, - "collections": 292 + "mods": 6294, + "collections": 293 }, { "id": 3333, @@ -48,12 +48,12 @@ "forum_url": "https://forums.nexusmods.com/games/1-cyberpunk-2077/", "nexusmods_url": "https://www.nexusmods.com/cyberpunk2077", "genre": "Action", - "file_count": 123015, - "downloads": 894075844, + "file_count": 123906, + "downloads": 908587568, "domain_name": "cyberpunk2077", "approved_date": 1607433331, - "mods": 17664, - "collections": 1584 + "mods": 17809, + "collections": 1602 }, { "id": 3474, @@ -62,11 +62,11 @@ "forum_url": "https://forums.nexusmods.com/games/2-baldurs-gate-3/", "nexusmods_url": "https://www.nexusmods.com/baldursgate3", "genre": "RPG", - "file_count": 103892, - "downloads": 342668709, + "file_count": 104549, + "downloads": 345662936, "domain_name": "baldursgate3", "approved_date": 1602863114, - "mods": 14725, - "collections": 1800 + "mods": 14843, + "collections": 1805 } ] diff --git a/pkgs/by-name/ni/nickel/package.nix b/pkgs/by-name/ni/nickel/package.nix index ff3bf0547966..03f9ef85d661 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.13.0"; + version = "1.14.0"; src = fetchFromGitHub { owner = "tweag"; repo = "nickel"; tag = finalAttrs.version; - hash = "sha256-YYDYVZ0rMO3bEHcBBSOup0gieg96hqT6XUqWM9h4yeI="; + hash = "sha256-ee9P2XrUToW0WJJk8QnIkY6/9t+RCY98Ai05cz9ViIY="; }; - cargoHash = "sha256-hsyAa8rLd/usoArZKfO5+92nLh4/sq9X0fpJncN4Ik4="; + cargoHash = "sha256-nO8T+nSfR/EGW8IhjevmCH10P0ky+D0vyULSCVL5OYE="; cargoBuildFlags = [ "-p nickel-lang-cli" diff --git a/pkgs/by-name/ni/nirius/package.nix b/pkgs/by-name/ni/nirius/package.nix index 4965b3e69558..d33717ea6a73 100644 --- a/pkgs/by-name/ni/nirius/package.nix +++ b/pkgs/by-name/ni/nirius/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "nirius"; - version = "0.4.3"; + version = "0.5.4"; src = fetchFromSourcehut { owner = "~tsdh"; repo = "nirius"; rev = "nirius-${version}"; - hash = "sha256-JAoKuM+A9AO1erhpWIYKq8lWjRAYjDKqxf1r/Fu2IAM="; + hash = "sha256-UZUat/BmMIvkAphLaU5jaiRCrtsXvUXXGOgPrjgpPaU="; }; - cargoHash = "sha256-btau5IVJ4PWK65eU1F7cmUzF4MOj8FEc4p8KhHg03QQ="; + cargoHash = "sha256-eLQf3cC95y4UdPI/gJWN4Fdwa3DqXT+QvIV+2w34ul0="; meta = { description = "Utility commands for the niri wayland compositor"; diff --git a/pkgs/by-name/op/openmolcas/qcmaquis.patch b/pkgs/by-name/op/openmolcas/qcmaquis.patch index c4b5261a6cf6..0bfe34c648f7 100644 --- a/pkgs/by-name/op/openmolcas/qcmaquis.patch +++ b/pkgs/by-name/op/openmolcas/qcmaquis.patch @@ -2,16 +2,17 @@ diff --git a/cmake/custom/nevpt2.cmake b/cmake/custom/nevpt2.cmake index 789739ec8..6c86a7b8c 100644 --- a/cmake/custom/nevpt2.cmake +++ b/cmake/custom/nevpt2.cmake -@@ -67,6 +67,7 @@ list(APPEND NEVPT2CMakeArgs +@@ -67,6 +67,8 @@ list(APPEND NEVPT2CMakeArgs "-DMOLCAS_BUILD_DIR=${PROJECT_BINARY_DIR}" "-DCMAKE_Fortran_MODULE_DIRECTORY=${mod_dir}" "-DDMRG_INCLUDE=${HDF5_QCM_INCLUDE}" + "-DCMAKE_SKIP_BUILD_RPATH=ON" ++ -DCMAKE_POLICY_VERSION_MINIMUM=3.5 ) - + if(HDF5_ROOT) @@ -118,9 +119,7 @@ endif () - + ExternalProject_Add(${EP_PROJECT} PREFIX ${CUSTOM_NEVPT2_LOCATION} - GIT_REPOSITORY ${reference_git_repo} @@ -25,16 +26,17 @@ diff --git a/cmake/custom/qcmaquis.cmake b/cmake/custom/qcmaquis.cmake index 5fd1ef207..8d2957c6e 100644 --- a/cmake/custom/qcmaquis.cmake +++ b/cmake/custom/qcmaquis.cmake -@@ -77,6 +77,7 @@ list (APPEND QCMaquisCMakeArgs +@@ -77,6 +77,8 @@ list (APPEND QCMaquisCMakeArgs -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} -DCMAKE_CXX_FLAGS=${QCM_CMake_CXX_FLAGS} -DCMAKE_INSTALL_PREFIX:PATH= + -DCMAKE_SKIP_BUILD_RPATH=ON ++ -DCMAKE_POLICY_VERSION_MINIMUM=3.5 ) if (HDF5_ROOT) list (APPEND QCMaquisCMakeArgs @@ -274,10 +275,7 @@ if (NOT MAQUIS_DMRG_FOUND) # Does the opposite work? - + ExternalProject_Add (${EP_PROJECT} PREFIX ${extprojpath} - GIT_REPOSITORY ${reference_git_repo} diff --git a/pkgs/by-name/op/openrct2/package.nix b/pkgs/by-name/op/openrct2/package.nix index c81ed7d76675..c25a9e238739 100644 --- a/pkgs/by-name/op/openrct2/package.nix +++ b/pkgs/by-name/op/openrct2/package.nix @@ -30,6 +30,7 @@ pkg-config, speexdsp, zlib, + withDiscordRpc ? false, }: let @@ -79,7 +80,6 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ SDL2 curl - discord-rpc duktape expat flac @@ -100,13 +100,15 @@ stdenv.mkDerivation (finalAttrs: { openssl speexdsp zlib - ]; + ] + ++ lib.optional withDiscordRpc discord-rpc; cmakeFlags = [ (lib.cmakeBool "DOWNLOAD_OBJECTS" false) (lib.cmakeBool "DOWNLOAD_OPENMSX" false) (lib.cmakeBool "DOWNLOAD_OPENSFX" false) (lib.cmakeBool "DOWNLOAD_TITLE_SEQUENCES" false) + (lib.cmakeBool "DISABLE_DISCORD_RPC" (!withDiscordRpc)) ]; postUnpack = '' diff --git a/pkgs/by-name/pa/parallel-launcher/package.nix b/pkgs/by-name/pa/parallel-launcher/package.nix index babe4a9c08d5..9da8b75c3b34 100644 --- a/pkgs/by-name/pa/parallel-launcher/package.nix +++ b/pkgs/by-name/pa/parallel-launcher/package.nix @@ -20,6 +20,7 @@ # Allow overrides for the RetroArch core and declarative settings parallel-n64-core ? parallel-launcher.passthru.parallel-n64-core, extraRetroArchSettings ? { }, + withDiscordRpc ? false, }: let # Converts a version string like x.y.z to vx.y-z @@ -88,12 +89,12 @@ stdenv.mkDerivation ( buildInputs = [ SDL2 - discord-rpc libgcrypt sqlite qt5.qtbase qt5.qtsvg - ]; + ] + ++ lib.optional withDiscordRpc discord-rpc; qtWrapperArgs = [ "--prefix PATH : ${ diff --git a/pkgs/by-name/pe/perfect_dark/package.nix b/pkgs/by-name/pe/perfect_dark/package.nix index 3d2976c808e2..72fce405b418 100644 --- a/pkgs/by-name/pe/perfect_dark/package.nix +++ b/pkgs/by-name/pe/perfect_dark/package.nix @@ -22,13 +22,13 @@ assert lib.assertOneOf "romID" romID roms; stdenv.mkDerivation (finalAttrs: { pname = "perfect_dark"; - version = "0-unstable-2025-08-25"; + version = "0-unstable-2025-10-08"; src = fetchFromGitHub { owner = "fgsfdsfgs"; repo = "perfect_dark"; - rev = "bb4fcffeb5dc382fce4c609897a2e82590d7d709"; - hash = "sha256-naWE+oWgvrd4CSoBm6W4em60baTWn4uSnKbWh8WKPDM="; + rev = "8ea7e7b4108882e066a6c67b9183615718bc27e6"; + hash = "sha256-cAT+exdt+kZZW1+ZNn1h81LdzwDck2QREy/aTUkCFrU="; postFetch = '' pushd $out diff --git a/pkgs/by-name/ph/phrase-cli/package.nix b/pkgs/by-name/ph/phrase-cli/package.nix index 35821b430ac2..c996dae22afc 100644 --- a/pkgs/by-name/ph/phrase-cli/package.nix +++ b/pkgs/by-name/ph/phrase-cli/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "phrase-cli"; - version = "2.46.0"; + version = "2.47.0"; src = fetchFromGitHub { owner = "phrase"; repo = "phrase-cli"; rev = version; - sha256 = "sha256-cKCasr2TtNIn6tNPX/QpxWsG/n3fdq9DTqC77ymGmsQ="; + sha256 = "sha256-/TQN8id0oo9xkrJWSkWkUcaMLILZx193qCSSJSbT7WM="; }; - vendorHash = "sha256-duzotdz+vyjza6mHNCSPlAbqW/RitC3ZDXepNW3PRyc="; + vendorHash = "sha256-NxObJPzWcC+w8v1dlv2esqNX36uGbs2pYH7TqDLy7HE="; ldflags = [ "-X=github.com/phrase/phrase-cli/cmd.PHRASE_CLIENT_VERSION=${version}" ]; diff --git a/pkgs/by-name/py/pytrainer/package.nix b/pkgs/by-name/py/pytrainer/package.nix index 6d9df2aae00c..28c03760ab0d 100644 --- a/pkgs/by-name/py/pytrainer/package.nix +++ b/pkgs/by-name/py/pytrainer/package.nix @@ -12,7 +12,7 @@ perl, sqlite, tzdata, - webkitgtk_4_0, + webkitgtk_4_1, wrapGAppsHook3, xvfb-run, }: @@ -60,7 +60,7 @@ python.pkgs.buildPythonApplication rec { buildInputs = [ sqlite gtk3 - webkitgtk_4_0 + webkitgtk_4_1 glib-networking adwaita-icon-theme gdk-pixbuf @@ -89,6 +89,10 @@ python.pkgs.buildPythonApplication rec { postPatch = '' substituteInPlace pytrainer/platform.py \ --replace-fail 'sys.prefix' "\"$out\"" + + # https://github.com/pytrainer/pytrainer/pull/281 + substituteInPlace pytrainer/extensions/mapviewer.py \ + --replace-fail "gi.require_version('WebKit2', '4.0')" "gi.require_version('WebKit2', '4.1')" ''; checkPhase = '' diff --git a/pkgs/by-name/rm/rmg/package.nix b/pkgs/by-name/rm/rmg/package.nix index d1b4b79a0301..fe3fd28bae09 100644 --- a/pkgs/by-name/rm/rmg/package.nix +++ b/pkgs/by-name/rm/rmg/package.nix @@ -25,6 +25,7 @@ withWayland ? false, # Affects final license withAngrylionRdpPlus ? false, + withDiscordRpc ? false, }: stdenv.mkDerivation (finalAttrs: { @@ -48,7 +49,6 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ boost - discord-rpc freetype hidapi libpng @@ -62,6 +62,7 @@ stdenv.mkDerivation (finalAttrs: { xdg-user-dirs zlib ] + ++ lib.optional withDiscordRpc discord-rpc ++ ( with qt6Packages; [ @@ -78,6 +79,7 @@ stdenv.mkDerivation (finalAttrs: { # everything else. (lib.cmakeBool "NO_RUST" true) (lib.cmakeBool "USE_ANGRYLION" withAngrylionRdpPlus) + (lib.cmakeBool "DISCORD_RPC" withDiscordRpc) # Remove with 0.8.4 update ]; qtWrapperArgs = diff --git a/pkgs/by-name/sc/scom/package.nix b/pkgs/by-name/sc/scom/package.nix index a716387130c8..b5d2fe8b5d99 100644 --- a/pkgs/by-name/sc/scom/package.nix +++ b/pkgs/by-name/sc/scom/package.nix @@ -5,13 +5,13 @@ }: stdenv.mkDerivation (finaAttrs: { pname = "scom"; - version = "1.2"; + version = "1.2.1"; src = fetchFromGitHub { owner = "crash-systems"; repo = "scom"; tag = finaAttrs.version; - hash = "sha256-fFA0s+B94YPDvcPi2GCThcMGcSY6qR1f7x/jP8gXh94="; + hash = "sha256-l1MSJ5+Fw33OEshmcQ+A/yU8BbMJHGR6jI7I/y3AVwU="; }; enableParallelBuilding = true; diff --git a/pkgs/by-name/ta/taskwarrior2/package.nix b/pkgs/by-name/ta/taskwarrior2/package.nix index db6eed2e2081..91e801cc0bb9 100644 --- a/pkgs/by-name/ta/taskwarrior2/package.nix +++ b/pkgs/by-name/ta/taskwarrior2/package.nix @@ -35,6 +35,11 @@ stdenv.mkDerivation rec { installShellFiles ]; + cmakeFlags = [ + # Fix build with cmake>=4 + "-DCMAKE_POLICY_VERSION_MINIMUM=3.5" + ]; + doCheck = true; preCheck = '' patchShebangs --build test diff --git a/pkgs/by-name/uw/uwsm/package.nix b/pkgs/by-name/uw/uwsm/package.nix index 6900841f575f..3080fde6c372 100644 --- a/pkgs/by-name/uw/uwsm/package.nix +++ b/pkgs/by-name/uw/uwsm/package.nix @@ -7,6 +7,7 @@ ninja, scdoc, pkg-config, + fetchpatch, nix-update-script, bash, dmenu, @@ -37,6 +38,13 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-UP9Ztps5oWl0bdXhSlE4SCxHFprUf74DWygJy6GvO4k="; }; + patches = [ + (fetchpatch { + url = "https://github.com/Vladimir-csp/uwsm/commit/bd4db0fd1880b9b798e8f67e2d4c5e4ca2a28aca.patch?full_index=1"; + hash = "sha256-GxGwy9BkpBKZGkG00+bVIh6iDNBgRG1f1f9GUKm3ERw="; + }) + ]; + nativeBuildInputs = [ makeBinaryWrapper meson @@ -48,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ util-linux # waitpid newt # whiptail - libnotify # notify + libnotify # notify-send bash # sh systemd python @@ -57,23 +65,23 @@ stdenv.mkDerivation (finalAttrs: { mesonFlags = [ "--prefix=${placeholder "out"}" - (lib.mapAttrsToList lib.mesonEnable { - "uwsm-app" = uwsmAppSupport; - "fumon" = fumonSupport; - "uuctl" = uuctlSupport; - "man-pages" = true; - }) - (lib.mesonOption "python-bin" python.interpreter) - ]; + ] + ++ (lib.mapAttrsToList lib.mesonEnable { + "uwsm-app" = uwsmAppSupport; + "fumon" = fumonSupport; + "uuctl" = uuctlSupport; + "man-pages" = true; + "canonicalize-bins" = true; + }) + ++ (lib.mapAttrsToList lib.mesonOption { + "python-bin" = python.interpreter; + }); postInstall = let wrapperArgs = "--suffix PATH : ${lib.makeBinPath finalAttrs.buildInputs}"; in - '' - wrapProgram $out/bin/uwsm ${wrapperArgs} - '' - + lib.optionalString uuctlSupport '' + lib.optionalString uuctlSupport '' wrapProgram $out/bin/uuctl ${wrapperArgs} '' + lib.optionalString uwsmAppSupport '' diff --git a/pkgs/by-name/vi/victorialogs/package.nix b/pkgs/by-name/vi/victorialogs/package.nix index 6cfe8d5b4990..c4723ac7b76d 100644 --- a/pkgs/by-name/vi/victorialogs/package.nix +++ b/pkgs/by-name/vi/victorialogs/package.nix @@ -10,13 +10,13 @@ buildGoModule (finalAttrs: { pname = "VictoriaLogs"; - version = "1.35.0"; + version = "1.36.1"; src = fetchFromGitHub { owner = "VictoriaMetrics"; repo = "VictoriaLogs"; tag = "v${finalAttrs.version}"; - hash = "sha256-9g23rtLi/tHIXpfZSHgaIHIGHwQ0eYW5kLtMHqrIlMk="; + hash = "sha256-TZhgZ8x1ESXrNMU6Sa4cQMurTZ+obD/JqqIJFJ18KOA="; }; vendorHash = null; @@ -35,7 +35,7 @@ buildGoModule (finalAttrs: { postPatch = '' # Allow older go versions substituteInPlace go.mod \ - --replace-fail "go 1.25.1" "go ${finalAttrs.passthru.go.version}" + --replace-fail "go 1.25.2" "go ${finalAttrs.passthru.go.version}" substituteInPlace vendor/modules.txt \ --replace-fail "go 1.25.0" "go ${finalAttrs.passthru.go.version}" diff --git a/pkgs/by-name/wb/wb32-dfu-updater/fix-cmake4-build.patch b/pkgs/by-name/wb/wb32-dfu-updater/fix-cmake4-build.patch new file mode 100644 index 000000000000..288dc154fdd1 --- /dev/null +++ b/pkgs/by-name/wb/wb32-dfu-updater/fix-cmake4-build.patch @@ -0,0 +1,7 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 3.0) ++cmake_minimum_required(VERSION 3.10) + + set(CMAKE_C_STANDARD 99) diff --git a/pkgs/by-name/wb/wb32-dfu-updater/package.nix b/pkgs/by-name/wb/wb32-dfu-updater/package.nix index 91c9f24b9dbb..84730fe04954 100644 --- a/pkgs/by-name/wb/wb32-dfu-updater/package.nix +++ b/pkgs/by-name/wb/wb32-dfu-updater/package.nix @@ -17,6 +17,10 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-DKsDVO00JFhR9hIZksFVJLRwC6PF9LCRpf++QywFO2w="; }; + patches = [ + ./fix-cmake4-build.patch # Temporary fix for https://github.com/WestberryTech/wb32-dfu-updater/pull/19 + ]; + nativeBuildInputs = [ cmake ]; buildInputs = [ libusb1 ]; diff --git a/pkgs/by-name/wh/whistle/package.nix b/pkgs/by-name/wh/whistle/package.nix index 2796ee003565..c10966882a7e 100644 --- a/pkgs/by-name/wh/whistle/package.nix +++ b/pkgs/by-name/wh/whistle/package.nix @@ -6,16 +6,16 @@ buildNpmPackage rec { pname = "whistle"; - version = "2.9.102"; + version = "2.9.103"; src = fetchFromGitHub { owner = "avwo"; repo = "whistle"; rev = "v${version}"; - hash = "sha256-SgMiCRv/MHT5FuNnuKDaMh9DbkfuBQSiPyptpZTzF+A="; + hash = "sha256-hen0LpPyJGsJTiQ+cDjLJWHThWfj7TReX3/l9YMQNPo="; }; - npmDepsHash = "sha256-pHvaRJeTIaoLBD4slSxAnR50Lt481CEGApGvzkl8Llc="; + npmDepsHash = "sha256-HS8uc6WjQst5lkBCAKruFkTwBW68ZBPBeAwUQuaMuEk="; dontNpmBuild = true; diff --git a/pkgs/by-name/xs/xss-lock/package.nix b/pkgs/by-name/xs/xss-lock/package.nix index 4e8931f6e068..a955fff286f9 100644 --- a/pkgs/by-name/xs/xss-lock/package.nix +++ b/pkgs/by-name/xs/xss-lock/package.nix @@ -37,6 +37,13 @@ stdenv.mkDerivation { xcbutil ]; + # See https://github.com/NixOS/nixpkgs/issues/445447 + postPatch = '' + substituteInPlace CMakeLists.txt --replace-fail \ + "cmake_minimum_required(VERSION 2.8)" \ + "cmake_minimum_required(VERSION 3.10)" + ''; + passthru.tests = { inherit (nixosTests) xss-lock; }; meta = with lib; { diff --git a/pkgs/development/compilers/dotnet/vmr.nix b/pkgs/development/compilers/dotnet/vmr.nix index 0de2c51f5ab8..5f1882e777eb 100644 --- a/pkgs/development/compilers/dotnet/vmr.nix +++ b/pkgs/development/compilers/dotnet/vmr.nix @@ -39,8 +39,7 @@ let llvmPackages = llvmPackages_20; - stdenv = - if llvmPackages.stdenv.hostPlatform.isDarwin then swiftPackages.stdenv else llvmPackages.stdenv; + stdenv = llvmPackages.stdenv; inherit (stdenv) isLinux diff --git a/pkgs/development/python-modules/cmsis-svd/default.nix b/pkgs/development/python-modules/cmsis-svd/default.nix index b3197b6f89ef..c7e9f0a07c0e 100644 --- a/pkgs/development/python-modules/cmsis-svd/default.nix +++ b/pkgs/development/python-modules/cmsis-svd/default.nix @@ -7,16 +7,16 @@ lxml, }: -buildPythonPackage { +buildPythonPackage rec { pname = "cmsis-svd"; - version = "0.4-unstable-2024-01-25"; + version = "0.6"; pyproject = true; src = fetchFromGitHub { owner = "cmsis-svd"; repo = "cmsis-svd"; - rev = "38d21d30abd0d4c2f34fd79d83b34392ed4bb7a3"; - hash = "sha256-lFA0sNHVj4a4+EwOTmFUbM/nhmzJ4mx4GvT6Ykutakk="; + tag = "python-${version}"; + hash = "sha256-fx9eR9/Nw/oxPaP9rm1G6sjGI7iU4bhkmTS7f8i2RrQ="; }; preBuild = '' @@ -38,6 +38,7 @@ buildPythonPackage { meta = { description = "CMSIS SVD parser"; homepage = "https://github.com/cmsis-svd/cmsis-svd"; + changelog = "https://github.com/cmsis-svd/cmsis-svd/blob/${src.rev}/CHANGELOG"; maintainers = [ lib.maintainers.dump_stack ]; license = lib.licenses.asl20; }; diff --git a/pkgs/development/python-modules/highctidh/default.nix b/pkgs/development/python-modules/highctidh/default.nix index 446681574df6..e93de00b4c3a 100644 --- a/pkgs/development/python-modules/highctidh/default.nix +++ b/pkgs/development/python-modules/highctidh/default.nix @@ -4,6 +4,7 @@ setuptools, pytestCheckHook, fetchFromGitea, + gitUpdater, }: buildPythonPackage rec { pname = "highctidh"; @@ -32,6 +33,10 @@ buildPythonPackage rec { "highctidh" ]; + passthru.updateScript = gitUpdater { + rev-prefix = "v"; + }; + meta = { description = "Fork of high-ctidh as as a portable shared library with Python bindings"; homepage = "https://codeberg.org/vula/highctidh"; diff --git a/pkgs/development/python-modules/image/default.nix b/pkgs/development/python-modules/image/default.nix new file mode 100644 index 000000000000..f2b53e280dd8 --- /dev/null +++ b/pkgs/development/python-modules/image/default.nix @@ -0,0 +1,40 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + setuptools, + pillow, + django, + six, +}: + +let + pname = "image"; + version = "1.5.33"; +in +buildPythonPackage rec { + inherit pname version; + + src = fetchPypi { + inherit pname version; + hash = "sha256-uqLgkXgnfapQ8i/W0dUex48ZwSaIkhy5q1gIdD8JcSY="; + }; + + pyproject = true; + build-system = [ setuptools ]; + + dependencies = [ + pillow + django + six + ]; + + pythonImportsCheck = [ "image" ]; + + meta = { + description = "Django application for image and video processing"; + homepage = "https://github.com/francescortiz/image"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ ulysseszhan ]; + }; +} diff --git a/pkgs/development/python-modules/llm-openai-plugin/default.nix b/pkgs/development/python-modules/llm-openai-plugin/default.nix index 20a97ffb81a1..4ab079b5b1d5 100644 --- a/pkgs/development/python-modules/llm-openai-plugin/default.nix +++ b/pkgs/development/python-modules/llm-openai-plugin/default.nix @@ -15,14 +15,14 @@ }: buildPythonPackage rec { pname = "llm-openai-plugin"; - version = "0.6"; + version = "0.7"; pyproject = true; src = fetchFromGitHub { owner = "simonw"; repo = "llm-openai-plugin"; tag = version; - hash = "sha256-PDjrsuZMt4XpYyRg8VRyHZmAu4gD5lLl6aQezhavOvc="; + hash = "sha256-f/0QvMi2ZF14GtyDIOc9TkHLfbSjjNMe+Wy+60jKO7E="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/llm-venice/default.nix b/pkgs/development/python-modules/llm-venice/default.nix index 9de50d77d4f3..b884507a077d 100644 --- a/pkgs/development/python-modules/llm-venice/default.nix +++ b/pkgs/development/python-modules/llm-venice/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "llm-venice"; - version = "0.8.0"; + version = "0.8.1"; pyproject = true; src = fetchFromGitHub { owner = "ar-jan"; repo = "llm-venice"; tag = version; - hash = "sha256-jvZWMEJAWlX2y2Mivi8Kib5tbMtf+CXYP6fmLvNmD9k="; + hash = "sha256-N/nmbsIAkw41qKi37BgkX3DBN0AJnPMyx0y9QzTsVmw="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/msrplib/default.nix b/pkgs/development/python-modules/msrplib/default.nix index de8e1eca240f..c6d769382825 100644 --- a/pkgs/development/python-modules/msrplib/default.nix +++ b/pkgs/development/python-modules/msrplib/default.nix @@ -8,7 +8,7 @@ buildPythonPackage { pname = "msrplib"; - version = "0.20.1-unstable-2021-06-01"; + version = "0.21.0-unstable-2021-06-01"; pyproject = true; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/qemu-qmp/default.nix b/pkgs/development/python-modules/qemu-qmp/default.nix index 48fe24d08612..d4acf9e0a058 100644 --- a/pkgs/development/python-modules/qemu-qmp/default.nix +++ b/pkgs/development/python-modules/qemu-qmp/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "qemu-qmp"; - version = "0.0.3"; + version = "0.0.5"; pyproject = true; src = fetchFromGitLab { owner = "qemu-project"; repo = "python-qemu-qmp"; tag = "v${version}"; - hash = "sha256-NOtBea81hv+swJyx8Mv2MIqoK4/K5vyMiN12hhDEpJY="; + hash = "sha256-Mpay8JIau3cuUDxtEVn78prilr+YncmtbVX5LkBDrvk="; }; build-system = [ diff --git a/pkgs/development/python-modules/sat-tmp/default.nix b/pkgs/development/python-modules/sat-tmp/default.nix index f055189c2ea9..7ac981cfda2b 100644 --- a/pkgs/development/python-modules/sat-tmp/default.nix +++ b/pkgs/development/python-modules/sat-tmp/default.nix @@ -29,6 +29,10 @@ buildPythonPackage rec { ]; # no pytest tests exist + doCheck = false; + + # Default-added updateScript doesn't handle Mercurial sources + passthru.updateScript = null; meta = { description = "Libervia temporary third party patches"; diff --git a/pkgs/development/python-modules/sipsimple/default.nix b/pkgs/development/python-modules/sipsimple/default.nix index 10fce0d5e0b2..3ae4cee38c1a 100644 --- a/pkgs/development/python-modules/sipsimple/default.nix +++ b/pkgs/development/python-modules/sipsimple/default.nix @@ -4,6 +4,7 @@ fetchFromGitHub, fetchurl, fetchpatch, + nix-update-script, cython, setuptools, alsa-lib, @@ -141,6 +142,12 @@ buildPythonPackage rec { passthru = { inherit extDeps; + updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "^(.*)-mac$" + ]; + }; }; meta = { diff --git a/pkgs/development/python-modules/urwid-satext/default.nix b/pkgs/development/python-modules/urwid-satext/default.nix index 5c4d35f1dda2..f3a9f15d13ab 100644 --- a/pkgs/development/python-modules/urwid-satext/default.nix +++ b/pkgs/development/python-modules/urwid-satext/default.nix @@ -32,6 +32,9 @@ buildPythonPackage rec { # no pytest tests exist doCheck = false; + # Default-added updateScript doesn't handle Mercurial sources + passthru.updateScript = null; + meta = { description = "SΓ T extension widgets for Urwid"; homepage = "https://libervia.org"; diff --git a/pkgs/games/mudlet/default.nix b/pkgs/games/mudlet/default.nix index 673d41d92da3..70beede3d01f 100644 --- a/pkgs/games/mudlet/default.nix +++ b/pkgs/games/mudlet/default.nix @@ -22,6 +22,7 @@ qtmultimedia, discord-rpc, yajl, + withDiscordRpc ? false, }: let @@ -98,8 +99,8 @@ stdenv.mkDerivation rec { qtbase qtmultimedia yajl - discord-rpc - ]; + ] + ++ lib.optional withDiscordRpc discord-rpc; cmakeFlags = [ # RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/ @@ -131,10 +132,12 @@ stdenv.mkDerivation rec { --set LUA_CPATH "${luaEnv}/lib/lua/${lua.luaversion}/?.so" \ --prefix LUA_PATH : "$NIX_LUA_PATH" \ --prefix DYLD_LIBRARY_PATH : "${ - lib.makeLibraryPath [ - libsForQt5.qtkeychain - discord-rpc - ] + lib.makeLibraryPath ( + [ + libsForQt5.qtkeychain + ] + ++ lib.optional withDiscordRpc discord-rpc + ) }:$out/lib" \ --chdir "$out"; @@ -146,10 +149,12 @@ stdenv.mkDerivation rec { --set LUA_CPATH "${luaEnv}/lib/lua/${lua.luaversion}/?.so" \ --prefix LUA_PATH : "$NIX_LUA_PATH" \ --prefix LD_LIBRARY_PATH : "${ - lib.makeLibraryPath [ - libsForQt5.qtkeychain - discord-rpc - ] + lib.makeLibraryPath ( + [ + libsForQt5.qtkeychain + ] + ++ lib.optional withDiscordRpc discord-rpc + ) }" \ --chdir "$out"; diff --git a/pkgs/servers/home-assistant/custom-components/hass-opensprinkler/package.nix b/pkgs/servers/home-assistant/custom-components/hass-opensprinkler/package.nix index de84fb136b7c..6ccad4dbafc2 100644 --- a/pkgs/servers/home-assistant/custom-components/hass-opensprinkler/package.nix +++ b/pkgs/servers/home-assistant/custom-components/hass-opensprinkler/package.nix @@ -8,13 +8,13 @@ buildHomeAssistantComponent rec { owner = "vinteo"; domain = "opensprinkler"; - version = "1.5.1"; + version = "1.5.2"; src = fetchFromGitHub { owner = "vinteo"; repo = "hass-opensprinkler"; tag = "v${version}"; - hash = "sha256-cq9BCN/lvEZ5xPt4cLOFwNP36S+u0hQr4o2gGFz0IGo="; + hash = "sha256-1wlknCsoLmin1b5uq0POjCZnzZB4styNPiaQWENZckc="; }; dependencies = [ diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/universal-remote-card/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/universal-remote-card/package.nix index 02b445d97b76..20fe1d463f84 100644 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/universal-remote-card/package.nix +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/universal-remote-card/package.nix @@ -6,18 +6,18 @@ buildNpmPackage rec { pname = "universal-remote-card"; - version = "4.8.1"; + version = "4.8.3"; src = fetchFromGitHub { owner = "Nerwyn"; repo = "android-tv-card"; rev = version; - hash = "sha256-jyY9x36HIiXpgPbK0Rms+78bP0edxivrm+Fm4znR2F4="; + hash = "sha256-29hDHn6bq6wNITgsPAEsfkWRL0BXnyFQhyoCXJnXpOk="; }; patches = [ ./dont-call-git.patch ]; - npmDepsHash = "sha256-gJGdoa4euIq54aTLBl8Dg7aj6YDbyoQzDQ/rfLHH5G8="; + npmDepsHash = "sha256-fWgsGEep/8ibRY+HEsMnHXQvVeyfZ4N+wvp/bu2C77U="; installPhase = '' runHook preInstall diff --git a/pkgs/servers/http/jetty/default.nix b/pkgs/servers/http/jetty/default.nix index 70b9dbdfbc34..69b76f17421b 100644 --- a/pkgs/servers/http/jetty/default.nix +++ b/pkgs/servers/http/jetty/default.nix @@ -57,7 +57,7 @@ in }; jetty_12 = common { - version = "12.1.1"; - hash = "sha256-VHmPhVEqq4eoOwo9O7sbdv6bJB9dCFkN+64jTlnFarM="; + version = "12.1.2"; + hash = "sha256-GtaEIXqOSutgrSJJ/+oFuGSe7y8omVX7sBgcG3GJzvs="; }; } diff --git a/pkgs/servers/http/nginx/mainline.nix b/pkgs/servers/http/nginx/mainline.nix index dece0210839e..d1187a82477c 100644 --- a/pkgs/servers/http/nginx/mainline.nix +++ b/pkgs/servers/http/nginx/mainline.nix @@ -1,6 +1,6 @@ { callPackage, ... }@args: callPackage ./generic.nix args { - version = "1.29.1"; - hash = "sha256-xYn35+2AHdvZBK+/PeJq4k6wzOJ8dxei6U33+xLWrSc="; + version = "1.29.2"; + hash = "sha256-Vmnjwp1Jv39utXcnW4bv5FBM+Br4hcWKHtfS57hJJDc="; } diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index da1e25b35abc..51c0d542a9f6 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -6,6 +6,7 @@ cacert, caBundle ? "${cacert}/etc/ssl/certs/ca-bundle.crt", nextcloud31Packages, + nextcloud32Packages, }: let @@ -63,6 +64,12 @@ in packages = nextcloud31Packages; }; + nextcloud32 = generic { + version = "32.0.0"; + hash = "sha256-V0SNVdm4cQLxfDY0cyA0ahslj2AXxjuVjHie/ULjRaM="; + packages = nextcloud32Packages; + }; + # tip: get the sha with: # curl 'https://download.nextcloud.com/server/releases/nextcloud-${version}.tar.bz2.sha256' } diff --git a/pkgs/servers/nextcloud/packages/31.json b/pkgs/servers/nextcloud/packages/31.json index 1927092cb924..4c2221c6d234 100644 --- a/pkgs/servers/nextcloud/packages/31.json +++ b/pkgs/servers/nextcloud/packages/31.json @@ -50,9 +50,9 @@ ] }, "cookbook": { - "hash": "sha256-EWLBypv588IkO1wx0vFv26NSk5GKx1pqSWTlAcW2mwE=", - "url": "https://github.com/christianlupus-nextcloud/cookbook-releases/releases/download/v0.11.3/cookbook-0.11.3.tar.gz", - "version": "0.11.3", + "hash": "sha256-pdmltxubvC2+h5U5edTB8X5M8WW+wBShIEpkbR0yaQ0=", + "url": "https://github.com/christianlupus-nextcloud/cookbook-releases/releases/download/v0.11.4/cookbook-0.11.4.tar.gz", + "version": "0.11.4", "description": "A library for all your recipes. It uses JSON files following the schema.org recipe format. To add a recipe to the collection, you can paste in the URL of the recipe, and the provided web page will be parsed and downloaded to whichever folder you specify in the app settings.", "homepage": "https://github.com/nextcloud/cookbook/", "licenses": [ @@ -70,19 +70,19 @@ ] }, "dav_push": { - "hash": "sha256-+Ji6xYFudC5ds4YLJnzZ34v7Ct615CdtkZPyq8iTsdA=", - "url": "https://github.com/bitfireAT/nc_ext_dav_push/releases/download/v0.0.3/dav_push.tar.gz", - "version": "0.0.3", - "description": "**This extension is in a very early stage of development. It is for demonstration and testing purposes only. Don't use it on production systems!**\n\nIn proprietary environments, changes in events and contacts are nowadays usually pushed to other clients so that they can update their views almost in real-time.\n\nWebDAV however (and in this context, especially CalDAV and CardDAV) doesn't currently support push notifications of clients when a collection has changed. So clients have to periodically ask the server for changes. This causes unnecessary delays and battery usage.\n\nThe WebDAV-Push standard, which is currently in development, wants to solve this problem with an open protocol, too.\n\nThis is the server part of these efforts to draft a standard and provide a working implementation (server + client) in order to demonstrate it.\n\n\nThe current WebDAV-Push draft is provided by [@bitfireAT](https://github.com/bitfireAT).\n \nThis Nextcloud extension has been developed by [@verdigado](https://github.com/verdigado).", + "hash": "sha256-73Wf6vP0m/jK0bwAdnuoMMAX5oh16DPViTFqjCX/rhI=", + "url": "https://github.com/bitfireAT/nc_ext_dav_push/releases/download/v1.0.0/dav_push.tar.gz", + "version": "1.0.0", + "description": "In proprietary environments, changes in events and contacts are nowadays usually pushed to other clients so that they can update their views almost in real-time.\n\nWebDAV however (and in this context, especially CalDAV and CardDAV) doesn't currently support push notifications of clients when a collection has changed. So clients have to periodically ask the server for changes. This causes unnecessary delays and battery usage.\n\nThe WebDAV-Push standard, which is currently in development, wants to solve this problem with an open protocol, too.\n\nThis is the server part of these efforts to draft a standard and provide a working implementation (server + client) in order to demonstrate it.\n\n\nThe current WebDAV-Push draft is provided by [@bitfireAT](https://github.com/bitfireAT).\n \nThis Nextcloud extension has been developed by [@verdigado](https://github.com/verdigado).", "homepage": "", "licenses": [ "agpl" ] }, "deck": { - "hash": "sha256-y0kZrmWO6sI4IP+5j+gi8UuxgIwNPXMRDFfETjsRtFg=", - "url": "https://github.com/nextcloud-releases/deck/releases/download/v1.15.2/deck-v1.15.2.tar.gz", - "version": "1.15.2", + "hash": "sha256-i/Fz97r6BrilcfPYNaUSCpLsUMCzLnL9Bm3GeU/9EHg=", + "url": "https://github.com/nextcloud-releases/deck/releases/download/v1.15.3/deck-v1.15.3.tar.gz", + "version": "1.15.3", "description": "Deck is a kanban style organization tool aimed at personal planning and project organization for teams integrated with Nextcloud.\n\n\n- πŸ“₯ Add your tasks to cards and put them in order\n- πŸ“„ Write down additional notes in Markdown\n- πŸ”– Assign labels for even better organization\n- πŸ‘₯ Share with your team, friends or family\n- πŸ“Ž Attach files and embed them in your Markdown description\n- πŸ’¬ Discuss with your team using comments\n- ⚑ Keep track of changes in the activity stream\n- πŸš€ Get your project organized", "homepage": "https://github.com/nextcloud/deck", "licenses": [ @@ -130,9 +130,9 @@ ] }, "forms": { - "hash": "sha256-6Y/W5xG+FjSDXBJkFfs+cyFde3l77bF0gkjbn4IfIVk=", - "url": "https://github.com/nextcloud-releases/forms/releases/download/v5.2.0/forms-v5.2.0.tar.gz", - "version": "5.2.0", + "hash": "sha256-P2QfOnJ5xbAaIIRNHyd8T4BZipyOAPO7W+hm7Dq+9pE=", + "url": "https://github.com/nextcloud-releases/forms/releases/download/v5.2.1/forms-v5.2.1.tar.gz", + "version": "5.2.1", "description": "**Simple surveys and questionnaires, self-hosted!**\n\n- **πŸ“ Simple design:** No mass of options, only the essentials. Works well on mobile of course.\n- **πŸ“Š View & export results:** Results are visualized and can also be exported as CSV in the same format used by Google Forms.\n- **πŸ”’ Data under your control!** Unlike in Google Forms, Typeform, Doodle and others, the survey info and responses are kept private on your instance.\n- **πŸ§‘β€πŸ’» Connect to your software:** Easily integrate Forms into your service with our full-fledged [REST-API](https://github.com/nextcloud/forms/blob/main/docs/API.md).\n- **πŸ™‹ Get involved!** We have lots of stuff planned like more question types, collaboration on forms, [and much more](https://github.com/nextcloud/forms/milestones)!", "homepage": "https://github.com/nextcloud/forms", "licenses": [ @@ -150,9 +150,9 @@ ] }, "groupfolders": { - "hash": "sha256-sj+5a/+xjJXwzc6is9mERQrZD2edVOQ7leUsjFbkn/w=", - "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v19.1.5/groupfolders-v19.1.5.tar.gz", - "version": "19.1.5", + "hash": "sha256-4q/7Hyy66bdpRG7iYHsrJaGle6+eCRkGihGnl4EQ2mA=", + "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v19.1.7/groupfolders-v19.1.7.tar.gz", + "version": "19.1.7", "description": "Admin configured folders shared with everyone in a team.\n\nFolders can be configured from *Team folders* in the admin settings.\n\nAfter a folder is created, the admin can give access to the folder to one or more teams, control their write/sharing permissions and assign a quota for the folder.\nAs of Hub 10/Nextcloud 31, the admin needs to be a part of the team to be able to assign it a Teamfolder.", "homepage": "https://github.com/nextcloud/groupfolders", "licenses": [ @@ -200,9 +200,9 @@ ] }, "mail": { - "hash": "sha256-zL5fkfSZNnQcbbvDb+xOmeqp4yG+dIe81MyywunmXjk=", - "url": "https://github.com/nextcloud-releases/mail/releases/download/v5.5.5/mail-v5.5.5.tar.gz", - "version": "5.5.5", + "hash": "sha256-7quVg4jNTt1R+rH6/D3lDVOL+i+i+BQAGYg0z5kLapE=", + "url": "https://github.com/nextcloud-releases/mail/releases/download/v5.5.6/mail-v5.5.6.tar.gz", + "version": "5.5.6", "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": [ @@ -220,9 +220,9 @@ ] }, "music": { - "hash": "sha256-/hlhplGc8IKiKBkOlnF63AhMP++sEoDCUxKmouuEAmw=", - "url": "https://github.com/owncloud/music/releases/download/v2.3.0/music_2.3.0_for_nextcloud.tar.gz", - "version": "2.3.0", + "hash": "sha256-iVti/js0+7iuBkIFvlvKWwRLBSroFJbGTBRQZ5cvxH8=", + "url": "https://github.com/owncloud/music/releases/download/v2.4.0/music_2.4.0_for_nextcloud.tar.gz", + "version": "2.4.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 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", "licenses": [ @@ -230,9 +230,9 @@ ] }, "news": { - "hash": "sha256-8U2EOK8mXPEk70IU8GLXYU0EoZU7O4fhFkzhGpauvZc=", - "url": "https://github.com/nextcloud/news/releases/download/26.1.0/news.tar.gz", - "version": "26.1.0", + "hash": "sha256-C4A1kb41DCS3FtConpJ+g9TBEIlaUqW9YC6Ha3bj0Yw=", + "url": "https://github.com/nextcloud/news/releases/download/27.0.0/news.tar.gz", + "version": "27.0.0", "description": "πŸ“° A RSS/Atom Feed reader App for Nextcloud\n\n- πŸ“² Synchronize your feeds with multiple mobile or desktop [clients](https://nextcloud.github.io/news/clients/)\n- πŸ”„ Automatic updates of your news feeds\n- πŸ†“ Free and open source under AGPLv3, no ads or premium functions\n\n**System Cron is currently required for this app to work**\n\nRequirements can be found [here](https://nextcloud.github.io/news/install/#dependencies)\n\nThe Changelog is available [here](https://github.com/nextcloud/news/blob/master/CHANGELOG.md)\n\nCreate a [bug report](https://github.com/nextcloud/news/issues/new/choose)\n\nCreate a [feature request](https://github.com/nextcloud/news/discussions/new)\n\nReport a [feed issue](https://github.com/nextcloud/news/discussions/new)", "homepage": "https://github.com/nextcloud/news", "licenses": [ @@ -290,9 +290,9 @@ ] }, "polls": { - "hash": "sha256-63UaqEbhNBm+LPbreeKvm0SgImrXolNTQ+S/pzpuTy4=", - "url": "https://github.com/nextcloud-releases/polls/releases/download/v8.4.6/polls-v8.4.6.tar.gz", - "version": "8.4.6", + "hash": "sha256-texrfkRr18HMRp2cIgpW/PRrRT4Bu/CjqH9arttv3hA=", + "url": "https://github.com/nextcloud-releases/polls/releases/download/v8.5.0/polls-v8.5.0.tar.gz", + "version": "8.5.0", "description": "A polls app, similar to Doodle/DuD-Poll with the possibility to restrict access (members, certain groups/users, hidden and public).", "homepage": "https://github.com/nextcloud/polls", "licenses": [ @@ -400,9 +400,9 @@ ] }, "twofactor_webauthn": { - "hash": "sha256-yAJRmuqZCiyzG7mrcjJQquFOamBcB7tP43ryAe/Z4UY=", - "url": "https://github.com/nextcloud-releases/twofactor_webauthn/releases/download/v2.4.0/twofactor_webauthn-v2.4.0.tar.gz", - "version": "2.4.0", + "hash": "sha256-B1Oje5oX68i9Q/IGFvxjN9Q+78Snq3yusgkgd8Mh3LQ=", + "url": "https://github.com/nextcloud-releases/twofactor_webauthn/releases/download/v2.4.1/twofactor_webauthn-v2.4.1.tar.gz", + "version": "2.4.1", "description": "A two-factor provider for WebAuthn devices", "homepage": "https://github.com/nextcloud/twofactor_webauthn#readme", "licenses": [ @@ -430,9 +430,9 @@ ] }, "uppush": { - "hash": "sha256-3QD3gtCfhs9tWrbiiPPV7lYxpzGQhc31unSZukcrvN0=", - "url": "https://codeberg.org/NextPush/uppush/archive/2.3.0.tar.gz", - "version": "2.3.0", + "hash": "sha256-3rQt2do+25uu1aOhVae4PsYkFg1bTqF4v6Xy12yCH5c=", + "url": "https://codeberg.org/NextPush/uppush/archive/2.3.1.tar.gz", + "version": "2.3.1", "description": "Once the mobile phone is connected with NextPush, push notifications can be forwarded to applications implementing UnifiedPush.\n\nMore information about UnifiedPush at https://unifiedpush.org", "homepage": "", "licenses": [ diff --git a/pkgs/servers/nextcloud/packages/32.json b/pkgs/servers/nextcloud/packages/32.json new file mode 100644 index 000000000000..6c7fabc48f7f --- /dev/null +++ b/pkgs/servers/nextcloud/packages/32.json @@ -0,0 +1,382 @@ +{ + "bookmarks": { + "hash": "sha256-CfsTpoFaq0GY0fKJrvgvYEdOABF59ZM6Jx1QQIdRbWY=", + "url": "https://github.com/nextcloud/bookmarks/releases/download/v16.0.0/bookmarks-16.0.0.tar.gz", + "version": "16.0.0", + "description": "- πŸ“‚ Sort bookmarks into folders\n- 🏷 Add tags and personal notes\n- ☠ Find broken links and duplicates\n- πŸ“² Synchronize with all your browsers and devices\n- πŸ“” Store archived versions of your links in case they are depublished\n- πŸ” Full-text search on site contents\n- πŸ‘ͺ Share bookmarks with other users, groups and teams or via public links\n- βš› Generate RSS feeds of your collections\n- πŸ“ˆ Stats on how often you access which links\n- πŸ”’ Automatic backups of your bookmarks collection\n- πŸ’Ό Built-in Dashboard widgets for frequent and recent links\n\nRequirements:\n - PHP extensions:\n - intl: *\n - mbstring: *\n - when using MySQL, use at least v8.0", + "homepage": "https://github.com/nextcloud/bookmarks", + "licenses": [ + "agpl" + ] + }, + "calendar": { + "hash": "sha256-jNuz6uq7piPZXXz9Vew8QwK3qqEMZ3teRm/Q7YBekOY=", + "url": "https://github.com/nextcloud-releases/calendar/releases/download/v6.0.0/calendar-v6.0.0.tar.gz", + "version": "6.0.0", + "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": [ + "agpl" + ] + }, + "collectives": { + "hash": "sha256-W/bXZAMpDdFZ1AeBq9RtKEebyq4FQ8uWBn0YSmzQuos=", + "url": "https://github.com/nextcloud/collectives/releases/download/v3.1.2/collectives-3.1.2.tar.gz", + "version": "3.1.2", + "description": "Collectives is a Nextcloud App for activist and community projects to organize together.\nCome and gather in collectives to build shared knowledge.\n\n* πŸ‘₯ **Collective and non-hierarchical workflow by heart**: Collectives are\n tied to a [Nextcloud Team](https://github.com/nextcloud/circles) and\n owned by the collective.\n* πŸ“ **Collaborative page editing** like known from Etherpad thanks to the\n [Text app](https://github.com/nextcloud/text).\n* πŸ”€ **Well-known [Markdown](https://en.wikipedia.org/wiki/Markdown) syntax**\n for page formatting.\n\n## Installation\n\nIn your Nextcloud instance, simply navigate to **Β»AppsΒ«**, find the\n**Β»TeamsΒ«** and **Β»CollectivesΒ«** apps and enable them.", + "homepage": "https://github.com/nextcloud/collectives", + "licenses": [ + "agpl" + ] + }, + "contacts": { + "hash": "sha256-fyqcUqx60APFkTW5yVESNpa8QZr8ynooAB6IEJ4GtEM=", + "url": "https://github.com/nextcloud-releases/contacts/releases/download/v8.0.2/contacts-v8.0.2.tar.gz", + "version": "8.0.2", + "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": [ + "agpl" + ] + }, + "cookbook": { + "hash": "sha256-pdmltxubvC2+h5U5edTB8X5M8WW+wBShIEpkbR0yaQ0=", + "url": "https://github.com/christianlupus-nextcloud/cookbook-releases/releases/download/v0.11.4/cookbook-0.11.4.tar.gz", + "version": "0.11.4", + "description": "A library for all your recipes. It uses JSON files following the schema.org recipe format. To add a recipe to the collection, you can paste in the URL of the recipe, and the provided web page will be parsed and downloaded to whichever folder you specify in the app settings.", + "homepage": "https://github.com/nextcloud/cookbook/", + "licenses": [ + "agpl" + ] + }, + "cospend": { + "hash": "sha256-20k/ZoJ7OTDKW8RF0Nv/1wDVO7GtX2lZk5EUv173HuM=", + "url": "https://github.com/julien-nc/cospend-nc/releases/download/v3.1.3/cospend-3.1.3.tar.gz", + "version": "3.1.3", + "description": "# Nextcloud Cospend πŸ’°\n\nNextcloud Cospend is a group/shared budget manager. It was inspired by the great [IHateMoney](https://github.com/spiral-project/ihatemoney/).\n\nYou can use it when you share a house, when you go on vacation with friends, whenever you share expenses with a group of people.\n\nIt lets you create projects with members and bills. Each member has a balance computed from the project bills. Balances are not an absolute amount of money at members disposal but rather a relative information showing if a member has spent more for the group than the group has spent for her/him, independently of exactly who spent money for whom. This way you can see who owes the group and who the group owes. Ultimately you can ask for a settlement plan telling you which payments to make to reset members balances.\n\nProject members are independent from Nextcloud users. Projects can be shared with other Nextcloud users or via public links.\n\n[MoneyBuster](https://gitlab.com/eneiluj/moneybuster) Android client is [available in F-Droid](https://f-droid.org/packages/net.eneiluj.moneybuster/) and on the [Play store](https://play.google.com/store/apps/details?id=net.eneiluj.moneybuster).\n\n[PayForMe](https://github.com/mayflower/PayForMe) iOS client is currently under developpement!\n\nThe private and public APIs are documented using [the Nextcloud OpenAPI extractor](https://github.com/nextcloud/openapi-extractor/). This documentation can be accessed directly in Nextcloud. All you need is to install Cospend (>= v1.6.0) and use the [the OCS API Viewer app](https://apps.nextcloud.com/apps/ocs_api_viewer) to browse the OpenAPI documentation.\n\n## Features\n\n* ✎ Create/edit/delete projects, members, bills, bill categories, currencies\n* βš– Check member balances\n* πŸ—  Display project statistics\n* β™» Display settlement plan\n* Move bills from one project to another\n* Move bills to trash before actually deleting them\n* Archive old projects before deleting them\n* πŸŽ‡ Automatically create reimbursement bills from settlement plan\n* πŸ—“ Create recurring bills (day/week/month/year)\n* πŸ“Š Optionally provide custom amount for each member in new bills\n* πŸ”— Link personal files to bills (picture of physical receipt for example)\n* πŸ‘© Public links for people outside Nextcloud (can be password protected)\n* πŸ‘« Share projects with Nextcloud users/groups/circles\n* πŸ–« Import/export projects as csv (compatible with csv files from IHateMoney and SplitWise)\n* πŸ”— Generate link/QRCode to easily add projects in MoneyBuster\n* πŸ—² Implement Nextcloud notifications and activity stream\n\nThis app usually support the 2 or 3 last major versions of Nextcloud.\n\nThis app is under development.\n\n🌍 Help us to translate this app on [Nextcloud-Cospend/MoneyBuster Crowdin project](https://crowdin.com/project/moneybuster).\n\nβš’ Check out other ways to help in the [contribution guidelines](https://github.com/julien-nc/cospend-nc/blob/master/CONTRIBUTING.md).\n\n## Documentation\n\n* [User documentation](https://github.com/julien-nc/cospend-nc/blob/master/docs/user.md)\n* [Admin documentation](https://github.com/julien-nc/cospend-nc/blob/master/docs/admin.md)\n* [Developer documentation](https://github.com/julien-nc/cospend-nc/blob/master/docs/dev.md)\n* [CHANGELOG](https://github.com/julien-nc/cospend-nc/blob/master/CHANGELOG.md#change-log)\n* [AUTHORS](https://github.com/julien-nc/cospend-nc/blob/master/AUTHORS.md#authors)\n\n## Known issues\n\n* It does not make you rich\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/cospend-nc", + "licenses": [ + "agpl" + ] + }, + "dav_push": { + "hash": "sha256-73Wf6vP0m/jK0bwAdnuoMMAX5oh16DPViTFqjCX/rhI=", + "url": "https://github.com/bitfireAT/nc_ext_dav_push/releases/download/v1.0.0/dav_push.tar.gz", + "version": "1.0.0", + "description": "In proprietary environments, changes in events and contacts are nowadays usually pushed to other clients so that they can update their views almost in real-time.\n\nWebDAV however (and in this context, especially CalDAV and CardDAV) doesn't currently support push notifications of clients when a collection has changed. So clients have to periodically ask the server for changes. This causes unnecessary delays and battery usage.\n\nThe WebDAV-Push standard, which is currently in development, wants to solve this problem with an open protocol, too.\n\nThis is the server part of these efforts to draft a standard and provide a working implementation (server + client) in order to demonstrate it.\n\n\nThe current WebDAV-Push draft is provided by [@bitfireAT](https://github.com/bitfireAT).\n \nThis Nextcloud extension has been developed by [@verdigado](https://github.com/verdigado).", + "homepage": "", + "licenses": [ + "agpl" + ] + }, + "deck": { + "hash": "sha256-liQwL1YEk+GgIyPvDcIWiTa3K9XikEElVPRszGdeCRc=", + "url": "https://github.com/nextcloud-releases/deck/releases/download/v1.16.0/deck-v1.16.0.tar.gz", + "version": "1.16.0", + "description": "Deck is a kanban style organization tool aimed at personal planning and project organization for teams integrated with Nextcloud.\n\n\n- πŸ“₯ Add your tasks to cards and put them in order\n- πŸ“„ Write down additional notes in Markdown\n- πŸ”– Assign labels for even better organization\n- πŸ‘₯ Share with your team, friends or family\n- πŸ“Ž Attach files and embed them in your Markdown description\n- πŸ’¬ Discuss with your team using comments\n- ⚑ Keep track of changes in the activity stream\n- πŸš€ Get your project organized", + "homepage": "https://github.com/nextcloud/deck", + "licenses": [ + "agpl" + ] + }, + "files_automatedtagging": { + "hash": "sha256-D4WHfQLtSYr0WCxOSfAzmoMn9ti/i3EahgNDD4xGzkU=", + "url": "https://github.com/nextcloud-releases/files_automatedtagging/releases/download/v3.0.0/files_automatedtagging-v3.0.0.tar.gz", + "version": "3.0.0", + "description": "An app for Nextcloud that automatically assigns tags to newly uploaded files based on some conditions.\n\nThe tags can later be used to control retention, file access, automatic script execution and more.\n\n## How it works\nTo define tags, administrators can create and manage a set of rule groups. Each rule group consists of one or more rules combined through operators. Rules can include criteria like file type, size, time and more. A request matches a group if all rules evaluate to true. On uploading a file all defined groups are evaluated and when matching, the given tags are assigned to the file.", + "homepage": "https://github.com/nextcloud/files_automatedtagging", + "licenses": [ + "agpl" + ] + }, + "files_retention": { + "hash": "sha256-48fC7VDNZs2+qienMP5hBAWgRkm/i+Q2WXnrd8fz16Q=", + "url": "https://github.com/nextcloud-releases/files_retention/releases/download/v3.0.0/files_retention-v3.0.0.tar.gz", + "version": "3.0.0", + "description": "An app for Nextcloud to control automatic deletion of files after a given time.\nOptionally the users can be informed the day before.", + "homepage": "https://github.com/nextcloud/files_retention", + "licenses": [ + "agpl" + ] + }, + "forms": { + "hash": "sha256-P2QfOnJ5xbAaIIRNHyd8T4BZipyOAPO7W+hm7Dq+9pE=", + "url": "https://github.com/nextcloud-releases/forms/releases/download/v5.2.1/forms-v5.2.1.tar.gz", + "version": "5.2.1", + "description": "**Simple surveys and questionnaires, self-hosted!**\n\n- **πŸ“ Simple design:** No mass of options, only the essentials. Works well on mobile of course.\n- **πŸ“Š View & export results:** Results are visualized and can also be exported as CSV in the same format used by Google Forms.\n- **πŸ”’ Data under your control!** Unlike in Google Forms, Typeform, Doodle and others, the survey info and responses are kept private on your instance.\n- **πŸ§‘β€πŸ’» Connect to your software:** Easily integrate Forms into your service with our full-fledged [REST-API](https://github.com/nextcloud/forms/blob/main/docs/API.md).\n- **πŸ™‹ Get involved!** We have lots of stuff planned like more question types, collaboration on forms, [and much more](https://github.com/nextcloud/forms/milestones)!", + "homepage": "https://github.com/nextcloud/forms", + "licenses": [ + "agpl" + ] + }, + "groupfolders": { + "hash": "sha256-v9EMLcD2gVlyBKrDiORK/VGeNvI4aKCXonunRxwqnuQ=", + "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v20.1.1/groupfolders-v20.1.1.tar.gz", + "version": "20.1.1", + "description": "Admin configured folders shared with everyone in a team.\n\nFolders can be configured from *Team folders* in the admin settings.\n\nAfter a folder is created, the admin can give access to the folder to one or more teams, control their write/sharing permissions and assign a quota for the folder.\nAs of Hub 10/Nextcloud 31, the admin needs to be a part of the team to be able to assign it a Teamfolder.", + "homepage": "https://github.com/nextcloud/groupfolders", + "licenses": [ + "agpl" + ] + }, + "impersonate": { + "hash": "sha256-mduIsKRwog658wnBHLVdBWg0d9IqXKdqHSffMuwL/Xo=", + "url": "https://github.com/nextcloud-releases/impersonate/releases/download/v3.0.0/impersonate-v3.0.0.tar.gz", + "version": "3.0.0", + "description": "By installing the impersonate app of your Nextcloud you enable administrators to impersonate other users on the Nextcloud server. This is especially useful for debugging issues reported by users.\n\nTo impersonate a user an administrator has to simply follow the following four steps:\n\n1. Login as administrator to Nextcloud.\n2. Open users administration interface.\n3. Select the impersonate button on the affected user.\n4. Confirm the impersonation.\n\nThe administrator is then logged-in as the user, to switch back to the regular user account they simply have to press the logout button.\n\n**Note:**\n\n- This app is not compatible with instances that have encryption enabled.\n- While impersonate actions are logged note that actions performed impersonated will be logged as the impersonated user.\n- Impersonating a user is only possible after their first login.\n- You can limit which users/groups can use impersonation in Administration settings > Additional settings.", + "homepage": "https://github.com/nextcloud/impersonate", + "licenses": [ + "agpl" + ] + }, + "integration_deepl": { + "hash": "sha256-WjTg/+ckoZ/xFrfN0LaLvWIM/JbbnfvVO4EbnRnvB60=", + "url": "https://github.com/nextcloud-releases/integration_deepl/releases/download/v2.0.0/integration_deepl-v2.0.0.tar.gz", + "version": "2.0.0", + "description": "Deepl integration providing an translations through deepl.com with Nextcloud\n\nThis app integrates with [Nextcloud Assistant](https://apps.nextcloud.com/apps/assistant) to offer translation services We recommend to install Assistant additionally and activate Deepl as translation provider in the Artifical Intelligence admin settings.\n\nThis app also integrates with the translation API of Nextcloud server to offer translation services without Assistant. Currently this is available in Text and Talk.\n\nTo run translations and any other Task Processing tasks synchronously, run the following command in a background process (10 is the interval in seconds when the process should relaunch to use the latest php changes):\n\n```sh\nset -e; while true; do occ background-job:worker -v -t 10 \"OC\\TaskProcessing\\SynchronousBackgroundJob\"; done\n```\n\n## Ethical AI Rating\n### Rating: πŸ”΄\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\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_deepl", + "licenses": [ + "agpl" + ] + }, + "integration_openai": { + "hash": "sha256-VAvpbiTzbbQPsohQygdXRfPqPkxf7rEBuYELb0ADZqA=", + "url": "https://github.com/nextcloud-releases/integration_openai/releases/download/v3.7.1/integration_openai-v3.7.1.tar.gz", + "version": "3.7.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": [ + "agpl" + ] + }, + "integration_paperless": { + "hash": "sha256-70goWT+uhdYCLIc68+kYEeWoO0rZMYbVgBcjQ88fKgw=", + "url": "https://github.com/nextcloud-releases/integration_paperless/releases/download/v1.0.7/integration_paperless-v1.0.7.tar.gz", + "version": "1.0.7", + "description": "Integration with the [Paperless](https://docs.paperless-ngx.com) Document Management System.\nIt adds a file action menu item that can be used to upload a file from your Nextcloud Files to Paperless.", + "homepage": "", + "licenses": [ + "agpl" + ] + }, + "mail": { + "hash": "sha256-7quVg4jNTt1R+rH6/D3lDVOL+i+i+BQAGYg0z5kLapE=", + "url": "https://github.com/nextcloud-releases/mail/releases/download/v5.5.6/mail-v5.5.6.tar.gz", + "version": "5.5.6", + "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-iVti/js0+7iuBkIFvlvKWwRLBSroFJbGTBRQZ5cvxH8=", + "url": "https://github.com/owncloud/music/releases/download/v2.4.0/music_2.4.0_for_nextcloud.tar.gz", + "version": "2.4.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 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", + "licenses": [ + "agpl" + ] + }, + "news": { + "hash": "sha256-C4A1kb41DCS3FtConpJ+g9TBEIlaUqW9YC6Ha3bj0Yw=", + "url": "https://github.com/nextcloud/news/releases/download/27.0.0/news.tar.gz", + "version": "27.0.0", + "description": "πŸ“° A RSS/Atom Feed reader App for Nextcloud\n\n- πŸ“² Synchronize your feeds with multiple mobile or desktop [clients](https://nextcloud.github.io/news/clients/)\n- πŸ”„ Automatic updates of your news feeds\n- πŸ†“ Free and open source under AGPLv3, no ads or premium functions\n\n**System Cron is currently required for this app to work**\n\nRequirements can be found [here](https://nextcloud.github.io/news/install/#dependencies)\n\nThe Changelog is available [here](https://github.com/nextcloud/news/blob/master/CHANGELOG.md)\n\nCreate a [bug report](https://github.com/nextcloud/news/issues/new/choose)\n\nCreate a [feature request](https://github.com/nextcloud/news/discussions/new)\n\nReport a [feed issue](https://github.com/nextcloud/news/discussions/new)", + "homepage": "https://github.com/nextcloud/news", + "licenses": [ + "agpl" + ] + }, + "nextpod": { + "hash": "sha256-2IvsEv3teTGITE6ilaN3RHUtNpxDk3iCLEq5sAmJ+Y4=", + "url": "https://github.com/pbek/nextcloud-nextpod/releases/download/v0.7.8/nextpod-nc.tar.gz", + "version": "0.7.8", + "description": "This Nextcloud app lets you visualize your podcast subscriptions and episode downloads from\n[GPodderSync](https://apps.nextcloud.com/apps/gpoddersync), which acts as a basic gpodder.net\napi to sync podcast consumer apps (podcatchers) like AntennaPod.\n\nYou need to have [GPodderSync](https://apps.nextcloud.com/apps/gpoddersync) installed to use this app!", + "homepage": "https://github.com/pbek/nextcloud-nextpod", + "licenses": [ + "agpl" + ] + }, + "notes": { + "hash": "sha256-tFR9r5kmR7Egczt62I7k8JUllAc4cNu95d3NSUGD108=", + "url": "https://github.com/nextcloud-releases/notes/releases/download/v4.12.3/notes-v4.12.3.tar.gz", + "version": "4.12.3", + "description": "The Notes app is a distraction free notes taking app for [Nextcloud](https://www.nextcloud.com/). It provides categories for better organization and supports formatting using [Markdown](https://en.wikipedia.org/wiki/Markdown) syntax. Notes are saved as files in your Nextcloud, so you can view and edit them with every Nextcloud client. Furthermore, a separate [REST API](https://github.com/nextcloud/notes/blob/master/docs/api/README.md) allows for an easy integration into apps ([Android](https://github.com/nextcloud/notes-android), [iOS](https://github.com/nextcloud/notes-ios), as well as [3rd-party apps](https://github.com/nextcloud/notes/wiki#3rd-party-clients) which allow convenient access to your Nextcloud notes). Further features include marking notes as favorites.", + "homepage": "https://github.com/nextcloud/notes", + "licenses": [ + "agpl" + ] + }, + "onlyoffice": { + "hash": "sha256-0g8y69XNKx8iEG0GM3hmIvnqACxO4YC3i83rNs9hsB8=", + "url": "https://github.com/ONLYOFFICE/onlyoffice-nextcloud/releases/download/v9.11.0/onlyoffice.tar.gz", + "version": "9.11.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-Le3yvewei8vty8frz66X7ij2H9ju2h4JWdGNf46L9MY=", + "url": "https://github.com/julien-nc/phonetrack/releases/download/v0.9.1/phonetrack-0.9.1.tar.gz", + "version": "0.9.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://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. Setting 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## 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" + ] + }, + "polls": { + "hash": "sha256-texrfkRr18HMRp2cIgpW/PRrRT4Bu/CjqH9arttv3hA=", + "url": "https://github.com/nextcloud-releases/polls/releases/download/v8.5.0/polls-v8.5.0.tar.gz", + "version": "8.5.0", + "description": "A polls app, similar to Doodle/DuD-Poll with the possibility to restrict access (members, certain groups/users, hidden and public).", + "homepage": "https://github.com/nextcloud/polls", + "licenses": [ + "agpl" + ] + }, + "previewgenerator": { + "hash": "sha256-4enkStAbo4dnMvPtVzOHzgKaeTKmEObBGOfrVAKvACI=", + "url": "https://github.com/nextcloud-releases/previewgenerator/releases/download/v5.10.0/previewgenerator-v5.10.0.tar.gz", + "version": "5.10.0", + "description": "The Preview Generator app allows admins to pre-generate previews. The app listens to edit events and stores this information. Once a cron job is triggered it will generate start preview generation. This means that you can better utilize your system by pre-generating previews when your system is normally idle and thus putting less load on your machine when the requests are actually served.\n\nThe app does not replace on demand preview generation so if a preview is requested before it is pre-generated it will still be shown.\nThe first time you install this app, before using a cron job, you properly want to generate all previews via:\n**./occ preview:generate-all -vvv**\n\n**Important**: To enable pre-generation of previews you must add **php /var/www/nextcloud/occ preview:pre-generate** to a system cron job that runs at times of your choosing.", + "homepage": "https://github.com/nextcloud/previewgenerator", + "licenses": [ + "agpl" + ] + }, + "qownnotesapi": { + "hash": "sha256-zaASURjhqeiz8eYc0HmhYDOF5Z+kIjhggEcJFe96GA8=", + "url": "https://github.com/pbek/qownnotesapi/releases/download/v25.8.0/qownnotesapi-nc.tar.gz", + "version": "25.8.0", + "description": "QOwnNotesAPI is the Nextcloud/ownCloud API for [QOwnNotes](http://www.qownnotes.org), the open source notepad for Linux, macOS and Windows, that works together with the notes application of Nextcloud/ownCloud.\n\nThe only purpose of this App is to provide API access to your Nextcloud/ownCloud server for your QOwnNotes desktop installation, you cannot use this App for anything else, if you don't have QOwnNotes installed on your desktop computer!", + "homepage": "https://github.com/pbek/qownnotesapi", + "licenses": [ + "agpl" + ] + }, + "quota_warning": { + "hash": "sha256-tJtblNz6Yv0cXcr8cxHuXq/9Otz4C2ahFLtUp0Zwpd4=", + "url": "https://github.com/nextcloud-releases/quota_warning/releases/download/v1.22.0/quota_warning-v1.22.0.tar.gz", + "version": "1.22.0", + "description": "This app sends notifications to users when they reached 85, 90 and 95% of their quota (checked once a day).\nIn addition an email can be sent to the users. The three percentages can be changed in the admin settings.\nIt is also possible to have a link in the email and the notification for upsell options.", + "homepage": "https://github.com/nextcloud/quota_warning", + "licenses": [ + "agpl" + ] + }, + "registration": { + "hash": "sha256-O0x0kv5Ng+ewBI9jJ8KUPvjsPZLOeEsj9eIuvkNfoqA=", + "url": "https://github.com/nextcloud-releases/registration/releases/download/v2.8.0/registration-v2.8.0.tar.gz", + "version": "2.8.0", + "description": "User registration\n\nThis app allows users to register a new account.\n\n# Features\n\n- Add users to a given group\n- Allow-list with email domains (including wildcard) to register with\n- Administrator will be notified via email for new user creation or require approval\n- Supports Nextcloud's Client Login Flow v1 and v2 - allowing registration in the mobile Apps and Desktop clients\n\n# Web form registration flow\n\n1. User enters their email address\n2. Verification link is sent to the email address\n3. User clicks on the verification link\n4. User is lead to a form where they can choose their username and password\n5. New account is created and is logged in automatically", + "homepage": "https://github.com/nextcloud/registration", + "licenses": [ + "agpl" + ] + }, + "richdocuments": { + "hash": "sha256-7cLCcb18m3Of0BovTucR37zckdon6LyjiXg5OwKmWHU=", + "url": "https://github.com/nextcloud-releases/richdocuments/releases/download/v9.0.0/richdocuments-v9.0.0.tar.gz", + "version": "9.0.0", + "description": "This application can connect to a Collabora Online (or other) server (WOPI-like Client). Nextcloud is the WOPI Host. Please read the documentation to learn more about that.\n\nYou can also edit your documents off-line with the Collabora Office app from the **[Android](https://play.google.com/store/apps/details?id=com.collabora.libreoffice)** and **[iOS](https://apps.apple.com/us/app/collabora-office/id1440482071)** store.", + "homepage": "https://collaboraoffice.com/", + "licenses": [ + "agpl" + ] + }, + "sociallogin": { + "hash": "sha256-zuzQKtU+sEEYhBZ4UMfY1eMSsDfe7o/ymWYv2SJBiHw=", + "url": "https://github.com/zorn-v/nextcloud-social-login/releases/download/v6.2.2/release.tar.gz", + "version": "6.2.2", + "description": "# Social Login\n\nMake it possible to create users and log in via Telegram, OAuth, or OpenID.\n\nFor OAuth, you must create an app with certain providers. Login buttons will appear on the login page if an app ID is specified. Settings are located in the \"Social login\" section of the settings page.\n\n## Installation\n\nLog in to your Nextcloud installation as an administrator. Under \"Apps\", click \"Download and enable\" next to the \"Social Login\" app.\n\nSee below for setup and configuration instructions.\n\n## Custom OAuth2/OIDC Groups\n\nYou can use groups from your custom provider. For this, specify the \"Groups claim\" in the custom OAuth2/OIDC provider settings. This claim should be returned from the provider in the `id_token` or at the user info endpoint. The format should be an `array` or a comma-separated string. E.g., (with a claim named `roles`):\n\n```json\n{\"roles\": [\"admin\", \"user\"]}\n```\nor\n```json\n{\"roles\": \"admin,user\"}\n```\n\nNested claims are also supported. For example, `resource_access.client-id.roles` for:\n\n```json\n\"resource_access\": {\n \"client-id\": {\n \"roles\": [\n \"client-role-1\",\n \"client-role-2\"\n ]\n }\n}\n```\n\n**DisplayName** support is also available:\n```json\n{\"roles\": [{\"gid\": 1, \"displayName\": \"admin\"}, {\"gid\": 2, \"displayName\": \"user\"}]}\n```\n\nYou can use provider groups in two ways:\n\n1. Map provider groups to existing Nextcloud groups.\n2. Create provider groups in Nextcloud and associate them with users (if the appropriate option is enabled).\n\nTo sync groups on every login, ensure the \"Update user profile every login\" setting is checked.\n\n## Examples for Groups\n\n* Configure WSO2IS to return a roles claim with OIDC [here](https://medium.com/@dewni.matheesha/claim-mapping-and-retrieving-end-user-information-in-wso2is-cffd5f3937ff).\n* [GitLab OIDC configuration to allow specific GitLab groups](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/gitlab.md).\n\n## Built-in OAuth Providers\n\nCopy the link from a specific login button to get the correct \"redirect URL\" for OAuth app settings.\n\n* [Amazon](https://developer.amazon.com/loginwithamazon/console/site/lwa/overview.html)\n* [Apple](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/apple.md)\n* [Codeberg](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/codeberg.md)\n* [Discord](#configure-discord)\n* [Facebook](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/facebook.md)\n* [GitHub](https://github.com/settings/developers)\n* [GitLab](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/gitlab.md)\n* [Google](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/google.md)\n* [Keycloak](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/keycloak.md)\n* [Mail.ru](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/mailru.md)\n* **PlexTv**: Use any title as the app ID.\n* [Telegram](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/telegram.md)\n* [Twitter](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/twitter.md)\n\nFor details about Google's \"Allow login only from specified domain\" setting, see [#44](https://github.com/zorn-v/nextcloud-social-login/issues/44). Use a comma-separated list for multiple domains.\n\n## Configuration\n\nAdd `'social_login_auto_redirect' => true` to `config.php` to automatically redirect unauthorized users to social login if only one provider is configured. To temporarily disable this (e.g., for local admin login), add `noredir=1` to the login URL: `https://cloud.domain.com/login?noredir=1`.\n\nConfigure HTTP client options using:\n```php\n 'social_login_http_client' => [\n 'timeout' => 45,\n 'proxy' => 'socks4://127.0.0.1:9050', // See for allowed formats\n ],\n```\nin `config.php`.\n\n### Configure a Provider via CLI\n\nUse the `occ` utility to configure providers via the command line. Replace variables and URLs with your deployment values:\n```bash\nphp occ config:app:set sociallogin custom_providers --value='{\"custom_oidc\": [{\"name\": \"gitlab_oidc\", \"title\": \"Gitlab\", \"authorizeUrl\": \"https://gitlab.my-domain.org/oauth/authorize\", \"tokenUrl\": \"https://gitlab.my-domain.org/oauth/token\", \"userInfoUrl\": \"https://gitlab.my-domain.org/oauth/userinfo\", \"logoutUrl\": \"\", \"clientId\": \"$my_application_id\", \"clientSecret\": \"$my_super_secret_secret\", \"scope\": \"openid\", \"groupsClaim\": \"groups\", \"style\": \"gitlab\", \"defaultGroup\": \"\"}]}'\n```\nFor Docker, prepend `docker exec -t -uwww-data CONTAINER_NAME` to the command or run interactively via `docker exec -it -uwww-data CONTAINER_NAME sh`.\n\nTo inspect configurations:\n```sql\nmysql -u nextcloud -p nextcloud\nPassword: \n\n> SELECT * FROM oc_appconfig WHERE appid='sociallogin';\n```\nOr run:\n```bash\ndocker exec -t -uwww-data CONTAINER_NAME php occ config:app:get sociallogin custom_providers\n```\n\n### Configure Discord\n\n1. Create a Discord application at [Discord Developer Portal](https://discord.com/developers/applications).\n2. Navigate to `Settings > OAuth2 > General`. Add a redirect URL: `https://nextcloud.mydomain.com/apps/sociallogin/oauth/discord`.\n3. Copy the `CLIENT ID` and generate a `CLIENT SECRET`.\n4. In Nextcloud, go to `Settings > Social Login`. Paste the `CLIENT ID` into \"App id\" and `CLIENT SECRET` into \"Secret\".\n5. Select a default group for new users.\n6. For group mapping, see [#395](https://github.com/zorn-v/nextcloud-social-login/pull/395).\n\n## Hint\n\n### Callback (Reply) URL\nCopy the link from a login button on the Nextcloud login page and use it as the callback URL on your provider's site. To make the button visible temporarily, fill provider settings with placeholder data and update later.\n\nIf you encounter callback URL errors despite correct settings, ensure your Nextcloud server generates HTTPS URLs by adding `'overwriteprotocol' => 'https'` to `config.php`.", + "homepage": "https://github.com/zorn-v/nextcloud-social-login", + "licenses": [ + "agpl" + ] + }, + "spreed": { + "hash": "sha256-tWWFUrJ5XQdXYb8BfoxHCFrMCKj+cwLit1zkoJtWfwk=", + "url": "https://github.com/nextcloud-releases/spreed/releases/download/v22.0.0/spreed-v22.0.0.tar.gz", + "version": "22.0.0", + "description": "Chat, video & audio-conferencing using WebRTC\n\n* πŸ’¬ **Chat** Nextcloud Talk comes with a simple text chat, allowing you to share or upload files from your Nextcloud Files app or local device and mention other participants.\n* πŸ‘₯ **Private, group, public and password protected calls!** Invite someone, a whole group or send a public link to invite to a call.\n* 🌐 **Federated chats** Chat with other Nextcloud users on their servers\n* πŸ’» **Screen sharing!** Share your screen with the participants of your call.\n* πŸš€ **Integration with other Nextcloud apps** like Files, Calendar, User status, Dashboard, Flow, Maps, Smart picker, Contacts, Deck, and many more.\n* πŸŒ‰ **Sync with other chat solutions** With [Matterbridge](https://github.com/42wim/matterbridge/) being integrated in Talk, you can easily sync a lot of other chat solutions to Nextcloud Talk and vice-versa.", + "homepage": "https://github.com/nextcloud/spreed", + "licenses": [ + "agpl" + ] + }, + "tables": { + "hash": "sha256-E68fyimEMBe0DJ2cOAIBs0+Psb8UVFFfLBZc/ESRzY8=", + "url": "https://github.com/nextcloud-releases/tables/releases/download/v0.9.5/tables-v0.9.5.tar.gz", + "version": "0.9.5", + "description": "Manage data the way you need it.\n\nWith this app you are able to create your own tables with individual columns. You can start with a template or from scratch and add your wanted columns.\nYou can choose from the following column types:\n- Text line or rich text\n- Link to urls or other nextcloud resources\n- Numbers\n- Progress bar\n- Stars rating\n- Yes/No tick\n- Date and/or time\n- (Multi) selection\n\nShare your tables and views with users and groups within your cloud.\n\nHave a good time and manage whatever you want.", + "homepage": "https://github.com/nextcloud/tables", + "licenses": [ + "agpl" + ] + }, + "twofactor_webauthn": { + "hash": "sha256-B1Oje5oX68i9Q/IGFvxjN9Q+78Snq3yusgkgd8Mh3LQ=", + "url": "https://github.com/nextcloud-releases/twofactor_webauthn/releases/download/v2.4.1/twofactor_webauthn-v2.4.1.tar.gz", + "version": "2.4.1", + "description": "A two-factor provider for WebAuthn devices", + "homepage": "https://github.com/nextcloud/twofactor_webauthn#readme", + "licenses": [ + "agpl" + ] + }, + "unroundedcorners": { + "hash": "sha256-0+fOJnPsuengy8TPzTKizDnDXTlZStalFDOv+dFlRgc=", + "url": "https://github.com/OliverParoczai/nextcloud-unroundedcorners/releases/download/v1.1.5/unroundedcorners-v1.1.5.tar.gz", + "version": "1.1.5", + "description": "# Unrounded Corners\nA Nextcloud app that restores the corners of buttons and widgets to their original looks by unrounding them.", + "homepage": "https://github.com/OliverParoczai/nextcloud-unroundedcorners", + "licenses": [ + "agpl" + ] + }, + "uppush": { + "hash": "sha256-3rQt2do+25uu1aOhVae4PsYkFg1bTqF4v6Xy12yCH5c=", + "url": "https://codeberg.org/NextPush/uppush/archive/2.3.1.tar.gz", + "version": "2.3.1", + "description": "Once the mobile phone is connected with NextPush, push notifications can be forwarded to applications implementing UnifiedPush.\n\nMore information about UnifiedPush at https://unifiedpush.org", + "homepage": "", + "licenses": [ + "agpl" + ] + }, + "user_oidc": { + "hash": "sha256-F92W+jiK8OJ7o/Q4tVsbAfxOSH3uhxkvjomm1ZkTZXM=", + "url": "https://github.com/nextcloud-releases/user_oidc/releases/download/v8.0.0/user_oidc-v8.0.0.tar.gz", + "version": "8.0.0", + "description": "Allows flexible configuration of an OIDC server as Nextcloud login user backend.", + "homepage": "https://github.com/nextcloud/user_oidc", + "licenses": [ + "agpl" + ] + }, + "user_saml": { + "hash": "sha256-kE51sQWjGzDbJxgRQNFmexcW+s9/6lcbW2Rxf+Tj6hA=", + "url": "https://github.com/nextcloud-releases/user_saml/releases/download/v7.0.0/user_saml-v7.0.0.tar.gz", + "version": "7.0.0", + "description": "Using the SSO & SAML app of your Nextcloud you can make it easily possible to integrate your existing Single-Sign-On solution with Nextcloud. In addition, you can use the Nextcloud LDAP user provider to keep the convenience for users. (e.g. when sharing)\nThe following providers are supported and tested at the moment:\n\n* **SAML 2.0**\n\t* OneLogin\n\t* Shibboleth\n\t* Active Directory Federation Services (ADFS)\n\n* **Authentication via Environment Variable**\n\t* Kerberos (mod_auth_kerb)\n\t* Any other provider that authenticates using the environment variable\n\nWhile theoretically any other authentication provider implementing either one of those standards is compatible, we like to note that they are not part of any internal test matrix.", + "homepage": "https://github.com/nextcloud/user_saml", + "licenses": [ + "agpl" + ] + }, + "whiteboard": { + "hash": "sha256-/tzGi1uq+1L74cLzGTdrnl+A9SMUrXOoyJPmijCOAN0=", + "url": "https://github.com/nextcloud-releases/whiteboard/releases/download/v1.2.1/whiteboard-v1.2.1.tar.gz", + "version": "1.2.1", + "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": [ + "agpl" + ] + } +} diff --git a/pkgs/servers/nextcloud/packages/apps/memories.nix b/pkgs/servers/nextcloud/packages/apps/memories.nix index 7a3facd503e2..5c3a8e811a91 100644 --- a/pkgs/servers/nextcloud/packages/apps/memories.nix +++ b/pkgs/servers/nextcloud/packages/apps/memories.nix @@ -13,10 +13,11 @@ let latestVersionForNc = { "31" = { - version = "7.6.1"; - appHash = "sha256-uRZBTwhdNr3OUw021WvTnEBcLd49EQbVr9bvU97zblc="; - srcHash = "sha256-eKvdv3ng4YwPmFu7eapYvD8A2cliryAhPf6NDBJjX6c="; + version = "7.7.0"; + appHash = "sha256-ORv+6XkN+qTk5bXMFKv2Mv/jU+7F12IbWE9JjV2ot9o="; + srcHash = "sha256-hiYAQshi84oOw1qfNECWAssbln8UPwD+8Hfb2pKw8no="; }; + "32" = latestVersionForNc."31"; }; currentVersionInfo = latestVersionForNc.${ncVersion} diff --git a/pkgs/servers/nextcloud/packages/apps/recognize.nix b/pkgs/servers/nextcloud/packages/apps/recognize.nix index 0faecd1c0f50..7a6a001967fd 100644 --- a/pkgs/servers/nextcloud/packages/apps/recognize.nix +++ b/pkgs/servers/nextcloud/packages/apps/recognize.nix @@ -17,9 +17,14 @@ let latestVersionForNc = { "31" = { - version = "9.0.3"; - appHash = "sha256-G7SDE72tszifozfT3vNxHW6WmMqQKhrSayQVANQaMbs="; - modelHash = "sha256-dB4ot/65xisR700kUXg3+Y+SkrpQO4mWrFfp+En0QEE="; + version = "9.0.7"; + appHash = "sha256-7EK4QIM9/Qbku2cTOmMcz6ywqKT9l2Ot1DYsdAXOo2E="; + modelHash = "sha256-h3tYtnQUcuFbWAuiKsN2wiFSbbRy/7eNO992MtGrzkc="; + }; + "32" = { + version = "10.0.4"; + appHash = "sha256-/RHnnvGJMcxe4EuceYc20xh3qkYy1ZzGsyvp0h03eLk="; + modelHash = "sha256-AJzVVdZrQs1US1JokW5VokL/uTsK7WiKmuZhw7WeRnU="; }; }; currentVersionInfo = diff --git a/pkgs/servers/nosql/mongodb/7.0.nix b/pkgs/servers/nosql/mongodb/7.0.nix index cb4bbf53279f..2009607e8421 100644 --- a/pkgs/servers/nosql/mongodb/7.0.nix +++ b/pkgs/servers/nosql/mongodb/7.0.nix @@ -21,8 +21,8 @@ let in buildMongoDB { inherit avxSupport; - version = "7.0.22"; - sha256 = "sha256-Je4vPG8tz1vqCEXzWyYi5KWQaxzlH0hOKSpWBgPs0Hs="; + version = "7.0.24"; + sha256 = "sha256-ANPg60OAxwwq1FhRTMOQ0dHBOuKpob1sXnAZMJWhtds="; patches = [ # ModuleNotFoundError: No module named 'mongo_tooling_metrics': # NameError: name 'SConsToolingMetrics' is not defined: diff --git a/pkgs/servers/nosql/mongodb/mongodb.nix b/pkgs/servers/nosql/mongodb/mongodb.nix index b847dfc278df..985dbda33bdf 100644 --- a/pkgs/servers/nosql/mongodb/mongodb.nix +++ b/pkgs/servers/nosql/mongodb/mongodb.nix @@ -5,8 +5,6 @@ buildPackages, boost, gperftools, - pcre2, - pcre-cpp, snappy, zlib, yaml-cpp, @@ -49,6 +47,7 @@ let system-libraries = [ "boost" + #pcre2 -- breaks on pcre2-10.46 with at least version 7.0.24 "snappy" "yaml" "zlib" @@ -57,13 +56,7 @@ let #"valgrind" -- mongodb only requires valgrind.h, which is vendored in the source. #"wiredtiger" ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ "tcmalloc" ] - ++ lib.optionals (lib.versionOlder version "7.0") [ - "pcre" - ] - ++ lib.optionals (lib.versionAtLeast version "7.0") [ - "pcre2" - ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ "tcmalloc" ]; inherit (lib) systems subtractLists; in @@ -92,8 +85,6 @@ stdenv.mkDerivation rec { yaml-cpp openssl openldap - pcre2 - pcre-cpp sasl snappy zlib diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e955eaae1fcd..84c6e70421d1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3556,9 +3556,11 @@ with pkgs; inherit (callPackages ../servers/nextcloud { }) nextcloud31 + nextcloud32 ; nextcloud31Packages = callPackage ../servers/nextcloud/packages { ncVersion = "31"; }; + nextcloud32Packages = callPackage ../servers/nextcloud/packages { ncVersion = "32"; }; nextcloud-notify_push = callPackage ../servers/nextcloud/notify_push.nix { }; @@ -13365,10 +13367,6 @@ with pkgs; curseofwar = callPackage ../games/curseofwar { SDL = null; }; curseofwar-sdl = callPackage ../games/curseofwar { ncurses = null; }; - cutechess = qt5.callPackage ../games/cutechess { }; - - cutemaze = qt6Packages.callPackage ../games/cutemaze { }; - ddnet-server = ddnet.override { buildClient = false; }; duckmarines = callPackage ../games/duckmarines { love = love_0_10; }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3bbc7c223a8e..b8f0ac2e6b2d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7000,6 +7000,8 @@ self: super: with self; { ilua = callPackage ../development/python-modules/ilua { }; + image = callPackage ../development/python-modules/image { }; + image-diff = callPackage ../development/python-modules/image-diff { }; image-go-nord = callPackage ../development/python-modules/image-go-nord { };