Merge branch 'staging'

This commit is contained in:
Vladimír Čunát
2015-07-24 15:12:28 +02:00
36 changed files with 1918 additions and 208 deletions

View File

@@ -1,15 +1,28 @@
{ stdenv, fetchurl, pcre }:
{ stdenv, fetchFromGitHub, autoconf, automake, libtool, bison, pcre }:
stdenv.mkDerivation rec {
name = "swig-2.0.11";
name = "swig-${version}";
version = "2.0.12";
src = fetchurl {
url = "mirror://sourceforge/swig/${name}.tar.gz";
sha256 = "0kj21b6syp62vx68r1j6azv9033kng68pxm1k79pm4skkzr0ny33";
src = fetchFromGitHub {
owner = "swig";
repo = "swig";
rev = "rel-${version}";
sha256 = "0khm9gh5pczfcihr0pbicaicc4v9kjm5ip2alvkhmbb3ga6njkcm";
};
nativeBuildInputs = [ autoconf automake libtool bison ];
buildInputs = [ pcre ];
postPatch = ''
# Disable ccache documentation as it need yodl
sed -i '/man1/d' CCache/Makefile.in
'';
preConfigure = ''
./autogen.sh
'';
meta = {
description = "SWIG, an interface compiler that connects C/C++ code to higher-level languages";

View File

@@ -1,15 +1,28 @@
{ stdenv, fetchurl, pcre }:
{ stdenv, fetchFromGitHub, autoconf, automake, libtool, bison, pcre }:
stdenv.mkDerivation rec {
name = "swig-3.0.2";
name = "swig-${version}";
version = "3.0.6";
src = fetchurl {
url = "mirror://sourceforge/swig/${name}.tar.gz";
sha256 = "04vqrij3k6pcq41y7rzl5rmhnghqg905f11wyrqw7vdwr9brcrm2";
src = fetchFromGitHub {
owner = "swig";
repo = "swig";
rev = "rel-${version}";
sha256 = "1y8rlrkqs9h5cyp75s1i9rvrj35kkcwjjw65dyv3xy1skgfxb6w8";
};
nativeBuildInputs = [ autoconf automake libtool bison ];
buildInputs = [ pcre ];
postPatch = ''
# Disable ccache documentation as it need yodl
sed -i '/man1/d' CCache/Makefile.in
'';
preConfigure = ''
./autogen.sh
'';
meta = {
description = "SWIG, an interface compiler that connects C/C++ code to higher-level languages";