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: 4e9fa5cff3c3
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: a611ddf96e6d
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Apr 5, 2018

  1. aws-auth: unstable-2017-07-24 -> unstable-2018-04-04 

    also re-enable for continuity on stable branch. this (perhaps final) release
should at least *work* with the rest of release-17.09 but will probably
see no further development and should remain "dropped" in master.
    @risicle
    risicle committed Apr 5, 2018

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    mweinelt Martin Weinelt
    GPG key ID: BD4AA0528F63F17E
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    c86b179 View commit details

  2. Merge pull request #38457 from risicle/ris-aws-auth-r17.09-2 

    r17.09: aws-auth:  unstable-2017-07-24 -> unstable-2018-04-04
    @Mic92
    Mic92 authored Apr 5, 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
    a611ddf View commit details
Showing with 5 additions and 7 deletions.
  1. +5 −7 pkgs/tools/admin/aws-auth/default.nix
12 changes: 5 additions & 7 deletions pkgs/tools/admin/aws-auth/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,25 +1,23 @@
{ stdenv, fetchFromGitHub, makeWrapper, jq, awscli }:
{ stdenv, fetchFromGitHub, makeWrapper, jq, awscli, openssl }:

stdenv.mkDerivation rec {
version = "unstable-2017-07-24";
version = "unstable-2018-04-04";
name = "aws-auth-${version}";

src = fetchFromGitHub {
owner = "alphagov";
repo = "aws-auth";
rev = "5a4c9673f9f00ebaa4bb538827e1c2f277c475e1";
sha256 = "095j9zqxra8hi2iyz0y4azs9yigy5f6alqkfmv180pm75nbc031g";
rev = "03e3eb2a0e89c6d55f0721462a6bc077aa4668bf";
sha256 = "0r89kvkcjsz6v9r2pk45v82v623y334b0hfvdvzfnls3j7d23m2p";
};

nativeBuildInputs = [ makeWrapper ];

dontBuild = true;

# copy script and set $PATH
installPhase = ''
install -D $src/aws-auth.sh $out/bin/aws-auth
wrapProgram $out/bin/aws-auth \
--prefix PATH : ${stdenv.lib.makeBinPath [ awscli jq ]}
--prefix PATH : ${stdenv.lib.makeBinPath [ awscli jq openssl ]}
'';

meta = {