From 90b23c45d0059c30bb8e6aec87fd4437f6c6bf4d Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 14 Sep 2023 09:17:26 +0000 Subject: [PATCH 1/2] pkgsMusl.connman: fix hash for patch The hash was changed despite the patch not changing at all. Switch back to the hash we had before, but in SRI format. Fixes: 774c20b68467 ("connman: 1.41 -> 1.42") --- pkgs/tools/networking/connman/connman/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/networking/connman/connman/default.nix b/pkgs/tools/networking/connman/connman/default.nix index abb6edc741e4..385ff434e7c1 100644 --- a/pkgs/tools/networking/connman/connman/default.nix +++ b/pkgs/tools/networking/connman/connman/default.nix @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { # Fix Musl build by avoiding a Glibc-only API. (fetchpatch { url = "https://git.alpinelinux.org/aports/plain/community/connman/libresolv.patch?id=e393ea84386878cbde3cccadd36a30396e357d1e"; - hash = "sha256-7Q1bp8rD/gGVYUqnIXqjr9vypR8jlC926p3KYWl9kLw="; + hash = "sha256-gzQUkUEunqTuSE78K0Ujvre/rx1KP1igQKy3e2i14s0="; }) ]; From 2ed69f9ec8a497b05ec51e93bdfea13ad7dfb238 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 14 Sep 2023 18:33:26 +0000 Subject: [PATCH 2/2] pkgsMusl.connman: use fetchurl for patch This patch is a static file, so we don't need all the complex machinery of fetchpatch. --- pkgs/tools/networking/connman/connman/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/connman/connman/default.nix b/pkgs/tools/networking/connman/connman/default.nix index 385ff434e7c1..47c6af698771 100644 --- a/pkgs/tools/networking/connman/connman/default.nix +++ b/pkgs/tools/networking/connman/connman/default.nix @@ -71,9 +71,9 @@ stdenv.mkDerivation rec { ./create-libppp-compat.h.patch ] ++ optionals stdenv.hostPlatform.isMusl [ # Fix Musl build by avoiding a Glibc-only API. - (fetchpatch { + (fetchurl { url = "https://git.alpinelinux.org/aports/plain/community/connman/libresolv.patch?id=e393ea84386878cbde3cccadd36a30396e357d1e"; - hash = "sha256-gzQUkUEunqTuSE78K0Ujvre/rx1KP1igQKy3e2i14s0="; + hash = "sha256-7Q1bp8rD/gGVYUqnIXqjr9vypR8jlC926p3KYWl9kLw="; }) ];