From 6aeb59bbe0e5a90017be3350e519ec818d675a0d Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 8 May 2014 15:49:39 +0200 Subject: [PATCH] Rename fetchGitHub -> fetchFromGitHub We're not fetching all of GitHub, after all. --- pkgs/tools/networking/dd-agent/default.nix | 4 ++-- pkgs/tools/text/recode/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/networking/dd-agent/default.nix b/pkgs/tools/networking/dd-agent/default.nix index 02ad58e77998..1674d01af8fc 100644 --- a/pkgs/tools/networking/dd-agent/default.nix +++ b/pkgs/tools/networking/dd-agent/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchGitHub, python, pythonPackages, sysstat, unzip, tornado +{ stdenv, fetchFromGitHub, python, pythonPackages, sysstat, unzip, tornado , makeWrapper }: stdenv.mkDerivation rec { version = "4.2.1"; name = "dd-agent-${version}"; - src = fetchGitHub { + src = fetchFromGitHub { owner = "DataDog"; repo = "dd-agent"; rev = version; diff --git a/pkgs/tools/text/recode/default.nix b/pkgs/tools/text/recode/default.nix index 81b863a35df4..8a15d0b9b561 100644 --- a/pkgs/tools/text/recode/default.nix +++ b/pkgs/tools/text/recode/default.nix @@ -1,11 +1,11 @@ # XXX: this may need -liconv on non-glibc systems.. -{ stdenv, fetchGitHub, python, perl, autoconf, automake, libtool, intltool, flex }: +{ stdenv, fetchFromGitHub, python, perl, autoconf, automake, libtool, intltool, flex }: stdenv.mkDerivation rec { name = "recode-3.7-2fd838565"; - src = fetchGitHub { + src = fetchFromGitHub { owner = "pinard"; repo = "Recode"; rev = "2fd8385658e5a08700e3b916053f6680ff85fdbd"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 573810135b8c..de242046893a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -340,7 +340,7 @@ let fetchzip = import ../build-support/fetchzip { inherit lib fetchurl unzip; }; - fetchGitHub = { owner, repo, rev, sha256 }: fetchzip { + fetchFromGitHub = { owner, repo, rev, sha256 }: fetchzip { url = "https://github.com/${owner}/${repo}/archive/${rev}.zip"; inherit sha256; };