Unverified Commit 47cb1f60 authored by Peder Bergebakken Sundt's avatar Peder Bergebakken Sundt Committed by GitHub
Browse files

Merge pull request #278319 from yaxitech/pulumi-3.99.0 

pulumi: 3.93.0 -> 3.99.0
parents 72dcd7c0 b5654da7

pkgs/tools/admin/pulumi-packages/pulumi-language-go.nix

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ buildGoModule rec { 


  sourceRoot = "${src.name}/sdk/go/pulumi-language-go";



  vendorHash = "sha256-mBK9VEatuxeoZtXXOKdwj7wtZ/lo4Bi2h7N00zK6Hpw=";

  vendorHash = "sha256-eHsTEb4Vff2bfADScLSkZiotSSnT1q0bexlUMaWgqbg=";



  ldflags = [

    "-s"

pkgs/tools/admin/pulumi-packages/pulumi-language-nodejs.nix

+2 −2
Original line number Diff line number Diff line
@@ -3,13 +3,13 @@ 
, nodejs

}:

buildGoModule rec {

  inherit (pulumi) version src sdkVendorHash;

  inherit (pulumi) version src;



  pname = "pulumi-language-nodejs";



  sourceRoot = "${src.name}/sdk/nodejs/cmd/pulumi-language-nodejs";



  vendorHash = "sha256-gEOVtAyn7v8tsRU11NgrD3swMFFBxOTIjMWCqSSvHlI=";

  vendorHash = "sha256-L91qIud8dWx7dWWEcknKUSTJe+f4OBL8wBg6dKUWgkQ=";



  postPatch = ''

    # Gives github.com/pulumi/pulumi/pkg/v3: is replaced in go.mod, but not marked as replaced in vendor/modules.txt etc

pkgs/tools/admin/pulumi-packages/pulumi-language-python.nix

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ buildGoModule rec { 


  sourceRoot = "${src.name}/sdk/python/cmd/pulumi-language-python";



  vendorHash = "sha256-upRXs8Bo0dpnANNetfXqkatip9bA+Fqhg72Cd60ltz8=";

  vendorHash = "sha256-Q8nnYJJN5+W2luY8JQJj1X9KIk9ad511FBywr+0wBNg=";



  postPatch = ''

    substituteInPlace main_test.go \

pkgs/tools/admin/pulumi/default.nix

+13 −6
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
, buildGoModule

, coreutils

, fetchFromGitHub

, fetchpatch

, installShellFiles

, git

  # passthru
@@ -14,21 +15,27 @@ 


buildGoModule rec {

  pname = "pulumi";

  version = "3.93.0";



  # Used in pulumi-language packages, which inherit this prop

  sdkVendorHash = lib.fakeHash;

  version = "3.99.0";



  src = fetchFromGitHub {

    owner = pname;

    repo = pname;

    rev = "v${version}";

    hash = "sha256-EaYYIbV7IItnmVfyEHtaAbAXvrZ8CXMjW+yNXOBIxg8=";

    hash = "sha256-5KHptoQliqPtJ6J5u23ZgRZOdO77BJhZbdc3Cty9Myk=";

    # Some tests rely on checkout directory name

    name = "pulumi";

  };



  vendorHash = "sha256-G+LspC6b2TvboMU6rKB0qrhhMNaLPVt/nUYZzkiVr/Q=";

  vendorHash = "sha256-1UyYbmNNHlAeaW6M6AkaQ5Hs25ziHenSs4QjlnUQGjs=";



  patches = [

    # Fix a test failure, can be dropped in next release (3.100.0)

    (fetchpatch {

      url = "https://github.com/pulumi/pulumi/commit/6dba7192d134d3b6f7e26dee9205711ccc736fa7.patch";

      hash = "sha256-QRN6XnIR2rrqJ4UFYNt/YmIlokTSkGUvnBO/Q9UN8X8=";

      stripLen = 1;

    })

  ];



  sourceRoot = "${src.name}/pkg";