1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-23 14:11:36 +00:00
Commit graph

237 commits

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