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: e171f096a244
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: 7cfafd014f88
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Oct 25, 2020

  1. arx-libertatis: remove old override 

    (cherry picked from commit 9ae47f9)
    @rnhmjoj
    rnhmjoj committed Oct 25, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    rnhmjoj Michele Guerini Rocco
    GPG key ID: BFBAF4C975F76450
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    e350840 View commit details

  2. tor-browser-bundle-bin: 10.0 -> 10.0.2 

    (cherry picked from commit 03d85e8)
    @erictapen
    erictapen committed Oct 25, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    erictapen Kerstin
    GPG key ID: 5F24E3BD56617EB2
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    7cfafd0 View commit details
Showing with 4 additions and 6 deletions.
  1. +3 −3 pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
  2. +1 −3 pkgs/top-level/all-packages.nix
6 changes: 3 additions & 3 deletions pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
View file
Original file line number Diff line number Diff line change
@@ -91,19 +91,19 @@ let
fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ];

# Upstream source
version = "10.0";
version = "10.0.2";

lang = "en-US";

srcs = {
x86_64-linux = fetchurl {
url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz";
sha256 = "1l2rfknffnh6hsi16dzps1wav5s723vyk57fzv9y5vjmbcbf7l2l";
sha256 = "sha256-JBJDMC44VSh1ekXPxsVvFk5nOB8Ro4UGtD32pG1weP8=";
};

i686-linux = fetchurl {
url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz";
sha256 = "0x80w02ckb6mznrm1gjdpkxk9yf2rdcl16ljjglivq358a309cl2";
sha256 = "sha256-EanW2Q8TtCPY5FSp8zfgBXMte9+RfKE24fu8ROtArK0=";
};
};
in
4 changes: 1 addition & 3 deletions pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -22911,9 +22911,7 @@ in

arena = callPackage ../games/arena {};

arx-libertatis = libsForQt5.callPackage ../games/arx-libertatis {
stdenv = gcc6Stdenv;
};
arx-libertatis = libsForQt5.callPackage ../games/arx-libertatis { };

asc = callPackage ../games/asc {
lua = lua5_1;