From 85d28c6239618a941178de00330432285635deed Mon Sep 17 00:00:00 2001 From: Jakub Skokan Date: Thu, 11 May 2023 10:31:56 +0200 Subject: [PATCH 1/5] maintainers: add aither64 --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index f630ba6e4456..2f7cf79c7887 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -503,6 +503,12 @@ githubId = 44871469; name = "Etienne Wodey"; }; + aither64 = { + email = "aither@havefun.cz"; + github = "aither64"; + githubId = 4717906; + name = "Jakub Skokan"; + }; ajgrf = { email = "a@ajgrf.com"; github = "ajgrf"; From 79eab03a25b022c0a2c5c0a79577a248831e8dd2 Mon Sep 17 00:00:00 2001 From: Jakub Skokan Date: Thu, 11 May 2023 10:38:30 +0200 Subject: [PATCH 2/5] pythonPackages.xstatic-font-awesome: init at 6.2.1.1 --- .../xstatic-font-awesome/default.nix | 24 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/python-modules/xstatic-font-awesome/default.nix diff --git a/pkgs/development/python-modules/xstatic-font-awesome/default.nix b/pkgs/development/python-modules/xstatic-font-awesome/default.nix new file mode 100644 index 000000000000..71028393dc8c --- /dev/null +++ b/pkgs/development/python-modules/xstatic-font-awesome/default.nix @@ -0,0 +1,24 @@ +{ buildPythonPackage +, lib +, fetchPypi +}: + +buildPythonPackage rec { + pname = "XStatic-Font-Awesome"; + version = "6.2.1.1"; + + src = fetchPypi { + inherit version pname; + sha256 = "sha256-8HWHEJYShjjy4VOQINgid1TD2IXdaOfubemgEjUHaCg="; + }; + + # no tests implemented + doCheck = false; + + meta = with lib; { + homepage = "https://github.com/python-xstatic/font-awesome"; + description = "Font Awesome packaged for python"; + license = licenses.ofl; + maintainers = with maintainers; [ aither64 ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a5466c5504ee..a7c3e1e4b166 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13046,6 +13046,8 @@ self: super: with self; { xstatic = callPackage ../development/python-modules/xstatic { }; + xstatic-font-awesome = callPackage ../development/python-modules/xstatic-font-awesome { }; + xstatic-jquery = callPackage ../development/python-modules/xstatic-jquery { }; xstatic-jquery-file-upload = callPackage ../development/python-modules/xstatic-jquery-file-upload { }; From 13d5bbfd03eb67fa0176d9a17e118d44d07472dc Mon Sep 17 00:00:00 2001 From: Jakub Skokan Date: Thu, 11 May 2023 10:41:34 +0200 Subject: [PATCH 3/5] pythonPackages.xstatic-asciinema-player: init at 2.6.1.1 --- .../xstatic-asciinema-player/default.nix | 24 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/python-modules/xstatic-asciinema-player/default.nix diff --git a/pkgs/development/python-modules/xstatic-asciinema-player/default.nix b/pkgs/development/python-modules/xstatic-asciinema-player/default.nix new file mode 100644 index 000000000000..d970f0888aa8 --- /dev/null +++ b/pkgs/development/python-modules/xstatic-asciinema-player/default.nix @@ -0,0 +1,24 @@ +{ buildPythonPackage +, lib +, fetchPypi +}: + +buildPythonPackage rec { + pname = "XStatic-asciinema-player"; + version = "2.6.1.1"; + + src = fetchPypi { + inherit version pname; + sha256 = "sha256-yA6WC067St82Dm6StaCKdWrRBhmNemswetIO8iodfcw="; + }; + + # no tests implemented + doCheck = false; + + meta = with lib; { + homepage = "https://github.com/python-xstatic/asciinema-player"; + description = "Asciinema-player packaged for python"; + license = licenses.asl20; + maintainers = with maintainers; [ aither64 ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a7c3e1e4b166..9c8712462747 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13040,6 +13040,8 @@ self: super: with self; { xsdata = callPackage ../development/python-modules/xsdata { }; + xstatic-asciinema-player = callPackage ../development/python-modules/xstatic-asciinema-player { }; + xstatic-bootbox = callPackage ../development/python-modules/xstatic-bootbox { }; xstatic-bootstrap = callPackage ../development/python-modules/xstatic-bootstrap { }; From becd4e0f3b4258b60593f6a6c2d72e8ba1887c19 Mon Sep 17 00:00:00 2001 From: Jakub Skokan Date: Thu, 11 May 2023 10:42:47 +0200 Subject: [PATCH 4/5] bepasty: 0.5.0 -> 1.1.0 Closes #116326 Closes #116429 --- pkgs/tools/misc/bepasty/default.nix | 25 ++++++------------------- 1 file changed, 6 insertions(+), 19 deletions(-) diff --git a/pkgs/tools/misc/bepasty/default.nix b/pkgs/tools/misc/bepasty/default.nix index cd2cac7684e8..ce080c155290 100644 --- a/pkgs/tools/misc/bepasty/default.nix +++ b/pkgs/tools/misc/bepasty/default.nix @@ -1,35 +1,22 @@ { python3 , lib }: - -let - python = python3.override { - self = python; - packageOverrides = self: super : { - xstatic-bootstrap = super.xstatic-bootstrap.overridePythonAttrs(oldAttrs: rec { - version = "3.3.7.1"; - src = oldAttrs.src.override { - inherit version; - sha256 = "0cgihyjb9rg6r2ddpzbjm31y0901vyc8m9h3v0zrhxydx1w9x50c"; - }; - }); - }; - }; - #We need to use buildPythonPackage here to get the PYTHONPATH build correctly. #This is needed for services.bepasty #https://github.com/NixOS/nixpkgs/pull/38300 -in with python.pkgs; buildPythonPackage rec { +with python3.pkgs; buildPythonPackage rec { pname = "bepasty"; - version = "0.5.0"; + version = "1.1.0"; propagatedBuildInputs = [ flask pygments setuptools xstatic + xstatic-asciinema-player xstatic-bootbox xstatic-bootstrap + xstatic-font-awesome xstatic-jquery xstatic-jquery-file-upload xstatic-jquery-ui @@ -40,7 +27,7 @@ in with python.pkgs; buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "1y3smw9620w2ia4zfsl2svb9j7mkfgc8z1bzjffyk1w5vryhwikh"; + sha256 = "sha256-f5tRq48tCqjzOGq7Z2T2U1zwQN121N9ap+xPxHWZyvU="; }; nativeCheckInputs = [ @@ -55,6 +42,6 @@ in with python.pkgs; buildPythonPackage rec { homepage = "https://github.com/bepasty/bepasty-server"; description = "Binary pastebin server"; license = lib.licenses.mit; - maintainers = [ lib.maintainers.makefu ]; + maintainers = with lib.maintainers; [ aither64 makefu ]; }; } From b031ba3d529e246fdbfa0d7b50e6621b7a96f8c4 Mon Sep 17 00:00:00 2001 From: Jakub Skokan Date: Fri, 12 May 2023 20:22:29 +0200 Subject: [PATCH 5/5] bepasty: fix license to bsd2 --- pkgs/tools/misc/bepasty/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/bepasty/default.nix b/pkgs/tools/misc/bepasty/default.nix index ce080c155290..57467f72e22f 100644 --- a/pkgs/tools/misc/bepasty/default.nix +++ b/pkgs/tools/misc/bepasty/default.nix @@ -41,7 +41,7 @@ with python3.pkgs; buildPythonPackage rec { meta = { homepage = "https://github.com/bepasty/bepasty-server"; description = "Binary pastebin server"; - license = lib.licenses.mit; + license = lib.licenses.bsd2; maintainers = with lib.maintainers; [ aither64 makefu ]; }; }