From 3341300ca71af9f8242a5e9e08ebe4dffb3dd5fc Mon Sep 17 00:00:00 2001
From: OPNA2608 <christoph.neidahl@gmail.com>
Date: Wed, 11 Jan 2023 00:41:02 +0100
Subject: [PATCH 1/2] pdisk: Fix duplicated id parameter in patch URL

---
 pkgs/tools/system/pdisk/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/system/pdisk/default.nix b/pkgs/tools/system/pdisk/default.nix
index 87fc683063c7..e9c4d162dc8c 100644
--- a/pkgs/tools/system/pdisk/default.nix
+++ b/pkgs/tools/system/pdisk/default.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
     })
     # Replace removed sys_nerr and sys_errlist with strerror
     (fetchpatch {
-      url = "https://aur.archlinux.org/cgit/aur.git/plain/linux_strerror.patch?h=pdisk&id=&id=d0c930ea8bcac008bbd0ade1811133a625caea54";
+      url = "https://aur.archlinux.org/cgit/aur.git/plain/linux_strerror.patch?h=pdisk&id=d0c930ea8bcac008bbd0ade1811133a625caea54";
       sha256 = "sha256-HGJIS+vTn6456KtaETutIgTPPBm2C9OHf1anG8yaJPo=";
     })
   ];

From 991a22a7d0aa93784370407fb2657f20f52c6dd3 Mon Sep 17 00:00:00 2001
From: OPNA2608 <christoph.neidahl@gmail.com>
Date: Tue, 17 Jan 2023 12:10:41 +0100
Subject: [PATCH 2/2] licenses: Remove unnecessary archive.org link for
 APSL-1.0

SPDX has a copy of it, and the url gets overridden with the spdx.org one anyway.
---
 lib/licenses.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/licenses.nix b/lib/licenses.nix
index 52956e52afa6..6919859d6cb4 100644
--- a/lib/licenses.nix
+++ b/lib/licenses.nix
@@ -81,7 +81,6 @@ in mkLicense lset) ({
   apsl10 = {
     spdxId = "APSL-1.0";
     fullName = "Apple Public Source License 1.0";
-    url = "https://web.archive.org/web/20040701000000*/http://www.opensource.apple.com/apsl/1.0.txt";
   };
 
   apsl20 = {