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: 5c8c62902ff0
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: 27accf380b48
Choose a head ref
  • 7 commits
  • 5 files changed
  • 4 contributors

Commits on Jan 22, 2020

  1. vault: 1.3.1 -> 1.3.2

    marsam committed Jan 22, 2020
    Copy the full SHA
    bce8f64 View commit details
  2. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    d0819c0 View commit details

Commits on Jan 23, 2020

  1. qmmp: 1.3.5 -> 1.3.6

    r-ryantm authored and bjornfor committed Jan 23, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    d1ba7da View commit details
  2. Merge pull request #78340 from marsam/update-vault

    vault: 1.3.1 -> 1.3.2
    Ma27 authored Jan 23, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    969bbb9 View commit details
  3. python27Packages.boltons: 19.3.0 -> 20.0.0

    r-ryantm authored and Jon committed Jan 23, 2020
    Copy the full SHA
    34719fa View commit details
  4. python37Packages.hstspreload: 2019.12.25 -> 2020.1.17

    r-ryantm authored and Jon committed Jan 23, 2020
    Copy the full SHA
    c221115 View commit details
  5. Merge pull request #78339 from marsam/update-terraform

    terraform: 0.12.19 -> 0.12.20
    nlewo authored Jan 23, 2020
    Copy the full SHA
    27accf3 View commit details
4 changes: 2 additions & 2 deletions pkgs/applications/audio/qmmp/default.nix
Original file line number Diff line number Diff line change
@@ -29,11 +29,11 @@
# handle that.

mkDerivation rec {
name = "qmmp-1.3.5";
name = "qmmp-1.3.6";

src = fetchurl {
url = "http://qmmp.ylsoftware.com/files/${name}.tar.bz2";
sha256 = "0h7kcqzhfvk610937pwrhizcdgd4n7ncl1vayv6sj3va1x7pv6xm";
sha256 = "0dihy6v6j1cfx4qgwgajdn8rx6nf8x5srk8yjki9xh1mlcaanhp8";
};

nativeBuildInputs = [ cmake pkgconfig ];
4 changes: 2 additions & 2 deletions pkgs/applications/networking/cluster/terraform/default.nix
Original file line number Diff line number Diff line change
@@ -112,8 +112,8 @@ in rec {
terraform_0_11-full = terraform_0_11.full;

terraform_0_12 = pluggable (generic {
version = "0.12.19";
sha256 = "067gzxysz8r2myj3rh0vwrs0pmbgb21jxlmawlf4v0lkjnhj6kwv";
version = "0.12.20";
sha256 = "1k94iwhdvp1ifg9w7y26cl89ihki2w9kxv8mz06pp9bnfwfw67x5";
patches = [ ./provider-path.patch ];
passthru = { inherit plugins; };
});
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/boltons/default.nix
Original file line number Diff line number Diff line change
@@ -2,14 +2,14 @@

buildPythonPackage rec {
pname = "boltons";
version = "19.3.0";
version = "20.0.0";

# No tests in PyPi Tarball
src = fetchFromGitHub {
owner = "mahmoud";
repo = "boltons";
rev = version;
sha256 = "0pgqr2hf7lxag8nc8wnh8hpp8fd2lxccq9h0bb8lb9x8npnzhnbn";
sha256 = "0scdslqi28b899i42m4c9pvhwv3kkw4wpi3n9zm5n64ggn5ngfbz";
};

checkInputs = [ pytest ];
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/hstspreload/default.nix
Original file line number Diff line number Diff line change
@@ -6,14 +6,14 @@

buildPythonPackage rec {
pname = "hstspreload";
version = "2019.12.25";
version = "2020.1.17";
disabled = isPy27;

src = fetchFromGitHub {
owner = "sethmlarson";
repo = pname;
rev = version;
sha256 = "1aa7jccwldxw3s0z668qqb0i0plsark1q3jvkmqkyp645w5bfilk";
sha256 = "08qcisiscnx74pwavh3ai3lg92zfrikwzr06p700kwk1gp8xhf3v";
};

# tests require network connection
4 changes: 2 additions & 2 deletions pkgs/tools/security/vault/default.nix
Original file line number Diff line number Diff line change
@@ -2,13 +2,13 @@

buildGoPackage rec {
pname = "vault";
version = "1.3.1";
version = "1.3.2";

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

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