commit 4f54ef201d889572f86fad3ad571d7962ba1904d · pyrox.dev/nixpkgs

+5 -1

nixos/modules/services/continuous-integration/gocd-server/default.nix

···

       106
       106
        
                 "-Dcruise.config.file=${cfg.workDir}/conf/cruise-config.xml"

     

       107
       107
        
                 "-Dcruise.server.port=${toString cfg.port}"

     

       108
       108
        
                 "-Dcruise.server.ssl.port=${toString cfg.sslPort}"

     

       109
       109
       +
                 "--add-opens=java.base/java.lang=ALL-UNNAMED"

     

       110
       110
       +
                 "--add-opens=java.base/java.util=ALL-UNNAMED"

     

       109
       111
        
               ];

     

       110
       112
        
               defaultText = literalExpression ''

     

       111
       113
        
                 [

     
···

       119
       121
        
                   "-Dcruise.config.file=''${config.${opt.workDir}}/conf/cruise-config.xml"

     

       120
       122
        
                   "-Dcruise.server.port=''${toString config.${opt.port}}"

     

       121
       123
        
                   "-Dcruise.server.ssl.port=''${toString config.${opt.sslPort}}"

     

       124
       124
       +
                   "--add-opens=java.base/java.lang=ALL-UNNAMED"

     

       125
       125
       +
                   "--add-opens=java.base/java.util=ALL-UNNAMED"

     

       122
       126
        
                 ]

     

       123
       127
        
               '';

     

       124
       128
        
       

     
···

       199
       203
        
               ${pkgs.git}/bin/git config --global --add http.sslCAinfo /etc/ssl/certs/ca-certificates.crt

     

       200
       204
        
               ${pkgs.jre}/bin/java -server ${concatStringsSep " " cfg.startupOptions} \

     

       201
       205
        
                                      ${concatStringsSep " " cfg.extraOptions}  \

     

       202
       202
       -
                                     -jar ${pkgs.gocd-server}/go-server/go.jar

     

       206
       206
       +
                                     -jar ${pkgs.gocd-server}/go-server/lib/go.jar

     

       203
       207
        
             '';

     

       204
       208
        
       

     

       205
       209
        
             serviceConfig = {

+3 -3

pkgs/development/tools/continuous-integration/gocd-server/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "gocd-server";

     

       5
       5
       -
         version = "19.3.0";

     

       6
       6
       -
         rev = "8959";

     

       5
       5
       +
         version = "22.2.0";

     

       6
       6
       +
         rev = "14697";

     

       7
       7
        
       

     

       8
       8
        
         src = fetchurl {

     

       9
       9
        
           url = "https://download.go.cd/binaries/${version}-${rev}/generic/go-server-${version}-${rev}.zip";

     

       10
       10
       -
           sha256 = "0c30qzd6awlw0zx91rk6na0mmgykqkgrw9ychx18ivjwma0hr0sc";

     

       10
       10
       +
           sha256 = "sha256-OACNCQJQNrihTQ+thGdXKEFD0lC7qRNTX1I42flSUmE=";

     

       11
       11
        
         };

     

       12
       12
        
       

     

       13
       13
        
         meta = with lib; {