From fb19fb6b704ae5c3a5300d3e6443b92075855132 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Wed, 31 Oct 2018 21:46:04 -0400 Subject: [PATCH 1/4] pythonPackages.simanneal: 0.4.1 -> 0.4.1 --- pkgs/development/python-modules/simanneal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/simanneal/default.nix b/pkgs/development/python-modules/simanneal/default.nix index d059d720f8b..ad1f2643e5f 100644 --- a/pkgs/development/python-modules/simanneal/default.nix +++ b/pkgs/development/python-modules/simanneal/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "simanneal"; - version = "0.4.1"; + version = "0.4.2"; src = fetchFromGitHub { owner = "perrygeo"; repo = "simanneal"; rev = version; - sha256 = "12499wvf7ii7cy8z2f1d472p7q9napg1lj0h9xx8l1mbr1hjlp3q"; + sha256 = "0p75da4nbk6iy16aahl0ilqg605jrr6aa1pzfyd9hc7ak2vs6840"; }; checkInputs = [ pytest ]; From b903be77c032e2f22868c84fc7eee89da8370aa7 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Wed, 31 Oct 2018 21:54:43 -0400 Subject: [PATCH 2/4] fastjet: 3.3.1 -> 3.3.2 --- pkgs/development/libraries/physics/fastjet/default.nix | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/physics/fastjet/default.nix b/pkgs/development/libraries/physics/fastjet/default.nix index 7a65da25890..3828cfda2af 100644 --- a/pkgs/development/libraries/physics/fastjet/default.nix +++ b/pkgs/development/libraries/physics/fastjet/default.nix @@ -2,21 +2,15 @@ stdenv.mkDerivation rec { name = "fastjet-${version}"; - version = "3.3.1"; + version = "3.3.2"; src = fetchurl { url = "http://fastjet.fr/repo/fastjet-${version}.tar.gz"; - sha256 = "0lvchyh9q2p8lb10isazw0wbwzs24yg7gxyhpj9xpvz5hydyvgvn"; + sha256 = "1hk3k7dyik640dzg21filpywc2dl862nl2hbpg384hf5pw9syn9z"; }; buildInputs = [ python2 ]; - postPatch = '' - substituteInPlace plugins/SISCone/SISConeBasePlugin.cc \ - --replace 'structure_of()' \ - 'structure_of()' - ''; - configureFlags = [ "--enable-allcxxplugins" "--enable-pyext" From 19803a3b69fc450ee72f3104e9676fefe0706c2a Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Wed, 31 Oct 2018 22:13:52 -0400 Subject: [PATCH 3/4] herwig: 7.1.4 thepeg: 2.1.4 --- pkgs/development/libraries/physics/herwig/default.nix | 4 ++-- pkgs/development/libraries/physics/thepeg/default.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/physics/herwig/default.nix b/pkgs/development/libraries/physics/herwig/default.nix index a8655c2dcbe..88a565f3b1b 100644 --- a/pkgs/development/libraries/physics/herwig/default.nix +++ b/pkgs/development/libraries/physics/herwig/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "herwig-${version}"; - version = "7.1.3"; + version = "7.1.4"; src = fetchurl { url = "https://www.hepforge.org/archive/herwig/Herwig-${version}.tar.bz2"; - sha256 = "1iq1h5ap86729c4pfkswzfh0l2v20fyvqsb15c35g0407l54wfqm"; + sha256 = "1awr1jz0q873x8bgwiilzklhk1zkgm6slvpychpnvsf9vk05mmdx"; }; nativeBuildInputs = [ autoconf automake libtool ]; diff --git a/pkgs/development/libraries/physics/thepeg/default.nix b/pkgs/development/libraries/physics/thepeg/default.nix index feffa5c11d5..63bc3c06e10 100644 --- a/pkgs/development/libraries/physics/thepeg/default.nix +++ b/pkgs/development/libraries/physics/thepeg/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "thepeg-${version}"; - version = "2.1.3"; + version = "2.1.4"; src = fetchurl { url = "https://www.hepforge.org/archive/thepeg/ThePEG-${version}.tar.bz2"; - sha256 = "030wpk78mwb56iph5iqmblsxgzpydsa25bbkv07bihihfm8gds0n"; + sha256 = "1x9dfxmsbmzmsxrv3cczfyrnqkxjcpy89v6v7ycysrx9k8qkf320"; }; buildInputs = [ boost fastjet gsl hepmc lhapdf rivet zlib ]; From 91d6c9111e2eaa86b992caee7fa03e8e08951fb6 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Wed, 21 Nov 2018 19:39:23 -0500 Subject: [PATCH 4/4] herwig: broken on aarch64 --- pkgs/development/libraries/physics/herwig/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/physics/herwig/default.nix b/pkgs/development/libraries/physics/herwig/default.nix index 88a565f3b1b..722dccaea7b 100644 --- a/pkgs/development/libraries/physics/herwig/default.nix +++ b/pkgs/development/libraries/physics/herwig/default.nix @@ -31,5 +31,6 @@ stdenv.mkDerivation rec { homepage = https://herwig.hepforge.org/; platforms = stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [ veprbl ]; + broken = stdenv.isAarch64; # doesn't compile: ignoring return value of 'FILE* freopen... }; }