Commit graph

211 commits

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