diff --git a/doc/languages-frameworks/javascript.section.md b/doc/languages-frameworks/javascript.section.md index 2b4df6f68457..3ec282ee737c 100644 --- a/doc/languages-frameworks/javascript.section.md +++ b/doc/languages-frameworks/javascript.section.md @@ -1066,12 +1066,12 @@ or [other methods](https://unix.stackexchange.com/questions/522822/different-met ##### example binary build {#javascript-buildDenoPackage-compile-to-binary-example} ```nix -{ buildDenoPackage, pkgs }: +{ buildDenoPackage, nix-gitignore }: buildDenoPackage { pname = "myPackage"; version = "0.1.0"; denoDepsHash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"; - src = pkgs.nix-gitignore.gitignoreSource [ ] ./.; + src = nix-gitignore.gitignoreSource [ ] ./.; binaryEntrypointPath = "main.ts"; } ``` @@ -1118,12 +1118,12 @@ Related options: ``` ```nix -{ buildDenoPackage, pkgs }: +{ buildDenoPackage, nix-gitignore }: buildDenoPackage { pname = "myPackage"; version = "0.1.0"; denoDepsHash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"; - src = pkgs.nix-gitignore.gitignoreSource [ ] ./.; + src = nix-gitignore.gitignoreSource [ ] ./.; denoTaskSuffix = ">out.txt"; installPhase = '' cp ./out.txt $out @@ -1161,13 +1161,13 @@ Related options: ##### example workspaces {#javascript-buildDenoPackage-workspaces-example} ```nix -{ buildDenoPackage, pkgs }: +{ buildDenoPackage, nix-gitignore }: rec { sub1 = buildDenoPackage { pname = "sub1"; version = "0.1.0"; denoDepsHash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA="; - src = pkgs.nix-gitignore.gitignoreSource [ ] ./.; + src = nix-gitignore.gitignoreSource [ ] ./.; denoWorkspacePath = "./sub1"; denoTaskFlags = [ "--text" diff --git a/pkgs/build-support/deno/build-deno-package/default.nix b/pkgs/build-support/deno/build-deno-package/default.nix index e64d7080dce4..358034bd735a 100644 --- a/pkgs/build-support/deno/build-deno-package/default.nix +++ b/pkgs/build-support/deno/build-deno-package/default.nix @@ -15,9 +15,9 @@ name ? "${args.pname}-${args.version}", src ? null, # The output hash of the dependencies for this project. - denoDepsHash ? "", + denoDepsHash ? lib.fakeHash, # The host platform, the output binary is compiled for. - hostPlatform ? builtins.currentSystem, + hostPlatform ? stdenvNoCC.hostPlatform.system, # A list of strings, which are names of impure env vars passed to the deps build. # Example: # `[ "NPM_TOKEN" ]` diff --git a/pkgs/build-support/deno/build-deno-package/hooks/default.nix b/pkgs/build-support/deno/build-deno-package/hooks/default.nix index e6044020e2f1..7ece1943a3cf 100644 --- a/pkgs/build-support/deno/build-deno-package/hooks/default.nix +++ b/pkgs/build-support/deno/build-deno-package/hooks/default.nix @@ -12,7 +12,7 @@ denoConfigHook = makeSetupHook { name = "deno-config-hook"; substitutions = { - denortBinary = lib.optionalString (binaryEntrypointPath != null) "${denort}/bin/denort"; + denortBinary = lib.optionalString (binaryEntrypointPath != null) (lib.getExe denort); }; } ./deno-config-hook.sh; diff --git a/pkgs/build-support/deno/fetch-deno-deps/default.nix b/pkgs/build-support/deno/fetch-deno-deps/default.nix index 9d4c43c0bb08..3b73781a43d2 100644 --- a/pkgs/build-support/deno/fetch-deno-deps/default.nix +++ b/pkgs/build-support/deno/fetch-deno-deps/default.nix @@ -11,7 +11,7 @@ { name ? "deno-deps", src, - hash, + hash ? lib.fakeHash, denoPackage ? deno, denoFlags ? [ ], denoInstallFlags ? [ diff --git a/pkgs/by-name/de/denort/package.nix b/pkgs/by-name/de/denort/package.nix index 3df1f602e882..45069e059d11 100644 --- a/pkgs/by-name/de/denort/package.nix +++ b/pkgs/by-name/de/denort/package.nix @@ -12,7 +12,7 @@ deno.overrideAttrs ( meta = with lib; { homepage = "https://deno.land/"; changelog = "https://github.com/denoland/deno/releases/tag/v${final.version}"; - description = "Slim version of the deno runtime, used bundled with deno projects into standalone binaries"; + description = "Slim version of the deno runtime, usually bundled with deno projects into standalone binaries"; license = licenses.mit; mainProgram = "denort"; maintainers = with maintainers; [ diff --git a/pkgs/test/build-deno-package/binaries/default.nix b/pkgs/test/build-deno-package/binaries/default.nix index d0f29f534f8d..3c2f9fbf364d 100644 --- a/pkgs/test/build-deno-package/binaries/default.nix +++ b/pkgs/test/build-deno-package/binaries/default.nix @@ -1,10 +1,10 @@ -{ pkgs, buildDenoPackage }: +{ nix-gitignore, buildDenoPackage }: { linux = buildDenoPackage rec { pname = "test-deno-build-binaries-${targetSystem}"; version = "0.1.0"; denoDepsHash = "sha256-oSCeCTujkOq3dRzQlMaKfcqishgAvI9+LYZx69PR48c="; - src = pkgs.nix-gitignore.gitignoreSource [ ] ./.; + src = nix-gitignore.gitignoreSource [ ] ./.; binaryEntrypointPath = "./main.ts"; targetSystem = "x86_64-linux"; }; @@ -17,7 +17,7 @@ # pname = "test-deno-build-binaries-${targetSystem}"; # version = "0.1.0"; # denoDepsHash = ""; - # src = pkgs.nix-gitignore.gitignoreSource [ ] ./.; + # src = nix-gitignore.gitignoreSource [ ] ./.; # binaryEntrypointPath = "./main.ts"; # denortPackage = macpkgs.denort; # inherit targetSystem; diff --git a/pkgs/test/build-deno-package/workspaces/default.nix b/pkgs/test/build-deno-package/workspaces/default.nix index 8c621cf09b31..64134c388886 100644 --- a/pkgs/test/build-deno-package/workspaces/default.nix +++ b/pkgs/test/build-deno-package/workspaces/default.nix @@ -1,10 +1,10 @@ -{ pkgs, buildDenoPackage }: +{ nix-gitignore, buildDenoPackage }: rec { sub1 = buildDenoPackage { pname = "test-deno-build-workspaces-sub1"; version = "0.1.0"; denoDepsHash = "sha256-Qvn3g+2NeWpNCfmfqXtPcJU4+LwrOSh1nq51xAbZZhk="; - src = pkgs.nix-gitignore.gitignoreSource [ ] ./.; + src = nix-gitignore.gitignoreSource [ ] ./.; denoWorkspacePath = "./sub1"; denoTaskFlags = [ "--text"