diff options
author | aszlig <aszlig@nix.build> | 2018-09-25 23:09:39 +0200 |
---|---|---|
committer | aszlig <aszlig@nix.build> | 2018-09-25 23:13:08 +0200 |
commit | 65d0b082f372f1f3fc7afbc9543ab5e8b09cf1ae (patch) | |
tree | 7335d63596597fe17ce705c8a24d5a4f70225cda /pkgs/top-level | |
parent | 4ad424fbd6355c88917c65e307bce810d581e3f1 (diff) | |
parent | 46cd67e6a194dcfcac62cfe8191748d05497713a (diff) | |
download | nixpkgs-65d0b082f372f1f3fc7afbc9543ab5e8b09cf1ae.tar nixpkgs-65d0b082f372f1f3fc7afbc9543ab5e8b09cf1ae.tar.gz nixpkgs-65d0b082f372f1f3fc7afbc9543ab5e8b09cf1ae.tar.bz2 nixpkgs-65d0b082f372f1f3fc7afbc9543ab5e8b09cf1ae.tar.lz nixpkgs-65d0b082f372f1f3fc7afbc9543ab5e8b09cf1ae.tar.xz nixpkgs-65d0b082f372f1f3fc7afbc9543ab5e8b09cf1ae.tar.zst nixpkgs-65d0b082f372f1f3fc7afbc9543ab5e8b09cf1ae.zip |
Merge Paperwork update to version 1.2.4 (#46487)
Thanks to @symphorien for this work, which apart from the update itself includes a few more fixes and cleanups. I've tested building and running the upgraded Paperwork and while I haven't done extensive testing on every little feature it seems to work so far. The changes also include an addition to fetchFromGitLab, which allows to specify a group. Merges: #46487
Diffstat (limited to 'pkgs/top-level')
-rw-r--r-- | pkgs/top-level/all-packages.nix | 8 | ||||
-rw-r--r-- | pkgs/top-level/python-packages.nix | 30 |
2 files changed, 5 insertions, 33 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8ae70687d96..44a6e9808ca 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -288,13 +288,13 @@ with pkgs; # gitlab example fetchFromGitLab = { - owner, repo, rev, domain ? "gitlab.com", name ? "source", + owner, repo, rev, domain ? "gitlab.com", name ? "source", group ? null, ... # For hash agility }@args: fetchzip ({ inherit name; - url = "https://${domain}/api/v4/projects/${owner}%2F${repo}/repository/archive.tar.gz?sha=${rev}"; - meta.homepage = "https://${domain}/${owner}/${repo}/"; - } // removeAttrs args [ "domain" "owner" "repo" "rev" ]) // { inherit rev; }; + url = "https://${domain}/api/v4/projects/${lib.optionalString (group != null) group+"%2F"}${owner}%2F${repo}/repository/archive.tar.gz?sha=${rev}"; + meta.homepage = "https://${domain}/${lib.optionalString (group != null) group+"/"}${owner}/${repo}/"; + } // removeAttrs args [ "domain" "owner" "group" "repo" "rev" ]) // { inherit rev; }; # gitweb example, snapshot support is optional in gitweb fetchFromRepoOrCz = { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index db4c20b8480..4b27db15876 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3869,35 +3869,7 @@ in { }; }; - pypillowfight = buildPythonPackage rec { - name = "pypillowfight-${version}"; - version = "0.2.1"; - - src = pkgs.fetchFromGitHub { - owner = "jflesch"; - repo = "libpillowfight"; - rev = version; - sha256 = "1rwmajsy9qhl3qhhy5mw0xmr3n8abxcq8baidpn0sxv6yjg2369z"; - }; - - # Disable tests because they're designed to only work on Debian: - # https://github.com/jflesch/libpillowfight/issues/2#issuecomment-268259174 - doCheck = false; - - # Python 2.x is not supported, see: - # https://github.com/jflesch/libpillowfight/issues/1 - disabled = !isPy3k && !isPyPy; - - # This is needed by setup.py regardless of whether tests are enabled. - buildInputs = [ self.nose ]; - propagatedBuildInputs = [ self.pillow ]; - - meta = { - description = "Library containing various image processing algorithms"; - homepage = "https://github.com/jflesch/libpillowfight"; - license = licenses.gpl3Plus; - }; - }; + pypillowfight = callPackage ../development/python-modules/pypillowfight { }; pyprind = callPackage ../development/python-modules/pyprind { }; |