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: 109a28ab954a
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: 168cbb39691c
Choose a head ref
  • 5 commits
  • 3 files changed
  • 4 contributors

Commits on Feb 11, 2019

  1. tor-browser-bundle-bin: 8.0.4 -> 8.0.5 

    https://blog.torproject.org/new-release-tor-browser-805

* demote github URL, it doesn't have newest
  (including 8.0.4 which this upgrades from)

(cherry picked from commit 791a6c4)
    @dtzWill @Moredread
    dtzWill authored and Moredread committed Feb 11, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    Moredread André-Patrick Bubel
    GPG key ID: 28925CBA8869FF29
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    d064b22 View commit details

  2. libu2f-host: 1.1.6 -> 1.1.7 (CVE-2018-20340) 

    (cherry picked from commit da9fdcb)
    @delroth @flokli
    delroth authored and flokli committed Feb 11, 2019

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    d770864 View commit details

  3. borgbackup: 1.1.7 -> 1.1.8 

    (cherry picked from commit 3adf842)
    Robert Schütz committed Feb 11, 2019
    Copy the full SHA
    16340b9 View commit details

  4. borgbackup: 1.1.8 -> 1.1.9 

    Changelog: https://borgbackup.readthedocs.io/en/stable/changes.html#version-1-1-9-2019-02-10
(cherry picked from commit 9c5ca86)
    Robert Schütz committed Feb 11, 2019
    Copy the full SHA
    ccd53a9 View commit details

  5. Merge pull request #55562 from Moredread/tor-browser-backport 

    tor-browser-bundle-bin: 8.0.4 -> 8.0.5 (Backport)
    @dotlambda
    dotlambda authored Feb 11, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    168cbb3 View commit details
8 changes: 4 additions & 4 deletions pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
View file
Original file line number Diff line number Diff line change
@@ -103,7 +103,7 @@ let
fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ];

# Upstream source
version = "8.0.4";
version = "8.0.5";

lang = "en-US";

@@ -113,15 +113,15 @@ let
"https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
"https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
];
sha256 = "1hclxqk54w1diyr8lrgirhy6cwmw2rccg174hgv39zrj2a5ajvmm";
sha256 = "0afrq5vy6rxj4p2dm7kaiq3d3iv4g8ivn7nfqx0z8h1wikyaf5di";
};

"i686-linux" = fetchurl {
urls = [
"https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
"https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
"https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
];
sha256 = "16393icjcck7brng1kq1vf4nacllcz1m3q3w2vs9rdkjfsazqh42";
sha256 = "113vn2fyw9sjxz24b2m6z4kw46rqgxglrna1lg9ji6zhkfb044vv";
};
};
in
4 changes: 2 additions & 2 deletions pkgs/development/libraries/libu2f-host/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, json_c, hidapi }:

stdenv.mkDerivation rec {
name = "libu2f-host-1.1.6";
name = "libu2f-host-1.1.7";

src = fetchurl {
url = "https://developers.yubico.com/libu2f-host/Releases/${name}.tar.xz";
sha256 = "19xxwwqfzg3njfpxvhlyxd05wjwsdw3m4lpn7gk31cna6agbp82d";
sha256 = "1zyws91b1fsbfwn3f23ry9a9zr0i1a1hqmhk3v1qnlvp56gjayli";
};

nativeBuildInputs = [ pkgconfig ];
13 changes: 2 additions & 11 deletions pkgs/tools/backup/borg/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,22 +2,13 @@

python3Packages.buildPythonApplication rec {
pname = "borgbackup";
version = "1.1.7";
version = "1.1.9";

src = python3Packages.fetchPypi {
inherit pname version;
sha256 = "f7b51a132e9edfbe1cacb4f478b28caf3622d79fffcb369bdae9f92d8c8a7fdc";
sha256 = "7d0ff84e64c4be35c43ae2c047bb521a94f15b278c2fe63b43950c4836b42575";
};

patches = [
# Workarounds for https://github.com/borgbackup/borg/issues/4093
# Can be deleted when 1.1.8 comes out
(fetchpatch {
url = "https://github.com/borgbackup/borg/commit/975cc33206e0e3644626fb7204c34d2157715b61.patch";
sha256 = "0b7apaixpa7bk0sy7g5ycm98cjpkg5gkwcgm7m37xj35lzxdlxhc";
})
];

nativeBuildInputs = with python3Packages; [
# For building documentation:
sphinx guzzle_sphinx_theme