Merge branch 'master' into staging-next

2019-11-27 22:57:50 -08:00
parent 4cc592761d f4f8169021
commit 0c1c18ca44
207 changed files with 4017 additions and 3629 deletions
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gfortran, hoppet, lhapdf, root5 }:
+{ stdenv, fetchurl, gfortran, hoppet, lhapdf, root5, zlib }:

 stdenv.mkDerivation rec {
  pname = "applgrid";
@@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
    sha256 = "1yw9wrk3vjv84kd3j4s1scfhinirknwk6xq0hvj7x2srx3h93q9p";
  };

-  buildInputs = [ gfortran hoppet lhapdf root5 ];
+  # For some reason zlib was only needed after bump to gfortran8
+  buildInputs = [ gfortran hoppet lhapdf root5 zlib ];

  patches = [
    ./bad_code.patch