nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-24 16:03:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #132231 from Artturin/udocker-fix

Browse Source 
udocker: 1.1.3 -> 1.3.1 and make usable
This commit is contained in:
Ben Siraphob 2021-08-01 01:30:02 +07:00 committed by GitHub
commit 9d865ef9f6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 29 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
pkgs/tools/virtualization/udocker/default.nix
View File

@ -1,35 +1,42 @@
{ lib, fetchFromGitHub, proot, patchelf, fakechroot, runc, simplejson, pycurl, coreutils, nose, mock, buildPythonApplication }:
{ lib
, fetchFromGitHub
, singularity
, python3Packages
}:
buildPythonApplication rec {
version = "1.1.3";
python3Packages.buildPythonApplication rec {
pname = "udocker";
version = "1.3.1";
src = fetchFromGitHub {
owner = "indigo-dc";
repo = "udocker" ;
repo = "udocker";
rev = "v${version}";
sha256 = "1c8y1p3brj987drikwrby8m1hdr40ja4anx0p4xsij3ll2h62w6z";
sha256 = "0dfsjgidsnah8nrclrq10yz3ja859123z81kq4zdifbrhnrn5a2x";
};
buildInputs = [ proot patchelf fakechroot runc simplejson pycurl coreutils ];
# crun patchelf proot runc fakechroot
# are download statistically linked during runtime
buildInputs = [
singularity
] ++ (with python3Packages; [
pytest-runner
pycurl
]);
postPatch = ''
substituteInPlace udocker.py --replace /usr/sbin:/sbin:/usr/bin:/bin $PATH
substituteInPlace udocker.py --replace /bin/chmod ${coreutils}/bin/chmod
substituteInPlace udocker.py --replace /bin/rm ${coreutils}/bin/rm
substituteInPlace tests/unit_tests.py --replace /bin/rm ${coreutils}/bin/rm
substituteInPlace udocker.py --replace "autoinstall = True" "autoinstall = False"
'';
checkInputs = [
nose
mock
checkInputs = with python3Packages; [
pytestCheckHook
];
checkPhase = ''
NOSE_EXCLUDE=test_03_create_repo,test_04_is_repo,test_02__get_group_from_host nosetests -v tests/unit_tests.py
'';
disabledTests = [
"test_05__get_volume_bindings"
];
disabledTestPaths = [
# Network
"tests/unit/test_curl.py"
"tests/unit/test_dockerioapi.py"
];
meta = with lib; {
description = "basic user tool to execute simple docker containers in user space without root privileges";

2
pkgs/top-level/all-packages.nix
View File

@ -27670,7 +27670,7 @@ in
umurmur = callPackage ../applications/networking/umurmur { };
udocker = pythonPackages.callPackage ../tools/virtualization/udocker { };
udocker = callPackage ../tools/virtualization/udocker { };
uefitoolPackages = recurseIntoAttrs (callPackage ../tools/system/uefitool/variants.nix {});
uefitool = uefitoolPackages.new-engine;