public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bump gocd-server version to 16.6.0-3590 (#17304)

Browse Source 
Update gocd-server package version to 16.6.0-3590 including new sha.  Modify heapSize
and maxMemory mkOption to accurately reflect their intended purpose of configuring
initial java heap sizes.
This commit is contained in:
Shawn Warren 2016-07-27 11:44:28 -05:00 committed by Rok Garbas
parent 14e8071921
commit 7234275cd5
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -67,33 +67,33 @@ in {
}; };
packages = mkOption { packages = mkOption {
default = [ pkgs.stdenv pkgs.jre config.programs.ssh.package pkgs.nix ]; default = [ pkgs.stdenv pkgs.jre pkgs.git config.programs.ssh.package pkgs.nix ];
type = types.listOf types.package; type = types.listOf types.package;
description = '' description = ''
Packages to add to PATH for the Go.CD server's process. Packages to add to PATH for the Go.CD server's process.
''; '';
}; };
heapSize = mkOption { initialJavaHeapSize = mkOption {
default = "512m"; default = "512m";
type = types.str; type = types.str;
description = '' description = ''
Specifies the java heap memory size for the Go.CD server's java process. Specifies the initial java heap memory size for the Go.CD server's java process.
''; '';
}; };
maxMemory = mkOption { maxJavaHeapMemory = mkOption {
default = "1024m"; default = "1024m";
type = types.str; type = types.str;
description = '' description = ''
Specifies the java maximum memory size for the Go.CD server's java process. Specifies the java maximum heap memory size for the Go.CD server's java process.
''; '';
}; };
extraOptions = mkOption { extraOptions = mkOption {
default = [ default = [
"-Xms${cfg.heapSize}" "-Xms${cfg.initialJavaHeapSize}"
"-Xmx${cfg.maxMemory}" "-Xmx${cfg.maxJavaHeapMemory}"
"-Dcruise.listen.host=${cfg.listenAddress}" "-Dcruise.listen.host=${cfg.listenAddress}"
"-Duser.language=en" "-Duser.language=en"
"-Djruby.rack.request.size.threshold.bytes=30000000" "-Djruby.rack.request.size.threshold.bytes=30000000"

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

@ -2,12 +2,12 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gocd-server-${version}-${rev}"; name = "gocd-server-${version}-${rev}";
version = "16.5.0"; version = "16.6.0";
rev = "3305"; rev = "3590";
src = fetchurl { src = fetchurl {
url = "https://download.go.cd/binaries/${version}-${rev}/generic/go-server-${version}-${rev}.zip"; url = "https://download.go.cd/binaries/${version}-${rev}/generic/go-server-${version}-${rev}.zip";
sha256 = "41139051f419dc340a5c05c76e5de06eeef3516526341f377ac77532511bfa2c"; sha256 = "6e737c8b419544deb5089e9a2540892a6faec73c962ee7c4e526a799056acca1";
}; };
meta = with stdenv.lib; { meta = with stdenv.lib; {
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
homepage = http://www.go.cd; homepage = http://www.go.cd;
license = licenses.asl20; license = licenses.asl20;
platforms = platforms.all; platforms = platforms.all;
maintainers = with maintainers; [ swarren83 ]; maintainers = with maintainers; [ grahamc swarren83 ];
}; };
buildInputs = [ unzip ]; buildInputs = [ unzip ];