diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2019-10-18 16:06:53 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2019-10-19 14:30:25 +0200 |
| commit | cc997f28d154e6bc47eacbe3632859090fedd616 (patch) | |
| tree | 0cdc1264641bf5d190ed8cefefa17528b3cad4b3 | |
| parent | f203d50d09052792866f926e7c2d3b3bf76d3388 (diff) | |
| download | nixpkgs-cc997f28d154e6bc47eacbe3632859090fedd616.tar nixpkgs-cc997f28d154e6bc47eacbe3632859090fedd616.tar.gz nixpkgs-cc997f28d154e6bc47eacbe3632859090fedd616.tar.bz2 nixpkgs-cc997f28d154e6bc47eacbe3632859090fedd616.tar.lz nixpkgs-cc997f28d154e6bc47eacbe3632859090fedd616.tar.xz nixpkgs-cc997f28d154e6bc47eacbe3632859090fedd616.tar.zst nixpkgs-cc997f28d154e6bc47eacbe3632859090fedd616.zip | |
fish: switch to fetchFromGitHub
The expression claimed there are differences between the release tarball and the tarball github packages from the tag but fetchFromGitHub literally downloads the same tarball.
| -rw-r--r-- | pkgs/shells/fish/default.nix | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix index 1ef3c4b6fd9..4f6df766d1b 100644 --- a/pkgs/shells/fish/default.nix +++ b/pkgs/shells/fish/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, coreutils, utillinux, +{ stdenv, fetchFromGitHub, 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 = 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"; + src = fetchFromGitHub { + owner = "fish-shell"; + repo = "fish-shell"; + rev = version; + sha256 = "1qh6dka1ayz352ihcq4529hjgnz255gyrqs3xyif6b2ycvrm4ad5"; }; nativeBuildInputs = [ cmake ]; |