From c731a289ac786059df0592371577f57dbcb98ccb Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 27 Jul 2023 15:16:56 +0200 Subject: [PATCH 1/2] jenkins: 2.401.2 -> 2.401.3 https://www.jenkins.io/changelog-stable//#v2.401.3 --- .../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 174f2e0eae81..18ae7591a7c5 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.401.2"; + version = "2.401.3"; src = fetchurl { url = "https://get.jenkins.io/war-stable/${version}/jenkins.war"; - hash = "sha256-hr2OCytRB1yZsA1DYDwoWEQL8BHs0Imlx5HQyWTUBoI="; + hash = "sha256-p5igxUgaj/sDINkSH2z0ncV1w2kCjarhek3TmLaeAA0="; }; nativeBuildInputs = [ makeWrapper ]; From 1d64486ba73822f4186149bfabfa404f9789f89e Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 27 Jul 2023 15:18:11 +0200 Subject: [PATCH 2/2] nixos/tests/jenkins: fix deprecation warning --- nixos/tests/jenkins.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/tests/jenkins.nix b/nixos/tests/jenkins.nix index a1ede6dc917b..a8f621000654 100644 --- a/nixos/tests/jenkins.nix +++ b/nixos/tests/jenkins.nix @@ -73,8 +73,8 @@ import ./make-test-python.nix ({ pkgs, ...} : { testScript = { nodes, ... }: let - configWithoutJobs = "${nodes.master.config.system.build.toplevel}/specialisation/noJenkinsJobs"; - jenkinsPort = nodes.master.config.services.jenkins.port; + configWithoutJobs = "${nodes.master.system.build.toplevel}/specialisation/noJenkinsJobs"; + jenkinsPort = nodes.master.services.jenkins.port; jenkinsUrl = "http://localhost:${toString jenkinsPort}"; in '' start_all()