commit c1f3bc6a53e6d6e83b75721f279974939a9963fd · pyrox.dev/nixpkgs

+43 -3

pkgs/by-name/pu/pulumi/package.nix

···

       10
       10
        
         callPackage,

     

       11
       11
        
         testers,

     

       12
       12
        
         pulumi,

     

       13
       13
       +
         pulumiPackages,

     

       14
       14
       +
         python3Packages,

     

       15
       15
       +
         nix-update-script,

     

       16
       16
       +
         _experimental-update-script-combinators,

     

       13
       17
        
       }:

     

       14
       18
        
       buildGoModule rec {

     

       15
       19
        
         pname = "pulumi";

     

       16
       16
       -
         version = "3.156.0";

     

       20
       20
       +
         version = "3.162.0";

     

       17
       21
        
       

     

       18
       22
        
         src = fetchFromGitHub {

     

       19
       23
        
           owner = "pulumi";

     

       20
       24
        
           repo = "pulumi";

     

       21
       25
        
           tag = "v${version}";

     

       22
       22
       -
           hash = "sha256-1iML+WCEkLMdAJ7e+F5XwBzM+pn3eZQsCaSi3Ui/JdM=";

     

       26
       26
       +
           hash = "sha256-avtqURmj3PL82j89kLmVsBWqJJHnOFqR1huoUESt4L4=";

     

       23
       27
        
           # Some tests rely on checkout directory name

     

       24
       28
        
           name = "pulumi";

     

       25
       29
        
         };

     

       26
       30
        
       

     

       27
       27
       -
         vendorHash = "sha256-2hpn1IKJvWtXgNKgf56dZABA4VO1aT0cDsHOmCEPrGo=";

     

       31
       31
       +
         vendorHash = "sha256-fJFpwhbRkxSI2iQfNJ9qdL9oYM1SVVMJ30VIymoZBmg=";

     

       28
       32
        
       

     

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

     

       30
       34
        
       

     
···

       56
       60
        
           # Skip tests that fail in Nix sandbox.

     

       57
       61
        
           "-skip=^${

     

       58
       62
        
             lib.concatStringsSep "$|^" [

     

       63
       63
       +
               # Concurrent map modification in test case.

     

       64
       64
       +
               # TODO: remove after the fix is merged and released.

     

       65
       65
       +
               # https://github.com/pulumi/pulumi/pull/19200

     

       66
       66
       +
               "TestGetDocLinkForPulumiType"

     

       67
       67
       +
       

     

       59
       68
        
               # Seems to require TTY.

     

       60
       69
        
               "TestProgressEvents"

     

       61
       70
        
       

     
···

       68
       77
        
               "TestGenerateOnlyProjectCheck"

     

       69
       78
        
               "TestPulumiNewSetsTemplateTag"

     

       70
       79
        
               "TestPulumiPromptRuntimeOptions"

     

       80
       80
       +
               "TestPulumiNewOrgTemplate"

     

       81
       81
       +
               "TestPulumiNewWithOrgTemplates"

     

       82
       82
       +
               "TestPulumiNewWithoutPulumiAccessToken"

     

       83
       83
       +
               "TestPulumiNewWithoutTemplateSupport"

     

       71
       84
        
       

     

       72
       85
        
               # Connects to https://pulumi-testing.vault.azure.net/…

     

       73
       86
        
               "TestAzureCloudManager"

     
···

       117
       130
        
         passthru = {

     

       118
       131
        
           pkgs = callPackage ./plugins.nix { };

     

       119
       132
        
           withPackages = callPackage ./with-packages.nix { };

     

       133
       133
       +
           updateScript = _experimental-update-script-combinators.sequence [

     

       134
       134
       +
             (nix-update-script { })

     

       135
       135
       +
             (nix-update-script {

     

       136
       136
       +
               attrPath = "pulumiPackages.pulumi-go";

     

       137
       137
       +
               extraArgs = [ "--version=skip" ];

     

       138
       138
       +
             })

     

       139
       139
       +
             (nix-update-script {

     

       140
       140
       +
               attrPath = "pulumiPackages.pulumi-nodejs";

     

       141
       141
       +
               extraArgs = [ "--version=skip" ];

     

       142
       142
       +
             })

     

       143
       143
       +
             (nix-update-script {

     

       144
       144
       +
               attrPath = "pulumiPackages.pulumi-python";

     

       145
       145
       +
               extraArgs = [ "--version=skip" ];

     

       146
       146
       +
             })

     

       147
       147
       +
           ];

     

       120
       148
        
           tests = {

     

       121
       149
        
             version = testers.testVersion {

     

       122
       150
        
               package = pulumi;

     

       123
       151
        
               version = "v${version}";

     

       124
       152
        
               command = "PULUMI_SKIP_UPDATE_CHECK=1 pulumi version";

     

       125
       153
        
             };

     

       154
       154
       +
             # Test building packages that reuse our version and src.

     

       155
       155
       +
             inherit (pulumiPackages) pulumi-go pulumi-nodejs pulumi-python;

     

       156
       156
       +
             # Pulumi currently requires protobuf4, but Nixpkgs defaults to a newer

     

       157
       157
       +
             # version. Test that we can actually build the package with protobuf4.

     

       158
       158
       +
             # https://github.com/pulumi/pulumi/issues/16828

     

       159
       159
       +
             # https://github.com/NixOS/nixpkgs/issues/351751#issuecomment-2462163436

     

       160
       160
       +
             pythonPackage =

     

       161
       161
       +
               (python3Packages.overrideScope (

     

       162
       162
       +
                 final: _: {

     

       163
       163
       +
                   protobuf = final.protobuf4;

     

       164
       164
       +
                 }

     

       165
       165
       +
               )).pulumi;

     

       126
       166
        
             pulumiTestHookShellcheck = testers.shellcheck {

     

       127
       167
        
               name = "pulumi-test-hook-shellcheck";

     

       128
       168
        
               src = ./extra/pulumi-test-hook.sh;

+1 -1

pkgs/by-name/pu/pulumi/plugins/pulumi-go/package.nix

···

       9
       9
        
       

     

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

     

       11
       11
        
       

     

       12
       12
       -
         vendorHash = "sha256-MqqkDuCAHsxyzcofufMSzf1TpntnMy+sNHhBY5vr+TE=";

     

       12
       12
       +
         vendorHash = "sha256-3I9Kh3Zqpu0gT0pQNzg2mMwxQUdhEpjITZOrO7Yt50A=";

     

       13
       13
        
       

     

       14
       14
        
         ldflags = [

     

       15
       15
        
           "-s"

+1 -1

pkgs/by-name/pu/pulumi/plugins/pulumi-nodejs/package.nix

···

       12
       12
        
       

     

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

     

       14
       14
        
       

     

       15
       15
       -
         vendorHash = "sha256-Blhbjc9nNj2ZDKs6uO/IZ5RuFJJTkS2wJF/7Egc7VvA=";

     

       15
       15
       +
         vendorHash = "sha256-UvfSmHWRFRZkmcgzUrLkqktQAt8ZlVDEzP6y+pxUOGc=";

     

       16
       16
        
       

     

       17
       17
        
         ldflags = [

     

       18
       18
        
           "-s"

+1 -1

pkgs/by-name/pu/pulumi/plugins/pulumi-python/package.nix

···

       12
       12
        
       

     

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

     

       14
       14
        
       

     

       15
       15
       -
         vendorHash = "sha256-x3dWYM8/2cWWhTmfGEDdrGHntqIDObYwQicSHIXr1rw=";

     

       15
       15
       +
         vendorHash = "sha256-5tr3mQ5x6jMOa9meHK6gaoRjNgLoHkWiTiaYXXqmUDo=";

     

       16
       16
        
       

     

       17
       17
        
         ldflags = [

     

       18
       18
        
           "-s"

+2 -2

pkgs/development/python-modules/pulumi/default.nix

···

       70
       70
        
         # https://github.com/pulumi/pulumi/blob/0acaf8060640fdd892abccf1ce7435cd6aae69fe/sdk/python/scripts/test_fast.sh#L16

     

       71
       71
        
         installCheckPhase = ''

     

       72
       72
        
           runHook preInstallCheck

     

       73
       73
       -
           ${python.executable} -m pytest --ignore=lib/test/automation lib/test

     

       73
       73
       +
           ${python.executable} -m pytest --junit-xml= --ignore=lib/test/automation lib/test

     

       74
       74
        
           pushd lib/test_with_mocks

     

       75
       75
       -
           ${python.executable} -m pytest

     

       75
       75
       +
           ${python.executable} -m pytest --junit-xml=

     

       76
       76
        
           popd

     

       77
       77
        
           runHook postInstallCheck

     

       78
       78
        
         '';