From 905349b8a594e099ffc9403d37b61aec032b0145 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Wed, 11 Jan 2017 14:25:47 +0100 Subject: [PATCH] libvncserver: 0.9.9 -> 0.9.11 --- pkgs/development/libraries/libvncserver/default.nix | 13 +++++++------ .../libraries/libvncserver/default.upstream | 4 ---- 2 files changed, 7 insertions(+), 10 deletions(-) delete mode 100644 pkgs/development/libraries/libvncserver/default.upstream diff --git a/pkgs/development/libraries/libvncserver/default.nix b/pkgs/development/libraries/libvncserver/default.nix index 93f62376ac6..a5595b1c842 100644 --- a/pkgs/development/libraries/libvncserver/default.nix +++ b/pkgs/development/libraries/libvncserver/default.nix @@ -1,7 +1,8 @@ {stdenv, fetchurl, libtool, libjpeg, openssl, libX11, libXdamage, xproto, damageproto, xextproto, libXext, fixesproto, libXfixes, xineramaproto, libXinerama, - libXrandr, randrproto, libXtst, zlib, libgcrypt + libXrandr, randrproto, libXtst, zlib, libgcrypt, autoreconfHook + , systemd, pkgconfig }: assert stdenv.isLinux; @@ -10,16 +11,16 @@ let s = # Generated upstream information rec { baseName="libvncserver"; - version="0.9.9"; + version="0.9.11"; name="${baseName}-${version}"; - hash="1y83z31wbjivbxs60kj8a8mmjmdkgxlvr2x15yz95yy24lshs1ng"; - url="mirror://sourceforge/project/libvncserver/libvncserver/0.9.9/LibVNCServer-0.9.9.tar.gz"; - sha256="1y83z31wbjivbxs60kj8a8mmjmdkgxlvr2x15yz95yy24lshs1ng"; + url="https://github.com/LibVNC/libvncserver/archive/LibVNCServer-${version}.tar.gz"; + sha256="15189n09r1pg2nqrpgxqrcvad89cdcrca9gx6qhm6akjf81n6g8r"; }; buildInputs = [ libtool libjpeg openssl libX11 libXdamage xproto damageproto xextproto libXext fixesproto libXfixes xineramaproto libXinerama - libXrandr randrproto libXtst zlib libgcrypt + libXrandr randrproto libXtst zlib libgcrypt autoreconfHook systemd + pkgconfig ]; in stdenv.mkDerivation { diff --git a/pkgs/development/libraries/libvncserver/default.upstream b/pkgs/development/libraries/libvncserver/default.upstream deleted file mode 100644 index eae48197439..00000000000 --- a/pkgs/development/libraries/libvncserver/default.upstream +++ /dev/null @@ -1,4 +0,0 @@ -url http://sourceforge.net/projects/libvncserver/files/libvncserver/ -SF_version_dir -version_link '[.]tar[.][bgx]z[0-9]*/download$' -SF_redirect