Commit Graph

43 Commits

Author SHA1 Message Date
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
Marc Seeger
08725b90e9 rpm: 4.15.1 -> 4.16.1.2 2020-12-25 14:50:33 -08:00
Ted Reed
b8e0f0cd72 rpm: add openmp when building with clang
The Darwin build has been broken with a missing header file "omp.h";
llvmPackages.openmp provides it.

Including this library is only necessary when clang is used.
2020-09-10 12:16:06 -07:00
Daniel Schaefer
f56b70378e rpm: 4.14.2.1 -> 4.15.1
It's only compatible with Python3 now.
2020-06-08 19:27:41 +02:00
Michael Reilly
84cf00f980
treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
Eric Norris
e5d007e86a
rpm: fix helper script paths 2020-01-18 15:59:30 -05: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
68a674a376 python27Packages.rpm: 4.14.2 -> 4.14.2.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/rpm/versions
2018-10-24 10:28:52 +02:00
R. RyanTM
d0b111cddd python27Packages.rpm: 4.14.1 -> 4.14.2
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/rpm/versions.
2018-08-23 19:46:22 -07:00
volth
e47175638b
rpm: 4.14.0 -> 4.14.1 2018-03-16 10:08:46 +00:00
Väinö Järvelä
2a532e2496 rpm: Add Darwin support 2018-02-21 07:33:11 +02:00
Yegor Timoshenko
506c89c30a maintainers: remove mornfall from packages 2018-01-17 05:17:33 +00:00
John Ericson
d7bddc27b2 treewide: Try to avoid depending on binutils directly
One should depend on

 - `stdenv.cc.bintools`: for executables at build time
 - `libbfd` or `libiberty`: for those libraries
 - `targetPackages.cc.bintools`: for exectuables at *run* time
 - `binutils`: only for specifically GNU Binutils's executables, regardless of
   the host platform, at run time.
2017-11-13 00:47:48 -05:00
adisbladis
9fa8f3ed0d
rpm: 4.13.0.1 -> 4.14.0 2017-11-03 02:07:38 +08: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
Jörg Thalheim
d5afba485b
rpm: fix rpmquery/rpmverify symlinks 2017-04-15 10:24:16 +02:00
armijnhemel
fed7d4a6e9 RPM: 4.13.0-rc1 -> 4.13.0.1 (#24910) 2017-04-15 10:18:04 +02:00
Graham Christensen
dad5651bd4
rpm: 4.12.0 -> 4.13.0-rc1 for CVEs
Null pointer deref & out of bound reads. See: https://lwn.net/Vulnerabilities/685287/

Fedora is shipping the rc1 as well.

re: https://github.com/NixOS/nixpkgs/pull/18975
2016-09-27 21:07:35 -04:00
Tuomas Tynkkynen
bb19e17d14 rpm: Split into multiple outputs
Patch away two things:

- %_includedir, %_oldincludedir, %_mandir, %_infodir macros from
  lib/rpm/platform/*/macros to avoid cycles between outputs. Hopefully
  anything doesn't really need those.
- Change %__ld, %__nm, %__objcopy, %__objdump in lib/rpm/macros to
  refer to the commands in PATH. Should be safe as %__cc for instance is
  already like that.
2016-09-19 16:09:34 +03:00
Tuomas Tynkkynen
48d7948808 rpm: Use list for configureFlags 2016-09-19 16:09:34 +03:00
Robin Gloster
8cd050f6ba rpm: remove hack
elfutils now adds a eu- prefix to avoid collisions
2016-08-24 19:23:42 +00:00
Tuomas Tynkkynen
24b046ce05 rpm: Fix python3 detection hack
Commit 5dff3c4b68 made rpm use autoreconfHook, so the patch that we
are making to `configure` gets lost when the file is regenerated.
To fix this, just patch the equivalent string in the `configure.ac` file
instead.

Fixes #15287
2016-05-07 17:55:32 +03:00
Dan Peebles
5dff3c4b68 rpm: stop build from trying to create /var/tmp, which breaks in sandboxed builds 2016-05-01 18:09:30 +00:00
Dan Peebles
c048f7db7b rpm: fix state directory in build
Prior to this change, it was was defaulting to storing its state in
its store path, which didn't make any sense.

Also added myself as a maintainer
2016-04-30 02:07:50 +00:00
Dan Peebles
fbbf910e23 rpm: add lua support and a few propagatedBuildInputs
It turns out that a surprising number of common packages use lua
scripts in RPM files, and not having lua can lead to obscure failures.

The propagatedBuildInputs stuff makes the librpm stuff more useful,
since some of its headers didn't work without extra buildInputs before.
2016-04-29 02:29:02 +00:00
Vladimír Čunát
f9f6f41bff Merge branch 'master' into closure-size
TODO: there was more significant refactoring of qtbase and plasma 5.5
on master, and I'm deferring pointing to correct outputs to later.
2015-12-31 09:53:02 +01:00
Tuomas Tynkkynen
c0aada1e1f rpm: Hack fix finding libpython when compiling for Python 3
Currently, building RPM with `python = python3` causes this:

checking for a Python interpreter with version >= 2.6... python3
checking for python3... /nix/store/dykqxnrwiz9drlcv2wy8lpvl3xvklx0g-python3-3.4.3/bin/python3
checking for python3 version... 3.4
checking for Python.h... yes
checking for library containing Py_Main... no
configure: error: missing python library

That comes from this snippet in configure.ac:
    AC_SEARCH_LIBS([Py_Main],[python${PYTHON_VERSION} python],[
      WITH_PYTHON_LIB="$ac_res"
    ],[AC_MSG_ERROR([missing python library])
    ])

So it's looking for (e.g) `libpython3.4.so` wheras we have `libpython3.4m.so`.
Patching the configure script to match seems to make that work (although
I don't really understand what the heck is this 'm' business about).
2015-12-28 02:16:23 +02:00
Vladimír Čunát
ba9b80c7e0 nspr,nss: split into multiple outputs
Hopefully most references are OK.
2015-10-13 20:18:44 +02:00
Tuomas Tynkkynen
aa6076f9f5 rpm: 4.11.2 -> 4.12.0 2015-10-01 00:42:36 +03:00
Eelco Dolstra
2ed5c2bd6b Set some meta.platforms
Also fix meta.platform -> meta.platforms in a few places.
2015-03-20 20:04:42 +01:00
William A. Kennington III
3dd129c02b rpm: Upgrade from 4.7.2 -> 4.11.2 2014-02-15 14:53:13 -06:00
Petr Rockai
6a2ac21602 rpm: Revert to using db4, fails to build with db5. 2014-02-15 19:43:52 +01:00
William A. Kennington III
bdb842d5eb Move all db4 packages to the default db5 2014-02-15 12:03:02 +01:00
Petr Rockai
8d877463f6 rpm: Build python bindings (--enable-python). 2014-02-08 14:38:09 +01:00
Petr Rockai
4124bb9ff5 Adopt more packages. 2014-01-28 18:11:00 +01:00
Peter Simons
e198f4b237 Revert "Update RPM to 4.10.0."
Commit e29c284926 breaks some builds, i.e.
<http://hydra.nixos.org/build/2890636>.
2012-07-24 21:57:18 +02:00
Petr Rockai
e29c284926 Update RPM to 4.10.0. 2012-07-23 20:30:28 +02:00
Eelco Dolstra
ed325cd1ae * We accidentally lost xz support in rpm. This broke RPM builds
(http://hydra.nixos.org/build/2230623).

svn path=/nixpkgs/trunk/; revision=32847
2012-03-07 09:47:22 +00:00
Eelco Dolstra
d4d7931a62 * Cleanup: remove obsolete references to ‘xz’, which is in stdenv now.
svn path=/nixpkgs/branches/stdenv-updates/; revision=31678
2012-01-18 20:53:01 +00:00
Eelco Dolstra
d869913b27 * RPM updated to 4.7.2.
* nspr updated to 4.8.2.
* nss updated to 3.12.4.
* elfutils updated to 0.143.

svn path=/nixpkgs/trunk/; revision=18867
2009-12-09 22:34:51 +00:00
Eelco Dolstra
564d96042a * RPM barfs if you don't build its static libraries - probably a
Makefile bug.

svn path=/nixpkgs/branches/stdenv-updates/; revision=15262
2009-04-23 09:55:52 +00:00
Eelco Dolstra
016e2d912e * Name attribute did not match the actual version.
svn path=/nixpkgs/trunk/; revision=13600
2008-12-09 13:52:37 +00:00
Eelco Dolstra
505c169238 * Revived RPM. Damn, RPM is nasty to build.
svn path=/nixpkgs/trunk/; revision=8407
2007-03-21 19:25:58 +00:00