Unverified Commit 13ae56bd authored by Paul Meyer's avatar Paul Meyer Committed by GitHub
Browse files

etcd_3_5: unpin go compiler (#435055)

parents b8fffce3 ff0316ae

pkgs/servers/etcd/3_5/default.nix

+19 −9
Original line number Diff line number Diff line 
{

  lib,

  applyPatches,

  buildGoModule,

  fetchFromGitHub,

  symlinkJoin,

  nixosTests,

  fetchpatch,

  k3s,

  lib,

  nixosTests,

  symlinkJoin,

}:



let
@@ -14,13 +16,21 @@ let 
  etcdUtlVendorHash = "sha256-S2pje2fTDaZwf6jnyE2YXWcs/fgqF51nxCVfEwg0Gsw=";

  etcdCtlVendorHash = "sha256-lZ6o0oWUsc3WiCa87ynm7UAG6VxTf81a301QMSPOvW0=";



  src = applyPatches {

    src = fetchFromGitHub {

      owner = "etcd-io";

      repo = "etcd";

    rev = "v${version}";

      tag = "v${version}";

      hash = etcdSrcHash;

    };



    patches = [

      (fetchpatch {

        url = "https://github.com/etcd-io/etcd/commit/31650ab0c8df43af05fc4c13b48ffee59271eec7.patch";

        hash = "sha256-Q94HOLFx2fnb61wMQsAUT4sIBXfxXqW9YEayukQXX18=";

      })

    ];

  };

  env = {

    CGO_ENABLED = 0;

  };

pkgs/top-level/all-packages.nix

+1 −3
Original line number Diff line number Diff line
@@ -9926,9 +9926,7 @@ with pkgs; 


  etcd = etcd_3_5;

  etcd_3_4 = callPackage ../servers/etcd/3_4 { };

  etcd_3_5 = callPackage ../servers/etcd/3_5 {

    buildGoModule = buildGo123Module;

  };

  etcd_3_5 = callPackage ../servers/etcd/3_5 { };



  prosody = callPackage ../servers/xmpp/prosody {

    withExtraLibs = [ ];