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

Commits on Dec 5, 2018

  1. govers: 20150109 -> 20160623

    @zimbatm
    zimbatm committed Dec 5, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    zimbatm Jonas Chevalier
    GPG key ID: 71BAF6D40C1D63D7
    Verified
    Learn about vigilant mode
    Copy the full SHA
    b5360ce View commit details

  2. gox: 0.4.0 -> 20181025 

    We need the latest gox to support the latest go releases better.
Unfortunately the author doesn't seem interesting in making new releases
(1y already since the last release).
    @zimbatm
    zimbatm committed Dec 5, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    zimbatm Jonas Chevalier
    GPG key ID: 71BAF6D40C1D63D7
    Verified
    Learn about vigilant mode
    Copy the full SHA
    3064dd1 View commit details

  3. vault: 0.11.5 -> 1.0.0

    @zimbatm
    zimbatm committed Dec 5, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    zimbatm Jonas Chevalier
    GPG key ID: 71BAF6D40C1D63D7
    Verified
    Learn about vigilant mode
    Copy the full SHA
    c8091a8 View commit details

  4. Merge pull request #51524 from zimbatm/vault-1.0.0 

    vault: 0.11.5 -> 1.0.0
    @zimbatm
    zimbatm authored Dec 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
    7faa672 View commit details
Showing with 8 additions and 8 deletions.
  1. +3 −3 pkgs/development/tools/govers/default.nix
  2. +3 −3 pkgs/development/tools/gox/default.nix
  3. +2 −2 pkgs/tools/security/vault/default.nix
6 changes: 3 additions & 3 deletions pkgs/development/tools/govers/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,15 +2,15 @@

buildGoPackage rec {
name = "govers-${version}";
version = "20150109-${stdenv.lib.strings.substring 0 7 rev}";
rev = "3b5f175f65d601d06f48d78fcbdb0add633565b9";
version = "20160623-${stdenv.lib.strings.substring 0 7 rev}";
rev = "77fd787551fc5e7ae30696e009e334d52d2d3a43";

goPackagePath = "github.com/rogpeppe/govers";

src = fetchgit {
inherit rev;
url = "https://github.com/rogpeppe/govers";
sha256 = "0din5a7nff6hpc4wg0yad2nwbgy4q1qaazxl8ni49lkkr4hyp8pc";
sha256 = "12w83vyi8mgn48fwdm2js693qcydimxapg8rk0yf01w0ab03r5wn";
};

dontRenameImports = true;
6 changes: 3 additions & 3 deletions pkgs/development/tools/gox/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,15 +2,15 @@

buildGoPackage rec {
name = "gox-${version}";
version = "0.4.0";
version = "20181025";

goPackagePath = "github.com/mitchellh/gox";

src = fetchFromGitHub {
owner = "mitchellh";
repo = "gox";
rev = "v${version}";
sha256 = "1q4fdkw904mrmh1q5z8pfd3r0gcn5dm776kldqawddy93iiwnp8r";
rev = "9cc487598128d0963ff9dcc51176e722788ec645";
sha256 = "18indkdwq2m1wy95d71lgbf46jxxrfc5km1fys5laapz993h77v6";
};

goDeps = ./deps.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 @@

stdenv.mkDerivation rec {
name = "vault-${version}";
version = "0.11.5";
version = "1.0.0";

src = fetchFromGitHub {
owner = "hashicorp";
repo = "vault";
rev = "v${version}";
sha256 = "1skf9l3a4gwag9gp2vwmniajk8rb05g93s15q5xfwqb6sg6zplfw";
sha256 = "0wqqf9mif6icfl888w2izvml7vqs4hkd5hrq4dhzcyig5w1bp0if";
};

nativeBuildInputs = [ go gox removeReferencesTo ];