diff options
author | Oleksii Filonenko <brightone@protonmail.com> | 2020-06-22 12:26:36 +0300 |
---|---|---|
committer | Maximilian Bosch <maximilian@mbosch.me> | 2020-06-29 23:43:33 +0200 |
commit | 35006429c27ebf0c7c40d6cec24a84be4321a648 (patch) | |
tree | af70c2ae008d44e96432b0e610fafa3394b3e3b1 /pkgs/tools | |
parent | 7986ae5860f10e0e593e4f5dec6fdd7bbce4e7c8 (diff) | |
download | nixpkgs-35006429c27ebf0c7c40d6cec24a84be4321a648.tar nixpkgs-35006429c27ebf0c7c40d6cec24a84be4321a648.tar.gz nixpkgs-35006429c27ebf0c7c40d6cec24a84be4321a648.tar.bz2 nixpkgs-35006429c27ebf0c7c40d6cec24a84be4321a648.tar.lz nixpkgs-35006429c27ebf0c7c40d6cec24a84be4321a648.tar.xz nixpkgs-35006429c27ebf0c7c40d6cec24a84be4321a648.tar.zst nixpkgs-35006429c27ebf0c7c40d6cec24a84be4321a648.zip |
httpie: 2.1.0 -> 2.2.0
https://github.com/jakubroztocil/httpie/releases/tag/2.2.0 Closes #91275 (original patch in the PR was broken since the hash from `nix-prefetch-url <patch-url>` was used for `fetchpatch`, however `fetchpatch` internally modifies the patchfile and therefore results in a different output-hash). Co-authored-by: Maximilian Bosch <maximilian@mbosch.me>
Diffstat (limited to 'pkgs/tools')
-rw-r--r-- | pkgs/tools/networking/httpie/default.nix | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/pkgs/tools/networking/httpie/default.nix b/pkgs/tools/networking/httpie/default.nix index 01986bf9321..bf80cd48ffa 100644 --- a/pkgs/tools/networking/httpie/default.nix +++ b/pkgs/tools/networking/httpie/default.nix @@ -1,21 +1,30 @@ -{ stdenv, fetchFromGitHub, python3Packages, docutils, }: +{ stdenv, fetchFromGitHub, python3Packages, docutils, fetchpatch }: python3Packages.buildPythonApplication rec { pname = "httpie"; - version = "2.1.0"; + version = "2.2.0"; src = fetchFromGitHub { owner = "jakubroztocil"; repo = "httpie"; rev = version; - sha256 = "1vwjlzx830q4dcm3r7j9cl8yzka37dw42rl1r05m5ysb1081cbj2"; + sha256 = "0caazv24jr0844c4mdx77vzwwi5m869n10wa42cydb08ppx1xxj6"; }; outputs = [ "out" "doc" "man" ]; propagatedBuildInputs = with python3Packages; [ pygments requests setuptools ]; dontUseSetuptoolsCheck = true; - patches = [ ./strip-venv.patch ]; + patches = [ + ./strip-venv.patch + + # Fix `test_ciphers_none_can_be_selected` + # TODO: remove on next release + (fetchpatch { + url = "https://github.com/jakubroztocil/httpie/commit/49e71d252f54871a6bc49cb1cba103d385a543b8.patch"; + sha256 = "13b2faf50gimj7f17dlx4gmd8ph8ipgihpzfqbvmfjlbf1v95fsj"; + }) + ]; checkInputs = with python3Packages; [ mock |