diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2017-08-25 17:51:18 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2017-08-25 19:36:18 +0200 |
commit | 997043c1372b16f39000238874aff263bdeab153 (patch) | |
tree | b6c47ed373f5600544e3c596257656e13e12ae9b | |
parent | e0a23575d226e2ffb29ea76a7dd0867ecda541a7 (diff) | |
download | nixpkgs-997043c1372b16f39000238874aff263bdeab153.tar nixpkgs-997043c1372b16f39000238874aff263bdeab153.tar.gz nixpkgs-997043c1372b16f39000238874aff263bdeab153.tar.bz2 nixpkgs-997043c1372b16f39000238874aff263bdeab153.tar.lz nixpkgs-997043c1372b16f39000238874aff263bdeab153.tar.xz nixpkgs-997043c1372b16f39000238874aff263bdeab153.tar.zst nixpkgs-997043c1372b16f39000238874aff263bdeab153.zip |
bepasty: move out of python-packages
because its a (web) application and thus doesn't belong there.
-rw-r--r-- | nixos/modules/services/misc/bepasty.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/misc/bepasty/default.nix | 34 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 | ||||
-rw-r--r-- | pkgs/top-level/python-packages.nix | 27 |
4 files changed, 37 insertions, 28 deletions
diff --git a/nixos/modules/services/misc/bepasty.nix b/nixos/modules/services/misc/bepasty.nix index 4d78cddcb54..c499e428af3 100644 --- a/nixos/modules/services/misc/bepasty.nix +++ b/nixos/modules/services/misc/bepasty.nix @@ -3,7 +3,7 @@ with lib; let gunicorn = pkgs.pythonPackages.gunicorn; - bepasty = pkgs.pythonPackages.bepasty-server; + bepasty = pkgs.bepasty; gevent = pkgs.pythonPackages.gevent; python = pkgs.pythonPackages.python; cfg = config.services.bepasty; diff --git a/pkgs/tools/misc/bepasty/default.nix b/pkgs/tools/misc/bepasty/default.nix new file mode 100644 index 00000000000..cd3a149b378 --- /dev/null +++ b/pkgs/tools/misc/bepasty/default.nix @@ -0,0 +1,34 @@ +{ python +, lib +}: + +with python.pkgs; + +buildPythonPackage rec { + pname = "bepasty"; + version = "0.4.0"; + name = "${pname}-${version}"; + + propagatedBuildInputs = [ + flask + pygments + xstatic + xstatic-bootbox + xstatic-bootstrap + xstatic-jquery + xstatic-jquery-file-upload + xstatic-jquery-ui + xstatic-pygments + ]; + src = fetchPypi { + inherit pname version; + sha256 = "0bs79pgrjlnkmjfyj2hllbx3rw757va5w2g2aghi9cydmsl7gyi4"; + }; + + meta = { + homepage = http://github.com/bepasty/bepasty-server; + description = "Binary pastebin server"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.makefu ]; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 663258dec39..2629b6112e2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1228,6 +1228,8 @@ with pkgs; pythonPackages = python2Packages; }; + bepasty = callPackage ../tools/misc/bepasty { }; + bfg-repo-cleaner = gitAndTools.bfg-repo-cleaner; bgs = callPackage ../tools/X11/bgs { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4ed3b072749..765b36f63fa 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -27380,33 +27380,6 @@ EOF }; }; - bepasty-server = buildPythonPackage rec { - name = "bepasty-server-${version}"; - version = "0.4.0"; - propagatedBuildInputs = with self;[ - flask - pygments - xstatic - xstatic-bootbox - xstatic-bootstrap - xstatic-jquery - xstatic-jquery-file-upload - xstatic-jquery-ui - xstatic-pygments - ]; - src = pkgs.fetchurl { - url = "mirror://pypi/b/bepasty/bepasty-${version}.tar.gz"; - sha256 = "0bs79pgrjlnkmjfyj2hllbx3rw757va5w2g2aghi9cydmsl7gyi4"; - }; - - meta = { - homepage = http://github.com/bepasty/bepasty-server; - description = "Binary pastebin server"; - license = licenses.mit; - maintainers = [ maintainers.makefu ]; - }; - }; - xgboost = buildPythonPackage rec { name = "xgboost-${version}"; |