Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: be81cfd9f878
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 1f0f7b7ec702
Choose a head ref
  • 2 commits
  • 3 files changed
  • 2 contributors

Commits on Oct 8, 2018

  1. tinc: 1.0.34 -> 1.0.35, 1.1pre16 -> 1.1pre17 

    Critical security update (CVE-2018-16737, CVE-2018-16738, CVE-2018-16758)

(cherry picked from commit 15a190e)
    @pacien @andir
    pacien authored and andir committed Oct 8, 2018
    Copy the full SHA
    859a4d3 View commit details

  2. debian vm tools: use snapshot.debian.org 

    snapshot.debian.org actually keeps track of all of the updates as they
come in rather than doing arbitrary (?) snapshots.

(cherry picked from commit 9cc18fa)
    @lheckemann @Mic92
    lheckemann authored and Mic92 committed Oct 8, 2018
    Copy the full SHA
    1f0f7b7 View commit details
Showing with 9 additions and 9 deletions.
  1. +4 −4 pkgs/build-support/vm/default.nix
  2. +3 −3 pkgs/tools/networking/tinc/default.nix
  3. +2 −2 pkgs/tools/networking/tinc/pre.nix
8 changes: 4 additions & 4 deletions pkgs/build-support/vm/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1000,8 +1000,8 @@ rec {
name = "debian-9.3-stretch-i386";
fullName = "Debian 9.3 Stretch (i386)";
packagesList = fetchurl {
url = mirror://debian/dists/stretch/main/binary-i386/Packages.xz;
sha256 = "1rpv0r92pkr9dmjvpffvgmq3an1s83npfmq870h67jqag3qpwj9l";
url = http://snapshot.debian.org/archive/debian/20180912T154744Z/dists/stretch/main/binary-i386/Packages.xz;
sha256 = "0flvn8zn7vk04p10ndf3aq0mdr8k2ic01g51aq4lsllkv8lmwzyh";
};
urlPrefix = mirror://debian;
packages = commonDebianPackages;
@@ -1011,8 +1011,8 @@ rec {
name = "debian-9.3-stretch-amd64";
fullName = "Debian 9.3 Stretch (amd64)";
packagesList = fetchurl {
url = mirror://debian/dists/stretch/main/binary-amd64/Packages.xz;
sha256 = "1gnkvh7wc5yp0rw8kq8p8rlskvl0lc4cv3gdylw8qpqzy75xqlig";
url = http://snapshot.debian.org/archive/debian/20180912T154744Z/dists/stretch/main/binary-amd64/Packages.xz;
sha256 = "11vnn9bba2jabixvabfbw9zparl326c88xn99di7pbr5xsnl15jm";
};
urlPrefix = mirror://debian;
packages = commonDebianPackages;
6 changes: 3 additions & 3 deletions pkgs/tools/networking/tinc/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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 = "http://www.tinc-vpn.org/packages/tinc-${version}.tar.gz";
sha256 = "1nngdp2x5kykrgh13q5wjry8m82vahqv53csvlb22ifxvrhrnfn0";
url = "https://www.tinc-vpn.org/packages/tinc-${version}.tar.gz";
sha256 = "0pl92sdwrkiwgll78x0ww06hfljd07mkwm62g8x17qn3gha3pj0q";
};

buildInputs = [ lzo openssl zlib ];
4 changes: 2 additions & 2 deletions pkgs/tools/networking/tinc/pre.nix
View file
Original file line number Diff line number Diff line change
@@ -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" ];