public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into stdenv-updates

Browse Source
This commit is contained in:
Eelco Dolstra
2012-12-04 17:12:35 +01:00
parent c138356805 50e7ddbdca
commit 5e256ccc88
391 changed files with 2094 additions and 19973 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/misc/coreutils-5/default.nix
-10
View File
@@ -1,10 +0,0 @@
{stdenv, fetchurl, perl ? null}:
stdenv.mkDerivation {
name = "coreutils-5.97";
src = fetchurl {
url = http://nixos.org/tarballs/coreutils-5.97.tar.gz;
md5 = "bdec4b75c76ac9bf51b6dd1747d3b06e";
};
patches = [./dietlibc.patch];
}
pkgs/tools/misc/coreutils-5/dietlibc.patch
-35
View File
@@ -1,35 +0,0 @@
diff -rc coreutils-5.97-orig/lib/strftime.c coreutils-5.97/lib/strftime.c
*** coreutils-5.97-orig/lib/strftime.c 2006-10-18 17:10:16.000000000 +0200
--- coreutils-5.97/lib/strftime.c 2006-10-18 17:19:10.000000000 +0200
***************
*** 180,185 ****
--- 180,191 ----
# define memset_zero(P, Len) (memset (P, '0', Len), (P) += (Len))
#endif
+ #if FPRINTFTIME
+ #define advance(p, _n) ;
+ #else
+ #define advance(p, _n) p += _n;
+ #endif
+
#define add(n, f) \
do \
{ \
***************
*** 198,204 ****
memset_space (p, _delta); \
} \
f; \
! p += FPRINTFTIME ? 0 : _n; \
} \
i += _incr; \
} while (0)
--- 204,210 ----
memset_space (p, _delta); \
} \
f; \
! advance(p, _n); \
} \
i += _incr; \
} while (0)
pkgs/tools/misc/findutils/4.2.27.nix
-14
View File
@@ -1,14 +0,0 @@
{stdenv, fetchurl, coreutils}:
stdenv.mkDerivation {
name = "findutils-4.2.27";
src = fetchurl {
url = http://nixos.org/tarballs/findutils-4.2.27.tar.gz;
md5 = "f1e0ddf09f28f8102ff3b90f3b5bc920";
};
buildInputs = [coreutils];
patches = [./findutils-path.patch]
# Note: the dietlibc is just to get findutils to compile. The
# locate command probably won't work though.
++ (if stdenv ? isDietLibC then [./dietlibc-hack.patch] else []);
}
pkgs/tools/misc/findutils/default.nix
+1 -4
View File
@@ -10,10 +10,7 @@ stdenv.mkDerivation rec {
buildNativeInputs = [coreutils];
patches = [ ./findutils-path.patch ./change_echo_path.patch ]
# Note: the dietlibc patch is just to get findutils to compile.
# The locate command probably won't work though.
++ stdenv.lib.optional (stdenv ? isDietLibC) ./dietlibc-hack.patch;
patches = [ ./findutils-path.patch ./change_echo_path.patch ];
doCheck = true;
pkgs/tools/misc/findutils/dietlibc-hack.patch
-58
View File
@@ -1,58 +0,0 @@
diff -rc findutils-4.2.27-orig/locate/code.c findutils-4.2.27/locate/code.c
*** findutils-4.2.27-orig/locate/code.c 2005-06-07 22:24:56.000000000 +0000
--- findutils-4.2.27/locate/code.c 2006-10-20 15:53:53.000000000 +0000
***************
*** 210,216 ****
--- 210,218 ----
if (diffcount < -LOCATEDB_OLD_OFFSET || diffcount > LOCATEDB_OLD_OFFSET)
{
putc (LOCATEDB_OLD_ESCAPE, stdout);
+ #if 0
putw (diffcount + LOCATEDB_OLD_OFFSET, stdout);
+ #endif
}
else
putc (diffcount + LOCATEDB_OLD_OFFSET, stdout);
diff -rc findutils-4.2.27-orig/locate/locate.c findutils-4.2.27/locate/locate.c
*** findutils-4.2.27-orig/locate/locate.c 2005-09-01 20:42:43.000000000 +0000
--- findutils-4.2.27/locate/locate.c 2006-10-20 15:53:11.000000000 +0000
***************
*** 468,473 ****
--- 468,474 ----
return VISIT_CONTINUE;
}
+ #if 0
static int
visit_old_format(struct process_data *procdata, void *context)
{
***************
*** 498,503 ****
--- 499,505 ----
return VISIT_CONTINUE;
}
+ #endif
static int
***************
*** 911,920 ****
lastinspector = NULL;
past_pat_inspector = NULL;
! if (old_format)
! add_visitor(visit_old_format, NULL);
! else
! add_visitor(visit_locate02_format, NULL);
if (basename_only)
add_visitor(visit_basename, NULL);
--- 913,919 ----
lastinspector = NULL;
past_pat_inspector = NULL;
! add_visitor(visit_locate02_format, NULL);
if (basename_only)
add_visitor(visit_basename, NULL);
pkgs/tools/misc/gnokii/src-for-default.nix
+5 -5
View File
@@ -1,9 +1,9 @@
rec {
version="0.6.30";
name="gnokii-0.6.30";
hash="0k14dymifk7dx3z58cqrc4mgxrm17s4jk12chwdfjhjarz390x8p";
url="http://www.gnokii.org/download/gnokii/0.6.x/gnokii-${version}.tar.gz";
advertisedUrl="http://www.gnokii.org/download/gnokii/gnokii-0.6.30.tar.gz";
version="0.6.31";
name="gnokii-0.6.31";
hash="0sjjhm40662bj6j0jh3sd25b8nww54nirpwamz618rg6pb5hjwm8";
url="http://www.gnokii.org/download/gnokii/gnokii-${version}.tar.gz";
advertisedUrl="http://www.gnokii.org/download/gnokii/gnokii-0.6.31.tar.gz";
}
pkgs/tools/misc/grub/device-mapper-symlinks.patch
-28
View File
@@ -1,28 +0,0 @@
Only in grub-1.97.1-orig/: grub-1.97.1
diff -rc -x '*~' grub-1.97.1-orig/util/getroot.c grub-1.97.1/util/getroot.c
*** grub-1.97.1-orig/util/getroot.c 2009-11-09 16:48:16.000000000 +0100
--- grub-1.97.1/util/getroot.c 2010-01-08 00:26:12.000000000 +0100
***************
*** 217,224 ****
continue;
if (S_ISLNK (st.st_mode))
! /* Don't follow symbolic links. */
! continue;
if (S_ISDIR (st.st_mode))
{
--- 217,229 ----
continue;
if (S_ISLNK (st.st_mode))
! {
! if (strcmp(dir, "mapper") != 0)
! /* Don't follow symbolic links. */
! continue;
! if (stat (ent->d_name, &st) < 0)
! continue;
! }
if (S_ISDIR (st.st_mode))
{
pkgs/tools/misc/mc/mc-4.6.1-bash32-1.patch
-41
View File
@@ -1,41 +0,0 @@
Submitted By: Alexander E. Patrakov
Date: 2007-01-19
Initial Package Version: 4.6.1
Origin: http://bugs.gentoo.org/show_bug.cgi?id=153925
Upstream Status: aware of the problem
Description: with bash-3.2, unpatched mc-4.6.1 refuses to go into directories
containing underscores or other strange characters.
--- mc-4.6.1/src/subshell.c.000 2006-05-08 23:11:48.000000000 +0200
+++ mc-4.6.1/src/subshell.c 2006-10-28 15:40:46.000000000 +0200
@@ -745,29 +745,13 @@ subshell_name_quote (const char *s)
memcpy (d, cmd_start, len);
d += len;
- /*
- * Print every character in octal format with the leading backslash.
- * tcsh and zsh may require 4-digit octals, bash < 2.05b doesn't like them.
- */
- if (subshell_type == BASH) {
for (; *s; s++) {
- /* Must quote numbers, so that they are not glued to octals */
if (isalpha ((unsigned char) *s)) {
*d++ = (unsigned char) *s;
} else {
- sprintf (d, "\\%03o", (unsigned char) *s);
- d += 4;
- }
- }
- } else {
- for (; *s; s++) {
- if (isalnum ((unsigned char) *s)) {
- *d++ = (unsigned char) *s;
- } else {
sprintf (d, "\\0%03o", (unsigned char) *s);
d += 5;
}
- }
}
memcpy (d, common_end, sizeof (common_end));
pkgs/tools/misc/mc/mc-4.6.1-debian_fixes-1.patch
-12671
View File
File diff suppressed because it is too large Load Diff
pkgs/tools/misc/plowshare/default.nix
+4 -4
View File
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "plowshare-${version}";
name = "plowshare4-${version}";
version = "20120916";
version = "20121126.47e4480";
src = fetchurl {
url = "http://plowshare.googlecode.com/files/plowshare-snapshot-git${version}.tar.gz";
sha256 = "eccdb28d49ac47782abc8614202b3a88426cd587371641ecf2ec008880dc6067";
url = "http://plowshare.googlecode.com/files/plowshare4-snapshot-git${version}.tar.gz";
sha256 = "1p7bqqfbgcy41hiickgr8cilspyvrrql12rdmfasz0dmgf7nx1x6";
};
buildInputs = [ makeWrapper ];
pkgs/tools/misc/ttf2pt1/ttf2pt1-cl-pdf.nix
-20
View File
@@ -1,20 +0,0 @@
{ttf2pt1, lib, fetchurl, unzip}:
lib.overrideDerivation ttf2pt1
(x:
{
name = "ttf2pt1-cl-pdf";
src = fetchurl {
url = "http://www.fractalconcept.com/fcweb/download/ttf2pt1-src.zip";
sha256 = "1w6kxgnrj3x67lf346bswmcqny9lmyhbnkp6kv99l6wfaq4gs82b";
};
buildInputs = x.buildInputs ++ [unzip];
sourceRoot = "ttf2pt1-cl-pdf";
preBuild = ''
chmod a+x scripts/*
'';
meta = x.meta // {
maintainers = [lib.maintainers.raskin];
platforms = lib.platforms.linux;
};
})