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: 5c21c8f63302
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 3802b4113a9b
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Sep 3, 2019

  1. devpi-server: 4.9.0 -> 5.1.0

    @marsam
    marsam committed Sep 3, 2019

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    b9329a8 View commit details

  2. Merge pull request #67984 from marsam/update-devpi-server 

    devpi-server: 4.9.0 -> 5.1.0
    @mmahut
    mmahut authored Sep 3, 2019

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    3802b41 View commit details
Showing with 7 additions and 7 deletions.
  1. +7 −7 pkgs/development/tools/devpi-server/default.nix
14 changes: 7 additions & 7 deletions pkgs/development/tools/devpi-server/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,20 +1,21 @@
{ stdenv, python3Packages, nginx }:
{ stdenv, python3Packages, nginx }:

python3Packages.buildPythonApplication rec {
name = "${pname}-${version}";
pname = "devpi-server";
version = "4.9.0";
version = "5.1.0";

src = python3Packages.fetchPypi {
inherit pname version;
sha256 = "0cx0nv1qqv8lg6p1v8dv5val0dxnc3229c15imibl9wrhrffjbg9";
sha256 = "254fceee846532a5fec4e6bf52a59eb8f236efc657678a542b5200da4bb3abbc";
};

propagatedBuildInputs = with python3Packages; [
py
appdirs
devpi-common
execnet
itsdangerous
repoze_lru
passlib
pluggy
pyramid
@@ -24,13 +25,12 @@ python3Packages.buildPythonApplication rec {

checkInputs = with python3Packages; [
beautifulsoup4
mock
nginx
pytest
pytest-flakes
pytest-flake8
pytestpep8
webtest
];
] ++ stdenv.lib.optionals isPy27 [ mock ];

# test_genconfig.py needs devpi-server on PATH
checkPhase = ''