1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-22 21:50:55 +00:00
Commit graph

151 commits

Author SHA1 Message Date
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