alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity
126577 commits 217 branches 121 tags 4.5 GiB
Commit graph

395 commits

Author SHA1 Message Date
Tobias Geerinckx-Rice d7a0a99f7f zpaq: 706 -> 707 
Fixes v7.06 bug in creating multipart encrypted archives with
incorrectly salted index.
 2016-03-20 23:20:56 +01:00
Tobias Geerinckx-Rice fb6786de36 zpaq: 705 -> 706 
Changes:
- Fixes handling of some corrupted archives.
- Conforms to new spec zpaq205.pdf.
- New man page.
- Add Makefile [and adapt Nix expression to use it].
 2016-03-18 08:03:48 +01:00
Robin Gloster 3f45f0948d Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-03-15 01:44:24 +00:00
Allan Espinosa b80f823789 unrar: build on darwin 2016-03-11 19:15:02 -06: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
Franz Pletz cb3d27df93 Merge remote-tracking branch 'origin/master' into hardened-stdenv 2016-03-05 18:55:30 +01:00
Franz Pletz aff1f4ab94 Use general hardening flag toggle lists 
The following parameters are now available:

  * hardeningDisable
    To disable specific hardening flags
  * hardeningEnable
    To enable specific hardening flags

Only the cc-wrapper supports this right now, but these may be reused by
other wrappers, builders or setup hooks.

cc-wrapper supports the following flags:

  * fortify
  * stackprotector
  * pie (disabled by default)
  * pic
  * strictoverflow
  * format
  * relro
  * bindnow
 2016-03-05 18:55:26 +01:00
Nikolay Amiantov 9e9a2f1096 unrar: 5.3.9 -> 5.3.11 
Also build shared library.
 2016-03-05 09:34:33 +03:00
Marc Scholten 8b5b57fb96 undmg: init at 1.0.2 2016-03-03 18:08:48 +01:00
Robin Gloster 3477e662e6 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-02-27 00:08:08 +00:00
Graham Christensen 483a130f89 cpio: patch CVE-2016-2037, out of bounds write (close #13489) 2016-02-26 22:46:13 +01:00
Robin Gloster 56ceca9d46 cromfs: use default gcc 2016-02-25 00:58:02 +00:00
Robin Gloster 8cbb8331a7 xarchive: disable format hardening 2016-02-24 16:01:51 +00:00
Tuomas Tynkkynen 1085701293 gnutar: Depend on 'acl' only on Linux 
I'm not sure why but the 'acl' dependency only exists in the
multiple-outputs branch...
 2016-02-03 17:33:18 +01:00
Vladimír Čunát ae74c356d9 Merge recent 'staging' into closure-size 
Let's get rid of those merge conflicts.
 2016-02-03 16:57:19 +01:00
Robin Gloster f6d3b7a2ae switch hardening flags 2016-01-30 16:36:57 +00:00
Franz Pletz 954e9903ad Use a hardened stdenv by default 2016-01-30 16:36:57 +00:00
Shea Levy 71a4d36983 zip: disable nls patch by default. 
This patch breaks zip -y (symlinks are turned into regular files).

See https://bugs.gentoo.org/show_bug.cgi?id=571676#c4
 2016-01-27 14:00:46 -05:00
Vladimír Čunát 716aac2519 Merge branch 'staging' into closure-size 2016-01-19 09:55:31 +01:00
Robin Gloster 53b389327e refactor to use autoreconfHook where possible 
Close #12446.
 2016-01-18 10:45:31 +01:00
Vladimír Čunát 620c147cce Merge branch 'master' into staging 2016-01-18 09:48:49 +01:00
Kranium Gikos Mendoza 0baa5abb9b unrar: 5.2.7 -> 5.3.9 2016-01-16 15:29:32 +08:00
Vladimír Čunát b1acaffe67 Merge branch 'master' into staging 2016-01-05 10:28:58 +01:00
Vladimír Čunát 8781743edb unrar: fix #12084: wrong license 2016-01-02 12:30:28 +01:00
janus 9897b35661 FreeBSD: patch expat, kerberos, libedit, ossp-uuid, lz4, sharutils, add libelf-freebsd 2016-01-01 17:01:13 +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
Tobias Geerinckx-Rice 3b065f0215 zpaqd: fix typo... 2015-12-31 05:09:13 +01:00
Tobias Geerinckx-Rice 4ae6598c0b zpaq{,d}: clarify; improve description; maintain 2015-12-31 05:04:05 +01:00
Tobias Geerinckx-Rice d04e57ea6a zpaq{,d}: un-break compileFlags and stop using -march=native 
Running zpaq on an older but not ancient 64-bit Intel server aborts
with an ‘Illegal instruction’ error. Turns out the build expression
was using -march=native to generate distibution binaries...

Change this to more conservative, portable settings which should
cover ‘all’ CPUs. It may run slightly slower — but that at least
implies running.

As a nice side effect, all common compile flags are now back in
`compileFlags` whence they came, and actually used consistently.
 2015-12-31 05:04:05 +01:00
Michael Raskin 56aa0ff1d9 runzip: init at 1.4 2015-12-27 14:23:52 +01:00
Shea Levy 0fbe4bb21c Merge branch 'zip-unicode' of git://github.com/spacefrogg/nixpkgs 2015-12-15 06:18:42 -05:00
Michael Raitza c087ea5f81 zip: fixed build phase (i.e. unicode support) 
The build did not use the current build infrastructure correctly. As a
 consequence zip lacked support for unicode and 64bit files.
 2015-12-15 10:09:02 +00:00
Luca Bruno 5b0352a6a4 Merge branch 'master' into closure-size 2015-12-11 18:31:00 +01:00
Emery Hemingway 2b6dcdfcd0 Rename 'emery' maintainer handle to 'ehmry', fixes #11493 
Communication happens on Github so names should be consistent.
 2015-12-05 23:06:20 +01:00
Vladimír Čunát e2f5ba1937 treewide: fix invocations of installBin command 
I've removed the trivial command in 4e72b61de.
I think `install -Dt "$out/bin"` is a better replacement anyway,
as it can be easily used to other directories than $out/bin.

/cc @ehmry who seems to maintain many packages with this usage.
(BTW, it would be better to have maintainer attribute same as github
username, as it makes pinging maintainers much easier.)
 2015-12-05 13:59:05 +01:00
Luca Bruno a412927924 Merge remote-tracking branch 'origin/master' into closure-size 2015-11-25 21:37:30 +01:00
Maciek Starzyk ba8e1dc92d dar: 2.4.17 -> 2.5.2 2015-11-23 21:46:51 +01: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
William A. Kennington III 9579c9ec7f Merge commit 'cb21b77' into master.upstream 
This is a partial merge of staging for builds which are working
 2015-11-13 15:53:10 -08:00
Nikolay Amiantov 7aeb535eb1 innoextract: 1.4 -> 1.5 2015-11-12 03:42:01 +03:00
Domen Kožar aff3a23d67 unzip: CVE-2015-7696, CVE-2015-7697 2015-11-01 09:39:45 +01:00
Vladimír Čunát 5227fb1dd5 Merge commit staging+systemd into closure-size 
Many non-conflict problems weren't (fully) resolved in this commit yet.
 2015-10-03 13:33:37 +02:00
Tobias Geerinckx-Rice 27678026d7 cpio: unbundle patch (fetch from my GitHub acct.) 2015-09-18 06:09:04 +02:00
Tobias Geerinckx-Rice 3278007dae cpio: 2.11 -> 2.12 
Enable tests (which may fail on Darwin, another reason to stage this).
 2015-09-18 06:06:39 +02:00
Luca Bruno 561fecb239 cromfs: use gcc 4.8 to fix build on i686 (ZHF) 2015-09-01 17:38:54 +02:00
Eelco Dolstra e4610f2965 buildEnv: Support package priorities like nix-env 
This gets rid of a bunch of collision warnings.
 2015-08-25 00:40:40 +02:00
Jude Taylor 14d83e9565 add gnused to impure darwin stdenv 2015-06-19 22:08:01 -07:00
Jude Taylor e26b421b71 fix conditionals for bootstrap sed calls 2015-06-18 13:41:34 -07:00
Jude Taylor fa9c81f694 pure darwin stdenv 2015-06-18 12:37:41 -07:00
Pascal Wittmann 2927efe62e cabextract: update from 1.4 to 1.6 2015-05-29 19:52:03 +02:00
Florian Friesdorf 12b781a945 cygwin: zip 2015-05-28 10:53:36 +02:00
Florian Friesdorf 387ad260c0 cygwin: cpio fpending 2015-05-28 10:53:35 +02:00
Florian Friesdorf 3961eb8a6c cygwin: gnutar fpending 2015-05-28 10:53:35 +02:00
Pascal Wittmann bb9e9cc3f8 Turned some meta.maintainers into lists 2015-05-14 19:09:43 +02:00
Michael Raskin 3ed214e53c Update ZPAQ 2015-05-10 13:46:30 +02:00
Vladimír Čunát 375bc8def7 Merge staging into closure-size 2015-05-05 11:49:03 +02:00
Thomas Tuegel 1fe28a1132 Merge remote-tracking branch 'upstream/master' into staging 2015-04-29 11:33:28 -05:00
Raymond Gauthier c45bc8c2b4 Added innoextract package. 
Allows to extract inno installer packages.
 2015-04-27 23:03:18 -04:00
Vladimír Čunát bf414c9d4f Merge 'staging' into closure-size 
- there were many easy merge conflicts
- cc-wrapper needed nontrivial changes

Many other problems might've been created by interaction of the branches,
but stdenv and a few other packages build fine now.
 2015-04-18 11:22:20 +02:00
Eric Seidel 7205c4fcf9 gnutar: patch out unsafe gettext calls on darwin 2015-04-07 11:43:14 -07:00
Eric Seidel e29bf6e26e gnutar: patch to build on darwin 2015-04-06 20:56:50 -07:00
William A. Kennington III 7ccccc15ba Merge branch 'master' into staging 2015-03-27 16:03:03 -07:00
William A. Kennington III 4631afc21e Support unraring source files 2015-03-27 15:36:26 -07:00
William A. Kennington III 8fbc082d1f unrar: 5.1.7 -> 5.2.7 2015-03-27 15:36:26 -07:00
William A. Kennington III 8eb5393ded gnutar: 1.27.1 -> 1.28 2015-03-25 22:42:01 -07:00
Michael Raskin 3c19c7d236 update zpaq 2015-03-21 21:29:40 +03:00
mancha f43d759bc4 unzip: fix CVE-2014-9636 patch 
Close #6544, fixes #6543.
vcunat: no security impact; just fixes false rejections of some rarer
inputs - a problem introduced by the CVE patch.
 2015-03-09 15:55:24 +01:00
Michael Raskin 487b95f4d0 update zpaq 2015-03-09 01:03:01 +03:00
William A. Kennington III adbba6eded Merge pull request #6528 from codyopel/stdenv-fixes 
remove stdenv.isBSD
 2015-03-02 20:10:07 -08:00
Rickard Nilsson 4987478c96 dar: Update from 2.4.15 to 2.4.17 2015-02-27 10:14:53 +01:00
Vladimír Čunát f3bf4505a9 cpio: fix CVE-2015-1197 by Suse patch 2015-02-26 21:25:20 +01:00
codyopel e29b0da9c7 remove stdenv.isBSD 2015-02-24 22:15:51 -05:00
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