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

ci: merge staging to master #44

Merged
merged 2 commits into from
Sep 19, 2024
Merged

ci: merge staging to master #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0f0a281
feat: added indirect input
brynblack Sep 18, 2024
877a10e
Merge pull request #43 from MatrixAI/feature-flake-indirect
brynblack Sep 19, 2024
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
123 changes: 23 additions & 100 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.

69 changes: 32 additions & 37 deletions flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,48 +1,43 @@
{
inputs = {
nixpkgs.url = "github:nixos/nixpkgs";
nixpkgs.follows = "nixpkgs-matrix/nixpkgs";
nixpkgs-matrix.url = "github:matrixai/nixpkgs-matrix";
nixpkgs-matrix = {
type = "indirect";
id = "nixpkgs-matrix-private";
};
flake-utils.url = "github:numtide/flake-utils";
};

outputs = { nixpkgs, flake-utils, ... }:
outputs = { nixpkgs-matrix, flake-utils, ... }:
flake-utils.lib.eachDefaultSystem (system:
let
pkgs = import nixpkgs { inherit system; };
pkgs = nixpkgs-matrix.legacyPackages.${system};

shell = { ci ? false }: with pkgs; mkShell {
nativeBuildInputs = [
nodejs_20
shellcheck
gitAndTools.gh
];
NIX_DONT_SET_RPATH = true;
NIX_NO_SELF_RPATH = true;
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"
export PATH="$(pwd)/dist/bin:$(npm root)/.bin:$PATH"
npm install --ignore-scripts
npx patch-package
set +v
'';
};
in
{
shell = { ci ? false }:
with pkgs;
mkShell {
nativeBuildInputs = [ nodejs_20 shellcheck gitAndTools.gh ];
NIX_DONT_SET_RPATH = true;
NIX_NO_SELF_RPATH = true;
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"
export PATH="$(pwd)/dist/bin:$(npm root)/.bin:$PATH"
npm install --ignore-scripts
npx patch-package
set +v
'';
};
in {
devShells = {
default = shell { ci = false; };
ci = shell { ci = true; };
Expand Down