Unverified Commit b0572943 authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

Merge pull request #196060 from risicle/ris-gocd-22.2.0

parents 8361a446 2296727a

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

+5 −1
Original line number Diff line number Diff line
@@ -106,6 +106,8 @@ in { 
          "-Dcruise.config.file=${cfg.workDir}/conf/cruise-config.xml"

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

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

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

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

        ];

        defaultText = literalExpression ''

          [
@@ -119,6 +121,8 @@ in { 
            "-Dcruise.config.file=''${config.${opt.workDir}}/conf/cruise-config.xml"

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

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

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

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

          ]

        '';
@@ -199,7 +203,7 @@ in { 
        ${pkgs.git}/bin/git config --global --add http.sslCAinfo /etc/ssl/certs/ca-certificates.crt

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

                               ${concatStringsSep " " cfg.extraOptions}  \

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

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

      '';



      serviceConfig = {

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

+7 −3
Original line number Diff line number Diff line
@@ -2,18 +2,22 @@ 


stdenv.mkDerivation rec {

  pname = "gocd-agent";

  version = "19.3.0";

  rev = "8959";

  version = "22.2.0";

  rev = "14697";



  src = fetchurl {

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

    sha256 = "1nirdv82i8x4s1dyb0rmxldh8avappd4g3mbbl6xp7r7s0drcprp";

    sha256 = "sha256-0nEJ0cNotVohT+eYRXV/XP4WfGx3UnPDqCBgklAvsnk=";

  };

  meta = with lib; {

    description = "A continuous delivery server specializing in advanced workflow modeling and visualization";

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

    license = licenses.asl20;

    platforms = platforms.all;

    sourceProvenance = with sourceTypes; [

      binaryBytecode

      binaryNativeCode

    ];

    maintainers = with maintainers; [ grahamc swarren83 ];

  };

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

+17 −4
Original line number Diff line number Diff line 
{ lib, stdenv, fetchurl, unzip }:

{ lib

, stdenv

, fetchurl

, unzip

, nixosTests

}:



stdenv.mkDerivation rec {

  pname = "gocd-server";

  version = "19.3.0";

  rev = "8959";

  version = "22.2.0";

  rev = "14697";



  src = fetchurl {

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

    sha256 = "0c30qzd6awlw0zx91rk6na0mmgykqkgrw9ychx18ivjwma0hr0sc";

    sha256 = "sha256-OACNCQJQNrihTQ+thGdXKEFD0lC7qRNTX1I42flSUmE=";

  };



  meta = with lib; {
@@ -15,11 +20,19 @@ stdenv.mkDerivation rec { 
    homepage = "http://www.go.cd";

    license = licenses.asl20;

    platforms = platforms.all;

    sourceProvenance = with sourceTypes; [

      binaryBytecode

      binaryNativeCode

    ];

    maintainers = with maintainers; [ grahamc swarren83 ];

  };



  nativeBuildInputs = [ unzip ];



  passthru.tests = {

    inherit (nixosTests) gocd-server;

  };



  buildCommand = "

    unzip $src -d $out

    mv $out/go-server-${version} $out/go-server