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

Merge master into stdenv-updates

Browse Source 
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
This commit is contained in:
Vladimír Čunát
2014-01-18 14:46:20 +01:00
parent 2848336491 9c1d3bfa9f
commit 0a58b512cb
231 changed files with 2911 additions and 1982 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/graphics/graphviz/default.nix
+2 -4
View File
@@ -3,11 +3,11 @@
}:
stdenv.mkDerivation rec {
name = "graphviz-2.28.0";
name = "graphviz-2.36.0";
src = fetchurl {
url = "http://www.graphviz.org/pub/graphviz/ARCHIVE/${name}.tar.gz";
sha256 = "0xpwg99cd8sp0c6r8klsmc66h1pday64kmnr4v6f9jkqqmrpkank";
sha256 = "0qb30z5sxlbjni732ndad3j4x7l36vsxpxn4fmf5fn7ivvc6dz9p";
};
buildInputs =
@@ -16,8 +16,6 @@ stdenv.mkDerivation rec {
] ++ stdenv.lib.optionals (xlibs != null) [ xlibs.xlibs xlibs.libXrender ]
++ stdenv.lib.optional (stdenv.system == "x86_64-darwin") gettext;
patches = [ ./fix-broken-memcp-signature.patch ];
CPPFLAGS = stdenv.lib.optionalString (stdenv.system == "x86_64-darwin") "-I${cairo}/include/cairo";
configureFlags =
pkgs/tools/graphics/graphviz/fix-broken-memcp-signature.patch
-15
View File
@@ -1,15 +0,0 @@
diff -ubr graphviz-2.28.0-orig/lib/cdt/cdt.h graphviz-2.28.0-new/lib/cdt/cdt.h
--- graphviz-2.28.0-orig/lib/cdt/cdt.h 2012-11-11 20:05:55.674397100 +0100
+++ graphviz-2.28.0-new/lib/cdt/cdt.h 2012-11-11 20:06:28.069511092 +0100
@@ -238,11 +238,6 @@
extern int dtstat _ARG_((Dt_t*, Dtstat_t*, int));
extern unsigned int dtstrhash _ARG_((unsigned int, Void_t*, int));
-#if !_PACKAGE_ast
-extern int memcmp _ARG_((const Void_t*, const Void_t*, size_t));
-extern int strcmp _ARG_((const char*, const char*));
-#endif
-
#undef extern
_END_EXTERNS_