From 43c7420fbdcfae3699b09657e5e43573d03c68b3 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Tue, 21 Mar 2023 11:22:18 +0100 Subject: [PATCH 1/2] jenkins: 2.375.3 -> 2.387.1 https://www.jenkins.io/changelog-stable//#v2.387.1 --- .../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 98aff1787616..ebf4376d4aac 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.375.3"; + version = "2.387.1"; src = fetchurl { url = "https://get.jenkins.io/war-stable/${version}/jenkins.war"; - hash = "sha256-1WBl8eXEMj/sNqlqv3cQskUeNLxPudoXnn3xKaTMwaw="; + hash = "sha256-wTKh4AtoWvx5luulML5CijJ5xkk5lBf5+jj8vA2+wCc="; }; nativeBuildInputs = [ makeWrapper ]; From 90f4daba7e15a207b383bdb369d99fea34f8dff0 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Tue, 21 Mar 2023 11:22:48 +0100 Subject: [PATCH 2/2] jenkins: fix passthru.updateScript --- .../tools/continuous-integration/jenkins/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix index ebf4376d4aac..34f0b58f4b41 100644 --- a/pkgs/development/tools/continuous-integration/jenkins/default.nix +++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix @@ -51,11 +51,10 @@ stdenv.mkDerivation rec { version="$(jq -r .version <<<$core_json)" sha256="$(jq -r .sha256 <<<$core_json)" - hash="$(nix-hash --type sha256 --to-base32 "$sha256")" - url="$(jq -r .url <<<$core_json)" + hash="$(nix hash to-sri --type sha256 "$sha256")" if [ ! "$oldVersion" = "$version" ]; then - update-source-version jenkins "$version" "$hash" "$url" + update-source-version jenkins "$version" "$hash" nixpkgs="$(git rev-parse --show-toplevel)" default_nix="$nixpkgs/pkgs/development/tools/continuous-integration/jenkins/default.nix" nixfmt "$default_nix"