diff --git a/nixos/doc/manual/release-notes/rl-2311.section.md b/nixos/doc/manual/release-notes/rl-2311.section.md index 5313f04cb789..d837e0ff68b7 100644 --- a/nixos/doc/manual/release-notes/rl-2311.section.md +++ b/nixos/doc/manual/release-notes/rl-2311.section.md @@ -1001,7 +1001,7 @@ Make sure to also check the many updates in the [Nixpkgs library](#sec-release-2 Satellite](https://github.com/synesthesiam/homeassistant-satellite), a streaming audio satellite for Home Assistant voice pipelines, where you can reuse existing mic and speaker hardware. Available as - [services.homeassistant-satellite](#opt-services.homeassistant-satellite.enable). + `services.homeassistant-satellite`. - [Apache Guacamole](https://guacamole.apache.org/), a cross-platform, clientless remote desktop gateway. Available as diff --git a/nixos/doc/manual/release-notes/rl-2405.section.md b/nixos/doc/manual/release-notes/rl-2405.section.md index b66e4d82db71..d6d717723036 100644 --- a/nixos/doc/manual/release-notes/rl-2405.section.md +++ b/nixos/doc/manual/release-notes/rl-2405.section.md @@ -129,6 +129,8 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m - [armagetronad](https://wiki.armagetronad.org), a mid-2000s 3D lightcycle game widely played at iD Tech Camps. You can define multiple servers using `services.armagetronad..enable`. +- [wyoming-satellite](https://github.com/rhasspy/wyoming-satellite), a voice assistant satellite for Home Assistant using the Wyoming protocol. Available as [services.wyoming.satellite]($opt-services.wyoming.satellite.enable). + - [TuxClocker](https://github.com/Lurkki14/tuxclocker), a hardware control and monitoring program. Available as [programs.tuxclocker](#opt-programs.tuxclocker.enable). - [ALVR](https://github.com/alvr-org/alvr), a VR desktop streamer. Available as [programs.alvr](#opt-programs.alvr.enable) @@ -287,6 +289,10 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m - `services.archisteamfarm` no longer uses the abbreviation `asf` for its state directory (`/var/lib/asf`), user and group (both `asf`). Instead the long name `archisteamfarm` is used. Configurations with `system.stateVersion` 23.11 or earlier, default to the old stateDirectory until the 24.11 release and must either set the option explicitly or move the data to the new directory. +- `xfsprogs` was updated to version 6.6.0, which enables reverse mapping (rmapbt) and large extent counts (nrext64) by default. + Support for these features was added in kernel 4.9 and 5.19 and nrext64 was deemed stable in kernel 6.5. + Format your filesystems with `mkfs.xfs -i nrext64=0`, if they need to be readable by GRUB2 before 2.12 or kernels older than 5.19. + - `networking.iproute2.enable` now does not set `environment.etc."iproute2/rt_tables".text`. Setting `environment.etc."iproute2/{CONFIG_FILE_NAME}".text` will override the whole configuration file instead of appending it to the upstream configuration file. diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 90b37e878312..1ddf536d3224 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -362,9 +362,6 @@ ./services/audio/spotifyd.nix ./services/audio/squeezelite.nix ./services/audio/tts.nix - ./services/audio/wyoming/faster-whisper.nix - ./services/audio/wyoming/openwakeword.nix - ./services/audio/wyoming/piper.nix ./services/audio/ympd.nix ./services/backup/automysqlbackup.nix ./services/backup/bacula.nix @@ -587,8 +584,11 @@ ./services/home-automation/evcc.nix ./services/home-automation/govee2mqtt.nix ./services/home-automation/home-assistant.nix - ./services/home-automation/homeassistant-satellite.nix ./services/home-automation/matter-server.nix + ./services/home-automation/wyoming/faster-whisper.nix + ./services/home-automation/wyoming/openwakeword.nix + ./services/home-automation/wyoming/piper.nix + ./services/home-automation/wyoming/satellite.nix ./services/home-automation/zigbee2mqtt.nix ./services/home-automation/zwave-js.nix ./services/logging/SystemdJournal2Gelf.nix diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index 0a975fcd98c8..8e30e401c792 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -62,6 +62,7 @@ in (mkRemovedOptionModule [ "services" "fourStoreEndpoint" ] "The fourStoreEndpoint module has been removed") (mkRemovedOptionModule [ "services" "fprot" ] "The corresponding package was removed from nixpkgs.") (mkRemovedOptionModule [ "services" "frab" ] "The frab module has been removed") + (mkRemovedOptionModule [ "services" "homeassistant-satellite"] "The `services.homeassistant-satellite` module has been replaced by `services.wyoming-satellite`.") (mkRemovedOptionModule [ "services" "ihatemoney" ] "The ihatemoney module has been removed for lack of downstream maintainer") (mkRemovedOptionModule [ "services" "kippo" ] "The corresponding package was removed from nixpkgs.") (mkRemovedOptionModule [ "services" "mailpile" ] "The corresponding package was removed from nixpkgs.") diff --git a/nixos/modules/services/home-automation/homeassistant-satellite.nix b/nixos/modules/services/home-automation/homeassistant-satellite.nix deleted file mode 100644 index 6ca428f2af81..000000000000 --- a/nixos/modules/services/home-automation/homeassistant-satellite.nix +++ /dev/null @@ -1,225 +0,0 @@ -{ config -, lib -, pkgs -, ... -}: - -let - cfg = config.services.homeassistant-satellite; - - inherit (lib) - escapeShellArg - escapeShellArgs - mkOption - mdDoc - mkEnableOption - mkIf - mkPackageOption - types - ; - - inherit (builtins) - toString - ; - - # override the package with the relevant vad dependencies - package = cfg.package.overridePythonAttrs (oldAttrs: { - propagatedBuildInputs = oldAttrs.propagatedBuildInputs - ++ lib.optional (cfg.vad == "webrtcvad") cfg.package.optional-dependencies.webrtc - ++ lib.optional (cfg.vad == "silero") cfg.package.optional-dependencies.silerovad - ++ lib.optional (cfg.pulseaudio.enable) cfg.package.optional-dependencies.pulseaudio; - }); - -in - -{ - meta.buildDocsInSandbox = false; - - options.services.homeassistant-satellite = with types; { - enable = mkEnableOption (mdDoc "Home Assistant Satellite"); - - package = mkPackageOption pkgs "homeassistant-satellite" { }; - - user = mkOption { - type = str; - example = "alice"; - description = mdDoc '' - User to run homeassistant-satellite under. - ''; - }; - - group = mkOption { - type = str; - default = "users"; - description = mdDoc '' - Group to run homeassistant-satellite under. - ''; - }; - - host = mkOption { - type = str; - example = "home-assistant.local"; - description = mdDoc '' - Hostname on which your Home Assistant instance can be reached. - ''; - }; - - port = mkOption { - type = port; - example = 8123; - description = mdDoc '' - Port on which your Home Assistance can be reached. - ''; - apply = toString; - }; - - protocol = mkOption { - type = enum [ "http" "https" ]; - default = "http"; - example = "https"; - description = mdDoc '' - The transport protocol used to connect to Home Assistant. - ''; - }; - - tokenFile = mkOption { - type = path; - example = "/run/keys/hass-token"; - description = mdDoc '' - Path to a file containing a long-lived access token for your Home Assistant instance. - ''; - apply = escapeShellArg; - }; - - sounds = { - awake = mkOption { - type = nullOr str; - default = null; - description = mdDoc '' - Audio file to play when the wake word is detected. - ''; - }; - - done = mkOption { - type = nullOr str; - default = null; - description = mdDoc '' - Audio file to play when the voice command is done. - ''; - }; - }; - - vad = mkOption { - type = enum [ "disabled" "webrtcvad" "silero" ]; - default = "disabled"; - example = "silero"; - description = mdDoc '' - Voice activity detection model. With `disabled` sound will be transmitted continously. - ''; - }; - - pulseaudio = { - enable = mkEnableOption "recording/playback via PulseAudio or PipeWire"; - - socket = mkOption { - type = nullOr str; - default = null; - example = "/run/user/1000/pulse/native"; - description = mdDoc '' - Path or hostname to connect with the PulseAudio server. - ''; - }; - - duckingVolume = mkOption { - type = nullOr float; - default = null; - example = 0.4; - description = mdDoc '' - Reduce output volume (between 0 and 1) to this percentage value while recording. - ''; - }; - - echoCancellation = mkEnableOption "acoustic echo cancellation"; - }; - - extraArgs = mkOption { - type = listOf str; - default = [ ]; - description = mdDoc '' - Extra arguments to pass to the commandline. - ''; - apply = escapeShellArgs; - }; - }; - - config = mkIf cfg.enable { - systemd.services."homeassistant-satellite" = { - description = "Home Assistant Satellite"; - after = [ - "network-online.target" - ]; - wants = [ - "network-online.target" - ]; - wantedBy = [ - "multi-user.target" - ]; - path = with pkgs; [ - ffmpeg-headless - ] ++ lib.optionals (!cfg.pulseaudio.enable) [ - alsa-utils - ]; - serviceConfig = { - User = cfg.user; - Group = cfg.group; - # https://github.com/rhasspy/hassio-addons/blob/master/assist_microphone/rootfs/etc/s6-overlay/s6-rc.d/assist_microphone/run - ExecStart = '' - ${package}/bin/homeassistant-satellite \ - --host ${cfg.host} \ - --port ${cfg.port} \ - --protocol ${cfg.protocol} \ - --token-file ${cfg.tokenFile} \ - --vad ${cfg.vad} \ - ${lib.optionalString cfg.pulseaudio.enable "--pulseaudio"}${lib.optionalString (cfg.pulseaudio.socket != null) "=${cfg.pulseaudio.socket}"} \ - ${lib.optionalString (cfg.pulseaudio.enable && cfg.pulseaudio.duckingVolume != null) "--ducking-volume=${toString cfg.pulseaudio.duckingVolume}"} \ - ${lib.optionalString (cfg.pulseaudio.enable && cfg.pulseaudio.echoCancellation) "--echo-cancel"} \ - ${lib.optionalString (cfg.sounds.awake != null) "--awake-sound=${toString cfg.sounds.awake}"} \ - ${lib.optionalString (cfg.sounds.done != null) "--done-sound=${toString cfg.sounds.done}"} \ - ${cfg.extraArgs} - ''; - CapabilityBoundingSet = ""; - DeviceAllow = ""; - DevicePolicy = "closed"; - LockPersonality = true; - MemoryDenyWriteExecute = false; # onnxruntime/capi/onnxruntime_pybind11_state.so: cannot enable executable stack as shared object requires: Operation not permitted - PrivateDevices = true; - PrivateUsers = true; - ProtectHome = false; # Would deny access to local pulse/pipewire server - ProtectHostname = true; - ProtectKernelLogs = true; - ProtectKernelModules = true; - ProtectKernelTunables = true; - ProtectControlGroups = true; - ProtectProc = "invisible"; - ProcSubset = "all"; # Error in cpuinfo: failed to parse processor information from /proc/cpuinfo - Restart = "always"; - RestrictAddressFamilies = [ - "AF_INET" - "AF_INET6" - "AF_UNIX" - ]; - RestrictNamespaces = true; - RestrictRealtime = true; - SupplementaryGroups = [ - "audio" - ]; - SystemCallArchitectures = "native"; - SystemCallFilter = [ - "@system-service" - "~@privileged" - ]; - UMask = "0077"; - }; - }; - }; -} diff --git a/nixos/modules/services/audio/wyoming/faster-whisper.nix b/nixos/modules/services/home-automation/wyoming/faster-whisper.nix similarity index 100% rename from nixos/modules/services/audio/wyoming/faster-whisper.nix rename to nixos/modules/services/home-automation/wyoming/faster-whisper.nix diff --git a/nixos/modules/services/audio/wyoming/openwakeword.nix b/nixos/modules/services/home-automation/wyoming/openwakeword.nix similarity index 100% rename from nixos/modules/services/audio/wyoming/openwakeword.nix rename to nixos/modules/services/home-automation/wyoming/openwakeword.nix diff --git a/nixos/modules/services/audio/wyoming/piper.nix b/nixos/modules/services/home-automation/wyoming/piper.nix similarity index 100% rename from nixos/modules/services/audio/wyoming/piper.nix rename to nixos/modules/services/home-automation/wyoming/piper.nix diff --git a/nixos/modules/services/home-automation/wyoming/satellite.nix b/nixos/modules/services/home-automation/wyoming/satellite.nix new file mode 100644 index 000000000000..531d375e703a --- /dev/null +++ b/nixos/modules/services/home-automation/wyoming/satellite.nix @@ -0,0 +1,244 @@ +{ config +, lib +, pkgs +, ... +}: + +let + cfg = config.services.wyoming.satellite; + + inherit (lib) + elem + escapeShellArgs + getExe + literalExpression + mkOption + mkEnableOption + mkIf + mkPackageOption + optional + optionals + types + ; + + finalPackage = cfg.package.overridePythonAttrs (oldAttrs: { + propagatedBuildInputs = oldAttrs.propagatedBuildInputs + # for audio enhancements like auto-gain, noise suppression + ++ cfg.package.optional-dependencies.webrtc + # vad is currently optional, because it is broken on aarch64-linux + ++ optionals cfg.vad.enable cfg.package.optional-dependencies.silerovad; + }); +in + +{ + meta.buildDocsInSandbox = false; + + options.services.wyoming.satellite = with types; { + enable = mkEnableOption "Wyoming Satellite"; + + package = mkPackageOption pkgs "wyoming-satellite" { }; + + user = mkOption { + type = str; + example = "alice"; + description = '' + User to run wyoming-satellite under. + ''; + }; + + group = mkOption { + type = str; + default = "users"; + description = '' + Group to run wyoming-satellite under. + ''; + }; + + uri = mkOption { + type = str; + default = "tcp://0.0.0.0:10700"; + description = '' + URI where wyoming-satellite will bind its socket. + ''; + }; + + name = mkOption { + type = str; + default = config.networking.hostName; + defaultText = literalExpression '' + config.networking.hostName + ''; + description = '' + Name of the satellite. + ''; + }; + + area = mkOption { + type = nullOr str; + default = null; + example = "Kitchen"; + description = '' + Area to the satellite. + ''; + }; + + microphone = { + command = mkOption { + type = str; + default = "arecord -r 16000 -c 1 -f S16_LE -t raw"; + description = '' + Program to run for audio input. + ''; + }; + + autoGain = mkOption { + type = ints.between 0 31; + default = 5; + example = 15; + description = '' + Automatic gain control in dbFS, with 31 being the loudest value. Set to 0 to disable. + ''; + }; + + noiseSuppression = mkOption { + type = ints.between 0 4; + default = 2; + example = 3; + description = '' + Noise suppression level with 4 being the maximum suppression, + which may cause audio distortion. Set to 0 to disable. + ''; + }; + }; + + sound = { + command = mkOption { + type = nullOr str; + default = "aplay -r 22050 -c 1 -f S16_LE -t raw"; + description = '' + Program to run for sound output. + ''; + }; + }; + + sounds = { + awake = mkOption { + type = nullOr path; + default = null; + description = '' + Path to audio file in WAV format to play when wake word is detected. + ''; + }; + + done = mkOption { + type = nullOr path; + default = null; + description = '' + Path to audio file in WAV format to play when voice command recording has ended. + ''; + }; + }; + + vad = { + enable = mkOption { + type = bool; + default = true; + description = '' + Whether to enable voice activity detection. + + Enabling will result in only streaming audio, when speech gets + detected. + ''; + }; + }; + + extraArgs = mkOption { + type = listOf str; + default = [ ]; + description = '' + Extra arguments to pass to the executable. + + Check `wyoming-satellite --help` for possible options. + ''; + }; + }; + + config = mkIf cfg.enable { + systemd.services."wyoming-satellite" = { + description = "Wyoming Satellite"; + after = [ + "network-online.target" + "sound.target" + ]; + wants = [ + "network-online.target" + "sound.target" + ]; + wantedBy = [ + "multi-user.target" + ]; + path = with pkgs; [ + alsa-utils + ]; + script = let + optionalParam = param: argument: optionals (!elem argument [ null 0 false ]) [ + param argument + ]; + in '' + export XDG_RUNTIME_DIR=/run/user/$UID + ${escapeShellArgs ([ + (getExe finalPackage) + "--uri" cfg.uri + "--name" cfg.name + "--mic-command" cfg.microphone.command + ] + ++ optionalParam "--mic-auto-gain" cfg.microphone.autoGain + ++ optionalParam "--mic-noise-suppression" cfg.microphone.noiseSuppression + ++ optionalParam "--area" cfg.area + ++ optionalParam "--snd-command" cfg.sound.command + ++ optionalParam "--awake-wav" cfg.sounds.awake + ++ optionalParam "--done-wav" cfg.sounds.done + ++ optional cfg.vad.enable "--vad" + ++ cfg.extraArgs)} + ''; + serviceConfig = { + User = cfg.user; + Group = cfg.group; + # https://github.com/rhasspy/hassio-addons/blob/master/assist_microphone/rootfs/etc/s6-overlay/s6-rc.d/assist_microphone/run + CapabilityBoundingSet = ""; + DeviceAllow = ""; + DevicePolicy = "closed"; + LockPersonality = true; + MemoryDenyWriteExecute = false; # onnxruntime/capi/onnxruntime_pybind11_state.so: cannot enable executable stack as shared object requires: Operation not permitted + PrivateDevices = true; + PrivateUsers = true; + ProtectHome = false; # Would deny access to local pulse/pipewire server + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectControlGroups = true; + ProtectProc = "invisible"; + ProcSubset = "all"; # Error in cpuinfo: failed to parse processor information from /proc/cpuinfo + Restart = "always"; + RestrictAddressFamilies = [ + "AF_INET" + "AF_INET6" + "AF_UNIX" + "AF_NETLINK" + ]; + RestrictNamespaces = true; + RestrictRealtime = true; + SupplementaryGroups = [ + "audio" + ]; + SystemCallArchitectures = "native"; + SystemCallFilter = [ + "@system-service" + "~@privileged" + ]; + UMask = "0077"; + }; + }; + }; +} diff --git a/nixos/modules/services/networking/mycelium.nix b/nixos/modules/services/networking/mycelium.nix index 9c4bca7c6861..9487a5daafee 100644 --- a/nixos/modules/services/networking/mycelium.nix +++ b/nixos/modules/services/networking/mycelium.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, ... }: +{ config, pkgs, lib, utils, ... }: let cfg = config.services.mycelium; @@ -46,6 +46,15 @@ in Adds the hosted peers from https://github.com/threefoldtech/mycelium#hosted-public-nodes. ''; }; + extraArgs = lib.mkOption { + type = lib.types.listOf lib.types.str; + default = [ ]; + description = '' + Extra command-line arguments to pass to mycelium. + + See `mycelium --help` for all available options. + ''; + }; }; config = lib.mkIf cfg.enable { networking.firewall.allowedTCPPorts = lib.optionals cfg.openFirewall [ 9651 ]; @@ -87,6 +96,7 @@ in ) "--tun-name" "mycelium" + "${utils.escapeSystemdExecArgs cfg.extraArgs}" ] ++ (lib.optional (cfg.addHostedPublicNodes || cfg.peers != [ ]) "--peers") ++ cfg.peers ++ (lib.optionals cfg.addHostedPublicNodes [ @@ -130,4 +140,3 @@ in maintainers = with lib.maintainers; [ flokli lassulus ]; }; } - diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix index 573a02cbda9e..1eaf065972d2 100644 --- a/nixos/modules/services/networking/networkmanager.nix +++ b/nixos/modules/services/networking/networkmanager.nix @@ -390,7 +390,7 @@ in }; }); default = [ ]; - example = literalExpression ''[{ name = "03f0:4e1d"; script = "''${pkgs.modemmanager}/share/ModemManager/fcc-unlock.available.d/03f0:4e1d"; }]''; + example = literalExpression ''[{ id = "03f0:4e1d"; path = "''${pkgs.modemmanager}/share/ModemManager/fcc-unlock.available.d/03f0:4e1d"; }]''; description = lib.mdDoc '' List of FCC unlock scripts to enable on the system, behaving as described in https://modemmanager.org/docs/modemmanager/fcc-unlock/#integration-with-third-party-fcc-unlock-tools. diff --git a/nixos/modules/services/x11/desktop-managers/pantheon.nix b/nixos/modules/services/x11/desktop-managers/pantheon.nix index 59bc142eeb7f..2cfdc69b86e0 100644 --- a/nixos/modules/services/x11/desktop-managers/pantheon.nix +++ b/nixos/modules/services/x11/desktop-managers/pantheon.nix @@ -174,12 +174,38 @@ in # https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1443 pkgs.pantheon.mutter ]; - systemd.packages = [ - pkgs.pantheon.gnome-settings-daemon + systemd.packages = with pkgs; [ + gnome.gnome-session + pantheon.gala + pantheon.gnome-settings-daemon + pantheon.elementary-session-settings ]; programs.dconf.enable = true; networking.networkmanager.enable = mkDefault true; + systemd.user.targets."gnome-session-x11-services".wants = [ + "org.gnome.SettingsDaemon.XSettings.service" + ]; + systemd.user.targets."gnome-session-x11-services-ready".wants = [ + "org.gnome.SettingsDaemon.XSettings.service" + ]; + + # https://github.com/elementary/gala/issues/1826#issuecomment-1890461298 + systemd.user.services."io.elementary.gala.daemon@" = { + unitConfig = { + Description = "Gala Daemon"; + BindsTo = "io.elementary.gala@.service"; + After = "io.elementary.gala@.service"; + }; + + serviceConfig = { + Type = "dbus"; + BusName = "org.pantheon.gala.daemon"; + ExecStart = "${pkgs.pantheon.gala}/bin/gala-daemon"; + Slice = "session.slice"; + }; + }; + # Global environment environment.systemPackages = (with pkgs.pantheon; [ elementary-session-settings diff --git a/nixos/modules/services/x11/display-managers/default.nix b/nixos/modules/services/x11/display-managers/default.nix index 3e2d5780a5cb..c22048c6692e 100644 --- a/nixos/modules/services/x11/display-managers/default.nix +++ b/nixos/modules/services/x11/display-managers/default.nix @@ -40,7 +40,7 @@ let IFS=: for i in $XDG_CURRENT_DESKTOP; do case $i in - KDE|GNOME|X-NIXOS-SYSTEMD-AWARE) echo "1"; exit; ;; + KDE|GNOME|Pantheon|X-NIXOS-SYSTEMD-AWARE) echo "1"; exit; ;; *) ;; esac done diff --git a/nixos/tests/lvm2/default.nix b/nixos/tests/lvm2/default.nix index e0358ec2806f..84f24cbc3859 100644 --- a/nixos/tests/lvm2/default.nix +++ b/nixos/tests/lvm2/default.nix @@ -36,9 +36,14 @@ lib.listToAttrs ( lib.flip lib.concatMap kernelVersionsToTest (version: let v' = lib.replaceStrings [ "." ] [ "_" ] version; + mkXfsFlags = lib.optionalString (lib.versionOlder version "5.10") " -m bigtime=0 -m inobtcount=0 " + + lib.optionalString (lib.versionOlder version "5.19") " -i nrext64=0 "; in lib.flip lib.mapAttrsToList tests (name: t: - lib.nameValuePair "lvm-${name}-linux-${v'}" (lib.optionalAttrs (builtins.elem version (t.kernelFilter kernelVersionsToTest)) (t.test ({ kernelPackages = pkgs."linuxPackages_${v'}"; } // builtins.removeAttrs t [ "test" "kernelFilter" ]))) + lib.nameValuePair "lvm-${name}-linux-${v'}" (lib.optionalAttrs (builtins.elem version (t.kernelFilter kernelVersionsToTest)) (t.test ({ + kernelPackages = pkgs."linuxPackages_${v'}"; + inherit mkXfsFlags; + } // builtins.removeAttrs t [ "test" "kernelFilter" ]))) ) ) ) diff --git a/nixos/tests/lvm2/systemd-stage-1.nix b/nixos/tests/lvm2/systemd-stage-1.nix index 1c95aadfcb3f..7f106e1b0dd6 100644 --- a/nixos/tests/lvm2/systemd-stage-1.nix +++ b/nixos/tests/lvm2/systemd-stage-1.nix @@ -1,4 +1,4 @@ -{ kernelPackages ? null, flavour }: let +{ kernelPackages ? null, flavour, mkXfsFlags ? "" }: let preparationCode = { raid = '' machine.succeed("vgcreate test_vg /dev/vdb /dev/vdc") @@ -71,7 +71,7 @@ in import ../make-test-python.nix ({ pkgs, lib, ... }: { boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; - environment.systemPackages = with pkgs; [ e2fsprogs ]; # for mkfs.ext4 + environment.systemPackages = with pkgs; [ xfsprogs ]; boot = { initrd.systemd = { enable = true; @@ -88,7 +88,7 @@ in import ../make-test-python.nix ({ pkgs, lib, ... }: { machine.wait_for_unit("multi-user.target") # Create a VG for the root ${preparationCode} - machine.succeed("mkfs.ext4 /dev/test_vg/test_lv") + machine.succeed("mkfs.xfs ${mkXfsFlags} /dev/test_vg/test_lv") machine.succeed("mkdir -p /mnt && mount /dev/test_vg/test_lv /mnt && echo hello > /mnt/test && umount /mnt") # Boot from LVM diff --git a/nixos/tests/lvm2/thinpool.nix b/nixos/tests/lvm2/thinpool.nix index f49c8980613c..325bb87460b7 100644 --- a/nixos/tests/lvm2/thinpool.nix +++ b/nixos/tests/lvm2/thinpool.nix @@ -1,4 +1,4 @@ -{ kernelPackages ? null }: +{ kernelPackages ? null, mkXfsFlags ? "" }: import ../make-test-python.nix ({ pkgs, lib, ... }: { name = "lvm2-thinpool"; meta.maintainers = lib.teams.helsinki-systems.members; @@ -18,7 +18,8 @@ import ../make-test-python.nix ({ pkgs, lib, ... }: { }; testScript = let - mkXfsFlags = lib.optionalString (lib.versionOlder kernelPackages.kernel.version "5.10") "-m bigtime=0 -m inobtcount=0"; + mkXfsFlags = lib.optionalString (lib.versionOlder kernelPackages.kernel.version "5.10") " -m bigtime=0 -m inobtcount=0 " + + lib.optionalString (lib.versionOlder kernelPackages.kernel.version "5.19") " -i nrext64=0 "; in '' machine.succeed("vgcreate test_vg /dev/vdb") machine.succeed("lvcreate -L 512M -T test_vg/test_thin_pool") diff --git a/nixos/tests/lvm2/vdo.nix b/nixos/tests/lvm2/vdo.nix index 75c1fc094e97..18d25b7b366d 100644 --- a/nixos/tests/lvm2/vdo.nix +++ b/nixos/tests/lvm2/vdo.nix @@ -1,4 +1,4 @@ -{ kernelPackages ? null }: +{ kernelPackages ? null, mkXfsFlags ? "" }: import ../make-test-python.nix ({ pkgs, lib, ... }: { name = "lvm2-vdo"; meta.maintainers = lib.teams.helsinki-systems.members; @@ -17,7 +17,7 @@ import ../make-test-python.nix ({ pkgs, lib, ... }: { testScript = '' machine.succeed("vgcreate test_vg /dev/vdb") machine.succeed("lvcreate --type vdo -n vdo_lv -L 6G -V 12G test_vg/vdo_pool_lv") - machine.succeed("mkfs.xfs -K /dev/test_vg/vdo_lv") + machine.succeed("mkfs.xfs ${mkXfsFlags} -K /dev/test_vg/vdo_lv") machine.succeed("mkdir /mnt; mount /dev/test_vg/vdo_lv /mnt") assert "/dev/mapper/test_vg-vdo_lv" == machine.succeed("findmnt -no SOURCE /mnt").strip() machine.succeed("umount /mnt") diff --git a/nixos/tests/pantheon.nix b/nixos/tests/pantheon.nix index 69a28c397bed..14f92fa3af4a 100644 --- a/nixos/tests/pantheon.nix +++ b/nixos/tests/pantheon.nix @@ -50,11 +50,11 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : machine.wait_until_succeeds(f"pgrep -f {i}") for i in ["gala", "io.elementary.wingpanel", "plank"]: machine.wait_for_window(i) - machine.wait_for_unit("bamfdaemon.service", "${user.name}") - machine.wait_for_unit("io.elementary.files.xdg-desktop-portal.service", "${user.name}") + for i in ["io.elementary.gala.daemon@x11.service", "bamfdaemon.service", "io.elementary.files.xdg-desktop-portal.service"]: + machine.wait_for_unit(i, "${user.name}") with subtest("Check if various environment variables are set"): - cmd = "xargs --null --max-args=1 echo < /proc/$(pgrep -xf /run/current-system/sw/bin/gala)/environ" + cmd = "xargs --null --max-args=1 echo < /proc/$(pgrep -xf ${pkgs.pantheon.gala}/bin/gala)/environ" machine.succeed(f"{cmd} | grep 'XDG_CURRENT_DESKTOP' | grep 'Pantheon'") # Hopefully from the sessionPath option. machine.succeed(f"{cmd} | grep 'XDG_DATA_DIRS' | grep 'gsettings-schemas/pantheon-agent-geoclue2'") diff --git a/pkgs/applications/audio/jacktrip/default.nix b/pkgs/applications/audio/jacktrip/default.nix index 150f05c5f53e..f8fb4cedbc9f 100644 --- a/pkgs/applications/audio/jacktrip/default.nix +++ b/pkgs/applications/audio/jacktrip/default.nix @@ -11,7 +11,7 @@ }: stdenv.mkDerivation rec { - version = "2.2.4"; + version = "2.2.5"; pname = "jacktrip"; src = fetchFromGitHub { @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { repo = "jacktrip"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-H1zjBNEFPvZRDEaFOiL1ZAlHQsNxeT4WbXEOqg0+eFg="; + sha256 = "sha256-rZ8oaud+ovJ7t+SGnWe7QbqjQns1EkbbwpdE+rLr6nc="; }; preConfigure = '' diff --git a/pkgs/applications/audio/schismtracker/default.nix b/pkgs/applications/audio/schismtracker/default.nix index 94b082fd84a4..bc6a406ba2f5 100644 --- a/pkgs/applications/audio/schismtracker/default.nix +++ b/pkgs/applications/audio/schismtracker/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "schismtracker"; - version = "20240308"; + version = "20240328"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-6MzMmeD4HCS/7VTFTAcOhyKjz5NvzvDEzcSpHGUwFvM="; + sha256 = "sha256-hoP/14lbqsuQ37oJDErPoQWWk04UshImmApCFrf5wno="; }; configureFlags = [ "--enable-dependency-tracking" ] diff --git a/pkgs/applications/misc/gramps/default.nix b/pkgs/applications/misc/gramps/default.nix index a24cff0942e1..e4bf463ac4a3 100644 --- a/pkgs/applications/misc/gramps/default.nix +++ b/pkgs/applications/misc/gramps/default.nix @@ -23,7 +23,7 @@ let inherit (pythonPackages) buildPythonApplication pythonOlder; in buildPythonApplication rec { - version = "5.2.0"; + version = "5.2.1"; pname = "gramps"; pyproject = true; @@ -33,7 +33,7 @@ buildPythonApplication rec { owner = "gramps-project"; repo = "gramps"; rev = "v${version}"; - hash = "sha256-8iQcaWLiBegVjcV16TfZbp8/4N/9f5pEl7mdV78CeEY="; + hash = "sha256-KgUc6AFLVFf3SYpjY/le0g4jNhGe4gpYcnkDEIZ/gxQ="; }; patches = [ diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-aarch64.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-aarch64.nix index 46c049b9d2f2..dffcdc6172f2 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-aarch64.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-aarch64.nix @@ -2,7 +2,7 @@ callPackage ./generic.nix { } rec { pname = "signal-desktop"; dir = "Signal"; - version = "6.46.0"; + version = "7.3.0"; url = "https://github.com/0mniteck/Signal-Desktop-Mobian/raw/${version}/builds/release/signal-desktop_${version}_arm64.deb"; - hash = "sha256-rHmG2brzlQtYd3l5EFhjndPF5T7nQWzUhEe7LsEFVpc="; + hash = "sha256-RIOMIAXdBMr1Bi1TDFr4VD0w8JfBKzwEjpYS/DfV5kc="; } diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-beta.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-beta.nix index 86f08b1067a1..2e13a6637735 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-beta.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-beta.nix @@ -2,7 +2,7 @@ callPackage ./generic.nix { } rec { pname = "signal-desktop-beta"; dir = "Signal Beta"; - version = "7.4.0-beta.1"; + version = "7.4.0-beta.2"; url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop-beta/signal-desktop-beta_${version}_amd64.deb"; - hash = "sha256-Pjz55iVBww7d7WIAonTeX+cdEobitltoAyOU79RY40c="; + hash = "sha256-oBkZ9BaKbmosTkC/OZFjt6PmU/9XqclyzbllwYPj3Q4="; } diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix index 10ea168355b3..3cb0d3572515 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix @@ -2,7 +2,7 @@ callPackage ./generic.nix { } rec { pname = "signal-desktop"; dir = "Signal"; - version = "7.2.1"; + version = "7.3.1"; url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - hash = "sha256-IJ808xvPqGivccqH/mOMSHu/mU/JLFJ798UztwXWtm0="; + hash = "sha256-J99mSSzl+TxWb6whzJ4oZs8a7NnKFVL3iNvWmvlQIaw="; } diff --git a/pkgs/applications/networking/sync/storj-uplink/default.nix b/pkgs/applications/networking/sync/storj-uplink/default.nix index 8f625a1fe1b0..e65ead7bd5c7 100644 --- a/pkgs/applications/networking/sync/storj-uplink/default.nix +++ b/pkgs/applications/networking/sync/storj-uplink/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "storj-uplink"; - version = "1.100.3"; + version = "1.100.4"; src = fetchFromGitHub { owner = "storj"; repo = "storj"; rev = "v${version}"; - hash = "sha256-/aR6M/zL7xL+ujmGgu9J8Toiy7/0ou76nYJ0vwd5RVM="; + hash = "sha256-LPckEiuw+3WlEnW07jql+TFggB6mEzrvC7NI+pVBCLY="; }; subPackages = [ "cmd/uplink" ]; diff --git a/pkgs/applications/office/planify/default.nix b/pkgs/applications/office/planify/default.nix index 6bf0f20313f6..d01e0c45c948 100644 --- a/pkgs/applications/office/planify/default.nix +++ b/pkgs/applications/office/planify/default.nix @@ -27,13 +27,13 @@ stdenv.mkDerivation rec { pname = "planify"; - version = "4.5.8"; + version = "4.5.11"; src = fetchFromGitHub { owner = "alainm23"; repo = "planify"; rev = version; - hash = "sha256-VTBnVVxv3hCyDKJlY/hE8oEDMNuMMWtm+NKzfD3tVzk="; + hash = "sha256-LMN+1ORp44uWVqzw1sjiZzx81s9l2msPFM3+sJ7qw8U="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/science/logic/dafny/default.nix b/pkgs/applications/science/logic/dafny/default.nix index 83d472c1abb1..acf4f05000bf 100644 --- a/pkgs/applications/science/logic/dafny/default.nix +++ b/pkgs/applications/science/logic/dafny/default.nix @@ -8,13 +8,13 @@ buildDotnetModule rec { pname = "Dafny"; - version = "4.5.0"; + version = "4.6.0"; src = fetchFromGitHub { owner = "dafny-lang"; repo = "dafny"; rev = "v${version}"; - hash = "sha256-NsQhJY++IaLyFc5jqo7TyZBcz0P8VUizGLxdIe9KEO4="; + hash = "sha256-3t0drxM7PZzrLbxBKYa6Gja2u6GK6Pc+ejoswag3P3k="; }; postPatch = '' diff --git a/pkgs/applications/version-management/lucky-commit/default.nix b/pkgs/applications/version-management/lucky-commit/default.nix index 4e8db1fef606..dcaca33f0952 100644 --- a/pkgs/applications/version-management/lucky-commit/default.nix +++ b/pkgs/applications/version-management/lucky-commit/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "lucky-commit"; - version = "2.2.2"; + version = "2.2.3"; src = fetchFromGitHub { owner = "not-an-aardvark"; repo = pname; rev = "v${version}"; - sha256 = "sha256-DrgZBzcJmqSP7iCHZyy623iRZYfTE/z/zzx7I+BAOBo="; + sha256 = "sha256-jxcsTtQcSuL+2vwdxIVxqTpKh8Bfvna+hkGt+Rx21FE="; }; - cargoHash = "sha256-5P0CiLCf86Jul4EaIDqHGkp4XNifLKnWJZXtrLkpLMY="; + cargoHash = "sha256-8JkodGtMdYP/IIBqRcJFD5syiZi+VakDyX7VcvR0HLo="; buildInputs = lib.optional withOpenCL (if stdenv.isDarwin then OpenCL else ocl-icd); diff --git a/pkgs/by-name/bu/bunbun/package.nix b/pkgs/by-name/bu/bunbun/package.nix new file mode 100644 index 000000000000..79d158fb6ae7 --- /dev/null +++ b/pkgs/by-name/bu/bunbun/package.nix @@ -0,0 +1,40 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, stdenv +, darwin +}: + +rustPlatform.buildRustPackage rec { + pname = "bunbun"; + version = "1.3.0"; + + src = fetchFromGitHub { + owner = "devraza"; + repo = "bunbun"; + rev = "refs/tags/v${version}"; + hash = "sha256-jqokKvJYu/xHJHJVuNlTns3cYPLx1osbRUrCpVTCJZ0="; + }; + + cargoHash = "sha256-dWZ5aNaHyTkEmkn88Dx5nCnGyiBmpJ6p5iYC7xj/mBw="; + + buildInputs = lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.CoreFoundation + darwin.apple_sdk.frameworks.IOKit + darwin.apple_sdk.frameworks.SystemConfiguration + ]; + + # Cargo.lock is outdated + preConfigure = '' + cargo update --offline + ''; + + meta = with lib; { + description = "A simple and adorable sysinfo utility written in Rust"; + homepage = "https://github.com/devraza/bunbun"; + changelog = "https://github.com/devraza/bunbun/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ GaetanLepage ]; + mainProgram = "bunbun"; + }; +} diff --git a/pkgs/by-name/cl/clash-verge-rev/package.nix b/pkgs/by-name/cl/clash-verge-rev/package.nix index 576a994c1e73..95415d03cfec 100644 --- a/pkgs/by-name/cl/clash-verge-rev/package.nix +++ b/pkgs/by-name/cl/clash-verge-rev/package.nix @@ -5,11 +5,11 @@ clash-verge.overrideAttrs (old: rec { pname = "clash-verge-rev"; - version = "1.5.10"; + version = "1.5.11"; src = fetchurl { url = "https://github.com/clash-verge-rev/clash-verge-rev/releases/download/v${version}/clash-verge_${version}_amd64.deb"; - hash = "sha256-xv6xKAjpHL4eyFEcgiuHZQi3EDhYkzGHAKbcKm4rIGk="; + hash = "sha256-FoNWCH4SE7DnKoDMwdUiTnWoFwHSUCAIDQhvgZdgyeU="; }; meta = old.meta // (with lib; { diff --git a/pkgs/by-name/do/doge/package.nix b/pkgs/by-name/do/doge/package.nix index d35d6708bdf2..4b64f8a7dfff 100644 --- a/pkgs/by-name/do/doge/package.nix +++ b/pkgs/by-name/do/doge/package.nix @@ -5,13 +5,13 @@ }: python3Packages.buildPythonApplication rec { pname = "doge"; - version = "3.7.0"; + version = "3.8.0"; src = fetchFromGitHub { owner = "Olivia5k"; repo = "doge"; rev = version; - hash = "sha256-LmEbDQUZe/3lg/Ze+WUNyYfC8zMr88/rn10sL0jgbGA="; + hash = "sha256-CZw9Pz9YPVmDMOfDp5yIp/yStOvXEzAgb/HvKpxhQ8I="; }; pyproject = true; diff --git a/pkgs/by-name/lu/lubelogger/package.nix b/pkgs/by-name/lu/lubelogger/package.nix index 1b8501fc1129..72bef4a340af 100644 --- a/pkgs/by-name/lu/lubelogger/package.nix +++ b/pkgs/by-name/lu/lubelogger/package.nix @@ -6,13 +6,13 @@ buildDotnetModule rec { pname = "lubelogger"; - version = "1.2.8"; + version = "1.2.9"; src = fetchFromGitHub { owner = "hargata"; repo = "lubelog"; rev = "v${version}"; - hash = "sha256-22I4OJZLeFLstGZF1fY/s8Y5tPgGJpJR/sPZpkHvUmY="; + hash = "sha256-bzCPoWgI7JA5dEYKl2m1ZzNPXxNRAzZz1lFa7fVCkNw="; }; projectFile = "CarCareTracker.sln"; diff --git a/pkgs/by-name/my/mycelium/Cargo.lock b/pkgs/by-name/my/mycelium/Cargo.lock index 311901f8a242..a16f24fc9477 100644 --- a/pkgs/by-name/my/mycelium/Cargo.lock +++ b/pkgs/by-name/my/mycelium/Cargo.lock @@ -218,6 +218,12 @@ version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" +[[package]] +name = "base64" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9475866fec1451be56a3c2400fd081ff546538961565ccb5b7142cbd22bc7a51" + [[package]] name = "bitflags" version = "1.3.2" @@ -241,9 +247,9 @@ dependencies = [ [[package]] name = "blake3" -version = "1.5.0" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0231f06152bf547e9c2b5194f247cd97aacf6dcd8b15d8e5ec0663f64580da87" +checksum = "30cca6d3674597c30ddf2c587bf8d9d65c9a84d2326d941cc79c9842dfe0ef52" dependencies = [ "arrayref", "arrayvec", @@ -275,9 +281,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.5.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" +checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" [[package]] name = "c2rust-bitfields" @@ -332,9 +338,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.4.18" +version = "4.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e578d6ec4194633722ccf9544794b71b1385c3c027efe0c55db226fc880865c" +checksum = "90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0" dependencies = [ "clap_builder", "clap_derive", @@ -342,9 +348,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.4.18" +version = "4.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4df4df40ec50c46000231c914968278b1eb05098cf8f1b3a518a95030e71d1c7" +checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4" dependencies = [ "anstream", "anstyle", @@ -354,9 +360,9 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.4.7" +version = "4.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" +checksum = "528131438037fd55894f62d6e9f068b8f45ac57ffa77517819645d10aed04f64" dependencies = [ "heck", "proc-macro2", @@ -366,9 +372,9 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" +checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" [[package]] name = "colorchoice" @@ -523,9 +529,9 @@ dependencies = [ [[package]] name = "faster-hex" -version = "0.8.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "239f7bfb930f820ab16a9cd95afc26f88264cf6905c960b340a615384aa3338a" +checksum = "a2a2b11eda1d40935b26cf18f6833c526845ae8c41e58d09af6adeb6f0269183" dependencies = [ "serde", ] @@ -736,9 +742,9 @@ checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" [[package]] name = "heck" -version = "0.4.1" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" [[package]] name = "hermit-abi" @@ -1068,11 +1074,11 @@ dependencies = [ [[package]] name = "mycelium" -version = "0.4.3" +version = "0.4.5" dependencies = [ "aes-gcm", "axum", - "base64", + "base64 0.22.0", "blake2", "blake3", "bytes", @@ -1120,14 +1126,14 @@ dependencies = [ [[package]] name = "netlink-packet-route" -version = "0.17.1" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "053998cea5a306971f88580d0829e90f270f940befd7cf928da179d4187a5a66" +checksum = "74c171cd77b4ee8c7708da746ce392440cb7bcf618d122ec9ecc607b12938bf4" dependencies = [ "anyhow", - "bitflags 1.3.2", "byteorder", "libc", + "log", "netlink-packet-core", "netlink-packet-utils", ] @@ -1174,9 +1180,9 @@ dependencies = [ [[package]] name = "network-interface" -version = "1.1.1" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d68759ef97fe9c9e46f79ea8736c19f1d28992e24c8dc8ce86752918bfeaae7" +checksum = "8ee524f98ddbe7772762a7477cfb22356df075cac4069bf81ac5082a46db742c" dependencies = [ "cc", "libc", @@ -1184,17 +1190,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "nix" -version = "0.26.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" -dependencies = [ - "bitflags 1.3.2", - "cfg-if", - "libc", -] - [[package]] name = "nix" version = "0.27.1" @@ -1278,7 +1273,7 @@ version = "3.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b8fcc794035347fb64beda2d3b462595dd2753e3f268d89c5aae77e8cf2c310" dependencies = [ - "base64", + "base64 0.21.7", "serde", ] @@ -1517,7 +1512,7 @@ version = "0.11.23" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "37b1ae8d9ac08420c66222fb9096fc5de435c3c48542bc5336c51892cffafb41" dependencies = [ - "base64", + "base64 0.21.7", "bytes", "encoding_rs", "futures-core", @@ -1577,9 +1572,9 @@ dependencies = [ [[package]] name = "rtnetlink" -version = "0.13.1" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a552eb82d19f38c3beed3f786bd23aa434ceb9ac43ab44419ca6d67a7e186c0" +checksum = "b684475344d8df1859ddb2d395dd3dac4f8f3422a1aa0725993cb375fc5caba5" dependencies = [ "futures", "log", @@ -1588,7 +1583,7 @@ dependencies = [ "netlink-packet-utils", "netlink-proto", "netlink-sys", - "nix 0.26.4", + "nix 0.27.1", "thiserror", "tokio", ] @@ -1801,9 +1796,9 @@ checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" [[package]] name = "strsim" -version = "0.10.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" +checksum = "5ee073c9e4cd00e28217186dbe12796d692868f432bf2e97ee73bed0c56dfa01" [[package]] name = "subtle" @@ -1963,9 +1958,9 @@ dependencies = [ [[package]] name = "tokio-stream" -version = "0.1.14" +version = "0.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842" +checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af" dependencies = [ "futures-core", "pin-project-lite", @@ -2001,9 +1996,9 @@ dependencies = [ [[package]] name = "toml" -version = "0.8.10" +version = "0.8.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a9aad4a3066010876e8dcf5a8a06e70a558751117a145c6ce2b82c2e2054290" +checksum = "e9dd1545e8208b4a5af1aa9bbd0b4cf7e9ea08fabc5d0a5c67fcaafa17433aa3" dependencies = [ "serde", "serde_spanned", @@ -2022,9 +2017,9 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.22.6" +version = "0.22.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c1b5fd4128cc8d3e0cb74d4ed9a9cc7c7284becd4df68f5f940e1ad123606f6" +checksum = "c12219811e0c1ba077867254e5ad62ee2c9c190b0d957110750ac0cda1ae96cd" dependencies = [ "indexmap", "serde", diff --git a/pkgs/by-name/my/mycelium/package.nix b/pkgs/by-name/my/mycelium/package.nix index b3aee2f9ff3e..ce67e2704637 100644 --- a/pkgs/by-name/my/mycelium/package.nix +++ b/pkgs/by-name/my/mycelium/package.nix @@ -7,13 +7,13 @@ rustPlatform.buildRustPackage rec { pname = "mycelium"; - version = "0.4.3"; + version = "0.4.5"; src = fetchFromGitHub { owner = "threefoldtech"; repo = "mycelium"; rev = "v${version}"; - hash = "sha256-bA3ci+vqXBCPBaxMvfUdFcqdaZbAw/+r5UbH/as/fnc="; + hash = "sha256-AJA1yd7P9zHOIdSOR2bAHgL5NyoyqzgNIEs8ObgD4Mo="; }; cargoLock = { diff --git a/pkgs/by-name/tl/tlrc/package.nix b/pkgs/by-name/tl/tlrc/package.nix index dd59312600a7..5ac8fe12fb97 100644 --- a/pkgs/by-name/tl/tlrc/package.nix +++ b/pkgs/by-name/tl/tlrc/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "tlrc"; - version = "1.9.0"; + version = "1.9.1"; src = fetchFromGitHub { owner = "tldr-pages"; repo = "tlrc"; rev = "v${version}"; - hash = "sha256-SoWGZXBAqWWg5kwwpWuiA7iGqq9RNok/LqsjPAy6O+k="; + hash = "sha256-RzGw4rvak055V48bkeuzKAH6F/wlFMLya8Ny3mgU+H4="; }; - cargoHash = "sha256-+HxRu8t6nofeE9WrDxQhebWIgeMYeMSXnHtHR1OHGzw="; + cargoHash = "sha256-BbBt6oCO9y++EWx9/CXISGfB/FEcEPKYeXNXcejevrg="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/ty/typstyle/package.nix b/pkgs/by-name/ty/typstyle/package.nix new file mode 100644 index 000000000000..1ef0f9b47f35 --- /dev/null +++ b/pkgs/by-name/ty/typstyle/package.nix @@ -0,0 +1,46 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, pkg-config +, libgit2 +, zlib +, stdenv +, darwin +}: + +rustPlatform.buildRustPackage rec { + pname = "typstyle"; + version = "0.11.5"; + + src = fetchFromGitHub { + owner = "Enter-tainer"; + repo = "typstyle"; + rev = "v${version}"; + hash = "sha256-jAsKktTgvmZ4NKr1QpJPYjI2HRSw8CPBfJTETVyiRhg="; + }; + + cargoHash = "sha256-oLJWgF5byM3sY3Bs/wpSrBqjNg4sHDF3RIsWZBiguGI="; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + libgit2 + zlib + ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.CoreFoundation + darwin.apple_sdk.frameworks.CoreServices + darwin.apple_sdk.frameworks.Security + darwin.apple_sdk.frameworks.SystemConfiguration + ]; + + meta = { + changelog = "https://github.com/Enter-tainer/typstyle/blob/${src.rev}/CHANGELOG.md"; + description = "Format your typst source code"; + homepage = "https://github.com/Enter-tainer/typstyle"; + license = lib.licenses.asl20; + mainProgram = "typstyle"; + maintainers = with lib.maintainers; [ drupol ]; + }; +} diff --git a/pkgs/by-name/wy/wyoming-satellite/package.nix b/pkgs/by-name/wy/wyoming-satellite/package.nix new file mode 100644 index 000000000000..45c0ff03eeb1 --- /dev/null +++ b/pkgs/by-name/wy/wyoming-satellite/package.nix @@ -0,0 +1,60 @@ +{ lib +, python3Packages +, fetchFromGitHub +}: + +python3Packages.buildPythonApplication rec { + pname = "wyoming-satellite"; + version = "1.2.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "rhasspy"; + repo = "wyoming-satellite"; + rev = "refs/tags/v${version}"; + hash = "sha256-KIWhWE9Qaxs72fJ1LRTkvk6QtpBJOFlmZv2od69O15g="; + }; + + nativeBuildInputs = with python3Packages; [ + setuptools + pythonRelaxDepsHook + ]; + + pythonRelaxDeps = [ + "zeroconf" + ]; + + propagatedBuildInputs = with python3Packages; [ + pyring-buffer + wyoming + zeroconf + ]; + + passthru.optional-dependencies = { + silerovad = with python3Packages; [ + pysilero-vad + ]; + webrtc = with python3Packages; [ + webrtc-noise-gain + ]; + }; + + pythonImportsCheck = [ + "wyoming_satellite" + ]; + + nativeCheckInputs = with python3Packages; [ + pytest-asyncio + pytestCheckHook + ]; + + + meta = with lib; { + description = "Remote voice satellite using Wyoming protocol"; + homepage = "https://github.com/rhasspy/wyoming-satellite"; + changelog = "https://github.com/rhasspy/wyoming-satellite/blob/${src.rev}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ hexa ]; + mainProgram = "wyoming-satellite"; + }; +} diff --git a/pkgs/data/fonts/google-fonts/default.nix b/pkgs/data/fonts/google-fonts/default.nix index d0f055166805..bb3fc3ab0c1d 100644 --- a/pkgs/data/fonts/google-fonts/default.nix +++ b/pkgs/data/fonts/google-fonts/default.nix @@ -40,12 +40,10 @@ stdenvNoCC.mkDerivation { dontBuild = true; - # The font files are in the fonts directory and use two naming schemes: - # FamilyName-StyleName.ttf and FamilyName[param1,param2,...].ttf - # This installs all fonts if fonts is empty and otherwise only - # the specified fonts by FamilyName. To do this, it invokes - # `find` 2 times for every font, anyone is free to do this - # in a more efficient way. + # The font files are in the fonts directory and use three naming schemes: + # FamilyName-StyleName.ttf, FamilyName[param1,param2,...].ttf, and + # FamilyName.ttf. This installs all fonts if fonts is empty and otherwise + # only the specified fonts by FamilyName. fonts = map (font: builtins.replaceStrings [" "] [""] font) fonts; installPhase = '' adobeBlankDest=$adobeBlank/share/fonts/truetype @@ -56,8 +54,7 @@ stdenvNoCC.mkDerivation { find . -name '*.ttf' -exec install -m 444 -Dt $dest '{}' + '' else '' for font in $fonts; do - find . -name "$font-*.ttf" -exec install -m 444 -Dt $dest '{}' + - find . -name "$font[*.ttf" -exec install -m 444 -Dt $dest '{}' + + find . \( -name "$font-*.ttf" -o -name "$font[*.ttf" -o -name "$font.ttf" \) -exec install -m 444 -Dt $dest '{}' + done ''); diff --git a/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix b/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix index dff4189a1a2d..2588a133ba7b 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix @@ -72,7 +72,7 @@ let export XDG_DATA_DIRS=@out@/share:$XDG_DATA_DIRS # Start pantheon session. Keep in sync with upstream - exec ${gnome-session}/bin/gnome-session --builtin --session=pantheon "$@" + exec ${gnome-session}/bin/gnome-session --session=pantheon "$@" ''; # Absolute path patched version of the upstream xsession diff --git a/pkgs/desktops/pantheon/desktop/gala/default.nix b/pkgs/desktops/pantheon/desktop/gala/default.nix index 61d9c120b246..123870c356de 100644 --- a/pkgs/desktops/pantheon/desktop/gala/default.nix +++ b/pkgs/desktops/pantheon/desktop/gala/default.nix @@ -70,6 +70,9 @@ stdenv.mkDerivation rec { postPatch = '' chmod +x build-aux/meson/post_install.py patchShebangs build-aux/meson/post_install.py + + # https://github.com/elementary/gala/issues/1826#issuecomment-1890461298 + sed '2i Wants=io.elementary.gala.daemon@.service' -i 'data/gala@x11.service.in' ''; passthru = { diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix index 5abe309624bb..d29fb743c7dc 100644 --- a/pkgs/development/compilers/vala/default.nix +++ b/pkgs/development/compilers/vala/default.nix @@ -14,15 +14,10 @@ let # https://github.com/openembedded/openembedded-core/blob/a5440d4288e09d3e/meta/recipes-devtools/vala/vala/disable-graphviz.patch graphvizPatch = { - "0.48" = ./disable-graphviz-0.46.1.patch; - - "0.54" = ./disable-graphviz-0.46.1.patch; - "0.56" = ./disable-graphviz-0.56.8.patch; - }.${lib.versions.majorMinor version} or (throw "no graphviz patch for this version of vala"); - disableGraphviz = lib.versionAtLeast version "0.38" && !withGraphviz; + disableGraphviz = !withGraphviz; in stdenv.mkDerivation rec { pname = "vala"; @@ -55,14 +50,14 @@ let nativeBuildInputs = [ pkg-config flex bison libxslt - ] ++ lib.optional (stdenv.isDarwin && (lib.versionAtLeast version "0.38")) expat + ] ++ lib.optional (stdenv.isDarwin) expat ++ lib.optional disableGraphviz autoreconfHook # if we changed our ./configure script, need to reconfigure ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ vala ] ++ extraNativeBuildInputs; buildInputs = [ glib libiconv libintl - ] ++ lib.optional (lib.versionAtLeast version "0.38" && withGraphviz) graphviz + ] ++ lib.optional (withGraphviz) graphviz ++ extraBuildInputs; enableParallelBuilding = true; @@ -90,16 +85,6 @@ let }); in rec { - vala_0_48 = generic { - version = "0.48.25"; - sha256 = "UMs8Xszdx/1DaL+pZBSlVgReedKxWmiRjHJ7jIOxiiQ="; - }; - - vala_0_54 = generic { - version = "0.54.9"; - sha256 = "hXLA6Nd9eMFZfVFgCPBUDH50leA10ou0wlzJk+U85LQ="; - }; - vala_0_56 = generic { version = "0.56.14"; sha256 = "k4LCaMqb3AKq7cgVKpgYvzk1JzBB9inFbeQQ42Cj9Vc="; diff --git a/pkgs/development/compilers/vala/disable-graphviz-0.46.1.patch b/pkgs/development/compilers/vala/disable-graphviz-0.46.1.patch deleted file mode 100644 index 7c2ded4c8eda..000000000000 --- a/pkgs/development/compilers/vala/disable-graphviz-0.46.1.patch +++ /dev/null @@ -1,280 +0,0 @@ -diff --git a/Makefile.am b/Makefile.am -index f70234759..b3d6c3833 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -13,19 +13,9 @@ SUBDIRS = \ - doc \ - gobject-introspection \ - vapigen \ -- $(NULL) -- --if ENABLE_VALADOC --SUBDIRS += \ - libvaladoc \ - valadoc \ - $(NULL) --endif -- --DISTCHECK_CONFIGURE_FLAGS = \ -- --enable-valadoc \ -- --enable-unversioned \ -- $(NULL) - - if ENABLE_UNVERSIONED - aclocaldir = $(datadir)/aclocal -diff --git a/configure.ac b/configure.ac -index 6de326bbb..91f159b16 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -160,10 +160,11 @@ AC_SUBST(GMODULE_CFLAGS) - AC_SUBST(GMODULE_LIBS) - - AC_ARG_WITH(cgraph, AS_HELP_STRING([--with-cgraph], [Required flag for cross-compilation to define capability of graphviz]), [], with_cgraph=check) --AC_ARG_ENABLE(valadoc, AS_HELP_STRING([--disable-valadoc], [Disable valadoc]), enable_valadoc=$enableval, enable_valadoc=yes) --if test x$enable_valadoc = xyes; then -+AC_ARG_ENABLE(graphviz, AS_HELP_STRING([--disable-graphviz], [Disable graphviz usage for valadoc]), enable_graphviz=$enableval, enable_graphviz=yes) -+if test x$enable_graphviz = xyes; then - PKG_CHECK_MODULES(LIBGVC, libgvc >= $LIBGVC_REQUIRED) - AC_MSG_CHECKING([for CGRAPH]) -+ VALAFLAGS="$VALAFLAGS -D HAVE_GRAPHVIZ" - cgraph_tmp_LIBADD="$LIBADD" - cgraph_tmp_CFLAGS="$CFLAGS" - LIBADD="$LIBADD $LIBGVC_LIBS" -@@ -201,8 +202,8 @@ if test x$enable_valadoc = xyes; then - LIBADD="$cgraph_tmp_LIBADD" - CFLAGS="$cgraph_tmp_CFLAGS" - fi -+AM_CONDITIONAL(ENABLE_GRAPHVIZ, test x$enable_graphviz = xyes) - AM_CONDITIONAL(HAVE_CGRAPH, test "$have_cgraph" = "yes") --AM_CONDITIONAL(ENABLE_VALADOC, test x$enable_valadoc = xyes) - - AC_PATH_PROG([XSLTPROC], [xsltproc], :) - AM_CONDITIONAL(HAVE_XSLTPROC, test "$XSLTPROC" != :) -diff --git a/doc/Makefile.am b/doc/Makefile.am -index d2684a0e0..b343c7c10 100644 ---- a/doc/Makefile.am -+++ b/doc/Makefile.am -@@ -6,16 +6,11 @@ SUBDIRS = \ - - dist_man_MANS = \ - valac.1 \ -+ valadoc.1 \ - vala-gen-introspect.1 \ - vapigen.1 \ - $(NULL) - --if ENABLE_VALADOC --dist_man_MANS += \ -- valadoc.1 \ -- $(NULL) --endif -- - EXTRA_DIST = \ - valac.h2m \ - valadoc.h2m \ -@@ -24,11 +19,7 @@ EXTRA_DIST = \ - $(NULL) - - if HAVE_HELP2MAN --if ENABLE_VALADOC - manpages: valac.1 valadoc.1 vala-gen-introspect.1 vapigen.1 --else --manpages: valac.1 vala-gen-introspect.1 vapigen.1 --endif - @rm $^ - $(MAKE) $(AM_MAKEFLAGS) $^ - -@@ -37,13 +28,11 @@ valac.1: - --include $(srcdir)/valac.h2m \ - --libtool --no-info \ - --output=$@ --if ENABLE_VALADOC - valadoc.1: - $(HELP2MAN) $(top_builddir)/valadoc/valadoc \ - --include $(srcdir)/valadoc.h2m \ - --libtool --no-info \ - --output=$@ --endif - vala-gen-introspect.1: - $(HELP2MAN) $(top_builddir)/gobject-introspection/gen-introspect \ - --include $(srcdir)/vala-gen-introspect.h2m \ -@@ -60,15 +49,12 @@ endif - if ENABLE_UNVERSIONED - install-data-hook: - cd $(DESTDIR)$(man1dir) && $(LN_S) -f valac@PACKAGE_SUFFIX@.1 valac.1 --if ENABLE_VALADOC - cd $(DESTDIR)$(man1dir) && $(LN_S) -f valadoc@PACKAGE_SUFFIX@.1 valadoc.1 --endif - cd $(DESTDIR)$(man1dir) && $(LN_S) -f vala-gen-introspect@PACKAGE_SUFFIX@.1 vala-gen-introspect.1 - cd $(DESTDIR)$(man1dir) && $(LN_S) -f vapigen@PACKAGE_SUFFIX@.1 vapigen.1 - endif - - --if ENABLE_VALADOC - COMMON_VALADOCFLAGS = \ - --force \ - --verbose \ -@@ -150,7 +136,6 @@ internal-apis/valadoc: $(valadoc_VALASOURCES) internal-apis/codegen - @touch $@ - - internal-api-docs: internal-apis/gee internal-apis/vala internal-apis/ccode internal-apis/codegen internal-apis/valadoc --endif - - clean-local: - rm -rf $(builddir)/internal-apis -diff --git a/libvaladoc/Makefile.am b/libvaladoc/Makefile.am -index 8a3924b54..81fde9ac8 100644 ---- a/libvaladoc/Makefile.am -+++ b/libvaladoc/Makefile.am -@@ -119,10 +119,6 @@ libvaladoc_la_VALASOURCES = \ - content/tablerow.vala \ - content/taglet.vala \ - content/text.vala \ -- charts/chart.vala \ -- charts/chartfactory.vala \ -- charts/hierarchychart.vala \ -- charts/simplechartfactory.vala \ - parser/manyrule.vala \ - parser/oneofrule.vala \ - parser/optionalrule.vala \ -@@ -149,13 +145,24 @@ libvaladoc_la_VALASOURCES = \ - highlighter/codetoken.vala \ - highlighter/highlighter.vala \ - html/basicdoclet.vala \ -- html/htmlchartfactory.vala \ - html/linkhelper.vala \ - html/cssclassresolver.vala \ - html/htmlmarkupwriter.vala \ - html/htmlrenderer.vala \ - $(NULL) - -+if ENABLE_GRAPHVIZ -+libvaladoc_la_VALASOURCES += \ -+ charts/chart.vala \ -+ charts/chartfactory.vala \ -+ charts/hierarchychart.vala \ -+ charts/simplechartfactory.vala \ -+ html/htmlchartfactory.vala \ -+ $(NULL) -+ -+LIBGVC_PKG = --vapidir $(top_srcdir)/vapi --pkg libgvc -+endif -+ - libvaladoc@PACKAGE_SUFFIX@_la_SOURCES = \ - libvaladoc.vala.stamp \ - $(libvaladoc_la_VALASOURCES:.vala=.c) \ -@@ -175,11 +182,11 @@ libvaladoc.vala.stamp: $(libvaladoc_la_VALASOURCES) - --library valadoc \ - --vapi valadoc@PACKAGE_SUFFIX@.vapi \ - --vapidir $(top_srcdir)/vapi --pkg gmodule-2.0 \ -- --vapidir $(top_srcdir)/vapi --pkg libgvc \ - --vapidir $(top_srcdir)/gee --pkg gee \ - --vapidir $(top_srcdir)/vala --pkg vala \ - --vapidir $(top_srcdir)/ccode --pkg ccode \ - --vapidir $(top_srcdir)/codegen --pkg codegen \ -+ $(LIBGVC_PKG) \ - --pkg config \ - $(filter %.vala %.c,$^) - touch $@ -@@ -207,6 +214,9 @@ nodist_pkgconfig_DATA = valadoc@PACKAGE_SUFFIX@.pc - - valadoc@PACKAGE_SUFFIX@.pc: valadoc.pc - cp $< $@ -+if !ENABLE_GRAPHVIZ -+ sed -i "s/libgvc //g" $@ -+endif - - vapidir = $(datadir)/vala/vapi - dist_vapi_DATA = valadoc@PACKAGE_SUFFIX@.vapi -@@ -214,6 +224,9 @@ nodist_vapi_DATA = valadoc@PACKAGE_SUFFIX@.deps - - valadoc@PACKAGE_SUFFIX@.deps: valadoc.deps - cp $< $@ -+if !ENABLE_GRAPHVIZ -+ sed -i "s/libgvc//g" $@ -+endif - - EXTRA_DIST = \ - $(libvaladoc_la_VALASOURCES) \ -diff --git a/libvaladoc/html/basicdoclet.vala b/libvaladoc/html/basicdoclet.vala -index 46578c28f..f6ce7097c 100644 ---- a/libvaladoc/html/basicdoclet.vala -+++ b/libvaladoc/html/basicdoclet.vala -@@ -46,7 +46,11 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet { - protected HtmlRenderer _renderer; - protected Html.MarkupWriter writer; - protected Html.CssClassResolver cssresolver; -+#if HAVE_GRAPHVIZ - protected Charts.Factory image_factory; -+#else -+ protected void* image_factory; -+#endif - protected ErrorReporter reporter; - protected string package_list_link = "../index.html"; - -@@ -120,7 +124,9 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet { - this.linker = new LinkHelper (); - - _renderer = new HtmlRenderer (settings, this.linker, this.cssresolver); -+#if HAVE_GRAPHVIZ - this.image_factory = new SimpleChartFactory (settings, linker); -+#endif - } - - -@@ -1025,6 +1031,7 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet { - } - - protected void write_image_block (Api.Node element) { -+#if HAVE_GRAPHVIZ - if (element is Class || element is Interface || element is Struct) { - unowned string format = (settings.use_svg_images ? "svg" : "png"); - var chart = new Charts.Hierarchy (image_factory, element); -@@ -1044,6 +1051,7 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet { - this.get_img_path_html (element, format)}); - writer.add_usemap (chart); - } -+#endif - } - - public void write_namespace_content (Namespace node, Api.Node? parent) { -diff --git a/libvaladoc/html/htmlmarkupwriter.vala b/libvaladoc/html/htmlmarkupwriter.vala -index 5aa4afdea..e79b0b8f5 100644 ---- a/libvaladoc/html/htmlmarkupwriter.vala -+++ b/libvaladoc/html/htmlmarkupwriter.vala -@@ -51,12 +51,16 @@ public class Valadoc.Html.MarkupWriter : Valadoc.MarkupWriter { - } - } - -+#if HAVE_GRAPHVIZ - public unowned MarkupWriter add_usemap (Charts.Chart chart) { - string? buf = (string?) chart.write_buffer ("cmapx"); - if (buf != null) { - raw_text ("\n"); - raw_text ((!) buf); - } -+#else -+ public unowned MarkupWriter add_usemap (void* chart) { -+#endif - - return this; - } -diff --git i/libvaladoc/Makefile.am w/libvaladoc/Makefile.am -index 8dc398cf1..a5d8a45b4 100644 ---- i/libvaladoc/Makefile.am -+++ w/libvaladoc/Makefile.am -@@ -176,9 +176,13 @@ endif - libvaladoc@PACKAGE_SUFFIX@_la_SOURCES = \ - libvaladoc.vala.stamp \ - $(libvaladoc_la_VALASOURCES:.vala=.c) \ -- gvc-compat.c \ - $(NULL) - -+if ENABLE_GRAPHVIZ -+libvaladoc@PACKAGE_SUFFIX@_la_SOURCES += \ -+ gvc-compat.c -+endif -+ - valadoc@PACKAGE_SUFFIX@.vapi valadoc.h: libvaladoc.vala.stamp - libvaladoc.vala.stamp: $(libvaladoc_la_VALASOURCES) - $(VALA_V)$(VALAC) \ diff --git a/pkgs/development/coq-modules/metacoq/default.nix b/pkgs/development/coq-modules/metacoq/default.nix index 5695bcf2ee99..174f44b7702a 100644 --- a/pkgs/development/coq-modules/metacoq/default.nix +++ b/pkgs/development/coq-modules/metacoq/default.nix @@ -13,8 +13,9 @@ let { case = "8.14"; out = "1.1-8.14"; } { case = "8.15"; out = "1.1-8.15"; } { case = "8.16"; out = "1.1-8.16"; } - { case = "8.17"; out = "1.2.1-8.17"; } - { case = "8.18"; out = "1.2.1-8.18"; } + { case = "8.17"; out = "1.3.1-8.17"; } + { case = "8.18"; out = "1.3.1-8.18"; } + { case = "8.19"; out = "1.3.1-8.19"; } ] null; release = { "1.0-beta2-8.11".sha256 = "sha256-I9YNk5Di6Udvq5/xpLSNflfjRyRH8fMnRzbo3uhpXNs="; @@ -28,6 +29,9 @@ let "1.1-8.16".sha256 = "sha256-cTK4ptxpPPlqxAhasZFX3RpSlsoTZwhTqs2A3BZy9sA="; "1.2.1-8.17".sha256 = "sha256-FP4upuRsG8B5Q5FIr76t+ecRirrOUX0D1QiLq0/zMyE="; "1.2.1-8.18".sha256 = "sha256-49g5db2Bv8HpltptJdxA7zrmgNFGC6arx5h2mKHhrko="; + "1.3.1-8.17".sha256 = "sha256-l0/QLC7V3zSk/FsaE2eL6tXy2BzbcI5MAk/c+FESwnc="; + "1.3.1-8.18".sha256 = "sha256-L6Ym4Auwqaxv5tRmJLSVC812dxCqdUU5aN8+t5HVYzY="; + "1.3.1-8.19".sha256 = "sha256-fZED/Uel1jt5XF83dR6HfyhSkfBdLkET8C/ArDgsm64="; }; releaseRev = v: "v${v}"; diff --git a/pkgs/development/libraries/libkrun/default.nix b/pkgs/development/libraries/libkrun/default.nix index dbee4c9a3582..6a6632029927 100644 --- a/pkgs/development/libraries/libkrun/default.nix +++ b/pkgs/development/libraries/libkrun/default.nix @@ -13,18 +13,18 @@ stdenv.mkDerivation rec { pname = "libkrun"; - version = "1.7.2"; + version = "1.8.1"; src = fetchFromGitHub { owner = "containers"; repo = "libkrun"; rev = "refs/tags/v${version}"; - hash = "sha256-cP+Pxl/9QIsoGysXTBZJ86q57cIMA7TJenMWtcOI+Y4="; + hash = "sha256-rrNiqwx4aEOB3fTyv8xcZEDsNJX4NNPhp13W0qnl1O0="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit pname version src; - hash = "sha256-qVyHC015QJEt6LZ8br3H0nucYKhYGBMtyB2IBaixTqk="; + hash = "sha256-6Zfy0LtxUDZzwlhul2fZpsI1c7GWntAMfsT6j+QefVs="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/aadict/default.nix b/pkgs/development/python-modules/aadict/default.nix index d6b5bdf9c6f0..4ddf06bbb700 100644 --- a/pkgs/development/python-modules/aadict/default.nix +++ b/pkgs/development/python-modules/aadict/default.nix @@ -2,27 +2,40 @@ , buildPythonPackage , fetchPypi , six -, nose -, coverage +, pynose +, setuptools }: buildPythonPackage rec { pname = "aadict"; version = "0.2.3"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; - sha256 = "013pn9ii6mkql6khgdvsd1gi7zmya418fhclm5fp7dfvann2hwx7"; + hash = "sha256-p3MorFXbtXNdqZRBhwJRvv4TX2h6twenoXhWE2OydwQ="; }; - propagatedBuildInputs = [ six ]; - nativeCheckInputs = [ nose coverage ]; + build-system = [ + setuptools + ]; + + dependencies = [ + six + ]; + + nativeCheckInputs = [ + pynose + ]; + + pythonImportsCheck = [ + "aadict" + ]; meta = with lib; { + description = "An auto-attribute dict (and a couple of other useful dict functions)"; homepage = "https://github.com/metagriffin/aadict"; - description = "An auto-attribute dict (and a couple of other useful dict functions)."; + license = licenses.gpl3Plus; maintainers = with maintainers; [ glittershark ]; - license = licenses.gpl3; }; } diff --git a/pkgs/development/python-modules/actdiag/default.nix b/pkgs/development/python-modules/actdiag/default.nix index 6d04df9d9671..070bcd72ed4a 100644 --- a/pkgs/development/python-modules/actdiag/default.nix +++ b/pkgs/development/python-modules/actdiag/default.nix @@ -2,7 +2,7 @@ , blockdiag , buildPythonPackage , fetchFromGitHub -, nose +, pynose , pytestCheckHook , pythonOlder , setuptools @@ -11,24 +11,27 @@ buildPythonPackage rec { pname = "actdiag"; version = "3.0.0"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "blockdiag"; - repo = pname; - rev = version; + repo = "actdiag"; + rev = "refs/tags/${version}"; hash = "sha256-WmprkHOgvlsOIg8H77P7fzEqxGnj6xaL7Df7urRkg3o="; }; - propagatedBuildInputs = [ - blockdiag + build-system = [ setuptools ]; + propagatedBuildInputs = [ + blockdiag + ]; + nativeCheckInputs = [ - nose + pynose pytestCheckHook ]; @@ -36,16 +39,23 @@ buildPythonPackage rec { "src/actdiag/tests/" ]; + disabledTests = [ + # AttributeError: 'TestRstDirectives' object has no attribute 'assertRegexpMatches' + "svg" + "noviewbox" + ]; + pythonImportsCheck = [ "actdiag" ]; meta = with lib; { description = "Generate activity-diagram image from spec-text file (similar to Graphviz)"; - mainProgram = "actdiag"; homepage = "http://blockdiag.com/"; + changelog = "https://github.com/blockdiag/actdiag/blob/${version}/CHANGES.rst"; license = licenses.asl20; - platforms = platforms.unix; maintainers = with maintainers; [ bjornfor ]; + mainProgram = "actdiag"; + platforms = platforms.unix; }; } diff --git a/pkgs/development/python-modules/approvaltests/default.nix b/pkgs/development/python-modules/approvaltests/default.nix index 16b7c1d29dcb..b396c69a61e5 100644 --- a/pkgs/development/python-modules/approvaltests/default.nix +++ b/pkgs/development/python-modules/approvaltests/default.nix @@ -5,6 +5,7 @@ , buildPythonPackage , empty-files , fetchFromGitHub +, fetchpatch2 , mock , mrjob , numpy @@ -20,7 +21,7 @@ buildPythonPackage rec { pname = "approvaltests"; - version = "11.1.2"; + version = "11.1.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -29,14 +30,21 @@ buildPythonPackage rec { owner = "approvals"; repo = "ApprovalTests.Python"; rev = "refs/tags/v${version}"; - hash = "sha256-VM4TP98bS9NmhxZz+YHMJrHKr5g6E6aYidxjKQyXp7k="; + hash = "sha256-VqE2Oj3b+ZfKT+fhJ9DxBClfa8Wz8w/puAnAotN3eG4="; }; - nativeBuildInputs = [ + patches = [ + (fetchpatch2 { + url = "https://github.com/approvals/ApprovalTests.Python/commit/dac7c8a8aa62f31dca7a687d4dbf08158351d5e1.patch"; + hash = "sha256-TMyfXNtzpGci6tdFRhxiKJRjCWRD5LkaffPY8EVj53E="; + }) + ]; + + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ allpairspy approval-utilities beautifulsoup4 @@ -56,7 +64,7 @@ buildPythonPackage rec { ]; disabledTests = [ - # Tests expects paths below ApprovalTests.Python directory + # Tests expect paths below ApprovalTests.Python directory "test_received_filename" "test_pytest_namer" ]; diff --git a/pkgs/development/python-modules/asciimatics/default.nix b/pkgs/development/python-modules/asciimatics/default.nix index 68607924c1de..0a9736bebe50 100644 --- a/pkgs/development/python-modules/asciimatics/default.nix +++ b/pkgs/development/python-modules/asciimatics/default.nix @@ -1,45 +1,40 @@ { lib , buildPythonPackage , fetchPypi -, setuptools-scm -, pyfiglet , pillow +, pyfiglet +, pytestCheckHook +, pythonOlder +, setuptools-scm , wcwidth -, future -, mock -, nose }: buildPythonPackage rec { pname = "asciimatics"; version = "1.15.0"; - format = "setuptools"; + pyproject = true; + + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; hash = "sha256-z905gEJydRnYtz5iuO+CwL7P7U60IImcO5bJjQuWgho="; }; - nativeBuildInputs = [ + build-system = [ setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ pyfiglet pillow wcwidth - future ]; nativeCheckInputs = [ - mock - nose + pytestCheckHook ]; - # tests require a pty emulator - # which is too complicated to setup here - doCheck = false; - pythonImportsCheck = [ "asciimatics.effects" "asciimatics.renderers" @@ -48,8 +43,9 @@ buildPythonPackage rec { ]; meta = with lib; { - description = "Helps to create full-screen text UIs (from interactive forms to ASCII animations) on any platform"; + description = "Module to create full-screen text UIs (from interactive forms to ASCII animations)"; homepage = "https://github.com/peterbrittain/asciimatics"; + changelog = "https://github.com/peterbrittain/asciimatics/releases/tag/${version}"; license = licenses.asl20; maintainers = with maintainers; [ cmcdragonkai ]; }; diff --git a/pkgs/development/python-modules/b2sdk/default.nix b/pkgs/development/python-modules/b2sdk/default.nix index a6a805fd33ad..a878a17b0f2a 100644 --- a/pkgs/development/python-modules/b2sdk/default.nix +++ b/pkgs/development/python-modules/b2sdk/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "b2sdk"; - version = "1.32.0"; + version = "1.33.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "Backblaze"; repo = "b2-sdk-python"; rev = "refs/tags/v${version}"; - hash = "sha256-xBLMvH51zbrSuBOtMxLeQJt7Wv31OcxBbD72EuLHzuU="; + hash = "sha256-eMFgsjEb0DMTLqG+8IZru1dEAuKZW4dEszrznZxR+mc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/bc-python-hcl2/default.nix b/pkgs/development/python-modules/bc-python-hcl2/default.nix index 7f3832eeeb05..dc74d1612760 100644 --- a/pkgs/development/python-modules/bc-python-hcl2/default.nix +++ b/pkgs/development/python-modules/bc-python-hcl2/default.nix @@ -2,14 +2,15 @@ , buildPythonPackage , fetchPypi , lark -, nose +, pynose , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "bc-python-hcl2"; version = "0.4.2"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.6"; @@ -20,10 +21,11 @@ buildPythonPackage rec { # Nose is required during build process, so can not use `nativeCheckInputs`. buildInputs = [ - nose + pynose + setuptools ]; - propagatedBuildInputs = [ + dependencies = [ lark ]; @@ -36,7 +38,6 @@ buildPythonPackage rec { meta = with lib; { description = "Parser for HCL2 written in Python using Lark"; - mainProgram = "hcl2tojson"; longDescription = '' This parser only supports HCL2 and isn't backwards compatible with HCL v1. It can be used to parse any HCL2 config file such as Terraform. @@ -46,5 +47,6 @@ buildPythonPackage rec { homepage = "https://github.com/amplify-education/python-hcl2"; license = licenses.mit; maintainers = with maintainers; [ anhdle14 ]; + mainProgram = "hcl2tojson"; }; } diff --git a/pkgs/development/python-modules/blockdiag/default.nix b/pkgs/development/python-modules/blockdiag/default.nix index 4444e3475946..47b598b306cb 100644 --- a/pkgs/development/python-modules/blockdiag/default.nix +++ b/pkgs/development/python-modules/blockdiag/default.nix @@ -1,31 +1,30 @@ { lib , buildPythonPackage , docutils +, ephem , fetchFromGitHub , fetchpatch , funcparserlib -, nose , pillow -, ephem -, pythonOlder +, pynose , pytestCheckHook +, pythonOlder , reportlab , setuptools , webcolors -, python }: buildPythonPackage rec { pname = "blockdiag"; version = "3.0.0"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "blockdiag"; repo = "blockdiag"; - rev = version; + rev = "refs/tags/${version}"; hash = "sha256-j8FoNUIJJOaahaol1MRPyY2jcPCEIlaAD4bmM2QKFFI="; }; @@ -38,18 +37,21 @@ buildPythonPackage rec { }) ]; - propagatedBuildInputs = [ + build-system = [ setuptools + ]; + + dependencies = [ + docutils funcparserlib pillow - webcolors reportlab - docutils + webcolors ]; nativeCheckInputs = [ ephem - nose + pynose pytestCheckHook ]; @@ -68,10 +70,11 @@ buildPythonPackage rec { meta = with lib; { description = "Generate block-diagram image from spec-text file (similar to Graphviz)"; - mainProgram = "blockdiag"; homepage = "http://blockdiag.com/"; + changelog = "https://github.com/blockdiag/blockdiag/blob/${version}/CHANGES.rst"; license = licenses.asl20; - platforms = platforms.unix; maintainers = with maintainers; [ bjornfor ]; + mainProgram = "blockdiag"; + platforms = platforms.unix; }; } diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix index a5e202469480..a796c7d5017e 100644 --- a/pkgs/development/python-modules/boto3-stubs/default.nix +++ b/pkgs/development/python-modules/boto3-stubs/default.nix @@ -365,14 +365,14 @@ buildPythonPackage rec { pname = "boto3-stubs"; - version = "1.34.72"; + version = "1.34.73"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-eQPciiA763TWI3smauBk/1qbJ2B0r3UAt9tIVEZJWWo="; + hash = "sha256-ok9aPF2xGPxYxkh/GozIpKggYmB5Fr+pcxKXygspBpc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/cle/default.nix b/pkgs/development/python-modules/cle/default.nix index df4594f76170..c1e0c3b5ad17 100644 --- a/pkgs/development/python-modules/cle/default.nix +++ b/pkgs/development/python-modules/cle/default.nix @@ -4,9 +4,9 @@ , cffi , fetchFromGitHub , minidump -, nose , pefile , pyelftools +, pynose , pytestCheckHook , pythonOlder , pyvex @@ -58,7 +58,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - nose + pynose pytestCheckHook ]; diff --git a/pkgs/development/python-modules/google-cloud-error-reporting/default.nix b/pkgs/development/python-modules/google-cloud-error-reporting/default.nix index a284b961291d..7705598e8097 100644 --- a/pkgs/development/python-modules/google-cloud-error-reporting/default.nix +++ b/pkgs/development/python-modules/google-cloud-error-reporting/default.nix @@ -15,21 +15,21 @@ buildPythonPackage rec { pname = "google-cloud-error-reporting"; - version = "1.10.0"; + version = "1.11.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-OyfMbjxwtrYLrXrjCVS+DFjGdGGsMsfHBrGzg66crkU="; + hash = "sha256-+oeVT/ag00BEObbqzkC/EazEwnrWvRURnz3gnCBbn4k="; }; - nativeBuildInputs = [ + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ google-api-core google-cloud-logging proto-plus diff --git a/pkgs/development/python-modules/google-nest-sdm/default.nix b/pkgs/development/python-modules/google-nest-sdm/default.nix index 44cd15ba33cd..2fb82e23543f 100644 --- a/pkgs/development/python-modules/google-nest-sdm/default.nix +++ b/pkgs/development/python-modules/google-nest-sdm/default.nix @@ -12,12 +12,13 @@ , pytestCheckHook , pythonOlder , requests-oauthlib +, setuptools }: buildPythonPackage rec { pname = "google-nest-sdm"; - version = "3.0.3"; - format = "setuptools"; + version = "3.0.4"; + pyproject = true; disabled = pythonOlder "3.10"; @@ -25,10 +26,14 @@ buildPythonPackage rec { owner = "allenporter"; repo = "python-google-nest-sdm"; rev = "refs/tags/${version}"; - hash = "sha256-VO/TY/QBzVFxqIumVJjw+Ic0hrqkRBS+7wQKBhcN9Jw="; + hash = "sha256-zYHrS9y15dcyDhOoky7sB2BYkpTL3PoyNbNewKKl19E="; }; - propagatedBuildInputs = [ + build-system = [ + setuptools + ]; + + dependencies = [ aiohttp google-auth google-auth-oauthlib @@ -57,10 +62,10 @@ buildPythonPackage rec { meta = with lib; { description = "Module for Google Nest Device Access using the Smart Device Management API"; - mainProgram = "google_nest"; homepage = "https://github.com/allenporter/python-google-nest-sdm"; changelog = "https://github.com/allenporter/python-google-nest-sdm/releases/tag/${version}"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; + mainProgram = "google_nest"; }; } diff --git a/pkgs/development/python-modules/librosa/default.nix b/pkgs/development/python-modules/librosa/default.nix index 48eae549523f..62d712aa7b1f 100644 --- a/pkgs/development/python-modules/librosa/default.nix +++ b/pkgs/development/python-modules/librosa/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildPythonPackage , fetchFromGitHub , fetchpatch @@ -108,6 +109,9 @@ buildPythonPackage rec { "test_load_resample" # does not converge "test_nnls_vector" + ] ++ lib.optionals stdenv.isDarwin [ + # https://github.com/librosa/librosa/pull/1808 + "test_pyin_multi_center" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/llama-index-readers-s3/default.nix b/pkgs/development/python-modules/llama-index-readers-s3/default.nix index 0cc7c10661e2..947a81bb76c4 100644 --- a/pkgs/development/python-modules/llama-index-readers-s3/default.nix +++ b/pkgs/development/python-modules/llama-index-readers-s3/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-index-readers-s3"; - version = "0.1.4"; + version = "0.1.5"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_readers_s3"; inherit version; - hash = "sha256-FjRIo0sJGJikX4T4Esew3pBxEp7E3kK7Ds2uXDJqMzQ="; + hash = "sha256-x3XaPKxnvYYzrJYDmXIKC9YOAOr1HOU1XnaaHIuQnhk="; }; build-system = [ diff --git a/pkgs/development/python-modules/mizani/default.nix b/pkgs/development/python-modules/mizani/default.nix index f54c01821240..1ab85c88c312 100644 --- a/pkgs/development/python-modules/mizani/default.nix +++ b/pkgs/development/python-modules/mizani/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "mizani"; - version = "0.11.0"; + version = "0.11.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "has2k1"; repo = "mizani"; rev = "refs/tags/v${version}"; - hash = "sha256-4xk8FCUiNOp5n512asYKcjAS7fsyExyMQiWg14XWwHY="; + hash = "sha256-rlzMvIQej8d7LCklNNZeIgtrGaB5A6lDd/1iQG+j+X8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 8a8d53bc1c49..c0909c69a4f4 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -163,7 +163,7 @@ rec { mypy-boto3-codebuild = buildMypyBoto3Package "codebuild" "1.34.70" "sha256-lv69lhMKJHRnooVrmGinfDEi7eVEe7O12GNNo5uZQQc="; - mypy-boto3-codecatalyst = buildMypyBoto3Package "codecatalyst" "1.34.0" "sha256-TsXVy8bx6kaj84PJiNNU+075Tx3WW0mrtZFOyLx9yT4="; + mypy-boto3-codecatalyst = buildMypyBoto3Package "codecatalyst" "1.34.73" "sha256-jQ/DIoWXQWo1oVWi4Gn88cxr78QCs45EVtgfc6fZkFk="; mypy-boto3-codecommit = buildMypyBoto3Package "codecommit" "1.34.6" "sha256-wCw6e7yvMjM+A6jXfB2D4Z+i9s3e/F9Ih/VxD6iiwws="; @@ -193,7 +193,7 @@ rec { mypy-boto3-comprehendmedical = buildMypyBoto3Package "comprehendmedical" "1.34.0" "sha256-4KzL56xU474te8tW5xVZo6D5Pwe3GLRQbQfX8CXTz9g="; - mypy-boto3-compute-optimizer = buildMypyBoto3Package "compute-optimizer" "1.34.0" "sha256-k/4Ixaf9n4J8Y5ELjuMZ2dn7DgKftmwQZfdHhYDMc6w="; + mypy-boto3-compute-optimizer = buildMypyBoto3Package "compute-optimizer" "1.34.73" "sha256-WOPbzONtQ+hnVYwWCWC2Q/E1mqWNww0K2tbJhZxjAHo="; mypy-boto3-config = buildMypyBoto3Package "config" "1.34.45" "sha256-LN1CcIOj9cgzSNCvnUVwLRNPXlitHAlt+5jj6wu6i8E="; @@ -251,7 +251,7 @@ rec { mypy-boto3-ebs = buildMypyBoto3Package "ebs" "1.34.0" "sha256-xIrrXOayZed+Jcn4CFXXNgKz/G+RdiuwA04wq+Ry/fs="; - mypy-boto3-ec2 = buildMypyBoto3Package "ec2" "1.34.71" "sha256-hjEJNB8/m1yE9f0yxoKZeVySRfCun1NGmL8UeqP8AXs="; + mypy-boto3-ec2 = buildMypyBoto3Package "ec2" "1.34.73" "sha256-/vEtJCIUBHeOX0ttyOID2/Ds2VCm6/eGEqRXE/ynrr4="; mypy-boto3-ec2-instance-connect = buildMypyBoto3Package "ec2-instance-connect" "1.34.63" "sha256-kExmGXEJ5jrvOewmWx7AjVb3boD5GU0cEUp/2PQhzlw="; @@ -263,7 +263,7 @@ rec { mypy-boto3-efs = buildMypyBoto3Package "efs" "1.34.0" "sha256-VAK7mfnPBPDC8Azm6Bxl86E8CkeArTmfgqYkIcSblYA="; - mypy-boto3-eks = buildMypyBoto3Package "eks" "1.34.53" "sha256-bmd/gv3krZZSeQDCYca/AFHkSBL4PTvx3ZEjItQ43QQ="; + mypy-boto3-eks = buildMypyBoto3Package "eks" "1.34.73" "sha256-sSVfQvBmH9wYnqInvF8ixsyb0pbvHPx0zQwfPxa5caE="; mypy-boto3-elastic-inference = buildMypyBoto3Package "elastic-inference" "1.34.0" "sha256-gbWKw0zDQf3qBlp1KeO7MX1j/GqRUpFAxLG0BKFrHBk="; @@ -327,7 +327,7 @@ rec { mypy-boto3-groundstation = buildMypyBoto3Package "groundstation" "1.34.0" "sha256-CR3w42iyXmyGMzjCM7M1LKqsIROMjXxxGM8coSTtJ3o="; - mypy-boto3-guardduty = buildMypyBoto3Package "guardduty" "1.34.59" "sha256-Q5itLyYcSK7tzlYjT4Dgdcm4bE2Dr+bl5kfHqV4D9Pg="; + mypy-boto3-guardduty = buildMypyBoto3Package "guardduty" "1.34.73" "sha256-DasHgBMa4/hnh/otzh0Zz4nalmESIS2/HkaY4vTltRs="; mypy-boto3-health = buildMypyBoto3Package "health" "1.34.0" "sha256-st3ygy9yZbAbh1ZWnT8XDZTBz1qWhRWXCEfr5ILQHpo="; @@ -519,7 +519,7 @@ rec { mypy-boto3-nimble = buildMypyBoto3Package "nimble" "1.34.0" "sha256-i0E9kLunDRl+XzU3Ti3vxqHNa2oGHQQ9xDjCtNKi1Lw="; - mypy-boto3-oam = buildMypyBoto3Package "oam" "1.34.0" "sha256-/0ou6QtLQerkqJ+alocpYxUfe9jRHoOgQy9R6sxZAFo="; + mypy-boto3-oam = buildMypyBoto3Package "oam" "1.34.73" "sha256-MAnS/E6BKcaubeOdblitGzS7y7YUZr35M4679iJL6lE="; mypy-boto3-omics = buildMypyBoto3Package "omics" "1.34.7" "sha256-Mtb11Oe2j28u+MFaycvMMNiqi7ZdVDcKQV/X/7npze4="; @@ -575,7 +575,7 @@ rec { mypy-boto3-qldb-session = buildMypyBoto3Package "qldb-session" "1.34.0" "sha256-JHePiaFCfIJPxZzvC1U38xrBGkDvB9+yKwPecaZl7BY="; - mypy-boto3-quicksight = buildMypyBoto3Package "quicksight" "1.34.53" "sha256-aN1W1Hu/gyV181x68VNkbBp2Ua4jpJB3H/vmQ0HO1Nw="; + mypy-boto3-quicksight = buildMypyBoto3Package "quicksight" "1.34.73" "sha256-tbO9V8EiPR1OyCYImQHYmMsZtvclNK7Mnoqt3s0YRFM="; mypy-boto3-ram = buildMypyBoto3Package "ram" "1.34.0" "sha256-9sOspEfirpVQ8cT9ILUSWypxBswpAD75A0hHRV7glNg="; diff --git a/pkgs/development/python-modules/nwdiag/default.nix b/pkgs/development/python-modules/nwdiag/default.nix index a35d6159731a..54bd6a1f9fea 100644 --- a/pkgs/development/python-modules/nwdiag/default.nix +++ b/pkgs/development/python-modules/nwdiag/default.nix @@ -2,7 +2,7 @@ , blockdiag , fetchFromGitHub , buildPythonPackage -, nose +, pynose , pytestCheckHook , setuptools , pythonOlder @@ -11,24 +11,27 @@ buildPythonPackage rec { pname = "nwdiag"; version = "3.0.0"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "blockdiag"; - repo = pname; - rev = version; + repo = "nwdiag"; + rev = "refs/tags/${version}"; hash = "sha256-uKrdkXpL5YBr953sRsHknYg+2/WwrZmyDf8BMA2+0tU="; }; - propagatedBuildInputs = [ - blockdiag + build-system = [ setuptools ]; + dependencies = [ + blockdiag + ]; + nativeCheckInputs = [ - nose + pynose pytestCheckHook ]; @@ -37,8 +40,9 @@ buildPythonPackage rec { ]; disabledTests = [ - # UnicodeEncodeError: 'latin-1' codec can't encode... - "test_setup_inline_svg_is_true_with_multibytes" + # AttributeError: 'TestRstDirectives' object has no attribute 'assertRegexpMatches' + "svg" + "noviewbox" ]; pythonImportsCheck = [ @@ -48,8 +52,10 @@ buildPythonPackage rec { meta = with lib; { description = "Generate network-diagram image from spec-text file (similar to Graphviz)"; homepage = "http://blockdiag.com/"; + changelog = "https://github.com/blockdiag/nwdiag/blob/${version}/CHANGES.rst"; license = licenses.asl20; - platforms = platforms.unix; maintainers = with maintainers; [ bjornfor ]; + mainProgram = "rackdiag"; + platforms = platforms.unix; }; } diff --git a/pkgs/development/python-modules/pex/default.nix b/pkgs/development/python-modules/pex/default.nix index 6260a921ffa8..7b962064a832 100644 --- a/pkgs/development/python-modules/pex/default.nix +++ b/pkgs/development/python-modules/pex/default.nix @@ -7,17 +7,17 @@ buildPythonPackage rec { pname = "pex"; - version = "2.2.2"; + version = "2.3.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-g5D9v1CZ70viP0C/9lWwJvterJ2KH3oUCKRsxEr9Neg="; + hash = "sha256-fQ/IYjYZL7wUpxslCB6cSMVD19vB57Jw1i7/iK/SJFw="; }; - nativeBuildInputs = [ + build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/pubnub/default.nix b/pkgs/development/python-modules/pubnub/default.nix index 174139f5aaf4..b6437f880ddb 100644 --- a/pkgs/development/python-modules/pubnub/default.nix +++ b/pkgs/development/python-modules/pubnub/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "pubnub"; - version = "7.4.2"; + version = "7.4.3"; pyproject = true; disabled = pythonOlder "3.7"; @@ -24,14 +24,14 @@ buildPythonPackage rec { owner = pname; repo = "python"; rev = "refs/tags/v${version}"; - hash = "sha256-fmRFxSVzKN2ynuXJlpZcuIt4XIe7XHU4HSzSN1kCi2g="; + hash = "sha256-t3lNotfT3C2hv5AGPWZpL3wN68m8HRcjsccUz8QcY5I="; }; - nativeBuildInputs = [ + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ aiohttp cbor2 pycryptodomex diff --git a/pkgs/development/python-modules/pynvim-pp/default.nix b/pkgs/development/python-modules/pynvim-pp/default.nix index 0f69b51e65de..a1dee20139b4 100644 --- a/pkgs/development/python-modules/pynvim-pp/default.nix +++ b/pkgs/development/python-modules/pynvim-pp/default.nix @@ -7,14 +7,14 @@ buildPythonPackage { pname = "pynvim-pp"; - version = "unstable-2023-08-03"; + version = "unstable-2024-03-11"; pyproject = true; src = fetchFromGitHub { owner = "ms-jpq"; repo = "pynvim_pp"; - rev = "40d0f6053ddbba61f53505eebb0290cfb661661b"; - hash = "sha256-4jeYE9HL+PQZuJq5nyf9CgL4UrRWm3ifLL/vfygLOwc="; + rev = "34e3a027c595981886d7efd1c91071f3eaa4715d"; + hash = "sha256-2+jDRJXlg9q4MN9vOhmeq4cWVJ0wp5r5xAh3G8lqgOg="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/pyring-buffer/default.nix b/pkgs/development/python-modules/pyring-buffer/default.nix new file mode 100644 index 000000000000..6a5c709f617e --- /dev/null +++ b/pkgs/development/python-modules/pyring-buffer/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub + +# build-system +, setuptools +}: + +buildPythonPackage rec { + pname = "pyring-buffer"; + version = "1.0.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "rhasspy"; + repo = "pyring-buffer"; + rev = "382290312fa2ad5d75bd42c040a43e25dad9c8a7"; + hash = "sha256-bHhcBU4tjFAyZ3/GjaP/hDXz2N73mCChTNYHsZyBCSM="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + pythonImportsCheck = [ + "pyring_buffer" + ]; + + meta = with lib; { + description = "A pure Python ring buffer for bytes"; + homepage = "https://github.com/rhasspy/pyring-buffer"; + changelog = "https://github.com/rhasspy/pyring-buffer/blob/${src.rev}/CHANGELOG.md"; + license = licenses.asl20; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/development/python-modules/pysilero-vad/default.nix b/pkgs/development/python-modules/pysilero-vad/default.nix new file mode 100644 index 000000000000..332d7260e519 --- /dev/null +++ b/pkgs/development/python-modules/pysilero-vad/default.nix @@ -0,0 +1,61 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, stdenv +, pythonRelaxDepsHook + +# build-system +, setuptools + +# dependencies +, numpy +, onnxruntime + +# tests +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "pysilero-vad"; + version = "1.0.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "rhasspy"; + repo = "pysilero-vad"; + rev = "fc1e3f74e6282249c1fd67ab0f65832ad1ce9cc5"; + hash = "sha256-5jS2xZEtvzXO/ffZzseTTUHfE528W9FvKB0AKG6T62k="; + }; + + nativeBuildInputs = [ + setuptools + pythonRelaxDepsHook + ]; + + pythonRelaxDeps = [ + "numpy" + ]; + + propagatedBuildInputs = [ + numpy + onnxruntime + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "pysilero_vad" + ]; + + meta = with lib; { + # what(): /build/source/include/onnxruntime/core/common/logging/logging.h:294 static const onnxruntime::logging::Logger& onnxruntime::logging::LoggingManager::DefaultLogger() Attempt to use DefaultLogger but none has been registered. + broken = stdenv.isAarch64 && stdenv.isLinux; + description = "Pre-packaged voice activity detector using silero-vad"; + homepage = "https://github.com/rhasspy/pysilero-vad"; + changelog = "https://github.com/rhasspy/pysilero-vad/blob/${src.rev}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/development/python-modules/python-whois/default.nix b/pkgs/development/python-modules/python-whois/default.nix index 6cdfb81628a3..a9bb5cdd8e38 100644 --- a/pkgs/development/python-modules/python-whois/default.nix +++ b/pkgs/development/python-modules/python-whois/default.nix @@ -1,37 +1,53 @@ { lib , buildPythonPackage , fetchPypi -, future -, nose +, pynose , pytestCheckHook +, python-dateutil +, pythonOlder +, setuptools , simplejson }: buildPythonPackage rec { pname = "python-whois"; - version = "0.8.0"; - format = "setuptools"; + version = "0.9.3"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-3TNtNRfqzip2iUBtt7uWraPF50MnQjFRru4+ZCJfYiA="; + hash = "sha256-jdoscMD4nw+PxIpCNweJMyv/9nm1+kYgSIhBUdJso84="; }; - propagatedBuildInputs = [ future ]; + build-system = [ + setuptools + ]; + + dependencies = [ + python-dateutil + ]; nativeCheckInputs = [ - nose + pynose pytestCheckHook simplejson ]; - # Exclude tests that require network access disabledTests = [ + # Exclude tests that require network access "test_dk_parse" "test_ipv4" "test_ipv6" + "test_choose_server" + "test_simple_ascii_domain" + "test_simple_unicode_domain" + ]; + + pythonImportsCheck = [ + "whois" ]; - pythonImportsCheck = [ "whois" ]; meta = with lib; { description = "Python module to produce parsed WHOIS data"; diff --git a/pkgs/development/python-modules/robotframework-pythonlibcore/default.nix b/pkgs/development/python-modules/robotframework-pythonlibcore/default.nix index 797bda0d3ea4..39feab338d24 100644 --- a/pkgs/development/python-modules/robotframework-pythonlibcore/default.nix +++ b/pkgs/development/python-modules/robotframework-pythonlibcore/default.nix @@ -2,16 +2,18 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub +, fetchpatch2 , setuptools +, robotframework +, approvaltests , pytest-mockito , pytestCheckHook -, robotframework , typing-extensions }: buildPythonPackage rec { pname = "robotframework-pythonlibcore"; - version = "4.3.0"; + version = "4.4.0"; disabled = pythonOlder "3.8"; @@ -21,23 +23,30 @@ buildPythonPackage rec { owner = "robotframework"; repo = "PythonLibCore"; rev = "refs/tags/v${version}"; - hash = "sha256-5ayOQyOhCg4nLpAyH/eQ6NYEApix0wsL2nhJzEXKJRo="; + hash = "sha256-282A4EW88z6ODSIEIIeBbN8YO491rwI4M7njI7kL3XQ="; }; - nativeBuildInputs = [ + patches = [ + (fetchpatch2 { + url = "https://github.com/robotframework/PythonLibCore/commit/8b756a4bd119d660109437023789bfada21bdc78.patch"; + hash = "sha256-4NtgkGbIj9gH9Det6VNh1MpGSGroESxQ8X2ZTeoX/zU="; + }) + ]; + + build-system = [ setuptools ]; - nativeCheckInputs = [ - pytest-mockito - pytestCheckHook + dependencies = [ robotframework - typing-extensions ]; - preCheck = '' - export PYTHONPATH="atest:utest/helpers:$PYTHONPATH" - ''; + nativeCheckInputs = [ + approvaltests + pytest-mockito + pytestCheckHook + typing-extensions + ]; pythonImportsCheck = [ "robotlibcore" ]; diff --git a/pkgs/development/python-modules/seqdiag/default.nix b/pkgs/development/python-modules/seqdiag/default.nix index bbf7cca1293a..8b8a89bd49db 100644 --- a/pkgs/development/python-modules/seqdiag/default.nix +++ b/pkgs/development/python-modules/seqdiag/default.nix @@ -2,7 +2,7 @@ , blockdiag , buildPythonPackage , fetchFromGitHub -, nose +, pynose , pytestCheckHook , pythonOlder , setuptools @@ -11,24 +11,27 @@ buildPythonPackage rec { pname = "seqdiag"; version = "3.0.0"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "blockdiag"; - repo = pname; - rev = version; + repo = "seqdiag"; + rev = "refs/tags/${version}"; hash = "sha256-Dh9JMx50Nexi0q39rYr9MpkKmQRAfT7lzsNOXoTuphg="; }; - propagatedBuildInputs = [ - blockdiag + build-system = [ setuptools ]; + dependencies = [ + blockdiag + ]; + nativeCheckInputs = [ - nose + pynose pytestCheckHook ]; @@ -36,21 +39,17 @@ buildPythonPackage rec { "src/seqdiag/tests/" ]; - disabledTests = [ - # UnicodeEncodeError: 'latin-1' codec can't encode... - "test_setup_inline_svg_is_true_with_multibytes" - ]; - pythonImportsCheck = [ "seqdiag" ]; meta = with lib; { description = "Generate sequence-diagram image from spec-text file (similar to Graphviz)"; - mainProgram = "seqdiag"; homepage = "http://blockdiag.com/"; + changelog = "https://github.com/blockdiag/seqdiag/blob/${version}/CHANGES.rst"; license = licenses.asl20; - platforms = platforms.unix; maintainers = with maintainers; [ bjornfor ]; + mainProgram = "seqdiag"; + platforms = platforms.unix; }; } diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix index e12d4e6b8abb..c46aeb33788b 100644 --- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix +++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "tencentcloud-sdk-python"; - version = "3.0.1116"; + version = "3.0.1119"; pyproject = true; disabled = pythonOlder "3.9"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "TencentCloud"; repo = "tencentcloud-sdk-python"; rev = "refs/tags/${version}"; - hash = "sha256-TeS5ymvVbebzGdCbQL7HEtB4J4VgnzfEsB31zwjs6aE="; + hash = "sha256-F/aghPj/4xh06z+PTHSd/J7ImwouDd59/Cry2Zq13Jg="; }; build-system = [ diff --git a/pkgs/development/python-modules/tesla-fleet-api/default.nix b/pkgs/development/python-modules/tesla-fleet-api/default.nix index 0377b13b244b..7515a4b83713 100644 --- a/pkgs/development/python-modules/tesla-fleet-api/default.nix +++ b/pkgs/development/python-modules/tesla-fleet-api/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "tesla-fleet-api"; - version = "0.5.1"; + version = "0.5.3"; pyproject = true; disabled = pythonOlder "3.10"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "Teslemetry"; repo = "python-tesla-fleet-api"; rev = "refs/tags/v${version}"; - hash = "sha256-PbtOokzpJ58SpQOfpSyoDnUb8qcRvy0XPDR5cGMMbKU="; + hash = "sha256-rVxrMgp1V8wlDE+PGGiyZbpe4OuU2LT/LFYQ6m6k98o="; }; build-system = [ diff --git a/pkgs/development/python-modules/tesserocr/default.nix b/pkgs/development/python-modules/tesserocr/default.nix index 7959d38d2d3c..95b5ced2a7d3 100644 --- a/pkgs/development/python-modules/tesserocr/default.nix +++ b/pkgs/development/python-modules/tesserocr/default.nix @@ -17,12 +17,12 @@ buildPythonPackage rec { pname = "tesserocr"; - version = "2.6.2"; + version = "2.6.3"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-RVJfocGjVvnRVanekbN1nKRECEr9hTVE9aKaqFizA5A="; + sha256 = "sha256-RMHE73vcKGz6FEzhoJfoHDMp9KQ1CbyElKGrhSM4xuE="; }; # https://github.com/sirfz/tesserocr/issues/314 diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index 5a5f67f8b7ea..6d99089ce279 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "checkov"; - version = "3.2.48"; + version = "3.2.49"; pyproject = true; src = fetchFromGitHub { owner = "bridgecrewio"; repo = "checkov"; rev = "refs/tags/${version}"; - hash = "sha256-B0wvUd94J+Q+ZuWitYMKYgOTSNGC4njPrUAhs1QPCuQ="; + hash = "sha256-lO1NMK+tIj/riNt5JVjqgQDAfDlApENi0waj5pfjubc="; }; patches = [ diff --git a/pkgs/development/tools/backblaze-b2/default.nix b/pkgs/development/tools/backblaze-b2/default.nix index 3ed49c05bec9..1fd6333a3d50 100644 --- a/pkgs/development/tools/backblaze-b2/default.nix +++ b/pkgs/development/tools/backblaze-b2/default.nix @@ -1,32 +1,30 @@ -{ lib, python3Packages, fetchPypi, installShellFiles, testers, backblaze-b2 +{ lib +, python3Packages +, fetchFromGitHub +, installShellFiles +, testers +, backblaze-b2 # executable is renamed to backblaze-b2 by default, to avoid collision with boost's 'b2' , execName ? "backblaze-b2" }: python3Packages.buildPythonApplication rec { pname = "backblaze-b2"; - version = "3.15.0"; - format = "setuptools"; + version = "3.17.0"; + format = "pyproject"; - src = fetchPypi { - inherit version; - pname = "b2"; - hash = "sha256-10c2zddALy7+CGxhjUC6tMLQcZ3WmLeRY1bNKWunAys="; + src = fetchFromGitHub { + owner = "Backblaze"; + repo = "B2_Command_Line_Tool"; + rev = "v${version}"; + hash = "sha256-Xj7RNe6XM2atijhVasILWRdTzu6xuKBzMllM1z1mFLY="; }; - postPatch = '' - substituteInPlace requirements.txt \ - --replace 'phx-class-registry==4.0.5' 'phx-class-registry' - substituteInPlace requirements.txt \ - --replace 'tabulate==0.8.10' 'tabulate' - substituteInPlace setup.py \ - --replace 'setuptools_scm<6.0' 'setuptools_scm' - ''; - nativeBuildInputs = [ installShellFiles - python3Packages.setuptools-scm - ]; + ] ++ (with python3Packages; [ + pdm-backend + ]); propagatedBuildInputs = with python3Packages; [ argcomplete @@ -46,31 +44,24 @@ python3Packages.buildPythonApplication rec { backoff more-itertools pexpect - - # backblaze-b2 requires pytest 7 to complete tests. - (pytestCheckHook.override { pytest = pytest_7; }) + pytestCheckHook + pytest-xdist ]; preCheck = '' export HOME=$(mktemp -d) ''; - disabledTests = [ - # require network - "test_files_headers" - "test_integration" - - # fixed by https://github.com/Backblaze/B2_Command_Line_Tool/pull/915 - "TestRmConsoleTool" - ]; - disabledTestPaths = [ # requires network "test/integration/test_b2_command_line.py" + "test/integration/test_tqdm_closer.py" # it's hard to make it work on nix "test/integration/test_autocomplete.py" - "test/unit/console_tool" + "test/unit/test_console_tool.py" + # this one causes successive tests to fail + "test/unit/_cli/test_autocomplete_cache.py" ]; postInstall = lib.optionalString (execName != "b2") '' @@ -88,7 +79,9 @@ python3Packages.buildPythonApplication rec { }).overrideAttrs (old: { # workaround the error: Permission denied: '/homeless-shelter' # backblaze-b2 fails to create a 'b2' directory under the XDG config path - HOME = "$(mktemp -d)"; + preHook = '' + export HOME=$(mktemp -d) + ''; }); meta = with lib; { diff --git a/pkgs/development/tools/continuous-integration/buildkite-test-collector-rust/default.nix b/pkgs/development/tools/continuous-integration/buildkite-test-collector-rust/default.nix index bae57ea74d79..709cd3e87fc7 100644 --- a/pkgs/development/tools/continuous-integration/buildkite-test-collector-rust/default.nix +++ b/pkgs/development/tools/continuous-integration/buildkite-test-collector-rust/default.nix @@ -3,24 +3,27 @@ , rustPlatform , stdenv , Security +, nix-update-script }: rustPlatform.buildRustPackage rec { pname = "buildkite-test-collector-rust"; - version = "0.1.0"; + version = "0.1.3"; src = fetchFromGitHub { owner = "buildkite"; repo = "test-collector-rust"; rev = "v${version}"; - sha256 = "sha256-rY/+AwxO0+xcnRj0A8TRhCUJQ0ecosybI6It1mDOdQM="; + sha256 = "sha256-PF2TFfzWmHXLgTopzJ04dfnzd3Sc/A6Hduffz2guxmU="; }; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; - cargoSha256 = "sha256-qfJ0ROi0S0mmPl6kKrW3dp3VLjYqK+sBVj+iKDNTjyM="; + cargoSha256 = "sha256-4eaU6dOb97/vV3NSCCpdzK2oQUIHl4kdAtgWbGsY5LU="; + + passthru.updateScript = nix-update-script { }; meta = with lib; { description = "Rust adapter for Buildkite Test Analytics"; diff --git a/pkgs/development/tools/database/dbmate/default.nix b/pkgs/development/tools/database/dbmate/default.nix index e7d5be602cdc..922f3c081d5d 100644 --- a/pkgs/development/tools/database/dbmate/default.nix +++ b/pkgs/development/tools/database/dbmate/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "dbmate"; - version = "2.13.0"; + version = "2.14.0"; src = fetchFromGitHub { owner = "amacneil"; repo = "dbmate"; rev = "refs/tags/v${version}"; - hash = "sha256-4Ur9LGYcC9C2EUWLLppcVSf+PLgfPITbKGp2qLRnxVY="; + hash = "sha256-jShFLwoxZdUEHA+gd87n3R+faOdC6TboXuPvcZp89+Y="; }; - vendorHash = "sha256-le2AWHqTElo95GQJ8jEk3jjNrxu63YyWVtq+CI6+SbY="; + vendorHash = "sha256-kBk2KhPDVYBGIUQpXq4ANA7WX+JUOxz7/Ad+4h2CD1c="; doCheck = false; diff --git a/pkgs/development/tools/misc/netcoredbg/default.nix b/pkgs/development/tools/misc/netcoredbg/default.nix index 180692e9932f..b16c4718914e 100644 --- a/pkgs/development/tools/misc/netcoredbg/default.nix +++ b/pkgs/development/tools/misc/netcoredbg/default.nix @@ -86,6 +86,7 @@ stdenv.mkDerivation { homepage = "https://github.com/Samsung/netcoredbg"; license = licenses.mit; platforms = platforms.unix; + mainProgram = "netcoredbg"; maintainers = with maintainers; [ leo60228 konradmalik ]; }; } diff --git a/pkgs/development/tools/misc/rsonpath/default.nix b/pkgs/development/tools/misc/rsonpath/default.nix index 1d673ae35ded..90c5d066aef8 100644 --- a/pkgs/development/tools/misc/rsonpath/default.nix +++ b/pkgs/development/tools/misc/rsonpath/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "rsonpath"; - version = "0.8.7"; + version = "0.9.0"; src = fetchFromGitHub { owner = "v0ldek"; repo = "rsonpath"; rev = "v${version}"; - hash = "sha256-AMnUErmufHc05MxHru/b4mFHH+HF9jfhoNi8yIejc64="; + hash = "sha256-g6dBPW3iIRslzQUwcmx9Ube/Q3llp6Sstdihq9ExANU="; }; - cargoHash = "sha256-flMzNxA1NWGy4ea7/dmPiEKspBmVuy82VPe5r8jaEGg="; + cargoHash = "sha256-byeMX4wKFQbOH9f89cWkrpKAbhThLlR12Xok7vn/hOw="; cargoBuildFlags = [ "-p=rsonpath" ]; cargoTestFlags = cargoBuildFlags; diff --git a/pkgs/tools/compression/xz/default.nix b/pkgs/tools/compression/xz/default.nix index 480eff197088..e02be74b60d3 100644 --- a/pkgs/tools/compression/xz/default.nix +++ b/pkgs/tools/compression/xz/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "xz"; - version = "5.6.1"; + version = "5.4.6"; src = fetchurl { url = with finalAttrs; "https://github.com/tukaani-project/xz/releases/download/v${version}/xz-${version}.tar.bz2"; - hash = "sha256-0wBCJkmgEksRIWML5VnIkM7t8yZn1wZLgSiTMWbCF8g="; + sha256 = "sha256-kThRsnTo4dMXgeyUnxwj6NvPDs9uc6JDbcIXad0+b0k="; }; strictDeps = true; diff --git a/pkgs/tools/filesystems/xfsprogs/default.nix b/pkgs/tools/filesystems/xfsprogs/default.nix index 5a7022ee6a13..327d1e74f7c5 100644 --- a/pkgs/tools/filesystems/xfsprogs/default.nix +++ b/pkgs/tools/filesystems/xfsprogs/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "xfsprogs"; - version = "6.4.0"; + version = "6.6.0"; src = fetchurl { url = "mirror://kernel/linux/utils/fs/xfs/xfsprogs/${pname}-${version}.tar.xz"; - hash = "sha256-wxhoQYv79Jo6nEf8cM3/3p2W9P8AUb0EoIgeZlRkgQQ="; + hash = "sha256-UMovRnbfj6tMtMPvPdUS1VUeaETUCmWjHVuOA1k9It8="; }; outputs = [ "bin" "dev" "out" "doc" ]; diff --git a/pkgs/tools/misc/latex2html/default.nix b/pkgs/tools/misc/latex2html/default.nix index 79b80eb3e55e..f3cca8872b23 100644 --- a/pkgs/tools/misc/latex2html/default.nix +++ b/pkgs/tools/misc/latex2html/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "latex2html"; - version = "2023.2"; + version = "2024"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-fn9Td4IVqlON93p3xPpQuurFQR8Rjp/sHoQG33O5GkI="; + sha256 = "sha256-MF+S6x+k+lkutJQ60HCxFpdR96K3AFZcP/4guK9RvsA="; }; buildInputs = [ ghostscript netpbm perl ]; diff --git a/pkgs/tools/misc/vial/default.nix b/pkgs/tools/misc/vial/default.nix index 613abcdf7dbf..e4c2b2989394 100644 --- a/pkgs/tools/misc/vial/default.nix +++ b/pkgs/tools/misc/vial/default.nix @@ -27,7 +27,7 @@ appimageTools.wrapType2 { description = "An Open-source GUI and QMK fork for configuring your keyboard in real time"; homepage = "https://get.vial.today"; license = lib.licenses.gpl2Plus; - mainProgram = "vial"; + mainProgram = "Vial"; maintainers = with lib.maintainers; [ kranzes ]; platforms = [ "x86_64-linux" ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; diff --git a/pkgs/tools/package-management/libdnf/default.nix b/pkgs/tools/package-management/libdnf/default.nix index 9bce8a919db4..79fc38eaef33 100644 --- a/pkgs/tools/package-management/libdnf/default.nix +++ b/pkgs/tools/package-management/libdnf/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { pname = "libdnf"; - version = "0.73.0"; + version = "0.73.1"; outputs = [ "out" "dev" "py" ]; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { owner = "rpm-software-management"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-zduxlroqo7aeQYhiTWmEK47YG/ll8hLH/d3xtXdcYhk="; + hash = "sha256-mZCrJ1fXqKE1sMYKWHLLQEPkdLwPwqJz+8n+DlNmxvM="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 96e91b000b40..75d1442bd38f 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -261,8 +261,8 @@ in lib.makeExtensible (self: ({ }; nix_2_21 = common { - version = "2.21.0"; - hash = "sha256-9b9qJ+7rGjLKbIswMf0/2pgUWH/xOlYLk7P4WYNcGDs="; + version = "2.21.1"; + hash = "sha256-iRtvOcJbohyhav+deEajI/Ln/LU/6WqSfLyXDQaNEro="; }; # The minimum Nix version supported by Nixpkgs diff --git a/pkgs/tools/security/cnspec/default.nix b/pkgs/tools/security/cnspec/default.nix index 57d33623f0a2..91fb3a554fd7 100644 --- a/pkgs/tools/security/cnspec/default.nix +++ b/pkgs/tools/security/cnspec/default.nix @@ -5,18 +5,18 @@ buildGoModule rec { pname = "cnspec"; - version = "10.9.1"; + version = "10.9.2"; src = fetchFromGitHub { owner = "mondoohq"; repo = "cnspec"; rev = "refs/tags/v${version}"; - hash = "sha256-9NHzSgcUWRVhq4hqkq8xJ0FgTk9BBz2Zc0yuj72WL+c="; + hash = "sha256-2Vy2IFsq9vbNECnf873FYcWiitnzsbxP8v2IwjE5j1I="; }; proxyVendor = true; - vendorHash = "sha256-bhpVAvoIriqA7QnYysqUfuAYbR9PoaPHgWCHlJLdgYY="; + vendorHash = "sha256-zGtvA1m6U55+0Toy5zvQeU0jkumQzPqle6rCfyg3aN0="; subPackages = [ "apps/cnspec" diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix index 3db2051c8de0..333668fbfc9d 100644 --- a/pkgs/tools/security/exploitdb/default.nix +++ b/pkgs/tools/security/exploitdb/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2024-03-26"; + version = "2024-03-29"; src = fetchFromGitLab { owner = "exploit-database"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-oZfo9p23uvDw2f7O5AnycVpE14Rul8ZIeQPojVGQCXI="; + hash = "sha256-SNgC7gMedVpy07PQTt5MfyxZdb5bN3tTDx72l/rusvw="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/security/metasploit/Gemfile b/pkgs/tools/security/metasploit/Gemfile index 21f6f0ecbd2a..cad0fef74f58 100644 --- a/pkgs/tools/security/metasploit/Gemfile +++ b/pkgs/tools/security/metasploit/Gemfile @@ -1,4 +1,4 @@ # frozen_string_literal: true source "https://rubygems.org" -gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.4.0" +gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.4.1" diff --git a/pkgs/tools/security/metasploit/Gemfile.lock b/pkgs/tools/security/metasploit/Gemfile.lock index b58232b1e8ef..9ec271d8b7e0 100644 --- a/pkgs/tools/security/metasploit/Gemfile.lock +++ b/pkgs/tools/security/metasploit/Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: https://github.com/rapid7/metasploit-framework - revision: c82de1374a222da3ca6db840432a971cfd4e865e - ref: refs/tags/6.4.0 + revision: 73d98ad0ca24cdd33bbb9dfb110f3b781c613b55 + ref: refs/tags/6.4.1 specs: - metasploit-framework (6.4.0) + metasploit-framework (6.4.1) actionpack (~> 7.0.0) activerecord (~> 7.0.0) activesupport (~> 7.0.0) diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix index cacaf4ec0b0e..0db72c46ae48 100644 --- a/pkgs/tools/security/metasploit/default.nix +++ b/pkgs/tools/security/metasploit/default.nix @@ -15,13 +15,13 @@ let }; in stdenv.mkDerivation rec { pname = "metasploit-framework"; - version = "6.4.0"; + version = "6.4.1"; src = fetchFromGitHub { owner = "rapid7"; repo = "metasploit-framework"; rev = "refs/tags/${version}"; - hash = "sha256-1OWgQgnmsKxGHzX2ly/7xIJH4BcWUV6SjScxB5bMhu0="; + hash = "sha256-swKIiUgxsT6EnJV21sXOYU+s9fNTURLtJd1kjINyMd0="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/security/metasploit/gemset.nix b/pkgs/tools/security/metasploit/gemset.nix index a35e66a42222..fdaf84e0bb0e 100644 --- a/pkgs/tools/security/metasploit/gemset.nix +++ b/pkgs/tools/security/metasploit/gemset.nix @@ -674,12 +674,12 @@ platforms = []; source = { fetchSubmodules = false; - rev = "c82de1374a222da3ca6db840432a971cfd4e865e"; - sha256 = "1vc6rjb0fc97in95wl8n2zh4g0n4zcprgxim3x3arc76151a1rfl"; + rev = "73d98ad0ca24cdd33bbb9dfb110f3b781c613b55"; + sha256 = "1p9ifa1qqr6x4pni4lakygssqkv1rv2xcxlmkj23xc9i924qh0mk"; type = "git"; url = "https://github.com/rapid7/metasploit-framework"; }; - version = "6.4.0"; + version = "6.4.1"; }; metasploit-model = { groups = ["default"]; diff --git a/pkgs/tools/security/pass/extensions/audit/default.nix b/pkgs/tools/security/pass/extensions/audit/default.nix index 365f81759cce..055af774a624 100644 --- a/pkgs/tools/security/pass/extensions/audit/default.nix +++ b/pkgs/tools/security/pass/extensions/audit/default.nix @@ -11,7 +11,7 @@ in stdenv.mkDerivation rec { owner = "roddhjav"; repo = "pass-audit"; rev = "v${version}"; - sha256 = "sha256-xigP8LxRXITLF3X21zhWx6ooFNSTKGv46yFSt1dd4vs="; + hash = "sha256-xigP8LxRXITLF3X21zhWx6ooFNSTKGv46yFSt1dd4vs="; }; patches = [ @@ -21,9 +21,9 @@ in stdenv.mkDerivation rec { postPatch = '' substituteInPlace audit.bash \ - --replace 'python3' "${pythonEnv}/bin/python3" + --replace-fail 'python3' "${pythonEnv.interpreter}" substituteInPlace Makefile \ - --replace "install --root" "install --prefix ''' --root" + --replace-fail "install --root" "install --prefix ''' --root" ''; outputs = [ "out" "man" ]; @@ -35,7 +35,7 @@ in stdenv.mkDerivation rec { doCheck = !stdenv.isDarwin; nativeCheckInputs = [ pythonPackages.green pass gnupg ]; checkPhase = '' - ${pythonEnv}/bin/python3 setup.py green -q + ${pythonEnv.interpreter} -m green -q ''; installFlags = [ "DESTDIR=${placeholder "out"}" "PREFIX=" ]; diff --git a/pkgs/tools/security/step-cli/default.nix b/pkgs/tools/security/step-cli/default.nix index 4ba73b2ac2e5..32446eeaa75b 100644 --- a/pkgs/tools/security/step-cli/default.nix +++ b/pkgs/tools/security/step-cli/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "step-cli"; - version = "0.25.2"; + version = "0.26.0"; src = fetchFromGitHub { owner = "smallstep"; repo = "cli"; rev = "refs/tags/v${version}"; - hash = "sha256-umo0f4cXxnxg3xH1aHeJE2brUT9w+Gp+0Qzq4zIQ8oI="; + hash = "sha256-B0LGedExlk9XllWilZ0QAwQHNyISAI2WJ48P2STbxSY="; }; ldflags = [ @@ -25,7 +25,7 @@ buildGoModule rec { rm command/certificate/remote_test.go ''; - vendorHash = "sha256-R9UJHXs35/yvwlqu1iR3lJN/w8DWMqw48Kc+7JKfD7I="; + vendorHash = "sha256-A38pmKRulvmxXbIaUsTiMWgq1MhUKkvuGp07H1rxCJg="; meta = with lib; { description = "A zero trust swiss army knife for working with X509, OAuth, JWT, OATH OTP, etc"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2706e97b3bc5..a05fd00195b5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17174,8 +17174,6 @@ with pkgs; vcard = python3Packages.toPythonApplication python3Packages.vcard; inherit (callPackage ../development/compilers/vala { }) - vala_0_48 - vala_0_54 vala_0_56 vala; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c15b9f68816e..526043dbc3bb 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9847,6 +9847,8 @@ self: super: with self; { pysiaalarm = callPackage ../development/python-modules/pysiaalarm { }; + pysilero-vad = callPackage ../development/python-modules/pysilero-vad { }; + pysimplesoap = callPackage ../development/python-modules/pysimplesoap { }; pyskyqhub = callPackage ../development/python-modules/pyskyqhub { }; @@ -11501,6 +11503,8 @@ self: super: with self; { pyric = callPackage ../development/python-modules/pyric { }; + pyring-buffer = callPackage ../development/python-modules/pyring-buffer { }; + pyrisco = callPackage ../development/python-modules/pyrisco { }; pyrituals = callPackage ../development/python-modules/pyrituals { };