Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: making nixpkgs-matrix an indirect input #802

Merged
merged 1 commit into from
Sep 19, 2024
Merged

chore: making nixpkgs-matrix an indirect input #802

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
122 changes: 14 additions & 108 deletions flake.lock
View file
Open in desktop

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

85 changes: 38 additions & 47 deletions flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,65 +1,56 @@
{
inputs = {
nixpkgs.url = "github:nixos/nixpkgs";
flake-utils.url = "github:numtide/flake-utils";

nixpkgs-matrix.url = "github:matrixai/nixpkgs-matrix";
nixpkgs.follows = "nixpkgs-matrix/nixpkgs";
nixpkgs-matrix = {
type = "indirect";
id = "nixpkgs-matrix";
};
};

outputs = { nixpkgs, flake-utils, ... }:
outputs = { nixpkgs-matrix, flake-utils, ... }:
flake-utils.lib.eachSystem ([
"x86_64-linux"
"x86_64-windows"
"x86_64-darwin"
"aarch64-darwin"
]) (system:
let
pkgs = import nixpkgs {
system = system;
};
pkgs = nixpkgs-matrix.legacyPackages.${system};

shell = { ci ? false }: with pkgs; pkgs.mkShell {
nativeBuildInputs = [
nodejs_20
shellcheck
jq
];
# Don't set rpath for native addons
NIX_DONT_SET_RPATH = true;
NIX_NO_SELF_RPATH = true;
RUST_SRC_PATH = "${rustPlatform.rustLibSrc}";
shellHook = ''
echo "Entering $(npm pkg get name)"
set -o allexport
. ./.env
set +o allexport
set -v
${
lib.optionalString ci
''
set -o errexit
set -o nounset
set -o pipefail
shopt -s inherit_errexit
''
}
mkdir --parents "$(pwd)/tmp"
shell = { ci ? false }:
with pkgs;
pkgs.mkShell {
nativeBuildInputs = [ nodejs_20 shellcheck jq ];
# Don't set rpath for native addons
NIX_DONT_SET_RPATH = true;
NIX_NO_SELF_RPATH = true;
RUST_SRC_PATH = "${rustPlatform.rustLibSrc}";
shellHook = ''
echo "Entering $(npm pkg get name)"
set -o allexport
. ./.env
set +o allexport
set -v
${lib.optionalString ci ''
set -o errexit
set -o nounset
set -o pipefail
shopt -s inherit_errexit
''}
mkdir --parents "$(pwd)/tmp"

# Built executables and NPM executables
export PATH="$(pwd)/dist/bin:$(npm root)/.bin:$PATH"
# Built executables and NPM executables
export PATH="$(pwd)/dist/bin:$(npm root)/.bin:$PATH"

npm install --ignore-scripts
npm install --ignore-scripts

set +v
'';
};
in
{
devShells = {
default = shell { ci = false; };
ci = shell { ci = true; };
set +v
'';
};
}
);
in {
devShells = {
default = shell { ci = false; };
ci = shell { ci = true; };
};
});
}