Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 4851555ea050
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: a98371adb3bc
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Jan 15, 2020

  1. httpie: 1.0.3 -> 2.0.0

    @bbigras
    bbigras committed Jan 15, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    pierreis Pierre
    GPG key ID: F88C917469AB1D8C
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    8858cc1 View commit details

  2. httpie: 1.0.3 -> 2.0.0 (#77722) 

    httpie: 1.0.3 -> 2.0.0
    @Mic92
    Mic92 authored Jan 15, 2020
    Copy the full SHA
    a98371a View commit details
Showing with 22 additions and 7 deletions.
  1. +3 −7 pkgs/tools/networking/httpie/default.nix
  2. +19 −0 pkgs/tools/networking/httpie/strip-venv.patch
10 changes: 3 additions & 7 deletions pkgs/tools/networking/httpie/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,22 +2,18 @@

python3Packages.buildPythonApplication rec {
pname = "httpie";
version = "1.0.3";
version = "2.0.0";

src = fetchFromGitHub {
owner = "jakubroztocil";
repo = "httpie";
rev = version;
sha256 = "0y30sp0x3nmgzi4dqw1rc3705hnn36ij0zlyyx7g6fqdq8bd8p5q";
sha256 = "0d0rsn5i973l9y0ws3xmnzaw4jwxdlryyjbasnlddph5mvkf7dq0";
};

propagatedBuildInputs = with python3Packages; [ pygments requests setuptools ];
dontUseSetuptoolsCheck = true;

disabledTests = [
"test_current_version"
"test_error"
];
patches = [ ./strip-venv.patch ];

checkInputs = with python3Packages; [
mock
19 changes: 19 additions & 0 deletions pkgs/tools/networking/httpie/strip-venv.patch
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
diff --git a/tests/test_docs.py b/tests/test_docs.py
index 7a41822..720ecf6 100644
--- a/tests/test_docs.py
+++ b/tests/test_docs.py
@@ -41,12 +41,10 @@ assert filenames

# HACK: hardcoded paths, venv should be irrelevant, etc.
# TODO: replaces the process with Python code
-VENV_BIN = Path(__file__).parent.parent / 'venv/bin'
-VENV_PYTHON = VENV_BIN / 'python'
-VENV_RST2PSEUDOXML = VENV_BIN / 'rst2pseudoxml.py'
+VENV_PYTHON = 'python'
+VENV_RST2PSEUDOXML = 'rst2pseudoxml.py'


-@pytest.mark.skipif(not os.path.exists(VENV_RST2PSEUDOXML), reason='docutils not installed')
@pytest.mark.parametrize('filename', filenames)
def test_rst_file_syntax(filename):
p = subprocess.Popen(