From 6ec23d9f3e1815fdc9dea2ebc1be45174001b690 Mon Sep 17 00:00:00 2001 From: Sumner Evans Date: Wed, 1 Sep 2021 08:15:53 -0600 Subject: [PATCH 1/8] matrix-synapse: 1.41.1 -> 1.42.0 (cherry picked from commit 8c6e887e750ed2c184e6018a8c3504124a09b1b3) --- pkgs/servers/matrix-synapse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index c60abd94546..bc789dac977 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -24,11 +24,11 @@ let in with py.pkgs; buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.41.1"; + version = "1.42.0"; src = fetchPypi { inherit pname version; - sha256 = "1vaym6mxnwg2xdqjcigi2sb0kkdi0ly5d5ghakfsysxcfn08d1z8"; + sha256 = "sha256-wJFjjm9apRqjk5eN/kIEgecHgm/XLbtwXHEpM2pmvO8="; }; patches = [ From 4b14b10ffbb924e462fb46349281eb49b9961553 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 3 Jun 2021 05:26:14 +0000 Subject: [PATCH 2/8] jenkins: 2.277.4 -> 2.289.1 (cherry picked from commit 14a6aedeeacac931e2ab96395de82831298f3188) --- .../tools/continuous-integration/jenkins/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix index 67074d43543..415b22894cb 100644 --- a/pkgs/development/tools/continuous-integration/jenkins/default.nix +++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "jenkins"; - version = "2.277.4"; + version = "2.289.1"; src = fetchurl { url = "http://mirrors.jenkins.io/war-stable/${version}/jenkins.war"; - sha256 = "19z72d0rkxpvl03aqz102in9ln08r9831lj3ymsgmglk8c37ici6"; + sha256 = "1wkm1y2bj245b9i51vhns9qfxc6xm44hg60vhgmswndcy5pwrybh"; }; buildCommand = '' From 2cf1fe5491ce3397e7cd3ff38770452adad14d6c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 30 Jun 2021 21:35:06 +0000 Subject: [PATCH 3/8] jenkins: 2.289.1 -> 2.289.2 (cherry picked from commit ad67354d1dc761892afa1b94542cd15621bd1ccf) --- .../tools/continuous-integration/jenkins/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix index 415b22894cb..a128db527df 100644 --- a/pkgs/development/tools/continuous-integration/jenkins/default.nix +++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "jenkins"; - version = "2.289.1"; + version = "2.289.2"; src = fetchurl { url = "http://mirrors.jenkins.io/war-stable/${version}/jenkins.war"; - sha256 = "1wkm1y2bj245b9i51vhns9qfxc6xm44hg60vhgmswndcy5pwrybh"; + sha256 = "0413ymfrb00ifxl8ww8nn8y4k07jhgsaxaw2h0qnfh9s6yxifpbf"; }; buildCommand = '' From 49ce5095590c0008694e0c8d5a0f03ad8c04201b Mon Sep 17 00:00:00 2001 From: Pamplemousse Date: Wed, 5 May 2021 13:52:52 -0700 Subject: [PATCH 4/8] jenkins: Create the `jenkins-cli` command Signed-off-by: Pamplemousse (cherry picked from commit 6f6c649ec606d6ec5bd5874002fda6efb568e9ec) --- .../continuous-integration/jenkins/default.nix | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix index a128db527df..88156f815ab 100644 --- a/pkgs/development/tools/continuous-integration/jenkins/default.nix +++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix @@ -1,5 +1,5 @@ -{ lib, stdenv, fetchurl, common-updater-scripts, coreutils, git, gnused, nix -, nixfmt, writeScript, nixosTests, jq, cacert, curl }: +{ lib, stdenv, fetchurl, common-updater-scripts, coreutils, git, gnused, makeWrapper, nix +, nixfmt, openjdk, writeScript, nixosTests, jq, cacert, curl }: stdenv.mkDerivation rec { pname = "jenkins"; @@ -10,9 +10,19 @@ stdenv.mkDerivation rec { sha256 = "0413ymfrb00ifxl8ww8nn8y4k07jhgsaxaw2h0qnfh9s6yxifpbf"; }; + nativeBuildInputs = [ makeWrapper ]; + buildCommand = '' - mkdir -p "$out/webapps" + mkdir -p "$out/bin" "$out/share" "$out/webapps" + cp "$src" "$out/webapps/jenkins.war" + + # Create the `jenkins-cli` command. + ${openjdk}/bin/jar -xf "$src" WEB-INF/lib/cli-${version}.jar \ + && mv WEB-INF/lib/cli-${version}.jar "$out/share/jenkins-cli.jar" + + makeWrapper "${openjdk}/bin/java" "$out/bin/jenkins-cli" \ + --add-flags "-jar $out/share/jenkins-cli.jar" ''; passthru = { From 3b60f6b0fdcdc04c9887fb2fbc03be6ac1e1cb7d Mon Sep 17 00:00:00 2001 From: Pamplemousse Date: Wed, 5 May 2021 14:21:24 -0700 Subject: [PATCH 5/8] nixos/modules/jenkins: Add option to add CLI Signed-off-by: Pamplemousse (cherry picked from commit 4265efef54bd5e2fe6d7dff3241d69ef3e86b161) --- .../jenkins/default.nix | 31 ++++++++++++++++--- 1 file changed, 26 insertions(+), 5 deletions(-) diff --git a/nixos/modules/services/continuous-integration/jenkins/default.nix b/nixos/modules/services/continuous-integration/jenkins/default.nix index cdc3b4b5c58..889688a2685 100644 --- a/nixos/modules/services/continuous-integration/jenkins/default.nix +++ b/nixos/modules/services/continuous-integration/jenkins/default.nix @@ -2,6 +2,7 @@ with lib; let cfg = config.services.jenkins; + jenkinsUrl = "http://${cfg.listenAddress}:${toString cfg.port}${cfg.prefix}"; in { options = { services.jenkins = { @@ -141,14 +142,34 @@ in { Additional command line arguments to pass to the Java run time (as opposed to Jenkins). ''; }; + + withCLI = mkOption { + type = types.bool; + default = false; + description = '' + Whether to make the CLI available. + + More info about the CLI available at + + https://www.jenkins.io/doc/book/managing/cli . + ''; + }; }; }; config = mkIf cfg.enable { - # server references the dejavu fonts - environment.systemPackages = [ - pkgs.dejavu_fonts - ]; + environment = { + # server references the dejavu fonts + systemPackages = [ + pkgs.dejavu_fonts + ] ++ optional cfg.withCLI cfg.package; + + variables = {} + // optionalAttrs cfg.withCLI { + # Make it more convenient to use the `jenkins-cli`. + JENKINS_URL = jenkinsUrl; + }; + }; users.groups = optionalAttrs (cfg.group == "jenkins") { jenkins.gid = config.ids.gids.jenkins; @@ -215,7 +236,7 @@ in { ''; postStart = '' - until [[ $(${pkgs.curl.bin}/bin/curl -L -s --head -w '\n%{http_code}' http://${cfg.listenAddress}:${toString cfg.port}${cfg.prefix} | tail -n1) =~ ^(200|403)$ ]]; do + until [[ $(${pkgs.curl.bin}/bin/curl -L -s --head -w '\n%{http_code}' ${jenkinsUrl} | tail -n1) =~ ^(200|403)$ ]]; do sleep 1 done ''; From 30048c7078643620652a24f7ca2251ef98ca2811 Mon Sep 17 00:00:00 2001 From: Pamplemousse Date: Sun, 4 Jul 2021 14:49:39 -0700 Subject: [PATCH 6/8] nixos/modules/jenkins: Test the CLI Signed-off-by: Pamplemousse (cherry picked from commit 4f093b8fdb3e6b7102ad99089712beca2ae49abb) --- nixos/tests/jenkins-cli.nix | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 nixos/tests/jenkins-cli.nix diff --git a/nixos/tests/jenkins-cli.nix b/nixos/tests/jenkins-cli.nix new file mode 100644 index 00000000000..f25e1604da3 --- /dev/null +++ b/nixos/tests/jenkins-cli.nix @@ -0,0 +1,30 @@ +import ./make-test-python.nix ({ pkgs, ...} : rec { + name = "jenkins-cli"; + meta = with pkgs.lib.maintainers; { + maintainers = [ pamplemousse ]; + }; + + nodes = { + machine = + { ... }: + { + services.jenkins = { + enable = true; + withCLI = true; + }; + }; + }; + + testScript = '' + start_all() + + machine.wait_for_unit("jenkins") + + assert "JENKINS_URL" in machine.succeed("env") + assert "http://0.0.0.0:8080" in machine.succeed("echo $JENKINS_URL") + + machine.succeed( + "jenkins-cli -auth admin:$(cat /var/lib/jenkins/secrets/initialAdminPassword)" + ) + ''; +}) From 9778fa8f6855b971d5af0e5a813f637002def665 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 28 Jul 2021 23:21:29 +0000 Subject: [PATCH 7/8] jenkins: 2.289.2 -> 2.289.3 (cherry picked from commit 7bc3dafc445c303c28b364aedeca5f130cde4159) --- .../tools/continuous-integration/jenkins/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix index 88156f815ab..4af5738d91b 100644 --- a/pkgs/development/tools/continuous-integration/jenkins/default.nix +++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix @@ -1,13 +1,14 @@ -{ lib, stdenv, fetchurl, common-updater-scripts, coreutils, git, gnused, makeWrapper, nix -, nixfmt, openjdk, writeScript, nixosTests, jq, cacert, curl }: +{ lib, stdenv, fetchurl, common-updater-scripts, coreutils, git, gnused +, makeWrapper, nix, nixfmt, openjdk, writeScript, nixosTests, jq, cacert, curl +}: stdenv.mkDerivation rec { pname = "jenkins"; - version = "2.289.2"; + version = "2.289.3"; src = fetchurl { url = "http://mirrors.jenkins.io/war-stable/${version}/jenkins.war"; - sha256 = "0413ymfrb00ifxl8ww8nn8y4k07jhgsaxaw2h0qnfh9s6yxifpbf"; + sha256 = "11wb4kqy1hja2fgnqsr6p0khdyvinclprxz9z5m58czrsllzsvcr"; }; nativeBuildInputs = [ makeWrapper ]; From b5c0ce5bef110c66d4cff87289c1b462ea7031ec Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 30 Aug 2021 11:50:30 +0000 Subject: [PATCH 8/8] =?UTF-8?q?jenkins:=202.289.3=20=E2=86=92=202.303.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 1342c4648b6f04064882daacdfc6a5650d406700) --- .../tools/continuous-integration/jenkins/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix index 4af5738d91b..a7d9aeda000 100644 --- a/pkgs/development/tools/continuous-integration/jenkins/default.nix +++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "jenkins"; - version = "2.289.3"; + version = "2.303.1"; src = fetchurl { url = "http://mirrors.jenkins.io/war-stable/${version}/jenkins.war"; - sha256 = "11wb4kqy1hja2fgnqsr6p0khdyvinclprxz9z5m58czrsllzsvcr"; + sha256 = "0rf06axz1hxssg942w2g66avak30jy6rfdwxynhriqv3vrf17bja"; }; nativeBuildInputs = [ makeWrapper ];