From 21b34985f52f2481aba40f0d211c2f1831732ee1 Mon Sep 17 00:00:00 2001 From: Simon Garrelou Date: Fri, 20 Oct 2023 10:08:00 +0200 Subject: cleanup default.nix --- default.nix | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/default.nix b/default.nix index 3827cec..0d5beea 100644 --- a/default.nix +++ b/default.nix @@ -1,16 +1,8 @@ { pkgs ? import {} }: -let - pythonCallPackage = pkgs.lib.callPackageWith(pkgs // pkgs.python3.pkgs); - setupPkg = { name, callPackage ? pkgs.callPackage, extraArgs ? {} }: callPackage ./pkgs/${name}/package.nix extraArgs; - pySetupPkg = { name, extraArgs ? {} }: setupPkg { inherit name extraArgs; callPackage = pythonCallPackage; }; -in rec { - miasm = pySetupPkg { name = "miasm"; }; + miasm = pkgs.python3Packages.callPackage ./pkgs/miasm/package.nix {}; - msynth = pySetupPkg { - name = "msynth"; - extraArgs = { inherit miasm; }; - }; + msynth = pkgs.python3Packages.callPackage ./pkgs/msynth/package.nix { inherit miasm; }; - passwdqc = setupPkg { name = "passwdqc"; }; + passwdqc = pkgs.callPackage ./pkgs/passwdqc/package.nix {}; } -- cgit v1.2.3