tjh.dev
Merge pull request #118967 from veprbl/pr/rivet_3_1_4
rivet: 3.1.3 -> 3.1.4
authored by Dmitry Kalinkin and committed by GitHub 79e46fe6 4b21d06d
-33
pkgs/development/libraries/physics/rivet/darwin.patch
-33
pkgs/development/libraries/physics/rivet/darwin.patch
···
1
-
diff --git a/include/Rivet/Tools/osdir.hh b/include/Rivet/Tools/osdir.hh
2
-
index 05f06ca..59af7de 100644
3
-
--- a/include/Rivet/Tools/osdir.hh
4
-
+++ b/include/Rivet/Tools/osdir.hh
5
-
@@ -21,7 +21,7 @@
6
-
7
-
/// @cond OSDIR
8
-
9
-
-#if defined(unix) || defined(__unix) || defined(__unix__)
10
-
+#if defined(unix) || defined(__unix) || defined(__unix__) || defined(__APPLE__)
11
-
#define OSLINK_OSDIR_POSIX
12
-
#elif defined(_WIN32)
13
-
#define OSLINK_OSDIR_WINDOWS
14
-
@@ -32,18 +32,7 @@
15
-
#include <string>
16
-
17
-
#if defined(OSLINK_OSDIR_NOTSUPPORTED)
18
-
-
19
-
-namespace oslink
20
-
-{
21
-
- class directory
22
-
- {
23
-
- public:
24
-
- directory(const std::string&) { }
25
-
- operator void*() const { return (void*)0; }
26
-
- std::string next() { return ""; }
27
-
- };
28
-
-}
29
-
-
30
-
+#error Platform misdetected or oslink is not implemented
31
-
#elif defined(OSLINK_OSDIR_POSIX)
32
-
33
-
#include <sys/types.h>
···
+3
-39
pkgs/development/libraries/physics/rivet/default.nix
+3
-39
pkgs/development/libraries/physics/rivet/default.nix
···
1
-
{ lib, stdenv, fetchurl, fetchpatch, fastjet, fastjet-contrib, ghostscript, hepmc, imagemagick, less, python3, rsync, texlive, yoda, which, makeWrapper }:
2
3
stdenv.mkDerivation rec {
4
pname = "rivet";
5
-
version = "3.1.3";
6
7
src = fetchurl {
8
url = "https://www.hepforge.org/archive/rivet/Rivet-${version}.tar.bz2";
9
-
sha256 = "08g0f84l7r6vm4n7gn36qi3bzacscpv061m9xar2572vf10wxpak";
10
};
11
-
12
-
patches = [
13
-
./darwin.patch # configure relies on impure sw_vers to -Dunix
14
-
15
-
# fix compilation errors (fails depending on number of cores filesystem ordering?)
16
-
# https://gitlab.com/hepcedar/rivet/-/merge_requests/220
17
-
(fetchpatch {
18
-
url = "https://gitlab.com/hepcedar/rivet/commit/3203bf12a4bef81f880789eb9cde7ff489ae5115.diff";
19
-
sha256 = "0zn5yxlv6dk4vcqgz0syzb9mp4qc9smpmgshcqimcvii7qcp20mc";
20
-
})
21
-
# https://gitlab.com/hepcedar/rivet/-/merge_requests/223
22
-
(fetchpatch {
23
-
url = "https://gitlab.com/hepcedar/rivet/commit/476f267c46b126fa163a92aa6cbcb7806c4624c3.diff";
24
-
sha256 = "0dhkraddzp06v5z0d2wf0c8vsd50hl5pqsjgsrb8x14d0vwi8rnc";
25
-
})
26
-
27
-
# fix for new python and fix transparency gs 9.52
28
-
# gs 9.52 opacity fix
29
-
(fetchpatch {
30
-
url = "https://gitlab.com/hepcedar/rivet/commit/25c4bee19882fc56407b0a438f86e1a11753d5e6.diff";
31
-
sha256 = "18p2wk54r0qfq6l27z6805zq1z5jhk5sbxbjixgibzq8prj1a78v";
32
-
})
33
-
34
-
# make-plots: fix wrong logic in Plot.set_xmax()
35
-
(fetchpatch {
36
-
url = "https://gitlab.com/hepcedar/rivet/commit/d371c6c10cf67a41c0e4e27c16ff5723d6276ad2.diff";
37
-
sha256 = "0w622rd5darj7qafbbc84blznvy5rnhsdyr2n1i1fkz19mrf5h2p";
38
-
})
39
-
40
-
# fix https://gitlab.com/hepcedar/rivet/-/issues/200
41
-
(fetchpatch {
42
-
url = "https://gitlab.com/hepcedar/rivet/commit/442dbd17dcb3bd6e30b26e54c50f6a8237f966f9.diff";
43
-
includes = [ "bin/make-pgfplots" "bin/make-plots" "bin/make-plots-fast" ];
44
-
sha256 = "0c3rysgcib49km1zdpgsdai3xi4s6ijqgxp4whn04mrh3qf4bmr3";
45
-
})
46
-
];
47
48
latex = texlive.combine { inherit (texlive)
49
scheme-basic
···
1
+
{ lib, stdenv, fetchurl, fastjet, fastjet-contrib, ghostscript, hepmc, imagemagick, less, python3, rsync, texlive, yoda, which, makeWrapper }:
2
3
stdenv.mkDerivation rec {
4
pname = "rivet";
5
+
version = "3.1.4";
6
7
src = fetchurl {
8
url = "https://www.hepforge.org/archive/rivet/Rivet-${version}.tar.bz2";
9
+
sha256 = "sha256-N+3ICilozhAxWJ5DumtJKHfKeQG+o4+Lt1NqXIz4EA0=";
10
};
11
12
latex = texlive.combine { inherit (texlive)
13
scheme-basic