Commit Graph

56 Commits

Author SHA1 Message Date
Jonathan Ringer
9bb3fccb5b treewide: pkgs.pkgconfig -> pkgs.pkg-config, move pkgconfig to alias.nix
continuation of #109595

pkgconfig was aliased in 2018, however, it remained in
all-packages.nix due to its wide usage. This cleans
up the remaining references to pkgs.pkgsconfig and
moves the entry to aliases.nix.

python3Packages.pkgconfig remained unchanged because
it's the canonical name of the upstream package
on pypi.
2021-01-19 01:16:25 -08:00
Ben Siraphob
badf51221d treewide: stdenv.lib -> lib 2021-01-16 17:58:11 +07:00
Profpatsch
4a7f99d55d treewide: with stdenv.lib; in meta -> with lib;
Part of: https://github.com/NixOS/nixpkgs/issues/108938

meta = with stdenv.lib;

is a widely used pattern. We want to slowly remove
the `stdenv.lib` indirection and encourage people
to use `lib` directly. Thus let’s start with the meta
field.

This used a rewriting script to mostly automatically
replace all occurances of this pattern, and add the
`lib` argument to the package header if it doesn’t
exist yet.

The script in its current form is available at
https://cs.tvl.fyi/depot@2f807d7f141068d2d60676a89213eaa5353ca6e0/-/blob/users/Profpatsch/nixpkgs-rewriter/default.nix
2021-01-11 10:38:22 +01:00
Ben Siraphob
3ae5e6ce03 treewide: remove enableParallelBuilding = true if using cmake 2021-01-03 18:37:40 +07:00
github-actions[bot]
0eb369d907
Merge staging-next into staging 2021-01-01 18:39:12 +00:00
Ben Siraphob
b04fc593e7 treewide: cmake buildInputs to nativeBuildInputs, minor cleanups 2021-01-01 11:52:33 +07:00
Dmitry Kalinkin
a30bff21e8
root: use llvm_5 from nixpkgs 2020-12-21 18:24:25 -05:00
Dmitry Kalinkin
b7e70092c5
root: 6.20.08 -> 6.22.06 2020-12-21 16:43:09 -05:00
Dmitry Kalinkin
7d6e0d5324
root: 6.18.04 -> 6.20.08 2020-12-20 23:49:54 -05:00
Jonathan Ringer
23d6cd325f root: don't propagated python interpreter 2020-08-09 10:44:15 -07:00
Markus Kowalewski
187b4a2e04
root: add license 2020-06-27 00:43:21 +02:00
Dmitry Kalinkin
df3a188b46
root5: 5.34.36 -> 5.34.38
Fixes: https://nvd.nist.gov/vuln/detail/CVE-2017-1000203
2020-06-18 16:42:02 -04:00
Michael Reilly
84cf00f980
treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
Dmitry Kalinkin
0b28198f23
root: wrap python executables
In normal use of ROOT the PYTHONPATH is intended to be set when user
sources the thisroot.{,s}sh. We do that in the setupHook. This covers
the case when thisroot.sh was not sourced.
2019-12-26 11:49:12 -05:00
Dmitry Kalinkin
b6d8873825 root: 6.12.06 -> 6.18.04
Also switch to python3.
2019-12-14 01:28:27 -08:00
Jonathan Ringer
0c1c18ca44
Merge branch 'master' into staging-next 2019-11-27 22:57:50 -08:00
Dmitry Kalinkin
bd0c4dd6ab
root: fix setupHook to work with "set -u" 2019-11-24 17:51:46 -05:00
adisbladis
c9d8624ccd
treewide: Get rid of libGLU_combined 2019-11-18 20:10:43 +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
Daiderd Jordan
da7bcec42f
root: remove cf-private 2019-07-03 22:20:22 +02:00
Dmitry Kalinkin
c36f841ec7
root5: fix build 2019-03-20 00:26:13 -04:00
Dmitry Kalinkin
73625f2522 root5: mark as broken on Linux 2019-01-11 20:45:37 -05:00
Dmitry Kalinkin
0c9335fb1c root, root5: fix build on darwin 2019-01-11 20:45:37 -05:00
Dmitry Kalinkin
3187db6e8d root5: init at 5.34.36 2018-09-24 14:34:49 -04:00
Markus Kowalewski
70e254d6bd
root: add license 2018-09-08 14:51:28 +02:00
volth
52f53c69ce pkgs/*: remove unreferenced function arguments 2018-07-21 02:48:04 +00:00
Vladimír Čunát
565bd805e6
Merge branch 'master' 2018-03-05 14:53:27 +01:00
Ryan Mulligan
a4809a57e1 root: 6.10.08 -> 6.12.06
Semi-automatic update. These checks were performed:

- built on NixOS
- ran `/nix/store/4gcl610xv4sj6vzwnksm825qp29f8ibx-root-6.12.06/bin/genreflex -h` got 0 exit code
- ran `/nix/store/4gcl610xv4sj6vzwnksm825qp29f8ibx-root-6.12.06/bin/genreflex --help` got 0 exit code
- ran `/nix/store/4gcl610xv4sj6vzwnksm825qp29f8ibx-root-6.12.06/bin/pq2 -h` got 0 exit code
- ran `/nix/store/4gcl610xv4sj6vzwnksm825qp29f8ibx-root-6.12.06/bin/rootn.exe -h` got 0 exit code
- ran `/nix/store/4gcl610xv4sj6vzwnksm825qp29f8ibx-root-6.12.06/bin/rootn.exe --help` got 0 exit code
- ran `/nix/store/4gcl610xv4sj6vzwnksm825qp29f8ibx-root-6.12.06/bin/rootn.exe -h` and found version 6.12.06
- ran `/nix/store/4gcl610xv4sj6vzwnksm825qp29f8ibx-root-6.12.06/bin/rootn.exe --help` and found version 6.12.06
- ran `/nix/store/4gcl610xv4sj6vzwnksm825qp29f8ibx-root-6.12.06/bin/xpdtest -h` got 0 exit code
- ran `/nix/store/4gcl610xv4sj6vzwnksm825qp29f8ibx-root-6.12.06/bin/xpdtest --help` got 0 exit code
- ran `/nix/store/4gcl610xv4sj6vzwnksm825qp29f8ibx-root-6.12.06/bin/root.exe -h` got 0 exit code
- ran `/nix/store/4gcl610xv4sj6vzwnksm825qp29f8ibx-root-6.12.06/bin/root.exe --help` got 0 exit code
- ran `/nix/store/4gcl610xv4sj6vzwnksm825qp29f8ibx-root-6.12.06/bin/root.exe -h` and found version 6.12.06
- ran `/nix/store/4gcl610xv4sj6vzwnksm825qp29f8ibx-root-6.12.06/bin/root.exe --help` and found version 6.12.06
- ran `/nix/store/4gcl610xv4sj6vzwnksm825qp29f8ibx-root-6.12.06/bin/root-config --help` got 0 exit code
- ran `/nix/store/4gcl610xv4sj6vzwnksm825qp29f8ibx-root-6.12.06/bin/root-config --version` and found version 6.12.06
- ran `/nix/store/4gcl610xv4sj6vzwnksm825qp29f8ibx-root-6.12.06/bin/prepareHistFactory -h` got 0 exit code
- ran `/nix/store/4gcl610xv4sj6vzwnksm825qp29f8ibx-root-6.12.06/bin/prepareHistFactory --help` got 0 exit code
- ran `/nix/store/4gcl610xv4sj6vzwnksm825qp29f8ibx-root-6.12.06/bin/prepareHistFactory help` got 0 exit code
- ran `/nix/store/4gcl610xv4sj6vzwnksm825qp29f8ibx-root-6.12.06/bin/prepareHistFactory -V` and found version 6.12.06
- ran `/nix/store/4gcl610xv4sj6vzwnksm825qp29f8ibx-root-6.12.06/bin/prepareHistFactory -v` and found version 6.12.06
- ran `/nix/store/4gcl610xv4sj6vzwnksm825qp29f8ibx-root-6.12.06/bin/prepareHistFactory --version` and found version 6.12.06
- ran `/nix/store/4gcl610xv4sj6vzwnksm825qp29f8ibx-root-6.12.06/bin/prepareHistFactory version` and found version 6.12.06
- ran `/nix/store/4gcl610xv4sj6vzwnksm825qp29f8ibx-root-6.12.06/bin/prepareHistFactory -h` and found version 6.12.06
- ran `/nix/store/4gcl610xv4sj6vzwnksm825qp29f8ibx-root-6.12.06/bin/prepareHistFactory --help` and found version 6.12.06
- ran `/nix/store/4gcl610xv4sj6vzwnksm825qp29f8ibx-root-6.12.06/bin/prepareHistFactory help` and found version 6.12.06
- found 6.12.06 with grep in /nix/store/4gcl610xv4sj6vzwnksm825qp29f8ibx-root-6.12.06

cc "@veprbl"
2018-03-01 15:39:08 +01:00
Alexander V. Nikolaev
0acec7e984 treewide: transition mesa to libGLU_combined 2018-02-24 17:06:49 +02:00
Dmitry Kalinkin
ef2fc289a6
root: 6.10.04 -> 6.10.08 2017-10-20 00:59:21 -04:00
John Ericson
531e4b80c9 misc pkgs: Basic sed to get fix pkgconfig and autoreconfHook buildInputs
Only acts on one-line dependency lists.
2017-09-21 15:49:53 -04:00
Dmitry Kalinkin
7c7ca7f017
root: add noSplash option 2017-08-30 19:56:53 -04:00
Dmitry Kalinkin
fd22d671ec root: 6.10.02 -> 6.10.04 2017-08-22 04:00:39 +02:00
Silvan Mosberger
f5fa5fa4d6 pkgs: refactor needless quoting of homepage meta attribute (#27809)
* pkgs: refactor needless quoting of homepage meta attribute

A lot of packages are needlessly quoting the homepage meta attribute
(about 1400, 22%), this commit refactors all of those instances.

* pkgs: Fixing some links that were wrongfully unquoted in the previous
commit

* Fixed some instances
2017-08-01 22:03:30 +02:00
Dmitry Kalinkin
459e3864d2
root: 6.10.00 -> 6.10.02 2017-07-14 04:40:27 -04:00
Dmitry Kalinkin
ada12f46dc
root: 6.09.02 -> 6.10.00
also workaround #26197
2017-06-24 13:38:25 -04:00
Dmitry Kalinkin
be9c0e8b7e
root: 6.08.02 -> 6.09.02
This also fixes breakage on darwin due to LLVM4.0 migration.

I had to enable opengl because otherwise macOS build is broken.
See root commit 23f8871c7 ('Do not include OpenGL directly but use our
TGLIncludes for that purpose.')

I've enabled xml because TUnfold depends on it.
2017-04-26 16:34:14 -04:00
Dmitry Kalinkin
c7bcb99ff2
root: 6.04.18 -> 6.08.02
This relies on
e9d60c56 ('libc++3.7: fix to use with modern compilers')
2017-01-01 17:52:03 -05:00
Dmitry Kalinkin
9434ec5441
root: fix environment setup
1) s/envHook/postHook/
2) patch to not set $p that fixes nested ```nix-shell -p root``` calls
2016-10-29 14:47:32 -04:00
Vladimír Čunát
4328629bf8 treewide: fix meta evaluation
There is no `stdenv.maintainers`. /cc @veprbl.
2016-10-22 12:05:23 +02:00
Dmitry Kalinkin
ef96b48659
root: s/python/python2/ 2016-10-21 15:47:38 -04:00
Dmitry Kalinkin
59a8aff8e6
root: add veprbl to maintainers 2016-10-21 13:30:30 -04:00
Dmitry Kalinkin
7b9deaba81 root: add setup-hook 2016-09-18 04:45:18 -04:00
Dmitry Kalinkin
5646c2aba6 root: add support for x86_64-darwin
1) add pcre dependency (for some reason builtin_pcre doesn't work)
2) Disable dependencies that are currently not supported by the
expression.  Most users should not need those. These are disabled to
prevent cmake from picking them up from system and causing impurities.
Once there is a user who needs these they will have to update the
expression.
3) disable some OSX detection code that relies on /usr/bin/sw_vers
that chooses c++ library, silences warnings and sets macosx-version-min.
macosx-version-min is already set by nix using MACOSX_DEPLOYMENT_TARGET
environment variable.
2016-09-11 17:29:13 -04:00
Tuomas Tynkkynen
b87a2245b1 root: Fix libc dev reference 2016-08-31 12:54:28 +03:00
Dmitry Kalinkin
4449ecb617 root: 6.04.16 -> 6.04.18 (#17265)
root: compile against external gsl

Revert "Revert "root: enable parallel building""

This reverts commit ee1a10ee6b.

ROOT has no problems with parallel build. The problems that caused the
original commit were not related to parallel building.
2016-07-30 01:41:37 +01:00
Vladimír Čunát
ee1a10ee6b Revert "root: enable parallel building"
This reverts commit 2991fdca52.
Hydra builds often report missing various files.
2016-05-26 16:27:59 +02:00
Dmitry Kalinkin
088601cb51 root: fix chrooted build, workaround 491f7f017c (cmake: set LIBDIR and INCLUDEDIR for multiple outputs) 2016-04-25 17:38:19 -04:00
Dmitry Kalinkin
f2200369e5 root: fix NixOS build, build with lzma from nix, update homepage url 2016-04-20 01:41:46 -04:00
Dmitry Kalinkin
baded4ea96 root: 5.34.15 -> 6.04.16 2016-04-17 22:59:31 -04:00