mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-06-10 03:23:29 +03:00
charliecloud: 0.24 -> 0.38
Diff: https://github.com/hpc/charliecloud/compare/v0.24...v0.38
This commit is contained in:
parent
f149b2b05a
commit
ef0f60d4b9
1 changed files with 12 additions and 8 deletions
|
@ -13,26 +13,30 @@
|
||||||
findutils,
|
findutils,
|
||||||
sudo,
|
sudo,
|
||||||
nixosTests,
|
nixosTests,
|
||||||
|
pkg-config,
|
||||||
|
fuse3,
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
|
|
||||||
version = "0.24";
|
|
||||||
pname = "charliecloud";
|
pname = "charliecloud";
|
||||||
|
version = "0.38";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "hpc";
|
owner = "hpc";
|
||||||
repo = "charliecloud";
|
repo = "charliecloud";
|
||||||
rev = "v${version}";
|
tag = "v${finalAttrs.version}";
|
||||||
sha256 = "sha256-kdaVlwE3vdCxsmJTOUwx8J+9UcBuXbKDwS2MHX2ZPPM=";
|
hash = "sha256-Mr2Qa1PRTarJ0I8nkH/Xsq8QN3OxOfL8tpl1lL1WV0c=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
autoreconfHook
|
autoreconfHook
|
||||||
makeWrapper
|
makeWrapper
|
||||||
|
pkg-config
|
||||||
];
|
];
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
docker
|
docker
|
||||||
|
fuse3
|
||||||
(python3.withPackages (ps: [
|
(python3.withPackages (ps: [
|
||||||
ps.lark
|
ps.lark
|
||||||
ps.requests
|
ps.requests
|
||||||
|
@ -48,11 +52,12 @@ stdenv.mkDerivation rec {
|
||||||
in
|
in
|
||||||
[
|
[
|
||||||
"--with-python=${pythonEnv}/bin/python3"
|
"--with-python=${pythonEnv}/bin/python3"
|
||||||
|
"-disable-bundled-lark"
|
||||||
];
|
];
|
||||||
|
|
||||||
preConfigure = ''
|
preConfigure = ''
|
||||||
patchShebangs test/
|
patchShebangs test/
|
||||||
substituteInPlace configure.ac --replace "/usr/bin/env" "${coreutils}/bin/env"
|
substituteInPlace configure.ac --replace-fail "/usr/bin/env" "${coreutils}/bin/env"
|
||||||
'';
|
'';
|
||||||
|
|
||||||
makeFlags = [
|
makeFlags = [
|
||||||
|
@ -94,5 +99,4 @@ stdenv.mkDerivation rec {
|
||||||
maintainers = [ lib.maintainers.bzizou ];
|
maintainers = [ lib.maintainers.bzizou ];
|
||||||
platforms = lib.platforms.linux;
|
platforms = lib.platforms.linux;
|
||||||
};
|
};
|
||||||
|
})
|
||||||
}
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue