MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-17 07:13:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
55321 commits 244 branches 124 tags 6.1 GiB
Commit graph

169 commits

Author SHA1 Message Date
Tobias Geerinckx-Rice
56692eec7c Fix user-facing typos (mainly in descriptions) 2015-01-01 15:45:32 +01:00
Eelco Dolstra
a0f3faf34e Merge remote-tracking branch 'origin/glibc-2.20' into staging 2014-11-16 22:17:36 +01: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
Vladimír Čunát
52404a868d Merge recent master into staging 
Nixpkgs Hydra: ?compare=1157272

TODO: port e22889064f

Conflicts:
	nixos/tests/gnome3_10.nix (auto-solved)
	pkgs/applications/video/aegisub/default.nix
	pkgs/development/libraries/boost/1.55.nix
 2014-11-05 15:00:44 +01: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
Arseniy Seroka
2b61f0b204 Merge pull request #4772 from abbradar/lbzip2 
lbzip2: add package
 2014-11-02 22:38:39 +03:00
Peter Simons
a9c53037fa Merge remote-tracking branch 'origin/master' into staging. 2014-11-02 16:15:53 +01:00
lethalman
a63cf7a1fa Merge pull request #4771 from abbradar/pbzip2-update 
pbzip2: update package
 2014-11-02 00:52:28 +01:00
Nikolay Amiantov
b6529ce1f6 lbzip2: add package 2014-11-02 02:05:54 +03:00
Nikolay Amiantov
f2a27d8d81 pbzip2: update package 2014-11-02 02:04:36 +03:00
Igor Pashev
ce5cc9d803 Added pxz 2014-11-01 18:59:20 +01:00
Eelco Dolstra
5cc92eb0d8 Remove obsolete useDietLibC stdenv adapter 2014-10-29 13:43:00 +01: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
Longrin Wischnewski
6e7de2155b change md5sum to sha256sum for a few packages 2014-10-12 16:13:21 +02:00
Eelco Dolstra
811de3bfaa Merge remote-tracking branch 'origin/staging' into darwin-clang-stdenv 
Conflicts:
	pkgs/tools/security/gnupg/default.nix
 2014-10-09 10:57:57 +02:00
Aristid Breitkreuz
2c107b86f6 remove unused parameter from gzip derivation 2014-10-08 20:23:27 +02:00
Aristid Breitkreuz
51c97e8e8f lzip: update from 1.15 to 1.16 2014-10-07 21:50:40 +02:00
Eelco Dolstra
a6ddb9243d xz: Update to 5.0.7 2014-10-06 20:51:51 +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
Eelco Dolstra
91ec6e0d90 Merge remote-tracking branch 'origin/master' into staging 2014-09-18 22:28:35 +02:00
Michael Raskin
d78973078a Adding AdvanceCOMP deflate compression optimizer 2014-09-17 11:27:13 +04:00
Gergely Risko
e6bf8a09ba Fix xz to not depend on bootstrap-tools 2014-09-14 21:00:12 +02:00
Eric Seidel
0577499d74 fix some packages on darwin 2014-09-09 13:54:26 -07:00
Peter Simons
1c0d15b90e Merge branch 'origin/master' into staging. 
Conflicts:
	pkgs/development/libraries/ffmpeg/2.x.nix
	pkgs/development/libraries/serf/default.nix
 2014-09-02 12:31:03 +02:00
Daniel Peebles
3182cf00ff Add xar 2014-08-30 22:52:46 +01:00
Vladimír Čunát
e51f73652d Merge recent master into staging 
Hydra: ?compare=1149952

Conflicts:
	nixos/doc/manual/configuration.xml (changed split file)
	nixos/modules/config/users-groups.nix (choosing filterNull instead of inline definition)
	pkgs/development/libraries/readline/readline6.3.nix (auto-solved)
 2014-08-30 10:04:02 +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
Luca Bruno
b83aceaecb Merge branch 'master' into staging 2014-08-14 23:09:59 +02:00
Sander van der Burg
ba54614773 kzipmix: create package 2014-08-14 16:10:30 +02:00
Gergely Risko
59291fdbf4 Get rid of bootstrap-tools dependency from xz (and therefore stdenv) 
0769fc5b77 broke this by setting CONFIG_SHELL.
 2014-08-14 02:06:44 +02:00
Mateusz Kowalczyk
7a45996233 Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
aszlig
625d7b9043
Merge pull request #1928 from 'cross-win-osx'. 
This includes a lot of fixes for cross-building to Windows and Mac OS X
and could possibly fix things even for non-cross-builds, like for
example OpenSSL on Windows.

The main reason for merging this in 14.04 already is that we already
have runInWindowsVM in master and it doesn't work until we actually
cross-build Cygwin's setup binary as the upstream version is a fast
moving target which gets _overwritten_ on every new release.

Conflicts:
	pkgs/top-level/all-packages.nix
 2014-04-21 10:00:35 +02:00
Austin Seipp
960690e931 bsdiff: adopt and clean up 
Bonus: simpler build, and should fix the build of bsdiff for Darwin
(patch taken from homebrew).

Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-03-28 18:52:37 -05:00
aszlig
423be7712b
bzip2/cross: Patch out erroneous path separator. 
Not sure why this even got into the upstream release, as _all_ other
includes use forward slashes.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2014-02-24 07:26:23 +01:00
Lluís Batlle i Rossell
5d8ca218df upx: updating to 3.91. 2014-02-04 10:12:28 +01:00
Eelco Dolstra
e07ce3314d Fix some "meta.licenses" attributes 2014-01-25 03:04:46 +01:00
Vladimír Čunát
0a58b512cb Merge master into stdenv-updates 
Conflicts (simple):
	pkgs/development/compilers/gcc/4.8/default.nix
	pkgs/development/compilers/llvm/default.nix
	pkgs/development/libraries/gmp/5.1.1.nix
	pkgs/development/libraries/gmp/5.1.3.nix
	pkgs/development/libraries/gmp/5.1.x.nix
	pkgs/top-level/all-packages.nix
 2014-01-18 14:46:20 +01:00
Peter Simons
088b35edfb pigz: update to version 2.3.1 2014-01-13 17:05:45 +01:00
Peter Simons
44df3d7799 lzip: update to version 1.15 2014-01-13 17:05:45 +01:00
Eelco Dolstra
a9a3ed1084 gzip: Don't depend on stdenv-linux. 
Issue #1469.
 2014-01-07 17:50:30 +01:00
Eelco Dolstra
c17e263ae9 gzip: Don't depend on less 
No need to make stdenv bootstrap more bloated than necessary.
 2014-01-07 14:12:10 +01:00
Vladimír Čunát
e740b565cf Merge master into stdenv-updates 
Conflicts (easy):
	pkgs/development/compilers/llvm/default.nix
	pkgs/development/compilers/openjdk/default.nix
	pkgs/development/libraries/icu/default.nix
	pkgs/development/libraries/libssh/default.nix
	pkgs/development/libraries/libxslt/default.nix
	pkgs/development/tools/parsing/bison/3.x.nix
 2013-12-29 10:01:22 +01:00
Nixpkgs Monitor
7af191826e upx: update from 3.07 to 3.09 2013-12-21 02:28:28 +02: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
8c94c3ad08 Updating lrzip to 0.616 2013-10-20 21:10:02 +04:00
Peter Simons
6be8ad3392 Merge branch 'origin/master' into stdenv-updates. 
There was a minor conflict in 'stumpwm'. The package needs texinfo
version 4.x. At least is used to, I'm not sure whether it still does.
 2013-10-18 18:57:24 +02:00
Jaka Hudoklin
9239b6df47 Add gzrt, gzip Recovery Toolkit 2013-10-17 18:35:24 +02:00
Eelco Dolstra
81a647696e xz: Update to 5.0.5 2013-08-26 14:25:51 +02:00
Peter Simons
0d7118814b Merge branch 'origin/master' into stdenv. 2013-08-17 10:00:16 +02:00