public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into staging

Browse Source 
Conflicts:
	pkgs/top-level/all-packages.nix
This commit is contained in:
Tuomas Tynkkynen
2018-04-03 02:22:54 +03:00
parent 4c46f13f15 00fc66dc7d
commit 747ebe3f66
263 changed files with 9700 additions and 7232 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/virtualization/dynamips/default.nix
View File

@@ -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 ];

4
pkgs/applications/virtualization/singularity/default.nix
View File

@@ -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 ];