felix/nixos
1
0
Fork 0
mirror of https://github.com/Stunkymonkey/nixos.git synced 2025-05-24 09:54:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

deplo-rs: fix imports

Browse source
This commit is contained in:
Felix Buehler 2022-06-03 23:34:01 +02:00
parent b8b79c5fc0
commit 0977d6d152
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
nixos/deploy.nix
View file

@ -1,5 +1,5 @@
{ self { self
, deploy , deploy-rs
, ... , ...
}: }:
let let

6
outputs.nix
View file

@ -3,7 +3,7 @@
, nixpkgs , nixpkgs
, nixpkgs-unstable , nixpkgs-unstable
, sops-nix , sops-nix
, deploy , deploy-rs
, ... , ...
} @ inputs: } @ inputs:
(flake-utils.lib.eachDefaultSystem (system: (flake-utils.lib.eachDefaultSystem (system:
@ -13,7 +13,7 @@
{ {
devShell = pkgs.callPackage ./shell.nix { devShell = pkgs.callPackage ./shell.nix {
inherit (sops-nix.packages."${pkgs.system}") sops-import-keys-hook ssh-to-pgp sops-init-gpg-key; inherit (sops-nix.packages."${pkgs.system}") sops-import-keys-hook ssh-to-pgp sops-init-gpg-key;
inherit (deploy.packages."${pkgs.system}") deploy-rs; inherit (deploy-rs.packages."${pkgs.system}") deploy-rs;
}; };
})) // { })) // {
nixosConfigurations = import ./nixos/configurations.nix (inputs // { nixosConfigurations = import ./nixos/configurations.nix (inputs // {
@ -24,5 +24,5 @@
}); });
hydraJobs = nixpkgs.lib.mapAttrs' (name: config: nixpkgs.lib.nameValuePair "nixos-${name}" config.config.system.build.toplevel) self.nixosConfigurations; hydraJobs = nixpkgs.lib.mapAttrs' (name: config: nixpkgs.lib.nameValuePair "nixos-${name}" config.config.system.build.toplevel) self.nixosConfigurations;
checks = builtins.mapAttrs (system: deployLib: deployLib.deployChecks self.deploy) deploy.lib; checks = builtins.mapAttrs (system: deployLib: deployLib.deployChecks self.deploy) deploy-rs.lib;
} }