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: 84f52d20f1e0
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 7b6251b4dceb
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Sep 1, 2017

  1. grml-zsh-config: generalize support to unix systems

    @loskutov
    loskutov committed Sep 1, 2017

    Partially verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    We cannot verify signatures from co-authors, and some of the co-authors attributed to this commit require their commits to be signed.
    Copy the full SHA
    9280937 View commit details

  2. Merge pull request #28814 from loskutov/grml-zsh-unix 

    grml-zsh-config: generalize support to unix systems
    @Mic92
    Mic92 authored Sep 1, 2017
    Copy the full SHA
    7b6251b View commit details
Showing with 3 additions and 2 deletions.
  1. +3 −2 pkgs/shells/grml-zsh-config/default.nix
5 changes: 3 additions & 2 deletions pkgs/shells/grml-zsh-config/default.nix
View file
Original file line number Diff line number Diff line change
@@ -14,7 +14,8 @@ stdenv.mkDerivation rec {
sha256 = "1xvv2mnkfqa657w8y4q2zrchhindngdzij9fbalcg1gggz4zdwcm";
};

buildInputs = [ zsh coreutils inetutils procps txt2tags ];
buildInputs = [ zsh coreutils txt2tags ]
++ optional stdenv.isLinux [ inetutils procps ];

buildPhase = ''
cd doc
@@ -34,7 +35,7 @@ stdenv.mkDerivation rec {
description = "grml's zsh setup";
homepage = http://grml.org/zsh/;
license = licenses.gpl2;
platforms = platforms.linux;
platforms = platforms.unix;
maintainers = with maintainers; [ msteen rvolosatovs ];
};
}