From 8a53488904df856b9e947c03f83372952989c970 Mon Sep 17 00:00:00 2001 From: Bob van der Linden Date: Sun, 9 Sep 2018 20:39:17 +0200 Subject: [PATCH 1/2] opentracker: 2016-10-02 -> 2018-05-26 --- pkgs/applications/networking/p2p/opentracker/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/p2p/opentracker/default.nix b/pkgs/applications/networking/p2p/opentracker/default.nix index abddc22c285c..83ddb456153c 100644 --- a/pkgs/applications/networking/p2p/opentracker/default.nix +++ b/pkgs/applications/networking/p2p/opentracker/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchgit, libowfat, zlib }: stdenv.mkDerivation { - name = "opentracker-2016-10-02"; + name = "opentracker-2018-05-26"; src = fetchgit { url = "git://erdgeist.org/opentracker"; - rev = "0ebc0ed6a3e3b7acc9f9e338cc23cea5f4f22f61"; - sha256 = "0qi0a8fygjwgs3yacramfn53jdabfgrlzid7q597x9lr94anfpyl"; + rev = "6411f1567f64248b0d145493c2e61004d2822623"; + sha256 = "110nfb6n4clykwdzpk54iccsfjawq0krjfqhg114i1z0ri5dyl8j"; }; buildInputs = [ libowfat zlib ]; From 1cf44e6a07b5ba66dcf015bb729d44b6418f0486 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 10 Sep 2018 22:41:23 +0100 Subject: [PATCH 2/2] opentracker: use https for downloading --- pkgs/applications/networking/p2p/opentracker/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/p2p/opentracker/default.nix b/pkgs/applications/networking/p2p/opentracker/default.nix index 83ddb456153c..46c482818f8b 100644 --- a/pkgs/applications/networking/p2p/opentracker/default.nix +++ b/pkgs/applications/networking/p2p/opentracker/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "opentracker-2018-05-26"; src = fetchgit { - url = "git://erdgeist.org/opentracker"; + url = "https://erdgeist.org/gitweb/opentracker"; rev = "6411f1567f64248b0d145493c2e61004d2822623"; sha256 = "110nfb6n4clykwdzpk54iccsfjawq0krjfqhg114i1z0ri5dyl8j"; }; @@ -12,9 +12,9 @@ stdenv.mkDerivation { buildInputs = [ libowfat zlib ]; installPhase = '' - mkdir -p $out/bin $out/share/doc - cp opentracker $out/bin - cp opentracker.conf.sample $out/share/doc + runHook preInstall + install -D opentracker $out/bin/opentracker + install -D opentracker.conf.sample $out/share/doc/opentracker.conf.sample runHook postInstall '';