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

Merge staging-next into staging

Browse Source
This commit is contained in:
Frederik Rietdijk
2019-11-19 14:53:29 +01:00
parent 801d3b51f0 f6b39f852e
commit 5f8b0d7d99
299 changed files with 3766 additions and 40865 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/physics/apfel/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, gfortran, lhapdf, python2 }:
{ stdenv, fetchFromGitHub, gfortran, lhapdf, python2, zlib }:
stdenv.mkDerivation rec {
pname = "apfel";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "13n5ygbqvskg3qq5n4sff1nbii0li0zf1vqissai7x0hynxgy7p6";
};
buildInputs = [ gfortran lhapdf python2 ];
buildInputs = [ gfortran lhapdf python2 zlib ];
enableParallelBuilding = true;
pkgs/development/libraries/physics/qcdnum/default.nix
+2 -1
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, gfortran }:
{ stdenv, fetchurl, gfortran, zlib }:
stdenv.mkDerivation rec {
pname = "QCDNUM";
@@ -10,6 +10,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ gfortran ];
buildInputs = [ zlib ];
enableParallelBuilding = true;