Compare commits
11 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 4528fdd20b | |||
| 1578a4c627 | |||
| d8b0702c85 | |||
| d1c93b70d9 | |||
| bfef08cb4c | |||
| 0b3b015714 | |||
| 7350cf767d | |||
| c31da27bd8 | |||
| fcf0869a69 | |||
| 9faee2a1b0 | |||
| 8a5b3b2f7c |
@@ -21,7 +21,7 @@ jobs:
|
||||
uses: actions/checkout@v4
|
||||
|
||||
- name: Setup Node.js
|
||||
uses: actions/setup-node@v4.0.4
|
||||
uses: actions/setup-node@v4.2.0
|
||||
with:
|
||||
node-version: 18.x
|
||||
|
||||
@@ -99,7 +99,8 @@ jobs:
|
||||
src = ./.;
|
||||
overrideSqlite3Attrs = old: {
|
||||
npm_config_sqlite = "/"; # Don't accidentally use the wrong sqlite.
|
||||
buildInputs = old.buildInputs ++ (with pkgs; [ python3 sqlite ]);
|
||||
nativeBuildInputs = [ pkgs.python311 ];
|
||||
buildInputs = old.buildInputs ++ [ pkgs.sqlite ];
|
||||
};
|
||||
}
|
||||
EOF
|
||||
|
||||
+2
-1
@@ -23,7 +23,8 @@ pkgs.callPackage ./yarn-project.nix { } {
|
||||
src = ./.;
|
||||
overrideSqlite3Attrs = old: {
|
||||
npm_config_sqlite = "/"; # Don't accidentally use the wrong sqlite.
|
||||
buildInputs = old.buildInputs ++ (with pkgs; [ python3 sqlite ]);
|
||||
nativeBuildInputs = [ pkgs.python311 ];
|
||||
buildInputs = old.buildInputs ++ [ pkgs.sqlite ];
|
||||
};
|
||||
}
|
||||
```
|
||||
|
||||
Vendored
+1
-1
File diff suppressed because one or more lines are too long
@@ -395,6 +395,7 @@ export default async (
|
||||
USES_PNP_LINKER: configuration.get("nodeLinker") === "pnp",
|
||||
USES_NM_LINKER: configuration.get("nodeLinker") === "node-modules",
|
||||
}).replace(/\n\n\n+/g, "\n\n");
|
||||
await xfs.mkdirpPromise(ppath.dirname(nixExprPath));
|
||||
await xfs.writeFilePromise(nixExprPath, projectExpr);
|
||||
|
||||
// Create a wrapper if it does not exist yet.
|
||||
|
||||
@@ -36,8 +36,6 @@ let
|
||||
export CI=1
|
||||
# Tell node-pre-gyp to never fetch binaries / always build from source.
|
||||
export npm_config_build_from_source=true
|
||||
# Disable Nixify plugin to save on some unnecessary processing.
|
||||
export yarn_enable_nixify=false
|
||||
'';
|
||||
|
||||
#@@ IF COMBINED_DRV
|
||||
@@ -66,7 +64,7 @@ let
|
||||
cd '${src}'
|
||||
${buildVars}
|
||||
HOME="$TMP" yarn_enable_global_cache=false yarn_cache_folder="$TMP" \
|
||||
yarn nixify fetch ${locator}
|
||||
yarn nixify fetch ${lib.escapeShellArg locator}
|
||||
# Because we change the cache dir, Yarn may generate a different name.
|
||||
mv "$TMP/$(sed 's/-[^-]*\.[^-]*$//' <<< "$outputFilename")"-* $out
|
||||
'';
|
||||
|
||||
Reference in New Issue
Block a user