From ff13fe9f6cec2893ea7812a07541759262fe3282 Mon Sep 17 00:00:00 2001 From: Ryota Kameoka Date: Sun, 5 Feb 2023 16:40:51 +0900 Subject: [PATCH 1/2] maintainers: add @ryota-ka --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 82916749f9a4..8d67750bc814 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -12842,6 +12842,12 @@ githubId = 3280280; name = "Ryne Everett"; }; + ryota-ka = { + email = "ok@ryota-ka.me"; + github = "ryota-ka"; + githubId = 7309170; + name = "Ryota Kameoka"; + }; rytone = { email = "max@ryt.one"; github = "rastertail"; From 26248c58506ff638b771f618269c4676aa6fe613 Mon Sep 17 00:00:00 2001 From: Ryota Kameoka Date: Sun, 5 Feb 2023 16:41:17 +0900 Subject: [PATCH 2/2] yarn-berry: init at 3.4.1 --- pkgs/development/tools/yarn-berry/default.nix | 43 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 45 insertions(+) create mode 100644 pkgs/development/tools/yarn-berry/default.nix diff --git a/pkgs/development/tools/yarn-berry/default.nix b/pkgs/development/tools/yarn-berry/default.nix new file mode 100644 index 000000000000..b8181e812fc2 --- /dev/null +++ b/pkgs/development/tools/yarn-berry/default.nix @@ -0,0 +1,43 @@ +{ fetchFromGitHub, lib, nodejs, stdenv, yarn }: + +stdenv.mkDerivation rec { + name = "yarn-berry"; + version = "3.4.1"; + + src = fetchFromGitHub { + owner = "yarnpkg"; + repo = "berry"; + rev = "@yarnpkg/cli/${version}"; + hash = "sha256-eBBB/F+mnGi93Qf23xgt306/ogoV76RXOM90O14u5Tw="; + }; + + buildInputs = [ + nodejs + ]; + + nativeBuildInputs = [ + yarn + ]; + + dontConfigure = true; + + buildPhase = '' + runHook preBuild + yarn workspace @yarnpkg/cli build:cli + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + install -Dm 755 ./packages/yarnpkg-cli/bundles/yarn.js "$out/bin/yarn" + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://yarnpkg.com/"; + description = "Fast, reliable, and secure dependency management."; + license = licenses.bsd2; + maintainers = with maintainers; [ ryota-ka ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 29b02a714f17..a4195dab3237 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13592,6 +13592,8 @@ with pkgs; yarn = callPackage ../development/tools/yarn { }; + yarn-berry = callPackage ../development/tools/yarn-berry { }; + yarn2nix-moretea = callPackage ../development/tools/yarn2nix-moretea/yarn2nix { pkgs = pkgs.__splicedPackages; }; inherit (yarn2nix-moretea)