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

Commits on Oct 18, 2019

  1. Verified

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

Commits on Oct 20, 2019

  1. Merge pull request #71307 from marsam/update-terraform

    terraform: 0.12.10 -> 0.12.11
    marsam authored Oct 20, 2019
    Copy the full SHA
    6e6ea38 View commit details
Showing with 3 additions and 3 deletions.
  1. +3 −3 pkgs/applications/networking/cluster/terraform/default.nix
6 changes: 3 additions & 3 deletions pkgs/applications/networking/cluster/terraform/default.nix
Original file line number Diff line number Diff line change
@@ -43,7 +43,7 @@ let
description = "Tool for building, changing, and versioning infrastructure";
homepage = https://www.terraform.io/;
license = licenses.mpl20;
maintainers = with maintainers; [ zimbatm peterhoeg kalbasit ];
maintainers = with maintainers; [ zimbatm peterhoeg kalbasit marsam ];
};
} // attrs');

@@ -97,8 +97,8 @@ in rec {
terraform_0_11-full = terraform_0_11.full;

terraform_0_12 = pluggable (generic {
version = "0.12.10";
sha256 = "0bmqcmzjsrpvvnd9pn40f774c8jy6j810qz0njxqh60yh27f5rhx";
version = "0.12.12";
sha256 = "04qvzbm33ngkbkh45jbcv06c9s1lkgjk39sxvfxw7y6ygxzsrqq5";
patches = [ ./provider-path.patch ];
passthru = { inherit plugins; };
});