From efc3380e13577cf1ea1dbe2cf6993a8d1537823c Mon Sep 17 00:00:00 2001 From: David Arnold Date: Mon, 29 Nov 2021 19:38:56 -0500 Subject: [PATCH] imp: move follows responsibility downstream - also remove unimportant (small) depenencies from follows management - so that it is less complex as errors occur, since: - it seems there are still follows issues present upstream --- flake.nix | 6 +----- shell/devos.nix | 7 ++----- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/flake.nix b/flake.nix index defb4b3..fd39cab 100644 --- a/flake.nix +++ b/flake.nix @@ -160,11 +160,7 @@ inputs.polymc.overlay ]; }; - latest = { - overlays = [ - deploy.overlay - ]; - }; + latest = { }; }; lib = import ./lib { lib = digga.lib // nixos.lib; }; diff --git a/shell/devos.nix b/shell/devos.nix index 6f01267..dd6f75e 100644 --- a/shell/devos.nix +++ b/shell/devos.nix @@ -1,4 +1,4 @@ -{ pkgs, extraModulesPath, ... }: +{ pkgs, extraModulesPath, inputs, ... }: let hooks = import ./hooks; @@ -43,12 +43,9 @@ in (linter editorconfig-checker) # (docs python3Packages.grip) too many deps (docs mdbook) + (devos inputs.deploy.packages.${pkgs.system}.deploy-rs) ] - ++ lib.optional - (pkgs ? deploy-rs) - (devos deploy-rs.deploy-rs) - ++ lib.optional (system != "i686-linux") (devos cachix)