Unverified Commit a7b55309 authored by Pol Dellaiera's avatar Pol Dellaiera Committed by GitHub
Browse files

Merge pull request #334383 from dotlambda/yarn 

nodePackages.yarn: drop
parents 629a4897 87d6cc69

pkgs/applications/misc/tandoor-recipes/frontend.nix

+2 −2
Original line number Diff line number Diff line 
{ stdenv, fetchYarnDeps, fixup-yarn-lock, callPackage, nodejs }:

{ stdenv, fetchYarnDeps, fixup-yarn-lock, callPackage, nodejs, yarn }:

let

  common = callPackage ./common.nix { };

in
@@ -16,7 +16,7 @@ stdenv.mkDerivation { 
  nativeBuildInputs = [

    fixup-yarn-lock

    nodejs

    nodejs.pkgs.yarn

    yarn

  ];



  configurePhase = ''

pkgs/by-name/me/mealie/mealie-frontend.nix

+2 −2
Original line number Diff line number Diff line 
src: version:

{ lib, fetchYarnDeps, nodejs_18, fixup-yarn-lock, stdenv }: stdenv.mkDerivation {

{ lib, fetchYarnDeps, nodejs_18, fixup-yarn-lock, stdenv, yarn }: stdenv.mkDerivation {

  name = "mealie-frontend";

  inherit version;

  src = "${src}/frontend";
@@ -12,7 +12,7 @@ src: version: 
  nativeBuildInputs = [

    fixup-yarn-lock

    nodejs_18

    nodejs_18.pkgs.yarn

    (yarn.override { nodejs = nodejs_18; })

  ];



  configurePhase = ''

pkgs/development/node-packages/aliases.nix

+1 −0
Original line number Diff line number Diff line
@@ -191,6 +191,7 @@ mapAliases { 
  inherit (pkgs) wrangler; # added 2024-07-01

  inherit (pkgs) write-good; # added 2023-08-20

  inherit (pkgs) yaml-language-server; # added 2023-09-05

  inherit (pkgs) yarn; # added 2024-08-13

  inherit (pkgs) yo; # added 2023-08-20

  zx = pkgs.zx; # added 2023-08-01

}

pkgs/development/node-packages/node-packages.json

+0 −1
Original line number Diff line number Diff line
@@ -256,5 +256,4 @@ 
, "wring"

, "@yaegassy/coc-nginx"

, "yalc"

, "yarn"

]

pkgs/development/node-packages/node-packages.nix

+0 −18
Original line number Diff line number Diff line
@@ -89266,22 +89266,4 @@ in 
    bypassCache = true;

    reconstructLock = true;

  };

  yarn = nodeEnv.buildNodePackage {

    name = "yarn";

    packageName = "yarn";

    version = "1.22.22";

    src = fetchurl {

      url = "https://registry.npmjs.org/yarn/-/yarn-1.22.22.tgz";

      sha512 = "prL3kGtyG7o9Z9Sv8IPfBNrWTDmXB4Qbes8A9rEzt6wkJV8mUvoirjU0Mp3GGAU06Y0XQyA3/2/RQFVuK7MTfg==";

    };

    buildInputs = globalBuildInputs;

    meta = {

      description = "📦🐈 Fast, reliable, and secure dependency management.";

      homepage = "https://github.com/yarnpkg/yarn#readme";

      license = "BSD-2-Clause";

    };

    production = true;

    bypassCache = true;

    reconstructLock = true;

  };

}