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: 30fb4e1e206d
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: 038a87ee11de
Choose a head ref
  • 4 commits
  • 4 files changed
  • 4 contributors

Commits on Jun 30, 2020

  1. vault: 1.3.2 -> 1.3.6 

    Fixes CVE-202-10661, CVE-2020-13223, CVE-2020-10660
Closes #91022
    @amaxine
    amaxine committed Jun 30, 2020
    Copy the full SHA
    a1a8e7b View commit details

  2. lorri: 1.0 -> 1.1

    @Profpatsch
    Profpatsch committed Jun 30, 2020
    Copy the full SHA
    0023aae View commit details

Commits on Jul 1, 2020

  1. targetcli: 2.1.51 -> 2.1.53 

    (cherry picked from commit cf47dc9)
    @r-ryantm @marsam
    r-ryantm authored and marsam committed Jul 1, 2020
    Copy the full SHA
    630c219 View commit details

  2. Merge pull request #91898 from maxeaubrey/vault_20.03_1.3.6 

    [20.03] vault: 1.3.2 -> 1.3.6
    @marsam
    marsam authored Jul 1, 2020

    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
    038a87e View commit details
Showing with 12 additions and 12 deletions.
  1. +1 −1 nixos/tests/lorri/default.nix
  2. +2 −2 pkgs/os-specific/linux/targetcli/default.nix
  3. +7 −7 pkgs/tools/misc/lorri/default.nix
  4. +2 −2 pkgs/tools/security/vault/default.nix
2 changes: 1 addition & 1 deletion nixos/tests/lorri/default.nix
View file
Original file line number Diff line number Diff line change
@@ -18,7 +18,7 @@ import ../make-test-python.nix {
machine.wait_until_succeeds("grep --fixed-strings 'ready' lorri.stdout")
# Ping the daemon
machine.succeed("lorri internal__ping shell.nix")
machine.succeed("lorri internal ping shell.nix")
# Wait for the daemon to finish the build
machine.wait_until_succeeds("grep --fixed-strings 'Completed' lorri.stdout")
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/targetcli/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,13 +2,13 @@

python.pkgs.buildPythonApplication rec {
pname = "targetcli";
version = "2.1.51";
version = "2.1.53";

src = fetchFromGitHub {
owner = "open-iscsi";
repo = "${pname}-fb";
rev = "v${version}";
sha256 = "07i9kyr525hlk32amzgycirwgwykdbjy5fmw6ji0nnhvk2jh4arn";
sha256 = "1qrq7y5hnghzbxgrxgl153n8jlhw31kqjbr93jsvlvhz5b3ci750";
};

propagatedBuildInputs = with python.pkgs; [ configshell rtslib ];
14 changes: 7 additions & 7 deletions pkgs/tools/misc/lorri/default.nix
View file
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@
, rustPlatform
# Updater script
, runtimeShell
, writeScript
, writers
# Tests
, nixosTests
# Apple dependencies
@@ -14,7 +14,7 @@

rustPlatform.buildRustPackage rec {
pname = "lorri";
version = "1.0";
version = "1.1";

meta = with stdenv.lib; {
description = "Your project's nix-env";
@@ -27,11 +27,12 @@ rustPlatform.buildRustPackage rec {
owner = "target";
repo = pname;
# Run `eval $(nix-build -A lorri.updater)` after updating the revision!
rev = "88c680c9abf0f04f2e294436d20073ccf26f0781";
sha256 = "1415mhdr0pwvshs04clfz1ys76r5qf9jz8jchm63l6llaj6m7mrv";
# ALSO don’t forget to update the cargoSha256!
rev = "93d93013217cd9aa09d2bd316d6c3abf827a6601";
sha256 = "0wbkx8hmikngfp6fp0y65yla22f3k0jszq8a6pas80q0b33llwm5";
};

cargoSha256 = "1kdpzbn3353yk7i65hll480fcy16wdvppdr6xgfh06x88xhim4mp";
cargoSha256 = "1nz1g1r94i81b728y0c5szfvxfkz9bqry3xag22alrhjhlc66kpp";
doCheck = false;

BUILD_REV_COUNT = src.revCount or 1;
@@ -42,8 +43,7 @@ rustPlatform.buildRustPackage rec {
stdenv.lib.optionals stdenv.isDarwin [ CoreServices Security ];

passthru = {
updater = with builtins; writeScript "copy-runtime-nix.sh" ''
#!${runtimeShell}
updater = writers.writeBash "copy-runtime-nix.sh" ''
set -euo pipefail
cp ${src}/nix/runtime.nix ${toString ./runtime.nix}
cp ${src}/nix/runtime-closure.nix.template ${toString ./runtime-closure.nix.template}
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.3.2";
version = "1.3.6";

src = fetchFromGitHub {
owner = "hashicorp";
repo = "vault";
rev = "v${version}";
sha256 = "17zymmm1r4yxwazn2qx2l01i7g91rn40h7hzgwf0pr6pwmdxvkzg";
sha256 = "0lnay66cgl3r7kmy9v59ss4jbzic2x5s5wd7srdyiyn2bkzq9k1n";
};

goPackagePath = "github.com/hashicorp/vault";