forked from mirrors/nixpkgs
Merge pull request #172935 from veprbl/pr/rivet_3_1_6
rivet: 3.1.5 -> 3.1.6
This commit is contained in:
commit
ec6dd63f83
|
@ -2,22 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rivet";
|
||||
version = "3.1.5";
|
||||
version = "3.1.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.hepforge.org/archive/rivet/Rivet-${version}.tar.bz2";
|
||||
hash = "sha256-YhcXW3gab7z3EJd3qGePeplVEapV4a5WKIc151hQXZo=";
|
||||
hash = "sha256-HPbrtqedGBxEHR0MfG1iPEI4F8YQk/NvIa2q4j5nkJA=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fixes build
|
||||
(fetchpatch {
|
||||
name = "rivet-3.1.5-namespace-fix.patch";
|
||||
url = "https://gitlab.com/hepcedar/rivet/-/commit/17a99b38b52e65a4a3fd6289124bd9dd874c30bf.diff";
|
||||
sha256 = "sha256-OknqghpMMB5nRHeeRc2ddxybhnkVGRB1x8jfOjrkyms=";
|
||||
})
|
||||
];
|
||||
|
||||
latex = texlive.combine { inherit (texlive)
|
||||
scheme-basic
|
||||
collection-pstricks
|
||||
|
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "yoda";
|
||||
version = "1.9.4";
|
||||
version = "1.9.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.hepforge.org/archive/yoda/YODA-${version}.tar.bz2";
|
||||
hash = "sha256-KifrhuZH11szennCDC2sJeHxO9JZJbnJWuKK3JN5NwU=";
|
||||
hash = "sha256-WRkaDpr6jbU/+qIHn4Uy5bE94b5iJwPW9wYNNhBSi2s=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with python.pkgs; [ cython makeWrapper ];
|
||||
|
|
Loading…
Reference in a new issue