From c1c9a14be7113c4e9422732fcd344eeed969b72d Mon Sep 17 00:00:00 2001 From: Olli Helenius Date: Mon, 9 Sep 2024 19:15:08 +0300 Subject: [PATCH 1/2] microsoft-identity-broker: use hash from upstream Packages file --- pkgs/by-name/mi/microsoft-identity-broker/update.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mi/microsoft-identity-broker/update.sh b/pkgs/by-name/mi/microsoft-identity-broker/update.sh index f91583a761df..ecd363cfc409 100755 --- a/pkgs/by-name/mi/microsoft-identity-broker/update.sh +++ b/pkgs/by-name/mi/microsoft-identity-broker/update.sh @@ -12,15 +12,19 @@ echo "$index_file" | while read -r line; do if [[ "$line" =~ ^Version:[[:space:]]*(.*) ]]; then Version="${BASH_REMATCH[1]}" fi + if [[ "$line" =~ ^SHA256:[[:space:]]*(.*) ]]; then + SHA256="${BASH_REMATCH[1]}" + fi if ! [[ "$line" ]] && [[ "${Package}" == "microsoft-identity-broker" ]]; then if ( dpkg --compare-versions ${Version} gt ${latest_version} ); then latest_version="${Version}" + sri_hash=$(nix-hash --to-sri --type sha256 "$SHA256") - echo $latest_version + echo $latest_version $sri_hash fi Package="" Version="" fi -done | tail -n 1 | (read version; update-source-version microsoft-identity-broker $version) +done | tail -n 1 | (read version hash; update-source-version microsoft-identity-broker $version $hash) From caee0feb9ffe39364d39c54cd9c07bf477b64bff Mon Sep 17 00:00:00 2001 From: Olli Helenius Date: Mon, 9 Sep 2024 19:15:30 +0300 Subject: [PATCH 2/2] microsoft-identity-broker: fix package hash --- pkgs/by-name/mi/microsoft-identity-broker/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/mi/microsoft-identity-broker/package.nix b/pkgs/by-name/mi/microsoft-identity-broker/package.nix index 2866d38da4cd..3d467d2155da 100644 --- a/pkgs/by-name/mi/microsoft-identity-broker/package.nix +++ b/pkgs/by-name/mi/microsoft-identity-broker/package.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://packages.microsoft.com/ubuntu/22.04/prod/pool/main/m/microsoft-identity-broker/microsoft-identity-broker_${version}_amd64.deb"; - hash = "sha256-O9zbImSWMrRsaOozj5PsCRvQ3UsaJzLfoTohmLZvLkM="; + hash = "sha256-I4Q6ucT6ps8/QGiQTNbMXcKxq6UMcuwJ0Prcqvov56M="; }; nativeBuildInputs = [ dpkg makeWrapper openjdk11 zip ];