Skip to content
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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: b93881139387
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: a8a38feeeb1e
Choose a head ref
  • 5 commits
  • 3 files changed
  • 1 contributor

Commits on Oct 18, 2017

  1. tor-browser-bundle.tor-launcher: 0.2.12.3 -> 0.2.13

    @joachifm
    joachifm committed Oct 18, 2017

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    joachifm Joachim F.
    GPG key ID: 6F93BCF559339360
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    9c8a0c0 View commit details

  2. tor-browser-bundle.https-everywhere: 2017.9.12 -> 2017.10.4

    @joachifm
    joachifm committed Oct 18, 2017

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    joachifm Joachim F.
    GPG key ID: 6F93BCF559339360
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    9cf5492 View commit details

  3. tor-browser-bundle.noscript: 5.0.10 -> 5.1.2

    @joachifm
    joachifm committed Oct 18, 2017

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    joachifm Joachim F.
    GPG key ID: 6F93BCF559339360
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    6d31872 View commit details

  4. tinycc: 0.9.27pre-20170924 -> 0.9.27pre-20171016

    @joachifm
    joachifm committed Oct 18, 2017

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    joachifm Joachim F.
    GPG key ID: 6F93BCF559339360
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    5c732e3 View commit details

  5. lkl: 2017-08-09 -> 2017-10-18 

    Based on linux 4.13
    @joachifm
    joachifm committed Oct 18, 2017
    2

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    joachifm Joachim F.
    GPG key ID: 6F93BCF559339360
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    a8a38fe View commit details
12 changes: 6 additions & 6 deletions pkgs/applications/networking/browsers/tor-browser-bundle/extensions.nix
View file
Original file line number Diff line number Diff line change
@@ -16,14 +16,14 @@
{
https-everywhere = stdenv.mkDerivation rec {
name = "https-everywhere-${version}";
version = "2017.9.12";
version = "2017.10.4";

extid = "https-everywhere-eff@eff.org";

src = fetchgit {
url = "https://git.torproject.org/https-everywhere.git";
rev = "refs/tags/${version}";
sha256 = "179429pngyksp9xkr86nf2m5q6zmg19c7ng1dhqjfb1vsncwgw66";
sha256 = "1g7971xygnhagnb25xjdf6mli6091ai9igx42d0ww88g8i0cqfzj";
fetchSubmodules = true; # for translations, TODO: remove
};

@@ -47,13 +47,13 @@

noscript = stdenv.mkDerivation rec {
name = "noscript-${version}";
version = "5.0.10";
version = "5.1.2";

extid = "{73a6fe31-595d-460b-a920-fcc0f8843232}";

src = fetchurl {
url = "https://secure.informaction.com/download/releases/noscript-${version}.xpi";
sha256 = "18k5karbaj5mhd9cyjbqgik6044bw88rjalkh6anjanxbn503j6g";
sha256 = "1fzspdiwhjabwz1yxb3gzj7giz9jbc1xxm65i93rvhzcp537cs42";
};

unpackPhase = ":";
@@ -88,14 +88,14 @@

tor-launcher = stdenv.mkDerivation rec {
name = "tor-launcher-${version}";
version = "0.2.12.3";
version = "0.2.13";

extid = "tor-launcher@torproject.org";

src = fetchgit {
url = "https://git.torproject.org/tor-launcher.git";
rev = "refs/tags/${version}";
sha256 = "0126x48pjiy2zm4l8jzhk70w24hviaz560ffp4lb9x0ar615bc9q";
sha256 = "1f98v88y2clwvjiw77kxqc9cacp5h0489a540nc2wmsx7vnskrq0";
};

nativeBuildInputs = [ zip ];
6 changes: 3 additions & 3 deletions pkgs/applications/virtualization/lkl/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{ stdenv, fetchFromGitHub, bc, python, fuse, libarchive }:

stdenv.mkDerivation rec {
name = "lkl-2017-08-09";
rev = "083cdeece0577635d523244dcf0da86074e23e4e";
name = "lkl-2017-10-18";
rev = "bfb315c4612c38427e3239d0a427a125d9ba0ede";

outputs = [ "dev" "lib" "out" ];

@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
inherit rev;
owner = "lkl";
repo = "linux";
sha256 = "1fyh0p54jgsqywswj40zbw64jbqx2w10wax1k3j2szzlhjrv9x1a";
sha256 = "172ccn2gsybnji7giiqq63bvp9nsw8kri88pjlvinwpwsv7x81aa";
};

# Fix a /usr/bin/env reference in here that breaks sandboxed builds
6 changes: 3 additions & 3 deletions pkgs/development/compilers/tinycc/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,9 +2,9 @@
with stdenv.lib;

let
date = "20170924";
rev = "1443039416dd02750765efde1af35e31c8d41be3";
sha256 = "060l0f77hirq3i5bg294gxcszlvyn89ds2q21jwgy3ryrapfbl8i";
date = "20171016";
rev = "da8c62f75d893449e232944fc62566c020b4d010";
sha256 = "0pdvyhrx7g9imxpc7gr75116imi6ifn0ihsl4fbffsji2dpi61y2";
version = "0.9.27pre-${date}";
in