deno_1: drop; deno: fix on x86_64-darwin (#347974)

NixOS · Oct 16, 2024 · cd99542 · cd99542
2 parents 961e429 + b97ec51
commit cd99542
Show file tree

Hide file tree

Showing 13 changed files with 10 additions and 247 deletions.
diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md
@@ -216,7 +216,8 @@
 
 - `grafana` has been updated to version 11.1. This version doesn't support setting `http_addr` to a hostname anymore, an IP address is expected.
 
-- `deno` has been updated to v2 which has breaking changes. Upstream will be abandoning v1 soon but for now you can use `deno_1` if you are yet to migrate (will be removed prior to cutting a final 24.11 release).
+- `deno` has been updated to Deno 2, which has breaking changes.
+  See the [migration guide](https://docs.deno.com/runtime/reference/migration_guide/) for details.
 
 - `gogs` has been removed. Upstream development has stalled and it has several
   [critical vulnerabilities](https://github.com/gogs/gogs/issues/7777) that weren't addressed

diff --git a/pkgs/by-name/de/deno/1/librusty_v8.nix b/pkgs/by-name/de/deno/1/librusty_v8.nix
diff --git a/pkgs/by-name/de/deno/1/package.nix b/pkgs/by-name/de/deno/1/package.nix
diff --git a/pkgs/by-name/de/deno/1/tests/basic.ts b/pkgs/by-name/de/deno/1/tests/basic.ts
diff --git a/pkgs/by-name/de/deno/1/tests/default.nix b/pkgs/by-name/de/deno/1/tests/default.nix
diff --git a/pkgs/by-name/de/deno/1/tests/import-json/data.json b/pkgs/by-name/de/deno/1/tests/import-json/data.json
diff --git a/pkgs/by-name/de/deno/1/tests/import-json/index.ts b/pkgs/by-name/de/deno/1/tests/import-json/index.ts
diff --git a/pkgs/by-name/de/deno/1/tests/import-ts/index.ts b/pkgs/by-name/de/deno/1/tests/import-ts/index.ts
diff --git a/pkgs/by-name/de/deno/1/tests/import-ts/lib.ts b/pkgs/by-name/de/deno/1/tests/import-ts/lib.ts
diff --git a/pkgs/by-name/de/deno/1/tests/read-file/data.txt b/pkgs/by-name/de/deno/1/tests/read-file/data.txt
diff --git a/pkgs/by-name/de/deno/1/tests/read-file/index.ts b/pkgs/by-name/de/deno/1/tests/read-file/index.ts
diff --git a/pkgs/by-name/de/deno/package.nix b/pkgs/by-name/de/deno/package.nix
@@ -7,8 +7,8 @@
   cmake,
   protobuf,
   installShellFiles,
-  libiconv,
-  darwin,
+  apple-sdk_11,
+  darwinMinVersionHook,
   librusty_v8 ? callPackage ./librusty_v8.nix {
     inherit (callPackage ./fetchers.nix { }) fetchLibrustyV8;
   },
@@ -45,20 +45,12 @@ rustPlatform.buildRustPackage rec {
     protobuf
     installShellFiles
   ];
-  buildInputs = lib.optionals stdenv.isDarwin (
-    [
-      libiconv
-      darwin.libobjc
-    ]
-    ++ (with darwin.apple_sdk_11_0.frameworks; [
-      Security
-      CoreServices
-      Metal
-      MetalPerformanceShaders
-      Foundation
-      QuartzCore
-    ])
-  );
+
+  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
+    apple-sdk_11
+    # V8 supports 10.15+; binary references `aligned_alloc` directly
+    (darwinMinVersionHook "10.15")
+  ];
 
   buildAndTestSubdir = "cli";
 
@@ -116,8 +108,5 @@ rustPlatform.buildRustPackage rec {
       "x86_64-darwin"
       "aarch64-darwin"
     ];
-    # NOTE: `aligned_alloc` error on darwin SDK < 10.15. Can't do usual overrideSDK with rust toolchain in current implementation.
-    # Should be fixed with darwin SDK refactor and can be revisited.
-    badPlatforms = [ "x86_64-darwin" ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
@@ -6822,8 +6822,6 @@ with pkgs;
 
   deer = callPackage ../shells/zsh/zsh-deer { };
 
-  deno_1 = callPackage ../by-name/de/deno/1/package.nix { };
-
   deqp-runner = callPackage ../tools/graphics/deqp-runner { };
 
   detox = callPackage ../tools/misc/detox { };