1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-09-11 15:08:33 +01:00
Commit graph

279 commits

Author SHA1 Message Date
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
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 #12446.
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 #12084: 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 #11493
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
William A. Kennington III 7ccccc15ba Merge branch 'master' into staging 2015-03-27 16:03:03 -07:00
William A. Kennington III 4631afc21e Support unraring source files 2015-03-27 15:36:26 -07:00
William A. Kennington III 8fbc082d1f unrar: 5.1.7 -> 5.2.7 2015-03-27 15:36:26 -07:00
William A. Kennington III 8eb5393ded gnutar: 1.27.1 -> 1.28 2015-03-25 22:42:01 -07:00
Michael Raskin 3c19c7d236 update zpaq 2015-03-21 21:29:40 +03:00