Luca Bruno
5b0352a6a4
Merge branch 'master' into closure-size
2015-12-11 18:31:00 +01:00
Vladimír Čunát
263fd55d4b
Merge recent staging built on Hydra
...
http://hydra.nixos.org/eval/1231884
Only Darwin jobs seem to be queued now,
but we can't afford to wait for that single build slave.
2015-12-05 11:11:51 +01:00
Luca Bruno
920b1d3591
Merge branch 'master' into closure-size
2015-11-29 16:50:26 +01:00
Tobias Geerinckx-Rice
2798b02ad0
Convert some *Flags from strings to lists
2015-11-26 23:45:31 +01:00
Luca Bruno
a412927924
Merge remote-tracking branch 'origin/master' into closure-size
2015-11-25 21:37:30 +01:00
Vladimír Čunát
60e5e837bb
pbzip2: fix a problem due to my bad refactoring
2015-11-24 10:07:21 +01:00
Vladimír Čunát
bf58d24fe6
pbzip2: maintenance updates 1.1.9 -> 1.1.12
2015-11-24 10:04:25 +01:00
Mitch Tishmack
642ee7a77f
pbzip2: g++ -> c++ to fix on darwin ( close #11212 )
...
vcunat made it apply unconditionally, as it works OK on Linux at least.
/cc maintainer @viric.
2015-11-24 10:03:22 +01:00
Matthias C. M. Troffaes
aeb3d8ce4c
bzip2: fix cross build on mingw by using autoconf patch
2015-11-23 11:25:03 +00:00
Matthias C. M. Troffaes
5f25c63bfd
Revert "bzip2: fix cross build on mingw by using autoconf patch"
...
This reverts commit 094c374941
.
2015-11-23 11:23:37 +00: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
Matthias C. M. Troffaes
094c374941
bzip2: fix cross build on mingw by using autoconf patch
2015-11-18 16:33:36 +00:00
William A. Kennington III
baf30718ca
Merge branch 'master.upstream' into staging.upstream
2015-11-18 02:36:33 -08:00
Pascal Wittmann
7fd2796e99
Replace 'with plaforms; platform' with 'platforms.platform'
2015-11-17 21:30:43 +01:00
aszlig
96648a8526
bzip2: Get rid of the custom builder.sh.
...
Everything the builder.sh did can be done with the generic builder which
makes it easier to override attributes and also easier to read.
The reason I've done this is because of #10820 , which tries to override
the preBuild hook, but the latter is hardcoded in the builder.sh of
bzip2.
I have compared the output of this against the previous version and the
only things that were different were timestamps in libbz2.a.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-11-17 16:25:56 +01:00
Eelco Dolstra
99fe4f97c5
xz: Update to 5.2.2
2015-10-30 13:18:21 +01:00
Vladimír Čunát
daa543a455
gzip: split man and info outputs
2015-10-28 10:09:33 +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
249b25698e
xdelta: tidy up
2015-08-03 01:41:55 +02:00
Tobias Geerinckx-Rice
c0f59dc0bb
lz4: remove test restrictions
...
Tests are still disabled by default.
2015-07-31 02:02:07 +02:00
Tobias Geerinckx-Rice
08f866d887
xdelta: 3.0.9 -> 3.0.10
2015-07-27 01:54:08 +02:00
Tobias Geerinckx-Rice
e0038d7571
lz4 130 -> 131
...
Changes:
- liblz4: xxhash symbols are dynamically changed (namespace
emulation) to avoid symbol conflict
- liblz4.a (static library) no longer compiled with -fPIC by
default
2015-06-30 09:49:52 +02:00
William A. Kennington III
7a0bbce2e6
lz4: Don't test by default as it takes forever
2015-06-24 17:51:59 -07:00
Tobias Geerinckx-Rice
98b2d7b727
Separate nativeBuildInputs where maintainers |= nckx
2015-06-17 22:21:32 +02:00
Pascal Wittmann
62d62b6588
Fixed some licenses
2015-06-10 13:00:42 +02:00
Bob van der Linden
e593a8d3bf
zopfli: removed roconnor as a maintainer
...
roconnor was added as a maintainer by accident
2015-06-08 19:41:45 +02:00
Arseniy Seroka
944972ba4a
Merge pull request #8199 from bobvanderlinden/zopfli
...
added zopfli package
2015-06-07 01:13:58 +03:00
Bob van der Linden
a818dba90b
added zopfli package
2015-06-06 23:59:51 +02:00
Tobias Geerinckx-Rice
d904b54c0e
lz4: fix make test
...
I'll assume this is an oversight due to hasty releasing and can be
reverted in version 131.
2015-05-30 21:09:26 +02:00
Tobias Geerinckx-Rice
cbbd7230ac
lz4 129 -> 130
...
Hotfix, solving issues with lz4cat.
- Fixed: incompatibility sparse mode vs console (#105 )
- Fixed: LZ4IO exits too early when frame crc not present (#106 )
- Fixed: incompatibility sparse mode vs append mode (#110 )
- Performance fix: big compression speed boost for clang (+30%)
- New: cross-version test
2015-05-30 21:09:25 +02:00
Tobias Geerinckx-Rice
158e1cfdd0
Don't use "with licenses;" for single licences
...
And don't use square brackets on such lines.
2015-05-28 19:20:29 +02:00
Florian Friesdorf
6756d7cdf8
cygwin: gzip fpending
2015-05-28 10:53:35 +02:00
Tobias Geerinckx-Rice
b2d7f4b1ba
Use common licence attributes from lib/licenses.nix
...
Many (less easily automatically converted) old-style strings
remain.
Where there was any possible ambiguity about the exact version or
variant intended, nothing was changed. IANAL, nor a search robot.
Use `with stdenv.lib` wherever it makes sense.
2015-05-27 22:00:06 +02:00
Pascal Wittmann
bb9e9cc3f8
Turned some meta.maintainers into lists
2015-05-14 19:09:43 +02:00
Tobias Geerinckx-Rice
a989b629d9
lz4 128 -> 129
...
- New: LZ4_compress_fast()
- Changed: New lz4 and lz4hc compression API. Previous function
prototypes still supported.
- Changed: Sparse file support enabled by default
- New: LZ4 CLI improved performance compressing/decompressing multiple
files
- Added: LZ4_compress_destSize()
- Fixed: GCC 4.9+ vector optimization
- Changed: Enums converted to LZ4F_ namespace convention
- Added: AppVeyor CI environment, for Visual tests
- Modified:Obsolete functions generate warnings
- Fixed : Bug #75 (unfinished stream)
- Updated: Documentation converted to MarkDown format
2015-05-12 18:13:05 +02:00
Vladimír Čunát
3b9ef2c71b
fix "libc}/lib" and similar references
...
Done mostly without any verification.
I didn't bother with libc}/include, as the path is still correct.
2015-05-05 11:52:08 +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
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
Vladimír Čunát
a99e543c36
bzip2: split into multiple outputs, refactor
2015-04-18 19:32:52 +02: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
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
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
Daniel Peebles
3182cf00ff
Add xar
2014-08-30 22:52:46 +01:00
Vladimír Čunát
030af0a803
fix .xz in stdenv bootstrap
...
Presumably needed due to the last staging merge.
There was some stdenv stage refactoring within, IIRC.
2014-08-30 15:48:17 +02: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
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
Vladimír Čunát
4dccb224c5
WIP2
2014-08-26 01:10:56 +02:00
Vladimír Čunát
3ec413cece
WIP
2014-08-25 15:30:46 +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
Vladimír Čunát
96cec2a7bd
Merge 'staging' into multiple-outputs
...
Conflicts:
pkgs/applications/audio/flac/default.nix
pkgs/build-support/gcc-wrapper/builder.sh
pkgs/development/libraries/apr-util/default.nix
pkgs/development/libraries/apr/default.nix
pkgs/development/libraries/atk/default.nix
pkgs/development/libraries/freetype/default.nix
pkgs/development/libraries/gdk-pixbuf/default.nix
pkgs/development/libraries/glib/default.nix
pkgs/development/libraries/glibc/2.17/builder.sh
pkgs/development/libraries/glibc/2.17/locales.nix
pkgs/development/libraries/libjpeg/default.nix
pkgs/development/libraries/libogg/default.nix
pkgs/development/libraries/libsamplerate/default.nix
pkgs/development/libraries/libtiff/default.nix
pkgs/development/libraries/libvorbis/default.nix
pkgs/development/libraries/mesa/default.nix
pkgs/development/libraries/pango/default.nix
pkgs/development/web/nodejs/default.nix
pkgs/os-specific/linux/pam/default.nix
pkgs/os-specific/linux/systemd/default.nix
pkgs/stdenv/generic/setup.sh
pkgs/stdenv/linux/default.nix
pkgs/top-level/all-packages.nix
pkgs/top-level/release-small.nix
2014-08-23 16:04:53 +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