Skip to content

Commit

Permalink
fixup! fixup! fixup! wip
Browse files Browse the repository at this point in the history
  • Loading branch information
urbas committed Mar 22, 2024
1 parent b4f6bed commit dd950cf
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 37 deletions.
33 changes: 1 addition & 32 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,8 @@
description = "A reimplementation or nix in Rust.";

inputs.nixpkgs.url = "nixpkgs/nixpkgs-unstable";
inputs.nixjs-rt.url = "path:./nixjs-rt";

outputs = { self, nixpkgs, nixjs-rt }:
outputs = { self, nixpkgs }:
let
supportedSystems = [ "x86_64-linux" "aarch64-linux" ];
forSupportedSystems = f: with nixpkgs.lib; foldl' (resultAttrset: system: recursiveUpdate resultAttrset (f { inherit system; pkgs = import nixpkgs { inherit system; }; })) { } supportedSystems;
Expand All @@ -17,7 +16,6 @@
coreutils
cargo-watch
nix
nixjs-rt.packages.${system}.default
nixpkgs-fmt
rustup
];
Expand All @@ -28,6 +26,8 @@
prefetch-npm-deps
];

nixjs-rt = import ./nixjs-rt/pkg.nix { inherit pkgs; self = "${self}/nixjs-rt"; };

in
{
packages.${system} = { inherit nixjs-rt pkgs; };
Expand Down
2 changes: 1 addition & 1 deletion nixjs-rt/README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# nixjs-rt [![builder](https://github.com/urbas/nixjs-rt/actions/workflows/build.yml/badge.svg)](https://github.com/urbas/nixjs-rt/actions/workflows/build.yml)
# nixjs-rt

Nix JavaScript Run-time, an implementation of nix language semantics in TypeScript.

Expand Down
2 changes: 1 addition & 1 deletion nixjs-rt/scripts/check-nix-pkg.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
set -e

outLink=$(mktemp -d)/result
nix build --out-link $outLink
nix build --out-link $outLink ..#nixjs-rt

function expectFile() {
local theFile=$1
Expand Down

0 comments on commit dd950cf

Please sign in to comment.