From ea87e5d0465d286e07600d76fefa1bc8cf249549 Mon Sep 17 00:00:00 2001 From: luftmensch-luftmensch Date: Mon, 9 Jun 2025 21:42:09 +0200 Subject: [PATCH 1/4] lite-xl: 2.1.7 -> 2.1.8 --- pkgs/by-name/li/lite-xl/package.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/lite-xl/package.nix b/pkgs/by-name/li/lite-xl/package.nix index 44c478e7209e..802f5105627d 100644 --- a/pkgs/by-name/li/lite-xl/package.nix +++ b/pkgs/by-name/li/lite-xl/package.nix @@ -5,27 +5,30 @@ lua5_4, meson, ninja, + cmake, pcre2, pkg-config, SDL2, + sdl3, stdenv, }: stdenv.mkDerivation rec { pname = "lite-xl"; - version = "2.1.7"; + version = "2.1.8"; src = fetchFromGitHub { owner = "lite-xl"; repo = "lite-xl"; rev = "v${version}"; - hash = "sha256-Ig0XDxnll/zruAwWHwuXiqumBXgAPxuK0E1ELupvcXo="; + hash = "sha256-9JpD7f5vOGhLW8dBjjYUI5PSaz/XWW5sIOZCAbKhxtE="; }; nativeBuildInputs = [ meson ninja pkg-config + cmake ]; buildInputs = [ @@ -33,6 +36,7 @@ stdenv.mkDerivation rec { lua5_4 pcre2 SDL2 + sdl3 ]; mesonFlags = [ From fb53df035d12066db8035fadbbc05e8fc76d1a14 Mon Sep 17 00:00:00 2001 From: luftmensch-luftmensch Date: Mon, 9 Jun 2025 21:45:36 +0200 Subject: [PATCH 2/4] lite-xl: remove `with lib;` antipattern --- pkgs/by-name/li/lite-xl/package.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/li/lite-xl/package.nix b/pkgs/by-name/li/lite-xl/package.nix index 802f5105627d..a56c65d28dee 100644 --- a/pkgs/by-name/li/lite-xl/package.nix +++ b/pkgs/by-name/li/lite-xl/package.nix @@ -12,10 +12,12 @@ sdl3, stdenv, }: - -stdenv.mkDerivation rec { +let pname = "lite-xl"; version = "2.1.8"; +in +stdenv.mkDerivation { + inherit pname version; src = fetchFromGitHub { owner = "lite-xl"; @@ -43,12 +45,12 @@ stdenv.mkDerivation rec { "-Duse_system_lua=true" ]; - meta = with lib; { + meta = { description = "Lightweight text editor written in Lua"; homepage = "https://github.com/lite-xl/lite-xl"; - license = licenses.mit; - maintainers = with maintainers; [ sefidel ]; - platforms = platforms.unix; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ sefidel ]; + platforms = lib.platforms.unix; mainProgram = "lite-xl"; }; } From 8b36963ea7a44746127b200ebcf3b25b4cee864b Mon Sep 17 00:00:00 2001 From: luftmensch-luftmensch Date: Mon, 9 Jun 2025 21:46:34 +0200 Subject: [PATCH 3/4] lite-xl: add luftmensch-luftmensc as maintainer --- pkgs/by-name/li/lite-xl/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/li/lite-xl/package.nix b/pkgs/by-name/li/lite-xl/package.nix index a56c65d28dee..ae762f4edb66 100644 --- a/pkgs/by-name/li/lite-xl/package.nix +++ b/pkgs/by-name/li/lite-xl/package.nix @@ -49,7 +49,10 @@ stdenv.mkDerivation { description = "Lightweight text editor written in Lua"; homepage = "https://github.com/lite-xl/lite-xl"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ sefidel ]; + maintainers = with lib.maintainers; [ + luftmensch-luftmensch + sefidel + ]; platforms = lib.platforms.unix; mainProgram = "lite-xl"; }; From dde0017c4d8ddea19ff7b61b5cfa5f985311f370 Mon Sep 17 00:00:00 2001 From: luftmensch-luftmensch Date: Tue, 10 Jun 2025 18:10:01 +0200 Subject: [PATCH 4/4] lite-xl: dropped SDL2 --- pkgs/by-name/li/lite-xl/package.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/by-name/li/lite-xl/package.nix b/pkgs/by-name/li/lite-xl/package.nix index ae762f4edb66..c690b84dff08 100644 --- a/pkgs/by-name/li/lite-xl/package.nix +++ b/pkgs/by-name/li/lite-xl/package.nix @@ -8,7 +8,6 @@ cmake, pcre2, pkg-config, - SDL2, sdl3, stdenv, }: @@ -37,7 +36,6 @@ stdenv.mkDerivation { freetype lua5_4 pcre2 - SDL2 sdl3 ];