From e6f79b30e620cf7bd5b06e2579e979ff090e925a Mon Sep 17 00:00:00 2001 From: seth Date: Fri, 18 Oct 2024 03:10:35 -0400 Subject: more refactors & outsource some things (#477) * tree-wide: drop flake-parts * drop nixinate * justfile: cleanup * drop treefmt-nix * doc: update READMEs * flake: cleanup * seth: don't use `./.` * modules/nixos,darwin: bundle all modules They all depend on each other anyways so * systems: manually import internal modules * seth: use riff module from nix-exprs * flake: back to flake-parts * Revert "flake: back to flake-parts" This reverts commit 35334882f7c0c23991a4efd65ea08b216006b2b0. Saving the last commit so I can go back if I want * flake: use lib.const this looks better...right? * flake: declare systems like a normal person --- dev/hydra-jobs.nix | 50 -------------------------------------------------- 1 file changed, 50 deletions(-) delete mode 100644 dev/hydra-jobs.nix (limited to 'dev/hydra-jobs.nix') diff --git a/dev/hydra-jobs.nix b/dev/hydra-jobs.nix deleted file mode 100644 index 7b55f57..0000000 --- a/dev/hydra-jobs.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ - lib, - self, - withSystem, - ... -}: -let - # architecture of "main" CI machine - ciSystem = "x86_64-linux"; - - /** - Map a NixOS, nix-darwin, or home-manager configuration to a final derivation - - # Type - - ``` - derivFromCfg :: AttrSet -> Attrset - ``` - */ - derivFromCfg = deriv: deriv.config.system.build.toplevel or deriv.activationPackage; - - /** - Map an attribute set of NixOS, nix-darwin, or home-manager configurations to their final derivation - - # Type - - ``` - mapCfgsToDerivs :: AttrSet -> Attrset - ``` - */ - mapCfgsToDerivs = lib.mapAttrs (lib.const derivFromCfg); -in -{ - flake.hydraJobs = withSystem ciSystem ( - { pkgs, self', ... }: - { - # i don't care to run these for each system, as they should be the same - # and don't need to be cached - inherit (self') checks; - inherit (self') devShells; - - darwinConfigurations = mapCfgsToDerivs self.darwinConfigurations; - homeConfigurations = mapCfgsToDerivs self.homeConfigurations; - nixosConfigurations = mapCfgsToDerivs self.nixosConfigurations // { - # please add aarch64 runners github...please... - atlas = lib.deepSeq (derivFromCfg self.nixosConfigurations.atlas).drvPath pkgs.emptyFile; - }; - } - ); -} -- cgit v1.2.3