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: e9c16ec186b2
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: f301375d8854
Choose a head ref
  • 3 commits
  • 1 file changed
  • 2 contributors

Commits on Jan 8, 2020

  1. tor: 0.4.1.6 -> 0.4.2.5 

    https://blog.torproject.org/new-release-0425-also-0417-0406-and-0359
    @dtzWill
    dtzWill committed Jan 8, 2020
    Copy the full SHA
    48838ac View commit details

  2. tor: patchShebangs script, fix build

    @dtzWill
    dtzWill committed Jan 8, 2020
    Copy the full SHA
    bd712ef View commit details

Commits on Jan 9, 2020

  1. Merge pull request #77342 from dtzWill/update/tor-0.4.2.5 

    tor: 0.4.1.6 -> 0.4.2.5
    @joachifm
    joachifm authored Jan 9, 2020
    Copy the full SHA
    f301375 View commit details
Showing with 4 additions and 2 deletions.
  1. +4 −2 pkgs/tools/security/tor/default.nix
6 changes: 4 additions & 2 deletions pkgs/tools/security/tor/default.nix
View file
Original file line number Diff line number Diff line change
@@ -15,11 +15,11 @@

stdenv.mkDerivation rec {
pname = "tor";
version = "0.4.1.6";
version = "0.4.2.5";

src = fetchurl {
url = "https://dist.torproject.org/${pname}-${version}.tar.gz";
sha256 = "0wgdid8w7srd218hh4rwslzdx2ickxw1pg18p2wry1r6wi65521a";
sha256 = "1hnqg6psf7shcmlvfk44mkpaz7v66mify3cnx7mzl23q5s37anad";
};

outputs = [ "out" "geoip" ];
@@ -34,6 +34,8 @@ stdenv.mkDerivation rec {
substituteInPlace contrib/client-tools/torify \
--replace 'pathfind torsocks' true \
--replace 'exec torsocks' 'exec ${torsocks}/bin/torsocks'
patchShebangs ./scripts/maint/checkShellScripts.sh
'';

enableParallelBuilding = true;