Skip to content

Commit

Permalink
ci(nix): Move from mission-control to just
Browse files Browse the repository at this point in the history
  • Loading branch information
bristermitten committed May 21, 2024
1 parent c784e69 commit ba41767
Show file tree
Hide file tree
Showing 4 changed files with 31 additions and 21 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ TAGS
.direnv
result
/.pre-commit-config.yaml
just-flake.just

# Elara! :D
build/
Expand Down
32 changes: 16 additions & 16 deletions flake.lock

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

14 changes: 9 additions & 5 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
treefmt-nix.url = "github:numtide/treefmt-nix";
treefmt-nix.inputs.nixpkgs.follows = "nixpkgs";
flake-root.url = "github:srid/flake-root";
mission-control.url = "github:Platonic-Systems/mission-control";
just-flake.url = "github:juspay/just-flake";
pre-commit-hooks.url = "github:cachix/pre-commit-hooks.nix";

h2jvm.url = "github:ElaraLang/h2jvm";
Expand All @@ -28,7 +28,7 @@
inputs.haskell-flake.flakeModule
inputs.treefmt-nix.flakeModule
inputs.flake-root.flakeModule
inputs.mission-control.flakeModule
inputs.just-flake.flakeModule
];

perSystem = { self', lib, system, config, pkgs, ... }: {
Expand Down Expand Up @@ -101,7 +101,10 @@
};
};


just-flake.features = {
treefmt.enable = true;
convco.enable = true;
};


treefmt.config = {
Expand Down Expand Up @@ -157,10 +160,12 @@
inputsFrom = [
config.haskellProjects.default.outputs.devShell
config.flake-root.devShell
config.mission-control.devShell
config.just-flake.outputs.devShell
];
inherit (self.checks.${system}.pre-commit-check) shellHook;

nativeBuildInputs = [ pkgs.just pkgs.convco ];

buildInputs =
let
stack-wrapped = pkgs.symlinkJoin
Expand All @@ -183,7 +188,6 @@
pkgs.haskellPackages.haskell-debug-adapter
pkgs.haskellPackages.ghci-dap
pkgs.haskellPackages.hpack

];
};

Expand Down
5 changes: 5 additions & 0 deletions justfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# See flake.nix (just-flake)
import 'just-flake.just'

default:
@just --list

0 comments on commit ba41767

Please sign in to comment.