Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions pkgs/by-name/ap/apfelgrid/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
apfel,
applgrid,
lhapdf,
root5,
root,
zlib,
}:

stdenv.mkDerivation rec {
Expand All @@ -25,7 +26,8 @@ stdenv.mkDerivation rec {
apfel
applgrid
lhapdf
root5
root
zlib
];

enableParallelBuilding = true;
Expand Down
50 changes: 0 additions & 50 deletions pkgs/by-name/ap/applgrid/bad_code.patch

This file was deleted.

20 changes: 10 additions & 10 deletions pkgs/by-name/ap/applgrid/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -5,41 +5,41 @@
gfortran,
hoppet,
lhapdf,
root5,
root,
zlib,
}:

stdenv.mkDerivation rec {
pname = "applgrid";
version = "1.4.70";
version = "1.6.27";

src = fetchurl {
url = "https://www.hepforge.org/archive/applgrid/${pname}-${version}.tgz";
sha256 = "1yw9wrk3vjv84kd3j4s1scfhinirknwk6xq0hvj7x2srx3h93q9p";
hash = "sha256-h+ZNGj33FIwg4fOCyfGJrUKM2vDDQl76JcLhtboAOtc=";
};

postPatch = ''
sed -i appl_grid/serialise_base.h -e '1i#include <cstdint>'
'';

nativeBuildInputs = [ gfortran ];

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

patches = [
./bad_code.patch
];

preConfigure =
''
substituteInPlace src/Makefile.in \
--replace "-L\$(subst /libgfortran.a, ,\$(FRTLIB) )" "-L${gfortran.cc.lib}/lib"
--replace-fail "-L\$(subst /libgfortran.a, ,\$(FRTLIB) )" "-L${gfortran.cc.lib}/lib"
''
+ (lib.optionalString stdenv.hostPlatform.isDarwin ''
substituteInPlace src/Makefile.in \
--replace "gfortran -print-file-name=libgfortran.a" "gfortran -print-file-name=libgfortran.dylib"
--replace-fail "gfortran -print-file-name=libgfortran.a" "gfortran -print-file-name=libgfortran.dylib"
'');

enableParallelBuilding = false; # broken
Expand Down
27 changes: 0 additions & 27 deletions pkgs/by-name/ro/root5/disable_libc_dicts_root5.patch

This file was deleted.

195 changes: 0 additions & 195 deletions pkgs/by-name/ro/root5/package.nix

This file was deleted.

Loading
Loading