diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 44d22fb5225..0f73a5c6536 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -7,15 +7,15 @@ # For documentation on this file, see https://help.github.com/articles/about-codeowners/ # Mentioned users will get code review requests. +# This file +.github/CODEOWNERS @edolstra + # Boostraping and core infra -pkgs/stdenv/ @Ericson2314 -pkgs/build-support/cc-wrapper/ @Ericson2314 +pkgs/stdenv/ @edolstra +pkgs/build-support/cc-wrapper/ @edolstra # Libraries -lib/ @Profpatsch - -# Build-Support -pkgs/build-support @Profpatsch +lib/ @edolstra # Python-related code and docs pkgs/top-level/python-packages.nix @FRidh diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index 859838182ed..0f3b8bcab8b 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -254,7 +254,6 @@ hydra-queue-runner = 235; hydra-www = 236; syncthing = 237; - mfi = 238; caddy = 239; taskd = 240; factorio = 241; @@ -522,7 +521,6 @@ octoprint = 230; radicale = 234; syncthing = 237; - #mfi = 238; # unused caddy = 239; taskd = 240; factorio = 241; diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 8a7a5bf4bc4..a46448b9437 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -458,7 +458,6 @@ ./services/networking/lldpd.nix ./services/networking/logmein-hamachi.nix ./services/networking/mailpile.nix - ./services/networking/mfi.nix ./services/networking/mjpg-streamer.nix ./services/networking/minidlna.nix ./services/networking/miniupnpd.nix diff --git a/nixos/modules/services/mail/postfix.nix b/nixos/modules/services/mail/postfix.nix index 01ae49d4909..d88a38def82 100644 --- a/nixos/modules/services/mail/postfix.nix +++ b/nixos/modules/services/mail/postfix.nix @@ -836,11 +836,5 @@ in (mkIf (cfg.dnsBlacklists != []) { services.postfix.mapFiles."client_access" = checkClientAccessFile; }) - (mkIf (cfg.extraConfig != "") { - warnings = [ "The services.postfix.extraConfig option was deprecated. Please use services.postfix.config instead." ]; - }) - (mkIf (cfg.extraMasterConf != "") { - warnings = [ "The services.postfix.extraMasterConf option was deprecated. Please use services.postfix.masterConfig instead." ]; - }) ]); } diff --git a/nixos/modules/services/networking/mfi.nix b/nixos/modules/services/networking/mfi.nix deleted file mode 100644 index 775564a2c44..00000000000 --- a/nixos/modules/services/networking/mfi.nix +++ /dev/null @@ -1,100 +0,0 @@ -{ config, lib, pkgs, utils, ... }: -with lib; -let - name = "Ubiquiti mFi Controller"; - cfg = config.services.mfi; - stateDir = "/var/lib/mfi"; - # XXX 2 runtime exceptions using jre8: JSPException on GET / ; can't initialize ./data/keystore on first run. - cmd = "@${pkgs.jre7}/bin/java java -jar ${stateDir}/lib/ace.jar"; - mountPoints = [ - { what = "${pkgs.mfi}/dl"; where = "${stateDir}/dl"; } - { what = "${pkgs.mfi}/lib"; where = "${stateDir}/lib"; } - { what = "${pkgs.mongodb248}/bin"; where = "${stateDir}/bin"; } - { what = "${cfg.dataDir}"; where = "${stateDir}/data"; } - ]; - systemdMountPoints = map (m: "${utils.escapeSystemdPath m.where}.mount") mountPoints; - ports = [ 6080 6880 6443 6843 ]; -in -{ - options = { - services.mfi = { - enable = mkEnableOption name; - openPorts = mkOption { - type = types.bool; - default = true; - description = "Whether to open TCP ports ${concatMapStrings (a: "${toString a} ") ports}for the services."; - }; - dataDir = mkOption { - type = types.str; - default = "${stateDir}/data"; - description = '' - Where to store the database and other data. - - This directory will be bind-mounted to ${stateDir}/data as part of the service startup. - ''; - }; - }; - }; - - config = mkIf cfg.enable { - - networking.firewall.allowedTCPPorts = mkIf config.services.mfi.openPorts ports; - - users.users.mfi = { - uid = config.ids.uids.mfi; - description = "mFi controller daemon user"; - home = "${stateDir}"; - }; - - # We must create the binary directories as bind mounts instead of symlinks - # This is because the controller resolves all symlinks to absolute paths - # to be used as the working directory. - systemd.mounts = map ({ what, where }: { - bindsTo = [ "mfi.service" ]; - partOf = [ "mfi.service" ]; - unitConfig.RequiresMountsFor = stateDir; - options = "bind"; - what = what; - where = where; - }) mountPoints; - - systemd.services.mfi = { - description = "mFi controller daemon"; - wantedBy = [ "multi-user.target" ]; - after = [ "network.target" ] ++ systemdMountPoints; - partOf = systemdMountPoints; - bindsTo = systemdMountPoints; - unitConfig.RequiresMountsFor = stateDir; - - preStart = '' - # Clear ./webapps each run. - rm -rf "${stateDir}/webapps" - mkdir -p "${stateDir}/webapps" - ln -s "${pkgs.mfi}/webapps/ROOT.war" "${stateDir}/webapps" - - # Copy initial config only once. - test -e "${stateDir}/conf" || cp -ar "${pkgs.mfi}/conf" "${stateDir}/conf" - test -e "${stateDir}/data" || cp -ar "${pkgs.mfi}/data" "${stateDir}/data" - - # Fix Permissions. - # (Bind-mounts cause errors; ignore exit codes) - chown -fR mfi: "${stateDir}" || true - chmod -fR u=rwX,go= "${stateDir}" || true - ''; - - postStop = '' - rm -rf "${stateDir}/webapps" - ''; - - serviceConfig = { - Type = "simple"; - ExecStart = "${cmd} start"; - ExecStop = "${cmd} stop"; - User = "mfi"; - PermissionsStartOnly = true; - UMask = "0077"; - WorkingDirectory = "${stateDir}"; - }; - }; - }; -} diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix index 6f6253e330b..7e1b01c3081 100644 --- a/nixos/release-combined.nix +++ b/nixos/release-combined.nix @@ -81,8 +81,8 @@ in rec { (all nixos.tests.boot.uefiUsb) (all nixos.tests.boot-stage1) nixos.tests.hibernate.x86_64-linux # i686 is flaky, see #23107 - nixos.tests.docker.x86_64-linux - nixos.tests.docker-edge.x86_64-linux + nixos.tests.docker + nixos.tests.docker-edge (all nixos.tests.ecryptfs) (all nixos.tests.env) (all nixos.tests.ipv6) diff --git a/nixos/release.nix b/nixos/release.nix index a893a64df1c..c43034ff44b 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -263,10 +263,10 @@ in rec { tests.plasma5 = callTest tests/plasma5.nix {}; tests.keymap = callSubTests tests/keymap.nix {}; tests.initrdNetwork = callTest tests/initrd-network.nix {}; - tests.kernel-copperhead = tests/kernel-copperhead.nix {}; - tests.kernel-latest = tests/kernel-latest.nix {}; - tests.kernel-lts = tests/kernel-lts.nix {}; - tests.kernel-params = tests/kernel-params.nix {}; + tests.kernel-copperhead = callTest tests/kernel-copperhead.nix {}; + tests.kernel-latest = callTest tests/kernel-latest.nix {}; + tests.kernel-lts = callTest tests/kernel-lts.nix {}; + tests.kernel-params = callTest tests/kernel-params.nix {}; tests.keystone = callTest tests/keystone.nix {}; tests.kubernetes = hydraJob (import tests/kubernetes.nix { system = "x86_64-linux"; }); tests.latestKernel.login = callTest tests/login.nix { latestKernel = true; }; diff --git a/pkgs/applications/audio/rosegarden/default.nix b/pkgs/applications/audio/rosegarden/default.nix index 00d7559cd58..4fec0d0c37b 100644 --- a/pkgs/applications/audio/rosegarden/default.nix +++ b/pkgs/applications/audio/rosegarden/default.nix @@ -1,24 +1,26 @@ -{ stdenv, fetchurl, qt4, pkgconfig, ladspaPlugins, ladspaH, +{ stdenv, fetchurl, cmake, qt4, pkgconfig, ladspaPlugins, ladspaH, dssi, liblo, liblrdf, fftwSinglePrec, libsndfile, libsamplerate, perl, makedepend, libjack2, withLirc ? false, lirc ? null } : stdenv.mkDerivation (rec { - version = "15.08"; + version = "17.04"; name = "rosegarden-${version}"; + src = fetchurl { url = "mirror://sourceforge/rosegarden/${name}.tar.bz2"; - sha256 = "1pk24bhpsmvn6rkqgll31na44w03banra1y7kiqd0gajlnw7wlls"; + sha256 = "1khfcj22asdhjh0jvhkqsz200wgmigkhsrcz09ffia5hqm0n32lq"; }; - QTDIR=qt4; - - buildInputs = [ qt4 pkgconfig ladspaPlugins ladspaH dssi liblo liblrdf fftwSinglePrec - libsndfile libsamplerate perl makedepend libjack2 ] - ++ stdenv.lib.optional withLirc [ lirc ]; - - #enableParallelBuilding = true; issues on hydra - + QTDIR = qt4; + + buildInputs = [ + cmake qt4 pkgconfig ladspaPlugins ladspaH dssi liblo liblrdf fftwSinglePrec + libsndfile libsamplerate perl makedepend libjack2 + ] ++ stdenv.lib.optional withLirc [ lirc ]; + + enableParallelBuilding = true; + meta = with stdenv.lib; { homepage = http://www.rosegardenmusic.com/; description = "Music composition and editing environment"; diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix index e3e889abd87..5fe4d0910ee 100644 --- a/pkgs/applications/editors/atom/default.nix +++ b/pkgs/applications/editors/atom/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "atom-${version}"; - version = "1.19.4"; + version = "1.19.7"; src = fetchurl { url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb"; - sha256 = "13k98ghz943yd5lqsbsvp1qy79lhgi3vww97qhqcbmmh15n0gsb0"; + sha256 = "0ividd7bmx0fqz1ykcx5cbnd6qyms1h7r662pcclyzzm3vxj9zif"; name = "${name}.deb"; }; diff --git a/pkgs/applications/graphics/mcomix/default.nix b/pkgs/applications/graphics/mcomix/default.nix index 318c2caee6f..eea0e501cb8 100644 --- a/pkgs/applications/graphics/mcomix/default.nix +++ b/pkgs/applications/graphics/mcomix/default.nix @@ -11,13 +11,10 @@ python27Packages.buildPythonApplication rec { propagatedBuildInputs = with python27Packages; [ pygtk pillow ]; - postPatch = '' - sed -i -e '/test_suite/d' setup.py - ''; + doCheck = false; meta = { description = "Image viewer designed to handle comic books"; - longDescription = '' MComix is an user-friendly, customizable image viewer. It is specifically designed to handle comic books, but also serves as a generic viewer. @@ -28,9 +25,10 @@ python27Packages.buildPythonApplication rec { MComix is a fork of the Comix project, and aims to add bug fixes and stability improvements after Comix development came to a halt in late 2009. ''; - homepage = http://mcomix.sourceforge.net/; license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [ fuuzetsu ]; + maintainers = with stdenv.lib.maintainers; [ fuuzetsu AndersonTorres ]; }; } +# TODO: +# - error in check phase diff --git a/pkgs/applications/graphics/yed/default.nix b/pkgs/applications/graphics/yed/default.nix index fa85d44a498..dcb7c512dde 100644 --- a/pkgs/applications/graphics/yed/default.nix +++ b/pkgs/applications/graphics/yed/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "yEd-${version}"; - version = "3.17"; + version = "3.17.1"; src = requireFile { name = "${name}.zip"; url = "https://www.yworks.com/en/products/yfiles/yed/"; - sha256 = "1wk58cql90y3i5l7jlxqfjjgf26i0zrv5cn0p9npgagaw6aiw2za"; + sha256 = "0fk1gai7yghfmfvx1rfzdnpwihbq6hqzncyk6zkpqdrf6zz576nl"; }; nativeBuildInputs = [ unzip makeWrapper ]; diff --git a/pkgs/applications/misc/slic3r/default.nix b/pkgs/applications/misc/slic3r/default.nix index 64bcb0e1921..8624cc9dda5 100644 --- a/pkgs/applications/misc/slic3r/default.nix +++ b/pkgs/applications/misc/slic3r/default.nix @@ -12,6 +12,10 @@ stdenv.mkDerivation rec { sha256 = "1z8h11k29b7z49z5k8ikyfiijyycy1q3krlzi8hfd0vdybvymw21"; }; + patches = [ + ./gcc6.patch + ]; + buildInputs = with perlPackages; [ perl makeWrapper which EncodeLocale MathClipper ExtUtilsXSpp threads MathConvexHullMonotoneChain MathGeometryVoronoi MathPlanePath Moo @@ -31,6 +35,7 @@ stdenv.mkDerivation rec { buildPhase = '' export SLIC3R_NO_AUTO=true + export LD=$CXX export PERL5LIB="./xs/blib/arch/:./xs/blib/lib:$PERL5LIB" substituteInPlace Build.PL \ diff --git a/pkgs/applications/misc/slic3r/gcc6.patch b/pkgs/applications/misc/slic3r/gcc6.patch new file mode 100644 index 00000000000..f382a252f0d --- /dev/null +++ b/pkgs/applications/misc/slic3r/gcc6.patch @@ -0,0 +1,40 @@ +diff --git i/xs/src/libslic3r/Config.hpp w/xs/src/libslic3r/Config.hpp +index 49e999b..d9b65d8 100644 +--- i/xs/src/libslic3r/Config.hpp ++++ w/xs/src/libslic3r/Config.hpp +@@ -65,7 +65,7 @@ class ConfigOptionFloat : public ConfigOption + + bool deserialize(std::string str) { + std::istringstream iss(str); +- return iss >> this->value; ++ return bool(iss >> this->value); + }; + }; + +@@ -124,7 +124,7 @@ class ConfigOptionInt : public ConfigOption + + bool deserialize(std::string str) { + std::istringstream iss(str); +- return iss >> this->value; ++ return bool(iss >> this->value); + }; + }; + +@@ -249,7 +249,7 @@ class ConfigOptionPercent : public ConfigOption + bool deserialize(std::string str) { + // don't try to parse the trailing % since it's optional + std::istringstream iss(str); +- return iss >> this->value; ++ return bool(iss >> this->value); + }; + }; + +@@ -279,7 +279,7 @@ class ConfigOptionFloatOrPercent : public ConfigOption + bool deserialize(std::string str) { + this->percent = str.find_first_of("%") != std::string::npos; + std::istringstream iss(str); +- return iss >> this->value; ++ return bool(iss >> this->value); + }; + }; + diff --git a/pkgs/applications/misc/truecrypt/builder.sh b/pkgs/applications/misc/truecrypt/builder.sh deleted file mode 100644 index 88820d4cad2..00000000000 --- a/pkgs/applications/misc/truecrypt/builder.sh +++ /dev/null @@ -1,15 +0,0 @@ -source $stdenv/setup - -tar xvfz $src -cd truecrypt-* - -cp $pkcs11h pkcs11.h -cp $pkcs11th pkcs11t.h -cp $pkcs11fh pkcs11f.h - -make PKCS11_INC="`pwd`" - -mkdir -p $out/bin -cp Main/truecrypt $out/bin -mkdir -p $out/share/$name -cp License.txt $out/share/$name/LICENSE diff --git a/pkgs/applications/misc/truecrypt/default.nix b/pkgs/applications/misc/truecrypt/default.nix index 2b66dd41a2a..4787516cedd 100644 --- a/pkgs/applications/misc/truecrypt/default.nix +++ b/pkgs/applications/misc/truecrypt/default.nix @@ -46,7 +46,24 @@ library, use the 'NOGUI' parameter: stdenv.mkDerivation { name = "truecrypt-7.1a"; - builder = ./builder.sh; + + patchPhase = "patch -p0 < ${./gcc6.patch}"; + + preBuild = '' + cp $pkcs11h pkcs11.h + cp $pkcs11th pkcs11t.h + cp $pkcs11fh pkcs11f.h + ''; + + makeFlags = [ + ''PKCS11_INC="`pwd`"'' + (if wxGUI then "" else "NOGUI=1") + ]; + + installPhase = '' + install -D -t $out/bin Main/truecrypt + install -D License.txt $out/share/$name/LICENSE + ''; src = fetchurl { url = https://fossies.org/linux/misc/old/TrueCrypt-7.1a-Source.tar.gz; @@ -68,14 +85,13 @@ stdenv.mkDerivation { sha256 = "5ae6a4f32ca737e02def3bf314c9842fb89be82bf00b6f4022a97d8d565522b8"; }; - buildInputs = [ pkgconfig fuse devicemapper wxGTK nasm ]; - makeFlags = if wxGUI then "" else "NOGUI=1"; + buildInputs = [ pkgconfig fuse devicemapper wxGTK nasm ]; meta = { description = "Free Open-Source filesystem on-the-fly encryption"; homepage = http://www.truecrypt.org/; license = "TrueCrypt License Version 2.6"; - maintainers = with stdenv.lib.maintainers; [viric]; + maintainers = with stdenv.lib.maintainers; [ viric ryantm ]; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/applications/misc/truecrypt/gcc6.patch b/pkgs/applications/misc/truecrypt/gcc6.patch new file mode 100644 index 00000000000..6e8c7da69e8 --- /dev/null +++ b/pkgs/applications/misc/truecrypt/gcc6.patch @@ -0,0 +1,61 @@ +--- Main/Resources.cpp 2016-05-16 16:47:35.846462041 +0200 ++++ Main/Resources.cpp 2016-05-16 17:12:21.838202520 +0200 +@@ -45,13 +45,13 @@ + strBuf.CopyFrom (res); + return string (reinterpret_cast (strBuf.Ptr())); + #else +- static const char LanguageXml[] = ++ static byte LanguageXml[] = + { + # include "Common/Language.xml.h" + , 0 + }; + +- return string (LanguageXml); ++ return string ((const char*) LanguageXml); + #endif + } + +@@ -64,13 +64,13 @@ + strBuf.CopyFrom (res); + return string (reinterpret_cast (strBuf.Ptr())); + #else +- static const char License[] = ++ static byte License[] = + { + # include "License.txt.h" + , 0 + }; + +- return string (License); ++ return string ((const char*) License); + #endif + } + +--- Main/Forms/PreferencesDialog.cpp 2016-05-16 17:14:47.704707908 +0200 ++++ Main/Forms/PreferencesDialog.cpp 2016-05-16 17:15:56.927964437 +0200 +@@ -414,11 +414,11 @@ + libExtension = wxDynamicLibrary::CanonicalizeName (L"x"); + + #ifdef TC_MACOSX +- extensions.push_back (make_pair (L"dylib", LangString["DLL_FILES"])); ++ extensions.push_back (make_pair (L"dylib", static_cast(LangString["DLL_FILES"].wc_str()))); + #endif + if (!libExtension.empty()) + { +- extensions.push_back (make_pair (libExtension.Mid (libExtension.find (L'.') + 1), LangString["DLL_FILES"])); ++ extensions.push_back (make_pair (static_cast(libExtension.Mid (libExtension.find (L'.') + 1).wc_str()), static_cast(LangString["DLL_FILES"].wc_str()))); + extensions.push_back (make_pair (L"*", L"")); + } + +--- Main/GraphicUserInterface.cpp 2016-05-16 17:16:38.724591342 +0200 ++++ Main/GraphicUserInterface.cpp 2016-05-16 17:17:09.854562653 +0200 +@@ -1445,7 +1445,7 @@ + FilePath GraphicUserInterface::SelectVolumeFile (wxWindow *parent, bool saveMode, const DirectoryPath &directory) const + { + list < pair > extensions; +- extensions.push_back (make_pair (L"tc", LangString["TC_VOLUMES"])); ++ extensions.push_back (make_pair (L"tc", static_cast(LangString["TC_VOLUMES"].wc_str()))); + + FilePathList selFiles = Gui->SelectFiles (parent, LangString[saveMode ? "OPEN_NEW_VOLUME" : "OPEN_VOL_TITLE"], saveMode, false, extensions, directory); + diff --git a/pkgs/applications/misc/xiphos/default.nix b/pkgs/applications/misc/xiphos/default.nix index a9f786a2a08..ecd6ab8c2ad 100644 --- a/pkgs/applications/misc/xiphos/default.nix +++ b/pkgs/applications/misc/xiphos/default.nix @@ -1,27 +1,29 @@ -{stdenv, fetchurl, pkgconfig +{stdenv, fetchFromGitHub, pkgconfig , python , intltool , docbook2x, docbook_xml_dtd_412, libxslt , sword, clucene_core, biblesync , gnome_doc_utils , libgsf, gconf -, gtkhtml, libgtkhtml, libglade, scrollkeeper +, gtkhtml, libglade, scrollkeeper , webkitgtk -, dbus_glib, enchant, isocodes, libuuid +, dbus_glib, enchant, isocodes, libuuid, icu }: stdenv.mkDerivation rec { name = "xiphos-${version}"; - version = "4.0.3-20150806"; + version = "4.0.6"; - src = fetchurl { - url = "mirror://sourceforge/project/gnomesword/Xiphos/4.0.3/${name}.tar.gz"; - sha256 = "1xkvhpasdlda2rp0874znz158z4rjh1hpynwy13d96kjxq4npiqv"; + src = fetchFromGitHub { + owner = "crosswire"; + repo = "xiphos"; + rev = "${version}"; + sha256 = "02xyy6rxxxaqbjbhdp813f0vp1jpfzqscjdbdc0qcd4yvi3baj5f"; }; buildInputs = [ pkgconfig python intltool docbook2x docbook_xml_dtd_412 libxslt - sword clucene_core biblesync gnome_doc_utils libgsf gconf gtkhtml libgtkhtml - libglade scrollkeeper webkitgtk dbus_glib enchant isocodes libuuid ]; + sword clucene_core biblesync gnome_doc_utils libgsf gconf gtkhtml + libglade scrollkeeper webkitgtk dbus_glib enchant isocodes libuuid icu ]; prePatch = '' patchShebangs .; @@ -33,7 +35,7 @@ stdenv.mkDerivation rec { ''; configurePhase = '' - python waf configure --prefix=$out + python waf configure --prefix=$out --enable-webkit2 ''; buildPhase = '' diff --git a/pkgs/applications/networking/cluster/terraform/providers/data.nix b/pkgs/applications/networking/cluster/terraform/providers/data.nix index 76eaa21a42c..0778e221c12 100644 --- a/pkgs/applications/networking/cluster/terraform/providers/data.nix +++ b/pkgs/applications/networking/cluster/terraform/providers/data.nix @@ -1,333 +1,486 @@ +# Generated with ./update-all { + alicloud = + { + owner = "terraform-providers"; + repo = "terraform-provider-alicloud"; + version = "0.1.0"; + sha256 = "199zrpmi1hqy80nrvdhh5pn7vlcvpjcsf0hpwgzb1r9vnydpz7cj"; + }; + archive = + { + owner = "terraform-providers"; + repo = "terraform-provider-archive"; + version = "0.1.0"; + sha256 = "1g7bjak1vgxpnmp4b9cb3mq8gqp1a7738fj0sxzflfk8k35p27ri"; + }; + arukas = + { + owner = "terraform-providers"; + repo = "terraform-provider-arukas"; + version = "0.1.0"; + sha256 = "1msfr0rlzjfds02h35p99d1f541a1fzndjcpgijb41yx74h2v5dl"; + }; + atlas = + { + owner = "terraform-providers"; + repo = "terraform-provider-atlas"; + version = "0.1.1"; + sha256 = "0k73vv14vnjl5qm33w54s5zzi0mmk1kn2zs3qkfq71aqi9ml7d14"; + }; aws = { - pname = "terraform-provider-aws"; + owner = "terraform-providers"; + repo = "terraform-provider-aws"; version = "0.1.4"; - src = { - owner = "terraform-providers"; - repo = "terraform-provider-aws"; - rev = "v0.1.4"; - sha256 = "0hqyvp1bgyfqq2lkjq5m5qxybagnxl9zrqiqfnlrfigdp0y31iz8"; - }; + sha256 = "0hqyvp1bgyfqq2lkjq5m5qxybagnxl9zrqiqfnlrfigdp0y31iz8"; + }; + azure = + { + owner = "terraform-providers"; + repo = "terraform-provider-azure"; + version = "0.1.1"; + sha256 = "11myqq3wnxvpysjycvwg7b14ll8d9vkn06xb3r26kmc42fkl5xv1"; }; azurerm = { - pname = "terraform-provider-azurerm"; + owner = "terraform-providers"; + repo = "terraform-provider-azurerm"; version = "0.1.6"; - src = { - owner = "terraform-providers"; - repo = "terraform-provider-azurerm"; - rev = "v0.1.6"; - sha256 = "01hjr42gpkpwpz0chnkw8pf0yid0hqpdnfz65q5h2p8h627hg0c6"; - }; + sha256 = "01hjr42gpkpwpz0chnkw8pf0yid0hqpdnfz65q5h2p8h627hg0c6"; }; bitbucket = { - pname = "terraform-provider-bitbucket"; + owner = "terraform-providers"; + repo = "terraform-provider-bitbucket"; version = "0.1.0"; - src = { - owner = "terraform-providers"; - repo = "terraform-provider-bitbucket"; - rev = "v0.1.0"; - sha256 = "0c5aiq0p425h7c600wg5h3601l40airwz6cs724lc72fycbb4s43"; - }; + sha256 = "0c5aiq0p425h7c600wg5h3601l40airwz6cs724lc72fycbb4s43"; }; chef = { - pname = "terraform-provider-chef"; + owner = "terraform-providers"; + repo = "terraform-provider-chef"; version = "0.1.0"; - src = { - owner = "terraform-providers"; - repo = "terraform-provider-chef"; - rev = "v0.1.0"; - sha256 = "17fppyhxi0rd5v8khw2psdn2hdv5j79hxhinwkzrq5s4iccqk5dw"; - }; + sha256 = "17fppyhxi0rd5v8khw2psdn2hdv5j79hxhinwkzrq5s4iccqk5dw"; }; circonus = { - pname = "terraform-provider-circonus"; + owner = "terraform-providers"; + repo = "terraform-provider-circonus"; version = "0.1.0"; - src = { - owner = "terraform-providers"; - repo = "terraform-provider-circonus"; - rev = "v0.1.0"; - sha256 = "0v05g91yg2zh4wczp8mi3hmvwb35z0y9044bwy67nm1l624xlj64"; - }; + sha256 = "0v05g91yg2zh4wczp8mi3hmvwb35z0y9044bwy67nm1l624xlj64"; + }; + clc = + { + owner = "terraform-providers"; + repo = "terraform-provider-clc"; + version = "0.1.0"; + sha256 = "0gvsjnwk6xkgxai1gxsjf0hsjxbv8d8jg5hq8yd3hjhc6785fgnf"; + }; + cloudflare = + { + owner = "terraform-providers"; + repo = "terraform-provider-cloudflare"; + version = "0.1.0"; + sha256 = "073j0kqkccj7yrqz6j4vx722vmy6mmvmgidamkjnhhjcwm6g1jbq"; }; cloudstack = { - pname = "terraform-provider-cloudstack"; + owner = "terraform-providers"; + repo = "terraform-provider-cloudstack"; version = "0.1.1"; - src = { - owner = "terraform-providers"; - repo = "terraform-provider-cloudstack"; - rev = "v0.1.1"; - sha256 = "09iqxpc5a6938qj1js2y9s4dcgk7hw69xga56ixpbbknms2yrhnb"; - }; + sha256 = "09iqxpc5a6938qj1js2y9s4dcgk7hw69xga56ixpbbknms2yrhnb"; }; cobbler = { - pname = "terraform-provider-cobbler"; + owner = "terraform-providers"; + repo = "terraform-provider-cobbler"; version = "0.1.0"; - src = { - owner = "terraform-providers"; - repo = "terraform-provider-cobbler"; - rev = "v0.1.0"; - sha256 = "1867aqlz1v7scybaia9yakaxw76lh6y2whhajv5pqy1ng58rcgiz"; - }; + sha256 = "1867aqlz1v7scybaia9yakaxw76lh6y2whhajv5pqy1ng58rcgiz"; }; consul = { - pname = "terraform-provider-consul"; + owner = "terraform-providers"; + repo = "terraform-provider-consul"; version = "0.1.0"; - src = { - owner = "terraform-providers"; - repo = "terraform-provider-consul"; - rev = "v0.1.0"; - sha256 = "1d179m42iv2dy6wjzldllffwg6qxbg6gnvxrp6nzy75v7qp2aq94"; - }; + sha256 = "1d179m42iv2dy6wjzldllffwg6qxbg6gnvxrp6nzy75v7qp2aq94"; }; datadog = { - pname = "terraform-provider-datadog"; + owner = "terraform-providers"; + repo = "terraform-provider-datadog"; version = "0.1.0"; - src = { - owner = "terraform-providers"; - repo = "terraform-provider-datadog"; - rev = "v0.1.0"; - sha256 = "1k3p0zxffhabs1xb6aw9189vbmh3ax10q4xi1qgjfjvla22byqmk"; - }; + sha256 = "1k3p0zxffhabs1xb6aw9189vbmh3ax10q4xi1qgjfjvla22byqmk"; + }; + digitalocean = + { + owner = "terraform-providers"; + repo = "terraform-provider-digitalocean"; + version = "0.1.2"; + sha256 = "0wn2bx9zk0fqvrn7a76rffin7f1b70p66h5bs9073szhr3zph7hg"; }; dme = { - pname = "terraform-provider-dme"; + owner = "terraform-providers"; + repo = "terraform-provider-dme"; version = "0.1.0"; - src = { - owner = "terraform-providers"; - repo = "terraform-provider-dme"; - rev = "v0.1.0"; - sha256 = "1ipqw1sbx0i9rhxawsysrqxvf10z8ra2y86xwd4iz0f12x9drblv"; - }; + sha256 = "1ipqw1sbx0i9rhxawsysrqxvf10z8ra2y86xwd4iz0f12x9drblv"; + }; + dns = + { + owner = "terraform-providers"; + repo = "terraform-provider-dns"; + version = "0.1.1"; + sha256 = "0ccp02rbvfvrb808mg053q5y7ghvxsl7p1gzw7pkm934i6j90g9n"; }; dnsimple = { - pname = "terraform-provider-dnsimple"; + owner = "terraform-providers"; + repo = "terraform-provider-dnsimple"; version = "0.1.0"; - src = { - owner = "terraform-providers"; - repo = "terraform-provider-dnsimple"; - rev = "v0.1.0"; - sha256 = "0gkd5i69ldm5zn34p3k68aqk798g6g0d60gw7yp316l7mskvrx7h"; - }; + sha256 = "0gkd5i69ldm5zn34p3k68aqk798g6g0d60gw7yp316l7mskvrx7h"; + }; + docker = + { + owner = "terraform-providers"; + repo = "terraform-provider-docker"; + version = "0.1.0"; + sha256 = "1nacxkyy12w4rj1bdf5ayqmmm47nwh362pcksr227rkwmsjlmg1m"; }; dyn = { - pname = "terraform-provider-dyn"; + owner = "terraform-providers"; + repo = "terraform-provider-dyn"; version = "0.1.0"; - src = { - owner = "terraform-providers"; - repo = "terraform-provider-dyn"; - rev = "v0.1.0"; - sha256 = "1w727r2gz5hjmbzw9zir0n5nrr818adh4qj50n3vijqwbxciyq2p"; - }; + sha256 = "1w727r2gz5hjmbzw9zir0n5nrr818adh4qj50n3vijqwbxciyq2p"; + }; + external = + { + owner = "terraform-providers"; + repo = "terraform-provider-external"; + version = "0.1.0"; + sha256 = "160f0avv6wbh11z54wy0qcq0zrcj4s31kn7a9x6zikv7v4hfnbza"; + }; + fastly = + { + owner = "terraform-providers"; + repo = "terraform-provider-fastly"; + version = "0.1.2"; + sha256 = "1z7nsgqqzvily9rxr79yjv6jfx56896c9lxb8flmzwjz6b6mvnz7"; + }; + github = + { + owner = "terraform-providers"; + repo = "terraform-provider-github"; + version = "0.1.1"; + sha256 = "0f6nk9nb8h8247rz7x1w11amp0qdcmy1alr8jgd2chrjv9f8nif0"; + }; + gitlab = + { + owner = "terraform-providers"; + repo = "terraform-provider-gitlab"; + version = "0.1.0"; + sha256 = "1xjhpaq2agdshrl5jbq9ak2nxdy86iay5bw16zww2qc5ah21sdg2"; }; google = { - pname = "terraform-provider-google"; + owner = "terraform-providers"; + repo = "terraform-provider-google"; version = "0.1.3"; - src = { - owner = "terraform-providers"; - repo = "terraform-provider-google"; - rev = "v0.1.3"; - sha256 = "1aa1hz0yc4g746m6dl04hc70rcrzx0py8kpdch3kim475bspclnf"; - }; + sha256 = "1aa1hz0yc4g746m6dl04hc70rcrzx0py8kpdch3kim475bspclnf"; + }; + grafana = + { + owner = "terraform-providers"; + repo = "terraform-provider-grafana"; + version = "0.1.0"; + sha256 = "1m2anc5cyn2p3yh4zn0y6wvzb0s2fz3sfdqm9psvx53266c2c81q"; + }; + heroku = + { + owner = "terraform-providers"; + repo = "terraform-provider-heroku"; + version = "0.1.0"; + sha256 = "1f72lm95bnkhaf2accypdn7xsxcgkqri5fq5mriya4n34c61z3l6"; }; http = { - pname = "terraform-provider-http"; + owner = "terraform-providers"; + repo = "terraform-provider-http"; version = "0.1.0"; - src = { - owner = "terraform-providers"; - repo = "terraform-provider-http"; - rev = "v0.1.0"; - sha256 = "1iy5fsl1j4wswbajnw0k6lagc2sz52idnswj1vmfc66x87ls0mah"; - }; + sha256 = "1iy5fsl1j4wswbajnw0k6lagc2sz52idnswj1vmfc66x87ls0mah"; + }; + icinga2 = + { + owner = "terraform-providers"; + repo = "terraform-provider-icinga2"; + version = "0.1.1"; + sha256 = "0z7lxrspm33j7bkkm2n7ac0jgyaz3y3lql3gd30p10nvpilrg07v"; }; ignition = { - pname = "terraform-provider-ignition"; - version = "0.1.0"; - src = { - owner = "terraform-providers"; - repo = "terraform-provider-ignition"; - rev = "v0.1.0"; - sha256 = "03jvngd3fjyqmdzg2847p0k2fjyqykgmdng5vss4rcsn0n3b9d39"; - }; + owner = "terraform-providers"; + repo = "terraform-provider-ignition"; + version = "0.2.0"; + sha256 = "07qsyjzbz34nh7qrmw97sg0zrqbchky9r3ywrdz96pmpr1yjmwr7"; }; influxdb = { - pname = "terraform-provider-influxdb"; + owner = "terraform-providers"; + repo = "terraform-provider-influxdb"; version = "0.1.0"; - src = { - owner = "terraform-providers"; - repo = "terraform-provider-influxdb"; - rev = "v0.1.0"; - sha256 = "0msc6maxsiwmsg8ppdfj1397c66llhaf15nc4hmr2h6dxqkb5wl5"; - }; + sha256 = "0msc6maxsiwmsg8ppdfj1397c66llhaf15nc4hmr2h6dxqkb5wl5"; + }; + kubernetes = + { + owner = "terraform-providers"; + repo = "terraform-provider-kubernetes"; + version = "1.0.0"; + sha256 = "1kh7a83f98v6b4v3zj84ddhrg2hya4nmvrw0mjc26q12g4z2d5g6"; + }; + librato = + { + owner = "terraform-providers"; + repo = "terraform-provider-librato"; + version = "0.1.0"; + sha256 = "0bxadwj5s7bvc4vlymn3w6qckf14hz82r7q98w2nh55sqr52d923"; + }; + local = + { + owner = "terraform-providers"; + repo = "terraform-provider-local"; + version = "0.1.0"; + sha256 = "02m0wg0jasnzrayamjsc2hzi0ibj83v4d0hmw2xbrxk7vmk71lgq"; }; logentries = { - pname = "terraform-provider-logentries"; + owner = "terraform-providers"; + repo = "terraform-provider-logentries"; version = "0.1.0"; - src = { - owner = "terraform-providers"; - repo = "terraform-provider-logentries"; - rev = "v0.1.0"; - sha256 = "11fkb84gqcq59wk5kqn3h428jrc2gkl659zxmkdldad6jdll9ypa"; - }; + sha256 = "11fkb84gqcq59wk5kqn3h428jrc2gkl659zxmkdldad6jdll9ypa"; }; mailgun = { - pname = "terraform-provider-mailgun"; + owner = "terraform-providers"; + repo = "terraform-provider-mailgun"; version = "0.1.0"; - src = { - owner = "terraform-providers"; - repo = "terraform-provider-mailgun"; - rev = "v0.1.0"; - sha256 = "1hjhjfxqbr43wa248c6hc91lx5b2gdw4vl92l2i6aqp17rbc0wfj"; - }; + sha256 = "1hjhjfxqbr43wa248c6hc91lx5b2gdw4vl92l2i6aqp17rbc0wfj"; + }; + mysql = + { + owner = "terraform-providers"; + repo = "terraform-provider-mysql"; + version = "0.1.0"; + sha256 = "0vjr97xf15va9qypjb9318h1nxr0sd6ydcy7ijnqb8538v3581mv"; + }; + newrelic = + { + owner = "terraform-providers"; + repo = "terraform-provider-newrelic"; + version = "0.1.1"; + sha256 = "1fqgxcspkgm3ncsqbvw79h5n09agba7q80nz0mrq09x0pyk8y051"; }; nomad = { - pname = "terraform-provider-nomad"; + owner = "terraform-providers"; + repo = "terraform-provider-nomad"; version = "0.1.0"; - src = { - owner = "terraform-providers"; - repo = "terraform-provider-nomad"; - rev = "v0.1.0"; - sha256 = "03sb31l59hxpp6zmnizxdm21jipz4mrzz9czk6ahhx7c8q0n0na8"; - }; + sha256 = "03sb31l59hxpp6zmnizxdm21jipz4mrzz9czk6ahhx7c8q0n0na8"; + }; + ns1 = + { + owner = "terraform-providers"; + repo = "terraform-provider-ns1"; + version = "0.1.0"; + sha256 = "1in9ggrvxfb3maxhgiv997hndkpnqpgx1c1365lfizhp7km5ncvj"; + }; + null = + { + owner = "terraform-providers"; + repo = "terraform-provider-null"; + version = "0.1.0"; + sha256 = "069yhsqi4jc14cay1gk7mwwmrg8xv90kj1k5qy3a2ypfbss4fcjp"; }; oneandone = { - pname = "terraform-provider-oneandone"; + owner = "terraform-providers"; + repo = "terraform-provider-oneandone"; version = "0.1.0"; - src = { - owner = "terraform-providers"; - repo = "terraform-provider-oneandone"; - rev = "v0.1.0"; - sha256 = "18bbpcprjib4d4skjdr76xjxi9091h5b3dls68y6bxkk6sh6av1i"; - }; + sha256 = "18bbpcprjib4d4skjdr76xjxi9091h5b3dls68y6bxkk6sh6av1i"; + }; + opc = + { + owner = "terraform-providers"; + repo = "terraform-provider-opc"; + version = "0.1.2"; + sha256 = "0c4ywav89lln9417zwflrp3qhcs7qf96rgcvm1msmpgglrhzwp2i"; + }; + openstack = + { + owner = "terraform-providers"; + repo = "terraform-provider-openstack"; + version = "0.2.1"; + sha256 = "1zsswsgv7lzhfd0v8llbm18gsfg6xji0r3f9rnvpjqkffj4088ca"; }; opsgenie = { - pname = "terraform-provider-opsgenie"; + owner = "terraform-providers"; + repo = "terraform-provider-opsgenie"; version = "0.1.0"; - src = { - owner = "terraform-providers"; - repo = "terraform-provider-opsgenie"; - rev = "v0.1.0"; - sha256 = "0zs0cl6jl4rijcs6vv5k8k5pyf0zs52dlgqcnb1gzslh8sg5pdkm"; - }; + sha256 = "0zs0cl6jl4rijcs6vv5k8k5pyf0zs52dlgqcnb1gzslh8sg5pdkm"; }; ovh = { - pname = "terraform-provider-ovh"; + owner = "terraform-providers"; + repo = "terraform-provider-ovh"; version = "0.1.0"; - src = { - owner = "terraform-providers"; - repo = "terraform-provider-ovh"; - rev = "v0.1.0"; - sha256 = "052bnfw146h9nh3cw77clwwxbmw1gvaich2yw39v4b1ca8brm5dr"; - }; + sha256 = "052bnfw146h9nh3cw77clwwxbmw1gvaich2yw39v4b1ca8brm5dr"; + }; + packet = + { + owner = "terraform-providers"; + repo = "terraform-provider-packet"; + version = "0.1.0"; + sha256 = "0dk10d4b10pdlhqgm6fqg0cn0ff78ss1x76inj6gfwrnbn2amhp0"; }; pagerduty = { - pname = "terraform-provider-pagerduty"; + owner = "terraform-providers"; + repo = "terraform-provider-pagerduty"; version = "0.1.2"; - src = { - owner = "terraform-providers"; - repo = "terraform-provider-pagerduty"; - rev = "v0.1.2"; - sha256 = "1dqzi53bnk4qcjhlimr13352nzb1nsij7354zapz2sgnz21v89mm"; - }; + sha256 = "1dqzi53bnk4qcjhlimr13352nzb1nsij7354zapz2sgnz21v89mm"; }; postgresql = { - pname = "terraform-provider-postgresql"; + owner = "terraform-providers"; + repo = "terraform-provider-postgresql"; version = "0.1.0"; - src = { - owner = "terraform-providers"; - repo = "terraform-provider-postgresql"; - rev = "v0.1.0"; - sha256 = "0gg48b2zn18ynvhnabvyfvw5wif0m1a852798wahv8fbv5d1vh7j"; - }; + sha256 = "0gg48b2zn18ynvhnabvyfvw5wif0m1a852798wahv8fbv5d1vh7j"; + }; + powerdns = + { + owner = "terraform-providers"; + repo = "terraform-provider-powerdns"; + version = "0.1.0"; + sha256 = "1k9xjx2smk6478dsrcnqk1k6r2pddpa9n8aghq5d1a5yhfsq5zzz"; }; profitbricks = { - pname = "terraform-provider-profitbricks"; + owner = "terraform-providers"; + repo = "terraform-provider-profitbricks"; version = "0.1.2"; - src = { - owner = "terraform-providers"; - repo = "terraform-provider-profitbricks"; - rev = "v0.1.2"; - sha256 = "105l0rijqmp7kmd7wygnhnj02q7y1rz0r8pj2mjzncb5pr48m3qp"; - }; + sha256 = "105l0rijqmp7kmd7wygnhnj02q7y1rz0r8pj2mjzncb5pr48m3qp"; + }; + rabbitmq = + { + owner = "terraform-providers"; + repo = "terraform-provider-rabbitmq"; + version = "0.1.0"; + sha256 = "0vn8456f2al1f6rs1gn157c86qz1fxz8sqphbr9lvdhy1jw1q2vp"; + }; + rancher = + { + owner = "terraform-providers"; + repo = "terraform-provider-rancher"; + version = "0.2.0"; + sha256 = "05aci6cjrs7rv6hqhvcqy1i0nr8azds8flnrc7vba0nyy6v192qg"; + }; + random = + { + owner = "terraform-providers"; + repo = "terraform-provider-random"; + version = "0.1.0"; + sha256 = "1lbv5yiw4qfsqm3gxf37gwadgp7g6ki0n70mj00d8l6v6jd0mdl5"; + }; + rundeck = + { + owner = "terraform-providers"; + repo = "terraform-provider-rundeck"; + version = "0.1.0"; + sha256 = "0rp8cgnp8in52g7zkl2lj42hns0g27m8f7l42lhfnv6n2vv5qxcg"; }; scaleway = { - pname = "terraform-provider-scaleway"; + owner = "terraform-providers"; + repo = "terraform-provider-scaleway"; version = "0.1.1"; - src = { - owner = "terraform-providers"; - repo = "terraform-provider-scaleway"; - rev = "v0.1.1"; - sha256 = "145wfcr5zjjk8vgx5xjf1hqh6h8jqxkhxbvv9x1w34i5bv809ch6"; - }; + sha256 = "145wfcr5zjjk8vgx5xjf1hqh6h8jqxkhxbvv9x1w34i5bv809ch6"; + }; + softlayer = + { + owner = "terraform-providers"; + repo = "terraform-provider-softlayer"; + version = "0.0.1"; + sha256 = "1xcg5zm2n1pc3l7ng94k589r7ykv6fxsmr5qn9xmmpdf912rdnfq"; + }; + spotinst = + { + owner = "terraform-providers"; + repo = "terraform-provider-spotinst"; + version = "0.1.0"; + sha256 = "04sxdbx6qjxixrv9shnp8fxkss6pylqmphlm1l4q5c83dwk96pka"; + }; + statuscake = + { + owner = "terraform-providers"; + repo = "terraform-provider-statuscake"; + version = "0.1.0"; + sha256 = "084520cak2krwpks2ipqcjfw3k4rrzn6gqqncz8c4i6g01f1m7yg"; + }; + template = + { + owner = "terraform-providers"; + repo = "terraform-provider-template"; + version = "0.1.1"; + sha256 = "1qrslnkvcj18jzxmsbf72gm54s8dnw5k5z15nffwgy09vv7mzpcn"; + }; + terraform = + { + owner = "terraform-providers"; + repo = "terraform-provider-terraform"; + version = "0.1.0"; + sha256 = "1w465853gwffpydb7idvg7bk8ygadgy08s04fxsqc8i2683jbpiz"; }; tls = { - pname = "terraform-provider-tls"; + owner = "terraform-providers"; + repo = "terraform-provider-tls"; version = "0.1.0"; - src = { - owner = "terraform-providers"; - repo = "terraform-provider-tls"; - rev = "v0.1.0"; - sha256 = "1n1k4dcqm8lp7mgj88xj8xc09mn769np4wg3cggnpcs6igbgdgg7"; - }; + sha256 = "1n1k4dcqm8lp7mgj88xj8xc09mn769np4wg3cggnpcs6igbgdgg7"; }; triton = { - pname = "terraform-provider-triton"; + owner = "terraform-providers"; + repo = "terraform-provider-triton"; version = "0.1.2"; - src = { - owner = "terraform-providers"; - repo = "terraform-provider-triton"; - rev = "v0.1.2"; - sha256 = "1jyrmc7932w7d8q96lmd0axf32psfic5d7hmwm1a25vzjzfn9nlw"; - }; + sha256 = "1jyrmc7932w7d8q96lmd0axf32psfic5d7hmwm1a25vzjzfn9nlw"; }; ultradns = { - pname = "terraform-provider-ultradns"; + owner = "terraform-providers"; + repo = "terraform-provider-ultradns"; version = "0.1.0"; - src = { - owner = "terraform-providers"; - repo = "terraform-provider-ultradns"; - rev = "v0.1.0"; - sha256 = "0bq2y6bxdax7qnmq6vxh8pz9sqy1r3m05dv7q5dbv2xvba1b88hj"; - }; + sha256 = "0bq2y6bxdax7qnmq6vxh8pz9sqy1r3m05dv7q5dbv2xvba1b88hj"; + }; + vault = + { + owner = "terraform-providers"; + repo = "terraform-provider-vault"; + version = "0.1.0"; + sha256 = "1rr4gaqfr6panjjdb5xx9vbq7701zjps0l75zi526kij1pph98p1"; + }; + vcd = + { + owner = "terraform-providers"; + repo = "terraform-provider-vcd"; + version = "1.0.0"; + sha256 = "0sjqdb37lalvizf4imxwn7nmry1c76dw2fpnrfmal34gghddm91p"; + }; + vsphere = + { + owner = "terraform-providers"; + repo = "terraform-provider-vsphere"; + version = "0.2.2"; + sha256 = "0d5d4wip57zmv9kqh4zr9mz8ylffa2qcf1vmx827rwyqdr25xvaz"; }; - # Broken with go/src/github.com/terraform-providers/terraform-provider-vsphere/vendor/github.com/hashicorp/terraform/config/testing.go:9: t.Helper undefined (type *testing.T has no field or method Helper) - # vsphere = - # { - # pname = "terraform-provider-vsphere"; - # version = "0.2.1"; - # src = { - # owner = "terraform-providers"; - # repo = "terraform-provider-vsphere"; - # rev = "v0.2.1"; - # sha256 = "04vz34w28nx7j6wlikgjabrb2l5fxj9icfm8d34w2fffz63nk77l"; - # }; - # }; } diff --git a/pkgs/applications/networking/cluster/terraform/providers/default.nix b/pkgs/applications/networking/cluster/terraform/providers/default.nix index df59439c7bf..8d41df24d8c 100644 --- a/pkgs/applications/networking/cluster/terraform/providers/default.nix +++ b/pkgs/applications/networking/cluster/terraform/providers/default.nix @@ -1,12 +1,21 @@ { stdenv, lib, buildGoPackage, fetchFromGitHub }: let list = import ./data.nix; - toDrv = _: data: + + toDrv = data: buildGoPackage rec { - inherit (data) pname version; - name = "${pname}-${version}"; - goPackagePath = "github.com/${data.src.owner}/${data.src.repo}"; - src = fetchFromGitHub data.src; + inherit (data) owner repo version sha256; + name = "${repo}-${version}"; + goPackagePath = "github.com/${owner}/${repo}"; + src = fetchFromGitHub { + inherit owner repo sha256; + rev = "v${version}"; + }; }; + + maybeDrv = name: data: + # vsphere is currently broken + if name == "vsphere" then null + else toDrv data; in - lib.mapAttrs toDrv list + lib.mapAttrs maybeDrv list diff --git a/pkgs/applications/networking/cluster/terraform/providers/template.nix b/pkgs/applications/networking/cluster/terraform/providers/template.nix deleted file mode 100644 index 16650af870b..00000000000 --- a/pkgs/applications/networking/cluster/terraform/providers/template.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: - -buildGoPackage rec { - pname = "terraform-provider-template"; - name = "${pname}-${version}"; - version = "0.1.1"; - - goPackagePath = "github.com/terraform-providers/terraform-provider-template"; - - src = fetchFromGitHub { - owner = "terraform-providers"; - repo = pname; - rev = "v${version}"; - sha256 = "1qrslnkvcj18jzxmsbf72gm54s8dnw5k5z15nffwgy09vv7mzpcn"; - }; -} \ No newline at end of file diff --git a/pkgs/applications/networking/cluster/terraform/providers/update-all b/pkgs/applications/networking/cluster/terraform/providers/update-all index 42c55a4c19d..d857e4f1870 100755 --- a/pkgs/applications/networking/cluster/terraform/providers/update-all +++ b/pkgs/applications/networking/cluster/terraform/providers/update-all @@ -10,18 +10,19 @@ set -euo pipefail GET() { local url=$1 echo "fetching $url" >&2 - curl -#fL "$url" + curl -#fL -u "$GITHUB_AUTH" "$url" } get_org_repos() { local org=$1 - GET "https://api.github.com/orgs/$org/repos" | jq -r '.[].name' + local page=1 + GET "https://api.github.com/orgs/$org/repos?per_page=100" | jq -r '.[].name' } get_repo_tags() { local owner=$1 local repo=$2 - GET "https://api.github.com/repos/$owner/$repo/git/refs/tags" | \ + GET "https://api.github.com/repos/$owner/$repo/git/refs/tags?per_page=100" | \ jq -r '.[].ref' | \ cut -d '/' -f 3- | \ sort --version-sort @@ -37,25 +38,37 @@ prefetch_github() { echo_entry() { local owner=$1 local repo=$2 - local rev=$3 - local sha256=$4 local version=${3:1} + local sha256=$4 cat <:` and run this script again. +HELP + exit 1 +fi + org=terraform-providers repos=$(get_org_repos "$org" | grep terraform-provider- | sort) @@ -63,9 +76,11 @@ repos=$(get_org_repos "$org" | grep terraform-provider- | sort) # Get all the providers with index -echo -n > data.nix +cat <
data.nix +# Generated with ./update-all +{ +HEADER -echo "{" >> data.nix for repo in $repos; do echo "*** $repo ***" name=$(echo "$repo" | cut -d - -f 3-) @@ -77,6 +92,9 @@ for repo in $repos; do echo_entry "$org" "$repo" "$last_tag" "$last_tag_sha256" | indent } >> data.nix done -echo "}" >> data.nix + +cat <