WIP test of mac CI builds, without liberaforms IFD

ngi-nix · Jul 26, 2023 · d851866 · d851866
1 parent a0b4267
commit d851866
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 8 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -4,20 +4,22 @@ on:
   push:
   pull_request:
 
+env:
+  NIXPKGS_ALLOW_UNSUPPORTED_SYSTEM: 1
+
 jobs:
   check-linux:
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v3
       - uses: DeterminateSystems/nix-installer-action@main
       - uses: DeterminateSystems/magic-nix-cache-action@main
-      - run: nix flake check --allow-import-from-derivation
+      - run: nix flake check --impure
 
   check-mac:
     runs-on: macos-latest
     steps:
       - uses: actions/checkout@v3
       - uses: DeterminateSystems/nix-installer-action@main
       - uses: DeterminateSystems/magic-nix-cache-action@main
-      - run: nix flake check --allow-import-from-derivation
-
+      - run: nix flake check --impure
diff --git a/all-packages.nix b/all-packages.nix
@@ -3,8 +3,8 @@ let
   self = rec {
     libgnunetchat = callPackage ./pkgs/libgnunetchat { };
     gnunet-messenger-cli = callPackage ./pkgs/gnunet-messenger-cli { };
-    liberaforms = callPackage ./pkgs/liberaforms { };
-    liberaforms-env = callPackage ./pkgs/liberaforms/env.nix { };
+    #Disabled because IFD# liberaforms = callPackage ./pkgs/liberaforms { };
+    #Disabled because IDF# liberaforms-env = callPackage ./pkgs/liberaforms/env.nix { };
   };
 
   callPackage = newScope self;

diff --git a/configs/all-configurations.nix b/configs/all-configurations.nix
@@ -1,4 +1,4 @@
 { pkgs }:
 {
-  liberaforms-container = import ./liberaforms/container.nix;
+  #Disabled because IDF# liberaforms-container = import ./liberaforms/container.nix;
 }
diff --git a/flake.nix b/flake.nix
@@ -22,6 +22,7 @@
               # to muck around with overlays (which don't work with flakes as you'd expect)
               _module.args.ngipkgs = self.packages.${system};
             };
+          checks = self.packages;
           };
           # XXX: fugly hack to work around literal quoting of attribute paths passed to `nixos-container`.
           # without it we'd have to pass `x86_64-linux.<container>`, which will
@@ -40,7 +41,7 @@
         packages.x86_64-linux = self.packages.x86_64-linux;
       };
 
-      checks.x86_64-linux = self.packages.x86_64-linux;
+      #checks.x86_64-linux = self.packages.x86_64-linux;
 
     };
 

diff --git a/modules/all-modules.nix b/modules/all-modules.nix
@@ -1,3 +1,3 @@
 {
-  liberaforms = import ./liberaforms.nix;
+  #Disabled because IDF# liberaforms = import ./liberaforms.nix;
 }