Commit graph

473 commits

Author SHA1 Message Date
Vladimír Čunát
d3b25752f1 p7zip: small update to fix CVE-2015-1038 2015-02-12 20:51:26 +01:00
Domen Kožar
d50bfd7515 unzip: CVE-2014-9636, fixes #6128 2015-02-04 11:17:19 +01:00
Michael Raskin
b09b841dc4 Update ZPAQ 2015-02-01 18:41:32 +03:00
Pascal Wittmann
58e97d6531 xarchiver: update from 0.5.3 to 0.5.4 2015-01-15 01:01:52 +01:00
James Cook
173f41cf0b unzip: Patch for CVE-2014-81{39,40,41}. 2015-01-08 11:29:40 -08:00
John Wiegley
28b6fb61e6 Change occurrences of gcc to the more general cc
This is done for the sake of Yosemite, which does not have gcc, and yet
this change is also compatible with Linux.
2014-12-26 11:06:21 -06:00
Michael Raskin
ed19e6755f ZPAQ: 655 → 660 2014-12-21 11:14:26 +03:00
Vladimír Čunát
225ddcda9a cpio: fix CVE-2014-9112 by Fedora patch 2014-12-10 19:20:28 +01:00
Shea Levy
3cc397b2a1 dar: bump
cc @viric
2014-11-23 12:56:49 -05:00
Eelco Dolstra
0518ccf5af Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	pkgs/stdenv/generic/default.nix
2014-11-06 10:16:39 +01:00
Mateusz Kowalczyk
007f80c1d0 Turn more licenses into lib.licenses style
Should eval cleanly, as far as -A tarball tells me.

Relevant: issue #2999, issue #739
2014-11-06 00:48:16 +00:00
Michael Raskin
bc5f55cc91 Adopt a few packages 2014-11-05 11:56:19 +03:00
Eelco Dolstra
7495c61d49 Merge remote-tracking branch 'origin/darwin-clang-stdenv' into staging
Conflicts:
	pkgs/applications/editors/vim/macvim.nix
2014-11-04 14:30:43 +01:00
Vladimír Čunát
2cf17b0802 Merge recent master into staging
Hydra nixpkgs: ?compare=1156478
2014-10-23 17:40:41 +02:00
Nikolay Amiantov
b580be236c rpmextract: accept multiple input files 2014-10-22 16:53:32 +04:00
Nikolay Amiantov
4dba792a59 rpmextract: add package 2014-10-20 03:16:24 +04: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
Igor Pashev
0635f1640f atool's configure script uses bashizm
if test "${startperl:0:1}" = "#" ; then
  startperl="\\$startperl"
fi

This results in an error:
checking for perl... /nix/store/6qvjjaywj6qf8jn9splpiz9qap01w36w-perl-5.16.3/bin/perl
./configure: 2264: ./configure.lineno: Bad substitution
builder for ‘/nix/store/nk9y51xlzsbkhswc5cpl3hkryg2xw85g-atool-0.39.0.drv’ failed with exit code 2
2014-10-09 21:59:46 +04:00
Aristid Breitkreuz
8fcdbfcd93 cromfs: update from 1.5.10.1 to 1.5.10.2 2014-10-08 20:23:24 +02:00
Eelco Dolstra
a2c7804903 Revert "gnutar: Update to 1.28"
This reverts commit 00c0c2a785.

http://hydra.nixos.org/build/15653534
2014-10-07 18:38:07 +02:00
Eelco Dolstra
00c0c2a785 gnutar: Update to 1.28 2014-10-06 20:53:54 +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
Joel Taylor
3e8344d334 suitable clang stdenv 2014-09-09 13:54:24 -07:00
Eelco Dolstra
42ee226184 Fix unzip setup hook 2014-09-08 22:32:37 +02:00
Vladimír Čunát
82797f98f2 Merge branch 'staging' into modular-stdenv
Conflicts:
	pkgs/development/interpreters/perl/5.10/setup-hook.sh
	pkgs/development/interpreters/perl/5.8/setup-hook.sh
	pkgs/stdenv/linux/default.nix
2014-09-08 18:24:58 +02:00
Nathaniel Baxter
4a1a77a432 unrar: Fixed license typo 2014-09-06 20:53:45 +10:00
Emery Hemingway
1124d8a9b9 unrar: update from 5.1.5 to 5.1.7, change license to 'unfree-redistributable' 2014-09-05 11:38:44 -04:00
Mateusz Kowalczyk
eac5176529 Fix license on unRAR to unfree.
This license is BAD and it needs to be caught. You need to agree to the
use conditions or you have to remove the software from your machine
which makes it not redistributable.

cc @ehmry
2014-09-05 01:47:16 +01:00
Vladimír Čunát
8da52a642a Merge branch 'staging' into v/modular
Conflicts (easy):
	pkgs/development/interpreters/perl/5.10/setup-hook.sh
	pkgs/development/interpreters/perl/5.8/setup-hook.sh
	pkgs/development/libraries/gtk+/2.x.nix
2014-08-31 12:23:18 +02:00
Vladimír Čunát
a70180ba73 mutiout: make it builtin 2014-08-30 08:27:43 +02:00
Vladimír Čunát
fb59f27a43 WIP: getting good 2014-08-27 01:14:09 +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
Eelco Dolstra
2def8e7499 Remove addHook
Just use bash arrays directly. I.e.

  addHook preConfigure myPreConfigure

is now

  preConfigureHooks+=(myPreConfigure)
2014-08-09 12:45:53 +02:00
Eelco Dolstra
d7b356f73b stdenv: Move unzip support to unzip's setup hook 2014-08-09 12:44:50 +02:00
Eelco Dolstra
f97ee61255 unzip: Clean up expression 2014-08-09 12:44:49 +02:00
Michael Raskin
20028936ab Update ZPAQ 2014-08-03 22:29:41 +04:00
Mateusz Kowalczyk
7a45996233 Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
Bjørn Forsman
9f744961b8 zip: add meta.description 2014-06-23 13:35:08 +02:00
Michael Raskin
b7b58f90d8 Update ZPAQ 2014-06-10 09:41:23 +04:00
Michael Raskin
783fb585bf Updating ZPAQ to 651 2014-05-28 01:33:29 +04:00
Rob Vermaas
29dc000e60 unrar: update from 5.1.2 to 5.1.5 2014-05-22 12:53:51 +02:00
John Wiegley
cd7c5fe198 Allow dar to build on Darwin 2014-05-10 14:04:13 -05:00
Eelco Dolstra
dbd332d147 Fix meta.maintainer -> meta.maintainers 2014-04-23 14:26:32 +02:00
wmertens
7029c291c6 Builds fine on Darwin 2014-04-20 16:17:34 +01:00
Emery Hemingway
0af5954f5b unrar: update 3.9.10 to 5.1.2 2014-04-17 14:32:03 +02:00
Michael Raskin
788b3f9ff9 Update zpaq 2014-03-08 21:13:00 +04:00
Domen Kožar
68a5b5e5fb add xarchiver: GTK+2 only frontend to 7z,zip,rar,tar,bzip2, gzip,arj, lha, rpm and deb (open and extract only) 2014-02-21 13:19:25 +01:00
Eelco Dolstra
bc5995e392 cpio: Fix build on Darwin 2014-01-28 13:38:08 +01:00
Vladimír Čunát
9443129b08 Merge master into stdenv-updates
Conflicts:
	pkgs/development/libraries/glibc/2.18/common.nix (take stdenv-updates)
	pkgs/misc/emulators/zsnes/default.nix (more complex, build tested)
	pkgs/top-level/all-packages.nix (auto-solved)
2014-01-04 18:34:53 +01:00
Michael Raskin
ad45ac4c2a Update ZPAQ 2014-01-04 15:01:30 +04:00
Peter Simons
45e8de9a7d Merge branch 'origin/master' into stdenv-updates.
Conflicts:
	pkgs/tools/misc/less/default.nix
2013-12-16 21:13:24 +01:00
Nixpkgs Monitor
6619a3a1d8 dar: update from 2.4.6 to 2.4.11 2013-12-15 12:49:39 +02:00
Peter Simons
486e7736df Merge remote-tracking branch 'origin/master' into stdenv-updates.
Conflicts:
	pkgs/tools/networking/p2p/amule/default.nix
2013-12-10 00:25:54 +01:00
Peter Simons
f0d3e92b33 atool: have Hydra build this tool only on Linux 2013-12-06 19:32:34 +01:00
Peter Simons
29c11ef8a5 gnutar: update to version 1.27.1 2013-12-02 13:00:02 +01: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
9eba67dbcd Fix/split ZPAQ after upgrade 2013-10-20 22:30:40 +04:00
Michael Raskin
bf721764ac Updating ZPAQ to 642 2013-10-20 21:09:45 +04:00
Peter Simons
134776e5e9 gnutar: drop obsolete gets-undeclared.patch 2013-10-18 12:50:48 +02:00
Peter Simons
bff3101607 gnutar: update to version 1.27 2013-10-10 11:55:19 +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
76244ac2e2 Merge branch 'master' into stdenv-updates
Conflicts:
	pkgs/development/compilers/ghc/with-packages.nix
2013-08-16 22:51:13 +02:00
Jason "Don" O'Conal
e822cc9c44 p7zip: fix build on darwin 2013-08-15 13:53:43 +10: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
Lluís Batlle i Rossell
206706503a cromfs: update to 1.5.10.1. 2013-07-14 22:27:51 +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
83e37cdac8 atool: fix version to match tarball 2013-07-14 02:08:48 +03:00
Domen Kozar
303c3a9fbf unzip: add bzip2 as native build input
Signed-off-by: Domen Kozar <domen@dev.si>
2013-05-26 19:25:37 +02:00
Domen Kozar
0f8a1b29d2 unzip: add bzip2 as native build input 2013-05-26 13:22:55 +02:00
Peter Simons
728e305205 Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-05-22 12:30:02 +02:00
Domen Kozar
db04466380 xarchive: add gtk archiver 2013-05-05 22:03:50 +02:00
Shea Levy
fde3526e7d Merge branch 'master' into stdenv-updates
Conflict in kerberos, which was updated both in master and in
stdenv-updates. Kept the stdenv-updates version, except pulled in the
enableParallelBuilding change from master.

Signed-off-by: Shea Levy <shea@shealevy.com>

Conflicts:
	pkgs/development/libraries/kerberos/krb5.nix
2013-05-04 18:28:48 -04:00
Michael Raskin
b98ece6bc2 Auto-update some packages; no early build failures (SBCL and Wine not yet fully built) 2013-04-23 09:15:48 +04:00
Vladimír Čunát
32a503a5d3 cpio: fix build without gets 2013-03-20 23:01:36 +01: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
Michael Raskin
5ec1806564 Adding ZPAQ archiver 2013-03-09 16:33:14 +04:00
Danny Wilson
fe3a8b6859 gnutar root build: Nix on Illumos doesn't support build users yet. 2013-02-28 20:04:05 +01:00
Danny Wilson
c019cdb761 Update CPIO to 2.11 2013-02-28 20:04:02 +01:00
Danny Wilson
bcaea92a12 Attempt at getting GCC 4.7 compiled on Illumos...
No success yet :-(
2013-02-28 20:04:01 +01:00
Eelco Dolstra
5e256ccc88 Merge remote-tracking branch 'origin/master' into stdenv-updates 2012-12-04 17:12:35 +01:00
Eelco Dolstra
5553546c21 Remove a bunch of unreferenced files
Plus a small number of obsolete packages (like old versions of qemu).
2012-11-29 13:43:37 +01:00
Peter Simons
f67d5a9a39 Merge branch 'master' into stdenv-updates.
Conflicts have been resolved in:

        pkgs/tools/misc/file/default.nix
        pkgs/top-level/all-packages.nix
        pkgs/top-level/python-packages.nix
2012-11-21 16:20:36 +01:00
Lluís Batlle i Rossell
16dbe75e57 sharutils: making them crossbuild, thanks to a patch.
Patch taken from:
http://repository.timesys.com/buildsources/s/sharutils/sharutils-4.11.1/sharutils-4.11.1-cross-binary-mode-popen.patch
after a google search for the guilty part of 'configure'.
2012-11-08 19:38:24 +01:00
Rickard Nilsson
2658eccaea zip: Add extra source URL 2012-11-06 11:23:34 +01:00
Eelco Dolstra
d9c01ef51d p7zip: Update to 9.20.1 2012-10-05 16:06:35 -04:00
Eelco Dolstra
e8c4748cdb cabextract: Update to 1.4 2012-10-05 16:06:19 -04:00
Eelco Dolstra
5833b2ee30 sharutils: Fix building on Glibc 2.16
http://hydra.nixos.org/build/3046590
2012-09-21 10:49:26 -04:00
Eelco Dolstra
a893399776 Fix more gets() problems 2012-09-18 14:51:15 -04:00
Sergey Mironov
36f0a97fc6 atool: add archiver helper 2012-08-15 01:10:05 +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
Lluís Batlle
ae7991b97e Updating dar to 2.4.6 2012-06-24 19:12:20 +02:00
Nicolas Pierron
82b308bf11 Add armv7l support.
svn path=/nixpkgs/trunk/; revision=33798
2012-04-15 23:41:25 +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
Eelco Dolstra
27809f0ec4 * No longer needed.
svn path=/nixpkgs/trunk/; revision=32772
2012-03-04 15:50:03 +00:00
Lluís Batlle i Rossell
53e80e5316 Adding a manpage for tar, using help2man
svn path=/nixpkgs/trunk/; revision=32749
2012-03-03 09:52:55 +00:00
Shea Levy
ea195b2507 svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=32564
2012-02-25 19:57:34 +00:00
Lluís Batlle i Rossell
bfb0389d6c Disabling NLS for the zip at openoffice builders. I think it breaks the builds, based on
the nixpkgs diff for the breakage at http://hydra.nixos.org/build/1964660 .


svn path=/nixpkgs/trunk/; revision=32556
2012-02-25 15:54:57 +00:00
Eelco Dolstra
5baef98dd9 * Cromfs updated to 1.5.10 (to get it to build with GCC 4.6).
svn path=/nixpkgs/branches/stdenv-updates/; revision=32400
2012-02-19 16:58:40 +00:00
Yury G. Kudryashov
c81f618a34 svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=32273
2012-02-14 14:33:10 +00:00
Yury G. Kudryashov
96c20f97b7 unzip: fix typo in meta
svn path=/nixpkgs/trunk/; revision=32272
2012-02-14 14:29:25 +00:00
Yury G. Kudryashov
215a07c1a9 svn merge ^/nixpkgs/trunk
Merge conflicts:
* unzip (almost trivial)
* dvswitch (trivial)
* gmp (copied result of `git merge`)

The last item introduced gmp-5.0.3, thus full rebuild.
+ensureDir->mkdir -p in TeX packages was catched by git but not svn.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32091
2012-02-06 23:03:12 +00:00
Yury G. Kudryashov
75262bcbed zip, unzip: add NLS support
svn path=/nixpkgs/trunk/; revision=31961
2012-02-01 22:32:16 +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
eda3fd1730 * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=30852
2011-12-12 16:54:35 +00:00
Lluís Batlle i Rossell
8ce410c6f3 Adding more libraries to have a more featured dar.
svn path=/nixpkgs/trunk/; revision=30377
2011-11-10 21:29:00 +00:00
Lluís Batlle i Rossell
1791ea0919 Another update to dar. Let's use the very latest release.
svn path=/nixpkgs/trunk/; revision=30376
2011-11-10 21:23:09 +00:00
Lluís Batlle i Rossell
9908557ae0 Updating dar.
svn path=/nixpkgs/trunk/; revision=30375
2011-11-10 21:19:30 +00:00
Ludovic Courtès
40f2ee9200 GNU tar 1.26.
svn path=/nixpkgs/branches/stdenv-updates/; revision=29589
2011-10-02 20:35:53 +00:00
Shea Levy
4d70ba6cc9 Merge from trunk up through r28790
svn path=/nixpkgs/branches/stdenv-updates/; revision=28792
2011-08-24 19:16:43 +00:00
David Guibert
565cdcc3e1 unzip: add support for file greater than 2 GB (unix only)
svn path=/nixpkgs/branches/stdenv-updates/; revision=28622
2011-08-16 18:21:05 +00:00
Shea Levy
e861fb2bcd Remove unzip 5.52, make unzip 6.0 default
As per TODO in all-packages.nix comments

svn path=/nixpkgs/branches/stdenv-updates/; revision=28101
2011-08-01 04:53:21 +00:00
Shea Levy
6e06060c33 zip: Make it actually install something
svn path=/nixpkgs/trunk/; revision=28050
2011-08-01 01:11:01 +00:00
Shea Levy
3a74fd3f3b zip: Bump to 3.0
svn path=/nixpkgs/trunk/; revision=28049
2011-08-01 01:10:52 +00:00
Shea Levy
92e792f17b zip: Change formatting
svn path=/nixpkgs/trunk/; revision=28048
2011-08-01 01:10:44 +00:00
Shea Levy
6a34912bfb zip: Folded builder into derivation
svn path=/nixpkgs/trunk/; revision=28047
2011-08-01 01:10:36 +00:00
Ludovic Courtès
8bfb02d945 GNU Sharutils 4.11.1.
svn path=/nixpkgs/trunk/; revision=27320
2011-05-30 21:48:50 +00:00
Ludovic Courtès
1b4e4b398f GNU sharutils 4.11.
svn path=/nixpkgs/trunk/; revision=25876
2011-02-09 21:36:39 +00:00
Rob Vermaas
e3e13aaeb7 unshield, use latest svn version
svn path=/nixpkgs/trunk/; revision=25725
2011-01-30 15:30:22 +00:00
Lluís Batlle i Rossell
c7de6bfeb3 Updating cromfs to 1.5.9.1, as the previous did not build with glibc 2.12.
Thanks to Bisqwit for the quick reaction.


svn path=/nixpkgs/branches/stdenv-updates/; revision=25224
2010-12-21 14:27:48 +00:00
Ludovic Courtès
f03da539a7 GNU tar 1.25.
svn path=/nixpkgs/branches/stdenv-updates/; revision=25093
2010-12-12 23:35:27 +00:00
Lluís Batlle i Rossell
f4f84af4ab Updating from trunk. I only had to take away the usual stdenv2 in
all-packages.nix


svn path=/nixpkgs/branches/stdenv-updates/; revision=24553
2010-10-31 19:30:31 +00:00
Lluís Batlle i Rossell
b9da5de4da Updating gnu tar
svn path=/nixpkgs/branches/stdenv-updates/; revision=24484
2010-10-26 08:33:34 +00:00
Lluís Batlle i Rossell
3592b9a796 Adding unarj
svn path=/nixpkgs/trunk/; revision=24430
2010-10-23 14:55:14 +00:00
Lluís Batlle i Rossell
cd4b54748a Updating from trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=24038
2010-10-03 09:25:34 +00:00
Yury G. Kudryashov
fb6efd252a cabextract: upgrade, metadata
svn path=/nixpkgs/trunk/; revision=23964
2010-09-27 11:19:36 +00:00
Lluís Batlle i Rossell
2c5de61327 Updating from trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=23840
2010-09-17 19:10:21 +00:00
Ludovic Courtès
c23a9903fe GNU Sharutils 4.10.
svn path=/nixpkgs/trunk/; revision=23645
2010-09-05 15:18:57 +00:00
Lluís Batlle i Rossell
46082f25f9 Updating from trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=23027
2010-08-07 20:14:04 +00:00
Eelco Dolstra
ca716d5bc7 * p7zip updated to 9.13. Also build 7z and 7zr.
svn path=/nixpkgs/trunk/; revision=23016
2010-08-06 22:26:25 +00:00
Peter Simons
6cffff9de1 pkgs/tools/archivers/cpio: revert to version 2.9
The latest version, 2.11, doesn't compile on Darwin. The build
expression for 2.11 is still still available in "latest.nix".

svn path=/nixpkgs/trunk/; revision=22923
2010-08-03 10:55:58 +00:00
Lluís Batlle i Rossell
5417c720fd Merging from trunk.
I tried to fix some trivial conflicts.
I don't know if I merged well some more difficult conflicts on openssl/darwin_patch
or haskell-platform.


svn path=/nixpkgs/branches/stdenv-updates/; revision=22878
2010-08-02 15:48:19 +00:00
Eelco Dolstra
228c6e0c1f * Merged the x-updates branch (latest X server / libraries, GTK+,
Fontconfig, etc.).

svn path=/nixpkgs/trunk/; revision=22735
2010-07-26 13:59:12 +00:00
Ludovic Courtès
e4df0cab9f cpio: Disable tests on Darwin.
svn path=/nixpkgs/trunk/; revision=22713
2010-07-22 15:27:48 +00:00
Eelco Dolstra
0db478d40b * Sync with the trunk.
svn path=/nixpkgs/branches/x-updates/; revision=22707
2010-07-22 13:18:07 +00:00
Ludovic Courtès
8115040c08 GNU cpio: Add fix for Darwin.
svn path=/nixpkgs/trunk/; revision=22705
2010-07-22 12:20:11 +00:00
Eelco Dolstra
f555da864d * dar: build with --disable-dar-static, apparently the zlib update
broke it.  Also upgrade to 2.3.10 and turn on ACL support.

svn path=/nixpkgs/branches/x-updates/; revision=22690
2010-07-21 15:30:25 +00:00
Ludovic Courtès
cfae38d9f9 GNU cpio 2.11.
svn path=/nixpkgs/trunk/; revision=22458
2010-07-04 21:10:36 +00:00
Lluís Batlle i Rossell
6d88da9a23 Merging from trunk (conflict on glibc, I think I resolved it)
svn path=/nixpkgs/branches/stdenv-updates/; revision=21879
2010-05-19 15:26:00 +00:00
Armijn Hemel
fc1344e4c9 update to 0.6
svn path=/nixpkgs/trunk/; revision=21822
2010-05-17 20:22:04 +00:00
Ludovic Courtès
8f995b2e50 GNU tar: Remove obsolete patch.
svn path=/nixpkgs/branches/stdenv-updates/; revision=21262
2010-04-23 09:11:23 +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
Ludovic Courtès
99d51d0e92 Assorted GNU updates.
svn path=/nixpkgs/branches/stdenv-updates/; revision=21047
2010-04-13 08:37:54 +00:00
Lluís Batlle i Rossell
08f80eb9fb Updating unrar.
svn path=/nixpkgs/trunk/; revision=20772
2010-03-22 15:58:25 +00:00
Ludovic Courtès
888d6711da GNU Sharutils 4.9.
svn path=/nixpkgs/trunk/; revision=20362
2010-03-04 11:10:40 +00:00
Ludovic Courtès
913503155a GNU Sharutils: Pass `gettext'; run the test suite.
svn path=/nixpkgs/trunk/; revision=20164
2010-02-22 09:52:39 +00:00
Ludovic Courtès
7abc6a6b7d GNU Sharutils 4.8.
svn path=/nixpkgs/trunk/; revision=20163
2010-02-22 09:07:15 +00:00
Lluís Batlle i Rossell
863ccef2c4 Updating unrar, and making its libunrar library work (needs -DSILENT, for example)
svn path=/nixpkgs/trunk/; revision=19309
2010-01-08 20:04:23 +00:00
Lluís Batlle i Rossell
de6f189743 Adding libunrar installation, when building unrar.
svn path=/nixpkgs/trunk/; revision=19302
2010-01-07 22:42:25 +00:00
Lluís Batlle i Rossell
783e78372d Updating cromfs, and adding me as a maintainer.
svn path=/nixpkgs/trunk/; revision=19084
2009-12-23 19:56:57 +00:00
Lluís Batlle i Rossell
56e8f65d44 Updating 'dar'.
svn path=/nixpkgs/trunk/; revision=19010
2009-12-17 08:08:17 +00:00
Eelco Dolstra
7f5b839524 * Removed selectVersion. There's no good reason to write
`selectVersion ./foo "bar"' instead of `import ./foo/bar.nix'.
* Replaced `with args' with formal function arguments in several
  packages.
* Renamed several files to `default.nix'.  As a general rule, version
  numbers should only be included in the filename when there is a
  reason to keep multiple versions of a package in Nixpkgs.
  Otherwise, it just makes it harder to update the package.

svn path=/nixpkgs/trunk/; revision=18403
2009-11-18 09:39:59 +00:00
Eelco Dolstra
1608964306 svn path=/nixpkgs/trunk/; revision=17689 2009-10-07 11:29:23 +00:00
Eelco Dolstra
8cb83682c4 * p7zip updated to 9.04.
svn path=/nixpkgs/trunk/; revision=17688
2009-10-07 11:28:35 +00:00
Eelco Dolstra
672d3856df * Unzip 6.0.
svn path=/nixpkgs/trunk/; revision=17687
2009-10-07 11:18:54 +00:00
Michael Raskin
fb54c95889 Give a sane name to downloaded patch for cpio
svn path=/nixpkgs/trunk/; revision=15506
2009-05-08 17:00:08 +00:00
Eelco Dolstra
5a2284ac61 * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=15313
2009-04-25 22:45:32 +00:00
Lluís Batlle i Rossell
c2d651ef68 Removing static compilation of the driver for cromfs, so the package works again in x86_64
svn path=/nixpkgs/trunk/; revision=15309
2009-04-25 16:22:12 +00:00
Eelco Dolstra
7689a348c4 * Got rid of a lot of "postInstall=postInstall" and similar lines in
builders.  These are redundant now.
* Inlined some trivial builders.
* Removed a few explicit setup-hook creations.  This is done
  automatically now if setupHook is set.
* Deleted the initscripts package.  NixOS doesn't use it anymore.

svn path=/nixpkgs/branches/stdenv-updates/; revision=15276
2009-04-23 13:31:10 +00:00
Eelco Dolstra
f762b50991 * Another sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=15269
2009-04-23 11:59:43 +00:00
Lluís Batlle i Rossell
0348315add Updating cromfs.
svn path=/nixpkgs/trunk/; revision=15152
2009-04-19 13:33:13 +00:00
Eelco Dolstra
3f8dff487e * Fix URL.
svn path=/nixpkgs/branches/stdenv-updates/; revision=14558
2009-03-16 13:21:27 +00:00
Ludovic Courtès
01a662d3e0 GNU Tar 1.22 (untested).
svn path=/nixpkgs/branches/stdenv-updates/; revision=14433
2009-03-07 11:35:18 +00:00
Eelco Dolstra
390695e73f * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=14057
2009-02-12 21:16:55 +00:00
Eelco Dolstra
7bf6d9cbdf * cpio: apply a patch from Gentoo to make it build on GCC 4.3.
svn path=/nixpkgs/branches/stdenv-updates/; revision=14046
2009-02-12 19:04:44 +00:00
Lluís Batlle i Rossell
db6973610c Updating cromfs to the just released 1.5.7.
svn path=/nixpkgs/trunk/; revision=13964
2009-02-02 21:56:29 +00:00
Eelco Dolstra
4274b92cda * Remove unused versions of tar.
svn path=/nixpkgs/branches/stdenv-updates/; revision=13826
2009-01-23 10:55:41 +00:00
Eelco Dolstra
4998f96209 * GNU tar 1.21.
svn path=/nixpkgs/branches/stdenv-updates/; revision=13787
2009-01-16 16:11:22 +00:00
Michael Raskin
772b50f138 Added cromfs - patch by Lluis Batlle
svn path=/nixpkgs/trunk/; revision=13700
2009-01-04 17:24:11 +00:00
Michael Raskin
b04fc9492c Adding dar (disk archiver with indexable archives) - patch by Lluis Batlle
svn path=/nixpkgs/trunk/; revision=13695
2009-01-03 15:11:52 +00:00
Eelco Dolstra
aa84bce64d * Get rid of all references to nix.cs.uu.nl.
svn path=/nixpkgs/trunk/; revision=13299
2008-11-14 16:57:19 +00:00
Armijn Hemel
1b5dbd6d9c 0.5 -> 0.5.1
svn path=/nixpkgs/trunk/; revision=12859
2008-09-13 10:25:20 +00:00
Eelco Dolstra
75fa800307 * GNU tar 1.20.
svn path=/nixpkgs/branches/stdenv-updates/; revision=11800
2008-05-09 14:56:29 +00:00
Yury G. Kudryashov
8ea549b319 sharutils added (4.6.3)
svn path=/nixpkgs/branches/stdenv-updates/; revision=10744
2008-02-18 20:52:25 +00:00
Yury G. Kudryashov
8bcddb0413 svn path=/nixpkgs/branches/stdenv-updates/; revision=10592 2008-02-10 17:39:34 +00:00
Eelco Dolstra
8cd1b893cf * coreutils-6.10, findutils-4.2.32.
* Added some meta attributes.

svn path=/nixpkgs/branches/stdenv-updates/; revision=10511
2008-02-06 13:18:50 +00:00
Yury G. Kudryashov
891295a46a More homepages
svn path=/nixpkgs/branches/stdenv-updates/; revision=10432
2008-01-31 10:42:02 +00:00
Yury G. Kudryashov
a7703662a4 Merged with trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=10145
2008-01-15 00:55:21 +00:00
Yury G. Kudryashov
a1f7a312c0 cpio: unneeded patches removed
svn path=/nixpkgs/branches/stdenv-updates/; revision=9817
2007-12-01 20:04:21 +00:00
Eelco Dolstra
b37f504680 * Updated various stdenv packages (grep, gawk, tar, cpio, findutils,
pcre).

svn path=/nixpkgs/branches/stdenv-updates/; revision=9758
2007-11-19 17:39:19 +00:00
Michael Raskin
43b208bbb9 Fixed synaptics; Added GOCR (not that it is a good OCR); reverted MarcWeber's update to setup-new-2.sh (he has no time to use it in nearest future; later I hope it will be irrelevant)
svn path=/nixpkgs/trunk/; revision=9613
2007-11-09 13:54:02 +00:00
Michael Raskin
77a46300fa Added patch from Gentoo for glibc 2.6 compatibility. It just randomly renames an inner function, so glibc 2.5-safe.
svn path=/nixpkgs/trunk/; revision=9441
2007-10-11 03:41:29 +00:00
Eelco Dolstra
8f4d8573c0 * Fix a bunch of URLs.
svn path=/nixpkgs/trunk/; revision=9292
2007-09-11 10:15:07 +00:00
Eelco Dolstra
a1022416c5 * Latest unstable Nix.
svn path=/nixpkgs/trunk/; revision=9274
2007-09-06 20:45:36 +00:00
Eelco Dolstra
af7da7f19d * Added p7zip for decompressing 7-zip archives.
svn path=/nixpkgs/trunk/; revision=9248
2007-09-04 11:55:19 +00:00
Eelco Dolstra
544cb9cb83 * Rewrite all URLs to GNU mirrors to mirror://gnu/.
svn path=/nixpkgs/trunk/; revision=9201
2007-08-27 13:42:00 +00:00
Eelco Dolstra
607b0d3e80 * Rewrite all the SourceForge URLs to mirror://sourceforge/.
find . -name "*.nix" | while read fn; do sed 's^http://[a-z]*.dl.sourceforge.net/sourceforge/^mirror://sourceforge/^g' < $fn > $fn.new; mv $fn.new $fn; done

svn path=/nixpkgs/trunk/; revision=9198
2007-08-27 13:01:33 +00:00
Eelco Dolstra
a0159dee8e * Reverted r6713, r6711, r4623, r3660, r2237. There rewrote fetchurl
URLs to http://nix.cs.uu.nl/dist/tarballs.  With content-addressable
  mirror support (r9190, NIXPKGS-70) this is no longer necessary:
  fetchurl will try to download from that location automatically.  So
  we can keep the original URLs.

svn path=/nixpkgs/trunk/; revision=9192
2007-08-24 12:32:36 +00:00
Michael Raskin
d80093f2ff Added version suffixes.
svn path=/nixpkgs/trunk/; revision=8921
2007-06-26 12:13:17 +00:00
Michael Raskin
868554700b Added unrar
svn path=/nixpkgs/trunk/; revision=8916
2007-06-24 15:34:44 +00:00
Eelco Dolstra
89a47c3feb * Added unshield, a program for unpacking InstallShield CAB files
(which are different from Windows Installer CAB files).

svn path=/nixpkgs/trunk/; revision=8797
2007-05-28 17:09:30 +00:00
Eelco Dolstra
fe25567984 * Patch to make tar shut up about timestamps of 0 (1-1-1970 00:00:00
UTC).  (NIXPKGS-46)

svn path=/nixpkgs/trunk/; revision=8743
2007-05-24 13:35:44 +00:00
Eelco Dolstra
f861c8b66c * makeFlags -> buildFlags in a few places.
svn path=/nixpkgs/trunk/; revision=7503
2006-12-27 18:34:35 +00:00
Armijn Hemel
7e41b751cb new versions of various very important tools to keep the buildfarm busy.
svn path=/nixpkgs/trunk/; revision=7485
2006-12-25 23:28:35 +00:00
Armijn Hemel
3613f5568c 1.1 -> 1.2
svn path=/nixpkgs/trunk/; revision=7268
2006-12-07 19:31:23 +00:00
Eelco Dolstra
eed02cb58f * Fix corrupt archives in cpio 2.7 when dealing with symlinks.
svn path=/nixpkgs/trunk/; revision=7143
2006-11-27 00:34:05 +00:00
Eelco Dolstra
908b2bf027 * Latest cpio; fixes a problem with symlinks.
svn path=/nixpkgs/trunk/; revision=6965
2006-11-07 10:48:08 +00:00
Eelco Dolstra
de25bee83d * Of course, the latest GNU tar has the same gnulib header file shit
as coreutils.

svn path=/nixpkgs/trunk/; revision=6880
2006-10-27 20:14:19 +00:00
Eelco Dolstra
5f4f8766cf * GNU tar 1.16.
svn path=/nixpkgs/trunk/; revision=6822
2006-10-24 17:24:46 +00:00
Eelco Dolstra
c6ecc900cf * Add more stuff to the bootstrap builder.
* Remove some redundant *Diet values in all-packages.nix.

svn path=/nixpkgs/trunk/; revision=6780
2006-10-19 21:36:51 +00:00
Eelco Dolstra
1442e8ec22 * Copy a bunch of files to nix.cs.uu.nl.
svn path=/nixpkgs/trunk/; revision=6711
2006-10-12 13:50:54 +00:00
Eelco Dolstra
67c581cdcc * Updated Pango, Cairo, Zip.
svn path=/nixpkgs/trunk/; revision=6697
2006-10-11 13:19:36 +00:00
Eelco Dolstra
8554e01d2b * Added cabextract. Might be useful for adding Visual C++.
svn path=/nixpkgs/trunk/; revision=5368
2006-06-01 21:25:40 +00:00
Eelco Dolstra
3389f4bc36 * Copy lots of files to nix.cs.uu.nl.
svn path=/nixpkgs/trunk/; revision=4623
2006-01-30 16:04:03 +00:00
Eelco Dolstra
82e678362f * "." -> "source".
svn path=/nixpkgs/trunk/; revision=4335
2005-12-05 14:11:09 +00:00
Armijn Hemel
f99dacf885 add gnutar linked to dietlibc
svn path=/nixpkgs/trunk/; revision=3779
2005-09-05 12:26:16 +00:00
Armijn Hemel
dffe1406a0 add cpio
svn path=/nixpkgs/trunk/; revision=3752
2005-08-30 13:56:15 +00:00
Eelco Dolstra
454707da23 * catamaran.labs.cs.uu.nl -> nix.cs.uu.nl.
svn path=/nixpkgs/trunk/; revision=3660
2005-08-22 08:39:27 +00:00
Eelco Dolstra
b899b28c73 * Oops, 1.15 was not the most recent version (and a very bad one, too).
svn path=/nixpkgs/trunk/; revision=3202
2005-06-17 22:06:59 +00:00
Eelco Dolstra
e2c30f15e4 * Fix zip (INSTALL variable not defined in the makefile!).
svn path=/nixpkgs/trunk/; revision=3198
2005-06-17 17:06:14 +00:00
Eelco Dolstra
a450978f26 * Glibc updated to 2.3.5.
* GCC 3.4.4 and 3.3.6.
* Other stdenv packages updated.

svn path=/nixpkgs/trunk/; revision=3188
2005-06-17 10:30:13 +00:00
Eelco Dolstra
7775caaa35 * Evacuate tarballs.
svn path=/nixpkgs/trunk/; revision=2527
2005-04-11 13:09:01 +00:00
Eelco Dolstra
1af17b9d7f * Rename new unzip.
svn path=/nixpkgs/trunk/; revision=2515
2005-04-11 08:26:36 +00:00
Eelco Dolstra
d8a0bdebf2 * Get rid of the old unzip.
svn path=/nixpkgs/trunk/; revision=2514
2005-04-11 08:22:23 +00:00
Eelco Dolstra
55a02efa5b * Mac needs Unzip 5.52.
svn path=/nixpkgs/trunk/; revision=2434
2005-03-21 14:48:48 +00:00
Eelco Dolstra
e42507d182 * Move tarballs to catamaran so that we are no longer dependent on a
gazillion different servers.  Resurrected some 25 missing files.

svn path=/nixpkgs/trunk/; revision=2237
2005-02-15 14:44:19 +00:00
Eelco Dolstra
1ff00e5516 * GNU tar updated to stable release 1.14.
svn path=/nixpkgs/trunk/; revision=1437
2004-09-18 17:07:06 +00:00
Eelco Dolstra
12ae5363ea * Remove trivial builders.
* Make builders unexecutable by removing the hash-bang line and
  execute permission.
* Convert calls to `derivation' to `mkDerivation'.
* Remove `system' and `stdenv' attributes from calls to
  `mkDerivation'.  These transformations were all done automatically,
  so it is quite possible I broke stuff.
* Put the `mkDerivation' function in stdenv/generic.

svn path=/nixpkgs/trunk/; revision=874
2004-03-29 17:23:01 +00:00
Eelco Dolstra
5941f66f0e * The stdenv setup script now defines a generic builder that allows
builders for typical Autoconf-style to be much shorten, e.g.,

    . $stdenv/setup
    genericBuild

  The generic builder does lots of stuff automatically:

  - Unpacks source archives specified by $src or $srcs (it knows about
    gzip, bzip2, tar, zip, and unpacked source trees).
  - Determines the source tree.
  - Applies patches specified by $patches.
  - Fixes libtool not to search for libraries in /lib etc.
  - Runs `configure'.
  - Runs `make'.
  - Runs `make install'.
  - Strips debug information from static libraries.
  - Writes nested log information (in the format accepted by
    `log2xml').

  There are also lots of hooks and variables to customise the generic
  builder.  See `stdenv/generic/docs.txt'.

* Adapted the base packages (i.e., the ones used by stdenv) to use the
  generic builder.

* We now use `curl' instead of `wget' to download files in `fetchurl'.

* Neither `curl' nor `wget' are part of stdenv.  We shouldn't
  encourage people to download stuff in builders (impure!).

* Updated some packages.

* `buildinputs' is now `buildInputs' (but the old name also works).

* `findInputs' in the setup script now prevents inputs from being
  processed multiple times (which could happen, e.g., if an input was
  a propagated input of several other inputs; this caused the size
  variables like $PATH to blow up exponentially in the worst case).

* Patched GNU Make to write nested log information in the format
  accepted by `log2xml'.  Also, prior to writing the build command,
  Make now writes a line `building X' to indicate what is being
  built.  This is unfortunately often obscured by the gigantic tool
  invocations in many Makefiles.  The actual build commands are marked
  `unimportant' so that they don't clutter pages generated by
  `log2html'.


svn path=/nixpkgs/trunk/; revision=845
2004-03-19 16:53:04 +00:00
Eelco Dolstra
7953d11e3a * Added unzip.
svn path=/nixpkgs/trunk/; revision=541
2003-11-25 14:40:02 +00:00
Eelco Dolstra
026ff9466a * Rename .fix -> .nix.
svn path=/nixpkgs/trunk/; revision=511
2003-11-18 12:12:56 +00:00
Eelco Dolstra
48c3faca51 * Renamed pkgs-ng to pkgs.
svn path=/nixpkgs/trunk/; revision=502
2003-11-14 09:59:13 +00:00