3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

138 commits

Author SHA1 Message Date
Mateusz Kowalczyk 7a45996233 Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
aszlig 625d7b9043
Merge pull request #1928 from 'cross-win-osx'.
This includes a lot of fixes for cross-building to Windows and Mac OS X
and could possibly fix things even for non-cross-builds, like for
example OpenSSL on Windows.

The main reason for merging this in 14.04 already is that we already
have runInWindowsVM in master and it doesn't work until we actually
cross-build Cygwin's setup binary as the upstream version is a fast
moving target which gets _overwritten_ on every new release.

Conflicts:
	pkgs/top-level/all-packages.nix
2014-04-21 10:00:35 +02:00
Austin Seipp 960690e931 bsdiff: adopt and clean up
Bonus: simpler build, and should fix the build of bsdiff for Darwin
(patch taken from homebrew).

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-03-28 18:52:37 -05:00
aszlig 423be7712b
bzip2/cross: Patch out erroneous path separator.
Not sure why this even got into the upstream release, as _all_ other
includes use forward slashes.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-02-24 07:26:23 +01:00
Lluís Batlle i Rossell 5d8ca218df upx: updating to 3.91. 2014-02-04 10:12:28 +01:00
Eelco Dolstra e07ce3314d Fix some "meta.licenses" attributes 2014-01-25 03:04:46 +01:00
Vladimír Čunát 0a58b512cb Merge master into stdenv-updates
Conflicts (simple):
	pkgs/development/compilers/gcc/4.8/default.nix
	pkgs/development/compilers/llvm/default.nix
	pkgs/development/libraries/gmp/5.1.1.nix
	pkgs/development/libraries/gmp/5.1.3.nix
	pkgs/development/libraries/gmp/5.1.x.nix
	pkgs/top-level/all-packages.nix
2014-01-18 14:46:20 +01:00
Peter Simons 088b35edfb pigz: update to version 2.3.1 2014-01-13 17:05:45 +01:00
Peter Simons 44df3d7799 lzip: update to version 1.15 2014-01-13 17:05:45 +01:00
Eelco Dolstra a9a3ed1084 gzip: Don't depend on stdenv-linux.
Issue #1469.
2014-01-07 17:50:30 +01:00
Eelco Dolstra c17e263ae9 gzip: Don't depend on less
No need to make stdenv bootstrap more bloated than necessary.
2014-01-07 14:12:10 +01:00
Vladimír Čunát e740b565cf Merge master into stdenv-updates
Conflicts (easy):
	pkgs/development/compilers/llvm/default.nix
	pkgs/development/compilers/openjdk/default.nix
	pkgs/development/libraries/icu/default.nix
	pkgs/development/libraries/libssh/default.nix
	pkgs/development/libraries/libxslt/default.nix
	pkgs/development/tools/parsing/bison/3.x.nix
2013-12-29 10:01:22 +01:00
Nixpkgs Monitor 7af191826e upx: update from 3.07 to 3.09 2013-12-21 02:28:28 +02:00
Peter Simons 91f2c362de Merge remote-tracking branch 'origin/master' into stdenv-updates.
Conflicts:
	pkgs/top-level/all-packages.nix
2013-10-26 18:28:05 +02:00
Michael Raskin 8c94c3ad08 Updating lrzip to 0.616 2013-10-20 21:10:02 +04:00
Peter Simons 6be8ad3392 Merge branch 'origin/master' into stdenv-updates.
There was a minor conflict in 'stumpwm'. The package needs texinfo
version 4.x. At least is used to, I'm not sure whether it still does.
2013-10-18 18:57:24 +02:00
Jaka Hudoklin 9239b6df47 Add gzrt, gzip Recovery Toolkit 2013-10-17 18:35:24 +02:00
Eelco Dolstra 81a647696e xz: Update to 5.0.5 2013-08-26 14:25:51 +02:00
Peter Simons 0d7118814b Merge branch 'origin/master' into stdenv. 2013-08-17 10:00:16 +02:00
Ludovic Courtès 2e937c437a unmaintain several packages 2013-08-16 23:45:01 +02:00
Peter Simons 522acfd2f4 Merge remote-tracking branch 'master' into stdenv-updates.
Conflicts:
	pkgs/applications/version-management/git-and-tools/git/default.nix
	pkgs/top-level/all-packages.nix
2013-07-30 11:29:30 +02:00
Evgeny Egorochkin da4be371e9 make package use mirror:// for gnu, savannah and gnome repositories where possible 2013-07-14 05:23:06 +03:00
Evgeny Egorochkin b084b29d26 Even more mirror:// fixes 2013-07-14 04:17:07 +03:00
Vladimír Čunát 4a7696589d gzip: update 1.5 -> 1.6, use less in tests now 2013-06-30 08:59:29 +02:00
Peter Simons 728e305205 Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-05-22 12:30:02 +02:00
Lluís Batlle i Rossell d72da0329d zsync: update to 0.6.2 2013-05-17 23:48:22 +02:00
Danny Wilson d007a78ccb Merge remote-tracking branch 'origin/stdenv-updates' into illumos
Conflicts:
	pkgs/development/libraries/gmp/5.1.1.nix
	pkgs/development/libraries/mpc/default.nix
	pkgs/development/libraries/mpfr/default.nix
	pkgs/development/libraries/ppl/default.nix
	pkgs/tools/misc/coreutils/default.nix
2013-03-17 13:22:24 +01:00
Peter Simons 5f758431d4 lzip: build the binary with -O3 and assertions disabled 2013-03-13 15:13:40 +01:00
Peter Simons c187516152 lzip: enable documentation build 2013-03-13 15:13:40 +01:00
Peter Simons 6d5c6af427 lzip: update to version 1.14 2013-03-13 13:59:33 +01:00
Michael Raskin b494b3b468 Update lrzip 2013-03-09 16:33:14 +04:00
Danny Wilson fcce211c8e Fix GZip build on Illumos 2013-02-28 20:04:02 +01:00
Eelco Dolstra 2aa6f262cb Merge remote-tracking branch 'origin/master' into stdenv-updates 2013-02-15 13:36:34 +01:00
Peter Simons 6b702f23ea lzip: add version 1.14-rc3 2013-02-06 13:15:12 +01:00
Eelco Dolstra 68da39a63f xz: Update to 5.0.4 2012-09-18 14:52:41 -04:00
Eelco Dolstra 51a6b27cc7 gzip: Update to 1.5
This fixes the gets() problem in gzip.

Also disabled "make check" because it depends on Perl and more/less,
which is undesirable in the stdenv bootstrap.
2012-09-18 14:30:19 -04:00
Peter Simons d5677fe6c7 stdenv-updates: merge updates from 'master' branch 2012-09-11 16:48:41 +02:00
Shea Levy 8480a90d1e bzip2: Keep libbz2.so.1.0 around.
Some packages (e.g. libarchive) try to link there. Reported by jack_c in IRC.
2012-07-12 14:28:19 -04:00
Lluís Batlle i Rossell 3bdc4b417f lrzip: adding an upstream patch that fixes its md5 checksum.
The next version will have this fix already.
2012-07-05 09:56:22 +02:00
Shea Levy 015e7594d0 Merge remote-tracking branch 'upstream/master' into stdenv-updates 2012-07-02 11:27:25 -04:00
Ludovic Courtès e80145b909 tar, gzip: Adjust the `gets' patch.
Fixes the incorrect patches introduced in
9786a98261.
2012-07-02 16:10:46 +02:00
Ludovic Courtès 9786a98261 tar, gzip, diffutils: Allow builds with newer versions of glibc.
This is a follow-up to 77fdc7bb35 ("GNU
Coreutils: Allow builds with newer versions of glibc.").
2012-07-01 01:14:56 +02:00
Shea Levy 8cc0edaeba Merge branch 'master' into stdenv-updates
ssp is disabled for glibc-2.13 unconditionally
2012-06-27 13:48:22 -04:00
Antono Vasiljev 1fb5c38fce Updated ncompress url (prev version missing on mirrors) (Fixes #21) 2012-06-24 16:37:32 +03:00
Eelco Dolstra 0f4d6b791e * bzip2 installs a weird libbz2.so.1.0 symlink, which should be
libbz2.so.1.  And libbz2.so should link to libbz2.so.1.0.6.

svn path=/nixpkgs/branches/stdenv-updates/; revision=34095
2012-05-14 21:57:18 +00:00
Peter Simons 7a4f8c97c5 pigz: updated to version 2.2.4
svn path=/nixpkgs/trunk/; revision=34058
2012-05-11 12:16:09 +00:00
Lluís Batlle i Rossell 2523c0b9d1 Updating lrzip to 0.612.
svn path=/nixpkgs/trunk/; revision=33991
2012-05-05 15:50:31 +00:00
Yury G. Kudryashov 57fd764a39 svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=32792
2012-03-05 10:00:23 +00:00
Lluís Batlle i Rossell f20a947a5d Updating lzop
svn path=/nixpkgs/trunk/; revision=32730
2012-03-01 22:03:34 +00:00
Eelco Dolstra c556a6ea46 * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless
function, so obsolete it.

svn path=/nixpkgs/branches/stdenv-updates/; revision=31644
2012-01-18 20:16:00 +00:00