From 7ba42794a87d5e8425a54f7db0fe1a1466893676 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sat, 19 Oct 2019 22:41:25 +0200
Subject: Revert "fish: switch to fetchFromGitHub"

This reverts commit cc997f28d154e6bc47eacbe3632859090fedd616.

I confused the URLs. The files have the same contents but the former URL is recommended by upstream.
---
 pkgs/shells/fish/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'pkgs/shells/fish')

diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix
index 4f6df766d1b..1ef3c4b6fd9 100644
--- a/pkgs/shells/fish/default.nix
+++ b/pkgs/shells/fish/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, coreutils, utillinux,
+{ stdenv, fetchurl, coreutils, utillinux,
   which, gnused, gnugrep,
   groff, man-db, getent, libiconv, pcre2,
   gettext, ncurses, python3,
@@ -93,11 +93,11 @@ let
 
     etcConfigAppendix = builtins.toFile "etc-config.appendix.fish" etcConfigAppendixText;
 
-    src = fetchFromGitHub {
-      owner = "fish-shell";
-      repo = "fish-shell";
-      rev = version;
-      sha256 = "1qh6dka1ayz352ihcq4529hjgnz255gyrqs3xyif6b2ycvrm4ad5";
+    src = fetchurl {
+      # There are differences between the release tarball and the tarball github packages from the tag
+      # Hence we cannot use fetchFromGithub
+      url = "https://github.com/fish-shell/fish-shell/releases/download/${version}/${pname}-${version}.tar.gz";
+      sha256 = "03j3jl9jzlnhq4p86zj8wqsh5sx45j1d1fvfa80ks1cfdg68qwhl";
     };
 
     nativeBuildInputs = [ cmake ];
-- 
cgit 1.4.1