diff --git a/_sources/generated.nix b/_sources/generated.nix index ffd6f8c..65c129c 100644 --- a/_sources/generated.nix +++ b/_sources/generated.nix @@ -36,14 +36,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"; @@ -111,14 +103,6 @@ sha256 = "sha256-4UEkx3SSluvIXNXOGjW8kHw0W93xXCuVQsLgSZCZ3zw="; }; }; - 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"; @@ -145,10 +129,10 @@ }; translate-shell = { pname = "translate-shell"; - version = "0.0.37"; + version = "0.0.38"; src = fetchurl { - url = "https://pypi.org/packages/source/t/translate-shell/translate-shell-0.0.37.tar.gz"; - sha256 = "sha256-4EpqVFTqAWh/kXFlgLF/zcDFf2upAvsIeNDOmMyWWPw="; + url = "https://pypi.org/packages/source/t/translate-shell/translate-shell-0.0.38.tar.gz"; + sha256 = "sha256-9Byn3XXyFRAzOfS/VHax7N457Fta4sQBSOTFeKgG/w0="; }; }; undollar = { diff --git a/default.nix b/default.nix index 3586d2d..2eba540 100644 --- 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 index b48a871..b61fd07 100644 --- 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 index 2afec2b..ab6f679 100644 --- 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 index 8b1c71d..8071667 100644 --- 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/help2man/default.nix b/pkgs/development/python-modules/help2man/default.nix deleted file mode 100644 index 1069d20..0000000 --- a/pkgs/development/python-modules/help2man/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ mySources -, python3 -}: - -with python3.pkgs; - -buildPythonPackage rec { - inherit (mySources.help2man) pname version src; - disabled = pythonOlder "3.6"; - propagatedBuildInputs = [ - jinja2 - ]; - nativeBuildInputs = [ - setuptools - shtab - ]; - pythonImportsCheck = [ - "help2man" - ]; - - meta = with lib; { - homepage = "https://help2man.readthedocs.io"; - description = "Convert --help and --version to man page"; - license = licenses.gpl3; - maintainers = with maintainers; [ Freed-Wu ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/python-modules/mulimgviewer/default.nix b/pkgs/development/python-modules/mulimgviewer/default.nix index b3721da..c6a6fa1 100644 --- 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 index 560dc84..0030d50 100644 --- 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/pkgs/development/python-modules/pkgbuild-language-server/default.nix b/pkgs/development/python-modules/pkgbuild-language-server/default.nix index d64dd08..01a9260 100644 --- a/pkgs/development/python-modules/pkgbuild-language-server/default.nix +++ b/pkgs/development/python-modules/pkgbuild-language-server/default.nix @@ -1,7 +1,6 @@ { mySources , python3 , lib -, setuptools-generate }: with python3.pkgs; diff --git a/pkgs/development/python-modules/portage-language-server/default.nix b/pkgs/development/python-modules/portage-language-server/default.nix index f07fbef..8691ea6 100644 --- a/pkgs/development/python-modules/portage-language-server/default.nix +++ b/pkgs/development/python-modules/portage-language-server/default.nix @@ -1,7 +1,6 @@ { mySources , python3 , lib -, setuptools-generate }: with python3.pkgs; diff --git a/pkgs/development/python-modules/repl-python-codestats/default.nix b/pkgs/development/python-modules/repl-python-codestats/default.nix index bb33152..bbc5fd6 100644 --- 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 index 073ad9f..05f673c 100644 --- 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 index ae6f6de..f6ed3ce 100644 --- 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/setuptools-generate/default.nix b/pkgs/development/python-modules/setuptools-generate/default.nix deleted file mode 100644 index c906d58..0000000 --- a/pkgs/development/python-modules/setuptools-generate/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ mySources -, python3 -, help2man -}: - -with python3.pkgs; - -buildPythonPackage rec { - inherit (mySources.setuptools-generate) pname version src; - format = "pyproject"; - disabled = pythonOlder "3.6"; - propagatedBuildInputs = [ - setuptools - click - help2man - markdown-it-py - shtab - tomli - ]; - nativeBuildInputs = [ - setuptools-scm - ]; - pythonImportsCheck = [ - "setuptools_generate" - ]; - - meta = with lib; { - homepage = "https://setuptools-generate.readthedocs.io"; - description = "Generate shell completions and man page when building a python package"; - license = licenses.gpl3; - maintainers = with maintainers; [ Freed-Wu ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/python-modules/sublime-syntax-language-server/default.nix b/pkgs/development/python-modules/sublime-syntax-language-server/default.nix index 924014b..f0eb6ff 100644 --- 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 index 8ed607c..ffeed22 100644 --- 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 index a3513e5..e3e0910 100644 --- 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 index 959ab5b..81e845c 100644 --- 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 index 0dff783..10d55e5 100644 --- 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 index 24f6c9b..df33e37 100644 --- 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;