Commit Graph

71 Commits

Author SHA1 Message Date
Ben Siraphob
8c5d37129f pkgs/tools: stdenv.lib -> lib 2021-01-15 17:12:36 +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
John Ericson
f52263ced0 treewide: Start to break up static overlay
We can use use `stdenv.hostPlatform.isStatic` instead, and move the
logic per package. The least opionated benefit of this is that it makes
it much easier to replace packages with modified ones, as there is no
longer any issue of overlay order.

CC @FRidh @matthewbauer
2021-01-03 19:18:16 +00:00
Frederik Rietdijk
be534380c4 bzip2_1_1: init at 2020-08-11
bzip2 has been unmaintained for a long time. For a while now, there has
been maintainership, resulting in the release of 1.0.8. At the same
time, there is now a master branch (version 1.1.x) which supports meson
and cmake as build systems.

This commit adds the current HEAD of the master branch (1.1.x). In the
future we may want to use this one instead of the older and patched
1.0.6 we currently have.

Related:
- https://github.com/NixOS/nixpkgs/pull/65029
- https://github.com/NixOS/nixpkgs/pull/94969
2020-08-30 17:28:41 +02:00
Matthew Bauer
d0677e6d45 treewide: add warning comment to “boot” packages
This adds a warning to the top of each “boot” package that reads:

  Note: this package is used for bootstrapping fetchurl, and thus cannot
  use fetchpatch! All mutable patches (generated by GitHub or cgit) that
  are needed here should be included directly in Nixpkgs as files.

This makes it clear to maintainer that they may need to treat this
package a little differently than others. Importantly, we can’t use
fetchpatch here due to using <nix/fetchurl.nix>. To avoid having stale
hashes, we need to include patches that are subject to changing
overtime (for instance, gitweb’s patches contain a version number at
the bottom).
2020-07-31 08:56:53 +02:00
Maximilian Bosch
01ce36f788 bzip2: fix aarch64 build 2020-01-14 08:52:25 +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
Vladimír Čunát
4fd6cb7abd
bzip2: patch CVE-2019-12900
The vulnerability seems quite serious.
It isn't practical to use fetchpatch here due to bootstrapping,
so I just committed the small patch file.
2019-06-22 11:58:21 +02:00
Benjamin Hipple
b4b19de128 bzip2: enable parallel building 2019-05-12 11:26:58 -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
Markus Kowalewski
3bc155dfd0
bzip2: update license 2018-08-09 11:44:34 +02:00
volth
52f53c69ce pkgs/*: remove unreferenced function arguments 2018-07-21 02:48:04 +00: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
Graham Christensen
390f6a985b
Revert "Revert "bzip2: patch for CVE-2016-3189""
This reverts commit 6393ca650e.
2016-11-30 19:30:52 -05:00
Tuomas Tynkkynen
a17216af4c treewide: Shuffle outputs
Make either 'bin' or 'out' the first output.
2016-08-29 14:49:51 +03:00
Bjørn Forsman
bd01fad0ed Captialize meta.description of all packages
In line with the Nixpkgs manual.

A mechanical change, done with this command:

  find pkgs -name "*.nix" | \
      while read f; do \
          sed -e 's/description\s*=\s*"\([a-z]\)/description = "\u\1/' -i "$f"; \
      done

I manually skipped some:

* Descriptions starting with an abbreviation, a user name or package name
* Frequently generated expressions (haskell-packages.nix)
2016-06-20 13:55:52 +02:00
Vladimír Čunát
68b4c4caa7 bzip2: greatly simplify by using autoconfiscated version
I don't know there's still need for linkStatic or cygwin special-casing,
but I left it there for now.
2016-05-05 08:31:09 +02:00
Vladimír Čunát
91f2b9ed66 bzip2: fix on mingw
The whole expression is rather a mess, mainly due to upstream
often behaving badly with non-standard configurations.
2016-04-23 10:52:01 +02:00
Vladimír Čunát
09af15654f Merge master into closure-size
The kde-5 stuff still didn't merge well.
I hand-fixed what I saw, but there may be more problems.
2016-03-08 09:58:19 +01:00
Dan Peebles
6f2ab634f9 bzip2: fix shared library generation on darwin
This fixes #6504
(cherry picked from commit 31ab7d38f2)
2016-02-13 17:20:44 +01:00
Dan Peebles
31ab7d38f2 bzip2: fix shared library generation on darwin
This fixes #6504
2016-02-13 10:31:36 -05:00
Bojan Nikolic
9f2cc14107 bzip2: Fix cross-compilation
The cross-compiling the "patchPhase" from the parent attribute set was
preventing application of patches specified in the crossDrv. Fix by
turning patchPhase into postPatch.
2016-02-11 15:31:16 +01:00
Vladimír Čunát
716aac2519 Merge branch 'staging' into closure-size 2016-01-19 09:55:31 +01:00
janus
a1ade02cdc FreeBSD support 2016-01-01 16:59:48 +00:00
Luca Bruno
5b0352a6a4 Merge branch 'master' into closure-size 2015-12-11 18:31:00 +01:00
Matthias C. M. Troffaes
aeb3d8ce4c bzip2: fix cross build on mingw by using autoconf patch 2015-11-23 11:25:03 +00:00
Matthias C. M. Troffaes
5f25c63bfd Revert "bzip2: fix cross build on mingw by using autoconf patch"
This reverts commit 094c374941.
2015-11-23 11:23:37 +00:00
Vladimír Čunát
333d69a5f0 Merge staging into closure-size
The most complex problems were from dealing with switches reverted in
the meantime (gcc5, gmp6, ncurses6).
It's likely that darwin is (still) broken nontrivially.
2015-11-20 14:32:58 +01:00
Matthias C. M. Troffaes
094c374941 bzip2: fix cross build on mingw by using autoconf patch 2015-11-18 16:33:36 +00:00
aszlig
96648a8526
bzip2: Get rid of the custom builder.sh.
Everything the builder.sh did can be done with the generic builder which
makes it easier to override attributes and also easier to read.

The reason I've done this is because of #10820, which tries to override
the preBuild hook, but the latter is hardcoded in the builder.sh of
bzip2.

I have compared the output of this against the previous version and the
only things that were different were timestamps in libbz2.a.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-11-17 16:25:56 +01:00
Vladimír Čunát
a99e543c36 bzip2: split into multiple outputs, refactor 2015-04-18 19:32:52 +02:00
Eelco Dolstra
a0f3faf34e Merge remote-tracking branch 'origin/glibc-2.20' into staging 2014-11-16 22:17:36 +01:00
Eelco Dolstra
5cc92eb0d8 Remove obsolete useDietLibC stdenv adapter 2014-10-29 13:43:00 +01:00
Eric Seidel
0577499d74 fix some packages on darwin 2014-09-09 13:54:26 -07:00
aszlig
423be7712b
bzip2/cross: Patch out erroneous path separator.
Not sure why this even got into the upstream release, as _all_ other
includes use forward slashes.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-02-24 07:26:23 +01:00
Shea Levy
8480a90d1e bzip2: Keep libbz2.so.1.0 around.
Some packages (e.g. libarchive) try to link there. Reported by jack_c in IRC.
2012-07-12 14:28:19 -04:00
Eelco Dolstra
0f4d6b791e * bzip2 installs a weird libbz2.so.1.0 symlink, which should be
libbz2.so.1.  And libbz2.so should link to libbz2.so.1.0.6.

svn path=/nixpkgs/branches/stdenv-updates/; revision=34095
2012-05-14 21:57:18 +00:00
Eelco Dolstra
c556a6ea46 * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless
function, so obsolete it.

svn path=/nixpkgs/branches/stdenv-updates/; revision=31644
2012-01-18 20:16:00 +00:00
Eelco Dolstra
33090b2198 * bzip2 updated to 1.0.6 (with a fix for CVE-2010-0405).
svn path=/nixpkgs/branches/stdenv-updates/; revision=30853
2011-12-12 17:06:31 +00:00
Peter Simons
b2ae5a5ba9 pkgs/tools/compression/bzip2: move --mandir into standard location $out/share/man
svn path=/nixpkgs/branches/stdenv-updates/; revision=25007
2010-12-06 17:48:52 +00:00
Lluís Batlle i Rossell
fca582bff0 Updating from trunk. I had to resolve the pcre and some stdenv2 in all-packages
svn path=/nixpkgs/branches/stdenv-updates/; revision=24155
2010-10-07 21:21:31 +00:00
Peter Simons
d0cdb3a02a pkgs/tools/compression/bzip2: strip trailing whitespace
svn path=/nixpkgs/trunk/; revision=24142
2010-10-07 13:14:25 +00:00
Peter Simons
5b87d8b27d pkgs/tools/compression/bzip2: completed meta section
svn path=/nixpkgs/trunk/; revision=24138
2010-10-07 13:14:09 +00:00
Lluís Batlle i Rossell
19b9811012 Making a bunch of basic programs cross-buildable.
After this, the 'bootstrap-tools' can be cross-built.


svn path=/nixpkgs/branches/stdenv-updates/; revision=20945
2010-04-04 18:10:42 +00:00
Lluís Batlle i Rossell
4b27d28701 Porting changes from stdenv-updates into this branch.
This comes from:
svn diff  ^/nixpkgs/trunk/@18255 ^/nixpkgs/branches/stdenv-updates/ > diff
patch -p0 < diff
and then adding into svn all files new from the patch.

trunk@18255 comes from the last time I updated stdenv-updates from trunk.


svn path=/nixpkgs/stdenv-updates2/; revision=18272
2009-11-08 00:32:12 +00:00
Eelco Dolstra
f468a5597a * Install a libbz2.so symlink. Otherwise, programs that link against
-lbz2 will get libbz2.a, which is generally not what we want.

svn path=/nixpkgs/branches/stdenv-updates/; revision=14307
2009-03-03 10:42:51 +00:00
Eelco Dolstra
1c623126c7 * Use the sh from klibc in the bootstrap. It's a lot smaller than
bash.  Also, use the cpio from klibc instead of tar.

svn path=/nixpkgs/branches/stdenv-updates/; revision=13905
2009-01-29 17:48:45 +00:00
Eelco Dolstra
cd60dc0ede * Various updates.
svn path=/nixpkgs/branches/stdenv-updates/; revision=12051
2008-06-12 09:49:40 +00:00
Yury G. Kudryashov
4d5a4ea903 More homepages
svn path=/nixpkgs/trunk/; revision=10419
2008-01-31 10:11:09 +00:00
Eelco Dolstra
fba07b7840 * bzip2 1.0.4 (NIXPKGS-57).
svn path=/nixpkgs/trunk/; revision=8744
2007-05-24 13:37:03 +00:00