Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: f203d50d0905
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: cc997f28d154
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Oct 19, 2019

  1. 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.
    @jtojnar
    jtojnar committed Oct 19, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    thoughtpolice Austin Seipp
    GPG key ID: 25D2038DEB08021D
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    cc997f2 View commit details
Showing with 6 additions and 6 deletions.
  1. +6 −6 pkgs/shells/fish/default.nix
12 changes: 6 additions & 6 deletions pkgs/shells/fish/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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 ];