commit 7234275cd558b82e291d55e3ceed61840bcb8465 · pyrox.dev/nixpkgs

+7 -7

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

···

       67
       67
        
             };

     

       68
       68
        
       

     

       69
       69
        
             packages = mkOption {

     

       70
       70
       -
               default = [ pkgs.stdenv pkgs.jre config.programs.ssh.package pkgs.nix ];

     

       70
       70
       +
               default = [ pkgs.stdenv pkgs.jre pkgs.git config.programs.ssh.package pkgs.nix ];

     

       71
       71
        
               type = types.listOf types.package;

     

       72
       72
        
               description = ''

     

       73
       73
        
                 Packages to add to PATH for the Go.CD server's process.

     

       74
       74
        
               '';

     

       75
       75
        
             };

     

       76
       76
        
       

     

       77
       77
       -
             heapSize = mkOption {

     

       77
       77
       +
             initialJavaHeapSize = mkOption {

     

       78
       78
        
               default = "512m";

     

       79
       79
        
               type = types.str;

     

       80
       80
        
               description = ''

     

       81
       81
       -
                 Specifies the java heap memory size for the Go.CD server's java process.

     

       81
       81
       +
                 Specifies the initial java heap memory size for the Go.CD server's java process.

     

       82
       82
        
               '';

     

       83
       83
        
             };

     

       84
       84
        
       

     

       85
       85
       -
             maxMemory = mkOption {

     

       85
       85
       +
             maxJavaHeapMemory = mkOption {

     

       86
       86
        
               default = "1024m";

     

       87
       87
        
               type = types.str;

     

       88
       88
        
               description = ''

     

       89
       89
       -
                 Specifies the java maximum memory size for the Go.CD server's java process.

     

       89
       89
       +
                 Specifies the java maximum heap memory size for the Go.CD server's java process.

     

       90
       90
        
               '';

     

       91
       91
        
             };

     

       92
       92
        
       

     

       93
       93
        
             extraOptions = mkOption {

     

       94
       94
        
               default = [

     

       95
       95
       -
                 "-Xms${cfg.heapSize}"

     

       96
       96
       -
                 "-Xmx${cfg.maxMemory}"

     

       95
       95
       +
                 "-Xms${cfg.initialJavaHeapSize}"

     

       96
       96
       +
                 "-Xmx${cfg.maxJavaHeapMemory}"

     

       97
       97
        
                 "-Dcruise.listen.host=${cfg.listenAddress}"

     

       98
       98
        
                 "-Duser.language=en"

     

       99
       99
        
                 "-Djruby.rack.request.size.threshold.bytes=30000000"

+4 -4

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

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         name = "gocd-server-${version}-${rev}";

     

       5
       5
       -
         version = "16.5.0";

     

       6
       6
       -
         rev = "3305";

     

       5
       5
       +
         version = "16.6.0";

     

       6
       6
       +
         rev = "3590";

     

       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 = "41139051f419dc340a5c05c76e5de06eeef3516526341f377ac77532511bfa2c";

     

       10
       10
       +
           sha256 = "6e737c8b419544deb5089e9a2540892a6faec73c962ee7c4e526a799056acca1";

     

       11
       11
        
         };

     

       12
       12
        
       

     

       13
       13
        
         meta = with stdenv.lib; {

     
···

       15
       15
        
           homepage = http://www.go.cd;

     

       16
       16
        
           license = licenses.asl20;

     

       17
       17
        
           platforms = platforms.all;

     

       18
       18
       -
           maintainers = with maintainers; [ swarren83 ];

     

       18
       18
       +
           maintainers = with maintainers; [ grahamc swarren83 ];

     

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
        
         buildInputs = [ unzip ];