Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

Merge pull request #49573 from veprbl/pr/bump

bump: pythonPackages.simanneal, fastjet, herwig

authored by

Jörg Thalheim and committed by
GitHub
a71b7697 35f74c36

+9 -14
+2 -8
pkgs/development/libraries/physics/fastjet/default.nix
··· 2 2 3 3 stdenv.mkDerivation rec { 4 4 name = "fastjet-${version}"; 5 - version = "3.3.1"; 5 + version = "3.3.2"; 6 6 7 7 src = fetchurl { 8 8 url = "http://fastjet.fr/repo/fastjet-${version}.tar.gz"; 9 - sha256 = "0lvchyh9q2p8lb10isazw0wbwzs24yg7gxyhpj9xpvz5hydyvgvn"; 9 + sha256 = "1hk3k7dyik640dzg21filpywc2dl862nl2hbpg384hf5pw9syn9z"; 10 10 }; 11 11 12 12 buildInputs = [ python2 ]; 13 - 14 - postPatch = '' 15 - substituteInPlace plugins/SISCone/SISConeBasePlugin.cc \ 16 - --replace 'structure_of<UserScaleBase::StructureType>()' \ 17 - 'structure_of<UserScaleBase>()' 18 - ''; 19 13 20 14 configureFlags = [ 21 15 "--enable-allcxxplugins"
+3 -2
pkgs/development/libraries/physics/herwig/default.nix
··· 2 2 3 3 stdenv.mkDerivation rec { 4 4 name = "herwig-${version}"; 5 - version = "7.1.3"; 5 + version = "7.1.4"; 6 6 7 7 src = fetchurl { 8 8 url = "https://www.hepforge.org/archive/herwig/Herwig-${version}.tar.bz2"; 9 - sha256 = "1iq1h5ap86729c4pfkswzfh0l2v20fyvqsb15c35g0407l54wfqm"; 9 + sha256 = "1awr1jz0q873x8bgwiilzklhk1zkgm6slvpychpnvsf9vk05mmdx"; 10 10 }; 11 11 12 12 nativeBuildInputs = [ autoconf automake libtool ]; ··· 31 31 homepage = https://herwig.hepforge.org/; 32 32 platforms = stdenv.lib.platforms.unix; 33 33 maintainers = with stdenv.lib.maintainers; [ veprbl ]; 34 + broken = stdenv.isAarch64; # doesn't compile: ignoring return value of 'FILE* freopen... 34 35 }; 35 36 }
+2 -2
pkgs/development/libraries/physics/thepeg/default.nix
··· 2 2 3 3 stdenv.mkDerivation rec { 4 4 name = "thepeg-${version}"; 5 - version = "2.1.3"; 5 + version = "2.1.4"; 6 6 7 7 src = fetchurl { 8 8 url = "https://www.hepforge.org/archive/thepeg/ThePEG-${version}.tar.bz2"; 9 - sha256 = "030wpk78mwb56iph5iqmblsxgzpydsa25bbkv07bihihfm8gds0n"; 9 + sha256 = "1x9dfxmsbmzmsxrv3cczfyrnqkxjcpy89v6v7ycysrx9k8qkf320"; 10 10 }; 11 11 12 12 buildInputs = [ boost fastjet gsl hepmc lhapdf rivet zlib ];
+2 -2
pkgs/development/python-modules/simanneal/default.nix
··· 2 2 3 3 buildPythonPackage rec { 4 4 pname = "simanneal"; 5 - version = "0.4.1"; 5 + version = "0.4.2"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "perrygeo"; 9 9 repo = "simanneal"; 10 10 rev = version; 11 - sha256 = "12499wvf7ii7cy8z2f1d472p7q9napg1lj0h9xx8l1mbr1hjlp3q"; 11 + sha256 = "0p75da4nbk6iy16aahl0ilqg605jrr6aa1pzfyd9hc7ak2vs6840"; 12 12 }; 13 13 14 14 checkInputs = [ pytest ];