From 900ec4b03e527c9a204eff19ec4ff260c44774cb Mon Sep 17 00:00:00 2001 From: transcaffeine Date: Tue, 18 Feb 2025 16:57:35 +0100 Subject: [PATCH] matrix-appservice-slack: move matrix-sdk-crypto-nodejs@0.1.0-beta3 into subfolder --- .../matrix-sdk-crypto-nodejs-0_1_0-beta_3}/Cargo-beta.3.lock | 0 .../matrix-sdk-crypto-nodejs-0_1_0-beta_3/package.nix} | 0 .../remove-duplicate-dependency.patch | 0 pkgs/by-name/ma/matrix-appservice-slack/package.nix | 4 ++-- pkgs/top-level/all-packages.nix | 1 - 5 files changed, 2 insertions(+), 3 deletions(-) rename pkgs/{development/libraries/matrix-sdk-crypto-nodejs => by-name/ma/matrix-appservice-slack/matrix-sdk-crypto-nodejs-0_1_0-beta_3}/Cargo-beta.3.lock (100%) rename pkgs/{development/libraries/matrix-sdk-crypto-nodejs/beta3.nix => by-name/ma/matrix-appservice-slack/matrix-sdk-crypto-nodejs-0_1_0-beta_3/package.nix} (100%) rename pkgs/{development/libraries/matrix-sdk-crypto-nodejs => by-name/ma/matrix-appservice-slack/matrix-sdk-crypto-nodejs-0_1_0-beta_3}/remove-duplicate-dependency.patch (100%) diff --git a/pkgs/development/libraries/matrix-sdk-crypto-nodejs/Cargo-beta.3.lock b/pkgs/by-name/ma/matrix-appservice-slack/matrix-sdk-crypto-nodejs-0_1_0-beta_3/Cargo-beta.3.lock similarity index 100% rename from pkgs/development/libraries/matrix-sdk-crypto-nodejs/Cargo-beta.3.lock rename to pkgs/by-name/ma/matrix-appservice-slack/matrix-sdk-crypto-nodejs-0_1_0-beta_3/Cargo-beta.3.lock diff --git a/pkgs/development/libraries/matrix-sdk-crypto-nodejs/beta3.nix b/pkgs/by-name/ma/matrix-appservice-slack/matrix-sdk-crypto-nodejs-0_1_0-beta_3/package.nix similarity index 100% rename from pkgs/development/libraries/matrix-sdk-crypto-nodejs/beta3.nix rename to pkgs/by-name/ma/matrix-appservice-slack/matrix-sdk-crypto-nodejs-0_1_0-beta_3/package.nix diff --git a/pkgs/development/libraries/matrix-sdk-crypto-nodejs/remove-duplicate-dependency.patch b/pkgs/by-name/ma/matrix-appservice-slack/matrix-sdk-crypto-nodejs-0_1_0-beta_3/remove-duplicate-dependency.patch similarity index 100% rename from pkgs/development/libraries/matrix-sdk-crypto-nodejs/remove-duplicate-dependency.patch rename to pkgs/by-name/ma/matrix-appservice-slack/matrix-sdk-crypto-nodejs-0_1_0-beta_3/remove-duplicate-dependency.patch diff --git a/pkgs/by-name/ma/matrix-appservice-slack/package.nix b/pkgs/by-name/ma/matrix-appservice-slack/package.nix index c4f5f168e2e0..b37ebccbf2f2 100644 --- a/pkgs/by-name/ma/matrix-appservice-slack/package.nix +++ b/pkgs/by-name/ma/matrix-appservice-slack/package.nix @@ -3,15 +3,15 @@ fetchFromGitHub, fetchYarnDeps, makeWrapper, - matrix-sdk-crypto-nodejs-0_1_0-beta_3, mkYarnPackage, nodejs_18, + callPackage, }: let data = lib.importJSON ./pin.json; - matrix-sdk-crypto-nodejs = matrix-sdk-crypto-nodejs-0_1_0-beta_3; nodejs = nodejs_18; + matrix-sdk-crypto-nodejs = callPackage ./matrix-sdk-crypto-nodejs-0_1_0-beta_3/package.nix { }; in mkYarnPackage rec { inherit nodejs; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 278cc5f41844..af3d392a0330 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4156,7 +4156,6 @@ with pkgs; }; matrix-sdk-crypto-nodejs = callPackage ../development/libraries/matrix-sdk-crypto-nodejs { }; - matrix-sdk-crypto-nodejs-0_1_0-beta_3 = callPackage ../development/libraries/matrix-sdk-crypto-nodejs/beta3.nix { }; makemkv = libsForQt5.callPackage ../applications/video/makemkv { };