JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
61,822 Commits 2 Branches 0 Tags 12 GiB
66b66e8302
Commit Graph

191 Commits

Author SHA1 Message Date
Thomas Tuegel
1fe28a1132 Merge remote-tracking branch 'upstream/master' into staging 2015-04-29 11:33:28 -05:00
Pascal Wittmann
f99d5cf2fc Fixed some descriptions 2015-04-28 10:55:20 +02:00
Vladimír Čunát
30f31c9afc Merge 'master' into staging 
(relatively simple conflicts)
 2015-04-26 22:52:08 +02:00
Tobias Geerinckx-Rice
fbeb8bd898 lz4, xdelta: explicitly mark test requirements as such in code 2015-04-19 03:45:58 +02:00
Tobias Geerinckx-Rice
bf2a5a8665 xdelta 3.0z -> 3.0.9 2015-04-17 00:46:21 +02:00
Thomas Tuegel
88918e10e9 Merge branch 'master' into staging 2015-04-10 07:45:38 -05:00
Tobias Geerinckx-Rice
1926a7aa32 Tidy nckx-maintained packages 
- Use fetchFromGitHub when possible
- Build in parallel if supported
 2015-04-08 02:29:42 +02:00
Eric Seidel
6ec373d776 Merge branch master into staging 2015-04-06 18:58:08 -07:00
Tobias Geerinckx-Rice
f97f3d7a1b lz4 127 -> 128 
Tests now fail when run in parallel. Don't.
 2015-04-01 20:23:47 +02:00
William A. Kennington III
fa2e5b25ba Merge branch 'master' into staging 2015-03-29 14:25:48 -07:00
Nikolay Amiantov
9ed21f3a49 lbzip2: style fix 2015-03-29 13:05:28 +03:00
William A. Kennington III
4ec8ce4432 xz: 5.2.0 -> 5.2.1 2015-03-25 22:42:24 -07:00
Michael Raskin
e68b486f6e update lrzip 2015-03-21 21:29:40 +03:00
Eelco Dolstra
2ed5c2bd6b Set some meta.platforms 
Also fix meta.platform -> meta.platforms in a few places.
 2015-03-20 20:04:42 +01:00
Michael Raskin
eeac4fdf0e update zpaq 2015-03-09 01:03:01 +03:00
Edward Tjörnhammar
33a8a51657 fetchurl: collate samba project urls into a mirror 2015-02-08 22:29:27 +01:00
Shea Levy
c45372f038 Merge commit 'cfb29ab882323d379aba20a95020c7c24f883eae' 
Partial staging merge, including cc-wrapper fixes

Conflicts:
	pkgs/applications/audio/spotify/default.nix
	pkgs/build-support/cc-wrapper/default.nix
	pkgs/development/compilers/cryptol/1.8.x.nix
 2015-02-02 21:14:28 -05:00
Peter Simons
520cba52fc pigz: update from 2.3.1 to 2.3.3, potentially fixes CVE-2015-1191 2015-01-27 14:04:54 +01:00
Eelco Dolstra
0caae022fd xz: Update to 5.2.0 2015-01-26 23:48:56 +01:00
Tobias Geerinckx-Rice
d14ba81572 lz4: run tests 
Data safety > valgrind.
 2015-01-20 07:31:00 +01:00
Tobias Geerinckx-Rice
8257ed81c9 Add lz4: very fast lossless compression 2015-01-13 23:54:02 +01:00
Spencer Whitt
8b6e6e93b1 Add package 'dtrx' 2015-01-06 14:41:23 -05:00
Tobias Geerinckx-Rice
c64257b8e5 Fix user-facing typos (mainly in descriptions) 2014-12-30 03:31:03 +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