Merge pull request #231311 from aither64/bepasty-1.1.0

bepasty: 0.5.0 -> 1.1.0
This commit is contained in:
Weijia Wang 2023-06-14 16:12:37 +03:00 committed by GitHub
commit 91ad44fd95
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 65 additions and 20 deletions

View file

@ -522,6 +522,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";

View file

@ -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 ];
};
}

View file

@ -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 ];
};
}

View file

@ -2,35 +2,22 @@
, python3
, fetchPypi
}:
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
@ -41,7 +28,7 @@ in with python.pkgs; buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
sha256 = "1y3smw9620w2ia4zfsl2svb9j7mkfgc8z1bzjffyk1w5vryhwikh";
sha256 = "sha256-f5tRq48tCqjzOGq7Z2T2U1zwQN121N9ap+xPxHWZyvU=";
};
nativeCheckInputs = [
@ -55,7 +42,7 @@ in with python.pkgs; buildPythonPackage rec {
meta = {
homepage = "https://github.com/bepasty/bepasty-server";
description = "Binary pastebin server";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.makefu ];
license = lib.licenses.bsd2;
maintainers = with lib.maintainers; [ aither64 makefu ];
};
}

View file

@ -13263,12 +13263,16 @@ 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 { };
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 { };