Merge pull request #1 from eldritch-elder/main

make the full devShell as a default
semickolon · Apr 2, 2024 · c8f14de · c8f14de
2 parents 5cb4b8e + 3469d97
commit c8f14de
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/.github/workflows/compile_all.yml b/.github/workflows/compile_all.yml
@@ -1,5 +1,6 @@
 on:
   pull_request:
+  workflow_dispatch:
   push:
     branches: [main]
 
@@ -12,7 +13,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - uses: DeterminateSystems/nix-installer-action@main
-      - run: nix develop --command fak compile_all
+      - run: nix develop .#container --command fak compile_all
       - uses: EndBug/latest-tag@latest
       - uses: ncipollo/release-action@v1
         with:

diff --git a/flake.nix b/flake.nix
@@ -13,7 +13,7 @@
       let
         pkgs = import nixpkgs { inherit system; };
         pkgs-unstable = import inputs.nixpkgs-unstable { inherit system; };
-        naersk = pkgs.callPackage inputs.naersk {};
+        naersk = pkgs.callPackage inputs.naersk { };
         wchisp = naersk.buildPackage rec {
           pname = "wchisp";
           version = "0.3-git";
@@ -47,12 +47,10 @@
           ninja
           python311
         ];
-      in
-      {
+      in {
         devShells = {
-          default = pkgs.mkShell { inherit packages; };
-          full = pkgs.mkShell { packages = packages ++ [wchisp]; };
+          default = pkgs.mkShell { packages = packages ++ [ wchisp ]; };
+          container = pkgs.mkShell { inherit packages; };
         };
-      }
-    );
+      });
 }