🔥 Remove setuptools-generate and help2man

NixOS/nixpkgs#259515
Freed-Wu · Nov 10, 2023 · c983b99 · c983b99
1 parent 0833273
commit c983b99
Show file tree

Hide file tree

Showing 18 changed files with 20 additions and 58 deletions.
diff --git a/_sources/generated.nix b/_sources/generated.nix
@@ -20,14 +20,6 @@
       sha256 = "sha256-90ELWRVHkdLLQoUIQuE1yc2F1Rj9UOMcxmKTmK1S8yY=";
     };
   };
-  help2man = {
-    pname = "help2man";
-    version = "0.0.9";
-    src = fetchurl {
-      url = "https://pypi.org/packages/source/h/help2man/help2man-0.0.9.tar.gz";
-      sha256 = "sha256-V/oY7VnulJUqI0EVPq40/JACDLTrsmzopzJDNBGc+Bo=";
-    };
-  };
   manpager = {
     pname = "manpager";
     version = "0.0.2";
@@ -79,14 +71,6 @@
       sha256 = "sha256-3gE1w5rwn5qXDDrNlZnX07FnukwKbu2E89Y+uKVTnqg=";
     };
   };
-  setuptools-generate = {
-    pname = "setuptools-generate";
-    version = "0.0.6";
-    src = fetchurl {
-      url = "https://pypi.org/packages/source/s/setuptools-generate/setuptools-generate-0.0.6.tar.gz";
-      sha256 = "sha256-biMkHZ7P39355QpJXzCStgvjym9KXhFsjD5/K2RrpyU=";
-    };
-  };
   sublime-syntax-language-server = {
     pname = "sublime-syntax-language-server";
     version = "0.0.4";

diff --git a/default.nix b/default.nix
@@ -20,7 +20,7 @@ let
 
     mySources = callPackage ./_sources/generated.nix { };
 
-    # https://github.com/NixOS-CN/flakes/pull/51
+    # https://github.com/NixOS/nixpkgs/pull/243429
     netease-cloud-music = callPackage ./pkgs/applications/audio/netease-cloud-music { };
     # https://github.com/NixOS/nixpkgs/pull/243032
     g3kb-switch = callPackage ./pkgs/tools/misc/g3kb-switch { };
@@ -30,8 +30,7 @@ let
     bash-prompt = callPackage ./pkgs/shells/bash/bash-prompt { };
     undollar = callPackage ./pkgs/tools/misc/undollar { };
     manpager = callPackage ./pkgs/tools/misc/manpager { };
-    help2man = callPackage ./pkgs/development/python-modules/help2man { };
-    setuptools-generate = callPackage ./pkgs/development/python-modules/setuptools-generate { };
+    # https://github.com/NixOS/nixpkgs/issues/261342
     repl-python-wakatime = callPackage ./pkgs/development/python-modules/repl-python-wakatime { };
     repl-python-codestats = callPackage ./pkgs/development/python-modules/repl-python-codestats { };
     translate-shell = callPackage ./pkgs/development/python-modules/translate-shell { };

diff --git a/nvfetcher.toml b/nvfetcher.toml
@@ -6,14 +6,6 @@ fetch.github = "Freed-Wu/undollar"
 src.github = "Freed-Wu/manpager"
 fetch.github = "Freed-Wu/manpager"
 
-[help2man]
-src.pypi = "help2man"
-fetch.pypi = "help2man"
-
-[setuptools-generate]
-src.pypi = "setuptools-generate"
-fetch.pypi = "setuptools-generate"
-
 [repl-python-wakatime]
 src.pypi = "repl-python-wakatime"
 fetch.pypi = "repl-python-wakatime"

diff --git a/pkgs/development/python-modules/bitbake-language-server/default.nix b/pkgs/development/python-modules/bitbake-language-server/default.nix
@@ -1,7 +1,6 @@
 { mySources
 , python3
 , lib
-, setuptools-generate
 }:
 
 with python3.pkgs;

diff --git a/pkgs/development/python-modules/expect-language-server/default.nix b/pkgs/development/python-modules/expect-language-server/default.nix
@@ -1,7 +1,6 @@
 { mySources
 , python3
 , lib
-, setuptools-generate
 }:
 
 with python3.pkgs;

diff --git a/pkgs/development/python-modules/mulimgviewer/default.nix b/pkgs/development/python-modules/mulimgviewer/default.nix
@@ -1,7 +1,6 @@
 { mySources
 , python3
 , wrapGAppsHook
-, setuptools-generate
 }:
 
 with python3.pkgs;

diff --git a/pkgs/development/python-modules/mutt-language-server/default.nix b/pkgs/development/python-modules/mutt-language-server/default.nix
@@ -1,7 +1,6 @@
 { mySources
 , python3
 , lib
-, setuptools-generate
 }:
 
 with python3.pkgs;

diff --git a/...n-modules/setuptools-generate/default.nix → ...ules/pkgbuild-language-server/default.nix b/...n-modules/setuptools-generate/default.nix → ...ules/pkgbuild-language-server/default.nix
@@ -1,32 +1,29 @@
 { mySources
 , python3
-, help2man
+, lib
 }:
 
 with python3.pkgs;
 
 buildPythonPackage rec {
-  inherit (mySources.setuptools-generate) pname version src;
+  inherit (mySources.pkgbuild-language-server) pname version src;
   format = "pyproject";
   disabled = pythonOlder "3.6";
   propagatedBuildInputs = [
-    setuptools
-    click
-    help2man
-    markdown-it-py
-    shtab
-    tomli
+    pygls
+    platformdirs
   ];
   nativeBuildInputs = [
+    setuptools-generate
     setuptools-scm
   ];
   pythonImportsCheck = [
-    "setuptools_generate"
+    "pkgbuild_language_server"
   ];
 
   meta = with lib; {
-    homepage = "https://setuptools-generate.readthedocs.io";
-    description = "Generate shell completions and man page when building a python package";
+    homepage = "https://pkgbuild-language-server.readthedocs.io";
+    description = "PKGBUILD language server";
     license = licenses.gpl3;
     maintainers = with maintainers; [ Freed-Wu ];
     platforms = platforms.unix;

diff --git a/...pment/python-modules/help2man/default.nix → ...dules/portage-language-server/default.nix b/...pment/python-modules/help2man/default.nix → ...dules/portage-language-server/default.nix
@@ -1,26 +1,29 @@
 { mySources
 , python3
+, lib
 }:
 
 with python3.pkgs;
 
 buildPythonPackage rec {
-  inherit (mySources.help2man) pname version src;
+  inherit (mySources.portage-language-server) pname version src;
+  format = "pyproject";
   disabled = pythonOlder "3.6";
   propagatedBuildInputs = [
-    jinja2
+    pygls
+    platformdirs
   ];
   nativeBuildInputs = [
-    setuptools
-    shtab
+    setuptools-generate
+    setuptools-scm
   ];
   pythonImportsCheck = [
-    "help2man"
+    "portage_language_server"
   ];
 
   meta = with lib; {
-    homepage = "https://help2man.readthedocs.io";
-    description = "Convert --help and --version to man page";
+    homepage = "https://portage-language-server.readthedocs.io";
+    description = "portage language server";
     license = licenses.gpl3;
     maintainers = with maintainers; [ Freed-Wu ];
     platforms = platforms.unix;

diff --git a/pkgs/development/python-modules/repl-python-codestats/default.nix b/pkgs/development/python-modules/repl-python-codestats/default.nix
@@ -1,7 +1,6 @@
 { mySources
 , python3
 , repl-python-wakatime
-, setuptools-generate
 }:
 
 with python3.pkgs;

diff --git a/pkgs/development/python-modules/repl-python-wakatime/default.nix b/pkgs/development/python-modules/repl-python-wakatime/default.nix
@@ -1,6 +1,5 @@
 { mySources
 , python3
-, setuptools-generate
 }:
 
 with python3.pkgs;

diff --git a/pkgs/development/python-modules/requirements-language-server/default.nix b/pkgs/development/python-modules/requirements-language-server/default.nix
@@ -1,7 +1,6 @@
 { mySources
 , python3
 , lib
-, setuptools-generate
 }:
 
 with python3.pkgs;

diff --git a/pkgs/development/python-modules/sublime-syntax-language-server/default.nix b/pkgs/development/python-modules/sublime-syntax-language-server/default.nix
@@ -1,7 +1,6 @@
 { mySources
 , python3
 , lib
-, setuptools-generate
 }:
 
 with python3.pkgs;

diff --git a/pkgs/development/python-modules/termux-language-server/default.nix b/pkgs/development/python-modules/termux-language-server/default.nix
@@ -1,7 +1,6 @@
 { mySources
 , python3
 , lib
-, setuptools-generate
 }:
 
 with python3.pkgs;

diff --git a/pkgs/development/python-modules/tmux-language-server/default.nix b/pkgs/development/python-modules/tmux-language-server/default.nix
@@ -1,7 +1,6 @@
 { mySources
 , python3
 , lib
-, setuptools-generate
 }:
 
 with python3.pkgs;

diff --git a/pkgs/development/python-modules/translate-shell/default.nix b/pkgs/development/python-modules/translate-shell/default.nix
@@ -1,7 +1,6 @@
 { mySources
 , python3
 , lib
-, setuptools-generate
 , repl-python-wakatime
 }:
 

diff --git a/pkgs/development/python-modules/xilinx-language-server/default.nix b/pkgs/development/python-modules/xilinx-language-server/default.nix
@@ -1,7 +1,6 @@
 { mySources
 , python3
 , lib
-, setuptools-generate
 }:
 
 with python3.pkgs;

diff --git a/pkgs/development/python-modules/zathura-language-server/default.nix b/pkgs/development/python-modules/zathura-language-server/default.nix
@@ -1,7 +1,6 @@
 { mySources
 , python3
 , lib
-, setuptools-generate
 }:
 
 with python3.pkgs;