Merge pull request #280 from Pacman99/digga

tree: rename devlib -> digga

flake.lock

@@ -69,29 +69,6 @@
         "type": "github"
       }
     },
-    "devlib": {
-      "inputs": {
-        "deploy": "deploy",
-        "devshell": "devshell",
-        "nixpkgs": [
-          "nixos"
-        ],
-        "utils": "utils_2"
-      },
-      "locked": {
-        "lastModified": 1620950194,
-        "narHash": "sha256-3fh8kUxZ/by7QP7vop+C+X6nj/YzYHnld9epGbRWKQ0=",
-        "owner": "divnix",
-        "repo": "devlib",
-        "rev": "213afcefb2db0bb5fd3fad871303c43b158d8204",
-        "type": "github"
-      },
-      "original": {
-        "owner": "divnix",
-        "repo": "devlib",
-        "type": "github"
-      }
-    },
     "devshell": {
       "locked": {
         "lastModified": 1618523768,
@@ -107,6 +84,28 @@
         "type": "github"
       }
     },
+    "digga": {
+      "inputs": {
+        "deploy": "deploy",
+        "devshell": "devshell",
+        "nixlib": "nixlib",
+        "nixpkgs": "nixpkgs_2",
+        "utils": "utils_2"
+      },
+      "locked": {
+        "lastModified": 1621012625,
+        "narHash": "sha256-xRBbDpQDUz3mSwL2WoePz6c3zIUtZ2ML3qW0B9CVspU=",
+        "owner": "divnix",
+        "repo": "digga",
+        "rev": "b0de71f4924e513e21d21a0ec60a2cb180f2187c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "divnix",
+        "repo": "digga",
+        "type": "github"
+      }
+    },
     "flake-compat": {
       "flake": false,
       "locked": {
@@ -229,6 +228,21 @@
         "type": "github"
       }
     },
+    "nixlib": {
+      "locked": {
+        "lastModified": 1620519687,
+        "narHash": "sha256-+6Dd72b2CASuXm2W7KRxZIE7AOy/dj4mU28vaF+zxcs=",
+        "owner": "divnix",
+        "repo": "nixpkgs.lib",
+        "rev": "c7b6169809c5f74dd0c34f3d69e9d12ba4d448de",
+        "type": "github"
+      },
+      "original": {
+        "owner": "divnix",
+        "repo": "nixpkgs.lib",
+        "type": "github"
+      }
+    },
     "nixos": {
       "locked": {
         "lastModified": 1615797423,
@@ -275,6 +289,21 @@
         "type": "github"
       }
     },
+    "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1620962350,
+        "narHash": "sha256-9ASW4d4/Z8HmRvuJI8rxbEOTbXTBpQ8y+CmFYBwtXzE=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "5d4a430472cafada97888cc80672fab255231f57",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "nur": {
       "locked": {
         "lastModified": 1615921934,
@@ -325,7 +354,7 @@
       "inputs": {
         "ci-agent": "ci-agent",
         "darwin": "darwin",
-        "devlib": "devlib",
+        "digga": "digga",
         "home": "home",
         "latest": "latest",
         "naersk": "naersk_2",

flake.nix

@@ -5,10 +5,7 @@
     {
       nixos.url = "nixpkgs/nixos-unstable";
       latest.url = "nixpkgs";
-      devlib.url = "github:divnix/devlib";
-      devlib.inputs = {
-        nixpkgs.follows = "nixos";
-      };
+      digga.url = "github:divnix/digga";
 
       ci-agent = {
         url = "github:hercules-ci/hercules-ci-agent";
@@ -26,8 +23,8 @@
       pkgs.inputs.nixpkgs.follows = "nixos";
     };
 
-  outputs = inputs@{ self, pkgs, devlib, nixos, ci-agent, home, nixos-hardware, nur, ... }:
-    devlib.lib.mkFlake {
+  outputs = inputs@{ self, pkgs, digga, nixos, ci-agent, home, nixos-hardware, nur, ... }:
+    digga.lib.mkFlake {
       inherit self inputs;
 
       channelsConfig = { allowUnfree = true; };
@@ -35,7 +32,7 @@
       channels = {
         nixos = {
           overlays =
-            (devlib.lib.importers.pathsIn ./overlays) ++
+            (digga.lib.importers.pathsIn ./overlays) ++
             [
               ./pkgs/default.nix
               pkgs.overlay # for `srcs`
@@ -45,11 +42,13 @@
         latest = { };
       };
 
-      lib = import ./lib { lib = devlib.lib // nixos.lib; };
+      lib = import ./lib { lib = digga.lib // nixos.lib; };
 
       sharedOverlays = [
         (final: prev: {
-          ourlib = self.lib;
+          lib = prev.lib.extend (lfinal: lprev: {
+            our = self.lib;
+          });
         })
       ];
 
@@ -59,14 +58,14 @@
           channelName = "nixos";
           modules = ./modules/module-list.nix;
           externalModules = [
-            { _module.args.ourlib = self.lib; }
+            { _module.args.ourLib = self.lib; }
             ci-agent.nixosModules.agent-profile
             home.nixosModules.home-manager
             ./modules/customBuilds.nix
           ];
         };
 
-        imports = [ (devlib.lib.importers.importHosts ./hosts) ];
+        imports = [ (digga.lib.importers.importHosts ./hosts) ];
         hosts = {
           /* set host specific properties here */
           NixOS = { };
@@ -86,9 +85,9 @@
         };
       };
 
-      homeConfigurations = devlib.lib.mkHomeConfigurations self.nixosConfigurations;
+      homeConfigurations = digga.lib.mkHomeConfigurations self.nixosConfigurations;
 
-      deploy.nodes = devlib.lib.mkDeployNodes self.nixosConfigurations { };
+      deploy.nodes = digga.lib.mkDeployNodes self.nixosConfigurations { };
 
       #defaultTemplate = self.templates.flk;
       templates.flk.path = ./.;

modules/customBuilds.nix

@@ -1,14 +1,14 @@
-{ lib, self, devlib, config, modules, channel, ... }:
+{ lib, self, diggaLib, config, modules, channel, ... }:
 let
   mkBuild = buildModule:
     # TODO: get specialArgs as a module argument and drop builderArgs usage
-    channel.input.lib.nixosSystem (devlib.mergeAny config.lib.builderArgs {
+    channel.input.lib.nixosSystem (diggaLib.mergeAny config.lib.builderArgs {
       modules = [ buildModule ];
     });
 in
 {
   system.build = {
-    iso = (mkBuild (devlib.modules.isoConfig {
+    iso = (mkBuild (diggaLib.modules.isoConfig {
       inherit self;
       inherit (self) inputs;
       fullHostConfig = config;