Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 97940bf6c572
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 345c08813926
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Dec 20, 2018

  1. git-secret: Add gawk to wrapper 

    Cherry-picked from 0fc60df
    @acairncross
    acairncross committed Dec 20, 2018
    Copy the full SHA
    7c9bd96 View commit details

  2. Merge pull request #52565 from ackien/git-secret-gawk-backport 

    [18.09] git-secret: Backport gawk fix
    @Mic92
    Mic92 authored Dec 20, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    345c088 View commit details
Showing with 2 additions and 2 deletions.
  1. +2 −2 pkgs/applications/version-management/git-and-tools/git-secret/default.nix
4 changes: 2 additions & 2 deletions pkgs/applications/version-management/git-and-tools/git-secret/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, lib, fetchFromGitHub, makeWrapper, git, gnupg }:
{ stdenv, lib, fetchFromGitHub, makeWrapper, git, gnupg, gawk }:

let
version = "0.2.4";
@@ -20,7 +20,7 @@ in stdenv.mkDerivation {
install -D git-secret $out/bin/git-secret
wrapProgram $out/bin/git-secret \
--prefix PATH : "${lib.makeBinPath [ git gnupg ]}"
--prefix PATH : "${lib.makeBinPath [ git gnupg gawk ]}"
mkdir $out/share
cp -r man $out/share