From cadf53ea4da3161000a30ebf0ad56a46cac9b2a0 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Sun, 22 Sep 2024 20:42:48 -0500 Subject: [PATCH] deno: move to by-name --- pkgs/{development/web => by-name/de}/deno/librusty_v8.nix | 0 .../web/deno/default.nix => by-name/de/deno/package.nix} | 4 ++-- pkgs/{development/web => by-name/de}/deno/tests/basic.ts | 0 pkgs/{development/web => by-name/de}/deno/tests/default.nix | 0 .../web => by-name/de}/deno/tests/import-json/data.json | 0 .../web => by-name/de}/deno/tests/import-json/index.ts | 0 .../web => by-name/de}/deno/tests/import-ts/index.ts | 0 .../web => by-name/de}/deno/tests/import-ts/lib.ts | 0 .../web => by-name/de}/deno/tests/read-file/data.txt | 0 .../web => by-name/de}/deno/tests/read-file/index.ts | 0 pkgs/{development/web => by-name/de}/deno/update/common.ts | 0 .../web => by-name/de}/deno/update/librusty_v8.ts | 0 pkgs/{development/web => by-name/de}/deno/update/src.ts | 0 pkgs/{development/web => by-name/de}/deno/update/update.ts | 4 ++-- pkgs/top-level/all-packages.nix | 2 -- 15 files changed, 4 insertions(+), 6 deletions(-) rename pkgs/{development/web => by-name/de}/deno/librusty_v8.nix (100%) rename pkgs/{development/web/deno/default.nix => by-name/de/deno/package.nix} (98%) rename pkgs/{development/web => by-name/de}/deno/tests/basic.ts (100%) rename pkgs/{development/web => by-name/de}/deno/tests/default.nix (100%) rename pkgs/{development/web => by-name/de}/deno/tests/import-json/data.json (100%) rename pkgs/{development/web => by-name/de}/deno/tests/import-json/index.ts (100%) rename pkgs/{development/web => by-name/de}/deno/tests/import-ts/index.ts (100%) rename pkgs/{development/web => by-name/de}/deno/tests/import-ts/lib.ts (100%) rename pkgs/{development/web => by-name/de}/deno/tests/read-file/data.txt (100%) rename pkgs/{development/web => by-name/de}/deno/tests/read-file/index.ts (100%) rename pkgs/{development/web => by-name/de}/deno/update/common.ts (100%) rename pkgs/{development/web => by-name/de}/deno/update/librusty_v8.ts (100%) rename pkgs/{development/web => by-name/de}/deno/update/src.ts (100%) rename pkgs/{development/web => by-name/de}/deno/update/update.ts (93%) diff --git a/pkgs/development/web/deno/librusty_v8.nix b/pkgs/by-name/de/deno/librusty_v8.nix similarity index 100% rename from pkgs/development/web/deno/librusty_v8.nix rename to pkgs/by-name/de/deno/librusty_v8.nix diff --git a/pkgs/development/web/deno/default.nix b/pkgs/by-name/de/deno/package.nix similarity index 98% rename from pkgs/development/web/deno/default.nix rename to pkgs/by-name/de/deno/package.nix index 877a9955f72f..0c1ad4d4828f 100644 --- a/pkgs/development/web/deno/default.nix +++ b/pkgs/by-name/de/deno/package.nix @@ -17,8 +17,8 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "denoland"; - repo = pname; - rev = "v${version}"; + repo = "deno"; + rev = "refs/tags/v${version}"; hash = "sha256-6rmAgGX7BnhbyDk0Pmp1uLBDywlK4cptTOfuvNhm0KE="; }; diff --git a/pkgs/development/web/deno/tests/basic.ts b/pkgs/by-name/de/deno/tests/basic.ts similarity index 100% rename from pkgs/development/web/deno/tests/basic.ts rename to pkgs/by-name/de/deno/tests/basic.ts diff --git a/pkgs/development/web/deno/tests/default.nix b/pkgs/by-name/de/deno/tests/default.nix similarity index 100% rename from pkgs/development/web/deno/tests/default.nix rename to pkgs/by-name/de/deno/tests/default.nix diff --git a/pkgs/development/web/deno/tests/import-json/data.json b/pkgs/by-name/de/deno/tests/import-json/data.json similarity index 100% rename from pkgs/development/web/deno/tests/import-json/data.json rename to pkgs/by-name/de/deno/tests/import-json/data.json diff --git a/pkgs/development/web/deno/tests/import-json/index.ts b/pkgs/by-name/de/deno/tests/import-json/index.ts similarity index 100% rename from pkgs/development/web/deno/tests/import-json/index.ts rename to pkgs/by-name/de/deno/tests/import-json/index.ts diff --git a/pkgs/development/web/deno/tests/import-ts/index.ts b/pkgs/by-name/de/deno/tests/import-ts/index.ts similarity index 100% rename from pkgs/development/web/deno/tests/import-ts/index.ts rename to pkgs/by-name/de/deno/tests/import-ts/index.ts diff --git a/pkgs/development/web/deno/tests/import-ts/lib.ts b/pkgs/by-name/de/deno/tests/import-ts/lib.ts similarity index 100% rename from pkgs/development/web/deno/tests/import-ts/lib.ts rename to pkgs/by-name/de/deno/tests/import-ts/lib.ts diff --git a/pkgs/development/web/deno/tests/read-file/data.txt b/pkgs/by-name/de/deno/tests/read-file/data.txt similarity index 100% rename from pkgs/development/web/deno/tests/read-file/data.txt rename to pkgs/by-name/de/deno/tests/read-file/data.txt diff --git a/pkgs/development/web/deno/tests/read-file/index.ts b/pkgs/by-name/de/deno/tests/read-file/index.ts similarity index 100% rename from pkgs/development/web/deno/tests/read-file/index.ts rename to pkgs/by-name/de/deno/tests/read-file/index.ts diff --git a/pkgs/development/web/deno/update/common.ts b/pkgs/by-name/de/deno/update/common.ts similarity index 100% rename from pkgs/development/web/deno/update/common.ts rename to pkgs/by-name/de/deno/update/common.ts diff --git a/pkgs/development/web/deno/update/librusty_v8.ts b/pkgs/by-name/de/deno/update/librusty_v8.ts similarity index 100% rename from pkgs/development/web/deno/update/librusty_v8.ts rename to pkgs/by-name/de/deno/update/librusty_v8.ts diff --git a/pkgs/development/web/deno/update/src.ts b/pkgs/by-name/de/deno/update/src.ts similarity index 100% rename from pkgs/development/web/deno/update/src.ts rename to pkgs/by-name/de/deno/update/src.ts diff --git a/pkgs/development/web/deno/update/update.ts b/pkgs/by-name/de/deno/update/update.ts similarity index 93% rename from pkgs/development/web/deno/update/update.ts rename to pkgs/by-name/de/deno/update/update.ts index 27e1d86ee861..5a219307c45f 100755 --- a/pkgs/development/web/deno/update/update.ts +++ b/pkgs/by-name/de/deno/update/update.ts @@ -12,8 +12,8 @@ const nixpkgs = Deno.cwd(); // TODO: Read values from default.nix const owner = "denoland"; const repo = "deno"; -const denoDir = `${nixpkgs}/pkgs/development/web/${repo}`; -const src = `${denoDir}/default.nix`; +const denoDir = `${nixpkgs}/pkgs/by-name/de/${repo}`; +const src = `${denoDir}/package.nix`; const librusty_v8 = `${denoDir}/librusty_v8.nix`; const architectures: Architecture[] = [ { nix: "x86_64-linux", rust: "x86_64-unknown-linux-gnu" }, diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bca02a560764..9e0dffbeec0a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6902,8 +6902,6 @@ with pkgs; deer = callPackage ../shells/zsh/zsh-deer { }; - deno = callPackage ../development/web/deno { }; - deqp-runner = callPackage ../tools/graphics/deqp-runner { }; detox = callPackage ../tools/misc/detox { };