diff --git a/flake.lock b/flake.lock index c78a5c7..5e668ca 100644 --- a/flake.lock +++ b/flake.lock @@ -50,16 +50,15 @@ }, "nixpkgs": { "locked": { - "lastModified": 1650109093, - "narHash": "sha256-tqlnKrAdJktRLXTou9le0oTqrYBAFpGscV5RADdpArU=", + "lastModified": 1659782844, + "narHash": "sha256-tM/qhHFE61puBxh9ebP3BIG1fkRAT4rHqD3jCM0HXGY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "faad370edcb37162401be50d45526f52bb16a713", + "rev": "c85e56bb060291eac3fb3c75d4e0e64f6836fcfe", "type": "github" }, "original": { "id": "nixpkgs", - "ref": "nixpkgs-unstable", "type": "indirect" } }, @@ -92,13 +91,13 @@ "snapshot-header": { "flake": false, "locked": { - "narHash": "sha256-Y/DTtpnT8JQZO5Ijr+tW0IrIOuECcJ+ZvFLCgwrFt2M=", + "narHash": "sha256-/2aR6n5CbUobwbxkrGqBOAhCZLwDdIsoIOcpALhAUF8=", "type": "tarball", - "url": "https://opensource.apple.com/tarballs/xnu/xnu-6153.141.1.tar.gz" + "url": "https://github.com/apple/darwin-xnu/archive/refs/tags/xnu-6153.141.1.tar.gz" }, "original": { "type": "tarball", - "url": "https://opensource.apple.com/tarballs/xnu/xnu-6153.141.1.tar.gz" + "url": "https://github.com/apple/darwin-xnu/archive/refs/tags/xnu-6153.141.1.tar.gz" } } }, diff --git a/flake.nix b/flake.nix index bbbb524..a3f4df2 100644 --- a/flake.nix +++ b/flake.nix @@ -14,21 +14,20 @@ flake = false; }; snapshot-header = { - url = "https://opensource.apple.com/tarballs/xnu/xnu-6153.141.1.tar.gz"; + url = "https://github.com/apple/darwin-xnu/archive/refs/tags/xnu-6153.141.1.tar.gz"; flake = false; }; snap-util = { url = "github:ahl/apfs"; flake = false; }; - nixpkgs.url = "flake:nixpkgs/nixpkgs-unstable"; }; outputs = { self, nixpkgs, acextract, command-line, dsc-extractor, snapshot-header, snap-util }: { packages.x86_64-darwin = { acextract = with import nixpkgs { system = "x86_64-darwin"; }; let xcode = makeSetupHook { - deps = [ (xcodeenv.composeXcodeWrapper { version = "13.4"; }) ]; + deps = [ (xcodeenv.composeXcodeWrapper { version = "14.1"; }) ]; } "${xcbuildHook}/nix-support/setup-hook"; in stdenv.mkDerivation { name = "acextract-${lib.substring 0 8 self.inputs.acextract.lastModifiedDate}"; @@ -89,7 +88,7 @@ stdenv.mkDerivation { name = "snap-util-${lib.substring 0 8 self.inputs.snap-util.lastModifiedDate}"; src = snap-util; - nativeBuildInputs = [ (xcodeenv.composeXcodeWrapper { version = "13.4"; }) ]; + nativeBuildInputs = [ (xcodeenv.composeXcodeWrapper { version = "14.1"; }) ]; preBuild = "NIX_CFLAGS_COMPILE='-idirafter ${snapshot-header}/bsd'"; installPhase = '' mkdir -p $out/bin