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

Merge pull request #118967 from veprbl/pr/rivet_3_1_4

Browse Source 
rivet: 3.1.3 -> 3.1.4
This commit is contained in:
Dmitry Kalinkin 2021-04-11 00:29:33 -04:00 committed by GitHub
commit 79e46fe6b0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
pkgs/development/libraries/physics/rivet/darwin.patch
View File

@ -1,33 +0,0 @@
diff --git a/include/Rivet/Tools/osdir.hh b/include/Rivet/Tools/osdir.hh
index 05f06ca..59af7de 100644
--- a/include/Rivet/Tools/osdir.hh
+++ b/include/Rivet/Tools/osdir.hh
@@ -21,7 +21,7 @@
/// @cond OSDIR
-#if defined(unix) || defined(__unix) || defined(__unix__)
+#if defined(unix) || defined(__unix) || defined(__unix__) || defined(__APPLE__)
#define OSLINK_OSDIR_POSIX
#elif defined(_WIN32)
#define OSLINK_OSDIR_WINDOWS
@@ -32,18 +32,7 @@
#include <string>
#if defined(OSLINK_OSDIR_NOTSUPPORTED)
-
-namespace oslink
-{
- class directory
- {
- public:
- directory(const std::string&) { }
- operator void*() const { return (void*)0; }
- std::string next() { return ""; }
- };
-}
-
+#error Platform misdetected or oslink is not implemented
#elif defined(OSLINK_OSDIR_POSIX)
#include <sys/types.h>

42
pkgs/development/libraries/physics/rivet/default.nix
View File

@ -1,50 +1,14 @@
{ lib, stdenv, fetchurl, fetchpatch, fastjet, fastjet-contrib, ghostscript, hepmc, imagemagick, less, python3, rsync, texlive, yoda, which, makeWrapper }:
{ lib, stdenv, fetchurl, fastjet, fastjet-contrib, ghostscript, hepmc, imagemagick, less, python3, rsync, texlive, yoda, which, makeWrapper }:
stdenv.mkDerivation rec {
pname = "rivet";
version = "3.1.3";
version = "3.1.4";
src = fetchurl {
url = "https://www.hepforge.org/archive/rivet/Rivet-${version}.tar.bz2";
sha256 = "08g0f84l7r6vm4n7gn36qi3bzacscpv061m9xar2572vf10wxpak";
sha256 = "sha256-N+3ICilozhAxWJ5DumtJKHfKeQG+o4+Lt1NqXIz4EA0=";
};
patches = [
./darwin.patch # configure relies on impure sw_vers to -Dunix
# fix compilation errors (fails depending on number of cores filesystem ordering?)
# https://gitlab.com/hepcedar/rivet/-/merge_requests/220
(fetchpatch {
url = "https://gitlab.com/hepcedar/rivet/commit/3203bf12a4bef81f880789eb9cde7ff489ae5115.diff";
sha256 = "0zn5yxlv6dk4vcqgz0syzb9mp4qc9smpmgshcqimcvii7qcp20mc";
})
# https://gitlab.com/hepcedar/rivet/-/merge_requests/223
(fetchpatch {
url = "https://gitlab.com/hepcedar/rivet/commit/476f267c46b126fa163a92aa6cbcb7806c4624c3.diff";
sha256 = "0dhkraddzp06v5z0d2wf0c8vsd50hl5pqsjgsrb8x14d0vwi8rnc";
})
# fix for new python and fix transparency gs 9.52
# gs 9.52 opacity fix
(fetchpatch {
url = "https://gitlab.com/hepcedar/rivet/commit/25c4bee19882fc56407b0a438f86e1a11753d5e6.diff";
sha256 = "18p2wk54r0qfq6l27z6805zq1z5jhk5sbxbjixgibzq8prj1a78v";
})
# make-plots: fix wrong logic in Plot.set_xmax()
(fetchpatch {
url = "https://gitlab.com/hepcedar/rivet/commit/d371c6c10cf67a41c0e4e27c16ff5723d6276ad2.diff";
sha256 = "0w622rd5darj7qafbbc84blznvy5rnhsdyr2n1i1fkz19mrf5h2p";
})
# fix https://gitlab.com/hepcedar/rivet/-/issues/200
(fetchpatch {
url = "https://gitlab.com/hepcedar/rivet/commit/442dbd17dcb3bd6e30b26e54c50f6a8237f966f9.diff";
includes = [ "bin/make-pgfplots" "bin/make-plots" "bin/make-plots-fast" ];
sha256 = "0c3rysgcib49km1zdpgsdai3xi4s6ijqgxp4whn04mrh3qf4bmr3";
})
];
latex = texlive.combine { inherit (texlive)
scheme-basic
collection-pstricks