~aasg/nixexprs

c94098ac6951cf22c20c7f87e4429f0607528259 — Aluísio Augusto Silva Gonçalves 9 months ago 8315fa0
Fix python3Packages outside overlay, and other formatting issues
M default.nix => default.nix +1 -2
@@ 1,8 1,7 @@
{ pkgs ? import <nixpkgs> { } }:
let
  withNewCallPackage = set: set // { callPackage = pkgs.lib.callPackageWith set; };
  myPkgs = import ./pkgs { inherit pkgs; };
  myPatchedPkgs = import ./patches { pkgs = withNewCallPackage (pkgs // myPkgs); };
  myPatchedPkgs = import ./patches { pkgs = pkgs // myPkgs; };
in
{
  modules = import ./modules;

M patches/default.nix => patches/default.nix +9 -3
@@ 1,5 1,11 @@
{ pkgs }:
let
  # self is not included here to avoid recursion.
  callPackage = pkgs.lib.callPackageWith pkgs;
  self = rec {

{
  haunt = pkgs.callPackage ./haunt { };
}
    haunt = callPackage ./haunt { };

  };
in
self

M patches/overlay.nix => patches/overlay.nix +5 -2
@@ 1,6 1,9 @@
self: super:

{
  haunt = import ./haunt { haunt = super.haunt; };
  zoxide = import ./zoxide { inherit (super) fetchFromGitHub lib zoxide; };

  haunt = super.callPackage ./haunt { };

  zoxide = super.callPackage ./zoxide { };

}

M pkgs/default.nix => pkgs/default.nix +21 -1
@@ 1,5 1,25 @@
{ pkgs }:
let
  self = (import ./overlay.nix) (self // pkgs) pkgs;
  callPackage = pkgs.lib.callPackageWith (pkgs // self);
  self = rec {

    dma = callPackage ./tools/networking/dma { };

    dyndnsc = callPackage ./tools/networking/dyndnsc { };

    guile-commonmark = callPackage ./development/guile-modules/guile-commonmark { };

    haunt = callPackage ./applications/misc/haunt { };

    linuxPackagesFor = kernel:
      (pkgs.linuxPackagesFor kernel).extend (import ./os-specific/linux/kernel-packages.nix);

    python3 = pkgs.python3.override { packageOverrides = import ./development/python-modules; };

    python3Packages = python3.pkgs;

    starship = callPackage ./shells/starship { };

  };
in
self

M pkgs/development/python-modules/default.nix => pkgs/development/python-modules/default.nix +1 -1
@@ 1,5 1,5 @@
pyself: pysuper:

{
  daemonocle = pysuper.callPackage ./daemonocle { inherit (pyself) click psutil; };
  daemonocle = pysuper.callPackage ./daemonocle { };
}

M pkgs/overlay.nix => pkgs/overlay.nix +5 -9
@@ 2,23 2,19 @@ self: super:

{

  dma = super.callPackage ./tools/networking/dma { inherit (self) flex openssl yacc; };
  dma = super.callPackage ./tools/networking/dma { };

  dyndnsc = super.callPackage ./tools/networking/dyndnsc { inherit (self) python3Packages; };
  dyndnsc = super.callPackage ./tools/networking/dyndnsc { };

  guile-commonmark = super.callPackage ./development/guile-modules/guile-commonmark {
    inherit (self) pkgconfig guile;
  };
  guile-commonmark = super.callPackage ./development/guile-modules/guile-commonmark { };

  haunt = super.callPackage ./applications/misc/haunt {
    inherit (self) pkgconfig guile guile-commonmark guile-reader;
  };
  haunt = super.callPackage ./applications/misc/haunt { };

  linuxPackagesFor = kernel:
    (super.linuxPackagesFor kernel).extend (import ./os-specific/linux/kernel-packages.nix);

  python3 = super.python3.override { packageOverrides = import ./development/python-modules; };

  starship = super.callPackage ./shells/starship { inherit (self) rustPlatform; };
  starship = super.callPackage ./shells/starship { };

}