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

applgrid: 1.4.70 -> 1.6.27

Browse Source
This commit is contained in:
Dmitry Kalinkin
2025-07-17 14:33:28 -04:00
parent f6dc8d6b1b
commit 3bd7be5bcb
2 changed files with 8 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/by-name/ap/applgrid/bad_code.patch
-50
View File
@@ -1,50 +0,0 @@
diff --git a/appl_grid/appl_grid.h b/appl_grid/appl_grid.h
index 5059622..a0651c9 100644
--- a/appl_grid/appl_grid.h
+++ b/appl_grid/appl_grid.h
@@ -56,7 +56,7 @@ public:
class exception : public std::exception {
public:
exception(const std::string& s) { std::cerr << what() << " " << s << std::endl; };
- exception(std::ostream& s) { std::cerr << what() << " " << s << std::endl; };
+ exception(std::ostream& s) { s << what() << " " << std::endl; };
virtual const char* what() const throw() { return "appl::grid::exception"; }
};
diff --git a/appl_grid/appl_pdf.h b/appl_grid/appl_pdf.h
index c71fd84..2525527 100644
--- a/appl_grid/appl_pdf.h
+++ b/appl_grid/appl_pdf.h
@@ -51,7 +51,7 @@ public:
class exception : public std::exception {
public:
exception(const std::string& s="") { std::cerr << what() << " " << s << std::endl; };
- exception(std::ostream& s) { std::cerr << what() << " " << s << std::endl; };
+ exception(std::ostream& s) { s << " " << std::endl; };
const char* what() const throw() { return "appl::appl_pdf::exception "; }
};
diff --git a/src/appl_igrid.h b/src/appl_igrid.h
index d25288e..be354df 100644
--- a/src/appl_igrid.h
+++ b/src/appl_igrid.h
@@ -52,7 +52,7 @@ private:
class exception {
public:
exception(const std::string& s) { std::cerr << s << std::endl; };
- exception(std::ostream& s) { std::cerr << s << std::endl; };
+ exception(std::ostream& s) { s << std::endl; };
};
typedef double (igrid::*transform_t)(double) const;
diff --git a/src/lumi_pdf.cxx b/src/lumi_pdf.cxx
--- a/src/lumi_pdf.cxx
+++ b/src/lumi_pdf.cxx
@@ -235,6 +235,6 @@ void lumi_pdf::write(const std::string& filename) const {
// std::string lumi_pdf::summary(std::ostream& s=std::cout) const {
std::string lumi_pdf::summary() const {
std::stringstream s;
- s << "lumi_pdf::lumi_pdf() " << s << "\tsize " << m_combinations.size() << " lookup size " << m_lookup.size() << " " << this;
+ s << "lumi_pdf::lumi_pdf() " << "\tsize " << m_combinations.size() << " lookup size " << m_lookup.size() << " " << this;
return s.str();
}
pkgs/by-name/ap/applgrid/package.nix
+8 -6
View File
@@ -11,13 +11,17 @@
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
@@ -28,16 +32,14 @@ stdenv.mkDerivation rec {
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