From 25ede4e8fdbf6552ebb73a4a087e9e819ce87f17 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sun, 13 Oct 2024 11:52:16 -0300 Subject: [PATCH 1/3] luakit: clear input parameters --- pkgs/applications/networking/browsers/luakit/default.nix | 5 ++++- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/browsers/luakit/default.nix b/pkgs/applications/networking/browsers/luakit/default.nix index 95b6958cd51c..dbdf7bd97988 100644 --- a/pkgs/applications/networking/browsers/luakit/default.nix +++ b/pkgs/applications/networking/browsers/luakit/default.nix @@ -7,12 +7,15 @@ , glib-networking , gst_all_1 , gtk3 -, luafilesystem +, luajitPackages , luajit , sqlite , webkitgtk_4_0 }: +let + inherit (luajitPackages) luafilesystem; +in stdenv.mkDerivation rec { pname = "luakit"; version = "2.3.3"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b15df4f0cfde..525acadddf3c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30778,9 +30778,7 @@ with pkgs; lime = callPackage ../development/libraries/lime { }; - luakit = callPackage ../applications/networking/browsers/luakit { - inherit (luajitPackages) luafilesystem; - }; + luakit = callPackage ../applications/networking/browsers/luakit { }; looking-glass-client = callPackage ../applications/virtualization/looking-glass-client { }; From d41f0ad3d8002f1024b13305679753c9be7bbf80 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sun, 13 Oct 2024 11:58:23 -0300 Subject: [PATCH 2/3] luakit: migrate to by-name --- .../luakit/default.nix => by-name/lu/luakit/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{applications/networking/browsers/luakit/default.nix => by-name/lu/luakit/package.nix} (100%) diff --git a/pkgs/applications/networking/browsers/luakit/default.nix b/pkgs/by-name/lu/luakit/package.nix similarity index 100% rename from pkgs/applications/networking/browsers/luakit/default.nix rename to pkgs/by-name/lu/luakit/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 525acadddf3c..55f73d0d6e9a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30778,8 +30778,6 @@ with pkgs; lime = callPackage ../development/libraries/lime { }; - luakit = callPackage ../applications/networking/browsers/luakit { }; - looking-glass-client = callPackage ../applications/virtualization/looking-glass-client { }; ltc-tools = callPackage ../applications/audio/ltc-tools { }; From 3539d051c12187589158f2b0af68b5c57101887e Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sun, 13 Oct 2024 12:11:10 -0300 Subject: [PATCH 3/3] luakit: hammer - nixfmt-rfc-style - finalAttrs - strictDeps - no nested with --- pkgs/by-name/lu/luakit/package.nix | 99 ++++++++++++++++-------------- 1 file changed, 53 insertions(+), 46 deletions(-) diff --git a/pkgs/by-name/lu/luakit/package.nix b/pkgs/by-name/lu/luakit/package.nix index dbdf7bd97988..d9f46d3b79b9 100644 --- a/pkgs/by-name/lu/luakit/package.nix +++ b/pkgs/by-name/lu/luakit/package.nix @@ -1,53 +1,58 @@ -{ lib -, stdenv -, fetchFromGitHub -, pkg-config -, wrapGAppsHook3 -, help2man -, glib-networking -, gst_all_1 -, gtk3 -, luajitPackages -, luajit -, sqlite -, webkitgtk_4_0 +{ + lib, + fetchFromGitHub, + glib-networking, + gst_all_1, + gtk3, + help2man, + luajit, + luajitPackages, + pkg-config, + sqlite, + stdenv, + webkitgtk_4_0, + wrapGAppsHook3, }: let inherit (luajitPackages) luafilesystem; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "luakit"; version = "2.3.3"; src = fetchFromGitHub { owner = "luakit"; - repo = pname; - rev = version; + repo = "luakit"; + rev = finalAttrs.version; hash = "sha256-DtoixcLq+ddbacTAo+Qq6q4k1i6thirACw1zqUeOxXo="; }; nativeBuildInputs = [ + luajit pkg-config help2man wrapGAppsHook3 ]; - buildInputs = [ - gtk3 - glib-networking # TLS support - luafilesystem - luajit - sqlite - webkitgtk_4_0 - ] ++ ( with gst_all_1; [ - gstreamer - gst-plugins-base - gst-plugins-good - gst-plugins-bad - gst-plugins-ugly - gst-libav - ]); + buildInputs = + [ + glib-networking # TLS support + gtk3 + luafilesystem + sqlite + webkitgtk_4_0 + ] + ++ (with gst_all_1; [ + gst-libav + gst-plugins-bad + gst-plugins-base + gst-plugins-good + gst-plugins-ugly + gstreamer + ]); + + strictDeps = true; # build-utils/docgen/gen.lua:2: module 'lib.lousy.util' not found # TODO: why is not this the default? The test runner adds @@ -66,20 +71,21 @@ stdenv.mkDerivation rec { "XDGPREFIX=${placeholder "out"}/etc/xdg" ]; - preFixup = let - luaKitPath = "$out/share/luakit/lib/?/init.lua;$out/share/luakit/lib/?.lua"; - in '' - gappsWrapperArgs+=( - --prefix XDG_CONFIG_DIRS : "$out/etc/xdg" - --prefix LUA_PATH ';' "${luaKitPath};$LUA_PATH" - --prefix LUA_CPATH ';' "$LUA_CPATH" - ) - ''; + preFixup = + let + luaKitPath = "$out/share/luakit/lib/?/init.lua;$out/share/luakit/lib/?.lua"; + in + '' + gappsWrapperArgs+=( + --prefix XDG_CONFIG_DIRS : "$out/etc/xdg" + --prefix LUA_PATH ';' "${luaKitPath};$LUA_PATH" + --prefix LUA_CPATH ';' "$LUA_CPATH" + ) + ''; - meta = with lib; { + meta = { homepage = "https://luakit.github.io/"; description = "Fast, small, webkit-based browser framework extensible in Lua"; - mainProgram = "luakit"; longDescription = '' Luakit is a highly configurable browser framework based on the WebKit web content engine and the GTK+ toolkit. It is very fast, extensible with Lua, @@ -87,8 +93,9 @@ stdenv.mkDerivation rec { power users, developers and anyone who wants to have fine-grained control over their web browser’s behaviour and interface. ''; - license = licenses.gpl3Only; - maintainers = [ maintainers.AndersonTorres ]; - platforms = platforms.unix; + license = lib.licenses.gpl3Only; + mainProgram = "luakit"; + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = lib.platforms.unix; }; -} +})