diff options
author | Robert Schütz <rschuetz17@gmail.com> | 2018-04-17 11:57:32 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-04-17 11:57:32 +0200 |
commit | c6a8b90d153643ff5eaaa378b8db565606059323 (patch) | |
tree | 9dbf8901e2a58cd3a690f04f68f157eba73c88fb /pkgs | |
parent | 4fc0b4edca7e48755538d4436b98baff5901a752 (diff) | |
parent | 6d09fbfcf4a721317dd9a042db440887eb58b64b (diff) | |
download | nixpkgs-c6a8b90d153643ff5eaaa378b8db565606059323.tar nixpkgs-c6a8b90d153643ff5eaaa378b8db565606059323.tar.gz nixpkgs-c6a8b90d153643ff5eaaa378b8db565606059323.tar.bz2 nixpkgs-c6a8b90d153643ff5eaaa378b8db565606059323.tar.lz nixpkgs-c6a8b90d153643ff5eaaa378b8db565606059323.tar.xz nixpkgs-c6a8b90d153643ff5eaaa378b8db565606059323.tar.zst nixpkgs-c6a8b90d153643ff5eaaa378b8db565606059323.zip |
Merge pull request #34296 from fgaz/isso
Isso: init at 0.10.6 (plus dependencies)
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/python-modules/misaka/default.nix | 22 | ||||
-rw-r--r-- | pkgs/servers/isso/default.nix | 54 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 | ||||
-rw-r--r-- | pkgs/top-level/python-packages.nix | 2 |
4 files changed, 80 insertions, 0 deletions
diff --git a/pkgs/development/python-modules/misaka/default.nix b/pkgs/development/python-modules/misaka/default.nix new file mode 100644 index 00000000000..b40aead3909 --- /dev/null +++ b/pkgs/development/python-modules/misaka/default.nix @@ -0,0 +1,22 @@ +{ lib, fetchPypi, buildPythonPackage, cffi }: +buildPythonPackage rec { + pname = "misaka"; + version = "2.1.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1yqrq3a5rracirmvk52n28nn6ckdaz897gnigv89a9gmyn87sqw7"; + }; + + propagatedBuildInputs = [ cffi ]; + + # The tests require write access to $out + doCheck = false; + + meta = with lib; { + description = "A CFFI binding for Hoedown, a markdown parsing library"; + homepage = "http://misaka.61924.nl/"; + license = licenses.mit; + maintainers = with maintainers; [ fgaz ]; + }; +} diff --git a/pkgs/servers/isso/default.nix b/pkgs/servers/isso/default.nix new file mode 100644 index 00000000000..5aafe55512b --- /dev/null +++ b/pkgs/servers/isso/default.nix @@ -0,0 +1,54 @@ +{ stdenv, python2, fetchurl, fetchFromGitHub }: + +let python = python2.override { + packageOverrides = self: super: { + misaka = super.misaka.overridePythonAttrs (old: rec { + version = "1.0.2"; + src = old.src.override { + inherit version; + sha256 = "05rmjxlfhghj90m1kc55lx3z8igabw5y8wmly66p3hphdy4f95v1"; + }; + propagatedBuildInputs = [ ]; + }); + html5lib = super.html5lib.overridePythonAttrs (old: rec { + version = "0.9999999"; + src = old.src.override { + inherit version; + sha256 = "2612a191a8d5842bfa057e41ba50bbb9dcb722419d2408c78cff4758d0754868"; + }; + checkInputs = with self; [ nose flake8 ]; + propagatedBuildInputs = with self; [ six ]; + checkPhase = '' + nosetests + ''; + }); + }; +}; + +in with python.pkgs; buildPythonApplication rec { + pname = "isso"; + version = "0.10.6"; + + # no tests on PyPI + src = fetchFromGitHub { + owner = "posativ"; + repo = pname; + rev = version; + sha256 = "19x9xbwd15fikhchyl4i1wrqx589hdmh279xhnxdszrq898igywb"; + }; + + propagatedBuildInputs = [ misaka werkzeug ipaddr configparser html5lib ]; + + checkInputs = [ nose ]; + + checkPhase = '' + ${python.interpreter} setup.py nosetests + ''; + + meta = with stdenv.lib; { + description = "A commenting server similar to Disqus"; + homepage = https://posativ.org/isso/; + license = licenses.mit; + maintainers = with maintainers; [ fgaz ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0345c91362e..86650a61edd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9431,6 +9431,8 @@ with pkgs; stdenv = llvmPackages_4.stdenv; }; + isso = callPackage ../servers/isso { }; + itk = callPackage ../development/libraries/itk { }; jasper = callPackage ../development/libraries/jasper { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d1ee00515cb..b5ef0362cce 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3541,6 +3541,8 @@ in { }; }; + misaka = callPackage ../development/python-modules/misaka {}; + mt-940 = callPackage ../development/python-modules/mt-940 { }; mwlib = let |