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

Commits on May 29, 2017

  1. tinycc: 0.9.27pre-20170225 -> 0.9.27pre-20170527 

    Contains fixes for the x86_64 codegen [1]

[1]: https://lists.nongnu.org/archive/html/tinycc-devel/2017-05/msg00102.html

(cherry picked from commit a50315d)
    @joachifm
    joachifm committed May 29, 2017
    Copy the full SHA
    3005d25 View commit details

  2. tor-browser-bundle-bin: additional download urls 

    To better support users that are unable to access the official Tor
distribution site, e.g., #26184

(cherry picked from commit 2262f89)
    @joachifm
    joachifm committed May 29, 2017
    Copy the full SHA
    569742c View commit details
Showing with 12 additions and 5 deletions.
  1. +9 −2 pkgs/applications/networking/browsers/torbrowser/default.nix
  2. +3 −3 pkgs/development/compilers/tinycc/default.nix
11 changes: 9 additions & 2 deletions pkgs/applications/networking/browsers/torbrowser/default.nix
View file
Original file line number Diff line number Diff line change
@@ -87,12 +87,18 @@ let

srcs = {
"x86_64-linux" = fetchurl {
url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz";
urls = [
"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 = "0jn98arczlgjigpmql1qg5b7izabv4zy4mji6vvcg3b8g1ma108r";
};

"i686-linux" = fetchurl {
url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz";
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"
];
sha256 = "0micxgkbys0py4bj6csbc8xz4gq0x5v2zirgi38krnm5x5riqj3w";
};
};
@@ -105,6 +111,7 @@ stdenv.mkDerivation rec {
src = srcs."${stdenv.system}" or (throw "unsupported system: ${stdenv.system}");

preferLocalBuild = true;
allowSubstitutes = false;

desktopItem = makeDesktopItem {
name = "torbrowser";
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,10 +2,10 @@
with stdenv.lib;

let
date = "20170225";
date = "20170527";
version = "0.9.27pre-${date}";
rev = "bb93064d7857d887b674999c9b4152b44a628f9a";
sha256 = "12wcahj1x4qy9ia931i23lvwkqjmyhaks3wipnzvbnlnc2b03kpr";
rev = "53c5fc2246270e0242903de0152a9a5d40f3d679";
sha256 = "0z5ayz0kdn5xqm84k730hmd7r9cq0zxxf45g5phgqppdfajrmswz";
in

stdenv.mkDerivation rec {