diff options
| author | Peter Simons <simons@cryp.to> | 2013-10-26 18:28:05 +0200 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2013-10-26 18:28:05 +0200 |
| commit | 91f2c362dee33f74bd6941f3b480dde30833a375 (patch) | |
| tree | 49eaa78856da07d2aee812ac743c319126cf7b74 /pkgs/applications/misc/synergy | |
| parent | f7bec094e62a64580fdcd7a46283cea0c94c70a9 (diff) | |
| parent | e1c9c133b0fc244794194bbf5bcee32c6d777dee (diff) | |
| download | nixpkgs-91f2c362dee33f74bd6941f3b480dde30833a375.tar nixpkgs-91f2c362dee33f74bd6941f3b480dde30833a375.tar.gz nixpkgs-91f2c362dee33f74bd6941f3b480dde30833a375.tar.bz2 nixpkgs-91f2c362dee33f74bd6941f3b480dde30833a375.tar.lz nixpkgs-91f2c362dee33f74bd6941f3b480dde30833a375.tar.xz nixpkgs-91f2c362dee33f74bd6941f3b480dde30833a375.tar.zst nixpkgs-91f2c362dee33f74bd6941f3b480dde30833a375.zip | |
Merge remote-tracking branch 'origin/master' into stdenv-updates.
Conflicts: pkgs/top-level/all-packages.nix
Diffstat (limited to 'pkgs/applications/misc/synergy')
| -rw-r--r-- | pkgs/applications/misc/synergy/cryptopp.patch | 12 | ||||
| -rw-r--r-- | pkgs/applications/misc/synergy/default.nix | 6 |
2 files changed, 9 insertions, 9 deletions
diff --git a/pkgs/applications/misc/synergy/cryptopp.patch b/pkgs/applications/misc/synergy/cryptopp.patch index f20ef9544a2..d0aebb87261 100644 --- a/pkgs/applications/misc/synergy/cryptopp.patch +++ b/pkgs/applications/misc/synergy/cryptopp.patch @@ -20,10 +20,10 @@ index 3b61fc0..2206646 100644 if (WIN32) # add /analyze in order to unconver potential bugs in the source code -diff --git a/src/lib/synergy/CCryptoMode.h b/src/lib/synergy/CCryptoMode.h +diff --git a/src/lib/io/CCryptoMode.h b/src/lib/io/CCryptoMode.h index 9b7e8ad..0d659ac 100644 ---- a/src/lib/synergy/CCryptoMode.h -+++ b/src/lib/synergy/CCryptoMode.h +--- a/src/lib/io/CCryptoMode.h ++++ b/src/lib/io/CCryptoMode.h @@ -17,9 +17,9 @@ #pragma once @@ -37,10 +37,10 @@ index 9b7e8ad..0d659ac 100644 #include "ECryptoMode.h" #include "CString.h" -diff --git a/src/lib/synergy/CCryptoStream.h b/src/lib/synergy/CCryptoStream.h +diff --git a/src/lib/io/CCryptoStream.h b/src/lib/io/CCryptoStream.h index 104b1f6..09c4dc4 100644 ---- a/src/lib/synergy/CCryptoStream.h -+++ b/src/lib/synergy/CCryptoStream.h +--- a/src/lib/io/CCryptoStream.h ++++ b/src/lib/io/CCryptoStream.h @@ -20,8 +20,8 @@ #include "BasicTypes.h" #include "CStreamFilter.h" diff --git a/pkgs/applications/misc/synergy/default.nix b/pkgs/applications/misc/synergy/default.nix index 0b3734ea147..c01d67943e5 100644 --- a/pkgs/applications/misc/synergy/default.nix +++ b/pkgs/applications/misc/synergy/default.nix @@ -7,11 +7,11 @@ assert !stdenv.isLinux -> unzip != null; with stdenv.lib; stdenv.mkDerivation rec { - name = "synergy-1.4.12"; + name = "synergy-1.4.15"; src = fetchurl { - url = "http://synergy.googlecode.com/files/${name}-Source.tar.gz"; - sha256 = "0j884skwqy8r8ckj9a4rlwsbjwb1yrj9wqma1nwhr2inff6hrdim"; + url = "http://synergy.googlecode.com/files/${name}-Source.tar.gz"; + sha256 = "0l1mxxky9hacyva0npzkgkwg4wkmihzq3abdrds0w5f6is44adv4"; }; patches = optional stdenv.isLinux ./cryptopp.patch; |