diff options
10 files changed, 166 insertions, 82 deletions
diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix index 8916a9fd167..c13169041aa 100644 --- a/pkgs/applications/science/misc/root/default.nix +++ b/pkgs/applications/science/misc/root/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "root-${version}"; - version = "6.10.00"; + version = "6.10.02"; src = fetchurl { url = "https://root.cern.ch/download/root_v${version}.source.tar.gz"; - sha256 = "1rxqcpqf1b3sxig5xbh3mkvarhg9lgj2f0gv0j48klfw8kgfwlsp"; + sha256 = "1ryp9397xpbnxha6s222c10pa50lf2qf5s35n31lc29s90p8s9kc"; }; buildInputs = [ cmake pcre pkgconfig python2 zlib libxml2 lzma gsl ] diff --git a/pkgs/development/libraries/physics/fastnlo/default.nix b/pkgs/development/libraries/physics/fastnlo/default.nix index e07583fccb5..e568e159797 100644 --- a/pkgs/development/libraries/physics/fastnlo/default.nix +++ b/pkgs/development/libraries/physics/fastnlo/default.nix @@ -1,17 +1,21 @@ -{ stdenv, fetchurl, boost, lhapdf, root, yoda }: +{ stdenv, fetchurl, boost, fastjet, gfortran, lhapdf, python2, root, yoda, zlib }: stdenv.mkDerivation rec { name = "fastnlo_toolkit-${version}"; - version = "2.3.1pre-2212"; + version = "2.3.1pre-2402"; src = fetchurl { url = "http://fastnlo.hepforge.org/code/v23/${name}.tar.gz"; - sha256 = "0xgnnwc002awvz6dhn7792jc8kdff843yjgvwmgcs60yvcj6blgp"; + sha256 = "1h41xnqcz401x3zbs8i2dsb4xlhbv8i5ps0561p6y7gcyridgcbl"; }; - buildInputs = [ boost lhapdf root yoda ]; + buildInputs = [ boost fastjet gfortran gfortran.cc.lib lhapdf python2 root yoda ]; + propagatedBuildInputs = [ zlib ]; - CXXFLAGS="-std=c++11"; # for yoda + preConfigure = '' + substituteInPlace ./fastnlotoolkit/Makefile.in \ + --replace "-fext-numeric-literals" "" + ''; configureFlags = [ "--with-yoda=${yoda}" diff --git a/pkgs/development/libraries/physics/herwig/default.nix b/pkgs/development/libraries/physics/herwig/default.nix index 737565d298e..407be5c5e4a 100644 --- a/pkgs/development/libraries/physics/herwig/default.nix +++ b/pkgs/development/libraries/physics/herwig/default.nix @@ -2,31 +2,21 @@ stdenv.mkDerivation rec { name = "herwig-${version}"; - version = "7.0.4"; + version = "7.1.1"; src = fetchurl { url = "http://www.hepforge.org/archive/herwig/Herwig-${version}.tar.bz2"; - sha256 = "1vac5y5cyyn1z1ii1a6x1ysx2znxmfq9a51gxqib0i19mrn5y9p6"; + sha256 = "13xaykwr7x6mp2bi22wz6dyzx3dxhcv6aw9cg8p29bh9l890g63j"; }; - patches = [ - # Otherwise it causes an error - # lib/Herwig/HwMatchboxScales.so: undefined symbol: _Z8renScaleSt6vectorIN6ThePEG14Lorentz5VectorIdEESaIS2_EES4_S4_ - (fetchpatch { - url = "https://herwig.hepforge.org/hg/herwig/rev/fe543583fa02?style=raw"; - sha256 = "1y6a9q93wicw3c73xni74w5k25vidgcr60ffi2b2ymhb390jas83"; - }) - ]; - nativeBuildInputs = [ autoconf automake libtool ]; buildInputs = [ boost fastjet gfortran gsl thepeg zlib ] # There is a bug that requires for MMHT PDF's to be presend during the build ++ (with lhapdf.pdf_sets; [ MMHT2014lo68cl MMHT2014nlo68cl ]); - preConfigure = '' - # needed for the patch above - autoreconf -i + postPatch = '' + patchShebangs ./cat_with_cpplines ''; configureFlags = [ diff --git a/pkgs/development/libraries/physics/lhapdf/default.nix b/pkgs/development/libraries/physics/lhapdf/default.nix index 90a6d17f09a..1a203172d2c 100644 --- a/pkgs/development/libraries/physics/lhapdf/default.nix +++ b/pkgs/development/libraries/physics/lhapdf/default.nix @@ -1,19 +1,15 @@ -{ stdenv, fetchurl, boost, python2 }: +{ stdenv, fetchurl, python2 }: stdenv.mkDerivation rec { name = "lhapdf-${version}"; - version = "6.1.6"; + version = "6.2.0"; src = fetchurl { url = "http://www.hepforge.org/archive/lhapdf/LHAPDF-${version}.tar.gz"; - sha256 = "1sgbaxv8clcfy4d96fkwfyqcd4b29i0hwv32ry4vy69j5qiki0f2"; + sha256 = "0gfjps7v93n0rrdndkhp22d93y892bf76pnzdhqbish0cigkkxph"; }; - buildInputs = [ boost python2 ]; - - patches = [ ./distutils-c++.patch ]; - - configureFlags = "--with-boost=${boost.dev}"; + buildInputs = [ python2 ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/physics/lhapdf/distutils-c++.patch b/pkgs/development/libraries/physics/lhapdf/distutils-c++.patch deleted file mode 100644 index 822c3e38272..00000000000 --- a/pkgs/development/libraries/physics/lhapdf/distutils-c++.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- a/wrappers/python/Makefile.am -+++ b/wrappers/python/Makefile.am -@@ -25,7 +25,7 @@ fix-out-of-source: $(FIXSOURCES) - - if WITH_PYTHON - --PYEXT_ENV = CC=$(CC) CXX=$(CXX) -+PYEXT_ENV = CC=$(CXX) CXX=$(CXX) - - ## Always force setup.py, it's not good at guessing what needs to rebuild - all-local: fix-out-of-source -diff --git a/wrappers/python/Makefile.in b/wrappers/python/Makefile.in -index 925460c..fdc8888 100644 ---- a/wrappers/python/Makefile.in -+++ b/wrappers/python/Makefile.in -@@ -266,7 +266,7 @@ top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ - EXTRA_DIST = lhapdf.cpp lhapdf.pyx clhapdf.pxd - FIXSOURCES = $(EXTRA_DIST) --@WITH_PYTHON_TRUE@PYEXT_ENV = CC=$(CC) CXX=$(CXX) -+@WITH_PYTHON_TRUE@PYEXT_ENV = CC=$(CXX) CXX=$(CXX) - all: all-am - - .SUFFIXES: diff --git a/pkgs/development/libraries/physics/lhapdf/maintainer.sh b/pkgs/development/libraries/physics/lhapdf/maintainer.sh index b0ced3b24e0..a8518d340b7 100755 --- a/pkgs/development/libraries/physics/lhapdf/maintainer.sh +++ b/pkgs/development/libraries/physics/lhapdf/maintainer.sh @@ -2,7 +2,7 @@ set -e -BASE_URL="https://www.hepforge.org/archive/lhapdf/pdfsets/6.1/" +BASE_URL="https://www.hepforge.org/archive/lhapdf/pdfsets/6.2/" for pdf_set in `curl $BASE_URL 2>/dev/null | gsed -e "s/.*<a href=\"\([^\"]*.tar.gz\)\".*/\1/;tx;d;:x"`; do echo -n " \"${pdf_set%.tar.gz}\" = \"" diff --git a/pkgs/development/libraries/physics/lhapdf/pdf_sets.nix b/pkgs/development/libraries/physics/lhapdf/pdf_sets.nix index c2a0babb4d5..b0f831f11da 100644 --- a/pkgs/development/libraries/physics/lhapdf/pdf_sets.nix +++ b/pkgs/development/libraries/physics/lhapdf/pdf_sets.nix @@ -6,7 +6,7 @@ let inherit name; src = fetchurl { - url = "https://www.hepforge.org/archive/lhapdf/pdfsets/6.1/${name}.tar.gz"; + url = "https://www.hepforge.org/archive/lhapdf/pdfsets/6.2/${name}.tar.gz"; inherit sha256; }; @@ -21,8 +21,26 @@ let }; in stdenv.lib.mapAttrs mkPdfSet { - "ATLAS-epWZ12-EIG" = "01nj0zn19sk2ir4fk1202jsz457yrpqrsm99gn60a6rbamjybk73"; - "ATLAS-epWZ12-VAR" = "13kra15c5ahjldprdvp343c7gd875g8hca7r1bx9ccz6nffxram6"; + "ABMP15_3_nnlo" = "028q5xixxjxhb8sr7l5v5mwh9mkszm5m59fgnpb69yxvv40a70v0"; + "ABMP15_4_nnlo" = "11zjp4dxmgp69kdkmdwqkpsajvwjrbwylmwgs56mgjb0vgb8wk0i"; + "ABMP15_5_nnlo" = "0z47g5fwh53gg5ws5bbip5q2m5mm7vl09q2w58g6ah9dk25r10ll"; + "ABMP16_3_nnlo" = "0bwirm3wqyjj6i3asya7kjmmjhqi69l1rnc6gnq7v136ajmv96y0"; + "ABMP16_4_nnlo" = "1cw52ijyrhgvyqc28pp278bavy9acvs6qywysgc7qjifygb14mca"; + "ABMP16_5_nnlo" = "0iyypvj4645g7nh8w6v88pz37p81bxilgc4p7wlkaa90hiq0wrk0"; + "ABMP16als112_5_nnlo" = "17kg6gvl09p5gm99yb9d8hkl1q51904qflsziv3r5ybxs18ym5g8"; + "ABMP16als113_5_nnlo" = "1gaiyq70zxx7c7c0gkkad3ygbhdwc563al2a6ksy78q8is3bhdy9"; + "ABMP16als114_5_nnlo" = "1gd41d8ay8i8m35qfqsm96jcv8vx6hpdsrdzsj415f4zpw5j29fm"; + "ABMP16als115_5_nnlo" = "0i70z8i0qgzr875szdh8sa6x3xcdkvrfsba97a6ha7b6km4p1yjk"; + "ABMP16als116_5_nnlo" = "11rph6vmmvvsi8msfp2agb7747n7xjgxb7z766i5jkvnggbmz75m"; + "ABMP16als117_5_nnlo" = "1sz9hy2m983aiwyssg60v4kq1zvz4xxvbzrgsdik1qv13bj4wx9w"; + "ABMP16als118_5_nnlo" = "1slvr5ygwwryk63mah45xp5x31qwrf0gkrnh4p9fvl4rdkji6z0z"; + "ABMP16als119_5_nnlo" = "1iqs1bi8r22awflf698cj39q8s2w86fwvdfgqb6sr8csm36ih6qp"; + "ABMP16als120_5_nnlo" = "051bqfyh2017vnvlisvkm1ik6x7n829p8205f5algsw7wi1s7b9v"; + "ATLAS-epWZ12-EIG" = "010ddmyfrmscgd1xdjsxsjc773jlvbh3s6mjbwk9zd298i3bf4kx"; + "ATLAS-epWZ12-VAR" = "1r9ip8549dzhs02skm8v00g6nsh7q1rwd3syz3bd6cl4sqhs0k37"; + "ATLAS-epWZ16-EIG" = "0b1zzp8p0kh4xjn76nm6waqlvdpqvnwyqsnnqdp2n7b9r9ssryyf"; + "ATLAS-epWZ16-THEO" = "0b0wqa203b2x159y54xhf9yh34lkchp48vp9693k51g9aznx8gjm"; + "ATLAS-epWZ16-VAR" = "1zkhlv8yxfla46gj57119w9prsd3zyy5vg275bayfwa6b71gmc0b"; "CJ12max" = "1vk2zkaiqbl6fixaxy7mrggmmxv7lvnw736lxm5sh25dapg6s8ag"; "CJ12mid" = "0s2558ihypn0l9qqx25qwnawbc7fkbi2wwwhbyb108rjk2klaf8v"; "CJ12min" = "1kdla638m3axr65ndid9irmqhby4gl084r297xw3jxxlrb0b7hj9"; @@ -99,6 +117,10 @@ in "CT10wnlo_as_0127" = "1svmgs55kg74rifjyns38lggv1c18mzmpmvsv116rrllklb19pfp"; "CT10wnlo_nf3" = "1m13if0d9xijq695x41snpwwrsgs5a0jvil6j2ww8cspc33d7vr3"; "CT10wnlo_nf4" = "1b9lz23rn2w7fqwxxgf6fcg620ac58dnb1ssj3ml3vfn7z88yx43"; + "CT14MC1nlo" = "0z82q7xr9agq8iyw7w2rcclh27mry5snn5jswn3cxpgnalls50rx"; + "CT14MC1nnlo" = "0fj6hjdv82fp4iv7iyk9gna7sksnpkgqx0bsrl2wjbigm4ys031g"; + "CT14MC2nlo" = "1x6a6js1jpvkykagz6w3klh6hb2wf56r3kh65i6qlnzak4m7b8sq"; + "CT14MC2nnlo" = "0hbdz8agjm16mm51hclpl2nsa5ji88zpqdsn682xgihq64kahsnb"; "CT14llo" = "0sz2ni8xcjjg8034qjrhb77ak1akzlf5fwq00qs9c196lk5b2x7s"; "CT14llo_NF3" = "07zzs3jprh0haqx5bcsii213m99m2nh9vki76d9cbhicyzx23pc1"; "CT14llo_NF4" = "0bxkw5qms6dpab0zf1hhd8dllrjip2izbv23aqpg72d5rqxb6ny4"; @@ -146,6 +168,20 @@ in "CT14qed_inc_proton" = "0gv0rlr6l62gidqp02ifn75d1ribvbihgpaqc92fww73zwilr7l0"; "CT14qed_neutron" = "0ck1vmqk17i7rq42hra79cz2rm8ngxv4da6dvz62l6m2nrga3l2k"; "CT14qed_proton" = "1gijxkq5gpsljijblzd13kgr7xjjvnjv18v02jivylf73igsakd7"; + "EPPS16nlo_CT14nlo_Ag108" = "1p7gckhv44h04rvknd6fdizy9c1jqfwic7ppf0ra14ic8wp1g7wg"; + "EPPS16nlo_CT14nlo_Al27" = "0hxyakfgknmixxndfj14i44afp5gcfz9afjvjdaj702sv42a7qa8"; + "EPPS16nlo_CT14nlo_Au197" = "1g272110y3a1fr6raxdfhagn68i0lcnwbdhiiqg4j6wb6v4m3p6i"; + "EPPS16nlo_CT14nlo_Be9" = "0zxsdmvz919ajwwb917613byshhpr876jcg9kik0pkz8c4ddr2z0"; + "EPPS16nlo_CT14nlo_C12" = "0mjmjk9n36aikhm8i6zwzfszyb5zcy1syn13vs2rm12x535j6dm5"; + "EPPS16nlo_CT14nlo_Ca40" = "18vd67splj75sjijfvhyq0q6068yr8l083sczamwpmy8z3l798ih"; + "EPPS16nlo_CT14nlo_Cu64" = "0g64gpc5cssmwl1sn7cl0ramsg2zfq7snr9bzr41q2dznbvqahgd"; + "EPPS16nlo_CT14nlo_Fe56" = "0dxfzpx99ha9g27bxx6xzxxh87va91qqwq6hnz1qsligjfx7q4yz"; + "EPPS16nlo_CT14nlo_He4" = "1ln5kz3270kyx6m3ji6q5xyp5a23f3kbwh9z9dmdwwsw7q9n8way"; + "EPPS16nlo_CT14nlo_Li6" = "04rviiml0rnym9qppsczcydw37r923ljx8hj63vv6dxng0g617qb"; + "EPPS16nlo_CT14nlo_Pb208" = "1b2zibpigdvvkg29zh7zm32jpdr2prm35jasafh17pfpwlfc55mb"; + "EPPS16nlo_CT14nlo_Pt195" = "14v1gicvm8i8z9d98rlv5rbhaglkbi9fhs3z465p4d764al6znnc"; + "EPPS16nlo_CT14nlo_Sn119" = "10nxn6rdp7svsrkdcdwxryjmirn1s871yj1w493adpfcy3chqw9k"; + "EPPS16nlo_CT14nlo_W184" = "1x8ndmkzmnl79vz1bgi9972190x03asvgnls6qiz746xl37q4ky7"; "GRVPI0" = "0i5icsw9hf4jm25d0szxqc3r1131n417lv8b4gslg93xqj4ry1hf"; "GRVPI1" = "05j3mcrb0sq4nzv7y0k68f2m3v8vnd13mzbhq43gjq712cbj126p"; "HERAPDF15LO_EIG" = "12cqj3vqwi86sfgxkiwbd7rnpw1awnbqbc852b0x32d9j18nz9c2"; @@ -213,7 +249,7 @@ in "HERAPDF20_NNLO_ALPHAS_115" = "0nlimqmfhx2ijx48ylciih5diwlsb5zzkli82rgnnxci3r4ycjq4"; "HERAPDF20_NNLO_ALPHAS_116" = "0nr8svx60zrf42nxg74v0h759y9lwg54892xpdmswg7mw0nwcrm9"; "HERAPDF20_NNLO_ALPHAS_117" = "0xiqdr2r5dyyp5q56b3w04wy3raqrh1mjsv1fm05xswxn2xwyhlq"; - "HERAPDF20_NNLO_ALPHAS_118" = ""; + "HERAPDF20_NNLO_ALPHAS_118" = "0d0w0f077g11s4clx1556y9xx5nn1dgm8zcp0bk92v4lapngf33c"; "HERAPDF20_NNLO_ALPHAS_119" = "1w9nl0pnfc1cii4knmqdq4cnh6shhhgj8pg4a42bx20lvqc3aqgb"; "HERAPDF20_NNLO_ALPHAS_120" = "1lksn0rcxq2scwpnps8dawlzijhvwbg0pn2is4r29igbqck2jvb3"; "HERAPDF20_NNLO_ALPHAS_121" = "03d58rbibvgcvmsw86q3030qnw5nnvq8p6diqscd9srb8br06p8m"; @@ -234,7 +270,7 @@ in "JR14NNLO08VF" = "0kzszj1r141fcg9vbf53480224nxcc5wfk9zmpmzbmrxzi0w127r"; "JR14NNLO20FF" = "0wc3qib90dpd1wgiymrn5lzwhqmh58ji2s92vpj2v9v4spws7pdq"; "JR14NNLO20VF" = "18l4ipn80gmh9kdw7a1k49fwgbl7b1frgc0hsa04vbwnv6hm73hn"; - "LUXqed_plus_PDF4LHC15_nnlo_100" = "009wb1ibh4yfbqh5fsznc2g9g50rl6g0pq0x9qf7iiq2vd40rzsz"; + "LUXqed_plus_PDF4LHC15_nnlo_100" = "08jzl4wcsrr9agycq1r5kd5bqxsx4b637nxk34s82vs7vwpq7qib"; "METAv10LHC" = "1vn4wnx1blz6wylbzirswdqqf0knmyh1pcfh62wvj695mh7i0w16"; "METAv10LHCH" = "1p4wy7m1ksz0r1fylwz3cbq7jl8s58v817n3d898l83ic2ghp4vj"; "METAv10LHCHfull" = "1w623939fjdyx1316rxyaavf6kmxff19himr00br57jrw3v49nfg"; @@ -341,6 +377,33 @@ in "MSTW2008nnlo_mcrange_fixasmz" = "05c8z2q2866550clx2mwb1jvhpn0agkyg82vvrswi3h4hgkvlfjx"; "MSTW2008nnlo_mcrange_fixasmz_nf3" = "0r86xsl1wfphwdj2hhlilkwc2949m7bcn42dms14g7w45i24g6id"; "MSTW2008nnlo_mcrange_nf3" = "1c9lsggncwghvw9mgd18h50ljrnlpp1p5r2zlzf8z3g8i4f3aaih"; + "NNFF10_KAm_lo" = "19wn44svz61lhk33kzc6id18w6qbkw4bfnwncar19phrjjp965v6"; + "NNFF10_KAm_nlo" = "191db9pj5yspiqc7598r147j9wvfc4s6cm0q805m5vmzpfg2cgr6"; + "NNFF10_KAm_nnlo" = "1hm8vhk1p31zdn72bgcyyq0w5qii1ba0cf81wjlbhwv4fadfd4sy"; + "NNFF10_KAp_lo" = "13yas11c7xxij45zrd3r6njjvx33kn9lg8i28ki0y4nw6ss21w3b"; + "NNFF10_KAp_nlo" = "1jza83klbcb3j2pcg2xhgj2imh4llb6hsfkbfj294q0isqypgzsv"; + "NNFF10_KAp_nnlo" = "0xwl34a31ajxwlgx6bhzzyf9b2xiq7bpv51p4zi6k1xihs91vwzc"; + "NNFF10_KAsum_lo" = "128cj81qp09hn99dnkm9q06wf2dr7xjq9qmwvrmdizrd8cwfa4l1"; + "NNFF10_KAsum_nlo" = "19pglfl1i5qg8sj3hg0qnhr1f66isfbrv7f901hnxniibbdjxib2"; + "NNFF10_KAsum_nnlo" = "1769ybc49a94appmiw0bbn3kkvcpw82sggxgvvda5jq9m36m9yzb"; + "NNFF10_PIm_lo" = "095xl0cs6p5z44hydfa963ylxvzqxdwwj1n8jn7n0c48rwssx357"; + "NNFF10_PIm_nlo" = "1fn8863092fn4aqacprbsdxlgz27q6pam08pccwq9ps0dwjn7cc5"; + "NNFF10_PIm_nnlo" = "0j4p50k821pphy8i6s73h3c29d7jb3bp5s4l8rl3bfb0nfx4p6hq"; + "NNFF10_PIp_lo" = "0hhw2ympx1a8d3sl953k27yzww0j2f5m9b865gv1ybb3l9ccv1i6"; + "NNFF10_PIp_nlo" = "18k3s7i1xvh8717n5cdllbb6zs8svh2bkw0k2zf4ql5ijiypvc10"; + "NNFF10_PIp_nnlo" = "16mywhpc3439dpk2c1i6gxrv9khyyg0kl4gsc41qyi3r4d7k6n2c"; + "NNFF10_PIsum_lo" = "1yh3hxfmgzgpwqidmzlc189syjbsj4vyswc4kch7yykxw4dqf6sa"; + "NNFF10_PIsum_nlo" = "12rgg0nc9rjvwfpf0y9kl1w9814a4pv4b17p46h8qm6kfyqqwjia"; + "NNFF10_PIsum_nnlo" = "19iz4q31apgm2il9478c7zmmc6kgz2wyp84qja761jvyl6z0img5"; + "NNFF10_PRm_lo" = "0c5pavhf5flx2nmld2dprgp1lsbvsrjw5mqdzvgkks7ibvq0ap5j"; + "NNFF10_PRm_nlo" = "0nfwhp9hacnm95w2qa5hvmfwaj7drc0w7lxqw1lrdp074bpd0ma3"; + "NNFF10_PRm_nnlo" = "084dz4xxmydf71vkhcrmj03jkwyj56jxvmbzm22mdh2dxmkz3l1g"; + "NNFF10_PRp_lo" = "014m0vjzrr4rbi84qxzmrym07kc4wax29fs66mfxkmrimxpb9l21"; + "NNFF10_PRp_nlo" = "0lrzw2618kgk7vsksbr1qxqc4h9lza573bz6208hwdgkmh7awasc"; + "NNFF10_PRp_nnlo" = "0bv07hh5rxvqw58jcam3piiiy19w325nrwivrifyv5wii8sybz8r"; + "NNFF10_PRsum_lo" = "1a9m77rl49wzzgdkr6x618bzcm2p50f915bbggknx5xjw550dqd1"; + "NNFF10_PRsum_nlo" = "1qambqywda7lvvkd6kx2r1g60v6lnqcamdd51396id33fvw3k45h"; + "NNFF10_PRsum_nnlo" = "1kijaxw6v1w33q6l89raz7ic59zcmd3nx5djp83lyg134a15crmw"; "NNPDF21_lo_as_0119_100" = "19qw2hp1yk82qgcrpx8wp2fg8wklaj6rr653m6mndhhr0aa0w80v"; "NNPDF21_lo_as_0130_100" = "0p5cw77dg5pkhl3d0y6r3k8vhw4m467wf3gd8kp2l5vcbdwb4izv"; "NNPDF21_lostar_as_0119_100" = "0i23axf0xl11nb2dn6p34bnm1xfisnn3a82db9dz863n60gqb5x4"; @@ -465,7 +528,7 @@ in "NNPDF30_nlo_as_0118_atlas" = "034h2wgakbm3mx70034nwb44ii38rca7xv3az3fhcnjbpg9vnf0p"; "NNPDF30_nlo_as_0118_cms" = "08g9315fpc4khwfjf76vvyqa9nannvwq0bpc42f9f7yc0pck71qa"; "NNPDF30_nlo_as_0118_cons" = "1lw0fhy9gwk3zr7vq7qh9p6zprbyd4faln3npnxs2snncic1mnz6"; - "NNPDF30_nlo_as_0118_hera" = "0ndgfpxl9mrf1fk6w5q9ag3qm9rr4q3jkymfnr4frkmzcdxjnvzn"; + "NNPDF30_nlo_as_0118_hera" = "1833gd9h3gg75hblxf5qh5hp61k7n9vavb91ll9lbqmcbfr34aas"; "NNPDF30_nlo_as_0118_hera_1000" = "0lljb96d3q25yw3fz3cbk2in90q6srpc4alkz95nyrvgp25xgbgy"; "NNPDF30_nlo_as_0118_hessian" = "0h8d2zc02ccr1rmlsf4xd5a41irbs9q9wx68caj2xy0i7qr8rsmp"; "NNPDF30_nlo_as_0118_mc" = "12nnyzh2f6mv4gq4x4b8nlqx34lbj5y2y60zivfdbcpyg2spj5y8"; @@ -510,7 +573,7 @@ in "NNPDF30_nnlo_as_0118_atlas" = "013jm6f2hnmzc2di7spf6zp31fwhm6c9sddwql36hww63w8sys71"; "NNPDF30_nnlo_as_0118_cms" = "1w0ax68rg5877s35zlg13c451fcz2rij4adzwhz4yf4skkbgflng"; "NNPDF30_nnlo_as_0118_cons" = "1qniswwj6cmcs7bm4n11jx2disqcwszl08cb7im824nvrcjka2pg"; - "NNPDF30_nnlo_as_0118_hera" = "07k4wlfd63zmhnxq06avdpfrgfnc2ziqhsgyy3w4lvara9i27il0"; + "NNPDF30_nnlo_as_0118_hera" = "05j5yrra93dxh1nah19hszd0q3pj4zfica8a7vm5akbfn02rccj6"; "NNPDF30_nnlo_as_0118_hera_1000" = "0ssiw9fk5fqwg77rbycrxrclldws35n6gj4a4sj6d9yc87vz1g7z"; "NNPDF30_nnlo_as_0118_hessian" = "1hb32bamwlx5il8g2sf5gy6xjr7r4rky7xgvdhf5ndq7v3n1ncx1"; "NNPDF30_nnlo_as_0118_mc" = "1gxl4c5z2vh382y8l2kpr8vy4fqvbxvrw6xjc6dp229ak89cd6c2"; @@ -536,6 +599,72 @@ in "NNPDF30_nnlo_as_0121_nf_6" = "1kln7zjgl0hwl621wnhhsih0m8f9ir2i8ligfg2s0qp8s3787lrg"; "NNPDF30_nnlo_nf_4_pdfas" = "0s460v9712ahz09fhzhlnsnkl9arsy3l82g1z6xjz4la8fwkr9wq"; "NNPDF30_nnlo_nf_5_pdfas" = "1vjfm9j39m4389b0r51axlbzdbkpk2vbs3vks3yqcr3hr09g9myk"; + "NNPDF31_lo_as_0118" = "0xdxn21k08vrb1pdpafkb7cqrjq7z08ydmbxplgl9dyn4mcqk4jg"; + "NNPDF31_lo_as_0130" = "0xkljqnkrq542vjxapnzx5ba5m6ixyqqkfdcn73m576zlkslx0md"; + "NNPDF31_lo_pch_as_0118" = "1y6nidprll6as4ygpvxld71b9ksn5mjci3dc6cjamijarcdpgpsq"; + "NNPDF31_lo_pch_as_0130" = "0lbb7906lx7fxj346h7apdmhi85biaknh8vzkf8z11mh1dy7hm3w"; + "NNPDF31_nlo_as_0116" = "00qlx5xdl0g99hb0vycpmflbsw73i952w1qpf84hraqd9xs9wq0w"; + "NNPDF31_nlo_as_0118" = "01jsfvd3bl0lca93hwlm5lngarlgkn8nmj048yj3qjj5vs98w7rx"; + "NNPDF31_nlo_as_0118_1000" = "1ms69qgi3mhrwi3jxapykfsiqwq3cfpx38jwmsv4pq2g2hhawvfq"; + "NNPDF31_nlo_as_0118_C1p6" = "0xig1dyf9sr72c2daksy6wicgfj8gxnyjbvxz1w8f1m0ww0mlwkx"; + "NNPDF31_nlo_as_0118_hessian" = "11kc9waf3c28ncb4irwvpnlbp5p6bzs6l9hfkix6v9c4z5d804rq"; + "NNPDF31_nlo_as_0118_mc" = "0xjrv6p4qanvx7l44cggj4jc29pnnf3lrnsa7sijzfardwsp60az"; + "NNPDF31_nlo_as_0118_nf_4" = "0ciasq6r5j424b1qgz6z4s1s9zycj8z9syws9cjc6c65warjcca7"; + "NNPDF31_nlo_as_0118_nf_6" = "0li61z1c83cjxgnsqp5hnd272w5wljj06ad73w1jmxv8jplb1l2m"; + "NNPDF31_nlo_as_0120" = "18b3acwhykwacf4av0a5cn77d0wvwxbjljh96nxmj0pdg8rs2v9s"; + "NNPDF31_nlo_hessian_pdfas" = "0yffdh37sxxfhaylg5rczyggx2313h4wzhig4j37nby35cj13dmr"; + "NNPDF31_nlo_pch_as_0116" = "04wl2n4iil8svxk6k970dc2c0gpbyvw23lvl5w522imahrc0kmph"; + "NNPDF31_nlo_pch_as_0118" = "0hcaaxd01769pvjqp92wqch6hqlnf3wddik13gp3rr9rcg8rf31l"; + "NNPDF31_nlo_pch_as_0118_1000" = "1mnfyvlnwz0ga985nkn7px0b7mzai6jx74j8pyy8mdpjbgkmwpq6"; + "NNPDF31_nlo_pch_as_0118_hessian" = "13z0icvq1ryix0kg7p5c4569v4hiv2mins2b2ai88jf16rj99n4r"; + "NNPDF31_nlo_pch_as_0118_mc" = "1wg1wlzf8qi1h83y9aajglacvhs9zm68p9dvn4w6fmqrj0hppd3g"; + "NNPDF31_nlo_pch_as_0118_nf_3" = "0xvqms66myq84bpszs04apfbc66i4jq2qdkkbp4cy3pq573bpvmr"; + "NNPDF31_nlo_pch_as_0118_nf_4" = "0yylm6zbrm4j9lh05vmwxbkdn6b83zxbpj7s43ygi1bl7jnsxmnh"; + "NNPDF31_nlo_pch_as_0118_nf_6" = "1j3a3blikmz36a8nraaak9ax6rykirx14lghvszs6zjnfxr44h5m"; + "NNPDF31_nlo_pch_as_0120" = "1hmzaar0ri15w37hagpn9jzq4kxs1231cwqn9zz2pr6a9rk99k8m"; + "NNPDF31_nlo_pch_hessian_pdfas" = "19fc6fyp4i761nl3f4vxrcy0rpgnhvaqh4w0sq44j1dfnsn0y4lr"; + "NNPDF31_nlo_pch_pdfas" = "1ql7j0xb49id82ab51ppphyrkag2m39jpsb3whna88bal3jh1710"; + "NNPDF31_nlo_pdfas" = "1xdzrwbfax9q492a63agx7a4jd4jp5r3pwgyyyqagvfxi4f1q17n"; + "NNPDF31_nnlo_as_0108" = "0gjwk058lbhmkmfmxkvxndnda10nih7zc711wp4c5gk70nhp1m6k"; + "NNPDF31_nnlo_as_0110" = "1lmi58ljspxs04zwx6bax6gf9221y1algrz7hjv63glc4j23q9h5"; + "NNPDF31_nnlo_as_0112" = "0qz79ljj9javl940bvpidiy9fqv91d53g1l9i2gbxd72rgr52h1w"; + "NNPDF31_nnlo_as_0114" = "1wjvwdl8mp36x5cqrgny15lnm696k5nxpwax0ry1win3gy7mb2kp"; + "NNPDF31_nnlo_as_0116" = "1zkxzdfgklpxy3bwvjlhpqq2s2g40q2f9wzibf9qb294c69wm886"; + "NNPDF31_nnlo_as_0117" = "1vwqqxwzx1cwy9ndr0aav6xxi4n18px6n0rsvwbrz0v4gsyr6mh1"; + "NNPDF31_nnlo_as_0118" = "0mi9ln96xy3pjifrjmw9mvgwlb81229spa9x1df084rpy8hab80f"; + "NNPDF31_nnlo_as_0118_1000" = "1bcjsxnp205v9ipf0j57pfnzl7kd89ds3w0gnjdsq8q86s0c5k23"; + "NNPDF31_nnlo_as_0118_collider" = "071ddwk53axsg7zdyf287nyqk3g3ayr95irp8kh8fsql3kvaw5hn"; + "NNPDF31_nnlo_as_0118_hessian" = "1g4cp3y54yn38c9kiljrqvq4201pikwd58sa4ngw0vbasp8hn612"; + "NNPDF31_nnlo_as_0118_mc" = "1x8ai1a8gv1if0l66596fwi4qdwla3aci27c23n5i60g83lf6hza"; + "NNPDF31_nnlo_as_0118_mc_138" = "0jbwmiqfcf36p5mbqp7gzvrr8s9k7a7wrkbhr8nymipr9yczd51h"; + "NNPDF31_nnlo_as_0118_mc_164" = "1myybl60kkdxaxlij9r3i3l090m4m4709g1dnp85k90vjryafwkc"; + "NNPDF31_nnlo_as_0118_nf_4" = "05hglnfv1d9gl4m34c2hwzf96pl39mihwly6sffq7dxsjdbr8yhw"; + "NNPDF31_nnlo_as_0118_nf_6" = "1bzfgcyphhpdizd307d91syg0xf0ki5cv0n9kij9a366ixf3m14z"; + "NNPDF31_nnlo_as_0118_noLHC" = "0ibvp81ys8dajhxbv7cjdsybvgs258yh45a99xskm3jknzg90a36"; + "NNPDF31_nnlo_as_0118_noZpt" = "0xszskydvzaw7ipyzslirimfys9vnm3nsyrimb8kzcnwnhviq7p7"; + "NNPDF31_nnlo_as_0118_nojets" = "0kci82bxd8njgb6w9zr7mcy8sswg6ldfvs0jclqm09yjl05nl3p2"; + "NNPDF31_nnlo_as_0118_notop" = "15wl949pdmfp3ikxkzcaqgqqmifs6d81z2smxg4m7hq1hg56y5lf"; + "NNPDF31_nnlo_as_0118_proton" = "1gx94jhavk9fvs0klqnkq152b23mvd2y68jpvfzhg7jvcl10fqal"; + "NNPDF31_nnlo_as_0118_wEMC" = "1z3yv8i7yb2ng1ap3qqy5qxkkq7ds19dzp76qrivrcfqh0ymdq8m"; + "NNPDF31_nnlo_as_0119" = "1c4ymkshqp70713p6n9kjmrqr1pjsb1gjw20pmy47azr0a6pcryy"; + "NNPDF31_nnlo_as_0120" = "12bgvx6kk5bw30ng81b6hcqdqn2vi3zc60xn21z6nv1995ky44mm"; + "NNPDF31_nnlo_as_0122" = "0kmaxwxrk5yrrj00z8fkl4y7n08yrx1159zp6p450vcnwx512p10"; + "NNPDF31_nnlo_as_0124" = "01gxfwsxqvng8d6kbmz6jq05l00d2gw4snjmcsj76lk9xcmkjmwi"; + "NNPDF31_nnlo_hessian_pdfas" = "1dd4yzh5vhr11qh5w1wfb1ppda4sk9f78h781p1ds165qsw2vcqj"; + "NNPDF31_nnlo_pch_as_0116" = "0zaigf1dhcidlqyyffjq193p1xcc94dbkqjfppmpdzwd4q283ydz"; + "NNPDF31_nnlo_pch_as_0118" = "0x2s5v0p7k3a3v01wr8rvp2al0x4l2bx9wwmvfjcm4k2f2m011s5"; + "NNPDF31_nnlo_pch_as_0118_1000" = "1kwc21p2s383973k5jqciqjpmp4xlvj59zsxjs9nvsywzp9k7vaq"; + "NNPDF31_nnlo_pch_as_0118_hessian" = "15wb8yap14mqbawbifgl57dkn8iwvby7pkn0yvrb0rrpgyivgxhr"; + "NNPDF31_nnlo_pch_as_0118_mc" = "0f2ymg5sd78531pxyvprqaw1dg9sbys5di46zjz1qycs8r3kcznm"; + "NNPDF31_nnlo_pch_as_0118_mc_138" = "0mzwhsp3xid0s32cpzq5z6vq7w90v3xr5nfdvhgbpqvl992gxbvb"; + "NNPDF31_nnlo_pch_as_0118_mc_164" = "13a4wsn2pv5w7847asjk30nzm9kcscsxcnjx4ygzdvk9938z7rxb"; + "NNPDF31_nnlo_pch_as_0118_nf_3" = "07v7n9yxbnmnyxngncfiy9v1k2njsy1bqvzchjqpzd9l3w751dpk"; + "NNPDF31_nnlo_pch_as_0118_nf_4" = "0lsa5zjyg0qx23fjx6lyi0bwkq7did4lbxwbi3d5gibnrr917lnq"; + "NNPDF31_nnlo_pch_as_0118_nf_6" = "0drb8ylkfs18sc5k3ynwrydwgcyv55f7la2m6cl412gbrwkbhina"; + "NNPDF31_nnlo_pch_as_0120" = "0ckflm3s97c9vgf5klnscf51dyhqcjsm83a7kqxq4085q1rwwixj"; + "NNPDF31_nnlo_pch_hessian_pdfas" = "010yzzhqay4mkyn5had3sdrfwd9qfm65y6w0riiamdcx561mwjcv"; + "NNPDF31_nnlo_pch_pdfas" = "1yp113p6kzqw8cizxawgnhmkz6xw27mqi76jy417c9lvmy4mq43p"; + "NNPDF31_nnlo_pdfas" = "0ixj0bmwv1hjg2kvmpyd8r2jykh7a5ng1d469wd3amqkc4ww9kcq"; "NNPDFpol10_100" = "0r5qfa8cyanalphgjdsh57s3viqv9i10v51p1pyamj1f90gb9pr8"; "NNPDFpol11_100" = "0nny1lpw37jcillpfxjx82hq7wlzp4yksxialmc2ivr192qqdda8"; "PDF4LHC15_nlo_30" = "05n0i1mr7v7ssvxvdmv9fn621rinl08frz71apjj7wfdm7s7bk72"; @@ -567,10 +696,10 @@ in "abm11_5n_as_nnlo" = "0091vwjkc686d1dnfn2dpa7jb56p8gli2z687fpx5f8yhjzpbh80"; "abm11_5n_nlo" = "1bpf37mg5wgcf1id2am98l5mj162xrnb8k16ppfx3qxlakp0iabl"; "abm11_5n_nnlo" = "1mpk322mqs078pk2nxxk8fa29ka6cxzsf65ffiny38678djmfqd2"; - "abm12lhc_3_nnlo" = "0hwgspbp6dpw5lz211i0vjgg45hag7zr3djfdk16gkr86sra7ba6"; - "abm12lhc_4_nnlo" = "161qdm0axsqhg6lizx0h4kdg714kl2d6mb8y7wrvanr0v0db9zkl"; - "abm12lhc_5_nnlo" = "0vshq0fx5nigzdf0vryr2v4kggc37byalzfjswm70l3nnjhxp6xs"; - "cteq6" = "0wk6fmajvbdh8wmx1wmyd9n53m82vvh2gj4iric4b4ig9ssmbjx9"; + "abm12lhc_3_nnlo" = "09k90vhjq7p0i0aaq2697pq2dc86bkmnv4q8zyqxjp3wnqx1v95f"; + "abm12lhc_4_nnlo" = "1hciv1z9b5fiz7swv21gr0rshijj9yj2n8x4l54v9g0jyd061jaz"; + "abm12lhc_5_nnlo" = "00xxkrhbfkxhg33mkpwwk5nsdp4nmi0zmllx5z5ygxl24rinsq9j"; + "cteq6" = "0lp110wldhliad354v29f0rhdzf5qrs1ibklj0cmzp2rcbp8zrix"; "cteq6l1" = "1b5m7g7wawk72h76l9yr3gx3n67jggna1004lwffvj43gffwkjap"; "cteq66" = "09i69ac3gkrai5jmazjyjvi5sl8k2vm48m90ijn6pl24p31qf68y"; "nCTEQ15FullNuc_1_1" = "0nx1n814mkikd01pxmpndk2qxpwqwd55cbn6z1kgxm8qlhhhd2zw"; diff --git a/pkgs/development/libraries/physics/rivet/default.nix b/pkgs/development/libraries/physics/rivet/default.nix index f68c2ea877d..454c868dfcd 100644 --- a/pkgs/development/libraries/physics/rivet/default.nix +++ b/pkgs/development/libraries/physics/rivet/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "rivet-${version}"; - version = "2.5.3"; + version = "2.5.4"; src = fetchurl { url = "http://www.hepforge.org/archive/rivet/Rivet-${version}.tar.bz2"; - sha256 = "1r0x575ivvm68nnh9qlfvdra5298i047qcbxcg37ki2aaqq07qcr"; + sha256 = "1qi7am60f2l4krd3sbj95mbzfk82lir0wy8z27yr9ncq6qcm48kp"; }; postPatch = "patchShebangs ./src/Analyses/cat_with_lines"; diff --git a/pkgs/development/libraries/physics/thepeg/default.nix b/pkgs/development/libraries/physics/thepeg/default.nix index 1216c34cdb8..7989eb518c7 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.0.3"; + version = "2.1.1"; src = fetchurl { url = "http://www.hepforge.org/archive/thepeg/ThePEG-${version}.tar.bz2"; - sha256 = "0d26linwv92iq23n4gx154jvyd0lz5vg41kf4nxa01nspy7scyy5"; + sha256 = "1082n4q036sah5r4asyl3hpcyc05cymg40dnk3jsdjgv2v0vvc71"; }; buildInputs = [ boost fastjet gsl hepmc lhapdf rivet zlib ]; diff --git a/pkgs/development/libraries/physics/yoda/default.nix b/pkgs/development/libraries/physics/yoda/default.nix index e6d0f3c500e..dd1b3305646 100644 --- a/pkgs/development/libraries/physics/yoda/default.nix +++ b/pkgs/development/libraries/physics/yoda/default.nix @@ -2,26 +2,15 @@ stdenv.mkDerivation rec { name = "yoda-${version}"; - version = "1.6.6"; + version = "1.6.7"; src = fetchurl { url = "http://www.hepforge.org/archive/yoda/YODA-${version}.tar.bz2"; - sha256 = "088xx4q6b03bnj6xg5189m8wsznhal8aj3jk40sbj24idm4jl5yg"; + sha256 = "05jyv5dypa6d4q1m8wm2qycgq1i0bgzwzzm9qqdj0b43ff2kggra"; }; pythonPath = []; # python wrapper support - patches = [ - (fetchpatch { - url = "https://yoda.hepforge.org/hg/yoda/rev/3dbc8927e715?style=raw"; - sha256 = "02rm34z9lbab66p7gpij12qwdph5fddpksg80qz0m537wjwy2ddy"; - }) - (fetchpatch { - url = "https://yoda.hepforge.org/hg/yoda/rev/669c2be582ef?style=raw"; - sha256 = "0s705cl3bazpvpvy46vv1k223knwxq2yy5na1c6lv217sq9w86wj"; - }) - ]; - buildInputs = with python2Packages; [ python numpy matplotlib makeWrapper ] ++ stdenv.lib.optional withRootSupport root; |