about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAndreas Rammhold <andreas@rammhold.de>2018-10-08 17:08:36 +0200
committerGitHub <noreply@github.com>2018-10-08 17:08:36 +0200
commitcefd0f7e86b27791ef75f9e506e8489c2b7476f0 (patch)
tree6f63e8f26b9ce7258b645d56b3219e8adf346bef
parent2be42950c3b726f3cbf8c0198c66190aed094121 (diff)
parent15a190eb27167c1817e0d5154394d0b3d768a56c (diff)
downloadnixlib-cefd0f7e86b27791ef75f9e506e8489c2b7476f0.tar
nixlib-cefd0f7e86b27791ef75f9e506e8489c2b7476f0.tar.gz
nixlib-cefd0f7e86b27791ef75f9e506e8489c2b7476f0.tar.bz2
nixlib-cefd0f7e86b27791ef75f9e506e8489c2b7476f0.tar.lz
nixlib-cefd0f7e86b27791ef75f9e506e8489c2b7476f0.tar.xz
nixlib-cefd0f7e86b27791ef75f9e506e8489c2b7476f0.tar.zst
nixlib-cefd0f7e86b27791ef75f9e506e8489c2b7476f0.zip
Merge pull request #48050 from pacien/pkg-tinc-20181008
tinc: 1.0.34 -> 1.0.35, 1.1pre16 -> 1.1pre17 (security update)
-rw-r--r--pkgs/tools/networking/tinc/default.nix4
-rw-r--r--pkgs/tools/networking/tinc/pre.nix4
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/tools/networking/tinc/default.nix b/pkgs/tools/networking/tinc/default.nix
index bf039b653cc6..a17f382557ac 100644
--- a/pkgs/tools/networking/tinc/default.nix
+++ b/pkgs/tools/networking/tinc/default.nix
@@ -1,12 +1,12 @@
 {stdenv, fetchurl, lzo, openssl, zlib}:
 
 stdenv.mkDerivation rec {
-  version = "1.0.34";
+  version = "1.0.35";
   name = "tinc-${version}";
 
   src = fetchurl {
     url = "https://www.tinc-vpn.org/packages/tinc-${version}.tar.gz";
-    sha256 = "1nngdp2x5kykrgh13q5wjry8m82vahqv53csvlb22ifxvrhrnfn0";
+    sha256 = "0pl92sdwrkiwgll78x0ww06hfljd07mkwm62g8x17qn3gha3pj0q";
   };
 
   buildInputs = [ lzo openssl zlib ];
diff --git a/pkgs/tools/networking/tinc/pre.nix b/pkgs/tools/networking/tinc/pre.nix
index 09c737c048ae..0cc1fb99455a 100644
--- a/pkgs/tools/networking/tinc/pre.nix
+++ b/pkgs/tools/networking/tinc/pre.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   name = "tinc-${version}";
-  version = "1.1pre16";
+  version = "1.1pre17";
 
   src = fetchgit {
     rev = "refs/tags/release-${version}";
     url = "git://tinc-vpn.org/tinc";
-    sha256 = "03dsm1kxagq8srskzg649xyhbdqbbqxc84pdwrz7yakpa9m6225c";
+    sha256 = "12abmx9qglchgn94a1qwgzldf2kaz77p8705ylpggzyncxv6bw2q";
   };
 
   outputs = [ "out" "man" "info" ];