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: c8124c121522
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: 89ec8c968acb
Choose a head ref
  • 4 commits
  • 5 files changed
  • 3 contributors

Commits on May 27, 2019

  1. terraform-provider-elasticsearch: init at 0.6.0 

    (cherry picked from commit d19b0b2)
    @basvandijk
    basvandijk committed May 27, 2019

    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
    3c389b8 View commit details

  2. intel-ocl: fix source URL (#62097) 

    (cherry picked from commit 69796ba)
    @fadenb @c0bw3b
    fadenb authored and c0bw3b committed May 27, 2019

    Unverified

    This user has not yet uploaded their public signing key.
    GPG key ID: 6371839BF51BA5DA
    Learn about vigilant mode
    Copy the full SHA
    866d7ff View commit details

  3. python/hetzner: 0.8.1 -> 0.8.2 

    Only includes a small fix for the login into the Robot Web interface,
which is used to eg. provide access to admin accounts (which in turn is
used by the NixOps Hetzner backend).

Signed-off-by: aszlig <aszlig@nix.build>
(cherry picked from commit 56009d4)
    @aszlig
    aszlig committed May 27, 2019
    Copy the full SHA
    8e46cb3 View commit details

  4. Merge pull request #62123 from basvandijk/terraform-provider-elastics… 

    …earch-0.6.0-release-19.03

Backport "terraform-provider-elasticsearch: init at 0.6.0" to release-19.03
    @basvandijk
    basvandijk authored May 27, 2019

    Unverified

    This user has not yet uploaded their public signing key.
    GPG key ID: 6371839BF51BA5DA
    Learn about vigilant mode
    Copy the full SHA
    89ec8c9 View commit details
1 change: 1 addition & 0 deletions pkgs/applications/networking/cluster/terraform-providers/default.nix
View file
Original file line number Diff line number Diff line change
@@ -24,6 +24,7 @@ let
};
in
{
elasticsearch = callPackage ./elasticsearch {};
gandi = callPackage ./gandi {};
ibm = callPackage ./ibm {};
libvirt = callPackage ./libvirt {};
29 changes: 29 additions & 0 deletions pkgs/applications/networking/cluster/terraform-providers/elasticsearch/default.nix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
{ stdenv, fetchFromGitHub, buildGoPackage }:
buildGoPackage rec {
name = "terraform-provider-elasticsearch-${version}";
version = "0.6.0";

goPackagePath = "github.com/phillbaker/terraform-provider-elasticsearch";

# ./deps.nix was generated using the work-around described in:
# https://github.com/kamilchm/go2nix/issues/19
goDeps = ./deps.nix;

src = fetchFromGitHub {
owner = "phillbaker";
repo = "terraform-provider-elasticsearch";
rev = "v${version}";
sha256 = "04i7jwhm1mg4m8p7y6yg83j76fx0ncallzbza1g1wc5cjjbkvgs2";
};

# Terraform allow checking the provider versions, but this breaks
# if the versions are not provided via file paths.
postBuild = "mv go/bin/terraform-provider-elasticsearch{,_v${version}}";

meta = with stdenv.lib; {
description = "Terraform provider for elasticsearch";
homepage = "https://github.com/phillbaker/terraform-provider-elasticsearch";
license = licenses.mpl20;
maintainers = with maintainers; [ basvandijk ];
};
}
75 changes: 75 additions & 0 deletions pkgs/applications/networking/cluster/terraform-providers/elasticsearch/deps.nix
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 2 additions & 3 deletions pkgs/development/python-modules/hetzner/default.nix
View file
Original file line number Diff line number Diff line change
@@ -5,13 +5,13 @@

buildPythonPackage rec {
pname = "hetzner";
version = "0.8.1";
version = "0.8.2";

src = fetchFromGitHub {
repo = "hetzner";
owner = "aszlig";
rev = "v${version}";
sha256 = "1xd1klvjskv0pg8ginih597jkk491a55b8dq80dsm61m5sbsx3vq";
sha256 = "152fklxff08s71v0b78yp5ajwpqyszm3sd7j0qsrwa2x9ik4968h";
};

meta = with stdenv.lib; {
@@ -20,5 +20,4 @@ buildPythonPackage rec {
license = licenses.bsd3;
maintainers = with maintainers; [ aszlig ];
};

}
2 changes: 1 addition & 1 deletion pkgs/os-specific/linux/intel-ocl/default.nix
View file
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
version = "5.0-63503";

src = fetchzip {
url = "http://registrationcenter-download.intel.com/akdlm/irc_nas/11396/SRB5.0_linux64.zip";
url = "https://registrationcenter-download.intel.com/akdlm/irc_nas/11396/SRB5.0_linux64.zip";
sha256 = "0qbp63l74s0i80ysh9ya8x7r79xkddbbz4378nms9i7a0kprg9p2";
stripRoot = false;
};