Merge branch 'master' into staging-next

A couple thousand rebuilds have accumulated on master.
2019-01-12 12:15:44 +01:00
parent 3d73081499 6359e9baf0
commit bde8efe792
157 changed files with 13755 additions and 10435 deletions
--- a/pkgs/development/libraries/physics/hoppet/default.nix
+++ b/pkgs/development/libraries/physics/hoppet/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gfortran }:
+{ stdenv, fetchurl, gfortran, perl }:

 stdenv.mkDerivation rec {
  name = "hoppet-${version}";
@@ -10,9 +10,14 @@ stdenv.mkDerivation rec {
  };

  buildInputs = [ gfortran ];
+  nativeBuildInputs = [ perl ];

  enableParallelBuilding = true;

+  preConfigure = ''
+    patchShebangs .
+  '';
+
  meta = with stdenv.lib; {
    description = "Higher Order Perturbative Parton Evolution Toolkit";
    license     = licenses.gpl2;