mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-29 09:02:46 +00:00
Code Issues Wiki Activity
130165 commits 255 branches 124 tags 7.8 GiB
Commit graph

398 commits

Author SHA1 Message Date
Tobias Geerinckx-Rice 1212d921c1
lrzip: 0.621 -> 0.630 
Changes: http://ck-hack.blogspot.com/2016/06/lrzip-0630.html
 2016-06-12 00:28:55 +02:00
Franz Pletz f8d481754c
Merge remote-tracking branch 'origin/master' into hardened-stdenv 2016-05-18 17:10:02 +02:00
Peter Simons 8e462995ba Bring my stdenv.lib.maintainers user name in line with my github nick. 2016-05-16 22:49:55 +02:00
Tobias Geerinckx-Rice f2c7f9a677
zstd: 0.6.0 -> 0.6.1 2016-05-14 16:01:33 +02:00
Vladimír Čunát 68b4c4caa7 bzip2: greatly simplify by using autoconfiscated version 
I don't know there's still need for linkStatic or cygwin special-casing,
but I left it there for now.
 2016-05-05 08:31:09 +02:00
Vladimír Čunát 1dc36904d8 Merge #14920: windows improvements, mainly mingw 2016-05-05 08:30:19 +02:00
Vladimír Čunát 7a005601d4 Merge branch 'master' to resolve conflicts 2016-05-05 08:25:38 +02:00
Tuomas Tynkkynen aadaa91379 Merge remote-tracking branch 'upstream/master' into staging 
Conflicts:
	pkgs/applications/networking/browsers/vivaldi/default.nix
	pkgs/misc/emulators/wine/base.nix
 2016-05-03 23:12:48 +03:00
Franz Pletz 50884acd84 lzip: 1.16 -> 1.17 2016-05-03 16:15:20 +02:00
Robin Gloster c92bca56f8 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-05-02 22:58:02 +00:00
Lancelot SIX 8a67abb820 pkgs.gzip: 1.7 -> 1.8 
See http://lists.gnu.org/archive/html/info-gnu/2016-04/msg00012.html
 2016-04-28 19:36:27 +02:00
Vladimír Čunát 91f2b9ed66 bzip2: fix on mingw 
The whole expression is rather a mess, mainly due to upstream
often behaving badly with non-standard configurations.
 2016-04-23 10:52:01 +02:00
Aneesh Agrawal a01fdb3ad4 gzip: 1.6 -> 1.7 (close #14828) 2016-04-20 16:40:53 +02:00
Robin Gloster d020caa5b2 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-04-18 13:49:22 +00:00
Tobias Geerinckx-Rice 550b878e46
zstd: 0.5.1 -> 0.6.0 
Changes:
- Stronger high compression modes
- Changed : highest compression modes require --ultra command to
  remove memory restrictions
- API: ZSTD_getFrameParams() provides size of decompressed content
- Fixed: zstd cli return error code > 0 and removes dst file artifact
  when decompression fails
- Various fixes and small performance improvements
 2016-04-14 02:37:53 +02:00
Vladimír Čunát 39ebb01d6e Merge branch 'staging', containing closure-size #7701 2016-04-13 09:25:28 +02:00
Franz Pletz 2a021baf21 pbzip2: 1.1.12 -> 1.1.13 2016-04-12 15:51:32 +02:00
Vladimír Čunát ab15a62c68 Merge branch 'master' into closure-size 
Beware that stdenv doesn't build. It seems something more will be needed
than just resolution of merge conflicts.
 2016-04-01 10:06:01 +02:00
Robin Gloster f60c9df0ba Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-03-28 15:16:29 +00:00
Vladimír Čunát b336ed89e6 zopfli: disable parallel building 
It was failing often, e.g.:
https://hydra.nixos.org/build/32101335/nixlog/1/raw
 2016-03-23 20:20:36 +01:00
Robin Gloster 3f45f0948d Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-03-15 01:44:24 +00:00
Luca Bruno dcfca100ec Merge pull request #12525 from knupfer/ngx_brotli 
add nginxModules.brotli
 2016-03-11 11:05:21 +01:00
Vladimír Čunát 09af15654f Merge master into closure-size 
The kde-5 stuff still didn't merge well.
I hand-fixed what I saw, but there may be more problems.
 2016-03-08 09:58:19 +01:00
Franz Pletz aff1f4ab94 Use general hardening flag toggle lists 
The following parameters are now available:

  * hardeningDisable
    To disable specific hardening flags
  * hardeningEnable
    To enable specific hardening flags

Only the cc-wrapper supports this right now, but these may be reused by
other wrappers, builders or setup hooks.

cc-wrapper supports the following flags:

  * fortify
  * stackprotector
  * pie (disabled by default)
  * pic
  * strictoverflow
  * format
  * relro
  * bindnow
 2016-03-05 18:55:26 +01:00
Robin Gloster 3477e662e6 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-02-27 00:08:08 +00:00
Frederik Rietdijk 40ca841c5c Merge pull request #13124 from FRidh/buildPythonApplication 
buildPythonApplication: use new function for Python applications
 2016-02-23 16:02:10 +01:00
Tobias Geerinckx-Rice 74acc3ad93 zstd: 0.5.0 -> 0.5.1 
Changes:
- New: Optimal parsing => Very high compression modes, thanks to @inikep
- Changed: Dictionary builder integrated into libzstd and zstd cli
- Changed (!): zstd cli now uses "multiple input files" as default mode. See zstd -h.
- Fix: high compression modes for big-endian platforms (#123)
- New: zstd cli : -t | --test command
 2016-02-22 19:42:27 +01:00
Robin Gloster 402d57ee8e bootstrap env: disable stackprotector hardening until gcc >=4.9 2016-02-22 18:32:53 +00:00
Frederik Rietdijk 4d06bf70f4 buildPythonApplication: use new function for Python applications 2016-02-19 13:16:41 +01:00
Vladimír Čunát e9520e81b3 Merge branch 'master' into staging 2016-02-17 10:06:31 +01:00
Vladimír Čunát d039c87984 Merge branch 'master' into closure-size 2016-02-14 08:33:51 +01:00
Dan Peebles 6f2ab634f9 bzip2: fix shared library generation on darwin 
This fixes #6504
(cherry picked from commit 31ab7d38f2)
 2016-02-13 17:20:44 +01:00
Dan Peebles 31ab7d38f2 bzip2: fix shared library generation on darwin 
This fixes #6504
 2016-02-13 10:31:36 -05:00
Bojan Nikolic 9f2cc14107 bzip2: Fix cross-compilation 
The cross-compiling the "patchPhase" from the parent attribute set was
preventing application of patches specified in the crossDrv. Fix by
turning patchPhase into postPatch.
 2016-02-11 15:31:16 +01:00
Tobias Geerinckx-Rice ce99feec68 zstd: 0.4.7 -> 0.5.0 
“New: dictionary builder tool
Changed: advanced API for streaming and dictionary compression
Improved: better compression of small data.”
 2016-02-08 00:37:11 +01:00
Vladimír Čunát 54299b60c4 Merge #12779: Mass replace pkg}/bin-style strings 
... to refer to correct outputs
 2016-02-03 17:25:22 +01:00
Vladimír Čunát ae74c356d9 Merge recent 'staging' into closure-size 
Let's get rid of those merge conflicts.
 2016-02-03 16:57:19 +01:00
Tuomas Tynkkynen e97e690244 treewide: Mass replace 'xz}/bin' to refer the 'bin' output 2016-02-01 20:46:28 +02:00
Tobias Geerinckx-Rice fa247fa213 zstd: init at 0.4.7 2016-01-27 02:45:20 +01:00
Tobias Geerinckx-Rice 7d2f8eca1b Revert "lz4: be just a bit more reproducible" 
This reverts commit efc359c231,
as it is no longer needed.

See: efc359c231 (commitcomment-15680107)
 2016-01-26 16:48:29 +01:00
Tobias Geerinckx-Rice efc359c231 lz4: be just a bit more reproducible 2016-01-26 06:13:05 +01:00
Tobias Geerinckx-Rice ac33b4724a More version attribute tidying where maintainers |= nckx 2016-01-25 20:08:34 +01:00
Tobias Geerinckx-Rice 9fb8020e4e Add version attribute where maintainers |= nckx 
This will probably be mandatory soon, and is a step in the right
direction. Removes the deprecated meta.version, and move some meta
sections to the end of the file where I should have put them in
the first place.
 2016-01-25 17:35:21 +01:00
knupfer 05bf6b2b10 brotliUnstable: init at bed93862 2016-01-21 22:09:23 +01:00
Vladimír Čunát 313faf07ba brotli: init at 0.3.0 2016-01-20 22:50:26 +01:00
Vladimír Čunát 716aac2519 Merge branch 'staging' into closure-size 2016-01-19 09:55:31 +01:00
Vladimír Čunát 2d0893088f Merge branch 'master' into staging 2016-01-15 13:43:57 +01:00
Tobias Geerinckx-Rice 685b2ebb60 xdelta: add longDescription 2016-01-11 20:34:36 +01:00
Tobias Geerinckx-Rice 6aa786d1d6 xdeltaUnstable: init at 3.1.0 
This will eventually become the new stable branch (as unstable ones
are wont to do), but is worth having if you want to patch yesterday's
‘large’ files today, or need to apply patches already created with it.

“First release of the 3.1.x series. This is taken from the
"64bithash" branch.

- Adds support for -B values greater than 2GB, enabled by
  -DXD3_USE_LARGESIZET=1 variable. [Enabled in nixpkgs.]
- Adds new performance and speed regression test, written in #Golang.
  [Not enabled in nixpkgs.]

When compiled for large sizes, xdelta3 uses a 64bit checksum function.
This impacts both compression and speed.

Relative to 3.0.11, the new branch is currently 3-5% slower and
has 1-2% worse compression. Performance will be addressed in
future 3.1.x releases.”
 2016-01-11 20:34:36 +01:00
Tobias Geerinckx-Rice 5e9b49dd53 xdelta: add lzmaSupport; enable by default 2016-01-11 18:35:50 +01:00
Tobias Geerinckx-Rice 83289318f0 xdelta: 3.0.10 -> 3.0.11 2016-01-11 18:35:50 +01:00
Vladimír Čunát b1acaffe67 Merge branch 'master' into staging 2016-01-05 10:28:58 +01:00
Tobias Geerinckx-Rice d030b608dd zopfli: build & install zopflipng, shared libraries, READMEs 2016-01-03 00:24:28 +01:00
Tobias Geerinckx-Rice 2ba8ae8d97 zopfli: 1.0.0 -> 1.0.1 + bug fixes 
Maintain & tidy up `meta` while we're here.
 2016-01-03 00:24:28 +01:00
janus 9897b35661 FreeBSD: patch expat, kerberos, libedit, ossp-uuid, lz4, sharutils, add libelf-freebsd 2016-01-01 17:01:13 +00:00
janus a1ade02cdc FreeBSD support 2016-01-01 16:59:48 +00:00
Vladimír Čunát f9f6f41bff Merge branch 'master' into closure-size 
TODO: there was more significant refactoring of qtbase and plasma 5.5
on master, and I'm deferring pointing to correct outputs to later.
 2015-12-31 09:53:02 +01:00
Dan Peebles 51ebb5a9aa lz4: mark as working on all unixes 
I've only tested on darwin, but it looks like a pretty vanilla package
 2015-12-30 17:45:13 -05:00
Michael Raskin 19aa4f0a6b pixz: init at 1.0.6 2015-12-12 17:39:14 +01:00
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