From 5f3faeb529d9076364caf1073ddce8937e85b124 Mon Sep 17 00:00:00 2001 From: "Matthieu C." <886074+teto@users.noreply.github.com> Date: Sat, 24 Aug 2024 17:21:33 +0200 Subject: [PATCH] luarocks-packages-updater: move to by-name --- .../lu/luarocks-packages-updater/package.nix} | 9 ++++----- .../lu/luarocks-packages-updater}/updater.py | 0 pkgs/top-level/all-packages.nix | 5 ++--- 3 files changed, 6 insertions(+), 8 deletions(-) rename pkgs/{development/lua-modules/updater/default.nix => by-name/lu/luarocks-packages-updater/package.nix} (86%) rename pkgs/{development/lua-modules/updater => by-name/lu/luarocks-packages-updater}/updater.py (100%) diff --git a/pkgs/development/lua-modules/updater/default.nix b/pkgs/by-name/lu/luarocks-packages-updater/package.nix similarity index 86% rename from pkgs/development/lua-modules/updater/default.nix rename to pkgs/by-name/lu/luarocks-packages-updater/package.nix index e556d4d0dec9..617bfa1057fb 100644 --- a/pkgs/development/lua-modules/updater/default.nix +++ b/pkgs/by-name/lu/luarocks-packages-updater/package.nix @@ -1,15 +1,14 @@ -{ buildPythonApplication -, nix +{ nix , makeWrapper , python3Packages , lib -# , nix-prefetch-git , nix-prefetch-scripts , luarocks-nix , lua5_1 , lua5_2 , lua5_3 , lua5_4 +, pluginupdate }: let @@ -25,7 +24,7 @@ let ]; in -buildPythonApplication { +python3Packages.buildPythonApplication { pname = "luarocks-packages-updater"; version = "0.1"; @@ -45,7 +44,7 @@ buildPythonApplication { '' mkdir -p $out/bin $out/lib cp ${./updater.py} $out/bin/luarocks-packages-updater - cp ${../../../../maintainers/scripts/pluginupdate.py} $out/lib/pluginupdate.py + cp ${pluginupdate} $out/lib/pluginupdate.py # wrap python scripts makeWrapperArgs+=( --prefix PATH : "${path}" --prefix PYTHONPATH : "$out/lib" \ diff --git a/pkgs/development/lua-modules/updater/updater.py b/pkgs/by-name/lu/luarocks-packages-updater/updater.py similarity index 100% rename from pkgs/development/lua-modules/updater/updater.py rename to pkgs/by-name/lu/luarocks-packages-updater/updater.py diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 03f16b6834a0..4880e3fc14cf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16692,11 +16692,10 @@ with pkgs; luarocks = luaPackages.luarocks; luarocks-nix = luaPackages.luarocks-nix; - luarocks-packages-updater = callPackage ../development/lua-modules/updater { - inherit (python3Packages) buildPythonApplication ; + luarocks-packages-updater = callPackage ../by-name/lu/luarocks-packages-updater/package.nix { + pluginupdate = ../../maintainers/scripts/pluginupdate.py; }; - luau = callPackage ../development/interpreters/luau { }; lune = callPackage ../development/interpreters/lune { };