diff --git a/.github/workflows/check-nix-format.yml b/.github/workflows/check-nix-format.yml index a70e132dc459..96727ee994e6 100644 --- a/.github/workflows/check-nix-format.yml +++ b/.github/workflows/check-nix-format.yml @@ -91,8 +91,10 @@ jobs: if (( "${#unformattedFiles[@]}" > 0 )); then echo "Some new/changed Nix files are not properly formatted" echo "Please format them using the Nixpkgs-specific \`nixfmt\` by going to the Nixpkgs root directory, running \`nix-shell\`, then:" + echo echo "nixfmt ${unformattedFiles[*]@Q}" - echo "Make sure your branch is up to date with master, rebase if not." + echo + echo "Make sure your branch is up to date with master; rebase if not." echo "If you're having trouble, please ping @NixOS/nix-formatting" exit 1 fi diff --git a/doc/release-notes/rl-2505.section.md b/doc/release-notes/rl-2505.section.md index 956d9fb754e9..ed68560d37fc 100644 --- a/doc/release-notes/rl-2505.section.md +++ b/doc/release-notes/rl-2505.section.md @@ -18,6 +18,9 @@ - [`lib.types.enum`](https://nixos.org/manual/nixos/unstable/#sec-option-types-basic): Previously the `functor.payload` was the list of enum values directly. Now it is an attribute set containing the values in the `values` attribute. - [`lib.types.separatedString`](https://nixos.org/manual/nixos/unstable/#sec-option-types-string): Previously the `functor.payload` was the seperator directly. Now it is an attribute set containing the seperator in the `sep` attribute. +- The `tinycc` package now has the `dev`, `doc` and `lib` outputs, thus, +`tinycc.out` may now only provide the tcc and cross compilers binaries. + - The `virtualisation.hypervGuest.videoMode` option has been removed. Standard tooling can now be used to configure display modes for Hyper-V VMs. ### Deprecations {#sec-nixpkgs-release-25.05-lib-deprecations} diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 3dceccfee268..8b1cbbb11037 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -17079,6 +17079,12 @@ github = "jackyliu16"; githubId = 50787361; }; + one-d-wide = { + name = "Remy D. Farley"; + email = "one-d-wide@protonmail.com"; + github = "one-d-wide"; + githubId = 116499566; + }; onemoresuza = { name = "Coutinho de Souza"; email = "dev@onemoresuza.com"; diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md index cefcb14e1bbb..339c4bb38c36 100644 --- a/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/nixos/doc/manual/release-notes/rl-2411.section.md @@ -936,16 +936,15 @@ The `sound` options have been largely removed, as they are unnecessary for most If you set `sound.enable` in your configuration: - If you are using Pulseaudio or PipeWire, simply remove that option - - If you are using ALSA as your only sound system (no sound server), set `hardware.alsa.enable = true` instead + - If you are not using an external sound server, and want volumes to be persisted across shutdowns, set `hardware.alsa.enablePersistence = true` instead If you set `sound.enableOSSEmulation` in your configuration: - Make sure it is still necessary, as very few applications actually use OSS - - If necessary, set `hardware.alsa.enableOSSEmulation = true` + - If necessary, set `boot.kernelModules = [ "snd_pcm_oss" ]` If you set `sound.extraConfig` in your configuration: - - If you are using a sound server, like Pulseaudio, JACK or PipeWire, migrate your configuration to that - - If you are using ALSA as your only sound system, check if you can use the new structured ALSA options `hardware.alsa.defaultDevice`, `hardware.alsa.cardAliases`, `hardware.alsa.controls`, etc. - - Otherwise, move your configuration directly into `hardware.alsa.config` + - If you are using another sound server, like Pulseaudio, JACK or PipeWire, migrate your configuration to that + - If you are not using an external sound server, set `environment.etc."asound.conf".text = yourExtraConfig` instead If you set `sound.mediaKeys` in your configuration: - Preferably switch to handling media keys in your desktop environment/compositor diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md index 8769c448c00f..44af73915382 100644 --- a/nixos/doc/manual/release-notes/rl-2505.section.md +++ b/nixos/doc/manual/release-notes/rl-2505.section.md @@ -49,6 +49,8 @@ - [Omnom](https://github.com/asciimoo/omnom), a webpage bookmarking and snapshotting service. Available as [services.omnom](options.html#opt-services.omnom.enable). +- [Yggdrasil-Jumper](https://github.com/one-d-wide/yggdrasil-jumper) is an independent project that aims to transparently reduce latency of a connection over Yggdrasil network, utilizing NAT traversal to automatically bypass intermediary nodes. + - [Zenoh](https://zenoh.io/), a pub/sub/query protocol with low overhead. The Zenoh router daemon is available as [services.zenohd](options.html#opt-services.zenohd.enable) - [ytdl-sub](https://github.com/jmbannon/ytdl-sub), a tool that downloads media via yt-dlp and prepares it for your favorite media player, including Kodi, Jellyfin, Plex, Emby, and modern music players. Available as [services.ytdl-sub](options.html#opt-services.ytdl-sub.instances). @@ -373,6 +375,9 @@ - The paperless module now has an option for regular automatic export of documents data using the integrated document exporter. +- New options for the declarative configuration of the user space part of ALSA have been introduced under [hardware.alsa](options.html#opt-hardware.alsa.enable), including setting the default capture and playback device, defining sound card aliases and volume controls. + Note: these are intended for users not running a sound server like PulseAudio or PipeWire, but having ALSA as their only sound system. + - Caddy can now be built with plugins by using `caddy.withPlugins`, a `passthru` function that accepts an attribute set as a parameter. The `plugins` argument represents a list of Caddy plugins, with each Caddy plugin being a versioned module. The `hash` argument represents the `vendorHash` of the resulting Caddy source code with the plugins added. Example: diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 6816b26cfb7f..7364d8c598db 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1329,6 +1329,7 @@ ./services/networking/xrdp.nix ./services/networking/yggdrasil.nix ./services/networking/zapret.nix + ./services/networking/yggdrasil-jumper.nix ./services/networking/zerobin.nix ./services/networking/zenohd.nix ./services/networking/zeronet.nix diff --git a/nixos/modules/services/audio/alsa.nix b/nixos/modules/services/audio/alsa.nix index a26dc493cdb0..ace47e862aad 100644 --- a/nixos/modules/services/audio/alsa.nix +++ b/nixos/modules/services/audio/alsa.nix @@ -86,9 +86,7 @@ in [ "sound" "enableOSSEmulation" ] [ "hardware" "alsa" "enableOSSEmulation" ] ) - (lib.mkRenamedOptionModule - [ "sound" "extraConfig" ] - [ "hardware" "alsa" "config" ]) + (lib.mkRenamedOptionModule [ "sound" "extraConfig" ] [ "hardware" "alsa" "config" ]) ]; options.hardware.alsa = { @@ -191,7 +189,7 @@ in }; }) ); - default = {}; + default = { }; example = lib.literalExpression '' { firefox = { device = "front"; maxVolume = -25.0; }; @@ -286,154 +284,176 @@ in }; - config = lib.mkIf cfg.enable { - - # Disable sound servers enabled by default and, - # if the user enabled one manually, cause a conflict. - services.pipewire.enable = false; - hardware.pulseaudio.enable = false; - - hardware.alsa.config = - let - conf = [ - '' - pcm.!default fromenv - - # Read the capture and playback device from - # the ALSA_AUDIO_IN, ALSA_AUDIO_OUT variables - pcm.fromenv { - type asym - playback.pcm { - type plug - slave.pcm { - @func getenv - vars [ ALSA_AUDIO_OUT ] - default pcm.sysdefault - } - } - capture.pcm { - type plug - slave.pcm { - @func getenv - vars [ ALSA_AUDIO_IN ] - default pcm.sysdefault - } - } - } - '' - (lib.optional cfg.enableRecorder '' - pcm.!default "splitter:fromenv,recorder" - - # Send audio to two stereo devices - pcm.splitter { - @args [ A B ] - @args.A.type string - @args.B.type string - type asym - playback.pcm { - type plug - route_policy "duplicate" - slave.pcm { - type multi - slaves.a.pcm $A - slaves.b.pcm $B - slaves.a.channels 2 - slaves.b.channels 2 - bindings [ - { slave a channel 0 } - { slave a channel 1 } - { slave b channel 0 } - { slave b channel 1 } - ] - } - } - capture.pcm $A - } - - # Device which records and plays back audio - pcm.recorder { - type asym - capture.pcm { - type dsnoop - ipc_key 9165218 - ipc_perm 0666 - slave.pcm "hw:loopback,1,0" - slave.period_size 1024 - slave.buffer_size 8192 - } - playback.pcm { - type dmix - ipc_key 6181923 - ipc_perm 0666 - slave.pcm "hw:loopback,0,0" - slave.period_size 1024 - slave.buffer_size 8192 - } - } - '') - (lib.mapAttrsToList mkControl cfg.controls) - (lib.mapAttrsToList (n: v: "pcm.${n} ${quote v}") cfg.deviceAliases) - ]; - in - lib.mkBefore (lib.concatStringsSep "\n" (lib.flatten conf)); - - hardware.alsa.cardAliases = lib.mkIf cfg.enableRecorder { - loopback.driver = "snd_aloop"; - loopback.id = 2; - }; - - # Set default PCM devices - environment.sessionVariables = defaultDeviceVars; - systemd.globalEnvironment = defaultDeviceVars; - - environment.etc."asound.conf".text = cfg.config; - - boot.kernelModules = - [ ] - ++ lib.optionals cfg.enableOSSEmulation [ "snd_pcm_oss" "snd_mixer_oss" ] - ++ lib.optionals cfg.enableRecorder [ "snd_aloop" ]; - - # Assign names to the sound cards - boot.extraModprobeConfig = lib.concatStringsSep "\n" cardsConfig; - - # Provide alsamixer, aplay, arecord, etc. - environment.systemPackages = [ pkgs.alsa-utils ]; - - # Install udev rules for restoring card settings on boot - services.udev.extraRules = '' - ACTION=="add", SUBSYSTEM=="sound", KERNEL=="controlC*", KERNELS!="card*", GOTO="alsa_restore_go" - GOTO="alsa_restore_end" - - LABEL="alsa_restore_go" - TEST!="/etc/alsa/state-daemon.conf", RUN+="${alsactl} restore -gU $attr{device/number}" - TEST=="/etc/alsa/state-daemon.conf", RUN+="${alsactl} nrestore -gU $attr{device/number}" - LABEL="alsa_restore_end" + options.hardware.alsa.enablePersistence = lib.mkOption { + type = lib.types.bool; + defaultText = lib.literalExpression "config.hardware.alsa.enable"; + default = config.hardware.alsa.enable; + description = '' + Whether to enable ALSA sound card state saving on shutdown. + This is generally not necessary if you're using an external sound server. ''; - - # Service to store/restore the sound card settings - systemd.services.alsa-store = { - description = "Store Sound Card State"; - wantedBy = [ "multi-user.target" ]; - restartIfChanged = false; - unitConfig = { - RequiresMountsFor = "/var/lib/alsa"; - ConditionVirtualization = "!systemd-nspawn"; - }; - serviceConfig = { - Type = "oneshot"; - RemainAfterExit = true; - StateDirectory = "alsa"; - # Note: the service should never be restated, otherwise any - # setting changed between the last `store` and now will be lost. - # To prevent NixOS from starting it in case it has failed we - # expand the exit codes considered successful - SuccessExitStatus = [ 0 99 ]; - ExecStart = "${alsactl} restore -gU"; - ExecStop = "${alsactl} store -gU"; - }; - }; }; + config = lib.mkMerge [ + + (lib.mkIf cfg.enable { + # Disable sound servers enabled by default and, + # if the user enabled one manually, cause a conflict. + services.pipewire.enable = false; + services.pulseaudio.enable = false; + + hardware.alsa.config = + let + conf = [ + '' + pcm.!default fromenv + + # Read the capture and playback device from + # the ALSA_AUDIO_IN, ALSA_AUDIO_OUT variables + pcm.fromenv { + type asym + playback.pcm { + type plug + slave.pcm { + @func getenv + vars [ ALSA_AUDIO_OUT ] + default pcm.sysdefault + } + } + capture.pcm { + type plug + slave.pcm { + @func getenv + vars [ ALSA_AUDIO_IN ] + default pcm.sysdefault + } + } + } + '' + (lib.optional cfg.enableRecorder '' + pcm.!default "splitter:fromenv,recorder" + + # Send audio to two stereo devices + pcm.splitter { + @args [ A B ] + @args.A.type string + @args.B.type string + type asym + playback.pcm { + type plug + route_policy "duplicate" + slave.pcm { + type multi + slaves.a.pcm $A + slaves.b.pcm $B + slaves.a.channels 2 + slaves.b.channels 2 + bindings [ + { slave a channel 0 } + { slave a channel 1 } + { slave b channel 0 } + { slave b channel 1 } + ] + } + } + capture.pcm $A + } + + # Device which records and plays back audio + pcm.recorder { + type asym + capture.pcm { + type dsnoop + ipc_key 9165218 + ipc_perm 0666 + slave.pcm "hw:loopback,1,0" + slave.period_size 1024 + slave.buffer_size 8192 + } + playback.pcm { + type dmix + ipc_key 6181923 + ipc_perm 0666 + slave.pcm "hw:loopback,0,0" + slave.period_size 1024 + slave.buffer_size 8192 + } + } + '') + (lib.mapAttrsToList mkControl cfg.controls) + (lib.mapAttrsToList (n: v: "pcm.${n} ${quote v}") cfg.deviceAliases) + ]; + in + lib.mkBefore (lib.concatStringsSep "\n" (lib.flatten conf)); + + hardware.alsa.cardAliases = lib.mkIf cfg.enableRecorder { + loopback.driver = "snd_aloop"; + loopback.id = 2; + }; + + # Set default PCM devices + environment.sessionVariables = defaultDeviceVars; + systemd.globalEnvironment = defaultDeviceVars; + + environment.etc."asound.conf".text = cfg.config; + + boot.kernelModules = + [ ] + ++ lib.optionals cfg.enableOSSEmulation [ + "snd_pcm_oss" + "snd_mixer_oss" + ] + ++ lib.optionals cfg.enableRecorder [ "snd_aloop" ]; + + # Assign names to the sound cards + boot.extraModprobeConfig = lib.concatStringsSep "\n" cardsConfig; + + # Provide alsamixer, aplay, arecord, etc. + environment.systemPackages = [ pkgs.alsa-utils ]; + }) + + (lib.mkIf config.hardware.alsa.enablePersistence { + + # Install udev rules for restoring card settings on boot + services.udev.extraRules = '' + ACTION=="add", SUBSYSTEM=="sound", KERNEL=="controlC*", KERNELS!="card*", GOTO="alsa_restore_go" + GOTO="alsa_restore_end" + + LABEL="alsa_restore_go" + TEST!="/etc/alsa/state-daemon.conf", RUN+="${alsactl} restore -gU $attr{device/number}" + TEST=="/etc/alsa/state-daemon.conf", RUN+="${alsactl} nrestore -gU $attr{device/number}" + LABEL="alsa_restore_end" + ''; + + # Service to store/restore the sound card settings + systemd.services.alsa-store = { + description = "Store Sound Card State"; + wantedBy = [ "multi-user.target" ]; + restartIfChanged = false; + unitConfig = { + RequiresMountsFor = "/var/lib/alsa"; + ConditionVirtualization = "!systemd-nspawn"; + }; + serviceConfig = { + Type = "oneshot"; + RemainAfterExit = true; + StateDirectory = "alsa"; + # Note: the service should never be restated, otherwise any + # setting changed between the last `store` and now will be lost. + # To prevent NixOS from starting it in case it has failed we + # expand the exit codes considered successful + SuccessExitStatus = [ + 0 + 99 + ]; + ExecStart = "${alsactl} restore -gU"; + ExecStop = "${alsactl} store -gU"; + }; + }; + }) + + ]; + meta.maintainers = with lib.maintainers; [ rnhmjoj ]; } diff --git a/nixos/modules/services/databases/ferretdb.nix b/nixos/modules/services/databases/ferretdb.nix index a7e3fa81c48f..00d28986b532 100644 --- a/nixos/modules/services/databases/ferretdb.nix +++ b/nixos/modules/services/databases/ferretdb.nix @@ -19,8 +19,38 @@ in }; settings = lib.mkOption { - type = - lib.types.submodule { freeformType = with lib.types; attrsOf str; }; + type = lib.types.submodule { + freeformType = with lib.types; attrsOf str; + options = { + FERRETDB_HANDLER = lib.mkOption { + type = lib.types.enum [ "sqlite" "pg" ]; + default = "sqlite"; + description = "Backend handler"; + }; + + FERRETDB_SQLITE_URL = lib.mkOption { + type = lib.types.str; + default = "file:/var/lib/ferretdb/"; + description = "SQLite URI (directory) for 'sqlite' handler"; + }; + + FERRETDB_POSTGRESQL_URL = lib.mkOption { + type = lib.types.str; + default = "postgres://ferretdb@localhost/ferretdb?host=/run/postgresql"; + description = "PostgreSQL URL for 'pg' handler"; + }; + + FERRETDB_TELEMETRY = lib.mkOption { + type = lib.types.enum [ "enable" "disable" ]; + default = "disable"; + description = '' + Enable or disable basic telemetry. + + See for more information. + ''; + }; + }; + }; example = { FERRETDB_LOG_LEVEL = "warn"; FERRETDB_MODE = "normal"; @@ -36,11 +66,7 @@ in config = lib.mkIf cfg.enable { - - services.ferretdb.settings = { - FERRETDB_HANDLER = lib.mkDefault "sqlite"; - FERRETDB_SQLITE_URL = lib.mkDefault "file:/var/lib/ferretdb/"; - }; + services.ferretdb.settings = { }; systemd.services.ferretdb = { description = "FerretDB"; diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix index 59fef3824d85..51d707c6594b 100644 --- a/nixos/modules/services/databases/postgresql.nix +++ b/nixos/modules/services/databases/postgresql.nix @@ -733,10 +733,12 @@ in ] ++ lib.optionals (any extensionInstalled [ "plv8" ]) [ "@pkey" ]; UMask = if groupAccessAvailable then "0027" else "0077"; } - (mkIf (cfg.dataDir != "/var/lib/postgresql") { + (mkIf (cfg.dataDir != "/var/lib/postgresql/${cfg.package.psqlSchema}") { + # The user provides their own data directory ReadWritePaths = [ cfg.dataDir ]; }) (mkIf (cfg.dataDir == "/var/lib/postgresql/${cfg.package.psqlSchema}") { + # Provision the default data directory StateDirectory = "postgresql postgresql/${cfg.package.psqlSchema}"; StateDirectoryMode = if groupAccessAvailable then "0750" else "0700"; }) diff --git a/nixos/modules/services/networking/yggdrasil-jumper.nix b/nixos/modules/services/networking/yggdrasil-jumper.nix new file mode 100644 index 000000000000..d26a69d89eea --- /dev/null +++ b/nixos/modules/services/networking/yggdrasil-jumper.nix @@ -0,0 +1,173 @@ +{ config, lib, pkgs, ... }: + +let + inherit (lib) + escapeShellArgs + filter + hasPrefix + mapAttrsToList + mkEnableOption + mkIf + mkOption + mkPackageOption + ; + format = pkgs.formats.toml { }; +in +{ + options = + let + inherit (lib.types) + bool + enum + lines + listOf + str + ; + in + { + services.yggdrasil-jumper = { + enable = mkEnableOption "the Yggdrasil Jumper system service"; + + retrieveListenAddresses = mkOption { + type = bool; + default = true; + description = '' + Automatically retrieve listen addresses from the Yggdrasil router configuration. + + See `yggdrasil_listen` option in Yggdrasil Jumper configuration. + ''; + }; + + appendListenAddresses = mkOption { + type = bool; + default = true; + description = '' + Append Yggdrasil router configuration with listeners on loopback + addresses (`127.0.0.1`) and preselected ports to support peering + using client-server protocols like `quic` and `tls`. + + See `Listen` option in Yggdrasil router configuration. + ''; + }; + + settings = mkOption { + type = format.type; + default = { }; + example = { + listen_port = 9999; + whitelist = [ + "" + ]; + }; + description = '' + Configuration for Yggdrasil Jumper as a Nix attribute set. + ''; + }; + + extraConfig = mkOption { + type = lines; + default = ""; + example = '' + listen_port = 9999; + whitelist = [ + "" + ]; + ''; + description = '' + Configuration for Yggdrasil Jumper in plaintext. + ''; + }; + + package = mkPackageOption pkgs "yggdrasil-jumper" { }; + + logLevel = mkOption { + type = enum [ "off" "error" "warn" "info" "debug" "trace" ]; + default = "info"; + description = '' + Set logging verbosity for Yggdrasil Jumper. + ''; + }; + + extraArgs = mkOption { + type = listOf str; + default = [ ]; + description = '' + Extra command line arguments for Yggdrasil Jumper. + ''; + }; + }; + }; + + config = + let + cfg = config.services.yggdrasil-jumper; + + # Generate, concatenate and validate config file + jumperSettings = format.generate "yggdrasil-jumper-settings" cfg.settings; + jumperExtraConfig = pkgs.writeText "yggdrasil-jumper-extra-config" cfg.extraConfig; + jumperConfig = + pkgs.runCommand + "yggdrasil-jumper-config" + { } + '' + cat ${jumperSettings} ${jumperExtraConfig} \ + | tee $out \ + | ${cfg.package}/bin/yggdrasil-jumper --validate --config - + ''; + in + mkIf cfg.enable { + assertions = [{ + assertion = config.services.yggdrasil.enable; + message = "`services.yggdrasil.enable` must be true for `yggdrasil-jumper` to operate"; + }]; + + services.yggdrasil.settings.Listen = + let + # By default linux dynamically alocates ports in range 32768..60999 + # `sysctl net.ipv4.ip_local_port_range` + # See: https://xkcd.com/221/ + prot_port = { "tls" = 11814; "quic" = 11814; }; + in + mkIf + (cfg.retrieveListenAddresses && cfg.appendListenAddresses) + (mapAttrsToList (prot: port: "${prot}://127.0.0.1:${toString port}") prot_port); + + services.yggdrasil-jumper.settings = { + yggdrasil_admin_listen = [ "unix:///run/yggdrasil/yggdrasil.sock" ]; + yggdrasil_listen = + mkIf + cfg.retrieveListenAddresses + (filter (a: !hasPrefix "tcp://" a) config.services.yggdrasil.settings.Listen); + }; + + systemd.services.yggdrasil-jumper = { + description = "Yggdrasil Jumper Service"; + after = [ "yggdrasil.service" ]; + unitConfig.BindsTo = [ "yggdrasil.service" ]; + wantedBy = [ "multi-user.target" ]; + + serviceConfig = { + User = "yggdrasil"; + DynamicUser = true; + + # TODO: Remove this delay after support for proper startup notification lands in `yggdrasil-go` + ExecStartPre = "${pkgs.coreutils}/bin/sleep 5"; + ExecStart = escapeShellArgs ([ "${cfg.package}/bin/yggdrasil-jumper" "--loglevel" "${cfg.logLevel}" "--config" "${jumperConfig}" ] ++ cfg.extraArgs); + KillSignal = "SIGINT"; + + MemoryDenyWriteExecute = true; + ProtectControlGroups = true; + ProtectHome = "tmpfs"; + RestrictAddressFamilies = "AF_UNIX AF_INET AF_INET6"; + RestrictNamespaces = true; + RestrictRealtime = true; + SystemCallArchitectures = "native"; + SystemCallFilter = [ "@system-service" "~@privileged" ]; + }; + }; + + environment.systemPackages = [ cfg.package ]; + }; + + meta.maintainers = with lib.maintainers; [ one-d-wide ]; +} diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix index 10c72550f2cd..aa9f074a6178 100644 --- a/nixos/modules/services/web-apps/nextcloud.nix +++ b/nixos/modules/services/web-apps/nextcloud.nix @@ -299,7 +299,7 @@ in { package = mkOption { type = types.package; description = "Which package to use for the Nextcloud instance."; - relatedPackages = [ "nextcloud28" "nextcloud29" "nextcloud30" ]; + relatedPackages = [ "nextcloud29" "nextcloud30" ]; }; phpPackage = mkPackageOption pkgs "php" { example = "php82"; diff --git a/nixos/tests/ferretdb.nix b/nixos/tests/ferretdb.nix index 7251198af77d..8e6e7b6a3219 100644 --- a/nixos/tests/ferretdb.nix +++ b/nixos/tests/ferretdb.nix @@ -26,7 +26,6 @@ with import ../lib/testing-python.nix { inherit system; }; services.ferretdb = { enable = true; settings.FERRETDB_HANDLER = "pg"; - settings.FERRETDB_POSTGRESQL_URL = "postgres://ferretdb@localhost/ferretdb?host=/run/postgresql"; }; systemd.services.ferretdb.serviceConfig = { diff --git a/nixos/tests/nextcloud/default.nix b/nixos/tests/nextcloud/default.nix index a1aba5c1ab64..568440150b23 100644 --- a/nixos/tests/nextcloud/default.nix +++ b/nixos/tests/nextcloud/default.nix @@ -110,4 +110,4 @@ let ./with-objectstore.nix ]; in -listToAttrs (concatMap genTests [ 28 29 30 ]) +listToAttrs (concatMap genTests [ 29 30 ]) diff --git a/pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix b/pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix index 35ac41fd106e..973b8cbb7c04 100644 --- a/pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix +++ b/pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix @@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "claude-dev"; publisher = "saoudrizwan"; - version = "3.1.1"; - hash = "sha256-xpVb+5neAvMv8ebQlObjVE/lNd7Gn/KLbQAZ9AvQRFI="; + version = "3.1.11"; + hash = "sha256-DxeMTbbDXofhq4+WvO8fpczyxorSJSw6bU3c8xFdDgg="; }; meta = { diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix index b1c8f5a9ea09..b3069527f8b2 100644 --- a/pkgs/applications/graphics/inkscape/default.nix +++ b/pkgs/applications/graphics/inkscape/default.nix @@ -113,6 +113,13 @@ stdenv.mkDerivation (finalAttrs: { # double-conversion is a dependency of 2geom substituteInPlace CMakeScripts/DefineDependsandFlags.cmake \ --replace-fail 'find_package(DoubleConversion REQUIRED)' "" + # use native Python when cross-compiling + shopt -s globstar + for f in **/CMakeLists.txt; do + substituteInPlace $f \ + --replace-quiet "COMMAND python3" "COMMAND ${lib.getExe python3Env.pythonOnBuildForHost}" + done + shopt -u globstar ''; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/syncthingtray/default.nix b/pkgs/applications/misc/syncthingtray/default.nix index 23ac32ce240a..6cded45faf1c 100644 --- a/pkgs/applications/misc/syncthingtray/default.nix +++ b/pkgs/applications/misc/syncthingtray/default.nix @@ -38,14 +38,14 @@ }: stdenv.mkDerivation (finalAttrs: { - version = "1.7.0"; + version = "1.7.1"; pname = "syncthingtray"; src = fetchFromGitHub { owner = "Martchus"; repo = "syncthingtray"; rev = "v${finalAttrs.version}"; - hash = "sha256-YKOqgUMK+FYYemxDcxfDV42z/1qSSja6M7NAt+UaFEo="; + hash = "sha256-97ehL61C6q/8Hlbt3bMkrZ33V+Z4a4xatc5p1Tw5NIw="; }; buildInputs = diff --git a/pkgs/by-name/aa/aaaaxy/package.nix b/pkgs/by-name/aa/aaaaxy/package.nix index 9fa7b2e238de..2c61f1d711f1 100644 --- a/pkgs/by-name/aa/aaaaxy/package.nix +++ b/pkgs/by-name/aa/aaaaxy/package.nix @@ -21,13 +21,13 @@ buildGoModule rec { pname = "aaaaxy"; - version = "1.5.250"; + version = "1.5.256"; src = fetchFromGitHub { owner = "divVerent"; repo = pname; rev = "v${version}"; - hash = "sha256-+avaHICyaNbNCaOWb+AgpEq4SONacFJ//AZx+2Aa7SY="; + hash = "sha256-wK0ZVJGTRp4m7nALfLzJE51juqBo8GmlK8BIQeb20ls="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/bi/bitwarden-desktop/package.nix b/pkgs/by-name/bi/bitwarden-desktop/package.nix index 5c0a43804cd6..4bb110d0b884 100644 --- a/pkgs/by-name/bi/bitwarden-desktop/package.nix +++ b/pkgs/by-name/bi/bitwarden-desktop/package.nix @@ -39,13 +39,13 @@ let in buildNpmPackage rec { pname = "bitwarden-desktop"; - version = "2024.12.0"; + version = "2024.12.1"; src = fetchFromGitHub { owner = "bitwarden"; repo = "clients"; rev = "desktop-v${version}"; - hash = "sha256-1XzIrZOTcFEuY/WqPGcFESBAZOiFcHA4ZvGXhDM7a54="; + hash = "sha256-nmQUfVhSJrnYWbxjNk0r6vEtPqA8kksEX5gUmpeKe6M="; }; patches = [ @@ -70,7 +70,7 @@ buildNpmPackage rec { "--legacy-peer-deps" ]; npmWorkspace = "apps/desktop"; - npmDepsHash = "sha256-EtIcqbubAYN9I9wbw17oHiVshd3GtQayFtdgqWP7Pgg="; + npmDepsHash = "sha256-5rOA7xtw2jqjoLxEl4lsLWpv32/TYmEaK+UN7R8EoJc="; cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; diff --git a/pkgs/by-name/cp/cpp-utilities/package.nix b/pkgs/by-name/cp/cpp-utilities/package.nix index 3141138c692a..0af1d26d98e8 100644 --- a/pkgs/by-name/cp/cpp-utilities/package.nix +++ b/pkgs/by-name/cp/cpp-utilities/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "cpp-utilities"; - version = "5.27.1"; + version = "5.27.2"; src = fetchFromGitHub { owner = "Martchus"; repo = "cpp-utilities"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-C/kUWFL305JJ3MGCVc1SQdHdZcuaF01/feQd5AdKQFM="; + sha256 = "sha256-WdIXakivkeg98c3zDKUBlFIRcFo8iFHgFZVMIbkrR0g="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/do/dolt/package.nix b/pkgs/by-name/do/dolt/package.nix index 0c68cc60bb73..f5440856014f 100644 --- a/pkgs/by-name/do/dolt/package.nix +++ b/pkgs/by-name/do/dolt/package.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "dolt"; - version = "1.45.1"; + version = "1.45.4"; src = fetchFromGitHub { owner = "dolthub"; repo = "dolt"; rev = "v${version}"; - sha256 = "sha256-O5y3AdFOtxNwpt8uGkTC7XHY1M/6Cv3vTyeHyVlTRGw="; + sha256 = "sha256-yOAZJj+uqVcySLbS3dLw1nhn45G1x2MQTObs150iUs8="; }; modRoot = "./go"; subPackages = [ "cmd/dolt" ]; - vendorHash = "sha256-h9HE90mOaDid2/uZcDBKZdbi6K1P2o27LZDnLAm+XSE="; + vendorHash = "sha256-+q+zQKNwDPQ+6RJQj2pjhEFRxU+9kF1bgPIJB0YaTzk="; proxyVendor = true; doCheck = false; diff --git a/pkgs/by-name/ge/gemrb/package.nix b/pkgs/by-name/ge/gemrb/package.nix index f4bf90f780ef..d15dc047adc0 100644 --- a/pkgs/by-name/ge/gemrb/package.nix +++ b/pkgs/by-name/ge/gemrb/package.nix @@ -27,13 +27,13 @@ let in stdenv.mkDerivation rec { pname = "gemrb"; - version = "0.9.3"; + version = "0.9.4"; src = fetchFromGitHub { owner = "gemrb"; repo = "gemrb"; rev = "v${version}"; - hash = "sha256-n01Q/27iYXahBbUDFHW1Q3lPqCtTvhstUBgownZbKtg="; + hash = "sha256-+aPnOJQGRblqcrblVU5ZwA8CZqeT19rxEtn3GLuofYU="; }; buildInputs = [ diff --git a/pkgs/by-name/go/go-blueprint/package.nix b/pkgs/by-name/go/go-blueprint/package.nix index ffb17d92b2f6..f4df089c084a 100644 --- a/pkgs/by-name/go/go-blueprint/package.nix +++ b/pkgs/by-name/go/go-blueprint/package.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "go-blueprint"; - version = "0.10.3"; + version = "0.10.4"; src = fetchFromGitHub { owner = "Melkeydev"; repo = "go-blueprint"; rev = "v${version}"; - hash = "sha256-CTmizd0OnSKHXhhfzRxG31kcnIRSRHZE1LuR7qjBlm8="; + hash = "sha256-/MIMDQKdpgY0bCwrYpJNC6jiEhNECROe61uuoFz8P68="; }; ldflags = [ diff --git a/pkgs/by-name/li/libcupsfilters/package.nix b/pkgs/by-name/li/libcupsfilters/package.nix index dfd17f890c47..22d497f098dd 100644 --- a/pkgs/by-name/li/libcupsfilters/package.nix +++ b/pkgs/by-name/li/libcupsfilters/package.nix @@ -7,6 +7,7 @@ fontconfig, ghostscript, lcms2, + lib, libexif, libjpeg, libpng, @@ -33,9 +34,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config - cups ]; buildInputs = [ + cups dbus fontconfig ghostscript @@ -50,9 +51,10 @@ stdenv.mkDerivation rec { qpdf ]; configureFlags = [ - "--with-mutool-path=${mupdf}/bin/mutool" - "--with-gs-path=${ghostscript}/bin/gs" - "--with-ippfind-path=${cups}/bin/ippfind" + "--with-cups-config=${lib.getExe' (lib.getDev cups) "cups-config"}" + "--with-mutool-path=${lib.getExe' mupdf "mutool"}" + "--with-gs-path=${lib.getExe ghostscript}" + "--with-ippfind-path=${lib.getExe' cups "ippfind"}" "--enable-imagefilters" "--with-test-font-path=${dejavu_fonts}/share/fonts/truetype/DejaVuSans.ttf" ]; @@ -61,4 +63,11 @@ stdenv.mkDerivation rec { "CUPS_DATADIR=$(out)/share/cups" "CUPS_SERVERROOT=$(out)/etc/cups" ]; + + meta = { + homepage = "https://github.com/OpenPrinting/libcupsfilters"; + description = "Backends, filters, and other software that was once part of the core CUPS distribution but is no longer maintained by Apple Inc"; + license = lib.licenses.asl20; + platforms = lib.platforms.linux; + }; } diff --git a/pkgs/by-name/li/liberation-sans-narrow/package.nix b/pkgs/by-name/li/liberation-sans-narrow/package.nix index 0fd45c6c500e..7945a5b0a4fd 100644 --- a/pkgs/by-name/li/liberation-sans-narrow/package.nix +++ b/pkgs/by-name/li/liberation-sans-narrow/package.nix @@ -18,15 +18,17 @@ stdenv.mkDerivation rec { sha256 = "1qw554jbdnqkg6pjjl4cqkgsalq3398kzvww2naw30vykcz752bm"; }; - buildInputs = [ + nativeBuildInputs = [ fontforge python3Packages.fonttools python3 ]; installPhase = '' + runHook preInstall find . -name '*Narrow*.ttf' -exec install -m444 -Dt $out/share/fonts/truetype {} \; install -m444 -Dt $out/doc/${pname}-${version} AUTHORS ChangeLog COPYING License.txt README.rst + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/by-name/li/libppd/package.nix b/pkgs/by-name/li/libppd/package.nix index 39383430208c..1493e22d2c22 100644 --- a/pkgs/by-name/li/libppd/package.nix +++ b/pkgs/by-name/li/libppd/package.nix @@ -28,6 +28,7 @@ stdenv.mkDerivation rec { cups ]; buildInputs = [ + cups ghostscript libcupsfilters mupdf diff --git a/pkgs/by-name/ll/lldap/package.nix b/pkgs/by-name/ll/lldap/package.nix index a6c13ffa81f6..17d6aa009cf0 100644 --- a/pkgs/by-name/ll/lldap/package.nix +++ b/pkgs/by-name/ll/lldap/package.nix @@ -12,6 +12,12 @@ let + wasm-bindgen-95 = wasm-bindgen-cli.override { + version = "0.2.95"; + hash = "sha256-prMIreQeAcbJ8/g3+pMp1Wp9H5u+xLqxRxL+34hICss="; + cargoHash = "sha256-6iMebkD7FQvixlmghGGIvpdGwFNLfnUcFke/Rg8nPK4="; + }; + commonDerivationAttrs = rec { pname = "lldap"; version = "0.6.1"; @@ -38,7 +44,7 @@ let pname = commonDerivationAttrs.pname + "-frontend"; nativeBuildInputs = [ - wasm-pack wasm-bindgen-cli binaryen which rustc rustc.llvmPackages.lld + wasm-pack wasm-bindgen-95 binaryen which rustc rustc.llvmPackages.lld ]; buildPhase = '' diff --git a/pkgs/by-name/lo/local-ai/package.nix b/pkgs/by-name/lo/local-ai/package.nix index e5125f67369b..17a7aa5d6a84 100644 --- a/pkgs/by-name/lo/local-ai/package.nix +++ b/pkgs/by-name/lo/local-ai/package.nix @@ -44,6 +44,8 @@ ocl-icd, opencl-headers, + with_vulkan ? false, + with_tinydream ? false, # do not compile with cublas ncnn, @@ -65,6 +67,7 @@ let with_openblas with_cublas with_clblas + with_vulkan ]) <= 1; if with_openblas then "openblas" @@ -138,6 +141,7 @@ let openclSupport = false; blasSupport = false; rpcSupport = true; + vulkanSupport = false; }; llama-cpp-grpc = @@ -147,8 +151,8 @@ let src = fetchFromGitHub { owner = "ggerganov"; repo = "llama.cpp"; - rev = "26a8406ba9198eb6fdd8329fa717555b4f77f05f"; - hash = "sha256-WFkg4ZhL5x55JdeFmAGBFKjWd31XyfGPtQkn+9b7GF4="; + rev = "ba8a1f9c5b675459c55a83e3f97f10df3a66c788"; + hash = "sha256-YunQh1760AcknBFwHc6uMZJ7V4OzEAKiwB9HBH1n4bc="; fetchSubmodules = true; }; postPatch = @@ -185,6 +189,7 @@ let rocmSupport = false; openclSupport = with_clblas; blasSupport = with_openblas; + vulkanSupport = with_vulkan; }; espeak-ng' = espeak-ng.overrideAttrs (self: { @@ -404,8 +409,8 @@ let src = fetchFromGitHub { owner = "leejet"; repo = "stable-diffusion.cpp"; - rev = "4570715727f35e5a07a76796d823824c8f42206c"; - hash = "sha256-1w7OokrQflasvauDEADLDJf2530m5a7WP+X1KgwxCks="; + rev = "dcf91f9e0f2cbf9da472ee2a556751ed4bab2d2a"; + hash = "sha256-NHIjLZNfx9G6olp0VWBthuf7jIQC/qVRw6q9A6H866E="; fetchSubmodules = true; }; installPhase = '' @@ -433,12 +438,12 @@ let stdenv; pname = "local-ai"; - version = "2.24.2"; + version = "2.25.0"; src = fetchFromGitHub { owner = "go-skynet"; repo = "LocalAI"; rev = "v${version}"; - hash = "sha256-nJYeNwx6G3WhrTZYi1yoPzYtofx1H7bTkK0T9ld5wcE="; + hash = "sha256-y0Pj74A2t5DpfI/tCEnV/w2zHLDZzXLJtgFLgng4MFw="; }; prepare-sources = @@ -462,7 +467,7 @@ let self = buildGo123Module.override { stdenv = effectiveStdenv; } { inherit pname version src; - vendorHash = "sha256-QmOoICJ11SY8xXE0g1+1mWRUZ3kQPtCcpM6aZiBkHQ0="; + vendorHash = "sha256-5xWrPsQwmGIA2k8OFR9OH3BeCUvLETygViWEOIRgjB0="; env.NIX_CFLAGS_COMPILE = lib.optionalString with_stablediffusion " -isystem ${opencv}/include/opencv4"; @@ -626,6 +631,7 @@ let inherit with_cublas with_openblas + with_vulkan with_tts with_stablediffusion with_tinydream diff --git a/pkgs/by-name/po/powershell-editor-services/package.nix b/pkgs/by-name/po/powershell-editor-services/package.nix index cea882e0d8f7..b303d617e2b6 100644 --- a/pkgs/by-name/po/powershell-editor-services/package.nix +++ b/pkgs/by-name/po/powershell-editor-services/package.nix @@ -7,11 +7,11 @@ }: stdenvNoCC.mkDerivation rec { pname = "powershell-editor-services"; - version = "4.1.0"; + version = "4.2.0"; src = fetchzip { url = "https://github.com/PowerShell/PowerShellEditorServices/releases/download/v${version}/PowerShellEditorServices.zip"; - hash = "sha256-B6RF4RoJB+C5i6puZhfy6FZzyZ9eMo81dd0XsaIEK6Q="; + hash = "sha256-HSLpgnCx871BuKcerX8NZIN+NbpEz+KQtm1HfUXr7kY="; stripRoot = false; }; diff --git a/pkgs/by-name/ra/radicale/package.nix b/pkgs/by-name/ra/radicale/package.nix index 20f1bcfc31fb..dbc4820558d4 100644 --- a/pkgs/by-name/ra/radicale/package.nix +++ b/pkgs/by-name/ra/radicale/package.nix @@ -7,14 +7,14 @@ python3.pkgs.buildPythonApplication rec { pname = "radicale"; - version = "3.3.3"; + version = "3.4.0"; pyproject = true; src = fetchFromGitHub { owner = "Kozea"; repo = "Radicale"; tag = "v${version}"; - hash = "sha256-KRVByUXiTx5sX7LDgtOlVky8UH5HThaaldvOpeeHd7k="; + hash = "sha256-yAKNqNs1HAYOntHUwdS75rHV9jB2R/6L20uaOPzEooY="; }; build-system = with python3.pkgs; [ diff --git a/pkgs/by-name/re/re-flex/package.nix b/pkgs/by-name/re/re-flex/package.nix index ab86d29838de..7313cf6d939f 100644 --- a/pkgs/by-name/re/re-flex/package.nix +++ b/pkgs/by-name/re/re-flex/package.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "re-flex"; - version = "5.1.0"; + version = "5.1.1"; src = fetchFromGitHub { owner = "Genivia"; repo = "RE-flex"; rev = "v${version}"; - hash = "sha256-GL2zg789R8SYB9e3BrMbrXZVg0EDB2LyvL6MO4n4kEk="; + hash = "sha256-QSstDLUYmqTyxu/KyQTVuKkzIdFZ5MsXlHAcTvhTvr8="; }; outputs = [ "out" "bin" "dev" ]; diff --git a/pkgs/by-name/ru/ruff/package.nix b/pkgs/by-name/ru/ruff/package.nix index aa97ab3e2553..1873cc36cf02 100644 --- a/pkgs/by-name/ru/ruff/package.nix +++ b/pkgs/by-name/ru/ruff/package.nix @@ -52,36 +52,14 @@ rustPlatform.buildRustPackage rec { # tests do not appear to respect linker options on doctests # Upstream issue: https://github.com/rust-lang/cargo/issues/14189 # This causes errors like "error: linker `cc` not found" on static builds - postInstallCheck = lib.optionalString (!stdenv.hostPlatform.isStatic) '' - cargoCheckHook - ''; + doCheck = !stdenv.hostPlatform.isStatic; - # Failing on darwin for an unclear reason. + # Failing on darwin for an unclear reason, but probably due to sandbox. # According to the maintainers, those tests are from an experimental crate that isn't actually # used by ruff currently and can thus be safely skipped. - checkFlags = lib.optionals stdenv.hostPlatform.isDarwin [ - "--skip=added_package" - "--skip=add_search_path" - "--skip=changed_file" - "--skip=changed_versions_file" - "--skip=deleted_file" - "--skip=directory_deleted" - "--skip=directory_moved_to_trash" - "--skip=directory_moved_to_workspace" - "--skip=directory_renamed" - "--skip=hard_links_in_workspace" - "--skip=hard_links_to_target_outside_workspace" - "--skip=move_file_to_trash" - "--skip=move_file_to_workspace" - "--skip=nested_packages_delete_root" - "--skip=new_file" - "--skip=new_ignored_file" - "--skip=removed_package" - "--skip=rename_file" - "--skip=search_path" - "--skip=unix::changed_metadata" - "--skip=unix::symlinked_module_search_path" - "--skip=unix::symlink_inside_workspace" + cargoTestFlags = lib.optionals stdenv.hostPlatform.isDarwin [ + "--workspace" + "--exclude=red_knot" ]; nativeInstallCheckInputs = [ diff --git a/pkgs/by-name/si/simdjson/package.nix b/pkgs/by-name/si/simdjson/package.nix index 806d816e44c6..6025070694c3 100644 --- a/pkgs/by-name/si/simdjson/package.nix +++ b/pkgs/by-name/si/simdjson/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "simdjson"; - version = "3.11.4"; + version = "3.11.6"; src = fetchFromGitHub { owner = "simdjson"; repo = "simdjson"; rev = "v${version}"; - sha256 = "sha256-mcsMp9P9+3ACHkykJitHADoZ35kBeUza2LN+EPnq8RU="; + sha256 = "sha256-599gzxJ53nHVo6MkEICzHxaQl0s1vZRjySSRUxC7ZXA="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/sq/squawk/package.nix b/pkgs/by-name/sq/squawk/package.nix index 8b236d549141..66065fd74588 100644 --- a/pkgs/by-name/sq/squawk/package.nix +++ b/pkgs/by-name/sq/squawk/package.nix @@ -11,18 +11,18 @@ }: rustPlatform.buildRustPackage rec { pname = "squawk"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "sbdchd"; repo = "squawk"; tag = "v${version}"; - hash = "sha256-uvgzfMMW/7oiy/SON+Hp4NItiGeKAAM+bMpQ7FPtfqY="; + hash = "sha256-gKYoTdGaonnLEnaoFlniD9nA5+TM5ITjyL/elOM7gZI="; }; useFetchCargoVendor = true; - cargoHash = "sha256-oIVtlVkW46UeNw2MCwECQON09fRzTKot3pDgWoC35D0="; + cargoHash = "sha256-z0ZZnXUH834f6FPYhAcmjmtLEYMvbT97UPgn6ddlxdY="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/st/stackit-cli/package.nix b/pkgs/by-name/st/stackit-cli/package.nix index d9819c60973d..4c255f4bab51 100644 --- a/pkgs/by-name/st/stackit-cli/package.nix +++ b/pkgs/by-name/st/stackit-cli/package.nix @@ -12,16 +12,16 @@ buildGoModule rec { pname = "stackit-cli"; - version = "0.20.0"; + version = "0.21.2"; src = fetchFromGitHub { owner = "stackitcloud"; repo = "stackit-cli"; rev = "v${version}"; - hash = "sha256-M3VUpe8M2O2EXjD9/+YNa7Q7l0Q/WXbIhObyFa/Wg18="; + hash = "sha256-0mFpTE/scvsFbS9VAwXw3tiMHwHgPahzNq7foW4dCUE="; }; - vendorHash = "sha256-eAyex6OqQc/nLWpCbmjyjxPf3pdK9wPAc8eARwiCrIs="; + vendorHash = "sha256-fRJ70BTTRKrFdOOm1DAvXj4frdN0Ak71pCRZMnsjYnY="; subPackages = [ "." ]; diff --git a/pkgs/by-name/un/unit/package.nix b/pkgs/by-name/un/unit/package.nix index 77bd7158fa0f..d8b32b16118b 100644 --- a/pkgs/by-name/un/unit/package.nix +++ b/pkgs/by-name/un/unit/package.nix @@ -40,14 +40,14 @@ let inherit (lib) optional optionals optionalString; in stdenv.mkDerivation rec { - version = "1.34.0"; + version = "1.34.1"; pname = "unit"; src = fetchFromGitHub { owner = "nginx"; repo = pname; rev = version; - sha256 = "sha256-M1Fe/jS+u2cXMjIyCbvrBX37LM6Q3xPib9Uywxp7QCI="; + sha256 = "sha256-p3n0j/sZr+aLwfZuXTbb5+J4T48FWdsZBbSH3Yiex9g="; }; nativeBuildInputs = [ which ]; diff --git a/pkgs/by-name/wa/waypipe/package.nix b/pkgs/by-name/wa/waypipe/package.nix index c88051e51496..61eedc92e513 100644 --- a/pkgs/by-name/wa/waypipe/package.nix +++ b/pkgs/by-name/wa/waypipe/package.nix @@ -22,18 +22,18 @@ }: llvmPackages.stdenv.mkDerivation rec { pname = "waypipe"; - version = "0.10.0"; + version = "0.10.1"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "mstoeckl"; repo = "waypipe"; tag = "v${version}"; - hash = "sha256-OV0FHieHce83W2O379VpGmUMrtID7NdtIrxIe+IJfF0="; + hash = "sha256-l9gZ7FtLxGKBRlMem3VGJGTvOkVAtLBa7eF9+gA5Vfo="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit pname version src; - hash = "sha256-pC1m1P4wJOT3jARGlpc86u7GdyPXX+YHsFLOcWRqdxI="; + hash = "sha256-DjqyKXbCQ6kzb1138wNWPnRXIgUaaE1nnCExLeLX6pw="; }; strictDeps = true; diff --git a/pkgs/by-name/yg/yggdrasil-jumper/package.nix b/pkgs/by-name/yg/yggdrasil-jumper/package.nix new file mode 100644 index 000000000000..ab1aa514b525 --- /dev/null +++ b/pkgs/by-name/yg/yggdrasil-jumper/package.nix @@ -0,0 +1,36 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, nix-update-script +}: + +rustPlatform.buildRustPackage rec { + pname = "yggdrasil-jumper"; + version = "0.3.1"; + + src = fetchFromGitHub { + owner = "one-d-wide"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-Op3KBJ911AjB7BIJuV4xR8KHMxBtQj7hf++tC1g7SlM="; + }; + + cargoHash = "sha256-i4w+cUCTzbXMC76HuVUdKh54ww8T9nPqQkL64YAneos="; + + passthru.updateScript = nix-update-script { }; + + meta = with lib; { + description = "Reduce latency of a connection over Yggdrasil Network"; + longDescription = '' + An independent project that aims to transparently reduce latency + of a connection over Yggdrasil network, utilizing NAT traversal to + bypass intermediary nodes. It periodically probes for active sessions + and automatically establishes direct peerings over internet with + remote nodes running Yggdrasil-Jumper without requiring any firewall + configuration or port mapping. + ''; + homepage = "https://github.com/one-d-wide/yggdrasil-jumper"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ one-d-wide ]; + }; +} diff --git a/pkgs/by-name/za/zap/package.nix b/pkgs/by-name/za/zap/package.nix index 00e0431f6557..0edcff844f72 100644 --- a/pkgs/by-name/za/zap/package.nix +++ b/pkgs/by-name/za/zap/package.nix @@ -10,10 +10,10 @@ stdenv.mkDerivation rec { pname = "zap"; - version = "2.15.0"; + version = "2.16.0"; src = fetchurl { url = "https://github.com/zaproxy/zaproxy/releases/download/v${version}/ZAP_${version}_Linux.tar.gz"; - sha256 = "sha256-ZBDhlrqrRYqSBOKar7V0X8oAOipsA4byxuXAS2diH6c="; + sha256 = "sha256-oHeVCecC7FPUEHTqoM5B8qlkqCKqW+A4AlWkguLn/o0="; }; desktopItems = [ diff --git a/pkgs/desktops/lomiri/services/biometryd/default.nix b/pkgs/desktops/lomiri/services/biometryd/default.nix index fba0305124b9..3c590f7d2bf5 100644 --- a/pkgs/desktops/lomiri/services/biometryd/default.nix +++ b/pkgs/desktops/lomiri/services/biometryd/default.nix @@ -4,7 +4,8 @@ fetchFromGitLab, gitUpdater, testers, - boost, + # Pin Boost 1.86 due to use of boost::asio::io_service. + boost186, cmake, cmake-extras, dbus, @@ -65,7 +66,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - boost + boost186 cmake-extras dbus dbus-cpp diff --git a/pkgs/development/compilers/tinycc/default.nix b/pkgs/development/compilers/tinycc/default.nix index a58af0c526fa..0632b01e3ef9 100644 --- a/pkgs/development/compilers/tinycc/default.nix +++ b/pkgs/development/compilers/tinycc/default.nix @@ -8,23 +8,25 @@ texinfo, which, }: - stdenv.mkDerivation (finalAttrs: { pname = "tcc"; - version = "0.9.27-unstable-2022-07-15"; + version = "0.9.27-unstable-2025-01-06"; + + outputs = [ + "dev" + "doc" + "info" + "lib" + "man" + "out" + ]; src = fetchFromRepoOrCz { repo = "tinycc"; - rev = "af1abf1f45d45b34f0b02437f559f4dfdba7d23c"; - hash = "sha256-jY0P2GErmo//YBaz6u4/jj/voOE3C2JaIDRmo0orXN8="; + rev = "f6385c05308f715bdd2c06336801193a21d69b50"; + hash = "sha256-tO3N+NplYy8QUOC2N3x0CO5Ui75j9bQzLSZQF1HQyhY="; }; - outputs = [ - "out" - "info" - "man" - ]; - nativeBuildInputs = [ copyPkgconfigItems perl @@ -57,17 +59,15 @@ stdenv.mkDerivation (finalAttrs: { (makePkgconfigItem libtcc-pcitem) ]; - postPatch = '' - patchShebangs texi2pod.pl - ''; - configureFlags = [ "--cc=$CC" "--ar=$AR" "--crtprefix=${lib.getLib stdenv.cc.libc}/lib" "--sysincludepaths=${lib.getDev stdenv.cc.libc}/include:{B}/include" - "--libpaths=${lib.getLib stdenv.cc.libc}/lib" + # The first libpath will be the one in which tcc will look for libtcc1.a, + # which is need for its tests. + "--libpaths=$lib/lib/tcc:$lib/lib:${lib.getLib stdenv.cc.libc}/lib" # build cross compilers "--enable-cross" ] @@ -75,6 +75,21 @@ stdenv.mkDerivation (finalAttrs: { "--config-musl" ]; + enableParallelBuilding = true; + + env.NIX_CFLAGS_COMPILE = toString [ + "-Wno-error=implicit-int" + "-Wno-error=int-conversion" + ]; + + # Test segfault for static build + doInstallCheck = + !stdenv.hostPlatform.isStatic && stdenv.buildPlatform.canExecute stdenv.hostPlatform; + + postPatch = '' + patchShebangs texi2pod.pl + ''; + preConfigure = let # To avoid "malformed 32-bit x.y.z" error on mac when using clang @@ -90,19 +105,14 @@ stdenv.mkDerivation (finalAttrs: { configureFlagsArray+=("--elfinterp=$(< $NIX_CC/nix-support/dynamic-linker)") ''; - env.NIX_CFLAGS_COMPILE = toString [ - "-Wno-error=implicit-int" - "-Wno-error=int-conversion" - ]; + installCheckTarget = "test"; - # Test segfault for static build - doCheck = !stdenv.hostPlatform.isStatic; - - checkTarget = "test"; # https://www.mail-archive.com/tinycc-devel@nongnu.org/msg10142.html - preCheck = lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) '' - rm tests/tests2/{108,114}* - ''; + preInstallCheck = + lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) + '' + rm tests/tests2/{108,114}* + ''; meta = { homepage = "https://repo.or.cz/tinycc.git"; @@ -132,12 +142,11 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "tcc"; maintainers = with lib.maintainers; [ joachifm - AndersonTorres + onemoresuza ]; platforms = lib.platforms.unix; # https://www.mail-archive.com/tinycc-devel@nongnu.org/msg10199.html broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64; }; }) -# TODO: more multiple outputs # TODO: self-compilation diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix index 204b96fb0712..f86785ac2887 100644 --- a/pkgs/development/interpreters/octave/default.nix +++ b/pkgs/development/interpreters/octave/default.nix @@ -106,11 +106,14 @@ stdenv.mkDerivation (finalAttrs: { sha256 = "sha256-gJ+jmnrMhIFb9NxNLX5rIoznWgfzskE/MxOqjgqqMoc="; }; + postPatch = '' + patchShebangs --build build-aux/*.pl + ''; + buildInputs = [ readline ncurses - perl flex qhull graphicsmagick @@ -157,6 +160,7 @@ stdenv.mkDerivation (finalAttrs: { ]; nativeBuildInputs = [ + perl pkg-config gfortran texinfo diff --git a/pkgs/development/libraries/qwlroots/default.nix b/pkgs/development/libraries/qwlroots/default.nix index 3eb27e2dda49..2c8ce27e9595 100644 --- a/pkgs/development/libraries/qwlroots/default.nix +++ b/pkgs/development/libraries/qwlroots/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "qwlroots"; - version = "0.3.0-wlroots0.17-0.18"; + version = "0.5.2"; src = fetchFromGitHub { owner = "vioken"; repo = "qwlroots"; rev = finalAttrs.version; - hash = "sha256-ObXegiJ4LT8bTUxNVJ9wBKN5oILWPDYTsuCy+OCsh3k="; + hash = "sha256-RVIxyAC346gXy05hyT/AtConzO1ZE8lbiCg2Diin6bA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/waylib/default.nix b/pkgs/development/libraries/waylib/default.nix index bc8d9025dbfd..157d021e10c6 100644 --- a/pkgs/development/libraries/waylib/default.nix +++ b/pkgs/development/libraries/waylib/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "waylib"; - version = "0.3.0-alpha"; + version = "0.6.10-alpha"; src = fetchFromGitHub { owner = "vioken"; repo = "waylib"; rev = finalAttrs.version; - hash = "sha256-5IWe8VFpLwDSja4to/ugVS80s5+bcAbM6/fg1HPP52Q="; + hash = "sha256-cs4nPYMIOppVuna5qBbgGtPdmVhMrhKkVG7L09NmB/U="; }; depsBuildBuild = [ diff --git a/pkgs/development/python-modules/django-dynamic-preferences/default.nix b/pkgs/development/python-modules/django-dynamic-preferences/default.nix index 1efb444ef24b..d0bd44d36a4b 100644 --- a/pkgs/development/python-modules/django-dynamic-preferences/default.nix +++ b/pkgs/development/python-modules/django-dynamic-preferences/default.nix @@ -1,38 +1,39 @@ { lib, buildPythonPackage, - fetchFromGitHub, - pythonOlder, - - # dependencies + distutils, django, - persisting-theory, - six, - - # tests djangorestframework, + fetchFromGitHub, + persisting-theory, pytest-django, pytestCheckHook, + pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "django-dynamic-preferences"; - version = "1.15.0"; - format = "setuptools"; + version = "1.17.0"; + pyproject = true; + + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "agateblue"; repo = "django-dynamic-preferences"; tag = version; - hash = "sha256-S0PAlSrMOQ68mX548pZzARfau/lytXWC4S5uVO1rUmo="; + hash = "sha256-irnwoWqQQxPueglI86ZIOt8wZcEHneY3eyATBXOuk9Y="; }; + build-system = [ + setuptools + distutils + ]; + buildInputs = [ django ]; - propagatedBuildInputs = [ - six - persisting-theory - ]; + dependencies = [ persisting-theory ]; nativeCheckInputs = [ djangorestframework @@ -42,15 +43,12 @@ buildPythonPackage rec { pythonImportsCheck = [ "dynamic_preferences" ]; - # Remove once https://github.com/agateblue/django-dynamic-preferences/issues/309 is fixed - doCheck = pythonOlder "3.12"; - env.DJANGO_SETTINGS = "tests.settings"; meta = with lib; { - changelog = "https://github.com/agateblue/django-dynamic-preferences/blob/${version}/HISTORY.rst"; - homepage = "https://github.com/EliotBerriot/django-dynamic-preferences"; description = "Dynamic global and instance settings for your django project"; + changelog = "https://github.com/agateblue/django-dynamic-preferences/blob/${version}/HISTORY.rst"; + homepage = "https://github.com/agateblue/django-dynamic-preferences"; license = licenses.bsd3; maintainers = with maintainers; [ mmai ]; }; diff --git a/pkgs/development/python-modules/fastmri/default.nix b/pkgs/development/python-modules/fastmri/default.nix new file mode 100644 index 000000000000..abd6a219cc03 --- /dev/null +++ b/pkgs/development/python-modules/fastmri/default.nix @@ -0,0 +1,86 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pythonOlder, + + # build system + setuptools, + setuptools-scm, + + # dependencies + numpy, + scikit-image, + torchvision, + torch, + runstats, + pytorch-lightning, + h5py, + pyyaml, + torchmetrics, + pandas, + + # tests + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "fastmri"; + version = "0.3.0"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "facebookresearch"; + repo = "fastMRI"; + tag = "v${version}"; + hash = "sha256-0IJV8OhY5kPWQwUYPKfmdI67TyYzDAPlwohdc0jWcV4="; + }; + + # banding_removal folder also has a subfolder named "fastmri" + # and np.product is substituted with np.prod in new numpy versions + postPatch = '' + substituteInPlace tests/test_math.py \ + --replace-fail "np.product" "np.prod" + substituteInPlace tests/conftest.py \ + --replace-fail "np.product" "np.prod" + + rm -rf banding_removal + ''; + + build-system = [ + setuptools + setuptools-scm + ]; + + dependencies = [ + numpy + scikit-image + torchvision + torch + runstats + pytorch-lightning + h5py + pyyaml + torchmetrics + pandas + ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + disabledTestPaths = [ + # much older version of pytorch-lightning is used + "tests/test_modules.py" + ]; + + pythonImportsCheck = [ "fastmri" ]; + + meta = { + description = "Pytorch-based MRI reconstruction tooling"; + homepage = "https://github.com/facebookresearch/fastMRI"; + changelog = "https://github.com/facebookresearch/fastMRI/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ osbm ]; + }; +} diff --git a/pkgs/development/python-modules/inkex/default.nix b/pkgs/development/python-modules/inkex/default.nix index ae013099ba75..542cb22f335a 100644 --- a/pkgs/development/python-modules/inkex/default.nix +++ b/pkgs/development/python-modules/inkex/default.nix @@ -23,8 +23,7 @@ buildPythonPackage { pname = "inkex"; inherit (inkscape) version; - - format = "pyproject"; + pyproject = true; inherit (inkscape) src; @@ -38,16 +37,19 @@ buildPythonPackage { }) ]; - nativeBuildInputs = [ poetry-core ]; + build-system = [ poetry-core ]; pythonRelaxDeps = [ "numpy" ]; - propagatedBuildInputs = [ + dependencies = [ cssselect lxml numpy + pillow pygobject3 + pyparsing pyserial + scour tinycss2 ]; @@ -60,10 +62,6 @@ buildPythonPackage { checkInputs = [ gtk3 - packaging - pillow - pyparsing - scour ]; disabledTests = diff --git a/pkgs/development/python-modules/llm-cmd/default.nix b/pkgs/development/python-modules/llm-cmd/default.nix index e4f9335dd1d2..e9a71c8cfed7 100644 --- a/pkgs/development/python-modules/llm-cmd/default.nix +++ b/pkgs/development/python-modules/llm-cmd/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportCheck = [ + pythonImportsCheck = [ "llm_cmd" ]; diff --git a/pkgs/development/python-modules/llm-ollama/default.nix b/pkgs/development/python-modules/llm-ollama/default.nix index 23760ce6f9d9..fc6ffa59fdbf 100644 --- a/pkgs/development/python-modules/llm-ollama/default.nix +++ b/pkgs/development/python-modules/llm-ollama/default.nix @@ -52,7 +52,7 @@ buildPythonPackage rec { "test_registered_models_when_ollama_is_down" ]; - pythonImportCheck = [ + pythonImportsCheck = [ "llm_ollama" ]; diff --git a/pkgs/development/python-modules/lrclibapi/default.nix b/pkgs/development/python-modules/lrclibapi/default.nix new file mode 100644 index 000000000000..f9866514548a --- /dev/null +++ b/pkgs/development/python-modules/lrclibapi/default.nix @@ -0,0 +1,46 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + poetry-core, + requests, + vcrpy, + pytestCheckHook, +}: +buildPythonPackage rec { + pname = "lrclibapi"; + version = "0.3.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "Dr-Blank"; + repo = "lrclibapi"; + tag = "v${version}"; + hash = "sha256-K5wO3BexftnWe48loaW8TjySQvh2X+X3GSmG5qg+BGc="; + }; + + build-system = [ + poetry-core + ]; + + dependencies = [ + requests + ]; + + pythonImportsCheck = [ + "lrclib" + ]; + + nativeCheckInputs = [ + pytestCheckHook + vcrpy + ]; + + meta = { + homepage = "https://github.com/Dr-Blank/lrclibapi"; + changelog = "https://github.com/Dr-Blank/lrclibapi/releases/tag/v${version}"; + description = "Python wrapper for downloading synced lyrics from the lrclib.net api"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ DataHearth ]; + }; +} diff --git a/pkgs/development/python-modules/moderngl-window/default.nix b/pkgs/development/python-modules/moderngl-window/default.nix index f87fed067d73..5ab5711dc8e3 100644 --- a/pkgs/development/python-modules/moderngl-window/default.nix +++ b/pkgs/development/python-modules/moderngl-window/default.nix @@ -29,14 +29,14 @@ buildPythonPackage rec { pname = "moderngl-window"; - version = "3.1.0"; + version = "3.1.1"; pyproject = true; src = fetchFromGitHub { owner = "moderngl"; repo = "moderngl_window"; tag = version; - hash = "sha256-oXUdYTvpvaML1YsqK7HudQV/RvUx6N0K/xYuiNp8uos="; + hash = "sha256-pElSwzNbZlZT8imK1UsLy2TyvS8TEM7hsVqLxEK1tbg="; }; build-system = [ diff --git a/pkgs/development/python-modules/mpl-typst/default.nix b/pkgs/development/python-modules/mpl-typst/default.nix new file mode 100644 index 000000000000..040807fde8cd --- /dev/null +++ b/pkgs/development/python-modules/mpl-typst/default.nix @@ -0,0 +1,53 @@ +{ + lib, + fetchFromGitHub, + buildPythonPackage, + setuptools, + matplotlib, + numpy, + pytestCheckHook, + pillow, + nix-update-script, +}: + +buildPythonPackage rec { + pname = "mpl-typst"; + version = "0.1.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "daskol"; + repo = "mpl-typst"; + tag = "v${version}"; + hash = "sha256-Pm5z4tkpgwjYtpBh9+AJWlsHl7HNGxyftfaNSwQDpdk="; + }; + + build-system = [ + setuptools + ]; + + dependencies = [ + matplotlib + ]; + + nativeCheckInputs = [ + pytestCheckHook + pillow + numpy + ]; + + pythonImportsCheck = [ + "mpl_typst" + "mpl_typst.as_default" + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Typst backend for matplotlib"; + homepage = "https://github.com/daskol/mpl-typst"; + changelog = "https://github.com/daskol/mpl-typst/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ genga898 ]; + }; +} diff --git a/pkgs/development/python-modules/python-benedict/default.nix b/pkgs/development/python-modules/python-benedict/default.nix index 8955938a3bc5..0d596f09f9a2 100644 --- a/pkgs/development/python-modules/python-benedict/default.nix +++ b/pkgs/development/python-modules/python-benedict/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { pname = "python-benedict"; - version = "0.34.0"; + version = "0.34.1"; pyproject = true; disabled = pythonOlder "3.10"; @@ -34,7 +34,7 @@ buildPythonPackage rec { owner = "fabiocaccamo"; repo = "python-benedict"; tag = version; - hash = "sha256-HQ9VVgRfF5qA36yOyKT63gXuKNLLjouqYKz5EuqGA2E="; + hash = "sha256-ffmyTVeQKzV/sssxFuIckmBW6wmjnTWkHbVQ1v7fmGg="; }; pythonRelaxDeps = [ "boto3" ]; diff --git a/pkgs/development/python-modules/reflex-chakra/default.nix b/pkgs/development/python-modules/reflex-chakra/default.nix index 1ef521441ed6..c720d2bdc455 100644 --- a/pkgs/development/python-modules/reflex-chakra/default.nix +++ b/pkgs/development/python-modules/reflex-chakra/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "reflex-chakra"; - version = "0.6.2"; + version = "0.6.3"; pyproject = true; disabled = pythonOlder "3.9"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "reflex-dev"; repo = "reflex-chakra"; tag = "v${version}"; - hash = "sha256-VMFCaJh7HA/bsOV1ONuPJCzhzpQrcppOnPIcIIpeaSs="; + hash = "sha256-Smkpcy6jPYTUWskZwWKkL9V545Ji/riQ8RFjJXm44qM="; }; pythonRemoveDeps = [ diff --git a/pkgs/development/python-modules/setupmeta/default.nix b/pkgs/development/python-modules/setupmeta/default.nix index 8857565f461b..8b65a9f1eb4c 100644 --- a/pkgs/development/python-modules/setupmeta/default.nix +++ b/pkgs/development/python-modules/setupmeta/default.nix @@ -8,33 +8,29 @@ pip, pytestCheckHook, pythonOlder, - setuptools-scm, + setuptools, six, - wheel, }: buildPythonPackage rec { pname = "setupmeta"; - version = "3.6.0"; - format = "setuptools"; + version = "3.6.1"; + pyproject = true; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "codrsquad"; - repo = pname; + repo = "setupmeta"; tag = "v${version}"; - hash = "sha256-OI7PU5LQ6w0iAbK7nsP+6RizsEWjKP9nec2J6n0xUhI="; + hash = "sha256-L8RDfcAa2Zhr6huFt0AmNt0Qzea2xNtCX1BIULsiQgA="; }; preBuild = '' export PYGRADLE_PROJECT_VERSION=${version}; ''; - nativeBuildInputs = [ - setuptools-scm - wheel - ]; + build-system = [ setuptools ]; nativeCheckInputs = [ git diff --git a/pkgs/development/python-modules/setuptools-git-versioning/default.nix b/pkgs/development/python-modules/setuptools-git-versioning/default.nix index 2173f63bdcfe..fb69ff6313f8 100644 --- a/pkgs/development/python-modules/setuptools-git-versioning/default.nix +++ b/pkgs/development/python-modules/setuptools-git-versioning/default.nix @@ -11,30 +11,29 @@ pythonOlder, setuptools, toml, - wheel, + tomli, }: buildPythonPackage rec { pname = "setuptools-git-versioning"; - version = "2.0.0"; + version = "2.1.0"; format = "pyproject"; src = fetchFromGitHub { owner = "dolfinus"; repo = "setuptools-git-versioning"; tag = "v${version}"; - hash = "sha256-xugK/JOVA53nCK8bB0gPkhIREmy0+/OthsydfYRCYno="; + hash = "sha256-Slf6tq83LajdTnr98SuCiFIdm/6auzftnARLAOBgyng="; }; - nativeBuildInputs = [ + build-system = [ setuptools - wheel ]; - propagatedBuildInputs = [ + dependencies = [ packaging setuptools - ] ++ lib.optionals (pythonOlder "3.11") [ toml ]; + ] ++ lib.optionals (pythonOlder "3.11") [ tomli ]; pythonImportsCheck = [ "setuptools_git_versioning" ]; diff --git a/pkgs/development/python-modules/sqlalchemy-continuum/default.nix b/pkgs/development/python-modules/sqlalchemy-continuum/default.nix index 77452fbccde6..501486e5059b 100644 --- a/pkgs/development/python-modules/sqlalchemy-continuum/default.nix +++ b/pkgs/development/python-modules/sqlalchemy-continuum/default.nix @@ -42,11 +42,20 @@ buildPythonPackage rec { i18n = [ sqlalchemy-i18n ]; }; - nativeCheckInputs = [ - psycopg2 - pymysql - pytestCheckHook - ] ++ lib.flatten (lib.attrValues optional-dependencies); + nativeCheckInputs = + [ + psycopg2 + pymysql + pytestCheckHook + ] + ++ optional-dependencies.flask + ++ optional-dependencies.flask-login + ++ optional-dependencies.flask-sqlalchemy; + + disabledTestPaths = [ + # requires sqlalchemy-i18n, which is incompatible with sqlalchemy>=2 + "tests/test_i18n.py" + ]; preCheck = '' # Indicate tests that we don't have a database server at hand diff --git a/pkgs/development/python-modules/sqlalchemy-i18n/default.nix b/pkgs/development/python-modules/sqlalchemy-i18n/default.nix index b3540712d926..172e1f352658 100644 --- a/pkgs/development/python-modules/sqlalchemy-i18n/default.nix +++ b/pkgs/development/python-modules/sqlalchemy-i18n/default.nix @@ -2,33 +2,54 @@ lib, fetchPypi, buildPythonPackage, + setuptools, sqlalchemy, sqlalchemy-utils, six, + postgresql, + postgresqlTestHook, + psycopg2, + pytestCheckHook, }: buildPythonPackage rec { pname = "sqlalchemy-i18n"; version = "1.1.0"; + pyproject = true; src = fetchPypi { pname = "SQLAlchemy-i18n"; inherit version; - sha256 = "de33376483a581ca14218d8f57a114466c5f72b674a95839b6c4564a6e67796f"; + hash = "sha256-3jM3ZIOlgcoUIY2PV6EURmxfcrZ0qVg5tsRWSm5neW8="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ sqlalchemy sqlalchemy-utils six ]; - # tests require running a postgresql server - doCheck = false; + pythonImportsCheck = [ "sqlalchemy_i18n" ]; - meta = with lib; { + nativeCheckInputs = [ + postgresql + postgresqlTestHook + psycopg2 + pytestCheckHook + ]; + + env = { + PGDATABASE = "sqlalchemy_i18n_test"; + postgresqlEnableTCP = 1; + }; + + meta = { homepage = "https://github.com/kvesteri/sqlalchemy-i18n"; description = "Internationalization extension for SQLAlchemy models"; - license = licenses.bsd3; + license = lib.licenses.bsd3; + # sqlalchemy.exc.InvalidRequestError: The 'sqlalchemy.orm.mapper()' function is removed as of SQLAlchemy 2.0. + broken = lib.versionAtLeast sqlalchemy.version "2"; }; } diff --git a/pkgs/development/python-modules/sqlcipher3/default.nix b/pkgs/development/python-modules/sqlcipher3/default.nix index cf91ac2872c4..5286d78f7cd3 100644 --- a/pkgs/development/python-modules/sqlcipher3/default.nix +++ b/pkgs/development/python-modules/sqlcipher3/default.nix @@ -28,7 +28,7 @@ buildPythonPackage { openssl ]; - pythonImportChecks = [ + pythonImportsCheck = [ "sqlcipher3" ]; diff --git a/pkgs/development/python-modules/wat/default.nix b/pkgs/development/python-modules/wat/default.nix index 90e06dd619ce..74c772b54a19 100644 --- a/pkgs/development/python-modules/wat/default.nix +++ b/pkgs/development/python-modules/wat/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "wat"; - version = "0.4.4"; + version = "0.5.0"; pyproject = true; src = fetchFromGitHub { owner = "igrek51"; repo = "wat"; rev = version; - hash = "sha256-52ZqLOOWxm3BtF36i9PWnNiWKQi4xjXi8vVw8pXnaVU="; + hash = "sha256-oAvweCZxUd3Sd2swjYFL3hZ3szlpVjefYb5apkR9P5U="; }; build-system = [ setuptools ]; diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 2907a1b06258..8f7975b4746d 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -4,8 +4,8 @@ "hash": "sha256:12c9bd0ikppkdpqmvg7g2062s60ks9p0qxx1jis29wl9swr74120" }, "6.1": { - "version": "6.1.125", - "hash": "sha256:0g0b23dm8kzijh9j1g4rv7b3r2lzz53g26xmz4zgchkybxfkbwnr" + "version": "6.1.126", + "hash": "sha256:140pprw2fkyz9qi5wnhi0yzpj65lzwi3zbmnvsk2yhgc9arj06f9" }, "5.15": { "version": "5.15.176", diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index d12ba27586ca..624212f6efed 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -3,7 +3,6 @@ stdenvNoCC, fetchurl, nixosTests, - nextcloud28Packages, nextcloud29Packages, nextcloud30Packages, }: @@ -58,12 +57,6 @@ let }; in { - nextcloud28 = generic { - version = "28.0.14"; - hash = "sha256-SpN/GIJIZCbJcD5Z7EspP2Ib6NCAt/hQFvYpkDw68zY="; - packages = nextcloud28Packages; - }; - nextcloud29 = generic { version = "29.0.11"; hash = "sha256-UGf8F91zICzC39m5ccp7uUy5UEghRgJ9rGILEjweztE="; diff --git a/pkgs/servers/nextcloud/packages/29.json b/pkgs/servers/nextcloud/packages/29.json index 873ad1b3e11b..9cdc0c51e71a 100644 --- a/pkgs/servers/nextcloud/packages/29.json +++ b/pkgs/servers/nextcloud/packages/29.json @@ -20,9 +20,9 @@ ] }, "contacts": { - "hash": "sha256-gOOb++cylFsD7dSe5ZOBgTxLgO6Aa3om4q3Y79ElcfI=", - "url": "https://github.com/nextcloud-releases/contacts/releases/download/v6.0.1/contacts-v6.0.1.tar.gz", - "version": "6.0.1", + "hash": "sha256-hqCDr7qEqsi8tZ9Woz9hsUm1HENK16FNz4pcQCto8S4=", + "url": "https://github.com/nextcloud-releases/contacts/releases/download/v6.0.2/contacts-v6.0.2.tar.gz", + "version": "6.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": [ @@ -53,7 +53,7 @@ "hash": "sha256-yhUkB1IodvWOg2fl+gJW3x68YrG0+eyIrrlpXTFVAwE=", "url": "https://github.com/nextcloud-releases/deck/releases/download/v1.13.3/deck-v1.13.3.tar.gz", "version": "1.13.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", + "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" @@ -70,9 +70,9 @@ ] }, "files_mindmap": { - "hash": "sha256-USwTVkcEDzmaJMMaztf86yag5t7b79sQW8OOHEw0hec=", - "url": "https://github.com/ACTom/files_mindmap/releases/download/v0.0.31/files_mindmap-0.0.31.tar.gz", - "version": "0.0.31", + "hash": "sha256-vrOF0kdxpNW7ulD1SkOdz44e2uYXdZuDec/4sC5N4JA=", + "url": "https://github.com/ACTom/files_mindmap/releases/download/v0.0.32/files_mindmap-0.0.32.tar.gz", + "version": "0.0.32", "description": "This application enables Nextcloud users to open, save and edit mind map files in the web browser. If enabled, an entry in the New button at the top of the web browser the Mindmap file entry appears. When clicked, a new mindmap file opens in the browser and the file can be saved into the current Nextcloud directory.", "homepage": "https://github.com/ACTom/files_mindmap", "licenses": [ @@ -80,9 +80,9 @@ ] }, "forms": { - "hash": "sha256-NW57bhZiNqKfUhMvGN9Ncy21Y0GucC/CFCmHTf8kJ2I=", - "url": "https://github.com/nextcloud-releases/forms/releases/download/v4.3.4/forms-v4.3.4.tar.gz", - "version": "4.3.4", + "hash": "sha256-J2xGGZ4fEUwpWeEi3swdr9bwl4iBgltHGxo9Bi+Tdus=", + "url": "https://github.com/nextcloud-releases/forms/releases/download/v4.3.5/forms-v4.3.5.tar.gz", + "version": "4.3.5", "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": [ @@ -130,9 +130,9 @@ ] }, "integration_paperless": { - "hash": "sha256-D8w2TA2Olab326REnHHG+fFWRmWrhejAEokXZYx5H6w=", - "url": "https://github.com/nextcloud-releases/integration_paperless/releases/download/v1.0.4/integration_paperless-v1.0.4.tar.gz", - "version": "1.0.4", + "hash": "sha256-UkpcmCK/LDWg0glKxlk2u4AiZIMJ6Nr/VvI3QBwpwFw=", + "url": "https://github.com/nextcloud-releases/integration_paperless/releases/download/v1.0.5/integration_paperless-v1.0.5.tar.gz", + "version": "1.0.5", "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": [ @@ -140,9 +140,9 @@ ] }, "mail": { - "hash": "sha256-59ra95yAOnHG+a6sSK6dJmmZ7qqUqtanfrw1jjpTjQ0=", - "url": "https://github.com/nextcloud-releases/mail/releases/download/v3.7.17/mail-v3.7.17.tar.gz", - "version": "3.7.17", + "hash": "sha256-1Q4kIN1aX2S1mAPivuqTi6cPyUE0mrogQD5XCAwclOA=", + "url": "https://github.com/nextcloud-releases/mail/releases/download/v3.7.18/mail-v3.7.18.tar.gz", + "version": "3.7.18", "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://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": [ @@ -170,19 +170,19 @@ ] }, "music": { - "hash": "sha256-yexffDYu0dv/i/V0Z+U1jD1+6X/JZuWZ4/mqWny5Nxs=", - "url": "https://github.com/owncloud/music/releases/download/v2.0.1/music_2.0.1_for_nextcloud.tar.gz", - "version": "2.0.1", - "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, and pls files\n- Browse by artists, albums, genres, or folders\n- Gapless play\n- Filter the shown content with the search function\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 various external apps e.g. on Android or iPhone", + "hash": "sha256-Fmb22HEVcfOBjpVgbuDvYIQKYII+L5xBHI/+BvNsUOw=", + "url": "https://github.com/owncloud/music/releases/download/v2.1.1/music_2.1.1_for_nextcloud.tar.gz", + "version": "2.1.1", + "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, and pls files\n- Browse by artists, albums, genres, or folders\n- Gapless play\n- Filter the shown content with the search function\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 various external apps e.g. on Android or iPhone\n- Widget for the Nextcloud Dashboard", "homepage": "https://github.com/owncloud/music", "licenses": [ "agpl" ] }, "news": { - "hash": "sha256-LnOu1zhD9sWlM81iQSdlClLRVyZFF3DLH6zrx1NYsr8=", - "url": "https://github.com/nextcloud/news/releases/download/25.1.2/news.tar.gz", - "version": "25.1.2", + "hash": "sha256-jJmF98mNAapZPEASoH5b/hFLFhcxW5a/1q86FFMawyI=", + "url": "https://github.com/nextcloud/news/releases/download/25.2.0/news.tar.gz", + "version": "25.2.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": [ @@ -200,9 +200,9 @@ ] }, "notify_push": { - "hash": "sha256-5VjDDU8YpSDHSV45GKP+YDSd9bq1F3/qLppaLiBzjy4=", - "url": "https://github.com/nextcloud-releases/notify_push/releases/download/v0.7.0/notify_push-v0.7.0.tar.gz", - "version": "0.7.0", + "hash": "sha256-4yCs4Q25PhYVICAIFlNiRTOFvL0JdmUwR5bNxp54GiA=", + "url": "https://github.com/nextcloud-releases/notify_push/releases/download/v1.0.0/notify_push-v1.0.0.tar.gz", + "version": "1.0.0", "description": "Push update support for desktop app.\n\nOnce the app is installed, the push binary needs to be setup. You can either use the setup wizard with `occ notify_push:setup` or see the [README](http://github.com/nextcloud/notify_push) for detailed setup instructions", "homepage": "", "licenses": [ @@ -220,9 +220,9 @@ ] }, "phonetrack": { - "hash": "sha256-zQt+3t86HZJVT/wiETHkPdTwV6Qy+iNkH3/THtTe1Xs=", - "url": "https://github.com/julien-nc/phonetrack/releases/download/v0.8.1/phonetrack-0.8.1.tar.gz", - "version": "0.8.1", + "hash": "sha256-fEJSGG4P+OC5f8PTATHurdUb0vnMaqMh6wwcVB+VcsA=", + "url": "https://github.com/julien-nc/phonetrack/releases/download/v0.8.2/phonetrack-0.8.2.tar.gz", + "version": "0.8.2", "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": [ @@ -230,9 +230,9 @@ ] }, "polls": { - "hash": "sha256-l0oK9go7NVkTJCyC1sagWwZpa/R5ZQsXTOishNSpYuw=", - "url": "https://github.com/nextcloud-releases/polls/releases/download/v7.2.6/polls-v7.2.6.tar.gz", - "version": "7.2.6", + "hash": "sha256-AMsa0JNQXO/0g9m+Qr2tJbYrKmcQ1xxcgZzkk4x29IU=", + "url": "https://github.com/nextcloud-releases/polls/releases/download/v7.2.9/polls-v7.2.9.tar.gz", + "version": "7.2.9", "description": "A polls app, similar to Doodle/Dudle with the possibility to restrict access (members, certain groups/users, hidden and public).", "homepage": "https://github.com/nextcloud/polls", "licenses": [ @@ -280,9 +280,9 @@ ] }, "spreed": { - "hash": "sha256-sCt3wVj0jbQyQtTK483AupJtb7a6+FWznpjLoz9mEaM=", - "url": "https://github.com/nextcloud-releases/spreed/releases/download/v19.0.11/spreed-v19.0.11.tar.gz", - "version": "19.0.11", + "hash": "sha256-8C2TopybeFczpaNQF3IWeVh3uPXmNjQ1mdcWTyYOsZw=", + "url": "https://github.com/nextcloud-releases/spreed/releases/download/v19.0.12/spreed-v19.0.12.tar.gz", + "version": "19.0.12", "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": [ diff --git a/pkgs/servers/nextcloud/packages/30.json b/pkgs/servers/nextcloud/packages/30.json index 054823aa021c..c0fba00dc0d3 100644 --- a/pkgs/servers/nextcloud/packages/30.json +++ b/pkgs/servers/nextcloud/packages/30.json @@ -1,8 +1,8 @@ { "bookmarks": { - "hash": "sha256-T/B+L2dhCyUCMYEyUQDMOCeMOBASIW7/A7RPtCol5Kc=", - "url": "https://github.com/nextcloud/bookmarks/releases/download/v15.0.4/bookmarks-15.0.4.tar.gz", - "version": "15.0.4", + "hash": "sha256-KsRj0AjSQ1Z7ej+BPWLqP2LMGg7NnL7o8/mI4mTNJRs=", + "url": "https://github.com/nextcloud/bookmarks/releases/download/v15.0.5/bookmarks-15.0.5.tar.gz", + "version": "15.0.5", "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 and 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": [ @@ -10,9 +10,9 @@ ] }, "calendar": { - "hash": "sha256-P536HKK0dX6LYX4GXu8hgOrbGnsJ8bY3Ou7aR2Hh51k=", - "url": "https://github.com/nextcloud-releases/calendar/releases/download/v5.0.8/calendar-v5.0.8.tar.gz", - "version": "5.0.8", + "hash": "sha256-nroc7URZtN5LhGg4wYgr3wD0k8k3vYj9k/V4H0JF2C0=", + "url": "https://github.com/nextcloud-releases/calendar/releases/download/v5.0.9/calendar-v5.0.9.tar.gz", + "version": "5.0.9", "description": "The Calendar app is a user interface for Nextcloud's CalDAV server. Easily sync events from various devices with your Nextcloud and edit them online.\n\n* πŸš€ **Integration with other Nextcloud apps!** Currently Contacts - more to come.\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 with a due date directly in the calendar\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": [ @@ -20,9 +20,9 @@ ] }, "contacts": { - "hash": "sha256-Slk10WZfUQGsYnruBR5APSiuBd3jh3WG1GIqKhTUdfU=", - "url": "https://github.com/nextcloud-releases/contacts/releases/download/v6.1.2/contacts-v6.1.2.tar.gz", - "version": "6.1.2", + "hash": "sha256-5h94RmmJcM7P0Wjx/hHDbUA55x3H/klOjkmH3qxMbpQ=", + "url": "https://github.com/nextcloud-releases/contacts/releases/download/v6.1.3/contacts-v6.1.3.tar.gz", + "version": "6.1.3", "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": [ @@ -40,9 +40,9 @@ ] }, "cospend": { - "hash": "sha256-3Jbti6plql9O9kknhZOlpqDtwPI0SYlnXP1qr0ZNpDA=", - "url": "https://github.com/julien-nc/cospend-nc/releases/download/v3.0.7/cospend-3.0.7.tar.gz", - "version": "3.0.7", + "hash": "sha256-2RDkUNZVEACgen4tnJW4vljnWiq1gK5BHd1Vqpd4IIs=", + "url": "https://github.com/julien-nc/cospend-nc/releases/download/v3.0.8/cospend-3.0.8.tar.gz", + "version": "3.0.8", "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": [ @@ -50,10 +50,10 @@ ] }, "deck": { - "hash": "sha256-BiUu//ouJiQt/BhrDBH16yGHoH4Kzb260A7ALIqSyEk=", - "url": "https://github.com/nextcloud-releases/deck/releases/download/v1.14.2/deck-v1.14.2.tar.gz", - "version": "1.14.2", - "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", + "hash": "sha256-5R392ezG5mGn4wQSdlHxca73tsAdQGr3+mSv19j6AlU=", + "url": "https://github.com/nextcloud-releases/deck/releases/download/v1.14.3/deck-v1.14.3.tar.gz", + "version": "1.14.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": [ "agpl" @@ -70,9 +70,9 @@ ] }, "files_mindmap": { - "hash": "sha256-USwTVkcEDzmaJMMaztf86yag5t7b79sQW8OOHEw0hec=", - "url": "https://github.com/ACTom/files_mindmap/releases/download/v0.0.31/files_mindmap-0.0.31.tar.gz", - "version": "0.0.31", + "hash": "sha256-vrOF0kdxpNW7ulD1SkOdz44e2uYXdZuDec/4sC5N4JA=", + "url": "https://github.com/ACTom/files_mindmap/releases/download/v0.0.32/files_mindmap-0.0.32.tar.gz", + "version": "0.0.32", "description": "This application enables Nextcloud users to open, save and edit mind map files in the web browser. If enabled, an entry in the New button at the top of the web browser the Mindmap file entry appears. When clicked, a new mindmap file opens in the browser and the file can be saved into the current Nextcloud directory.", "homepage": "https://github.com/ACTom/files_mindmap", "licenses": [ @@ -80,9 +80,9 @@ ] }, "forms": { - "hash": "sha256-NW57bhZiNqKfUhMvGN9Ncy21Y0GucC/CFCmHTf8kJ2I=", - "url": "https://github.com/nextcloud-releases/forms/releases/download/v4.3.4/forms-v4.3.4.tar.gz", - "version": "4.3.4", + "hash": "sha256-J2xGGZ4fEUwpWeEi3swdr9bwl4iBgltHGxo9Bi+Tdus=", + "url": "https://github.com/nextcloud-releases/forms/releases/download/v4.3.5/forms-v4.3.5.tar.gz", + "version": "4.3.5", "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": [ @@ -110,9 +110,9 @@ ] }, "impersonate": { - "hash": "sha256-lPzWFv00dIKe7S5L4t0edvzMWsV4cqVArdCb3TLgeeM=", - "url": "https://github.com/nextcloud-releases/impersonate/releases/download/v1.17.0/impersonate-v1.17.0.tar.gz", - "version": "1.17.0", + "hash": "sha256-LGA3m4vubYK9QPdv9E0eQ3R0hTLjuTgNcSAq4sZVUNU=", + "url": "https://github.com/nextcloud-releases/impersonate/releases/download/v1.17.1/impersonate-v1.17.1.tar.gz", + "version": "1.17.1", "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": [ @@ -120,9 +120,9 @@ ] }, "integration_openai": { - "hash": "sha256-jAAsX9NA09rM5kWBrlfZXIdkF5Go2CIYAtxzKvYd4nM=", - "url": "https://github.com/nextcloud-releases/integration_openai/releases/download/v3.2.0/integration_openai-v3.2.0.tar.gz", - "version": "3.2.0", + "hash": "sha256-Dc7E5c9/rX4xgk7+spbwNWed57TDaO5oVPW6WDTXz/k=", + "url": "https://github.com/nextcloud-releases/integration_openai/releases/download/v3.3.0/integration_openai-v3.3.0.tar.gz", + "version": "3.3.0", "description": "⚠️ The smart pickers have been removed from this app\nas they are now included in the [Assistant app](https://apps.nextcloud.com/apps/assistant).\n\nThis app implements:\n\n* Text generation providers: Free prompt, Summarize, Headline, Context Write, Chat, and Reformulate (using any available large language model)\n* A Translation provider (using any available language model)\n* A SpeechToText provider (using Whisper)\n* An image generation provider\n\n⚠️ Context Write, Summarize, Headline and Reformulate have mainly been tested with OpenAI.\nThey might work when connecting to other services, without any guarantee.\n\nInstead of connecting to the OpenAI API for these, you can also connect to a self-hosted [LocalAI](https://localai.io) instance or [Ollama](https://ollama.com/) instance\nor to any service that implements an API similar to the OpenAI one, for example: [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 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": [ @@ -130,9 +130,9 @@ ] }, "integration_paperless": { - "hash": "sha256-D8w2TA2Olab326REnHHG+fFWRmWrhejAEokXZYx5H6w=", - "url": "https://github.com/nextcloud-releases/integration_paperless/releases/download/v1.0.4/integration_paperless-v1.0.4.tar.gz", - "version": "1.0.4", + "hash": "sha256-UkpcmCK/LDWg0glKxlk2u4AiZIMJ6Nr/VvI3QBwpwFw=", + "url": "https://github.com/nextcloud-releases/integration_paperless/releases/download/v1.0.5/integration_paperless-v1.0.5.tar.gz", + "version": "1.0.5", "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": [ @@ -150,9 +150,9 @@ ] }, "maps": { - "hash": "sha256-CsffBLHjgL/DeXo8ryGKFzvQ/RA4V7hfuFdllDfL0yg=", - "url": "https://github.com/nextcloud/maps/releases/download/v1.5.0/maps-1.5.0.tar.gz", - "version": "1.5.0", + "hash": "sha256-/uoM29jXqeOvOJBu3xhv+KgqPE7T03pV269fdr2Er+0=", + "url": "https://github.com/nextcloud/maps/releases/download/v1.6.0-2-nightly/maps-1.6.0-2-nightly.tar.gz", + "version": "1.6.0", "description": "**The whole world fits inside your cloud!**\n\n- **πŸ—Ί Beautiful map:** Using [OpenStreetMap](https://www.openstreetmap.org) and [Leaflet](https://leafletjs.com), you can choose between standard map, satellite, topographical, dark mode or even watercolor! 🎨\n- **⭐ Favorites:** Save your favorite places, privately! Sync with [GNOME Maps](https://github.com/nextcloud/maps/issues/30) and mobile apps is planned.\n- **🧭 Routing:** Possible using either [OSRM](http://project-osrm.org), [GraphHopper](https://www.graphhopper.com) or [Mapbox](https://www.mapbox.com).\n- **πŸ–Ό Photos on the map:** No more boring slideshows, just show directly where you were!\n- **πŸ™‹ Contacts on the map:** See where your friends live and plan your next visit.\n- **πŸ“± Devices:** Lost your phone? Check the map!\n- **γ€° Tracks:** Load GPS tracks or past trips. Recording with [PhoneTrack](https://f-droid.org/en/packages/net.eneiluj.nextcloud.phonetrack/) or [OwnTracks](https://owntracks.org) is planned.", "homepage": "https://github.com/nextcloud/maps", "licenses": [ @@ -170,19 +170,19 @@ ] }, "music": { - "hash": "sha256-yexffDYu0dv/i/V0Z+U1jD1+6X/JZuWZ4/mqWny5Nxs=", - "url": "https://github.com/owncloud/music/releases/download/v2.0.1/music_2.0.1_for_nextcloud.tar.gz", - "version": "2.0.1", - "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, and pls files\n- Browse by artists, albums, genres, or folders\n- Gapless play\n- Filter the shown content with the search function\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 various external apps e.g. on Android or iPhone", + "hash": "sha256-Fmb22HEVcfOBjpVgbuDvYIQKYII+L5xBHI/+BvNsUOw=", + "url": "https://github.com/owncloud/music/releases/download/v2.1.1/music_2.1.1_for_nextcloud.tar.gz", + "version": "2.1.1", + "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, and pls files\n- Browse by artists, albums, genres, or folders\n- Gapless play\n- Filter the shown content with the search function\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 various external apps e.g. on Android or iPhone\n- Widget for the Nextcloud Dashboard", "homepage": "https://github.com/owncloud/music", "licenses": [ "agpl" ] }, "news": { - "hash": "sha256-LnOu1zhD9sWlM81iQSdlClLRVyZFF3DLH6zrx1NYsr8=", - "url": "https://github.com/nextcloud/news/releases/download/25.1.2/news.tar.gz", - "version": "25.1.2", + "hash": "sha256-jJmF98mNAapZPEASoH5b/hFLFhcxW5a/1q86FFMawyI=", + "url": "https://github.com/nextcloud/news/releases/download/25.2.0/news.tar.gz", + "version": "25.2.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": [ @@ -200,9 +200,9 @@ ] }, "notify_push": { - "hash": "sha256-5VjDDU8YpSDHSV45GKP+YDSd9bq1F3/qLppaLiBzjy4=", - "url": "https://github.com/nextcloud-releases/notify_push/releases/download/v0.7.0/notify_push-v0.7.0.tar.gz", - "version": "0.7.0", + "hash": "sha256-4yCs4Q25PhYVICAIFlNiRTOFvL0JdmUwR5bNxp54GiA=", + "url": "https://github.com/nextcloud-releases/notify_push/releases/download/v1.0.0/notify_push-v1.0.0.tar.gz", + "version": "1.0.0", "description": "Push update support for desktop app.\n\nOnce the app is installed, the push binary needs to be setup. You can either use the setup wizard with `occ notify_push:setup` or see the [README](http://github.com/nextcloud/notify_push) for detailed setup instructions", "homepage": "", "licenses": [ @@ -220,9 +220,9 @@ ] }, "phonetrack": { - "hash": "sha256-zQt+3t86HZJVT/wiETHkPdTwV6Qy+iNkH3/THtTe1Xs=", - "url": "https://github.com/julien-nc/phonetrack/releases/download/v0.8.1/phonetrack-0.8.1.tar.gz", - "version": "0.8.1", + "hash": "sha256-fEJSGG4P+OC5f8PTATHurdUb0vnMaqMh6wwcVB+VcsA=", + "url": "https://github.com/julien-nc/phonetrack/releases/download/v0.8.2/phonetrack-0.8.2.tar.gz", + "version": "0.8.2", "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": [ @@ -230,9 +230,9 @@ ] }, "polls": { - "hash": "sha256-l0oK9go7NVkTJCyC1sagWwZpa/R5ZQsXTOishNSpYuw=", - "url": "https://github.com/nextcloud-releases/polls/releases/download/v7.2.6/polls-v7.2.6.tar.gz", - "version": "7.2.6", + "hash": "sha256-AMsa0JNQXO/0g9m+Qr2tJbYrKmcQ1xxcgZzkk4x29IU=", + "url": "https://github.com/nextcloud-releases/polls/releases/download/v7.2.9/polls-v7.2.9.tar.gz", + "version": "7.2.9", "description": "A polls app, similar to Doodle/Dudle with the possibility to restrict access (members, certain groups/users, hidden and public).", "homepage": "https://github.com/nextcloud/polls", "licenses": [ @@ -280,9 +280,9 @@ ] }, "spreed": { - "hash": "sha256-S5bl2wiuEiS4e1cnt5/R6zgFslDEnoEd9Bkl9H9ufE4=", - "url": "https://github.com/nextcloud-releases/spreed/releases/download/v20.1.1/spreed-v20.1.1.tar.gz", - "version": "20.1.1", + "hash": "sha256-j2r0dJ5QYrGHFbCfuuyOmXR7oEN78Nagn5Qb8kzmknA=", + "url": "https://github.com/nextcloud-releases/spreed/releases/download/v20.1.3/spreed-v20.1.3.tar.gz", + "version": "20.1.3", "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": [ diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 58c1d47c78a7..5abbfb440ca2 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -179,8 +179,8 @@ in lib.makeExtensible (self: ({ }; nix_2_25 = common { - version = "2.25.3"; - hash = "sha256-T+wFMm3cj8pGJSwXmPuxG5pz+1gRDJoToF9OBxtzocA="; + version = "2.25.4"; + hash = "sha256-cB/1vIYk8LWvL71hiKFu8froJHTUAfsYOOxBlBeNglI="; self_attribute_name = "nix_2_25"; }; diff --git a/pkgs/tools/text/mecab/ipadic.nix b/pkgs/tools/text/mecab/ipadic.nix index 5eb1439ed0db..1a44af2d3eb8 100644 --- a/pkgs/tools/text/mecab/ipadic.nix +++ b/pkgs/tools/text/mecab/ipadic.nix @@ -1,7 +1,9 @@ { + lib, stdenv, fetchurl, mecab-nodic, + buildPackages, }: stdenv.mkDerivation (finalAttrs: { @@ -16,8 +18,15 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ mecab-nodic ]; - configureFlags = [ - "--with-charset=utf8" - "--with-dicdir=${placeholder "out"}" - ]; + configureFlags = + [ + "--with-charset=utf8" + "--with-dicdir=${placeholder "out"}" + ] + ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + "--with-mecab-config=${lib.getExe' buildPackages.mecab "mecab-config"}" + ] + ++ lib.optionals (stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + "--with-mecab-config=${lib.getExe' (lib.getDev mecab-nodic) "mecab-config"}" + ]; }) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index f812769a2a62..08a598b64105 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -898,6 +898,18 @@ mapAliases { neocities-cli = neocities; # Added 2024-07-31 netbox_3_3 = throw "netbox 3.3 series has been removed as it was EOL"; # Added 2023-09-02 netbox_3_5 = throw "netbox 3.5 series has been removed as it was EOL"; # Added 2024-01-22 + nextcloud28 = throw '' + Nextcloud v28 has been removed from `nixpkgs` as the support for is dropped + by upstream in 2025-01. Please upgrade to at least Nextcloud v29 by declaring + + services.nextcloud.package = pkgs.nextcloud29; + + in your NixOS config. + + WARNING: if you were on Nextcloud 27 you have to upgrade to Nextcloud 28 + first on 24.11 because Nextcloud doesn't support upgrades across multiple major versions! + ''; # Added 2025-01-19 + nextcloud28Packages = throw "Nextcloud 28 is EOL!"; # Added 2025-01-19 nextcloud27 = throw '' Nextcloud v27 has been removed from `nixpkgs` as the support for is dropped by upstream in 2024-06. Please upgrade to at least Nextcloud v28 by declaring diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 006bf25adfd1..2a9a047d7768 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4343,9 +4343,8 @@ with pkgs; nm-tray = libsForQt5.callPackage ../tools/networking/networkmanager/tray.nix { }; inherit (callPackages ../servers/nextcloud {}) - nextcloud28 nextcloud29 nextcloud30; + nextcloud29 nextcloud30; - nextcloud28Packages = callPackage ../servers/nextcloud/packages { ncVersion = "28"; }; nextcloud29Packages = callPackage ../servers/nextcloud/packages { ncVersion = "29"; }; nextcloud30Packages = callPackage ../servers/nextcloud/packages { ncVersion = "30"; }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 02216dd7f80e..5a8874b6eeb7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4509,6 +4509,8 @@ self: super: with self; { inherit (self) python; }); + fastmri = callPackage ../development/python-modules/fastmri { }; + fastnumbers = callPackage ../development/python-modules/fastnumbers { }; fastparquet = callPackage ../development/python-modules/fastparquet { }; @@ -7733,6 +7735,8 @@ self: super: with self; { lrcalc-python = callPackage ../development/python-modules/lrcalc-python { }; + lrclibapi = callPackage ../development/python-modules/lrclibapi { }; + lru-dict = callPackage ../development/python-modules/lru-dict { }; lsassy = callPackage ../development/python-modules/lsassy { }; @@ -8501,6 +8505,8 @@ self: super: with self; { mpl-scatter-density = callPackage ../development/python-modules/mpl-scatter-density { }; + mpl-typst = callPackage ../development/python-modules/mpl-typst { }; + mpmath = callPackage ../development/python-modules/mpmath { }; mpris-server = callPackage ../development/python-modules/mpris-server { }; diff --git a/pkgs/top-level/qt6-packages.nix b/pkgs/top-level/qt6-packages.nix index 9e02fbbb1121..237a4757afb3 100644 --- a/pkgs/top-level/qt6-packages.nix +++ b/pkgs/top-level/qt6-packages.nix @@ -98,7 +98,7 @@ makeScopeWithSplicing' { qtspell = callPackage ../development/libraries/qtspell { }; qwlroots = callPackage ../development/libraries/qwlroots { - wlroots = pkgs.wlroots_0_17; + wlroots = pkgs.wlroots_0_18; }; qxlsx = callPackage ../development/libraries/qxlsx { };