summary refs log tree commit diff
path: root/pkgs/shells/fish
diff options
context:
space:
mode:
authoradisbladis <adis@blad.is>2017-11-27 18:44:52 +0800
committeradisbladis <adis@blad.is>2017-11-27 18:44:52 +0800
commitee933bdb1d69c831c36f1a0bb26b19e31a8f42e4 (patch)
tree5a00c56f799dcf24f4b39b4e94a61012e8096bbe /pkgs/shells/fish
parent13bb5ff4027bb148754fd1cfdf2a5653d7f77101 (diff)
downloadnixpkgs-ee933bdb1d69c831c36f1a0bb26b19e31a8f42e4.tar
nixpkgs-ee933bdb1d69c831c36f1a0bb26b19e31a8f42e4.tar.gz
nixpkgs-ee933bdb1d69c831c36f1a0bb26b19e31a8f42e4.tar.bz2
nixpkgs-ee933bdb1d69c831c36f1a0bb26b19e31a8f42e4.tar.lz
nixpkgs-ee933bdb1d69c831c36f1a0bb26b19e31a8f42e4.tar.xz
nixpkgs-ee933bdb1d69c831c36f1a0bb26b19e31a8f42e4.tar.zst
nixpkgs-ee933bdb1d69c831c36f1a0bb26b19e31a8f42e4.zip
fish: 2.6.0 -> 2.7.0
Diffstat (limited to 'pkgs/shells/fish')
-rw-r--r--pkgs/shells/fish/default.nix12
1 files changed, 7 insertions, 5 deletions
diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix
index 5832c8ef891..494425e8302 100644
--- a/pkgs/shells/fish/default.nix
+++ b/pkgs/shells/fish/default.nix
@@ -35,11 +35,11 @@ let
     #     source both, but source the more global configuration files earlier
     #     than the more local ones, so that more local configurations inherit
     #     from but override the more global locations.
-    
+
     if test -f /etc/fish/config.fish
       source /etc/fish/config.fish
     end
-    
+
     #                                                                             #
     ############### ↑ Nix hook for sourcing /etc/fish/config.fish ↑ ###############
   '';
@@ -88,13 +88,15 @@ let
 
   fish = stdenv.mkDerivation rec {
     name = "fish-${version}";
-    version = "2.6.0";
+    version = "2.7.0";
 
     etcConfigAppendix = builtins.toFile "etc-config.appendix.fish" etcConfigAppendixText;
 
     src = fetchurl {
-      url = "http://fishshell.com/files/${version}/${name}.tar.gz";
-      sha256 = "1yzx73kg5ng5ivhi68756sl5hpb8869110l9fwim6gn7f7bbprby";
+      # 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}/${name}.tar.gz";
+      sha256 = "1jvvm27hp46w0cia14lfz6161dkz8b935j1m7j38i7rgx75bfxis";
     };
 
     buildInputs = [ ncurses libiconv pcre2 ];