diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2018-02-25 20:19:51 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2018-02-25 22:24:09 +0300 |
| commit | 370f5b4c57dbd5e1f8d37ba43613b645cbe61315 (patch) | |
| tree | c57a7d45e400b1507cbabb5a98a9a484601d858c | |
| parent | c336e5c872619beb34ec04bbbde8c7e617b7cf33 (diff) | |
| download | nixpkgs-370f5b4c57dbd5e1f8d37ba43613b645cbe61315.tar nixpkgs-370f5b4c57dbd5e1f8d37ba43613b645cbe61315.tar.gz nixpkgs-370f5b4c57dbd5e1f8d37ba43613b645cbe61315.tar.bz2 nixpkgs-370f5b4c57dbd5e1f8d37ba43613b645cbe61315.tar.lz nixpkgs-370f5b4c57dbd5e1f8d37ba43613b645cbe61315.tar.xz nixpkgs-370f5b4c57dbd5e1f8d37ba43613b645cbe61315.tar.zst nixpkgs-370f5b4c57dbd5e1f8d37ba43613b645cbe61315.zip | |
pypolicyd-spf: move to all-packages
It's not a library.
| -rw-r--r-- | pkgs/servers/mail/pypolicyd-spf/default.nix | 26 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 26 |
3 files changed, 28 insertions, 26 deletions
diff --git a/pkgs/servers/mail/pypolicyd-spf/default.nix b/pkgs/servers/mail/pypolicyd-spf/default.nix new file mode 100644 index 00000000000..d5e410a86c1 --- /dev/null +++ b/pkgs/servers/mail/pypolicyd-spf/default.nix @@ -0,0 +1,26 @@ +{ lib, buildPythonApplication, fetchurl, pyspf }: + +buildPythonApplication rec { + name = "pypolicyd-spf-${version}"; + majorVersion = "2.0"; + version = "${majorVersion}.2"; + + src = fetchurl { + url = "https://launchpad.net/pypolicyd-spf/${majorVersion}/${version}/+download/${name}.tar.gz"; + sha256 = "1nm8y1jjgx6mxrbcxrbdnmkf8vglwp0wiw6jipzh641wb24gi76z"; + }; + + propagatedBuildInputs = [ pyspf ]; + + preBuild = '' + substituteInPlace setup.py --replace "'/etc'" "'$out/etc'" + ''; + + meta = with lib; { + homepage = https://launchpad.net/pypolicyd-spf/; + description = "Postfix policy engine for Sender Policy Framework (SPF) checking"; + maintainers = with maintainers; [ abbradar ]; + license = licenses.asl20; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9e1a5380c77..1599c517c7f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12513,6 +12513,8 @@ with pkgs; pyMAILt = callPackage ../servers/xmpp/pyMAILt {}; + pypolicyd-spf = python3.pkgs.callPackage ../servers/mail/pypolicyd-spf { }; + qpid-cpp = callPackage ../servers/amqp/qpid-cpp { boost = boost155; }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ac1e8295082..81c55485eda 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6168,32 +6168,6 @@ in { pythonix = toPythonModule (callPackage ../development/python-modules/pythonix { }); - pypolicyd-spf = buildPythonPackage rec { - name = "pypolicyd-spf-${version}"; - majorVersion = "2.0"; - version = "${majorVersion}.1"; - disabled = !isPy3k; - - src = pkgs.fetchurl { - url = "https://launchpad.net/pypolicyd-spf/${majorVersion}/${version}/+download/${name}.tar.gz"; - sha256 = "09yi8y7pij5vzzrkc9sdw01x8w5n758d0qg7wv5hxd1l6if8c94i"; - }; - - propagatedBuildInputs = with self; [ pyspf ]; - - preBuild = '' - substituteInPlace setup.py --replace "'/etc'" "'$out/etc'" - ''; - - meta = { - homepage = "https://launchpad.net/pypolicyd-spf/"; - description = "Postfix policy engine for Sender Policy Framework (SPF) checking"; - maintainers = with maintainers; [ abbradar ]; - license = licenses.asl20; - platforms = platforms.all; - }; - }; - pyramid = buildPythonPackage rec { pname = "pyramid"; version = "1.9.1"; |