From 13a0b31ed427397388b2aab39df0aa22f3dc3f9c Mon Sep 17 00:00:00 2001 From: sinanmohd Date: Tue, 18 Feb 2025 11:01:39 +0530 Subject: [PATCH] fix(nix/packages): only support building docker images on linux --- flake.nix | 50 +++++++++++++++++++++++++++++--------------------- 1 file changed, 29 insertions(+), 21 deletions(-) diff --git a/flake.nix b/flake.nix index 21010e30a4..41fccffe0e 100644 --- a/flake.nix +++ b/flake.nix @@ -15,36 +15,44 @@ pkgs = import nixpkgs { inherit system; }; }; - supportedSystems = lib.platforms.unix; - forAllSystems = f: lib.genAttrs supportedSystems (forSystem f); + forUnixSystems = f: lib.genAttrs lib.platforms.unix (forSystem f); + forLinuxSystems = f: lib.genAttrs lib.platforms.linux (forSystem f); in { - packages = forAllSystems ( - { system, pkgs }: - { - docker_sa = pkgs.callPackage ./nix/docker/stand_alone { - nocodb = self.packages.${system}.nocodb; - }; - docker_aio = pkgs.callPackage ./nix/docker/all_in_one { - nocodb = self.packages.${system}.nocodb; - }; + packages = + lib.recursiveUpdate + (forUnixSystems ( + { system, pkgs }: + { + bumper = pkgs.callPackage ./nix/bumper { }; + nocodb = pkgs.callPackage ./nix/package.nix { + version = if self ? shortRev then self.shortRev else self.dirtyShortRev; + }; - bumper = pkgs.callPackage ./nix/bumper { }; - nocodb = pkgs.callPackage ./nix/package.nix { - version = if self ? shortRev then self.shortRev else self.dirtyShortRev; - }; - - pnpmDeps = self.packages.${system}.nocodb.pnpmDeps; - default = self.packages.${system}.nocodb; - } - ); + pnpmDeps = self.packages.${system}.nocodb.pnpmDeps; + default = self.packages.${system}.nocodb; + } + )) + ( + forLinuxSystems ( + { system, pkgs }: + { + docker_sa = pkgs.callPackage ./nix/docker/stand_alone { + nocodb = self.packages.${system}.nocodb; + }; + docker_aio = pkgs.callPackage ./nix/docker/all_in_one { + nocodb = self.packages.${system}.nocodb; + }; + } + ) + ); nixosModules = { nocodb = import ./nix/module.nix inputs; default = self.nixosModules.nocodb; }; - devShells = forAllSystems ( + devShells = forUnixSystems ( { system, pkgs }: { nocodb = pkgs.callPackage ./nix/shell.nix {