teutat3s/os
2
0
Fork 0
forked from pub-solar/os
Code Pull requests Activity

Merge #329

Browse source 
329: bump digga to latest develop r=nrdxp a=blaggacao



Co-authored-by: David Arnold <dgx.arnold@gmail.com>
This commit is contained in:
bors[bot] 2021-06-25 02:17:44 +00:00 committed by GitHub
parent ab4bd584e2 1c80b508ca
commit 5f5c26bee3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 88 additions and 117 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

137
flake.lock
View file

@ -72,15 +72,21 @@
"inputs": {
"flake-compat": "flake-compat_2",
"naersk": "naersk",
"nixpkgs": "nixpkgs",
"utils": "utils"
"nixpkgs": [
"digga",
"nixpkgs"
],
"utils": [
"digga",
"utils"
]
},
"locked": {
"lastModified": 1616406726,
"narHash": "sha256-n9zmgxR03QNrvs9/fHewqE0j3SjL7Y+cglBCFu3U3rg=",
"lastModified": 1623011836,
"narHash": "sha256-02M4P3eqUdV+ouZb8n1KDR1CXeZQm17cKpjKZKi0c10=",
"owner": "serokell",
"repo": "deploy-rs",
"rev": "9e405fbc5ab5bacbd271fd78c6b6b6877c4d9f8d",
"rev": "70d71b3027b1793b780f1e2435bdbbe1b0cb9ac6",
"type": "github"
},
"original": {
@ -109,20 +115,21 @@
"deploy": "deploy",
"devshell": "devshell",
"nixlib": "nixlib",
"nixpkgs": "nixpkgs_2",
"utils": "utils_2"
"nixos-generators": "nixos-generators",
"nixpkgs": "nixpkgs",
"utils": "utils"
},
"locked": {
"lastModified": 1623197477,
"narHash": "sha256-2Qk/uIHb1nXre2rRlGonAJmpuamBs7RRfgXhMmS5JkU=",
"lastModified": 1624576193,
"narHash": "sha256-EPemiDnTx0V622bMtGpcgclSExljWK3+qXZMiZVvvEc=",
"owner": "divnix",
"repo": "digga",
"rev": "f69703abc33f221b676966a8435c4f09ef70ff49",
"rev": "241896d3942fe3f818ce9a153955dbcadd9f00fc",
"type": "github"
},
"original": {
"owner": "divnix",
"ref": "master",
"ref": "develop",
"repo": "digga",
"type": "github"
}
@ -161,11 +168,11 @@
},
"flake-utils": {
"locked": {
"lastModified": 1620759905,
"narHash": "sha256-WiyWawrgmyN0EdmiHyG2V+fqReiVi8bM9cRdMaKQOFg=",
"lastModified": 1623660459,
"narHash": "sha256-OTmOsh43po7r5F9s9H6lVCBQ2b0FikWbmiwLbMAGRdw=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "b543720b25df6ffdfcf9227afafc5b8c1fabfae8",
"rev": "98c8d36b1828009b20f12544214683c7489935a1",
"type": "github"
},
"original": {
@ -211,15 +218,16 @@
"naersk": {
"inputs": {
"nixpkgs": [
"latest"
"digga",
"nixpkgs"
]
},
"locked": {
"lastModified": 1610392286,
"narHash": "sha256-3wFl5y+4YZO4SgRYK8WE7JIS3p0sxbgrGaQ6RMw+d98=",
"lastModified": 1622810282,
"narHash": "sha256-4wmvM3/xfD0hCdNDIXVzRMfL4yB1J+DjH6Zte2xbAxk=",
"owner": "nmattia",
"repo": "naersk",
"rev": "d7bfbad3304fd768c0f93a4c3b50976275e6d4be",
"rev": "e8061169e1495871b56be97c5c51d310fae01374",
"type": "github"
},
"original": {
@ -229,26 +237,6 @@
"type": "github"
}
},
"naersk_2": {
"inputs": {
"nixpkgs": [
"latest"
]
},
"locked": {
"lastModified": 1614785451,
"narHash": "sha256-TPw8kQvr2UNCuvndtY+EjyXp6Q5GEW2l9UafXXh1XmI=",
"owner": "nmattia",
"repo": "naersk",
"rev": "e0fe990b478a66178a58c69cf53daec0478ca6f9",
"type": "github"
},
"original": {
"owner": "nmattia",
"repo": "naersk",
"type": "github"
}
},
"nixlib": {
"locked": {
"lastModified": 1620519687,
@ -266,19 +254,40 @@
},
"nixos": {
"locked": {
"lastModified": 1615797423,
"narHash": "sha256-5NGDZXPQzuoxf/42NiyC9YwwhwzfMfIRrz3aT0XHzSc=",
"lastModified": 1624575719,
"narHash": "sha256-MVQJ2ltjqrxdB8zHj2s05ujgX6VbCDZ/+K8j2xh59Hk=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "266dc8c3d052f549826ba246d06787a219533b8f",
"rev": "001f78ff0044adf3ca972643eaf3fc5cbc8f634c",
"type": "github"
},
"original": {
"id": "nixpkgs",
"ref": "nixos-unstable",
"ref": "release-21.05",
"type": "indirect"
}
},
"nixos-generators": {
"inputs": {
"nixpkgs": [
"digga",
"nixpkgs"
]
},
"locked": {
"lastModified": 1624117213,
"narHash": "sha256-hAoBANafVdM/+8Z6PrlPEKPN6LrdkM4qg2Q/ji0XUns=",
"owner": "nix-community",
"repo": "nixos-generators",
"rev": "c64d3c2153274a6ab355e57f5eedfe6f85073d24",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "nixos-generators",
"type": "github"
}
},
"nixos-hardware": {
"locked": {
"lastModified": 1615652054,
@ -296,27 +305,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1610942247,
"narHash": "sha256-PKo1ATAlC6BmfYSRmX0TVmNoFbrec+A5OKcabGEu2yU=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "7d71001b796340b219d1bfa8552c81995017544a",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1620962350,
"narHash": "sha256-9ASW4d4/Z8HmRvuJI8rxbEOTbXTBpQ8y+CmFYBwtXzE=",
"lastModified": 1624148921,
"narHash": "sha256-FAhKTXZV67C36hK5lPvZfsFt+QY1QSHYQXwGXqpOChs=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "5d4a430472cafada97888cc80672fab255231f57",
"rev": "f2122ea5815648effdd97157c7bf4e9a1a6dbb34",
"type": "github"
},
"original": {
@ -379,7 +372,6 @@
"digga": "digga",
"home": "home",
"latest": "latest",
"naersk": "naersk_2",
"nixos": "nixos",
"nixos-hardware": "nixos-hardware",
"nur": "nur",
@ -387,30 +379,15 @@
}
},
"utils": {
"locked": {
"lastModified": 1610051610,
"narHash": "sha256-U9rPz/usA1/Aohhk7Cmc2gBrEEKRzcW4nwPWMPwja4Y=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "3982c9903e93927c2164caa727cd3f6a0e6d14cc",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"utils_2": {
"inputs": {
"flake-utils": "flake-utils"
},
"locked": {
"lastModified": 1622583383,
"narHash": "sha256-2DFx619SNfjzYwqx1ryae8zHnTh+N7VsZkbtAbrYIIA=",
"lastModified": 1624128793,
"narHash": "sha256-yZYvpT6i6iRK0x1a8k/LCoS7JGLVk6Yi1eqfhatnDLk=",
"owner": "gytis-ivaskevicius",
"repo": "flake-utils-plus",
"rev": "6b2ea4b02cad77fac581c6a9ec4f822ba87dce5c",
"rev": "785e6f13b8c6131d1eee625a713e8475b2b0512b",
"type": "github"
},
"original": {

17
flake.nix
View file

@ -3,9 +3,12 @@
inputs =
{
nixos.url = "nixpkgs/nixos-unstable";
nixos.url = "nixpkgs/release-21.05";
latest.url = "nixpkgs";
digga.url = "github:divnix/digga/master";
digga = {
url = "github:divnix/digga/develop";
inputs.nipxkgs.follows = "latest";
};
ci-agent = {
url = "github:hercules-ci/hercules-ci-agent";
@ -15,8 +18,8 @@
darwin.inputs.nixpkgs.follows = "latest";
home.url = "github:nix-community/home-manager";
home.inputs.nixpkgs.follows = "nixos";
naersk.url = "github:nmattia/naersk";
naersk.inputs.nixpkgs.follows = "latest";
# naersk.url = "github:nmattia/naersk";
# naersk.inputs.nixpkgs.follows = "latest";
agenix.url = "github:ryantm/agenix";
agenix.inputs.nixpkgs.follows = "latest";
nixos-hardware.url = "github:nixos/nixos-hardware";
@ -59,6 +62,7 @@
sharedOverlays = [
(final: prev: {
__dontExport = true;
lib = prev.lib.extend (lfinal: lprev: {
our = self.lib;
});
@ -69,13 +73,12 @@
hostDefaults = {
system = "x86_64-linux";
channelName = "nixos";
modules = ./modules/module-list.nix;
imports = [ (digga.lib.importers.modules ./modules) ];
externalModules = [
{ lib.our = self.lib; }
ci-agent.nixosModules.agent-profile
home.nixosModules.home-manager
agenix.nixosModules.age
./modules/customBuilds.nix
];
};
@ -95,7 +98,7 @@
};
home = {
modules = ./users/modules/module-list.nix;
imports = [ (digga.lib.importers.modules ./users/modules) ];
externalModules = [ ];
importables = rec {
profiles = digga.lib.importers.rakeLeaves ./users/profiles;

49
modules/customBuilds.nix
View file

@ -1,33 +1,26 @@
{ lib, self, diggaLib, config, modules, channel, ... }:
let
mkBuild = buildModule:
# TODO: get specialArgs as a module argument and drop builderArgs usage
channel.input.lib.nixosSystem (diggaLib.mergeAny config.lib.builderArgs {
modules = [ buildModule ];
});
in
{ lib, pkgs, self, config, modules, channel, ... }:
{
system.build = {
iso = (mkBuild (diggaLib.modules.isoConfig {
inherit self;
fullHostConfig = config;
})).config.system.build.isoImage;
iso = (config.lib.digga.mkBuild
(config.lib.digga.modules.isoConfig {
inherit self;
fullHostConfig = config;
})
).config.system.build.isoImage;
homes = (mkBuild ({ config, ... }: {
home-manager.useUserPackages = lib.mkForce false;
home-manager.sharedModules = [
{
home.sessionVariables = {
inherit (config.environment.sessionVariables) NIX_PATH;
};
xdg.configFile."nix/registry.json".text =
config.environment.etc."nix/registry.json".text;
}
];
})).config.home-manager.users;
digitalOcean = (mkBuild ({ modulesPath, ... }: {
imports = [ "${modulesPath}/virtualisation/digital-ocean-image.nix" ];
})).config.system.build.digitalOceanImage;
homes = (config.lib.digga.mkBuild
({ config, ... }: {
home-manager.useUserPackages = lib.mkForce false;
home-manager.sharedModules = [
{
home.sessionVariables = {
inherit (config.environment.sessionVariables) NIX_PATH;
};
xdg.configFile."nix/registry.json".text =
config.environment.etc."nix/registry.json".text;
}
];
})
).config.home-manager.users;
};
}

1
modules/module-list.nix
View file

@ -1 +0,0 @@
[ ]

0
users/modules/.flake-keep Normal file
View file

1
users/modules/module-list.nix
View file

@ -1 +0,0 @@
[ ]