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: 5b45342832ce
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: c66c53a132ac
Choose a head ref
  • 4 commits
  • 4 files changed
  • 1 contributor

Commits on May 23, 2017

  1. Verified

    This commit was signed with the committer’s verified signature.
    globin Robin Gloster
    Copy the full SHA
    ca2f31a View commit details
  2. Verified

    This commit was signed with the committer’s verified signature.
    globin Robin Gloster
    Copy the full SHA
    d50c716 View commit details
  3. Verified

    This commit was signed with the committer’s verified signature.
    globin Robin Gloster
    Copy the full SHA
    39e6ad6 View commit details
  4. Verified

    This commit was signed with the committer’s verified signature.
    globin Robin Gloster
    Copy the full SHA
    c66c53a View commit details
6 changes: 3 additions & 3 deletions pkgs/shells/zsh-autosuggestions/default.nix
Original file line number Diff line number Diff line change
@@ -4,13 +4,13 @@

stdenv.mkDerivation rec {
name = "zsh-autosuggestions-${version}";
version = "0.3.3";
version = "0.4.0";

src = fetchFromGitHub {
repo = "zsh-autosuggestions";
owner = "zsh-users";
repo = "zsh-autosuggestions";
rev = "v${version}";
sha256 = "0mnwyz4byvckrslzqfng5c0cx8ka0y12zcy52kb7amg3l07jrls4";
sha256 = "0z6i9wjjklb4lvr7zjhbphibsyx51psv50gm07mbb0kj9058j6kc";
};

buildInputs = [ zsh ];
4 changes: 2 additions & 2 deletions pkgs/shells/zsh-completions/default.nix
Original file line number Diff line number Diff line change
@@ -2,13 +2,13 @@

stdenv.mkDerivation rec {
name = "zsh-completions-${version}";
version = "0.18.0";
version = "0.25.0";

src = fetchFromGitHub {
owner = "zsh-users";
repo = "zsh-completions";
rev = "${version}";
sha256 = "0iwb1kaidjxaz66kbbdzbydbdlfc6dk21sflzar0zy25jgx1p4xs";
sha256 = "0hc56y0fvshzs05acbzxf4q37vqsk4q3zp4c7smh175v56wigy94";
};

installPhase= ''
24 changes: 10 additions & 14 deletions pkgs/shells/zsh-syntax-highlighting/default.nix
Original file line number Diff line number Diff line change
@@ -1,25 +1,21 @@
{ stdenv, fetchurl, zsh }:
{ stdenv, fetchFromGitHub, zsh }:

# To make use of this derivation, use the `programs.zsh.enableSyntaxHighlighting` option

let

pkgName = "zsh-syntax-highlighting";
version = "0.4.1";

in

stdenv.mkDerivation rec {
name = "${pkgName}-${version}";

src = fetchurl {
url = "https://github.com/zsh-users/${pkgName}/archive/${version}.tar.gz";
sha256 = "15sih7blqz11d8wdybx38d91vgcq9jg3q0205r26138si0g9q6wp";
version = "0.5.0";
name = "zsh-syntax-highlighting-${version}";

src = fetchFromGitHub {
owner = "zsh-users";
repo = "zsh-syntax-highlighting";
rev = version;
sha256 = "0k0m5aw67lhi4z143sdawx93y1892scvvdfdnjvljb4hf0vzs2ww";
};

buildInputs = [ zsh ];

installFlags="PREFIX=$(out)";
installFlags = "PREFIX=$(out)";

meta = with stdenv.lib; {
description = "Fish shell like syntax highlighting for Zsh";
4 changes: 2 additions & 2 deletions pkgs/tools/misc/youtube-dl/default.nix
Original file line number Diff line number Diff line change
@@ -14,11 +14,11 @@ with stdenv.lib;
buildPythonApplication rec {

name = "youtube-dl-${version}";
version = "2017.04.28";
version = "2017.05.23";

src = fetchurl {
url = "https://yt-dl.org/downloads/${version}/${name}.tar.gz";
sha256 = "0d3mgf8qxb07b7bjf79ppaxhcl4f47q0zjpshp6y2q0lalfskh3j";
sha256 = "1na2ccja8p18i3ypf7vjrxlh653906746l966fwm06b5q6867iwd";
};

nativeBuildInputs = [ makeWrapper ];