From abedd7aa0388472349f6c714243a208ba051c680 Mon Sep 17 00:00:00 2001 From: dadada Date: Sun, 30 May 2021 16:47:03 +0200 Subject: [PATCH] make pythonPackages into lambda instead of path --- default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/default.nix b/default.nix index 8eb38d4..43763f0 100644 --- a/default.nix +++ b/default.nix @@ -1,6 +1,10 @@ { pkgs ? import { } }: with pkgs; +let + myPythonPackages = import ./pkgs/python-pkgs; + myPython3Packages = myPythonPackages { callPackage = python3Packages.callPackage; }; +in rec { lib = import ./lib { inherit pkgs; }; modules = import ./modules; @@ -11,12 +15,14 @@ rec { hosts = import ./hosts; - pythonPackages = ./pkgs/python-pkgs; + pythonPackages = myPythonPackages; tubslatex = callPackage ./pkgs/tubslatex { }; keys = callPackage ./pkgs/keys { }; homePage = callPackage ./pkgs/homePage { }; deploy = callPackage ./pkgs/deploy.nix { }; - recipemd = python3.pkgs.toPythonApplication (python3Packages.callPackage ./pkgs/python-pkgs/recipemd { }); + + recipemd = python3Packages.toPythonApplication myPython3Packages.recipemd; + scripts = callPackage ./pkgs/scripts.nix { }; }