Update FLTK and TigerVNC; doesn't fix TigerVNC Xvnc build per se

This commit is contained in:
Michael Raskin 2014-01-01 01:36:27 +04:00
parent bad39d4861
commit af9db522cf
3 changed files with 7 additions and 7 deletions

View file

@ -22,7 +22,7 @@ fi;
# server's certificate. This is perfectly safe: we don't care
# whether the server is being spoofed --- only the cryptographic
# hash of the output matters. Pass in extra p's to handle redirects.
printf 'p\np\np\n' | svn export ${ignoreExternals:+--ignore-externals} \
printf 'p\np\np\n' | svn export --trust-server-cert --non-interactive ${ignoreExternals:+--ignore-externals} \
-r "$rev" "$url" "$out"
stopNest

View file

@ -3,13 +3,13 @@
let inherit (composableDerivation) edf; in
let version = "1.3.0"; in
let version = "1.3.2"; in
composableDerivation.composableDerivation {} {
name = "fltk-${version}";
src = fetchurl {
url = "ftp://ftp.easysw.com/pub/fltk/${version}/fltk-${version}-source.tar.gz";
sha256 = "075j6ljx4dfg9rnkardn24y0f26ylpakm0yylg6a9kllha07c1lr";
url = "http://fltk.org/pub/fltk/${version}/fltk-${version}-source.tar.gz";
sha256 = "1974brlk723095vf8z72kazq1cbqr9a51kq6b0xda6zkjkgl8q0p";
};
propagatedBuildInputs = [ x11 inputproto libXi freeglut ];

View file

@ -10,8 +10,8 @@
with stdenv.lib;
stdenv.mkDerivation rec {
# Release version = "1.2.0";
revision = 5005;
# Release version = "1.3.0";
revision = 5129;
version = "r${toString revision}";
name = "tigervnc-${version}";
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
# Release url = "mirror://sourceforge/tigervnc/${version}/${name}.tar.gz";
url = "https://tigervnc.svn.sourceforge.net/svnroot/tigervnc/trunk";
rev = revision;
sha256 = "2401e0ede9a2d50a37caeb094e5e832d24878749239578f44ae2acd42de01b43";
sha256 = "1qszlqr8z16iqkm05gbs0knj4fxc3bb6gjayky1abmf8pjazi0j8";
};
inherit fontDirectories;