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

Commits on Jan 25, 2021

  1. vault: 1.6.0 -> 1.6.1 

    (cherry picked from commit 0376f54)
    @dotlambda
    Diego Rodriguez authored and dotlambda committed Jan 25, 2021
    Copy the full SHA
    27c954c View commit details

  2. vault-bin: 1.6.0 -> 1.6.1 

    (cherry picked from commit 1017399)
    @dotlambda
    Diego Rodriguez authored and dotlambda committed Jan 25, 2021

    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
    c8c71a0 View commit details

  3. Merge pull request #110755 from dotlambda/vault-1.6.1 

    [20.09] vault: 1.6.0 -> 1.6.1
    @dotlambda
    dotlambda authored Jan 25, 2021
    Copy the full SHA
    1feb69d View commit details
Showing with 8 additions and 8 deletions.
  1. +2 −2 pkgs/tools/security/vault/default.nix
  2. +6 −6 pkgs/tools/security/vault/vault-bin.nix
4 changes: 2 additions & 2 deletions pkgs/tools/security/vault/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,13 +2,13 @@

buildGoPackage rec {
pname = "vault";
version = "1.6.0";
version = "1.6.1";

src = fetchFromGitHub {
owner = "hashicorp";
repo = "vault";
rev = "v${version}";
sha256 = "13fasdiijxy87m33wfyd8gylyz556i0bdd7xp706ip2fcckrmz7a";
sha256 = "1pgyyl2zgnr3wy4k8c5xsk2s5dpl97xdfq67lpfss7fz1bij8x47";
};

goPackagePath = "github.com/hashicorp/vault";
12 changes: 6 additions & 6 deletions pkgs/tools/security/vault/vault-bin.nix
View file
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
{ stdenv, fetchurl, unzip }:

let
version = "1.6.0";
version = "1.6.1";

sources = let
base = "https://releases.hashicorp.com/vault/${version}";
in {
x86_64-linux = fetchurl {
url = "${base}/vault_${version}_linux_amd64.zip";
sha256 = "0fay6bw31x9kxmc52sh5qp63nfkwji74fbnlx8pj3smz3qnqw143";
sha256 = "1la2pylcj9y5gr7hr4aaa49427y3lgxi2phhl46pqmr7an62pkbm";
};
i686-linux = fetchurl {
url = "${base}/vault_${version}_linux_386.zip";
sha256 = "0bjks9lpgl39cq55c9cyc0glhmyxzs37a2an8ynzza94gv5mgcxa";
sha256 = "1a2rhv5bpv43qp74a49msrwr7djzy86irsn73jl0xnkh0k6ijci1";
};
x86_64-darwin = fetchurl {
url = "${base}/vault_${version}_darwin_amd64.zip";
sha256 = "0hl1k35x78y0hi3y5xjnzby1ygisqjyvdak7s61m9f363nsr1shh";
sha256 = "0snswwai2ya26crm3ksifrmbdnajr36v4vamh7g65plg6vzban9a";
};
aarch64-linux = fetchurl {
url = "${base}/vault_${version}_linux_arm64.zip";
sha256 = "018a5i14x6phhx1axvx0bvqn4ggsimfizs48xbmykgiyfmzkrwgz";
sha256 = "0ix99da3xd4z200dgvpfc2h1sfx6l8cipichvfjlj39md45grs89";
};
};

@@ -45,6 +45,6 @@ in stdenv.mkDerivation {
description = "A tool for managing secrets, this binary includes the UI";
platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-linux" ];
license = licenses.mpl20;
maintainers = with maintainers; [ offline psyanticy mkaito ];
maintainers = with maintainers; [ offline psyanticy mkaito Chili-Man ];
};
}