movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-13 21:50:33 +03:00
Code Activity

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

Browse source
This commit is contained in:
Sandro 2022-10-27 01:07:34 +02:00 • committed by GitHub
commit b05729432a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 29 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -106,6 +106,8 @@ in {
"-Dcruise.config.file=${cfg.workDir}/conf/cruise-config.xml" "-Dcruise.config.file=${cfg.workDir}/conf/cruise-config.xml"
"-Dcruise.server.port=${toString cfg.port}" "-Dcruise.server.port=${toString cfg.port}"
"-Dcruise.server.ssl.port=${toString cfg.sslPort}" "-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 '' defaultText = literalExpression ''
[ [
@ -119,6 +121,8 @@ in {
"-Dcruise.config.file=''${config.${opt.workDir}}/conf/cruise-config.xml" "-Dcruise.config.file=''${config.${opt.workDir}}/conf/cruise-config.xml"
"-Dcruise.server.port=''${toString config.${opt.port}}" "-Dcruise.server.port=''${toString config.${opt.port}}"
"-Dcruise.server.ssl.port=''${toString config.${opt.sslPort}}" "-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.git}/bin/git config --global --add http.sslCAinfo /etc/ssl/certs/ca-certificates.crt
${pkgs.jre}/bin/java -server ${concatStringsSep " " cfg.startupOptions} \ ${pkgs.jre}/bin/java -server ${concatStringsSep " " cfg.startupOptions} \
${concatStringsSep " " cfg.extraOptions} \ ${concatStringsSep " " cfg.extraOptions} \
-jar ${pkgs.gocd-server}/go-server/go.jar -jar ${pkgs.gocd-server}/go-server/lib/go.jar
''; '';
serviceConfig = { serviceConfig = {

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

@ -2,18 +2,22 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "gocd-agent"; pname = "gocd-agent";
version = "19.3.0"; version = "22.2.0";
rev = "8959"; rev = "14697";
src = fetchurl { src = fetchurl {
url = "https://download.go.cd/binaries/${version}-${rev}/generic/go-agent-${version}-${rev}.zip"; url = "https://download.go.cd/binaries/${version}-${rev}/generic/go-agent-${version}-${rev}.zip";
sha256 = "1nirdv82i8x4s1dyb0rmxldh8avappd4g3mbbl6xp7r7s0drcprp"; sha256 = "sha256-0nEJ0cNotVohT+eYRXV/XP4WfGx3UnPDqCBgklAvsnk=";
}; };
meta = with lib; { meta = with lib; {
description = "A continuous delivery server specializing in advanced workflow modeling and visualization"; description = "A continuous delivery server specializing in advanced workflow modeling and visualization";
homepage = "http://www.go.cd"; homepage = "http://www.go.cd";
license = licenses.asl20; license = licenses.asl20;
platforms = platforms.all; platforms = platforms.all;
sourceProvenance = with sourceTypes; [
binaryBytecode
binaryNativeCode
];
maintainers = with maintainers; [ grahamc swarren83 ]; maintainers = with maintainers; [ grahamc swarren83 ];
}; };

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

@ -1,13 +1,18 @@
{ lib, stdenv, fetchurl, unzip }: { lib
, stdenv
, fetchurl
, unzip
, nixosTests
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "gocd-server"; pname = "gocd-server";
version = "19.3.0"; version = "22.2.0";
rev = "8959"; rev = "14697";
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 = "0c30qzd6awlw0zx91rk6na0mmgykqkgrw9ychx18ivjwma0hr0sc"; sha256 = "sha256-OACNCQJQNrihTQ+thGdXKEFD0lC7qRNTX1I42flSUmE=";
}; };
meta = with lib; { meta = with lib; {
@ -15,11 +20,19 @@ 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;
sourceProvenance = with sourceTypes; [
binaryBytecode
binaryNativeCode
];
maintainers = with maintainers; [ grahamc swarren83 ]; maintainers = with maintainers; [ grahamc swarren83 ];
}; };
nativeBuildInputs = [ unzip ]; nativeBuildInputs = [ unzip ];
passthru.tests = {
inherit (nixosTests) gocd-server;
};
buildCommand = " buildCommand = "
unzip $src -d $out unzip $src -d $out
mv $out/go-server-${version} $out/go-server mv $out/go-server-${version} $out/go-server