2
0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-21 13:13:33 +00:00
Commit Graph

384 Commits

Author SHA1 Message Date
Robin Gloster
f222d98746 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-25 12:47:13 +00:00
Tobias Geerinckx-Rice
d21727991b
zpaq: 7.13 -> 7.14 2016-07-23 21:44:09 +02:00
mimadrid
2ac6dda96e
xarchiver: 0.5.4.6 -> 0.5.4.7 2016-07-23 13:18:42 +02:00
Robin Gloster
203846b9de Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-19 10:37:02 +00:00
Miguel Madrid
c09338d037 p7zip: 15.14.1 -> 16.02 () 2016-07-19 09:25:35 +02:00
mimadrid
8856cfa619
xarchiver: 0.5.4 -> 0.5.4.6 2016-07-15 18:23:26 +02:00
Robin Gloster
5185bc1773 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-15 14:41:01 +00:00
Miguel Madrid
746de51073 unrar: 5.3.11 -> 5.4.2 2016-07-07 19:13:26 +02:00
Tobias Geerinckx-Rice
7de7a35d59
zpaqd: 7.07 -> 7.08
Fixes double close in r command to output file.
2016-06-23 12:37:54 +02:00
Robin Gloster
2d382f3d98 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-05-30 19:39:34 +00:00
Robin Gloster
527a605ad7 dar: disable format hardening 2016-05-30 19:34:16 +00:00
Vladimír Čunát
e4832c7541 Merge branch 'staging'
Includes a security update of libxml2.
2016-05-27 15:58:40 +02:00
Chris Jefferson
ac2625e3b1 p7zip: Fix darwin build 2016-05-26 09:59:55 +01:00
Vladimír Čunát
dc5bbc4700 gnutar: remove patch already applied upstream
Fallout from . Only Darwin is affected, hashes of the rest remain.
2016-05-22 18:06:07 +02:00
Alexander Ried
1ffcc12bf6 gnutar: 1.28 -> 1.29 2016-05-20 01:51:43 +02:00
Franz Pletz
f8d481754c
Merge remote-tracking branch 'origin/master' into hardened-stdenv 2016-05-18 17:10:02 +02:00
Domen Kožar
b49bf121b8 rename iElectric to domenkozar to match GitHub 2016-05-17 13:00:47 +01:00
Rahul Gopinath
8dd753dedc pxattr: Init at 2.1.0
pxattr provides a single interface to extended file system attributes. It can
be used to save and restore extended file system attributes before using
a utility such as tar for backup which does not understand extended fsattr.
2016-05-09 15:13:20 -07:00
Tobias Geerinckx-Rice
666250bd3b
unarj: mark as broken
And ‘maintain’ to help keep an eye on it.

Closes .
2016-05-08 03:29:45 +02:00
Tobias Geerinckx-Rice
982f83d310
zpaq: 7.12 -> 7.13 2016-05-06 13:47:48 +02:00
Tobias Geerinckx-Rice
9c7f71cd61
unarj: 2.63a -> 2.65 2016-05-03 04:00:25 +02:00
Robin Gloster
c92bca56f8 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-05-02 22:58:02 +00:00
Tobias Geerinckx-Rice
ad3a4cf7d4
zpaq: remove unused .upstream file 2016-04-28 14:20:11 +02:00
Tobias Geerinckx-Rice
ae8dce8d16
zpaq: 7.11 -> 7.12
Faster extract. Removes -encrypt (combined with -repack).

Also, we now correctly follow upstream's versioning and no longer
multiply the version number by 100. You may need to update manually.
2016-04-28 14:17:24 +02:00
Tuomas Tynkkynen
a3466e300d dar: 2.5.2 -> 2.5.3
While at it, add xz support and enable parallel build.
2016-04-18 21:32:36 +03:00
Robin Gloster
d020caa5b2 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-04-18 13:49:22 +00:00
Tobias Geerinckx-Rice
11ee4c394d
zpaq: 710 -> 711 2016-04-17 18:43:44 +02:00
Michael Raskin
f52af3b5a2 zpaqd: 633 -> 707 2016-04-13 14:47:04 +02:00
Nikolay Amiantov
acf06763f4 unshield: 0.7pre3955 -> 1.3 2016-04-13 14:07:09 +03:00
Vladimír Čunát
39ebb01d6e Merge branch 'staging', containing closure-size 2016-04-13 09:25:28 +02:00
Tobias Geerinckx-Rice
d6c50706be
zpaq: 709 -> 710
Adds multi-part archives, -index. Some UI changes.
2016-04-11 23:39:47 +02:00
Vladimír Čunát
30f14243c3 Merge branch 'master' into closure-size
Comparison to master evaluations on Hydra:
  - 1255515 for nixos
  - 1255502 for nixpkgs
2016-04-10 11:17:52 +02:00
Marius Bakke
5d15c0f5fd p7zip: 9.38 -> 15.14.1 2016-04-09 14:05:23 +01:00
Tobias Geerinckx-Rice
feca1695f6
zpaq: 7.08 -> 7.09
Fixes bug in extracting streaming archive with empty first file name.
2016-04-07 23:55:11 +02:00
Robin Gloster
3e68106afd Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-04-07 21:52:26 +00:00
Tobias Geerinckx-Rice
56ff116f2a zpaq: 7.07 -> 7.08
Changes:
- Removes multi-part archive support, -nodelete, add -test, and
  -key prompt.
- Updated to libzpaq v7.08 (smaller decoder buffer).
- Updated Makefile to link libzpaq.o statically.
2016-04-05 03:25:45 +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
Marius Bakke
8db43cbd9d innoextract: 1.5 -> 1.6 2016-03-25 06:16:31 +00:00
Tobias Geerinckx-Rice
d7a0a99f7f zpaq: 706 -> 707
Fixes v7.06 bug in creating multipart encrypted archives with
incorrectly salted index.
2016-03-20 23:20:56 +01:00
Tobias Geerinckx-Rice
fb6786de36 zpaq: 705 -> 706
Changes:
- Fixes handling of some corrupted archives.
- Conforms to new spec zpaq205.pdf.
- New man page.
- Add Makefile [and adapt Nix expression to use it].
2016-03-18 08:03:48 +01:00
Robin Gloster
3f45f0948d Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-03-15 01:44:24 +00:00
Allan Espinosa
b80f823789 unrar: build on darwin 2016-03-11 19:15:02 -06: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
cb3d27df93 Merge remote-tracking branch 'origin/master' into hardened-stdenv 2016-03-05 18:55:30 +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
Nikolay Amiantov
9e9a2f1096 unrar: 5.3.9 -> 5.3.11
Also build shared library.
2016-03-05 09:34:33 +03:00
Marc Scholten
8b5b57fb96 undmg: init at 1.0.2 2016-03-03 18:08:48 +01:00
Robin Gloster
3477e662e6 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-02-27 00:08:08 +00:00
Graham Christensen
483a130f89 cpio: patch CVE-2016-2037, out of bounds write (close ) 2016-02-26 22:46:13 +01:00
Robin Gloster
56ceca9d46 cromfs: use default gcc 2016-02-25 00:58:02 +00:00
Robin Gloster
8cbb8331a7 xarchive: disable format hardening 2016-02-24 16:01:51 +00:00
Tuomas Tynkkynen
1085701293 gnutar: Depend on 'acl' only on Linux
I'm not sure why but the 'acl' dependency only exists in the
multiple-outputs branch...
2016-02-03 17:33:18 +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
Robin Gloster
f6d3b7a2ae switch hardening flags 2016-01-30 16:36:57 +00:00
Franz Pletz
954e9903ad Use a hardened stdenv by default 2016-01-30 16:36:57 +00:00
Shea Levy
71a4d36983 zip: disable nls patch by default.
This patch breaks zip -y (symlinks are turned into regular files).

See https://bugs.gentoo.org/show_bug.cgi?id=571676#c4
2016-01-27 14:00:46 -05:00
Vladimír Čunát
716aac2519 Merge branch 'staging' into closure-size 2016-01-19 09:55:31 +01:00
Robin Gloster
53b389327e refactor to use autoreconfHook where possible
Close .
2016-01-18 10:45:31 +01:00
Vladimír Čunát
620c147cce Merge branch 'master' into staging 2016-01-18 09:48:49 +01:00
Kranium Gikos Mendoza
0baa5abb9b unrar: 5.2.7 -> 5.3.9 2016-01-16 15:29:32 +08:00
Vladimír Čunát
b1acaffe67 Merge branch 'master' into staging 2016-01-05 10:28:58 +01:00
Vladimír Čunát
8781743edb unrar: fix : wrong license 2016-01-02 12:30: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
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
Tobias Geerinckx-Rice
3b065f0215 zpaqd: fix typo... 2015-12-31 05:09:13 +01:00
Tobias Geerinckx-Rice
4ae6598c0b zpaq{,d}: clarify; improve description; maintain 2015-12-31 05:04:05 +01:00
Tobias Geerinckx-Rice
d04e57ea6a zpaq{,d}: un-break compileFlags and stop using -march=native
Running zpaq on an older but not ancient 64-bit Intel server aborts
with an ‘Illegal instruction’ error. Turns out the build expression
was using -march=native to generate distibution binaries...

Change this to more conservative, portable settings which should
cover ‘all’ CPUs. It may run slightly slower — but that at least
implies running.

As a nice side effect, all common compile flags are now back in
`compileFlags` whence they came, and actually used consistently.
2015-12-31 05:04:05 +01:00
Michael Raskin
56aa0ff1d9 runzip: init at 1.4 2015-12-27 14:23:52 +01:00
Shea Levy
0fbe4bb21c Merge branch 'zip-unicode' of git://github.com/spacefrogg/nixpkgs 2015-12-15 06:18:42 -05:00
Michael Raitza
c087ea5f81 zip: fixed build phase (i.e. unicode support)
The build did not use the current build infrastructure correctly. As a
 consequence zip lacked support for unicode and 64bit files.
2015-12-15 10:09:02 +00:00
Luca Bruno
5b0352a6a4 Merge branch 'master' into closure-size 2015-12-11 18:31:00 +01:00
Emery Hemingway
2b6dcdfcd0 Rename 'emery' maintainer handle to 'ehmry', fixes
Communication happens on Github so names should be consistent.
2015-12-05 23:06:20 +01:00
Vladimír Čunát
e2f5ba1937 treewide: fix invocations of installBin command
I've removed the trivial command in 4e72b61de.
I think `install -Dt "$out/bin"` is a better replacement anyway,
as it can be easily used to other directories than $out/bin.

/cc @ehmry who seems to maintain many packages with this usage.
(BTW, it would be better to have maintainer attribute same as github
username, as it makes pinging maintainers much easier.)
2015-12-05 13:59:05 +01:00
Luca Bruno
a412927924 Merge remote-tracking branch 'origin/master' into closure-size 2015-11-25 21:37:30 +01:00
Maciek Starzyk
ba8e1dc92d dar: 2.4.17 -> 2.5.2 2015-11-23 21:46:51 +01: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
William A. Kennington III
9579c9ec7f Merge commit 'cb21b77' into master.upstream
This is a partial merge of staging for builds which are working
2015-11-13 15:53:10 -08:00
Nikolay Amiantov
7aeb535eb1 innoextract: 1.4 -> 1.5 2015-11-12 03:42:01 +03:00
Domen Kožar
aff3a23d67 unzip: CVE-2015-7696, CVE-2015-7697 2015-11-01 09:39:45 +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
27678026d7 cpio: unbundle patch (fetch from my GitHub acct.) 2015-09-18 06:09:04 +02:00
Tobias Geerinckx-Rice
3278007dae cpio: 2.11 -> 2.12
Enable tests (which may fail on Darwin, another reason to stage this).
2015-09-18 06:06:39 +02:00
Luca Bruno
561fecb239 cromfs: use gcc 4.8 to fix build on i686 (ZHF) 2015-09-01 17:38:54 +02:00
Eelco Dolstra
e4610f2965 buildEnv: Support package priorities like nix-env
This gets rid of a bunch of collision warnings.
2015-08-25 00:40:40 +02:00
Jude Taylor
14d83e9565 add gnused to impure darwin stdenv 2015-06-19 22:08:01 -07:00
Jude Taylor
e26b421b71 fix conditionals for bootstrap sed calls 2015-06-18 13:41:34 -07:00
Jude Taylor
fa9c81f694 pure darwin stdenv 2015-06-18 12:37:41 -07:00
Pascal Wittmann
2927efe62e cabextract: update from 1.4 to 1.6 2015-05-29 19:52:03 +02:00
Florian Friesdorf
12b781a945 cygwin: zip 2015-05-28 10:53:36 +02:00
Florian Friesdorf
387ad260c0 cygwin: cpio fpending 2015-05-28 10:53:35 +02:00
Florian Friesdorf
3961eb8a6c cygwin: gnutar fpending 2015-05-28 10:53:35 +02:00
Pascal Wittmann
bb9e9cc3f8 Turned some meta.maintainers into lists 2015-05-14 19:09:43 +02:00
Michael Raskin
3ed214e53c Update ZPAQ 2015-05-10 13:46:30 +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
Raymond Gauthier
c45bc8c2b4 Added innoextract package.
Allows to extract inno installer packages.
2015-04-27 23:03:18 -04: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
Eric Seidel
7205c4fcf9 gnutar: patch out unsafe gettext calls on darwin 2015-04-07 11:43:14 -07:00
Eric Seidel
e29bf6e26e gnutar: patch to build on darwin 2015-04-06 20:56:50 -07:00