Unverified Commit fe85b09c authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #213663 from wegank/darwin-hash-master 

darwin: update srcs
parents 863e3673 8c137ec9

pkgs/os-specific/darwin/DarwinTools/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -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 = [

pkgs/os-specific/darwin/xattr/default.nix

+10 −5
Original line number Diff line number Diff line 
{ 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; {

pkgs/tools/filesystems/hfsprogs/default.nix

+7 −4
Original line number Diff line number Diff line 
{ 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;

    })

  ];

pkgs/tools/system/pdisk/default.nix

+6 −4
Original line number Diff line number Diff line 
{ 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 = [