diff options
author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-04-03 02:22:54 +0300 |
---|---|---|
committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-04-03 02:22:54 +0300 |
commit | 747ebe3f660ea4a6e7bd03831f4e95a66d59b526 (patch) | |
tree | b9575026aa7949f51541135be0059b54eda07bbe /pkgs/applications/virtualization | |
parent | 4c46f13f15c602a88dfd87a37acdc94653232a1d (diff) | |
parent | 00fc66dc7dcda7fc38a9cc7f4dbd7bb66f28c5f9 (diff) | |
download | nixlib-747ebe3f660ea4a6e7bd03831f4e95a66d59b526.tar nixlib-747ebe3f660ea4a6e7bd03831f4e95a66d59b526.tar.gz nixlib-747ebe3f660ea4a6e7bd03831f4e95a66d59b526.tar.bz2 nixlib-747ebe3f660ea4a6e7bd03831f4e95a66d59b526.tar.lz nixlib-747ebe3f660ea4a6e7bd03831f4e95a66d59b526.tar.xz nixlib-747ebe3f660ea4a6e7bd03831f4e95a66d59b526.tar.zst nixlib-747ebe3f660ea4a6e7bd03831f4e95a66d59b526.zip |
Merge remote-tracking branch 'upstream/master' into staging
Conflicts: pkgs/top-level/all-packages.nix
Diffstat (limited to 'pkgs/applications/virtualization')
-rw-r--r-- | pkgs/applications/virtualization/dynamips/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/virtualization/singularity/default.nix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/applications/virtualization/dynamips/default.nix b/pkgs/applications/virtualization/dynamips/default.nix index 811e5cf47c3b..8b590cff9640 100644 --- a/pkgs/applications/virtualization/dynamips/default.nix +++ b/pkgs/applications/virtualization/dynamips/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "dynamips"; - version = "0.2.17"; + version = "0.2.18"; src = fetchFromGitHub { owner = "GNS3"; repo = pname; rev = "v${version}"; - sha256 = "12c45jcp9isz57dbshxrvvhqbvmf9cnrr7ddac5m6p34in4hk01n"; + sha256 = "1jrwvrpl61rqbjjphv8v7ryhdwfjrpps76dbvkpl43hpn5hqqis2"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/virtualization/singularity/default.nix b/pkgs/applications/virtualization/singularity/default.nix index 662805438958..0a45b4d5d90d 100644 --- a/pkgs/applications/virtualization/singularity/default.nix +++ b/pkgs/applications/virtualization/singularity/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { name = "singularity-${version}"; - version = "2.4.2"; + version = "2.4.5"; enableParallelBuilding = true; @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { owner = "singularityware"; repo = "singularity"; rev = version; - sha256 = "0cpa2yp82g9j64mgr90p75ddk85kbj1qi1r6hy0sz17grqdlaxl4"; + sha256 = "0wz2in07197n5c2csww864nn2qmr925lqcjsd1kmlwwnrhq6lzl3"; }; nativeBuildInputs = [ autoreconfHook makeWrapper ]; |