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: 13a4b486b919
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: ed45fe1ccf80
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Jan 29, 2020

  1. saml2aws: 2.15.0 -> 2.19.0 

    Current version is broken, at least for use with Okta and AWS. New
version fixes this problem.

Packaging has changed a bit too, deps.nix was removed, and the top-level
`buildGoModule` is used insead, since the upstream project now exposes a
go.mod file.
    @MartinPotier @teto
    MartinPotier authored and teto committed Jan 29, 2020
    Copy the full SHA
    ed45fe1 View commit details
Showing with 14 additions and 386 deletions.
  1. +14 −14 pkgs/tools/security/saml2aws/default.nix
  2. +0 −372 pkgs/tools/security/saml2aws/deps.nix
28 changes: 14 additions & 14 deletions pkgs/tools/security/saml2aws/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
{ stdenv, buildGoModule, fetchFromGitHub }:

buildGoPackage rec {
name = "saml2aws-${version}";
buildGoModule rec {
pname = "saml2aws";
version = "2.15.0";

goPackagePath = "github.com/versent/saml2aws";
goDeps = ./deps.nix;

buildFlagsArray = ''
-ldflags=-X main.Version=${version}
'';
version = "2.19.0";

src = fetchFromGitHub {
rev = "v${version}";
owner = "Versent";
repo = "saml2aws";
sha256 = "0pn4zdzisgan7vvgi7hp8716wsb2x33gq55c7fw1aa2qwy0bq3gp";
rev = "v${version}";
sha256 = "1b34v52nvn5mgkxj90lmw0hhpqb35gi3dn47x3v7255890wkzryz";
};

modSha256 = "1ndr8npjjaxg97azshpca7mclxhbqm49wzswmv571y5x519bb7q8";

subPackages = [ "." "cmd/saml2aws" ];

buildFlagsArray = ''
-ldflags=-X main.Version=${version}
'';

meta = with stdenv.lib; {
description = "CLI tool which enables you to login and retrieve AWS temporary credentials using a SAML IDP";
homepage = https://github.com/Versent/saml2aws;
homepage = "https://github.com/Versent/saml2aws";
license = licenses.mit;
platforms = stdenv.lib.platforms.unix;
maintainers = [ stdenv.lib.maintainers.pmyjavec ];
Loading