Commit Graph

185 Commits

Author SHA1 Message Date
Frederik Rietdijk
10d0c68a9b Merge staging-next into staging 2019-11-20 10:02:21 +01:00
Dmitry Kalinkin
3ff236097b fastjet-contrib: init at 1.042 2019-11-19 09:38:06 -08:00
Frederik Rietdijk
5f8b0d7d99 Merge staging-next into staging 2019-11-19 14:53:29 +01:00
adisbladis
c9d8624ccd
treewide: Get rid of libGLU_combined 2019-11-18 20:10:43 +00:00
Renaud
57a19cb5b6
qcdnum: fix build
It was failing on Hydra with:
ld: cannot find -lz
2019-11-16 18:42:04 +01:00
Renaud
af6ffdaacb
apfel: fix build
Was failing on Hydra with:
ld: cannot find -lz
2019-11-16 18:40:10 +01:00
OmnipotentEntity
e36dca0624 geant4: 10.4.1 -> 10.5.1 (#70535) 2019-10-19 18:23:42 -04:00
R. RyanTM
77424f2c6d hepmc3: 3.1.1 -> 3.1.2 (#69587)
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/hepmc3/versions
2019-09-26 18:32:37 -04:00
volth
08f68313a4 treewide: remove redundant rec 2019-08-28 11:07:32 +00:00
volth
46420bbaa3 treewide: name -> pname (easy cases) (#66585)
treewide replacement of

stdenv.mkDerivation rec {
  name = "*-${version}";
  version = "*";

to pname
2019-08-15 13:41:18 +01:00
R. RyanTM
94804a63a2 apfel: 3.0.3 -> 3.0.4 (#63977)
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/apfel/versions
2019-08-12 10:36:03 -04:00
Dmitry Kalinkin
ecef988054
hepmc: rename to hepmc2 2019-08-05 17:47:43 -04:00
Dmitry Kalinkin
d046fb8ea9
hepmc: 2.06.09 -> 2.06.10 2019-08-05 16:47:34 -04:00
R. RyanTM
621880e5e7 pythia: 8.240 -> 8.243 (#66036)
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/pythia/versions
2019-08-05 11:30:54 -04:00
Dmitry Kalinkin
ccb9fefb1e
rivet: 2.7.0 -> 2.7.2 2019-06-27 10:45:49 -04:00
Dmitry Kalinkin
8f182df3f8
yoda: 1.7.4 -> 1.7.7 2019-06-27 10:40:41 -04:00
Gabriel Ebner
cc5f64c3ea geant4: fix build with enableInventor = true 2019-06-17 18:40:52 +02:00
volth
f3282c8d1e treewide: remove unused variables (#63177)
* treewide: remove unused variables

* making ofborg happy
2019-06-16 19:59:05 +00:00
Dmitry Kalinkin
73b5a2531c
rivet: fix rivet-mkhtml runtime 2019-06-10 18:00:18 -04:00
Dmitry Kalinkin
00932b9d08
lhapdf.pdf_sets: update
Some of the downloads produce empty files, those hashes were not
updated.
2019-06-06 13:15:43 -04:00
R. RyanTM
adceb10e36 lhapdf: 6.2.1 -> 6.2.3
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/lhapdf/versions
2019-06-01 19:24:22 -07:00
c0bw3b
9cb260d091 [treewide] delete unused patches 2019-05-04 19:52:24 +02:00
Renaud
a36cff247c
Merge pull request #59534 from r-ryantm/auto-update/hepmc3
hepmc3: 3.1.0 -> 3.1.1
2019-04-24 00:30:47 +02:00
Matthew Bauer
290a5d916e treewide: update homepages to https where available
Based on "problems" from repology:

https://repology.org/repository/nix_unstable/problems

Mostly simple changes to reflect redirects.
2019-04-15 10:10:05 -04:00
R. RyanTM
30a3f2bdd6 hepmc3: 3.1.0 -> 3.1.1
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/hepmc3/versions
2019-04-14 16:13:42 -07:00
Dmitry Kalinkin
b154937027
herwig: 7.1.4 -> 7.1.5
thepeg: 2.1.4 -> 2.1.5
2019-04-05 00:21:17 -04:00
Dmitry Kalinkin
cdab07b603
applgrid: fix build for gcc 2019-03-22 01:21:48 -04:00
Dmitry Kalinkin
cf1de3c2df
yoda: fix sha hash of the tarball
Tarball was replaced upstream. The files are the same, changes are meta
only (appear to be timestamps).
2019-03-07 14:08:10 -05:00
Dmitry Kalinkin
01ad172921
rivet: 2.7.0 -> 2.7.0
Upstream changed tarball yet again. The change is to autotools scripts,
the new ones have a more strict check for "yoda" package version.
2019-03-06 16:47:55 -05:00
Dmitry Kalinkin
78d041f6a9 rivet: 2.6.2 -> 2.7.0 2019-02-19 10:19:25 -05:00
Sarah Brofeldt
3b1e68b79e
Merge pull request #55454 from veprbl/pr/hepmc3_init
hepmc3: init at 3.1.0
2019-02-08 19:26:58 +01:00
Dmitry Kalinkin
230f88a436
hepmc3: init at 3.1.0 2019-02-08 12:26:33 -05:00
R. RyanTM
904e9ab048 pythia: 8.235 -> 8.240
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/pythia/versions
2019-02-04 18:48:20 -05:00
Dmitry Kalinkin
958201a98f
Merge pull request #48675 from veprbl/pr/xfitter_fix
xfitter: runtime fixes
2019-01-20 20:00:02 -05:00
Vladimír Čunát
bde8efe792
Merge branch 'master' into staging-next
A couple thousand rebuilds have accumulated on master.
2019-01-12 12:19:34 +01:00
Robin Gloster
8f92eff731
hoppet: fix sandboxed build 2019-01-11 04:10:31 +01:00
Frederik Rietdijk
0a2caa41fe Python: drop python.majorVersion
Drop `python.majorVersion`. For Python language version, use `python.pythonVersion`.
For implementation version, use `python.sourceVersion`.

Some expressions were broken. Those that were identified were fixed.

fixup major
2019-01-04 10:45:22 +01:00
Sarah Brofeldt
4d34cfcd96
Merge pull request #51851 from veprbl/pr/rivet_bump
rivet: 2.6.1 -> 2.6.2
2018-12-11 12:49:48 +01:00
Dmitry Kalinkin
99d4e656c5
rivet: 2.6.1 -> 2.6.2 2018-12-10 17:28:30 -05:00
Dmitry Kalinkin
7726c8b0ed
yoda: 1.7.3 -> 1.7.4 2018-12-10 17:28:08 -05:00
Dmitry Kalinkin
a1ef7fd877 cernlib: restrict supported arches 2018-12-10 17:05:22 +03:00
Dmitry Kalinkin
357f6a8b7e cernlib: fix build
The imake rules contain a comment line that looks like a pragma. Recently imake
in nixpkgs was switched to use tradcpp, which is a bit more strict about
interpreting unknown pragmas. To fix the build, the comments is changed to use
C++ style comments.
2018-12-10 06:38:45 +03:00
Jörg Thalheim
a71b7697c9
Merge pull request #49573 from veprbl/pr/bump
bump: pythonPackages.simanneal, fastjet, herwig
2018-11-22 00:53:26 +00:00
Dmitry Kalinkin
91d6c9111e
herwig: broken on aarch64 2018-11-21 19:39:23 -05:00
Dmitry Kalinkin
f6aac1cc66 yoda: 1.7.1 -> 1.7.3 (#49654) 2018-11-03 17:27:19 +01:00
Dmitry Kalinkin
19803a3b69
herwig: 7.1.4
thepeg: 2.1.4
2018-10-31 22:13:52 -04:00
Dmitry Kalinkin
b903be77c0
fastjet: 3.3.1 -> 3.3.2 2018-10-31 21:54:43 -04:00
Dmitry Kalinkin
3dd924b58e
apfelgrid: use root5 (same as xfitter) 2018-10-18 15:24:33 -04:00
Dmitry Kalinkin
ad6b9e4604
qcdnum: downgrade 17-01-14 -> 17-01-13
17-01-14 is not compatible with xfitter. It fails with:

  PDFEXT obsolete, please use EXTPDF instead
2018-10-09 18:57:49 -04:00
Matthew Bauer
c4f344ac44
Merge pull request #47291 from veprbl/pr/xfitter_init
xfitter: init at 2.0.0
2018-10-05 22:38:09 -05:00
Dmitry Kalinkin
8229fbb486 lhapdf: fix "lhapdf list" interactive tool (#44905)
In version 6.2.1 the "list" command now uses python bindings, which need
to be imported, so we need to set the PYTHONPATH.
2018-09-24 22:37:44 +02:00
Dmitry Kalinkin
23e5af9e95 apfelgrid: init at 1.0.1 2018-09-24 14:34:49 -04:00
Dmitry Kalinkin
530de1cd82 apfel: init at 3.0.3 2018-09-24 14:34:49 -04:00
Dmitry Kalinkin
4f80119bc7 applgrid: init at 1.4.70 2018-09-24 14:34:49 -04:00
Dmitry Kalinkin
5c2a7f104e qcdnum: init at 17-01-14 2018-09-24 14:34:48 -04:00
Dmitry Kalinkin
f793b9fd06 mela: init at 2.0.1 2018-09-24 14:34:10 -04:00
Dmitry Kalinkin
af476db8cb hoppet: init at 1.2.0 2018-09-24 14:34:10 -04:00
Daiderd Jordan
68f7e75517
cernlib: mark broken on darwin
Using gccStdenv makes the build go further, but then it fails with.

    kuipc /private/tmp/nix-build-cernlib-2006.drv-0/2006/src/packlib/kuip/code_kuip/kuipcdf.cdf kuipcdf.c
    Makefile:413: archive/kuipcdf.d: No such file or directory
    make[3]: *** [Makefile:473: kuipcdf.c] Abort trap: 6

/cc ZHF #45961
2018-09-13 23:00:46 +02:00
Dmitry Kalinkin
8d063d92a4 geant4: limit platforms to linux 2018-09-07 11:36:28 -04:00
Dmitry Kalinkin
fc4f99a8dd g4py: fix for new boost 2018-09-03 10:55:33 -04:00
Dmitry Kalinkin
f3049d020a geant4: move parameter definitions from all-packages, use system zlib, use qt5 2018-09-03 10:55:33 -04:00
Dmitry Kalinkin
4d33e289b5 g4py: fix after bump to 10.04.1 2018-09-03 10:55:33 -04:00
Dmitry Kalinkin
537de20645 geant4: remove multi version infrastructure
Nobody maintains this and this does not contribute anything towards
making reproducible research. Also this was missing recurseIntoAttrs, so
Hydra used to not see it.
2018-09-03 10:55:33 -04:00
Dmitry Kalinkin
d7ab0f4026 geant4: only supply requested dependencies, sort out *BuildInputs 2018-09-03 10:55:15 -04:00
Dmitry Kalinkin
d22be10e66 geant4: refactor cmakeFlags to use lists 2018-09-03 10:55:15 -04:00
John Ericson
2c2f1e37d4 reewide: Purge all uses stdenv.system and top-level system
It is deprecated and will be removed after 18.09.
2018-08-30 17:20:32 -04:00
Dmitry Kalinkin
bd2e865b44 rivet: fix hash broken by upstream 2018-08-16 15:34:32 -04:00
Dmitry Kalinkin
984e0e8c1d rivet: 2.7.0 -> 2.7.1 2018-08-15 09:53:32 -04:00
Dmitry Kalinkin
b98faf680c yoda: 1.7.0 -> 1.7.1 2018-08-14 17:49:21 -04:00
volth
52f53c69ce pkgs/*: remove unreferenced function arguments 2018-07-21 02:48:04 +00:00
Silvan Mosberger
57bccb3cb8 treewide: http -> https sources (#42676)
* treewide: http -> https sources

This updates the source urls of all top-level packages from http to
https where possible.

* buildtorrent: fix url and tab -> spaces
2018-06-28 20:43:35 +02:00
xeji
66f4630924
Merge pull request #41283 from veprbl/pr/herwig_7.1.3
herwig 7.1.3
2018-05-31 08:36:42 +02:00
Dmitry Kalinkin
4342d99d82
herwig: 7.1.2 -> 7.1.3
thepeg: 2.1.2 -> 2.1.3
2018-05-30 16:08:10 -04:00
Dmitry Kalinkin
57bbe41295
thepeg: fix rivet backend 2018-05-30 16:06:34 -04:00
Orivej Desh
842f1af65e yoda: fix build after #28029 2018-05-29 17:11:29 +00:00
Matthew Bauer
02297beade treewide: add version to packages
Lots of packages are missing versions in their name. This adds them
where appropriate. These were found with this command:

 $ nix-env -qa -f. | grep -v '\-[0-9A-Za-z.-_+]*$' | grep -v '^hook$'

See issue #41007.
2018-05-25 15:48:05 -05:00
Tmplt
024efc9509 geant4: v10.0.2 -> v10.4.1, define datasets seperately, add deps for enableInventor
By seperating the datasets, geant4 now builds in a sandbox.

Resolves #39766
2018-05-12 21:58:41 +02:00
Jörg Thalheim
68e75fbb53
Merge pull request #39577 from veprbl/pr/pythia_8.235
pythia: 8.226 -> 8.235, enable lhapdf6 plugin
2018-04-28 11:44:37 +01:00
xeji
a674227d2a
Merge pull request #39631 from veprbl/patch-6
fastjet: update license in meta
2018-04-28 01:34:50 +02:00
xeji
aae03f7b93
Merge pull request #39548 from r-ryantm/auto-update/fastjet
fastjet: 3.3.0 -> 3.3.1
2018-04-28 01:17:16 +02:00
Dmitry Kalinkin
b1950f081d
fastjet: update license in meta
Fixes: 70e070 ('fastjet: 3.3.0 -> 3.3.1')
2018-04-27 19:16:32 -04:00
Dmitry Kalinkin
e421c427d2
fastjet: add veprbl to maintainers 2018-04-27 18:33:42 -04:00
Dmitry Kalinkin
1cfc5f1da2
pythia: 8.226 -> 8.235, enable lhapdf6 plugin 2018-04-26 18:08:53 -04:00
R. RyanTM
70e070afa7 fastjet: 3.3.0 -> 3.3.1
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/fastjet/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/y8mkgp5xlcfik6fb5r1dzb93n6xm1f9r-fastjet-3.3.1/bin/fastjet-config -h’ got 0 exit code
- ran ‘/nix/store/y8mkgp5xlcfik6fb5r1dzb93n6xm1f9r-fastjet-3.3.1/bin/fastjet-config --help’ got 0 exit code
- ran ‘/nix/store/y8mkgp5xlcfik6fb5r1dzb93n6xm1f9r-fastjet-3.3.1/bin/fastjet-config --version’ and found version 3.3.1
- found 3.3.1 with grep in /nix/store/y8mkgp5xlcfik6fb5r1dzb93n6xm1f9r-fastjet-3.3.1
- directory tree listing: https://gist.github.com/aa455f4d0802d2b2b76678ecccfe3eab
2018-04-26 05:57:09 -07:00
Dmitry Kalinkin
4810d54555 rivet: 2.6.0 -> 2.6.0
upstream just replaced the tarball with a new version without bumping anything
2018-03-30 20:23:37 +01:00
Vladimír Čunát
565bd805e6
Merge branch 'master' 2018-03-05 14:53:27 +01:00
Ryan Mulligan
901576e846 pythia: 8.219 -> 8.226
Semi-automatic update. These checks were performed:

- built on NixOS
- ran `/nix/store/whxh0pc4qfz97dhxsn8ya9pwy1w9msz1-pythia-8.226/bin/pythia8-config -h` got 0 exit code
- ran `/nix/store/whxh0pc4qfz97dhxsn8ya9pwy1w9msz1-pythia-8.226/bin/pythia8-config --help` got 0 exit code
- ran `/nix/store/whxh0pc4qfz97dhxsn8ya9pwy1w9msz1-pythia-8.226/bin/pythia8-config help` got 0 exit code
- ran `/nix/store/whxh0pc4qfz97dhxsn8ya9pwy1w9msz1-pythia-8.226/bin/pythia8-config -V` and found version 8.226
- ran `/nix/store/whxh0pc4qfz97dhxsn8ya9pwy1w9msz1-pythia-8.226/bin/pythia8-config -v` and found version 8.226
- ran `/nix/store/whxh0pc4qfz97dhxsn8ya9pwy1w9msz1-pythia-8.226/bin/pythia8-config --version` and found version 8.226
- ran `/nix/store/whxh0pc4qfz97dhxsn8ya9pwy1w9msz1-pythia-8.226/bin/pythia8-config version` and found version 8.226
- ran `/nix/store/whxh0pc4qfz97dhxsn8ya9pwy1w9msz1-pythia-8.226/bin/pythia8-config help` and found version 8.226
- found 8.226 with grep in /nix/store/whxh0pc4qfz97dhxsn8ya9pwy1w9msz1-pythia-8.226
- found 8.226 in filename of file in /nix/store/whxh0pc4qfz97dhxsn8ya9pwy1w9msz1-pythia-8.226

cc "@veprbl"
2018-02-28 15:02:21 +00:00
Ryan Mulligan
2af5567cd2 thepeg: 2.1.1 -> 2.1.2
Semi-automatic update. These checks were performed:

- built on NixOS
- ran `/nix/store/s8bdx22ycxz8j072244q8sng0jxh3sjc-thepeg-2.1.2/bin/setupThePEG help` got 0 exit code
- ran `/nix/store/s8bdx22ycxz8j072244q8sng0jxh3sjc-thepeg-2.1.2/bin/setupThePEG -v` and found version 2.1.2
- ran `/nix/store/s8bdx22ycxz8j072244q8sng0jxh3sjc-thepeg-2.1.2/bin/setupThePEG --version` and found version 2.1.2
- ran `/nix/store/s8bdx22ycxz8j072244q8sng0jxh3sjc-thepeg-2.1.2/bin/runThePEG -v` and found version 2.1.2
- ran `/nix/store/s8bdx22ycxz8j072244q8sng0jxh3sjc-thepeg-2.1.2/bin/runThePEG --version` and found version 2.1.2
- found 2.1.2 with grep in /nix/store/s8bdx22ycxz8j072244q8sng0jxh3sjc-thepeg-2.1.2

cc "@veprbl"
2018-02-28 11:53:49 +01:00
Ryan Mulligan
bdce76effb herwig: 7.1.1 -> 7.1.2
Semi-automatic update. These checks were performed:

- built on NixOS
- ran `/nix/store/wl85ali5l9g4naazpbkdlk3aqrlwi2g4-herwig-7.1.2/bin/gosam2herwig -h` got 0 exit code
- ran `/nix/store/wl85ali5l9g4naazpbkdlk3aqrlwi2g4-herwig-7.1.2/bin/gosam2herwig --help` got 0 exit code
- ran `/nix/store/wl85ali5l9g4naazpbkdlk3aqrlwi2g4-herwig-7.1.2/bin/mg2herwig -h` got 0 exit code
- ran `/nix/store/wl85ali5l9g4naazpbkdlk3aqrlwi2g4-herwig-7.1.2/bin/mg2herwig --help` got 0 exit code
- ran `/nix/store/wl85ali5l9g4naazpbkdlk3aqrlwi2g4-herwig-7.1.2/bin/herwig-mergegrids -h` got 0 exit code
- ran `/nix/store/wl85ali5l9g4naazpbkdlk3aqrlwi2g4-herwig-7.1.2/bin/herwig-mergegrids --help` got 0 exit code
- ran `/nix/store/wl85ali5l9g4naazpbkdlk3aqrlwi2g4-herwig-7.1.2/bin/Herwig -h` got 0 exit code
- ran `/nix/store/wl85ali5l9g4naazpbkdlk3aqrlwi2g4-herwig-7.1.2/bin/Herwig --help` got 0 exit code
- ran `/nix/store/wl85ali5l9g4naazpbkdlk3aqrlwi2g4-herwig-7.1.2/bin/Herwig -V` and found version 7.1.2
- ran `/nix/store/wl85ali5l9g4naazpbkdlk3aqrlwi2g4-herwig-7.1.2/bin/Herwig --version` and found version 7.1.2
- ran `/nix/store/wl85ali5l9g4naazpbkdlk3aqrlwi2g4-herwig-7.1.2/bin/Herwig -h` and found version 7.1.2
- ran `/nix/store/wl85ali5l9g4naazpbkdlk3aqrlwi2g4-herwig-7.1.2/bin/Herwig --help` and found version 7.1.2
- found 7.1.2 with grep in /nix/store/wl85ali5l9g4naazpbkdlk3aqrlwi2g4-herwig-7.1.2

cc "@veprbl"
2018-02-26 18:39:38 -08:00
Alexander V. Nikolaev
0acec7e984 treewide: transition mesa to libGLU_combined 2018-02-24 17:06:49 +02:00
Will Dietz
8a1069bdcb fastjet: Fix build w/clang5
https://hydra.nixos.org/build/68588849/nixlog/1

libtool: compile:  clang++ -DHAVE_CONFIG_H -I. -I../../include/fastjet -O2 -Wall -g -Woverloaded-virtual -DDROP_CGAL -I. -I./siscone -I./../../include -I./siscone -c SISConeBasePlugin.cc  -fno-common -DPIC -o .libs/libSISConePlugin_la-SISConeBasePlugin.o
SISConeBasePlugin.cc:12:12: error: no matching member function for call to 'structure_of'
  return a.structure_of<UserScaleBase::StructureType>().ordering_var2()
         ~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
./../../include/fastjet/PseudoJet.hh:1012:60: note: candidate template ignored: substitution failure [with TransformerType = fastjet::SISConeBasePlugin::UserScaleBase::StructureType]: ISO C++ specifies that qualified reference to 'StructureType' is a constructor name rather than a type in this context, despite preceding 'typename' keyword
const typename TransformerType::StructureType & PseudoJet::structure_of() const{
      ~~~~~~~~                                             ^
2018-02-02 10:24:18 -06:00
Dmitry Kalinkin
e272f56f93
rivet: 2.5.4 -> 2.6.0 2017-12-23 18:13:03 -05:00
Dmitry Kalinkin
9e69322761
yoda: 1.6.7 -> 1.7.0 2017-12-23 18:12:34 -05:00
Dmitry Kalinkin
6f25309122
lhapdf: 6.2.0 -> 6.2.1 2017-12-23 17:48:41 -05:00
Frederik Rietdijk
985f0ce15d python.pkgs.rivet: add bindings for rivet 2017-11-23 15:11:03 +01:00
Dmitry Kalinkin
2f1816de5b
fastjet: 3.2.0 -> 3.3.0 2017-11-17 16:23:42 -05:00
Dmitry Kalinkin
ae8eff8b7b
lhapdf: update hash 2017-07-17 11:03:47 -04:00
Dmitry Kalinkin
4c0e86ba67
fastnlo: 2.3.1pre-2212 -> 2.3.1pre-2402 2017-07-17 04:16:43 -04:00
Dmitry Kalinkin
6bcc20361f herwig: 7.0.4 -> 7.1.1, thepeg: 2.0.3 -> 2.1.1 2017-07-17 00:20:59 -04:00
Dmitry Kalinkin
c7692b1839
lhapdf: update PDF sets 2017-07-13 23:39:48 -04:00