From 0dccb35d37da4b523c4aad337d484c5017ce37fd Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Mon, 30 Jan 2023 23:25:37 +0100
Subject: [PATCH 1/4] darwin.DarwinTools: update src
---
pkgs/os-specific/darwin/DarwinTools/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/os-specific/darwin/DarwinTools/default.nix b/pkgs/os-specific/darwin/DarwinTools/default.nix
index f648435eed27..72a375028453 100644
--- a/pkgs/os-specific/darwin/DarwinTools/default.nix
+++ b/pkgs/os-specific/darwin/DarwinTools/default.nix
@@ -5,8 +5,8 @@ stdenv.mkDerivation rec {
version = "1";
src = fetchurl {
- url = "https://opensource.apple.com/tarballs/DarwinTools/DarwinTools-${version}.tar.gz";
- sha256 = "0hh4jl590jv3v830p77r3jcrnpndy7p2b8ajai3ldpnx2913jfhp";
+ url = "https://web.archive.org/web/20180408044816/https://opensource.apple.com/tarballs/DarwinTools/DarwinTools-${version}.tar.gz";
+ hash = "sha256-Fzo5QhLd3kZHVFKhJe7xzV6bmRz5nAsG2mNLkAqVBEI=";
};
patches = [
From 7ff8fc22486c5f77618d34bbeefd845b1f2c2354 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Mon, 30 Jan 2023 23:25:44 +0100
Subject: [PATCH 2/4] darwin.xattr: update src
---
pkgs/os-specific/darwin/xattr/default.nix | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/pkgs/os-specific/darwin/xattr/default.nix b/pkgs/os-specific/darwin/xattr/default.nix
index a1e3c4914879..7fe0f84606ce 100644
--- a/pkgs/os-specific/darwin/xattr/default.nix
+++ b/pkgs/os-specific/darwin/xattr/default.nix
@@ -1,6 +1,6 @@
{ lib
, stdenv
-, fetchzip
+, fetchFromGitHub
, buildPythonPackage
, python
, ed
@@ -11,9 +11,11 @@ buildPythonPackage rec {
pname = "xattr";
version = "61.60.1";
- src = fetchzip rec {
- url = "https://opensource.apple.com/tarballs/python_modules/python_modules-${version}.tar.gz";
- sha256 = "19kydl7w4vpdi7zmfd5z9vjkq24jfk2cv4j0pppw69j06czhdwwi";
+ src = fetchFromGitHub {
+ owner = "apple-oss-distributions";
+ repo = "python_modules";
+ rev = "python_modules-${version}";
+ hash = "sha256-kfMGPzNAJsPvvUCSzcR0kgg85U6/NFf/ie1uwg9tfqY=";
};
sourceRoot = "${src.name}/Modules/xattr-0.6.4";
@@ -61,7 +63,10 @@ buildPythonPackage rec {
'';
makeWrapperArgs = [
- "--prefix" "PYTHONPATH" ":" "${placeholder "python"}/${python.sitePackages}"
+ "--prefix"
+ "PYTHONPATH"
+ ":"
+ "${placeholder "python"}/${python.sitePackages}"
];
meta = with lib; {
From 85d978e8e2a280e94b6cb27915568b51a8b3a8bc Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Mon, 30 Jan 2023 23:30:04 +0100
Subject: [PATCH 3/4] hfsprogs: update src
---
pkgs/tools/filesystems/hfsprogs/default.nix | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/pkgs/tools/filesystems/hfsprogs/default.nix b/pkgs/tools/filesystems/hfsprogs/default.nix
index 877d95c5b3d9..cb3cbe5d7f28 100644
--- a/pkgs/tools/filesystems/hfsprogs/default.nix
+++ b/pkgs/tools/filesystems/hfsprogs/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, openssl, libbsd }:
+{ lib, stdenv, fetchurl, fetchFromGitHub, openssl, libbsd }:
stdenv.mkDerivation rec {
version = "332.25";
@@ -8,9 +8,12 @@ stdenv.mkDerivation rec {
url = "http://ftp.de.debian.org/debian/pool/main/h/hfsprogs/hfsprogs_${version}-11.debian.tar.gz";
sha256 = "62d9b8599c66ebffbc57ce5d776e20b41341130d9b27341d63bda08460ebde7c";
})
- (fetchurl {
- url = "https://opensource.apple.com/tarballs/diskdev_cmds/diskdev_cmds-${version}.tar.gz";
- sha256 = "74c9aeca899ed7f4bf155c65fc45bf0f250c0f6d57360ea953b1d536d9aa45e6";
+ (fetchFromGitHub {
+ owner = "apple-oss-distributions";
+ repo = "diskdev_cmds";
+ rev = "diskdev_cmds-${version}";
+ hash = "sha256-cycPGPx2Gbjn4FKGKuQKJkh+dWGbJfy6C+LTz8rrs0A=";
+ name = sourceRoot;
})
];
From 8c137ec9e899a08b6ee37e03424231bf1fd93a4a Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Mon, 30 Jan 2023 23:30:07 +0100
Subject: [PATCH 4/4] pdisk: update src
---
pkgs/tools/system/pdisk/default.nix | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/pkgs/tools/system/pdisk/default.nix b/pkgs/tools/system/pdisk/default.nix
index 87fc683063c7..e0a78b6b9409 100644
--- a/pkgs/tools/system/pdisk/default.nix
+++ b/pkgs/tools/system/pdisk/default.nix
@@ -1,6 +1,6 @@
{ stdenv
, lib
-, fetchzip
+, fetchFromGitHub
, fetchpatch
, installShellFiles
, libbsd
@@ -12,9 +12,11 @@ stdenv.mkDerivation rec {
pname = "pdisk";
version = "0.9";
- src = fetchzip {
- url = "https://opensource.apple.com/tarballs/pdisk/pdisk-${lib.versions.minor version}.tar.gz";
- sha256 = "sha256-+gBgnk/1juEHE0nXaz7laUaH7sxrX5SzsLGr0PHsdHs=";
+ src = fetchFromGitHub {
+ owner = "apple-oss-distributions";
+ repo = pname;
+ rev = "${pname}-${lib.versions.minor version}";
+ hash = "sha256-+gBgnk/1juEHE0nXaz7laUaH7sxrX5SzsLGr0PHsdHs=";
};
patches = [