1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-02 18:42:15 +00:00
Commit graph

208 commits

Author SHA1 Message Date
Igor Pashev ce5cc9d803 Added pxz 2014-11-01 18:59:20 +01:00
Eelco Dolstra 5cc92eb0d8 Remove obsolete useDietLibC stdenv adapter 2014-10-29 13:43:00 +01:00
Eelco Dolstra 09dc132e04 Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	pkgs/development/libraries/poppler/default.nix
2014-10-16 15:16:50 +02:00
Longrin Wischnewski 6e7de2155b change md5sum to sha256sum for a few packages 2014-10-12 16:13:21 +02:00
Eelco Dolstra 811de3bfaa Merge remote-tracking branch 'origin/staging' into darwin-clang-stdenv
Conflicts:
	pkgs/tools/security/gnupg/default.nix
2014-10-09 10:57:57 +02:00
Aristid Breitkreuz 2c107b86f6 remove unused parameter from gzip derivation 2014-10-08 20:23:27 +02:00
Aristid Breitkreuz 51c97e8e8f lzip: update from 1.15 to 1.16 2014-10-07 21:50:40 +02:00
Eelco Dolstra a6ddb9243d xz: Update to 5.0.7 2014-10-06 20:51:51 +02:00
Eelco Dolstra cd71f7a2e6 Merge branch 'darwin-stdenv' of github.com:joelteon/nixpkgs into staging
Conflicts:
	pkgs/development/interpreters/ruby/ruby-19.nix
	pkgs/development/libraries/libc++/default.nix
	pkgs/development/libraries/libc++abi/default.nix
	pkgs/tools/text/sgml/opensp/default.nix
2014-09-23 11:27:53 +02:00
Eelco Dolstra 91ec6e0d90 Merge remote-tracking branch 'origin/master' into staging 2014-09-18 22:28:35 +02:00
Michael Raskin d78973078a Adding AdvanceCOMP deflate compression optimizer 2014-09-17 11:27:13 +04:00
Gergely Risko e6bf8a09ba Fix xz to not depend on bootstrap-tools 2014-09-14 21:00:12 +02:00
Eric Seidel 0577499d74 fix some packages on darwin 2014-09-09 13:54:26 -07:00
Peter Simons 1c0d15b90e Merge branch 'origin/master' into staging.
Conflicts:
	pkgs/development/libraries/ffmpeg/2.x.nix
	pkgs/development/libraries/serf/default.nix
2014-09-02 12:31:03 +02:00
Daniel Peebles 3182cf00ff Add xar 2014-08-30 22:52:46 +01:00
Vladimír Čunát e51f73652d Merge recent master into staging
Hydra: ?compare=1149952

Conflicts:
	nixos/doc/manual/configuration.xml (changed split file)
	nixos/modules/config/users-groups.nix (choosing filterNull instead of inline definition)
	pkgs/development/libraries/readline/readline6.3.nix (auto-solved)
2014-08-30 10:04:02 +02:00
Bjørn Forsman c9baba9212 Fix many package descriptions
(My OCD kicked in today...)

Remove repeated package names, capitalize first word, remove trailing
periods and move overlong descriptions to longDescription.

I also simplified some descriptions as well, when they were particularly
long or technical, often based on Arch Linux' package descriptions.

I've tried to stay away from generated expressions (and I think I
succeeded).

Some specifics worth mentioning:
 * cron, has "Vixie Cron" in its description. The "Vixie" part is not
   mentioned anywhere else. I kept it in a parenthesis at the end of the
   description.

 * ctags description started with "Exuberant Ctags ...", and the
   "exuberant" part is not mentioned elsewhere. Kept it in a parenthesis
   at the end of description.

 * nix has the description "The Nix Deployment System". Since that
   doesn't really say much what it is/does (especially after removing
   the package name!), I changed that to "Powerful package manager that
   makes package management reliable and reproducible" (borrowed from
   nixos.org).

 * Tons of "GNU Foo, Foo is a [the important bits]" descriptions
   is changed to just [the important bits]. If the package name doesn't
   contain GNU I don't think it's needed to say it in the description
   either.
2014-08-24 22:31:37 +02:00
Luca Bruno b83aceaecb Merge branch 'master' into staging 2014-08-14 23:09:59 +02:00
Sander van der Burg ba54614773 kzipmix: create package 2014-08-14 16:10:30 +02:00
Gergely Risko 59291fdbf4 Get rid of bootstrap-tools dependency from xz (and therefore stdenv)
0769fc5b77 broke this by setting CONFIG_SHELL.
2014-08-14 02:06:44 +02:00
Mateusz Kowalczyk 7a45996233 Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
aszlig 625d7b9043
Merge pull request #1928 from 'cross-win-osx'.
This includes a lot of fixes for cross-building to Windows and Mac OS X
and could possibly fix things even for non-cross-builds, like for
example OpenSSL on Windows.

The main reason for merging this in 14.04 already is that we already
have runInWindowsVM in master and it doesn't work until we actually
cross-build Cygwin's setup binary as the upstream version is a fast
moving target which gets _overwritten_ on every new release.

Conflicts:
	pkgs/top-level/all-packages.nix
2014-04-21 10:00:35 +02:00
Austin Seipp 960690e931 bsdiff: adopt and clean up
Bonus: simpler build, and should fix the build of bsdiff for Darwin
(patch taken from homebrew).

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-03-28 18:52:37 -05: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
Lluís Batlle i Rossell 5d8ca218df upx: updating to 3.91. 2014-02-04 10:12:28 +01:00
Eelco Dolstra e07ce3314d Fix some "meta.licenses" attributes 2014-01-25 03:04:46 +01:00
Vladimír Čunát 0a58b512cb Merge master into stdenv-updates
Conflicts (simple):
	pkgs/development/compilers/gcc/4.8/default.nix
	pkgs/development/compilers/llvm/default.nix
	pkgs/development/libraries/gmp/5.1.1.nix
	pkgs/development/libraries/gmp/5.1.3.nix
	pkgs/development/libraries/gmp/5.1.x.nix
	pkgs/top-level/all-packages.nix
2014-01-18 14:46:20 +01:00
Peter Simons 088b35edfb pigz: update to version 2.3.1 2014-01-13 17:05:45 +01:00
Peter Simons 44df3d7799 lzip: update to version 1.15 2014-01-13 17:05:45 +01:00
Eelco Dolstra a9a3ed1084 gzip: Don't depend on stdenv-linux.
Issue #1469.
2014-01-07 17:50:30 +01:00
Eelco Dolstra c17e263ae9 gzip: Don't depend on less
No need to make stdenv bootstrap more bloated than necessary.
2014-01-07 14:12:10 +01:00
Vladimír Čunát e740b565cf Merge master into stdenv-updates
Conflicts (easy):
	pkgs/development/compilers/llvm/default.nix
	pkgs/development/compilers/openjdk/default.nix
	pkgs/development/libraries/icu/default.nix
	pkgs/development/libraries/libssh/default.nix
	pkgs/development/libraries/libxslt/default.nix
	pkgs/development/tools/parsing/bison/3.x.nix
2013-12-29 10:01:22 +01:00
Nixpkgs Monitor 7af191826e upx: update from 3.07 to 3.09 2013-12-21 02:28:28 +02:00
Peter Simons 91f2c362de Merge remote-tracking branch 'origin/master' into stdenv-updates.
Conflicts:
	pkgs/top-level/all-packages.nix
2013-10-26 18:28:05 +02:00
Michael Raskin 8c94c3ad08 Updating lrzip to 0.616 2013-10-20 21:10:02 +04:00
Peter Simons 6be8ad3392 Merge branch 'origin/master' into stdenv-updates.
There was a minor conflict in 'stumpwm'. The package needs texinfo
version 4.x. At least is used to, I'm not sure whether it still does.
2013-10-18 18:57:24 +02:00
Jaka Hudoklin 9239b6df47 Add gzrt, gzip Recovery Toolkit 2013-10-17 18:35:24 +02:00
Eelco Dolstra 81a647696e xz: Update to 5.0.5 2013-08-26 14:25:51 +02:00
Peter Simons 0d7118814b Merge branch 'origin/master' into stdenv. 2013-08-17 10:00:16 +02:00
Ludovic Courtès 2e937c437a unmaintain several packages 2013-08-16 23:45:01 +02:00
Peter Simons 522acfd2f4 Merge remote-tracking branch 'master' into stdenv-updates.
Conflicts:
	pkgs/applications/version-management/git-and-tools/git/default.nix
	pkgs/top-level/all-packages.nix
2013-07-30 11:29:30 +02:00
Evgeny Egorochkin da4be371e9 make package use mirror:// for gnu, savannah and gnome repositories where possible 2013-07-14 05:23:06 +03:00
Evgeny Egorochkin b084b29d26 Even more mirror:// fixes 2013-07-14 04:17:07 +03:00
Vladimír Čunát 4a7696589d gzip: update 1.5 -> 1.6, use less in tests now 2013-06-30 08:59:29 +02:00
Peter Simons 728e305205 Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-05-22 12:30:02 +02:00
Lluís Batlle i Rossell d72da0329d zsync: update to 0.6.2 2013-05-17 23:48:22 +02:00
Danny Wilson d007a78ccb Merge remote-tracking branch 'origin/stdenv-updates' into illumos
Conflicts:
	pkgs/development/libraries/gmp/5.1.1.nix
	pkgs/development/libraries/mpc/default.nix
	pkgs/development/libraries/mpfr/default.nix
	pkgs/development/libraries/ppl/default.nix
	pkgs/tools/misc/coreutils/default.nix
2013-03-17 13:22:24 +01:00
Peter Simons 5f758431d4 lzip: build the binary with -O3 and assertions disabled 2013-03-13 15:13:40 +01:00
Peter Simons c187516152 lzip: enable documentation build 2013-03-13 15:13:40 +01:00
Peter Simons 6d5c6af427 lzip: update to version 1.14 2013-03-13 13:59:33 +01:00
Michael Raskin b494b3b468 Update lrzip 2013-03-09 16:33:14 +04:00
Danny Wilson fcce211c8e Fix GZip build on Illumos 2013-02-28 20:04:02 +01:00
Eelco Dolstra 2aa6f262cb Merge remote-tracking branch 'origin/master' into stdenv-updates 2013-02-15 13:36:34 +01:00
Peter Simons 6b702f23ea lzip: add version 1.14-rc3 2013-02-06 13:15:12 +01:00
Eelco Dolstra 68da39a63f xz: Update to 5.0.4 2012-09-18 14:52:41 -04:00
Eelco Dolstra 51a6b27cc7 gzip: Update to 1.5
This fixes the gets() problem in gzip.

Also disabled "make check" because it depends on Perl and more/less,
which is undesirable in the stdenv bootstrap.
2012-09-18 14:30:19 -04:00
Peter Simons d5677fe6c7 stdenv-updates: merge updates from 'master' branch 2012-09-11 16:48:41 +02: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
Lluís Batlle i Rossell 3bdc4b417f lrzip: adding an upstream patch that fixes its md5 checksum.
The next version will have this fix already.
2012-07-05 09:56:22 +02:00
Shea Levy 015e7594d0 Merge remote-tracking branch 'upstream/master' into stdenv-updates 2012-07-02 11:27:25 -04:00
Ludovic Courtès e80145b909 tar, gzip: Adjust the `gets' patch.
Fixes the incorrect patches introduced in
9786a98261.
2012-07-02 16:10:46 +02:00
Ludovic Courtès 9786a98261 tar, gzip, diffutils: Allow builds with newer versions of glibc.
This is a follow-up to 77fdc7bb35 ("GNU
Coreutils: Allow builds with newer versions of glibc.").
2012-07-01 01:14:56 +02:00
Shea Levy 8cc0edaeba Merge branch 'master' into stdenv-updates
ssp is disabled for glibc-2.13 unconditionally
2012-06-27 13:48:22 -04:00
Antono Vasiljev 1fb5c38fce Updated ncompress url (prev version missing on mirrors) (Fixes #21) 2012-06-24 16:37:32 +03: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
Peter Simons 7a4f8c97c5 pigz: updated to version 2.2.4
svn path=/nixpkgs/trunk/; revision=34058
2012-05-11 12:16:09 +00:00
Lluís Batlle i Rossell 2523c0b9d1 Updating lrzip to 0.612.
svn path=/nixpkgs/trunk/; revision=33991
2012-05-05 15:50:31 +00:00
Yury G. Kudryashov 57fd764a39 svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=32792
2012-03-05 10:00:23 +00:00
Lluís Batlle i Rossell f20a947a5d Updating lzop
svn path=/nixpkgs/trunk/; revision=32730
2012-03-01 22:03:34 +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
Ludovic Courtès 0baf364715 XZ Utils 5.0.3.
svn path=/nixpkgs/branches/stdenv-updates/; revision=29846
2011-10-14 21:56:07 +00:00
Lluís Batlle i Rossell 074ef3fd85 Updating lrzip
svn path=/nixpkgs/trunk/; revision=27304
2011-05-25 22:19:53 +00:00
Lluís Batlle i Rossell 6aa761ab3b Removing a superfluous argument in upx
svn path=/nixpkgs/trunk/; revision=26621
2011-03-31 10:04:52 +00:00
Lluís Batlle i Rossell 56acf8aeb0 Updating upx (and I tried to make it use fine lzma and ucl)
svn path=/nixpkgs/trunk/; revision=26620
2011-03-31 09:49:54 +00:00
Lluís Batlle i Rossell ee04ffcb55 Updating from trunk. I resolved simple conflicts.
svn path=/nixpkgs/branches/stdenv-updates/; revision=25061
2010-12-11 12:47:00 +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
Eelco Dolstra aa01c8abd6 * Added xdelta.
svn path=/nixpkgs/trunk/; revision=24907
2010-11-28 16:37:48 +00:00
Michael Raskin 293704a6f8 Fix the makefile
svn path=/nixpkgs/branches/stdenv-updates/; revision=24816
2010-11-22 23:16:05 +00:00
Lluís Batlle i Rossell a38202bc8b Updating xz to a stable version. Not beta anymore. (more stdenv rebuild)
svn path=/nixpkgs/branches/stdenv-updates/; revision=24483
2010-10-26 08:33:18 +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 02bd68fa15 Removing a gzip patch we had, as it looks like being in the new upstream release.
svn path=/nixpkgs/branches/stdenv-updates/; revision=23307
2010-08-21 15:36:48 +00:00
Ludovic Courtès e0fa7776d3 GNU gzip 1.4.
svn path=/nixpkgs/branches/stdenv-updates/; revision=23278
2010-08-20 15:26:26 +00:00
Lluís Batlle i Rossell 86345919c2 Updating from trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=22254
2010-06-14 09:28:10 +00:00
Lluís Batlle i Rossell 6c4cb05613 Adding zsync
svn path=/nixpkgs/trunk/; revision=22158
2010-06-05 19:23:57 +00:00
Lluís Batlle i Rossell 4328f6a1fe Updating bsdiff
svn path=/nixpkgs/trunk/; revision=22156
2010-06-05 11:40:23 +00:00
Lluís Batlle i Rossell fa1a414aee Merging from trunk - I had to resolve conflicts on coreutils; I hope I resolved that
well


svn path=/nixpkgs/branches/stdenv-updates/; revision=21975
2010-05-25 20:38:18 +00:00
Eelco Dolstra 81cd88d83d * Remove a bunch of empty files/directories.
svn path=/nixpkgs/trunk/; revision=21911
2010-05-20 10:51:19 +00:00
Lluís Batlle i Rossell 6f2fac6466 Merging from trunk.
I hope I resolved the conflicts well (gmp and gccCross)


svn path=/nixpkgs/branches/stdenv-updates/; revision=21251
2010-04-22 21:44:33 +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
Ludovic Courtès 525274bd94 xz: Fix x86_64-darwin builds.
svn path=/nixpkgs/trunk/; revision=20916
2010-04-01 14:52:14 +00:00
Ludovic Courtès dd5de51265 ncompress 4.2.4.3.
svn path=/nixpkgs/trunk/; revision=20712
2010-03-17 14:44:42 +00:00
Lluís Batlle i Rossell 4e59f00501 I added again nasm as lrzip input. It is required in i686-linux at least.
svn path=/nixpkgs/trunk/; revision=20467
2010-03-07 22:46:29 +00:00
Lluís Batlle i Rossell 7a2ad368f9 Updating lrzip. It does not depend on nasm anymore.
svn path=/nixpkgs/trunk/; revision=20463
2010-03-07 21:03:50 +00:00
Lluís Batlle i Rossell 75e0d28624 Updating upx - now it builds with gcc 4.4
svn path=/nixpkgs/trunk/; revision=20160
2010-02-22 08:08:23 +00:00
Lluís Batlle i Rossell 40985548d1 Merging from Oleksandr:
Updating some gnome packages and pigz.


svn path=/nixpkgs/trunk/; revision=20154
2010-02-21 12:25:36 +00:00
Eelco Dolstra a617a7c239 * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=19786
2010-02-03 14:23:43 +00:00
Rob Vermaas 13417770a3 applying patches provided by griswold
svn path=/nixpkgs/trunk/; revision=19707
2010-01-27 12:12:35 +00:00