From 01bf568bdc1de0792adb322c8831861d9b9adef6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phan=20Kochen?= Date: Tue, 25 Jan 2022 22:22:38 +0100 Subject: [PATCH] Revert "feature: handle git dependencies" This reverts commit f957a934792abd1d3245f7683260b37c0fcdbae7. --- src/generate.ts | 1 - src/tmpl/yarn-project.nix.in | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/generate.ts b/src/generate.ts index b7ca5ae..6b93138 100644 --- a/src/generate.ts +++ b/src/generate.ts @@ -245,7 +245,6 @@ export default async (project: Project, cache: Cache, report: Report) => { `${isolatedProp} = optionalOverride (args.${overrideArg} or null) (mkIsolatedBuild { ${[ `pname = ${json(pkg.name)};`, `version = ${json(pkg.version)};`, - `reference = ${json(pkg.reference)};`, `locators = [\n${locators}];`, ].join(` `)} });` ); diff --git a/src/tmpl/yarn-project.nix.in b/src/tmpl/yarn-project.nix.in index 202860e..9841c85 100644 --- a/src/tmpl/yarn-project.nix.in +++ b/src/tmpl/yarn-project.nix.in @@ -1,7 +1,7 @@ # This file is generated by running "yarn install" inside your project. # Manual changes might be lost - proceed with caution! -{ lib, nodejs, stdenv, fetchurl, writeText, git, cacert }: +{ lib, nodejs, stdenv, fetchurl, writeText }: { src, overrideAttrs ? null, ... } @ args: let @@ -43,7 +43,7 @@ let in lib.mapAttrs (locator: { filename, sha512 }: stdenv.mkDerivation { inherit src builder locator; name = lib.strings.sanitizeDerivationName locator; - buildInputs = [ nodejs git cacert ]; + buildInputs = [ nodejs ]; outputFilename = filename; outputHashMode = "flat"; outputHashAlgo = "sha512"; @@ -64,7 +64,7 @@ let mkCacheBuilderForDrvs (pickCacheDrvs locators); # Create a derivation that builds a node-pre-gyp module in isolation. - mkIsolatedBuild = { pname, version, reference, locators }: stdenv.mkDerivation (drvCommon // { + mkIsolatedBuild = { pname, version, locators }: stdenv.mkDerivation (drvCommon // { inherit pname version; phases = [ "buildPhase" "installPhase" ]; @@ -74,7 +74,7 @@ let source ${mkCacheBuilderForLocators locators} popd > /dev/null - echo '{ "dependencies": { "${pname}": "${reference}" } }' > package.json + echo '{ "dependencies": { "${pname}": "${version}" } }' > package.json install -m 0600 ${lockfile} ./yarn.lock export yarn_global_folder="$TMP" export YARN_ENABLE_IMMUTABLE_INSTALLS=false