ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-11 04:02:55 +03:00
Code Issues Projects Releases Wiki Activity

Revert "fish: switch to fetchFromGitHub"

Browse Source 
This reverts commit cc997f28d1.

I confused the URLs. The files have the same contents but the former URL is recommended by upstream.
This commit is contained in:
Jan Tojnar 2019-10-19 22:41:25 +02:00
parent 05c0114801
commit 7ba42794a8
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/shells/fish/default.nix
View File

@ -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 ];