Compare commits

..

10 Commits

Author SHA1 Message Date
Timothy J. Aveni 1578a4c627 Quote Nixify fetch locators 2026-06-18 21:16:24 -07:00
Stéphan Kochen d8b0702c85 Merge pull request #98 from stephank/dependabot/github_actions/actions/setup-node-4.2.0
Bump actions/setup-node from 4.1.0 to 4.2.0
2025-01-27 21:05:48 +01:00
dependabot[bot] d1c93b70d9 Bump actions/setup-node from 4.1.0 to 4.2.0
Bumps [actions/setup-node](https://github.com/actions/setup-node) from 4.1.0 to 4.2.0.
- [Release notes](https://github.com/actions/setup-node/releases)
- [Commits](https://github.com/actions/setup-node/compare/v4.1.0...v4.2.0)

---
updated-dependencies:
- dependency-name: actions/setup-node
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-01-27 06:25:24 +00:00
Stéphan Kochen bfef08cb4c Merge pull request #95 from stephank/fix-ci
Fix CI
2024-12-11 08:59:06 +01:00
Stéphan Kochen 0b3b015714 Fix CI 2024-12-11 08:48:25 +01:00
github-actions[bot] 7350cf767d Update dist 2024-12-11 07:45:20 +00:00
Stéphan Kochen c31da27bd8 Merge pull request #97 from the-sun-will-rise-tomorrow/mkdir-path
src/generate.ts: Create the nixExprPath directory if it doesn't exist
2024-12-11 08:44:56 +01:00
the-sun-will-rise-tomorrow fcf0869a69 src/generate.ts: Create the nixExprPath directory if it doesn't exist
This can happen in a multi-project workspace, where only some projects
use Nix; in this case, the directory with Nix-related files may not
exist in some build environments.
2024-12-10 13:03:40 +00:00
Stéphan Kochen 9faee2a1b0 Merge pull request #96 from stephank/dependabot/github_actions/actions/setup-node-4.1.0
Bump actions/setup-node from 4.0.4 to 4.1.0
2024-11-26 14:17:20 +01:00
dependabot[bot] 8a5b3b2f7c Bump actions/setup-node from 4.0.4 to 4.1.0
Bumps [actions/setup-node](https://github.com/actions/setup-node) from 4.0.4 to 4.1.0.
- [Release notes](https://github.com/actions/setup-node/releases)
- [Commits](https://github.com/actions/setup-node/compare/v4.0.4...v4.1.0)

---
updated-dependencies:
- dependency-name: actions/setup-node
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-11-26 06:28:57 +00:00
5 changed files with 8 additions and 5 deletions
+3 -2
View File
@@ -21,7 +21,7 @@ jobs:
uses: actions/checkout@v4 uses: actions/checkout@v4
- name: Setup Node.js - name: Setup Node.js
uses: actions/setup-node@v4.0.4 uses: actions/setup-node@v4.2.0
with: with:
node-version: 18.x node-version: 18.x
@@ -99,7 +99,8 @@ jobs:
src = ./.; src = ./.;
overrideSqlite3Attrs = old: { overrideSqlite3Attrs = old: {
npm_config_sqlite = "/"; # Don't accidentally use the wrong sqlite. 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 EOF
+2 -1
View File
@@ -23,7 +23,8 @@ pkgs.callPackage ./yarn-project.nix { } {
src = ./.; src = ./.;
overrideSqlite3Attrs = old: { overrideSqlite3Attrs = old: {
npm_config_sqlite = "/"; # Don't accidentally use the wrong sqlite. 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 ];
}; };
} }
``` ```
+1 -1
View File
File diff suppressed because one or more lines are too long
+1
View File
@@ -395,6 +395,7 @@ export default async (
USES_PNP_LINKER: configuration.get("nodeLinker") === "pnp", USES_PNP_LINKER: configuration.get("nodeLinker") === "pnp",
USES_NM_LINKER: configuration.get("nodeLinker") === "node-modules", USES_NM_LINKER: configuration.get("nodeLinker") === "node-modules",
}).replace(/\n\n\n+/g, "\n\n"); }).replace(/\n\n\n+/g, "\n\n");
await xfs.mkdirpPromise(ppath.dirname(nixExprPath));
await xfs.writeFilePromise(nixExprPath, projectExpr); await xfs.writeFilePromise(nixExprPath, projectExpr);
// Create a wrapper if it does not exist yet. // Create a wrapper if it does not exist yet.
+1 -1
View File
@@ -66,7 +66,7 @@ let
cd '${src}' cd '${src}'
${buildVars} ${buildVars}
HOME="$TMP" yarn_enable_global_cache=false yarn_cache_folder="$TMP" \ 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. # Because we change the cache dir, Yarn may generate a different name.
mv "$TMP/$(sed 's/-[^-]*\.[^-]*$//' <<< "$outputFilename")"-* $out mv "$TMP/$(sed 's/-[^-]*\.[^-]*$//' <<< "$outputFilename")"-* $out
''; '';