From 166babb622421c50178bf4863609d1eadaf6d65e Mon Sep 17 00:00:00 2001 From: "Markus S. Wamser" Date: Fri, 6 Jun 2025 10:51:01 +0200 Subject: [PATCH] ly: 1.0.3 -> 1.1.0 --- nixos/modules/services/display-managers/ly.nix | 4 +--- pkgs/by-name/ly/ly/deps.nix | 14 +++++++------- pkgs/by-name/ly/ly/package.nix | 10 +++++----- 3 files changed, 13 insertions(+), 15 deletions(-) diff --git a/nixos/modules/services/display-managers/ly.nix b/nixos/modules/services/display-managers/ly.nix index 9475f183a16d..51a99a7ec458 100644 --- a/nixos/modules/services/display-managers/ly.nix +++ b/nixos/modules/services/display-managers/ly.nix @@ -41,13 +41,11 @@ let path = "/run/current-system/sw/bin"; term_reset_cmd = "${pkgs.ncurses}/bin/tput reset"; term_restore_cursor_cmd = "${pkgs.ncurses}/bin/tput cnorm"; - mcookie_cmd = "/run/current-system/sw/bin/mcookie"; waylandsessions = "${dmcfg.sessionData.desktops}/share/wayland-sessions"; - wayland_cmd = dmcfg.sessionData.wrapper; xsessions = "${dmcfg.sessionData.desktops}/share/xsessions"; xauth_cmd = lib.optionalString xcfg.enable "${pkgs.xorg.xauth}/bin/xauth"; x_cmd = lib.optionalString xcfg.enable xserverWrapper; - x_cmd_setup = dmcfg.sessionData.wrapper; + setup_cmd = dmcfg.sessionData.wrapper; }; finalConfig = defaultConfig // cfg.settings; diff --git a/pkgs/by-name/ly/ly/deps.nix b/pkgs/by-name/ly/ly/deps.nix index 17a9803b92f2..67982e9667a4 100644 --- a/pkgs/by-name/ly/ly/deps.nix +++ b/pkgs/by-name/ly/ly/deps.nix @@ -89,23 +89,23 @@ let in linkFarm name [ { - name = "122062d301a203d003547b414237229b09a7980095061697349f8bef41be9c30266b"; + name = "clap-0.10.0-oBajB434AQBDh-Ei3YtoKIRxZacVPF1iSwp3IX_ZB8f0"; path = fetchZigArtifact { name = "clap"; - url = "https://github.com/Hejsil/zig-clap/archive/refs/tags/0.9.1.tar.gz"; - hash = "sha256-7qxm/4xb+58MGG+iUzssUtR97OG2dRjAqyS0BAet4HY="; + url = "https://github.com/Hejsil/zig-clap/archive/refs/tags/0.10.0.tar.gz"; + hash = "sha256-cbPGmVlIXwIuRPIfQoFXzwLulT4XEv8rQWcJUl1ueyo="; }; } { - name = "12209b971367b4066d40ecad4728e6fdffc4cc4f19356d424c2de57f5b69ac7a619a"; + name = "zigini-0.3.1-BSkB7XJGAAB2E-sKyzhTaQCBlYBL8yqzE4E_jmSY99sC"; path = fetchZigArtifact { name = "zigini"; - url = "https://github.com/Kawaii-Ash/zigini/archive/0bba97a12582928e097f4074cc746c43351ba4c8.tar.gz"; - hash = "sha256-OdaJ5tqmk2MPwaAbpK4HRD/CcQCN+Cjj8U63BqUcFMs="; + url = "https://github.com/Kawaii-Ash/zigini/archive/2ed3d417f17fab5b0ee8cad8a63c6d62d7ac1042.tar.gz"; + hash = "sha256-Zj9uU6EEHkNZ1cPIDgDj1E2CEpbmPmpJYjSSFnxxdf0="; }; } { - name = "1220b0979ea9891fa4aeb85748fc42bc4b24039d9c99a4d65d893fb1c83e921efad8"; + name = "N-V-__8AAB9qAACwl56piR-krrhXSPxCvEskA52cmaTWXYk_"; path = fetchZigArtifact { name = "ini"; url = "https://github.com/ziglibs/ini/archive/e18d36665905c1e7ba0c1ce3e8780076b33e3002.tar.gz"; diff --git a/pkgs/by-name/ly/ly/package.nix b/pkgs/by-name/ly/ly/package.nix index cb68aff5c7cf..a3fc6dda1966 100644 --- a/pkgs/by-name/ly/ly/package.nix +++ b/pkgs/by-name/ly/ly/package.nix @@ -5,26 +5,26 @@ linux-pam, libxcb, makeBinaryWrapper, - zig_0_13, + zig_0_14, callPackage, nixosTests, }: stdenv.mkDerivation (finalAttrs: { pname = "ly"; - version = "1.0.3"; + version = "1.1.0"; src = fetchFromGitea { domain = "codeberg.org"; owner = "AnErrupTion"; repo = "ly"; tag = "v${finalAttrs.version}"; - hash = "sha256-TsEn0kH7j4myjjgwHnbOUmIZjHn8A1d/7IjamoWxpXQ="; + hash = "sha256-+rRvrlzV5MDwb/7pr/oZjxxDmE1kbnchyUi70xwp0Cw="; }; nativeBuildInputs = [ makeBinaryWrapper - zig_0_13.hook + zig_0_14.hook ]; buildInputs = [ libxcb @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' ln -s ${ callPackage ./deps.nix { - zig = zig_0_13; + zig = zig_0_14; } } $ZIG_GLOBAL_CACHE_DIR/p '';