Fixed import-from-derivation when using keys from package
This commit is contained in:
parent
ddc4fb3086
commit
c1fe091ec5
6 changed files with 6 additions and 29 deletions
|
@ -1,10 +1,12 @@
|
||||||
{ config, pkgs, lib, ... }:
|
{ config, pkgs, lib, ... }:
|
||||||
with lib;
|
with lib;
|
||||||
{
|
let
|
||||||
|
keys = [ ../../../keys/dadada.pub ];
|
||||||
|
in {
|
||||||
networking.domain = mkDefault "dadada.li";
|
networking.domain = mkDefault "dadada.li";
|
||||||
|
|
||||||
dadada.admin.users = {
|
dadada.admin.users = {
|
||||||
"dadada" = [ "${pkgs.keys}/dadada.pub" ];
|
"dadada" = keys;
|
||||||
};
|
};
|
||||||
|
|
||||||
dadada.autoUpgrade.enable = mkDefault true;
|
dadada.autoUpgrade.enable = mkDefault true;
|
||||||
|
|
|
@ -38,7 +38,7 @@ in
|
||||||
dadada.admin = {
|
dadada.admin = {
|
||||||
enable = true;
|
enable = true;
|
||||||
users = {
|
users = {
|
||||||
"dadada" = [ "${pkgs.keys}/dadada.pub" ];
|
"dadada" = [ ../../keys/dadada.pub ];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -53,7 +53,6 @@
|
||||||
};
|
};
|
||||||
packages = flake-utils.lib.flattenTree {
|
packages = flake-utils.lib.flattenTree {
|
||||||
deploy = pkgs.callPackage ./pkgs/deploy.nix { };
|
deploy = pkgs.callPackage ./pkgs/deploy.nix { };
|
||||||
keys = pkgs.callPackage ./pkgs/keys { };
|
|
||||||
recipemd = pkgs.python3Packages.toPythonApplication python3Packages.recipemd;
|
recipemd = pkgs.python3Packages.toPythonApplication python3Packages.recipemd;
|
||||||
};
|
};
|
||||||
})) // {
|
})) // {
|
||||||
|
@ -68,6 +67,7 @@
|
||||||
nixosModules = import ./nixos/modules inputs;
|
nixosModules = import ./nixos/modules inputs;
|
||||||
overlays = import ./overlays;
|
overlays = import ./overlays;
|
||||||
pythonPackages = import ./pkgs/python-pkgs;
|
pythonPackages = import ./pkgs/python-pkgs;
|
||||||
|
keys = ./keys;
|
||||||
|
|
||||||
hydraJobs = (
|
hydraJobs = (
|
||||||
nixpkgs.lib.mapAttrs'
|
nixpkgs.lib.mapAttrs'
|
||||||
|
|
|
@ -3,9 +3,6 @@ let
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
#tubslatex = import ./tubslatex.nix;
|
#tubslatex = import ./tubslatex.nix;
|
||||||
keys = final: prev: {
|
|
||||||
keys = prev.callPackage ../pkgs/keys { };
|
|
||||||
};
|
|
||||||
recipemd = final: prev: {
|
recipemd = final: prev: {
|
||||||
recipemd = prev.python3Packages.toPythonApplication prev.python3Packages.recipemd;
|
recipemd = prev.python3Packages.toPythonApplication prev.python3Packages.recipemd;
|
||||||
};
|
};
|
||||||
|
|
|
@ -1,22 +0,0 @@
|
||||||
{ stdenv, lib }:
|
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
|
||||||
name = "dadadaKeys";
|
|
||||||
version = "1";
|
|
||||||
|
|
||||||
src = ./keys;
|
|
||||||
|
|
||||||
buildPhase = "";
|
|
||||||
|
|
||||||
installPhase = ''
|
|
||||||
mkdir $out
|
|
||||||
cp * $out
|
|
||||||
'';
|
|
||||||
|
|
||||||
meta = with lib; {
|
|
||||||
description = "Public keys for my infrastructure";
|
|
||||||
license = licenses.publicDomain;
|
|
||||||
platforms = platforms.all;
|
|
||||||
maintainers = [ "dadada" ];
|
|
||||||
};
|
|
||||||
}
|
|
Loading…
Add table
Add a link
Reference in a new issue