~aasg/nixexprs

4483725527d703ddf65b91c71375de718ca84868 — Aluísio Augusto Silva Gonçalves a month ago 650bd39
lib: Receive Nixpkgs lib directly to avoid recursing into pkgs
M default.nix => default.nix +1 -1
@@ 5,7 5,7 @@ let
  aasgPkgs = newPkgs // patchedPkgs;
in
{
  lib = import ./lib { inherit pkgs; };
  lib = import ./lib { inherit (pkgs) lib; };
  modules = import ./modules;
  overlays = {
    pkgs = import ./pkgs/overlay.nix;

M lib/default.nix => lib/default.nix +3 -4
@@ 1,14 1,13 @@
{ pkgs }:
{ lib }:
let
  lib = pkgs.lib;
  callLibs = file: import file { lib = lib; aasgLib = self; };
  callLibs = file: import file { inherit lib; aasgLib = self; };
  self = rec {
    attrsets = callLibs ./attrsets.nix;
    inherit (attrsets) capitalizeAttrNames updateNew updateNewRecursive;

    declareEnvironment = lib.makeOverridable (callLibs ./declarative-env.nix);

    extended = import ./extension.nix { inherit pkgs; };
    extended = import ./extension.nix { inherit lib; };

    lists = callLibs ./lists.nix;
    inherit (lists) indexOf isSubsetOf;

M lib/extension.nix => lib/extension.nix +2 -3
@@ 1,9 1,8 @@
{ pkgs }:
{ lib }:
/*
 * Merge of the Nixpkgs and aasg libs.
 */
let
  lib = pkgs.lib;
  aasgLib = import ./. { inherit pkgs; };
  aasgLib = import ./. { inherit lib; };
in
aasgLib.updateNewRecursive lib aasgLib

M modules/programs/dma.nix => modules/programs/dma.nix +1 -1
@@ 1,5 1,5 @@
{ config, lib, pkgs, ... }:
with import ../../lib/extension.nix { inherit pkgs; };
with import ../../lib/extension.nix { inherit lib; };
let
  cfg = config.programs.dma;


M modules/services/networking/matrix-appservice-irc.nix => modules/services/networking/matrix-appservice-irc.nix +1 -1
@@ 1,5 1,5 @@
{ config, lib, pkgs, ... }:
with import ../../../lib/extension.nix { inherit pkgs; };
with import ../../../lib/extension.nix { inherit lib; };
let
  format = pkgs.formats.yaml { };
  cfg = config.services.matrix-appservice-irc;