1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-28 16:42:09 +00:00
Commit graph

176 commits

Author SHA1 Message Date
Eelco Dolstra bc5995e392 cpio: Fix build on Darwin 2014-01-28 13:38:08 +01:00
Vladimír Čunát 9443129b08 Merge master into stdenv-updates
Conflicts:
	pkgs/development/libraries/glibc/2.18/common.nix (take stdenv-updates)
	pkgs/misc/emulators/zsnes/default.nix (more complex, build tested)
	pkgs/top-level/all-packages.nix (auto-solved)
2014-01-04 18:34:53 +01:00
Michael Raskin ad45ac4c2a Update ZPAQ 2014-01-04 15:01:30 +04:00
Peter Simons 45e8de9a7d Merge branch 'origin/master' into stdenv-updates.
Conflicts:
	pkgs/tools/misc/less/default.nix
2013-12-16 21:13:24 +01:00
Nixpkgs Monitor 6619a3a1d8 dar: update from 2.4.6 to 2.4.11 2013-12-15 12:49:39 +02:00
Peter Simons 486e7736df Merge remote-tracking branch 'origin/master' into stdenv-updates.
Conflicts:
	pkgs/tools/networking/p2p/amule/default.nix
2013-12-10 00:25:54 +01:00
Peter Simons f0d3e92b33 atool: have Hydra build this tool only on Linux 2013-12-06 19:32:34 +01:00
Peter Simons 29c11ef8a5 gnutar: update to version 1.27.1 2013-12-02 13:00:02 +01: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 9eba67dbcd Fix/split ZPAQ after upgrade 2013-10-20 22:30:40 +04:00
Michael Raskin bf721764ac Updating ZPAQ to 642 2013-10-20 21:09:45 +04:00
Peter Simons 134776e5e9 gnutar: drop obsolete gets-undeclared.patch 2013-10-18 12:50:48 +02:00
Peter Simons bff3101607 gnutar: update to version 1.27 2013-10-10 11:55:19 +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 76244ac2e2 Merge branch 'master' into stdenv-updates
Conflicts:
	pkgs/development/compilers/ghc/with-packages.nix
2013-08-16 22:51:13 +02:00
Jason "Don" O'Conal e822cc9c44 p7zip: fix build on darwin 2013-08-15 13:53:43 +10: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
Lluís Batlle i Rossell 206706503a cromfs: update to 1.5.10.1. 2013-07-14 22:27:51 +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 83e37cdac8 atool: fix version to match tarball 2013-07-14 02:08:48 +03:00
Domen Kozar 303c3a9fbf unzip: add bzip2 as native build input
Signed-off-by: Domen Kozar <domen@dev.si>
2013-05-26 19:25:37 +02:00
Domen Kozar 0f8a1b29d2 unzip: add bzip2 as native build input 2013-05-26 13:22:55 +02:00
Peter Simons 728e305205 Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-05-22 12:30:02 +02:00
Domen Kozar db04466380 xarchive: add gtk archiver 2013-05-05 22:03:50 +02:00
Shea Levy fde3526e7d Merge branch 'master' into stdenv-updates
Conflict in kerberos, which was updated both in master and in
stdenv-updates. Kept the stdenv-updates version, except pulled in the
enableParallelBuilding change from master.

Signed-off-by: Shea Levy <shea@shealevy.com>

Conflicts:
	pkgs/development/libraries/kerberos/krb5.nix
2013-05-04 18:28:48 -04:00
Michael Raskin b98ece6bc2 Auto-update some packages; no early build failures (SBCL and Wine not yet fully built) 2013-04-23 09:15:48 +04:00
Vladimír Čunát 32a503a5d3 cpio: fix build without gets 2013-03-20 23:01:36 +01: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
Michael Raskin 5ec1806564 Adding ZPAQ archiver 2013-03-09 16:33:14 +04:00
Danny Wilson fe3a8b6859 gnutar root build: Nix on Illumos doesn't support build users yet. 2013-02-28 20:04:05 +01:00
Danny Wilson c019cdb761 Update CPIO to 2.11 2013-02-28 20:04:02 +01:00
Danny Wilson bcaea92a12 Attempt at getting GCC 4.7 compiled on Illumos...
No success yet :-(
2013-02-28 20:04:01 +01:00
Eelco Dolstra 5e256ccc88 Merge remote-tracking branch 'origin/master' into stdenv-updates 2012-12-04 17:12:35 +01:00
Eelco Dolstra 5553546c21 Remove a bunch of unreferenced files
Plus a small number of obsolete packages (like old versions of qemu).
2012-11-29 13:43:37 +01:00
Peter Simons f67d5a9a39 Merge branch 'master' into stdenv-updates.
Conflicts have been resolved in:

        pkgs/tools/misc/file/default.nix
        pkgs/top-level/all-packages.nix
        pkgs/top-level/python-packages.nix
2012-11-21 16:20:36 +01:00
Lluís Batlle i Rossell 16dbe75e57 sharutils: making them crossbuild, thanks to a patch.
Patch taken from:
http://repository.timesys.com/buildsources/s/sharutils/sharutils-4.11.1/sharutils-4.11.1-cross-binary-mode-popen.patch
after a google search for the guilty part of 'configure'.
2012-11-08 19:38:24 +01:00
Rickard Nilsson 2658eccaea zip: Add extra source URL 2012-11-06 11:23:34 +01:00
Eelco Dolstra d9c01ef51d p7zip: Update to 9.20.1 2012-10-05 16:06:35 -04:00
Eelco Dolstra e8c4748cdb cabextract: Update to 1.4 2012-10-05 16:06:19 -04:00
Eelco Dolstra 5833b2ee30 sharutils: Fix building on Glibc 2.16
http://hydra.nixos.org/build/3046590
2012-09-21 10:49:26 -04:00
Eelco Dolstra a893399776 Fix more gets() problems 2012-09-18 14:51:15 -04:00
Sergey Mironov 36f0a97fc6 atool: add archiver helper 2012-08-15 01:10:05 +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
Lluís Batlle ae7991b97e Updating dar to 2.4.6 2012-06-24 19:12:20 +02:00
Nicolas Pierron 82b308bf11 Add armv7l support.
svn path=/nixpkgs/trunk/; revision=33798
2012-04-15 23:41:25 +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
Eelco Dolstra 27809f0ec4 * No longer needed.
svn path=/nixpkgs/trunk/; revision=32772
2012-03-04 15:50:03 +00:00
Lluís Batlle i Rossell 53e80e5316 Adding a manpage for tar, using help2man
svn path=/nixpkgs/trunk/; revision=32749
2012-03-03 09:52:55 +00:00