diff options
| author | Bruno Bzeznik <Bruno.Bzeznik@imag.fr> | 2020-08-21 08:06:48 +0200 |
|---|---|---|
| committer | Bruno Bzeznik <Bruno.Bzeznik@imag.fr> | 2020-08-21 08:06:48 +0200 |
| commit | d909bb54186afe88d52ee31389a7445ac65d7233 (patch) | |
| tree | ef797badfafbd1ce4da0e6c74f32d5b45500a0e8 /pkgs/applications/virtualization | |
| parent | 156fe85c5fdaf0cb93cf8ed7036fae58ee0b1a91 (diff) | |
charliecloud: 0.12 -> 0.18
Diffstat (limited to 'pkgs/applications/virtualization')
| -rw-r--r-- | pkgs/applications/virtualization/charliecloud/default.nix | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/pkgs/applications/virtualization/charliecloud/default.nix b/pkgs/applications/virtualization/charliecloud/default.nix index a316952a010df..7a5073a07440a 100644 --- a/pkgs/applications/virtualization/charliecloud/default.nix +++ b/pkgs/applications/virtualization/charliecloud/default.nix @@ -1,22 +1,24 @@ -{ stdenv, fetchFromGitHub, python }: +{ stdenv, fetchFromGitHub, python, autoconf, automake, docker, buildah }: stdenv.mkDerivation rec { - version = "0.12"; + version = "0.18"; pname = "charliecloud"; src = fetchFromGitHub { owner = "hpc"; repo = "charliecloud"; rev = "v${version}"; - sha256 = "177rcf1klcxsp6x9cw75cmz3y2izgd1hvi1rb9vc6iz9qx1nmk3v"; + sha256 = "0x2kvp95ld0yii93z9i0k9sknfx7jkgy4rkw9l369fl7f73ghsiq"; }; - buildInputs = [ python ]; + nativeBuildInputs = [ autoconf automake ]; + buildInputs = [ python docker buildah ]; preConfigure = '' - substituteInPlace Makefile --replace '/bin/bash' '${stdenv.shell}' patchShebangs test/ + patchShebangs autogen.sh + ./autogen.sh ''; makeFlags = [ @@ -24,12 +26,6 @@ stdenv.mkDerivation rec { "LIBEXEC_DIR=lib/charliecloud" ]; - postInstall = '' - mkdir -p $out/share/charliecloud - mv $out/lib/charliecloud/examples $out/share/charliecloud - mv $out/lib/charliecloud/test $out/share/charliecloud - ''; - meta = { description = "User-defined software stacks (UDSS) for high-performance computing (HPC) centers"; longDescription = '' |