From 50e230c417c3925725c022e64d2907157918af8e Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 30 Oct 2024 14:08:21 +0100 Subject: [PATCH 01/27] nixos/lomiri: nixfmt --- .../services/desktop-managers/lomiri.nix | 149 ++++++++++-------- 1 file changed, 86 insertions(+), 63 deletions(-) diff --git a/nixos/modules/services/desktop-managers/lomiri.nix b/nixos/modules/services/desktop-managers/lomiri.nix index 75834eab0cd8..39c295dc1cb8 100644 --- a/nixos/modules/services/desktop-managers/lomiri.nix +++ b/nixos/modules/services/desktop-managers/lomiri.nix @@ -1,8 +1,14 @@ -{ config, pkgs, lib, ... }: +{ + config, + pkgs, + lib, + ... +}: let cfg = config.services.desktopManager.lomiri; -in { +in +{ options.services.desktopManager.lomiri = { enable = lib.mkEnableOption '' the Lomiri graphical shell (formerly known as Unity8) @@ -11,42 +17,46 @@ in { config = lib.mkIf cfg.enable { environment = { - systemPackages = (with pkgs; [ - glib # XDG MIME-related tools identify it as GNOME, add gio for MIME identification to work - libayatana-common - ubports-click - ]) ++ (with pkgs.lomiri; [ - hfd-service - history-service - libusermetrics - lomiri - lomiri-calculator-app - lomiri-camera-app - lomiri-clock-app - lomiri-content-hub - lomiri-docviewer-app - lomiri-download-manager - lomiri-filemanager-app - lomiri-gallery-app - lomiri-polkit-agent - lomiri-schemas # exposes some required dbus interfaces - lomiri-session # wrappers to properly launch the session - lomiri-sounds - lomiri-system-settings - lomiri-terminal-app - lomiri-thumbnailer - lomiri-url-dispatcher - lomiri-wallpapers - mediascanner2 # TODO possibly needs to be kicked off by graphical-session.target - morph-browser - qtmir # not having its desktop file for Xwayland available causes any X11 application to crash the session - suru-icon-theme - telephony-service - teleports - ]); + systemPackages = + (with pkgs; [ + glib # XDG MIME-related tools identify it as GNOME, add gio for MIME identification to work + libayatana-common + ubports-click + ]) + ++ (with pkgs.lomiri; [ + hfd-service + history-service + libusermetrics + lomiri + lomiri-calculator-app + lomiri-camera-app + lomiri-clock-app + lomiri-content-hub + lomiri-docviewer-app + lomiri-download-manager + lomiri-filemanager-app + lomiri-gallery-app + lomiri-polkit-agent + lomiri-schemas # exposes some required dbus interfaces + lomiri-session # wrappers to properly launch the session + lomiri-sounds + lomiri-system-settings + lomiri-terminal-app + lomiri-thumbnailer + lomiri-url-dispatcher + lomiri-wallpapers + mediascanner2 # TODO possibly needs to be kicked off by graphical-session.target + morph-browser + qtmir # not having its desktop file for Xwayland available causes any X11 application to crash the session + suru-icon-theme + telephony-service + teleports + ]); # To override the default keyboard layout in Lomiri - etc.${pkgs.lomiri.lomiri.passthru.etcLayoutsFile}.text = lib.strings.replaceStrings [","] ["\n"] config.services.xserver.xkb.layout; + etc.${pkgs.lomiri.lomiri.passthru.etcLayoutsFile}.text = lib.strings.replaceStrings [ "," ] [ + "\n" + ] config.services.xserver.xkb.layout; }; hardware = { @@ -84,21 +94,26 @@ in { services.ayatana-indicators = { enable = true; - packages = (with pkgs; [ - ayatana-indicator-datetime - ayatana-indicator-display - ayatana-indicator-messages - ayatana-indicator-power - ayatana-indicator-session - ] ++ lib.optionals config.hardware.bluetooth.enable [ - ayatana-indicator-bluetooth - ] ++ lib.optionals (config.hardware.pulseaudio.enable || config.services.pipewire.pulse.enable) [ - ayatana-indicator-sound - ]) ++ (with pkgs.lomiri; [ - telephony-service - ] ++ lib.optionals config.networking.networkmanager.enable [ - lomiri-indicator-network - ]); + packages = + ( + with pkgs; + [ + ayatana-indicator-datetime + ayatana-indicator-display + ayatana-indicator-messages + ayatana-indicator-power + ayatana-indicator-session + ] + ++ lib.optionals config.hardware.bluetooth.enable [ ayatana-indicator-bluetooth ] + ++ lib.optionals (config.hardware.pulseaudio.enable || config.services.pipewire.pulse.enable) [ + ayatana-indicator-sound + ] + ) + ++ ( + with pkgs.lomiri; + [ telephony-service ] + ++ lib.optionals config.networking.networkmanager.enable [ lomiri-indicator-network ] + ); }; services.udisks2.enable = true; @@ -159,7 +174,13 @@ in { "lomiri-polkit-agent" = rec { description = "Lomiri Polkit agent"; - wantedBy = [ "lomiri.service" "lomiri-full-greeter.service" "lomiri-full-shell.service" "lomiri-greeter.service" "lomiri-shell.service" ]; + wantedBy = [ + "lomiri.service" + "lomiri-full-greeter.service" + "lomiri-full-shell.service" + "lomiri-greeter.service" + "lomiri-shell.service" + ]; after = [ "graphical-session.target" ]; partOf = wantedBy; serviceConfig = { @@ -172,17 +193,19 @@ in { systemd.services = { "dbus-com.lomiri.UserMetrics" = { - serviceConfig = { - Type = "dbus"; - BusName = "com.lomiri.UserMetrics"; - User = "usermetrics"; - StandardOutput = "syslog"; - SyslogIdentifier = "com.lomiri.UserMetrics"; - ExecStart = "${pkgs.lomiri.libusermetrics}/libexec/libusermetrics/usermetricsservice"; - } // lib.optionalAttrs (!config.security.apparmor.enable) { - # Due to https://gitlab.com/ubports/development/core/libusermetrics/-/issues/8, auth must be disabled when not using AppArmor, lest the next database usage breaks - Environment = "USERMETRICS_NO_AUTH=1"; - }; + serviceConfig = + { + Type = "dbus"; + BusName = "com.lomiri.UserMetrics"; + User = "usermetrics"; + StandardOutput = "syslog"; + SyslogIdentifier = "com.lomiri.UserMetrics"; + ExecStart = "${pkgs.lomiri.libusermetrics}/libexec/libusermetrics/usermetricsservice"; + } + // lib.optionalAttrs (!config.security.apparmor.enable) { + # Due to https://gitlab.com/ubports/development/core/libusermetrics/-/issues/8, auth must be disabled when not using AppArmor, lest the next database usage breaks + Environment = "USERMETRICS_NO_AUTH=1"; + }; }; }; From 0b145d934850ec5e39f3fd911a2e5fa5f64b1994 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 30 Oct 2024 14:09:15 +0100 Subject: [PATCH 02/27] nixos/lomiri: Add internal basics option for shared shell/greeter things --- .../services/desktop-managers/lomiri.nix | 389 ++++++++++-------- 1 file changed, 212 insertions(+), 177 deletions(-) diff --git a/nixos/modules/services/desktop-managers/lomiri.nix b/nixos/modules/services/desktop-managers/lomiri.nix index 39c295dc1cb8..c8faa352a644 100644 --- a/nixos/modules/services/desktop-managers/lomiri.nix +++ b/nixos/modules/services/desktop-managers/lomiri.nix @@ -13,211 +13,246 @@ in enable = lib.mkEnableOption '' the Lomiri graphical shell (formerly known as Unity8) ''; + + basics = lib.mkOption { + internal = true; + description = '' + Enable basic things for getting Lomiri working. + ''; + type = lib.types.bool; + default = config.services.xserver.displayManager.lightdm.greeters.lomiri.enable || cfg.enable; + }; }; - config = lib.mkIf cfg.enable { - environment = { - systemPackages = - (with pkgs; [ - glib # XDG MIME-related tools identify it as GNOME, add gio for MIME identification to work - libayatana-common - ubports-click - ]) - ++ (with pkgs.lomiri; [ - hfd-service - history-service - libusermetrics - lomiri - lomiri-calculator-app - lomiri-camera-app - lomiri-clock-app - lomiri-content-hub - lomiri-docviewer-app - lomiri-download-manager - lomiri-filemanager-app - lomiri-gallery-app - lomiri-polkit-agent - lomiri-schemas # exposes some required dbus interfaces - lomiri-session # wrappers to properly launch the session - lomiri-sounds - lomiri-system-settings - lomiri-terminal-app - lomiri-thumbnailer - lomiri-url-dispatcher - lomiri-wallpapers - mediascanner2 # TODO possibly needs to be kicked off by graphical-session.target - morph-browser - qtmir # not having its desktop file for Xwayland available causes any X11 application to crash the session - suru-icon-theme - telephony-service - teleports - ]); + config = lib.mkMerge [ + # Basics for getting Lomiri to work + (lib.mkIf cfg.basics { + environment = { + # To override the default keyboard layout in Lomiri + etc.${pkgs.lomiri.lomiri.passthru.etcLayoutsFile}.text = lib.strings.replaceStrings [ "," ] [ + "\n" + ] config.services.xserver.xkb.layout; - # To override the default keyboard layout in Lomiri - etc.${pkgs.lomiri.lomiri.passthru.etcLayoutsFile}.text = lib.strings.replaceStrings [ "," ] [ - "\n" - ] config.services.xserver.xkb.layout; - }; + pathsToLink = [ + # Data + "/share/locale" # TODO LUITK hardcoded default locale path, fix individual apps to not rely on it + "/share/wallpapers" + ]; - hardware = { - bluetooth.enable = lib.mkDefault true; - }; + systemPackages = with pkgs.lomiri; [ + lomiri-wallpapers # default + additional wallpaper + suru-icon-theme # basic indicator icons + ]; + }; - networking.networkmanager.enable = lib.mkDefault true; + fonts.packages = with pkgs; [ + ubuntu-classic # Ubuntu is default font + ]; - systemd.packages = with pkgs.lomiri; [ - hfd-service - lomiri-download-manager - ]; + # Xwayland is partly hardcoded in Mir so it can't really be fully turned off, and it must be on PATH for X11 apps *and Lomiri's web browser* to work. + # Until Mir/Lomiri can be properly used without it, force it on so everything behaves as expected. + programs.xwayland.enable = lib.mkForce true; - services.dbus.packages = with pkgs.lomiri; [ - hfd-service - libusermetrics - lomiri-download-manager - ]; - - fonts.packages = with pkgs; [ - # Applications tend to default to Ubuntu font - ubuntu-classic - ]; - - # Copy-pasted basic stuff - hardware.graphics.enable = lib.mkDefault true; - fonts.enableDefaultPackages = lib.mkDefault true; - programs.dconf.enable = lib.mkDefault true; - - # Xwayland is partly hardcoded in Mir so it can't really be fully turned off, and it must be on PATH for X11 apps *and Lomiri's web browser* to work. - # Until Mir/Lomiri can be properly used without it, force it on so everything behaves as expected. - programs.xwayland.enable = lib.mkForce true; - - services.accounts-daemon.enable = true; - - services.ayatana-indicators = { - enable = true; - packages = - ( + services.ayatana-indicators = { + enable = true; + packages = ( with pkgs; [ - ayatana-indicator-datetime - ayatana-indicator-display - ayatana-indicator-messages - ayatana-indicator-power - ayatana-indicator-session + ayatana-indicator-datetime # Clock + ayatana-indicator-session # Controls for shutting down etc ] - ++ lib.optionals config.hardware.bluetooth.enable [ ayatana-indicator-bluetooth ] - ++ lib.optionals (config.hardware.pulseaudio.enable || config.services.pipewire.pulse.enable) [ - ayatana-indicator-sound - ] - ) - ++ ( - with pkgs.lomiri; - [ telephony-service ] - ++ lib.optionals config.networking.networkmanager.enable [ lomiri-indicator-network ] ); - }; + }; + }) - services.udisks2.enable = true; - services.upower.enable = true; - services.geoclue2.enable = true; + # Full Lomiri DE + (lib.mkIf cfg.enable { + # We need the basic setup as well + services.desktopManager.lomiri.basics = true; - services.gnome.evolution-data-server = { - enable = true; - plugins = with pkgs; [ - # TODO: lomiri.address-book-service + environment = { + systemPackages = + (with pkgs; [ + glib # XDG MIME-related tools identify it as GNOME, add gio for MIME identification to work + libayatana-common + ubports-click + ]) + ++ (with pkgs.lomiri; [ + hfd-service + history-service + libusermetrics + lomiri + lomiri-calculator-app + lomiri-camera-app + lomiri-clock-app + lomiri-content-hub + lomiri-docviewer-app + lomiri-download-manager + lomiri-filemanager-app + lomiri-gallery-app + lomiri-polkit-agent + lomiri-schemas # exposes some required dbus interfaces + lomiri-session # wrappers to properly launch the session + lomiri-sounds + lomiri-system-settings + lomiri-terminal-app + lomiri-thumbnailer + lomiri-url-dispatcher + mediascanner2 # TODO possibly needs to be kicked off by graphical-session.target + morph-browser + qtmir # not having its desktop file for Xwayland available causes any X11 application to crash the session + telephony-service + teleports + ]); + }; + + hardware = { + bluetooth.enable = lib.mkDefault true; + }; + + networking.networkmanager.enable = lib.mkDefault true; + + systemd.packages = with pkgs.lomiri; [ + hfd-service + lomiri-download-manager ]; - }; - services.telepathy.enable = true; + services.dbus.packages = with pkgs.lomiri; [ + hfd-service + libusermetrics + lomiri-download-manager + ]; - services.displayManager = { - defaultSession = lib.mkDefault "lomiri"; - sessionPackages = with pkgs.lomiri; [ lomiri-session ]; - }; + # Copy-pasted basic stuff + hardware.graphics.enable = lib.mkDefault true; + fonts.enableDefaultPackages = lib.mkDefault true; + programs.dconf.enable = lib.mkDefault true; - services.xserver = { - enable = lib.mkDefault true; - displayManager.lightdm = { - enable = lib.mkDefault true; - greeters.lomiri.enable = lib.mkDefault true; - }; - }; + services.accounts-daemon.enable = true; - environment.pathsToLink = [ - # Configs for inter-app data exchange system - "/share/lomiri-content-hub/peers" - # Configs for inter-app URL requests - "/share/lomiri-url-dispatcher/urls" - # Splash screens & other images for desktop apps launched via lomiri-app-launch - "/share/lomiri-app-launch" - # TODO Try to get maliit stuff working - "/share/maliit/plugins" - # At least the network indicator is still under the unity name, due to leftover Unity-isms - "/share/unity" - # Data - "/share/locale" # TODO LUITK hardcoded default locale path, fix individual apps to not rely on it - "/share/sounds" - "/share/wallpapers" - ]; - - systemd.user.services = { - # Unconditionally run service that collects system-installed URL handlers before LUD - # TODO also run user-installed one? - "lomiri-url-dispatcher-update-system-dir" = { - description = "Lomiri URL dispatcher system directory updater"; - wantedBy = [ "lomiri-url-dispatcher.service" ]; - before = [ "lomiri-url-dispatcher.service" ]; - serviceConfig = { - Type = "oneshot"; - ExecStart = "${pkgs.lomiri.lomiri-url-dispatcher}/libexec/lomiri-url-dispatcher/lomiri-update-directory /run/current-system/sw/share/lomiri-url-dispatcher/urls/"; - }; + services.ayatana-indicators = { + enable = true; + packages = + ( + with pkgs; + [ + ayatana-indicator-display + ayatana-indicator-messages + ayatana-indicator-power + ] + ++ lib.optionals config.hardware.bluetooth.enable [ ayatana-indicator-bluetooth ] + ++ lib.optionals (config.hardware.pulseaudio.enable || config.services.pipewire.pulse.enable) [ + ayatana-indicator-sound + ] + ) + ++ ( + with pkgs.lomiri; + [ telephony-service ] + ++ lib.optionals config.networking.networkmanager.enable [ lomiri-indicator-network ] + ); }; - "lomiri-polkit-agent" = rec { - description = "Lomiri Polkit agent"; - wantedBy = [ - "lomiri.service" - "lomiri-full-greeter.service" - "lomiri-full-shell.service" - "lomiri-greeter.service" - "lomiri-shell.service" + services.udisks2.enable = true; + services.upower.enable = true; + services.geoclue2.enable = true; + + services.gnome.evolution-data-server = { + enable = true; + plugins = with pkgs; [ + # TODO: lomiri.address-book-service ]; - after = [ "graphical-session.target" ]; - partOf = wantedBy; - serviceConfig = { - Type = "simple"; - Restart = "always"; - ExecStart = "${pkgs.lomiri.lomiri-polkit-agent}/libexec/lomiri-polkit-agent/policykit-agent"; + }; + + services.telepathy.enable = true; + + services.displayManager = { + defaultSession = lib.mkDefault "lomiri"; + sessionPackages = with pkgs.lomiri; [ lomiri-session ]; + }; + + services.xserver = { + enable = lib.mkDefault true; + displayManager.lightdm = { + enable = lib.mkDefault true; + greeters.lomiri.enable = lib.mkDefault true; }; }; - }; - systemd.services = { - "dbus-com.lomiri.UserMetrics" = { - serviceConfig = - { - Type = "dbus"; - BusName = "com.lomiri.UserMetrics"; - User = "usermetrics"; - StandardOutput = "syslog"; - SyslogIdentifier = "com.lomiri.UserMetrics"; - ExecStart = "${pkgs.lomiri.libusermetrics}/libexec/libusermetrics/usermetricsservice"; - } - // lib.optionalAttrs (!config.security.apparmor.enable) { - # Due to https://gitlab.com/ubports/development/core/libusermetrics/-/issues/8, auth must be disabled when not using AppArmor, lest the next database usage breaks - Environment = "USERMETRICS_NO_AUTH=1"; + environment.pathsToLink = [ + # Configs for inter-app data exchange system + "/share/lomiri-content-hub/peers" + # Configs for inter-app URL requests + "/share/lomiri-url-dispatcher/urls" + # Splash screens & other images for desktop apps launched via lomiri-app-launch + "/share/lomiri-app-launch" + # TODO Try to get maliit stuff working + "/share/maliit/plugins" + # At least the network indicator is still under the unity name, due to leftover Unity-isms + "/share/unity" + # Data + "/share/sounds" + ]; + + systemd.user.services = { + # Unconditionally run service that collects system-installed URL handlers before LUD + # TODO also run user-installed one? + "lomiri-url-dispatcher-update-system-dir" = { + description = "Lomiri URL dispatcher system directory updater"; + wantedBy = [ "lomiri-url-dispatcher.service" ]; + before = [ "lomiri-url-dispatcher.service" ]; + serviceConfig = { + Type = "oneshot"; + ExecStart = "${pkgs.lomiri.lomiri-url-dispatcher}/libexec/lomiri-url-dispatcher/lomiri-update-directory /run/current-system/sw/share/lomiri-url-dispatcher/urls/"; }; + }; + + "lomiri-polkit-agent" = rec { + description = "Lomiri Polkit agent"; + wantedBy = [ + "lomiri.service" + "lomiri-full-greeter.service" + "lomiri-full-shell.service" + "lomiri-greeter.service" + "lomiri-shell.service" + ]; + after = [ "graphical-session.target" ]; + partOf = wantedBy; + serviceConfig = { + Type = "simple"; + Restart = "always"; + ExecStart = "${pkgs.lomiri.lomiri-polkit-agent}/libexec/lomiri-polkit-agent/policykit-agent"; + }; + }; }; - }; - users.users.usermetrics = { - group = "usermetrics"; - home = "/var/lib/usermetrics"; - createHome = true; - isSystemUser = true; - }; + systemd.services = { + "dbus-com.lomiri.UserMetrics" = { + serviceConfig = + { + Type = "dbus"; + BusName = "com.lomiri.UserMetrics"; + User = "usermetrics"; + StandardOutput = "syslog"; + SyslogIdentifier = "com.lomiri.UserMetrics"; + ExecStart = "${pkgs.lomiri.libusermetrics}/libexec/libusermetrics/usermetricsservice"; + } + // lib.optionalAttrs (!config.security.apparmor.enable) { + # Due to https://gitlab.com/ubports/development/core/libusermetrics/-/issues/8, auth must be disabled when not using AppArmor, lest the next database usage breaks + Environment = "USERMETRICS_NO_AUTH=1"; + }; + }; + }; - users.groups.usermetrics = { }; - }; + users.users.usermetrics = { + group = "usermetrics"; + home = "/var/lib/usermetrics"; + createHome = true; + isSystemUser = true; + }; + + users.groups.usermetrics = { }; + }) + ]; meta.maintainers = lib.teams.lomiri.members; } From de4db8a6b0fcdc381f06fa4be26be42d9755d538 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 30 Oct 2024 14:12:48 +0100 Subject: [PATCH 03/27] nixos/lightdm-greeters/lomiri: nixfmt --- .../x11/display-managers/lightdm-greeters/lomiri.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/x11/display-managers/lightdm-greeters/lomiri.nix b/nixos/modules/services/x11/display-managers/lightdm-greeters/lomiri.nix index 0cc79178358b..ced4d023dfdd 100644 --- a/nixos/modules/services/x11/display-managers/lightdm-greeters/lomiri.nix +++ b/nixos/modules/services/x11/display-managers/lightdm-greeters/lomiri.nix @@ -1,4 +1,9 @@ -{ config, lib, pkgs, ... }: +{ + config, + lib, + pkgs, + ... +}: let From d14f6e598623f22ddc47427fa68a2013faae27a8 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 30 Oct 2024 14:15:02 +0100 Subject: [PATCH 04/27] nixos/lightdm-greeters/lomiri: Enable lomiri.basics option for shared settings --- .../services/x11/display-managers/lightdm-greeters/lomiri.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/modules/services/x11/display-managers/lightdm-greeters/lomiri.nix b/nixos/modules/services/x11/display-managers/lightdm-greeters/lomiri.nix index ced4d023dfdd..387f485e2fea 100644 --- a/nixos/modules/services/x11/display-managers/lightdm-greeters/lomiri.nix +++ b/nixos/modules/services/x11/display-managers/lightdm-greeters/lomiri.nix @@ -22,6 +22,9 @@ in }; config = lib.mkIf (ldmcfg.enable && cfg.enable) { + # Lomiri greeter == Lomiri shell in special mode, need some basics setup at least + services.desktopManager.lomiri.basics = true; + services.xserver.displayManager.lightdm.greeters.gtk.enable = false; services.xserver.displayManager.lightdm.greeter = lib.mkDefault { From 23e40c0ca47b29ef2850a8ef7962e8ee06f7254b Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 30 Oct 2024 14:27:21 +0100 Subject: [PATCH 05/27] tests/lomiri: Only enable greeter in greeter test To test a scenario where only the greeter portion is being enabled, not the whole DE. --- nixos/tests/lomiri.nix | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/nixos/tests/lomiri.nix b/nixos/tests/lomiri.nix index 1ff68e85b94d..4e400ccf121e 100644 --- a/nixos/tests/lomiri.nix +++ b/nixos/tests/lomiri.nix @@ -72,11 +72,13 @@ in inherit description password; }; - services.desktopManager.lomiri.enable = lib.mkForce true; - services.displayManager.defaultSession = lib.mkForce "lomiri"; - - # Help with OCR - fonts.packages = [ pkgs.inconsolata ]; + services.xserver.enable = true; + services.xserver.windowManager.icewm.enable = true; + services.xserver.displayManager.lightdm = { + enable = true; + greeters.lomiri.enable = true; + }; + services.displayManager.defaultSession = lib.mkForce "none+icewm"; }; enableOCR = true; @@ -110,13 +112,8 @@ in # Login machine.send_chars("${password}\n") - machine.wait_until_succeeds("pgrep -u ${user} -f 'lomiri --mode=full-shell'") - - # Output rendering from Lomiri has started when it starts printing performance diagnostics - machine.wait_for_console_text("Last frame took") - # Look for datetime's clock, one of the last elements to load - wait_for_text(r"(AM|PM)") - machine.screenshot("lomiri_launched") + machine.wait_for_x() + machine.screenshot("session_launched") ''; } ); From 1e49cbefaca3da759c56fce4f0e9f0d460bd5e93 Mon Sep 17 00:00:00 2001 From: nat Date: Sun, 3 Nov 2024 16:21:19 +0100 Subject: [PATCH 06/27] jazz2: 2.9.0 -> 2.9.1 --- pkgs/by-name/ja/jazz2/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ja/jazz2/package.nix b/pkgs/by-name/ja/jazz2/package.nix index 72eb7786ac3e..170194342cb3 100644 --- a/pkgs/by-name/ja/jazz2/package.nix +++ b/pkgs/by-name/ja/jazz2/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "jazz2"; - version = "2.9.0"; + version = "2.9.1"; src = fetchFromGitHub { owner = "deathkiller"; repo = "jazz2-native"; rev = finalAttrs.version; - hash = "sha256-qkR3j22tG8Q9WGeIFauWLibpMrF3AvU0abt/6lg763U="; + hash = "sha256-q/08lQ+HW2obWc8YAAEorKkNWy1d2uWeufOC5TVKpN4="; }; patches = [ ./nocontent.patch ]; From f81a2c1514a05bb864698ee620cee9f80d759b9e Mon Sep 17 00:00:00 2001 From: jonboh Date: Thu, 7 Nov 2024 21:17:33 +0100 Subject: [PATCH 07/27] fix: use selected package instead of pkgs.vector --- nixos/modules/services/logging/vector.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/logging/vector.nix b/nixos/modules/services/logging/vector.nix index c68d546bb96c..7c69e790171f 100644 --- a/nixos/modules/services/logging/vector.nix +++ b/nixos/modules/services/logging/vector.nix @@ -27,7 +27,7 @@ in config = lib.mkIf cfg.enable { # for cli usage - environment.systemPackages = [ pkgs.vector ]; + environment.systemPackages = [ cfg.package ]; systemd.services.vector = { description = "Vector event and log aggregator"; @@ -40,7 +40,7 @@ in conf = format.generate "vector.toml" cfg.settings; validateConfig = file: pkgs.runCommand "validate-vector-conf" { - nativeBuildInputs = [ pkgs.vector ]; + nativeBuildInputs = [ cfg.package ]; } '' vector validate --no-environment "${file}" ln -s "${file}" "$out" From da5b4f85a98c3fe69610bb9d6ac13a55cf816fa8 Mon Sep 17 00:00:00 2001 From: aleksana Date: Sun, 10 Nov 2024 11:21:47 +0800 Subject: [PATCH 08/27] ptyxis: 47.2 -> 47.4 --- pkgs/by-name/pt/ptyxis/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pt/ptyxis/package.nix b/pkgs/by-name/pt/ptyxis/package.nix index 9b3fbaf6e091..e4a4b670c909 100644 --- a/pkgs/by-name/pt/ptyxis/package.nix +++ b/pkgs/by-name/pt/ptyxis/package.nix @@ -16,14 +16,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "ptyxis"; - version = "47.2"; + version = "47.4"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "chergert"; repo = "ptyxis"; rev = finalAttrs.version; - hash = "sha256-8b+leFzVEj75xAnGwmVoCr6+mTO3e+DOPUNe0A5KGYY="; + hash = "sha256-G2WesIaz+eYiDExyMi6Ww2cHMthuxAX5b+B68dz6Yb0="; }; nativeBuildInputs = [ From 4a81099da9a7a4cde96dfe8d2841f9139421186b Mon Sep 17 00:00:00 2001 From: Bruno Rodrigues Date: Sun, 10 Nov 2024 13:16:59 +0100 Subject: [PATCH 09/27] rPackages.lwgeom: fixed build on darwin --- pkgs/development/r-modules/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index a7dfb55aba28..37930d4c67b0 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -1097,6 +1097,12 @@ let ]; }); + lwgeom = old.lwgeom.overrideAttrs (attrs: { + configureFlags = [ + "--with-proj-lib=${pkgs.lib.getLib pkgs.proj}/lib" + ]; + }); + sf = old.sf.overrideAttrs (attrs: { configureFlags = [ "--with-proj-lib=${pkgs.lib.getLib pkgs.proj}/lib" From f44ad5872af2be6485ebe13830a1e93ce3d1d61c Mon Sep 17 00:00:00 2001 From: Morgan Helton Date: Sun, 10 Nov 2024 07:20:07 -0600 Subject: [PATCH 10/27] pomerium: 0.27.1 -> 0.27.2 --- pkgs/by-name/po/pomerium/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/po/pomerium/package.nix b/pkgs/by-name/po/pomerium/package.nix index 75c13df48390..009fc19ddf61 100644 --- a/pkgs/by-name/po/pomerium/package.nix +++ b/pkgs/by-name/po/pomerium/package.nix @@ -13,15 +13,15 @@ let in buildGo123Module rec { pname = "pomerium"; - version = "0.27.1"; + version = "0.27.2"; src = fetchFromGitHub { owner = "pomerium"; repo = "pomerium"; rev = "v${version}"; - hash = "sha256-+RKWl/weUYktS7jUB1lYpZCBKEfh7RMfKgRDbYV8Bjs="; + hash = "sha256-t1j5usgr/SO3Ev3JpCJWb3Ys8wgZUTGQVb6mo0oIsEc="; }; - vendorHash = "sha256-/iYUZp6EASDGApLymNuR10395PH8D3zPU+TlmmAN8Zc="; + vendorHash = "sha256-nTEFSLP0/GUVgtujVG6lQIxnj6DOEifc0MVh9CNxt8s="; ui = mkYarnPackage { inherit version; From 6a695ba7864143c4cf79e0980bd445d760728a3e Mon Sep 17 00:00:00 2001 From: aleksana Date: Sun, 10 Nov 2024 23:27:04 +0800 Subject: [PATCH 11/27] ad: init at 0.1.3 --- pkgs/by-name/ad/ad/package.nix | 61 ++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) create mode 100644 pkgs/by-name/ad/ad/package.nix diff --git a/pkgs/by-name/ad/ad/package.nix b/pkgs/by-name/ad/ad/package.nix new file mode 100644 index 000000000000..2fdf571d1d11 --- /dev/null +++ b/pkgs/by-name/ad/ad/package.nix @@ -0,0 +1,61 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + installShellFiles, + versionCheckHook, +}: + +rustPlatform.buildRustPackage rec { + pname = "ad"; + version = "0.1.3"; + + src = fetchFromGitHub { + owner = "sminez"; + repo = "ad"; + rev = "refs/tags/${version}"; + hash = "sha256-l1SyrJW3lZIvoFZG57Bj134sUcoq60xfeXjzVaZPfzs="; + }; + + cargoHash = "sha256-wpR9wZA5SGyLI1ScfZwSENuUMI/iX3YS0P/o9drIwoo="; + + nativeBuildInputs = [ installShellFiles ]; + + checkFlags = [ + # both assume `/usr/bin/sh` exists + "--skip=buffer::tests::try_expand_known_works::file_that_exists_abs_path" + "--skip=buffer::tests::try_expand_known_works::file_that_exists_abs_path_with_addr" + ]; + + postInstall = '' + installManPage doc/man/ad.1 + ''; + + nativeInstallCheckInputs = [ + versionCheckHook + ]; + + doInstallCheck = true; + + meta = { + description = "Adaptable text editor"; + longDescription = '' + ad (pronounced A.D.) is an attempt at combining a modal + editing interface of likes of vi and kakoune with the + approach to extensibility of Plan9's Acme. Inside + of ad text is something you can execute as well as edit. + + It is primarily intended as playground for experimenting + with implementing various text editor features and + currently is not at all optimised or feature complete + enough for use as your main text editor. + ''; + homepage = "https://github.com/sminez/ad"; + license = lib.licenses.mit; + mainProgram = "ad"; + maintainers = with lib.maintainers; [ aleksana ]; + # rely on unix domain socket + # https://github.com/sminez/ad/issues/28 + platforms = lib.platforms.unix; + }; +} From 1bc2a95e43facf3ccb1e4735c6dd51e2f6aeb081 Mon Sep 17 00:00:00 2001 From: Mikael Fangel <34864484+MikaelFangel@users.noreply.github.com> Date: Mon, 4 Nov 2024 00:22:03 +0100 Subject: [PATCH 12/27] changedetection-io: 0.46.04 -> 0.47.06 update --- pkgs/by-name/ch/changedetection-io/package.nix | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/pkgs/by-name/ch/changedetection-io/package.nix b/pkgs/by-name/ch/changedetection-io/package.nix index b87d71867d41..b5a13a11a1ec 100644 --- a/pkgs/by-name/ch/changedetection-io/package.nix +++ b/pkgs/by-name/ch/changedetection-io/package.nix @@ -5,26 +5,17 @@ python3.pkgs.buildPythonApplication rec { pname = "changedetection-io"; - version = "0.46.04"; + version = "0.47.06"; format = "setuptools"; src = fetchFromGitHub { owner = "dgtlmoon"; repo = "changedetection.io"; rev = "refs/tags/${version}"; - hash = "sha256-V1nGVURA4nksDX0kXxfPbO/rB0nmECqpfysenpzcfZs="; + hash = "sha256-kRoHCnXYWG09lrIiBA14OzhtbTqghXck5JXXNAMMtyc="; }; - postPatch = '' - substituteInPlace requirements.txt \ - --replace "apprise~=1.8.0" "apprise" \ - --replace "cryptography~=3.4" "cryptography" \ - --replace "dnspython==2.6.1" "dnspython" \ - --replace "pytest ~=7.2" "" \ - --replace "pytest-flask ~=1.2" "" \ - --replace "selenium~=4.14.0" "selenium" \ - --replace "werkzeug~=3.0" "werkzeug" - ''; + pythonRelaxDeps = true; propagatedBuildInputs = with python3.pkgs; [ apprise From e0df4c4198a96f5ffd555c674642393a1a3d88ab Mon Sep 17 00:00:00 2001 From: Benno Bielmeier Date: Wed, 30 Oct 2024 17:44:12 +0100 Subject: [PATCH 13/27] meilisearch: 1.10.3 -> 1.11.0 --- pkgs/servers/search/meilisearch/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/search/meilisearch/default.nix b/pkgs/servers/search/meilisearch/default.nix index e87fe1f9b60f..53a20fa16d83 100644 --- a/pkgs/servers/search/meilisearch/default.nix +++ b/pkgs/servers/search/meilisearch/default.nix @@ -10,7 +10,7 @@ }: let - version = "1.10.3"; + version = "1.11.0"; in rustPlatform.buildRustPackage { pname = "meilisearch"; @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage { owner = "meilisearch"; repo = "meiliSearch"; rev = "refs/tags/v${version}"; - hash = "sha256-OKy4y11akNGGrRzMHbIWe3MpZCz7qyofsJMAL06NDpo="; + hash = "sha256-QtuUuLUR+yrcKk0wH2XRdkV5mFnH2PuZ0sgMgKxudH8="; }; cargoBuildFlags = [ "--package=meilisearch" ]; @@ -28,6 +28,7 @@ rustPlatform.buildRustPackage { cargoLock = { lockFile = ./Cargo.lock; outputHashes = { + "rhai-1.20.0" = "sha256-lirpciSMM+OJh6Z4Ok3nZyJSdP8SNyUG15T9QqPNjII="; "hf-hub-0.3.2" = "sha256-tsn76b+/HRvPnZ7cWd8SBcEdnMPtjUEIRJipOJUbz54="; "tokenizers-0.15.2" = "sha256-lWvCu2hDJFzK6IUBJ4yeL4eZkOA08LHEMfiKXVvkog8="; }; From 2e5d0590ad5327bddcff6c368ab1c76fb2c68113 Mon Sep 17 00:00:00 2001 From: Benno Bielmeier Date: Sat, 9 Nov 2024 09:36:18 +0100 Subject: [PATCH 14/27] meilisearch: 1.11.0 -> 1.11.1 --- pkgs/servers/search/meilisearch/Cargo.lock | 87 +++++++++++++-------- pkgs/servers/search/meilisearch/default.nix | 4 +- 2 files changed, 55 insertions(+), 36 deletions(-) diff --git a/pkgs/servers/search/meilisearch/Cargo.lock b/pkgs/servers/search/meilisearch/Cargo.lock index 9fdf0cb2da83..55980577bbf5 100644 --- a/pkgs/servers/search/meilisearch/Cargo.lock +++ b/pkgs/servers/search/meilisearch/Cargo.lock @@ -386,15 +386,16 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" [[package]] name = "arroy" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ece9e5347e7fdaaea3181dec7f916677ad5f3fcbac183648ce1924eb4aeef9a" +checksum = "dfc5f272f38fa063bbff0a7ab5219404e221493de005e2b4078c62d626ef567e" dependencies = [ "bytemuck", "byteorder", "heed", "log", "memmap2", + "nohash", "ordered-float", "rand", "rayon", @@ -471,7 +472,7 @@ checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" [[package]] name = "benchmarks" -version = "1.10.3" +version = "1.11.1" dependencies = [ "anyhow", "bytes", @@ -527,7 +528,7 @@ dependencies = [ "proc-macro2", "quote", "regex", - "rustc-hash", + "rustc-hash 1.1.0", "shlex", "syn 2.0.60", ] @@ -652,7 +653,7 @@ dependencies = [ [[package]] name = "build-info" -version = "1.10.3" +version = "1.11.1" dependencies = [ "anyhow", "time", @@ -1622,7 +1623,7 @@ dependencies = [ [[package]] name = "dump" -version = "1.10.3" +version = "1.11.1" dependencies = [ "anyhow", "big_s", @@ -1834,7 +1835,7 @@ checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" [[package]] name = "file-store" -version = "1.10.3" +version = "1.11.1" dependencies = [ "tempfile", "thiserror", @@ -1856,7 +1857,7 @@ dependencies = [ [[package]] name = "filter-parser" -version = "1.10.3" +version = "1.11.1" dependencies = [ "insta", "nom", @@ -1876,7 +1877,7 @@ dependencies = [ [[package]] name = "flatten-serde-json" -version = "1.10.3" +version = "1.11.1" dependencies = [ "criterion", "serde_json", @@ -2000,7 +2001,7 @@ dependencies = [ [[package]] name = "fuzzers" -version = "1.10.3" +version = "1.11.1" dependencies = [ "arbitrary", "clap", @@ -2552,7 +2553,7 @@ checksum = "206ca75c9c03ba3d4ace2460e57b189f39f43de612c2f85836e65c929701bb2d" [[package]] name = "index-scheduler" -version = "1.10.3" +version = "1.11.1" dependencies = [ "anyhow", "arroy", @@ -2746,7 +2747,7 @@ dependencies = [ [[package]] name = "json-depth-checker" -version = "1.10.3" +version = "1.11.1" dependencies = [ "criterion", "serde_json", @@ -3365,7 +3366,7 @@ checksum = "490cc448043f947bae3cbee9c203358d62dbee0db12107a74be5c30ccfd09771" [[package]] name = "meili-snap" -version = "1.10.3" +version = "1.11.1" dependencies = [ "insta", "md5", @@ -3374,7 +3375,7 @@ dependencies = [ [[package]] name = "meilisearch" -version = "1.10.3" +version = "1.11.1" dependencies = [ "actix-cors", "actix-http", @@ -3414,6 +3415,7 @@ dependencies = [ "meilisearch-types", "mimalloc", "mime", + "mopa-maintained", "num_cpus", "obkv", "once_cell", @@ -3463,7 +3465,7 @@ dependencies = [ [[package]] name = "meilisearch-auth" -version = "1.10.3" +version = "1.11.1" dependencies = [ "base64 0.22.1", "enum-iterator", @@ -3482,7 +3484,7 @@ dependencies = [ [[package]] name = "meilisearch-types" -version = "1.10.3" +version = "1.11.1" dependencies = [ "actix-web", "anyhow", @@ -3512,7 +3514,7 @@ dependencies = [ [[package]] name = "meilitool" -version = "1.10.3" +version = "1.11.1" dependencies = [ "anyhow", "clap", @@ -3520,6 +3522,7 @@ dependencies = [ "file-store", "meilisearch-auth", "meilisearch-types", + "serde", "time", "uuid", ] @@ -3542,7 +3545,7 @@ dependencies = [ [[package]] name = "milli" -version = "1.10.3" +version = "1.11.1" dependencies = [ "arroy", "big_s", @@ -3679,12 +3682,24 @@ dependencies = [ "syn 2.0.60", ] +[[package]] +name = "mopa-maintained" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79b7f3e22167862cc7c95b21a6f326c22e4bf40da59cbf000b368a310173ba11" + [[package]] name = "mutually_exclusive_features" version = "0.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6d02c0b00610773bb7fc61d85e13d86c7858cbdf00e1a120bfc41bc055dbaa0e" +[[package]] +name = "nohash" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0f889fb66f7acdf83442c35775764b51fed3c606ab9cee51500dbde2cf528ca" + [[package]] name = "nom" version = "7.1.3" @@ -3976,7 +3991,7 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "permissive-json-pointer" -version = "1.10.3" +version = "1.11.1" dependencies = [ "big_s", "serde_json", @@ -4307,7 +4322,7 @@ dependencies = [ "pin-project-lite", "quinn-proto", "quinn-udp", - "rustc-hash", + "rustc-hash 1.1.0", "rustls", "thiserror", "tokio", @@ -4316,14 +4331,14 @@ dependencies = [ [[package]] name = "quinn-proto" -version = "0.11.3" +version = "0.11.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddf517c03a109db8100448a4be38d498df8a210a99fe0e1b9eaf39e78c640efe" +checksum = "fadfaed2cd7f389d0161bb73eeb07b7b78f8691047a6f3e73caaeae55310a4a6" dependencies = [ "bytes", "rand", "ring", - "rustc-hash", + "rustc-hash 2.0.0", "rustls", "slab", "thiserror", @@ -4574,9 +4589,8 @@ dependencies = [ [[package]] name = "rhai" -version = "1.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61797318be89b1a268a018a92a7657096d83f3ecb31418b9e9c16dcbb043b702" +version = "1.20.0" +source = "git+https://github.com/rhaiscript/rhai?rev=ef3df63121d27aacd838f366f2b83fd65f20a1e4#ef3df63121d27aacd838f366f2b83fd65f20a1e4" dependencies = [ "ahash 0.8.11", "bitflags 2.6.0", @@ -4593,8 +4607,7 @@ dependencies = [ [[package]] name = "rhai_codegen" version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5a11a05ee1ce44058fa3d5961d05194fdbe3ad6b40f904af764d81b86450e6b" +source = "git+https://github.com/rhaiscript/rhai?rev=ef3df63121d27aacd838f366f2b83fd65f20a1e4#ef3df63121d27aacd838f366f2b83fd65f20a1e4" dependencies = [ "proc-macro2", "quote", @@ -4696,6 +4709,12 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" +[[package]] +name = "rustc-hash" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152" + [[package]] name = "rustc_version" version = "0.4.0" @@ -4834,9 +4853,9 @@ checksum = "a3f0bf26fd526d2a95683cd0f87bf103b8539e2ca1ef48ce002d67aad59aa0b4" [[package]] name = "serde" -version = "1.0.204" +version = "1.0.209" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12" +checksum = "99fce0ffe7310761ca6bf9faf5115afbc19688edd00171d81b1bb1b116c63e09" dependencies = [ "serde_derive", ] @@ -4852,9 +4871,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.204" +version = "1.0.209" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222" +checksum = "a5831b979fd7b5439637af1752d535ff49f4860c0f341d1baeb6faf0f4242170" dependencies = [ "proc-macro2", "quote", @@ -5347,7 +5366,7 @@ dependencies = [ "fancy-regex 0.12.0", "lazy_static", "parking_lot", - "rustc-hash", + "rustc-hash 1.1.0", ] [[package]] @@ -6361,7 +6380,7 @@ dependencies = [ [[package]] name = "xtask" -version = "1.10.3" +version = "1.11.1" dependencies = [ "anyhow", "build-info", diff --git a/pkgs/servers/search/meilisearch/default.nix b/pkgs/servers/search/meilisearch/default.nix index 53a20fa16d83..59ce07445c98 100644 --- a/pkgs/servers/search/meilisearch/default.nix +++ b/pkgs/servers/search/meilisearch/default.nix @@ -10,7 +10,7 @@ }: let - version = "1.11.0"; + version = "1.11.1"; in rustPlatform.buildRustPackage { pname = "meilisearch"; @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage { owner = "meilisearch"; repo = "meiliSearch"; rev = "refs/tags/v${version}"; - hash = "sha256-QtuUuLUR+yrcKk0wH2XRdkV5mFnH2PuZ0sgMgKxudH8="; + hash = "sha256-SxmN6CDgS4QrCdJPF36RyljvKXXhCuYzaJnpqROSY5U="; }; cargoBuildFlags = [ "--package=meilisearch" ]; From 3518622af756db457db79a545d9a773c685d14ff Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Mon, 11 Nov 2024 10:14:12 +0800 Subject: [PATCH 15/27] benthos: nixfmt --- pkgs/by-name/be/benthos/package.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/be/benthos/package.nix b/pkgs/by-name/be/benthos/package.nix index 26c03f7fa658..240e2b1c422a 100644 --- a/pkgs/by-name/be/benthos/package.nix +++ b/pkgs/by-name/be/benthos/package.nix @@ -1,6 +1,7 @@ -{ lib -, buildGoModule -, fetchFromGitHub +{ + lib, + buildGoModule, + fetchFromGitHub, }: buildGoModule rec { From e0b79819697780e71bfbb6440156607bfdcb219d Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Mon, 11 Nov 2024 10:40:49 +0800 Subject: [PATCH 16/27] benthos: 4.27.0 -> 4.39.0 --- pkgs/by-name/be/benthos/package.nix | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/be/benthos/package.nix b/pkgs/by-name/be/benthos/package.nix index 240e2b1c422a..cd5e65953754 100644 --- a/pkgs/by-name/be/benthos/package.nix +++ b/pkgs/by-name/be/benthos/package.nix @@ -2,41 +2,44 @@ lib, buildGoModule, fetchFromGitHub, + nix-update-script, }: buildGoModule rec { pname = "benthos"; - version = "4.27.0"; + version = "4.40.0"; src = fetchFromGitHub { - owner = "benthosdev"; + owner = "redpanda-data"; repo = "benthos"; rev = "refs/tags/v${version}"; - hash = "sha256-Jswy4Ku/dxIEfC+jNjLXu/WW24enc4Qn0vrOHvNDVYQ="; + hash = "sha256-FABy2Fl32qS0zVQ+pDYUXQjTvAxn3eDCqvQn8kpZCjw="; }; proxyVendor = true; - vendorHash = "sha256-6CVDhy29bIn19EgKbKDNTBWdy+i18g0oz/NxABcQ6QE="; - - doCheck = false; - subPackages = [ "cmd/benthos" ]; + vendorHash = "sha256-LCw15Q/kr5XCoBAOyGVOCcD/FcqUodlYLETNsRbOeG8="; + +# doCheck = false; + ldflags = [ "-s" "-w" - "-X github.com/benthosdev/benthos/v4/internal/cli.Version=${version}" + "-X github.com/redpanda-data/benthos/v4/internal/cli.Version=${version}" ]; - meta = with lib; { + passthru.updateScript = nix-update-script { }; + + meta = { description = "Fancy stream processing made operationally mundane"; mainProgram = "benthos"; homepage = "https://www.benthos.dev"; changelog = "https://github.com/benthosdev/benthos/blob/v${version}/CHANGELOG.md"; - license = licenses.mit; - maintainers = with maintainers; [ sagikazarmark ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ sagikazarmark ]; }; } From c8c511e89289239fb558af19b71e547f48b6a5b5 Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Sun, 10 Nov 2024 21:12:35 +0800 Subject: [PATCH 17/27] python3Packages.drms: add bot-wxt1221 as maintainers --- pkgs/development/python-modules/drms/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/drms/default.nix b/pkgs/development/python-modules/drms/default.nix index 8a919a74a6c9..df31801623c3 100644 --- a/pkgs/development/python-modules/drms/default.nix +++ b/pkgs/development/python-modules/drms/default.nix @@ -50,10 +50,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "drms" ]; - meta = with lib; { + meta = { description = "Access HMI, AIA and MDI data with Python"; homepage = "https://github.com/sunpy/drms"; - license = licenses.bsd2; - maintainers = [ ]; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ bot-wxt1221 ]; }; } From bde4a877452c7a3c59f44a7b4d446ea70c2a0422 Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Sun, 10 Nov 2024 21:13:01 +0800 Subject: [PATCH 18/27] python3Packages.drms: fix build --- pkgs/development/python-modules/drms/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/drms/default.nix b/pkgs/development/python-modules/drms/default.nix index df31801623c3..f079e61d6579 100644 --- a/pkgs/development/python-modules/drms/default.nix +++ b/pkgs/development/python-modules/drms/default.nix @@ -44,7 +44,10 @@ buildPythonPackage rec { pytest-doctestplus ]; - disabledTests = [ "test_query_hexadecimal_strings" ]; + disabledTests = [ + "test_query_hexadecimal_strings" + "test_jsocinfoconstants" # Need network + ]; disabledTestPaths = [ "docs/tutorial.rst" ]; From 6dffdac08693e97462cb1b9635ebf39024c135da Mon Sep 17 00:00:00 2001 From: zendo Date: Mon, 11 Nov 2024 14:00:06 +0800 Subject: [PATCH 19/27] bashly: 1.1.10 -> 1.2.6 --- pkgs/by-name/ba/bashly/Gemfile.lock | 30 ++++++---- pkgs/by-name/ba/bashly/gemset.nix | 86 +++++++++++++++++++++++------ pkgs/by-name/ba/bashly/package.nix | 35 ++++-------- 3 files changed, 99 insertions(+), 52 deletions(-) diff --git a/pkgs/by-name/ba/bashly/Gemfile.lock b/pkgs/by-name/ba/bashly/Gemfile.lock index b7d336769261..c3f08f1947ce 100644 --- a/pkgs/by-name/ba/bashly/Gemfile.lock +++ b/pkgs/by-name/ba/bashly/Gemfile.lock @@ -1,37 +1,47 @@ GEM remote: https://rubygems.org/ specs: - bashly (1.1.10) + bashly (1.2.6) colsole (>= 0.8.1, < 2) completely (~> 0.6.1) filewatcher (~> 2.0) gtx (~> 0.1) + logger (>= 1, < 3) lp (~> 0.2) mister_bin (~> 0.7) + ostruct (>= 0, < 2) psych (>= 3.3.2, < 7) + requires (~> 1.1.0) tty-markdown (~> 0.7) + cgi (0.4.1) colsole (1.0.0) - completely (0.6.2) + completely (0.6.3) colsole (>= 0.8.1, < 2) mister_bin (~> 0.7) docopt_ng (0.7.1) + erb (4.0.4) + cgi (>= 0.3.3) filewatcher (2.1.0) module_methods (~> 0.1.0) - gtx (0.1.0) + gtx (0.1.1) + erb (~> 4.0) kramdown (2.4.0) rexml + logger (1.6.1) lp (0.2.1) mister_bin (0.7.6) colsole (>= 0.8.1, < 2) docopt_ng (~> 0.7, >= 0.7.1) module_methods (0.1.0) + ostruct (0.6.1) pastel (0.8.0) tty-color (~> 0.5) - psych (5.1.2) + psych (5.2.0) stringio - rexml (3.2.6) - rouge (4.2.1) - stringio (3.1.0) + requires (1.1.0) + rexml (3.3.9) + rouge (4.5.0) + stringio (3.1.2) strings (0.2.1) strings-ansi (~> 0.2) unicode-display_width (>= 1.5, < 3.0) @@ -46,14 +56,14 @@ GEM tty-color (~> 0.5) tty-screen (~> 0.8) tty-screen (0.8.2) - unicode-display_width (2.5.0) + unicode-display_width (2.6.0) unicode_utils (1.4.0) PLATFORMS - x86_64-linux + ruby DEPENDENCIES bashly BUNDLED WITH - 2.3.26 + 2.5.16 diff --git a/pkgs/by-name/ba/bashly/gemset.nix b/pkgs/by-name/ba/bashly/gemset.nix index 234cd93b159d..9a95ade58ccf 100644 --- a/pkgs/by-name/ba/bashly/gemset.nix +++ b/pkgs/by-name/ba/bashly/gemset.nix @@ -1,14 +1,24 @@ { bashly = { - dependencies = ["colsole" "completely" "filewatcher" "gtx" "lp" "mister_bin" "psych" "tty-markdown"]; + dependencies = ["colsole" "completely" "filewatcher" "gtx" "logger" "lp" "mister_bin" "ostruct" "psych" "requires" "tty-markdown"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1kdqpnkwgmb6kbrq9fyazj0jh0dh8srh86xjk92xrvgfps1kh5sy"; + sha256 = "0dzyqwf43i92jq5j66j31qvsbfcpd6zk74ssqz14kj51wn2d8vw3"; type = "gem"; }; - version = "1.1.10"; + version = "1.2.6"; + }; + cgi = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0c5494n3n6l51n1w1vc118zckbqdzk7r6b656hswg72w0bif2ja3"; + type = "gem"; + }; + version = "0.4.1"; }; colsole = { groups = ["default"]; @@ -26,10 +36,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12vf279w44d520vw28drxyi05wi1hyrg262ifjlhk9chjrnzcc7k"; + sha256 = "0ci8iza647hvc4f1cmf9mpsm3i78ysf6g6213wkyrr5jk296hjjb"; type = "gem"; }; - version = "0.6.2"; + version = "0.6.3"; }; docopt_ng = { groups = ["default"]; @@ -41,6 +51,17 @@ }; version = "0.7.1"; }; + erb = { + dependencies = ["cgi"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "05wpc7pn1k6jik7i57vfrj6k5lda39hrny0q3706pi05c886w4fy"; + type = "gem"; + }; + version = "4.0.4"; + }; filewatcher = { dependencies = ["module_methods"]; groups = ["default"]; @@ -53,14 +74,15 @@ version = "2.1.0"; }; gtx = { + dependencies = ["erb"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10hfhicvv371gy1i16x6vry1xglvxl0zh7qr6f14pqsx32qih6ff"; + sha256 = "1w0hbr9i6jpn9spbb13ipg2fajkwa51y56jw21ziwsddmv997274"; type = "gem"; }; - version = "0.1.0"; + version = "0.1.1"; }; kramdown = { dependencies = ["rexml"]; @@ -73,6 +95,16 @@ }; version = "2.4.0"; }; + logger = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0lwncq2rf8gm79g2rcnnyzs26ma1f4wnfjm6gs4zf2wlsdz5in9s"; + type = "gem"; + }; + version = "1.6.1"; + }; lp = { groups = ["default"]; platforms = []; @@ -104,6 +136,16 @@ }; version = "0.1.0"; }; + ostruct = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "05xqijcf80sza5pnlp1c8whdaay8x5dc13214ngh790zrizgp8q9"; + type = "gem"; + }; + version = "0.6.1"; + }; pastel = { dependencies = ["tty-color"]; groups = ["default"]; @@ -121,40 +163,50 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0s5383m6004q76xm3lb732bp4sjzb6mxb6rbgn129gy2izsj4wrk"; + sha256 = "0wq567f615x1ilgaqlh4yzf322f96rgn45xw4nm4vwfaddszw0v6"; type = "gem"; }; - version = "5.1.2"; + version = "5.2.0"; + }; + requires = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0dlibxp6jfdl4favj2pgsm2pw84hhr2cdiizfs51ldkpddm50njp"; + type = "gem"; + }; + version = "1.1.0"; }; rexml = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "05i8518ay14kjbma550mv0jm8a6di8yp5phzrd8rj44z9qnrlrp0"; + sha256 = "1j9p66pmfgxnzp76ksssyfyqqrg7281dyi3xyknl3wwraaw7a66p"; type = "gem"; }; - version = "3.2.6"; + version = "3.3.9"; }; rouge = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zd1pdldi6h8x27dqim7cy8m69xr01aw5c8k1zhkz497n4np6wgk"; + sha256 = "0dllqyxlxsmsy4xdpgwbn6w9w6qsha9ay6cl5kq06jgw63k5dp10"; type = "gem"; }; - version = "4.2.1"; + version = "4.5.0"; }; stringio = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "063psvsn1aq6digpznxfranhcpmi0sdv2jhra5g0459sw0x2dxn1"; + sha256 = "0cd1kdrf62p2ya3ia4rz49d5012bqinvqjmcgkakknswz0l1hkr0"; type = "gem"; }; - version = "3.1.0"; + version = "3.1.2"; }; strings = { dependencies = ["strings-ansi" "unicode-display_width" "unicode_utils"]; @@ -213,10 +265,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1d0azx233nags5jx3fqyr23qa2rhgzbhv8pxp46dgbg1mpf82xky"; + sha256 = "0nkz7fadlrdbkf37m0x7sw8bnz8r355q3vwcfb9f9md6pds9h9qj"; type = "gem"; }; - version = "2.5.0"; + version = "2.6.0"; }; unicode_utils = { groups = ["default"]; diff --git a/pkgs/by-name/ba/bashly/package.nix b/pkgs/by-name/ba/bashly/package.nix index 5a3d6661caa2..8611d5938935 100644 --- a/pkgs/by-name/ba/bashly/package.nix +++ b/pkgs/by-name/ba/bashly/package.nix @@ -1,31 +1,16 @@ -{ lib -, stdenvNoCC -, bundlerApp +{ + lib, + bundlerApp, + bundlerUpdateScript, }: -let - bashlyBundlerApp = bundlerApp { - pname = "bashly"; - gemdir = ./.; - exes = [ "bashly" ]; - }; -in -stdenvNoCC.mkDerivation (finalAttrs: { - name = "bashly"; +bundlerApp { + pname = "bashly"; - dontUnpack = true; + gemdir = ./.; + exes = [ "bashly" ]; - installPhase = '' - runHook preInstall - - mkdir $out; - cd $out; - - mkdir bin; pushd bin; - ln -vs ${bashlyBundlerApp}/bin/bashly; - - runHook postInstall - ''; + passthru.updateScript = bundlerUpdateScript "bashly"; meta = { description = "Bash command line framework and CLI generator"; @@ -35,4 +20,4 @@ stdenvNoCC.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ drupol ]; platforms = lib.platforms.unix; }; -}) +} From 7bb56ad6acf9b590ff3f58c697ef3d287b91cc0c Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sun, 10 Nov 2024 17:34:08 +0100 Subject: [PATCH 20/27] nbqa: 1.9.0 -> 1.9.1 Diff: https://github.com/nbQA-dev/nbQA/compare/refs/tags/1.9.0...1.9.1 Changelog: https://nbqa.readthedocs.io/en/latest/history.html --- pkgs/by-name/nb/nbqa/package.nix | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/nb/nbqa/package.nix b/pkgs/by-name/nb/nbqa/package.nix index 07fdcdde271a..e171b4b57556 100644 --- a/pkgs/by-name/nb/nbqa/package.nix +++ b/pkgs/by-name/nb/nbqa/package.nix @@ -1,6 +1,6 @@ { lib, - python3, + python3Packages, fetchFromGitHub, # optional-dependencies @@ -8,27 +8,29 @@ # tests versionCheckHook, + + nix-update-script, }: let - nbqa = python3.pkgs.buildPythonApplication rec { + nbqa = python3Packages.buildPythonApplication rec { pname = "nbqa"; - version = "1.9.0"; + version = "1.9.1"; pyproject = true; src = fetchFromGitHub { owner = "nbQA-dev"; repo = "nbQA"; rev = "refs/tags/${version}"; - hash = "sha256-9s+q2unh+jezU0Er7ZH0tvgntmPFts9OmsgAMeQXRrY="; + hash = "sha256-qVNJ8f8vUlTCi5DbvG70orcSnulH60UcI5iABtXYUog="; }; - build-system = with python3.pkgs; [ + build-system = with python3Packages; [ setuptools ]; optional-dependencies.toolchain = - (with python3.pkgs; [ + (with python3Packages; [ black blacken-docs flake8 @@ -42,7 +44,7 @@ let ruff ]; - dependencies = with python3.pkgs; [ + dependencies = with python3Packages; [ autopep8 ipython tokenize-rt @@ -60,7 +62,7 @@ let ''; nativeCheckInputs = - (with python3.pkgs; [ + (with python3Packages; [ autoflake distutils mdformat @@ -71,6 +73,7 @@ let ]) ++ lib.flatten (lib.attrValues optional-dependencies) ++ [ versionCheckHook ]; + versionCheckProgramArg = [ "--version" ]; disabledTests = [ # Test data not found @@ -98,10 +101,12 @@ let nbqa.overridePythonAttrs ( { dependencies, ... }: { - dependencies = dependencies ++ selector python3.pkgs; + dependencies = dependencies ++ selector python3Packages; doCheck = false; } ); + + updateScript = nix-update-script { }; }; meta = { From c91af3b51c481cbef61476e42d960045d0db390d Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 9 Nov 2024 16:51:12 +0100 Subject: [PATCH 21/27] open-isns: 0.102 -> 0.103 switch to meson/ninja builds and fix split output openiscsi: fix open-isns input --- pkgs/by-name/op/open-isns/package.nix | 22 +++++++++++++++------- pkgs/by-name/op/openiscsi/package.nix | 2 +- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/op/open-isns/package.nix b/pkgs/by-name/op/open-isns/package.nix index 7afe13eea86a..8f892f19ff2c 100644 --- a/pkgs/by-name/op/open-isns/package.nix +++ b/pkgs/by-name/op/open-isns/package.nix @@ -1,24 +1,32 @@ -{ lib, stdenv, openssl, fetchFromGitHub }: +{ lib, stdenv, pkg-config, meson, ninja, openssl, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "open-isns"; - version = "0.102"; + version = "0.103"; src = fetchFromGitHub { owner = "open-iscsi"; repo = "open-isns"; rev = "v${version}"; - sha256 = "sha256-Vz6VqqvEr0f8AdN9NcVnruapswmoOgvAXxXSfrM3yRA="; + sha256 = "sha256-buqQMsoxRCbWiBDq0XAg93J7bjbdxeIernV8sDVxCAA="; }; + # The location of /var/lib is not made configurable in the meson.build file + postPatch = '' + substituteInPlace meson.build \ + --replace-fail "/var/lib" "$out/var/lib" \ + ''; + + nativeBuildInputs = [ meson ninja pkg-config ]; propagatedBuildInputs = [ openssl ]; - outputs = [ "out" "lib" ]; - outputInclude = "lib"; + outputs = [ "out" "lib" "dev" "man" ]; configureFlags = [ "--enable-shared" ]; - installFlags = [ "etcdir=$(out)/etc" "vardir=$(out)/var/lib/isns" ]; - installTargets = [ "install" "install_hdrs" "install_lib" ]; + mesonFlags = [ + "-Dslp=disabled" # openslp is not maintained and labeled unsafe + "-Dsystemddir=${placeholder "out"}/lib/systemd" + ]; meta = with lib; { description = "iSNS server and client for Linux"; diff --git a/pkgs/by-name/op/openiscsi/package.nix b/pkgs/by-name/op/openiscsi/package.nix index 9bb98fbeea3b..d1074588b97f 100644 --- a/pkgs/by-name/op/openiscsi/package.nix +++ b/pkgs/by-name/op/openiscsi/package.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ kmod - (lib.getLib open-isns) + open-isns openssl systemd util-linux From 789fc0056a4489341616bac63ac717219e85d1fa Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 9 Nov 2024 17:00:51 +0100 Subject: [PATCH 22/27] open-isns: apply nixfmt --- pkgs/by-name/op/open-isns/package.nix | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/op/open-isns/package.nix b/pkgs/by-name/op/open-isns/package.nix index 8f892f19ff2c..8488668da2b2 100644 --- a/pkgs/by-name/op/open-isns/package.nix +++ b/pkgs/by-name/op/open-isns/package.nix @@ -1,4 +1,12 @@ -{ lib, stdenv, pkg-config, meson, ninja, openssl, fetchFromGitHub }: +{ + lib, + stdenv, + pkg-config, + meson, + ninja, + openssl, + fetchFromGitHub, +}: stdenv.mkDerivation rec { pname = "open-isns"; @@ -17,9 +25,18 @@ stdenv.mkDerivation rec { --replace-fail "/var/lib" "$out/var/lib" \ ''; - nativeBuildInputs = [ meson ninja pkg-config ]; + nativeBuildInputs = [ + meson + ninja + pkg-config + ]; propagatedBuildInputs = [ openssl ]; - outputs = [ "out" "lib" "dev" "man" ]; + outputs = [ + "out" + "lib" + "dev" + "man" + ]; configureFlags = [ "--enable-shared" ]; From a2d3ae028622ddb944206fa8c99e47c8fc341577 Mon Sep 17 00:00:00 2001 From: Arthur Gautier Date: Fri, 8 Nov 2024 16:21:05 -0800 Subject: [PATCH 23/27] rpm-sequoia: init at 1.7.0 --- pkgs/by-name/rp/rpm-sequoia/objdump.patch | 18 ++++++ pkgs/by-name/rp/rpm-sequoia/package.nix | 74 +++++++++++++++++++++++ 2 files changed, 92 insertions(+) create mode 100644 pkgs/by-name/rp/rpm-sequoia/objdump.patch create mode 100644 pkgs/by-name/rp/rpm-sequoia/package.nix diff --git a/pkgs/by-name/rp/rpm-sequoia/objdump.patch b/pkgs/by-name/rp/rpm-sequoia/objdump.patch new file mode 100644 index 000000000000..232190a9bc80 --- /dev/null +++ b/pkgs/by-name/rp/rpm-sequoia/objdump.patch @@ -0,0 +1,18 @@ +objdump may be prefixed on cross-compilation, read the path from $OBJDUMP instead + +diff --git a/tests/symbols.rs b/tests/symbols.rs +index 9375619..5f161fc 100644 +--- a/tests/symbols.rs ++++ b/tests/symbols.rs +@@ -27,7 +27,10 @@ fn symbols() -> anyhow::Result<()> { + } + }; + +- let cmd = Command::new("objdump") ++ let cmd = Command::new("bash") ++ .arg("-c") ++ .arg(r#"exec "$OBJDUMP" "$@""#) ++ .arg("--") + .arg("-T") + .arg(lib) + .unwrap(); diff --git a/pkgs/by-name/rp/rpm-sequoia/package.nix b/pkgs/by-name/rp/rpm-sequoia/package.nix new file mode 100644 index 000000000000..d3ecf9fa91f6 --- /dev/null +++ b/pkgs/by-name/rp/rpm-sequoia/package.nix @@ -0,0 +1,74 @@ +{ + stdenv, + fetchFromGitHub, + lib, + nettle, + nix-update-script, + rustPlatform, + pkg-config, + runCommand, +}: + +rustPlatform.buildRustPackage rec { + pname = "rpm-sequoia"; + version = "1.7.0"; + + src = fetchFromGitHub { + owner = "rpm-software-management"; + repo = "rpm-sequoia"; + rev = "v${version}"; + hash = "sha256-AZCsboUv4muKOw5El2Hw5O1cvAgD3JhBppacrQCJT2k="; + }; + + cargoHash = "sha256-0yO1+OAkXje/ir8i8URVhIcW8gwXleYx+XL1U4bjtXk="; + + patches = [ + ./objdump.patch + ]; + + nativeBuildInputs = [ + pkg-config + rustPlatform.bindgenHook + ]; + + propagatedBuildInputs = [ nettle ]; + + # Tests will parse the symbols, on darwin we have two issues: + # - library name is hardcoded to librpm_sequoia.so + # - The output of the objdump differs and the parsing logic needs to be adapted + doCheck = !stdenv.hostPlatform.isDarwin; + + outputs = [ + "out" + "dev" + ]; + + # Ensure the generated .pc file gets the correct prefix + env.PREFIX = placeholder "out"; + + # Install extra files, the same as this is done on fedora: + # https://src.fedoraproject.org/rpms/rust-rpm-sequoia/blob/f41/f/rust-rpm-sequoia.spec#_81 + preInstall = + # Install the generated pc file for consumption by the dependents + '' + install -Dm644 target/release/rpm-sequoia.pc -t $dev/lib/pkgconfig + '' + + + # Dependents will rely on the versioned symlinks + '' + install -d $out/lib + find target/release/ \ + -maxdepth 1 \ + -type l -name 'librpm_sequoia.*' \ + -exec cp --no-dereference {} $out/lib/ \; + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "An OpenPGP backend for rpm using Sequoia PGP"; + homepage = "https://sequoia-pgp.org/"; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ baloo ]; + }; +} From bb061f0e550f1d1bf9c27891fd99d6f903615c4f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 11 Nov 2024 20:04:41 +0000 Subject: [PATCH 24/27] python312Packages.pydantic-yaml: 1.3.0 -> 1.4.0 --- pkgs/development/python-modules/pydantic-yaml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pydantic-yaml/default.nix b/pkgs/development/python-modules/pydantic-yaml/default.nix index 50f14837476a..bb7f1726a69e 100644 --- a/pkgs/development/python-modules/pydantic-yaml/default.nix +++ b/pkgs/development/python-modules/pydantic-yaml/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pydantic-yaml"; - version = "1.3.0"; + version = "1.4.0"; pyproject = true; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "NowanIlfideme"; repo = "pydantic-yaml"; rev = "refs/tags/v${version}"; - hash = "sha256-Kv1nLR91iwShmCgduXA07+a+2EP1nnvaC7fBAn/ufEM="; + hash = "sha256-xlFSczMCEkSDhtzSl8qzZwwZd0IelPmjTEV+Jk9G0fI="; }; postPatch = '' From e73bbaf8d07fafcb919d7a5a3c217d48d9ab2f68 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Thu, 18 Apr 2024 21:38:22 +0200 Subject: [PATCH 25/27] wordpressPackages.plugins.so-clean-up-wp-seo: init at 4.0.2 --- pkgs/servers/web-apps/wordpress/packages/plugins.json | 6 ++++++ .../web-apps/wordpress/packages/wordpress-plugins.json | 1 + 2 files changed, 7 insertions(+) diff --git a/pkgs/servers/web-apps/wordpress/packages/plugins.json b/pkgs/servers/web-apps/wordpress/packages/plugins.json index 4698aaee912c..fdc98742fdcb 100644 --- a/pkgs/servers/web-apps/wordpress/packages/plugins.json +++ b/pkgs/servers/web-apps/wordpress/packages/plugins.json @@ -137,6 +137,12 @@ "sha256": "1r0jfcy7qmrcclnhfqja6rixs3w3ipadblpgk54s36b11gnkfs9q", "version": "1.1.3" }, + "so-clean-up-wp-seo": { + "path": "so-clean-up-wp-seo/tags/4.0.2", + "rev": "3068954", + "sha256": "1ypvbpzaxgfgpk29b8snfvsmbb166irpb739rzyfs3b3857nnrvn", + "version": "4.0.2" + }, "static-mail-sender-configurator": { "path": "static-mail-sender-configurator/tags/0.10.0", "rev": "2941521", diff --git a/pkgs/servers/web-apps/wordpress/packages/wordpress-plugins.json b/pkgs/servers/web-apps/wordpress/packages/wordpress-plugins.json index 3ffa1b4f0dd9..f5db899e8bb2 100644 --- a/pkgs/servers/web-apps/wordpress/packages/wordpress-plugins.json +++ b/pkgs/servers/web-apps/wordpress/packages/wordpress-plugins.json @@ -22,6 +22,7 @@ , "opengraph": "asl20" , "simple-login-captcha": "gpl2Plus" , "simple-mastodon-verification": "gpl2Plus" +, "so-clean-up-wp-seo": "gpl3Plus" , "static-mail-sender-configurator": "mit" , "surge": "gpl3Only" , "tc-custom-javascript": "gpl2Plus" From 8db09779faceef1e3df98b64e139ba398908e25e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 11 Nov 2024 21:21:51 +0000 Subject: [PATCH 26/27] python312Packages.ihcsdk: 2.8.6 -> 2.8.7 --- pkgs/development/python-modules/ihcsdk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ihcsdk/default.nix b/pkgs/development/python-modules/ihcsdk/default.nix index 7750e89c27fa..8c141695b6be 100644 --- a/pkgs/development/python-modules/ihcsdk/default.nix +++ b/pkgs/development/python-modules/ihcsdk/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "ihcsdk"; - version = "2.8.6"; + version = "2.8.7"; pyproject = true; src = fetchFromGitHub { owner = "dingusdk"; repo = "PythonIhcSdk"; rev = "refs/tags/v${version}"; - hash = "sha256-0meYr/SywtRfp/TBW3t8QUMlenb5KnzvKfn6c7Przpc="; + hash = "sha256-Ct+ONqvvm1OcZKi+5P3o5ievfVK0pg8DpjNwkbuczCE="; }; build-system = [ setuptools ]; From 8c2fd986cc1eae7ee09844fbd87966d09e52c430 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 8 Nov 2024 09:10:19 +0000 Subject: [PATCH 27/27] networkmanager-iodine: 1.2.0-unstable-2024-05-12 -> 1.2.0-unstable-2024-11-02 --- pkgs/by-name/ne/networkmanager-iodine/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ne/networkmanager-iodine/package.nix b/pkgs/by-name/ne/networkmanager-iodine/package.nix index fa706f1b5892..c1fea9dcb77d 100644 --- a/pkgs/by-name/ne/networkmanager-iodine/package.nix +++ b/pkgs/by-name/ne/networkmanager-iodine/package.nix @@ -18,14 +18,14 @@ stdenv.mkDerivation { pname = "NetworkManager-iodine${lib.optionalString withGnome "-gnome"}"; - version = "1.2.0-unstable-2024-05-12"; + version = "1.2.0-unstable-2024-11-02"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "GNOME"; repo = "network-manager-iodine"; - rev = "8ec0a35e12047ccf256b3951897c701661ddb8af"; - sha256 = "cNjznry8wi1UmE5khf0JCEYjs9nDU/u8lFLte53MLTM="; + rev = "dd633f80913ae637d6f496bae1b7bac8c297860c"; + sha256 = "sAndI8jjCcRENDGz4V3AKswybzC8PDzYPaEN1mLcti8="; }; patches = [