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: e8d116f8ee4a
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 61a8aca8e555
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Mar 7, 2019

  1. udocker: Fix build (#57002) 

    The latest changes to support better cross-compilation compatibility
have introduced a stricter handling of dependency specifications in
python. Since b4acd97, mock and nosetest should be checkInputs, since
they are used for testing.

Fixes: #56972
    @knedlsepp @xeji
    knedlsepp authored and xeji committed Mar 7, 2019
    Copy the full SHA
    61a8aca View commit details
Showing with 6 additions and 1 deletion.
  1. +6 −1 pkgs/tools/virtualization/udocker/default.nix
7 changes: 6 additions & 1 deletion pkgs/tools/virtualization/udocker/default.nix
View file
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@ buildPythonApplication rec {
sha256 = "134xk7rfj0xki9znryk5qf1nsfa318ahrrsi1k6ia7kipp7i3hb4";
};

buildInputs = [ proot patchelf fakechroot runc simplejson pycurl coreutils nose mock ];
buildInputs = [ proot patchelf fakechroot runc simplejson pycurl coreutils ];

postPatch = ''
substituteInPlace udocker.py --replace /usr/sbin:/sbin:/usr/bin:/bin $PATH
@@ -22,6 +22,11 @@ buildPythonApplication rec {
substituteInPlace udocker.py --replace "autoinstall = True" "autoinstall = False"
'';

checkInputs = [
nose
mock
];

checkPhase = ''
NOSE_EXCLUDE=test_03_create_repo,test_04_is_repo,test_02__get_group_from_host nosetests -v tests/unit_tests.py
'';