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

Merge pull request from veprbl/pr/bump 

bump: pythonPackages.simanneal, fastjet, herwig
This commit is contained in:
Jörg Thalheim 2018-11-22 00:53:26 +00:00 committed by GitHub
parent 35f74c3608 91d6c9111e
commit a71b7697c9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 14 deletions
pkgs/development
libraries/physics
fastjet
default.nix
herwig
default.nix
thepeg
default.nix
python-modules/simanneal
default.nix

10
pkgs/development/libraries/physics/fastjet/default.nix
View File

@ -2,21 +2,15 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "fastjet-${version}"; name = "fastjet-${version}";
version = "3.3.1"; version = "3.3.2";
src = fetchurl { src = fetchurl {
url = "http://fastjet.fr/repo/fastjet-${version}.tar.gz"; url = "http://fastjet.fr/repo/fastjet-${version}.tar.gz";
sha256 = "0lvchyh9q2p8lb10isazw0wbwzs24yg7gxyhpj9xpvz5hydyvgvn"; sha256 = "1hk3k7dyik640dzg21filpywc2dl862nl2hbpg384hf5pw9syn9z";
}; };
buildInputs = [ python2 ]; buildInputs = [ python2 ];
postPatch = ''
substituteInPlace plugins/SISCone/SISConeBasePlugin.cc \
--replace 'structure_of<UserScaleBase::StructureType>()' \
'structure_of<UserScaleBase>()'
'';
configureFlags = [ configureFlags = [
"--enable-allcxxplugins" "--enable-allcxxplugins"
"--enable-pyext" "--enable-pyext"

5
pkgs/development/libraries/physics/herwig/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "herwig-${version}"; name = "herwig-${version}";
version = "7.1.3"; version = "7.1.4";
src = fetchurl { src = fetchurl {
url = "https://www.hepforge.org/archive/herwig/Herwig-${version}.tar.bz2"; url = "https://www.hepforge.org/archive/herwig/Herwig-${version}.tar.bz2";
sha256 = "1iq1h5ap86729c4pfkswzfh0l2v20fyvqsb15c35g0407l54wfqm"; sha256 = "1awr1jz0q873x8bgwiilzklhk1zkgm6slvpychpnvsf9vk05mmdx";
}; };
nativeBuildInputs = [ autoconf automake libtool ]; nativeBuildInputs = [ autoconf automake libtool ];
@ -31,5 +31,6 @@ stdenv.mkDerivation rec {
homepage = https://herwig.hepforge.org/; homepage = https://herwig.hepforge.org/;
platforms = stdenv.lib.platforms.unix; platforms = stdenv.lib.platforms.unix;
maintainers = with stdenv.lib.maintainers; [ veprbl ]; maintainers = with stdenv.lib.maintainers; [ veprbl ];
broken = stdenv.isAarch64; # doesn't compile: ignoring return value of 'FILE* freopen...
}; };
} }

4
pkgs/development/libraries/physics/thepeg/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "thepeg-${version}"; name = "thepeg-${version}";
version = "2.1.3"; version = "2.1.4";
src = fetchurl { src = fetchurl {
url = "https://www.hepforge.org/archive/thepeg/ThePEG-${version}.tar.bz2"; url = "https://www.hepforge.org/archive/thepeg/ThePEG-${version}.tar.bz2";
sha256 = "030wpk78mwb56iph5iqmblsxgzpydsa25bbkv07bihihfm8gds0n"; sha256 = "1x9dfxmsbmzmsxrv3cczfyrnqkxjcpy89v6v7ycysrx9k8qkf320";
}; };
buildInputs = [ boost fastjet gsl hepmc lhapdf rivet zlib ]; buildInputs = [ boost fastjet gsl hepmc lhapdf rivet zlib ];

4
pkgs/development/python-modules/simanneal/default.nix
View File

@ -2,13 +2,13 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "simanneal"; pname = "simanneal";
version = "0.4.1"; version = "0.4.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "perrygeo"; owner = "perrygeo";
repo = "simanneal"; repo = "simanneal";
rev = version; rev = version;
sha256 = "12499wvf7ii7cy8z2f1d472p7q9napg1lj0h9xx8l1mbr1hjlp3q"; sha256 = "0p75da4nbk6iy16aahl0ilqg605jrr6aa1pzfyd9hc7ak2vs6840";
}; };
checkInputs = [ pytest ]; checkInputs = [ pytest ];