diff options
author | Simon Garrelou <simon.garrelou@airbus.com> | 2023-10-20 10:08:00 +0200 |
---|---|---|
committer | Simon Garrelou <simon.garrelou@airbus.com> | 2023-10-20 10:08:00 +0200 |
commit | 21b34985f52f2481aba40f0d211c2f1831732ee1 (patch) | |
tree | ac220e6508f15dd1c063148c0b4df7eab96659e9 | |
parent | d31bde2672c5135fc044e34c312086561a98a0d3 (diff) | |
download | nixpkgs-21b34985f52f2481aba40f0d211c2f1831732ee1.tar.gz nixpkgs-21b34985f52f2481aba40f0d211c2f1831732ee1.zip |
cleanup default.nix
-rw-r--r-- | default.nix | 14 |
1 files 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 @@ | |||
1 | { pkgs ? import <nixpkgs> {} }: | 1 | { pkgs ? import <nixpkgs> {} }: |
2 | let | ||
3 | pythonCallPackage = pkgs.lib.callPackageWith(pkgs // pkgs.python3.pkgs); | ||
4 | setupPkg = { name, callPackage ? pkgs.callPackage, extraArgs ? {} }: callPackage ./pkgs/${name}/package.nix extraArgs; | ||
5 | pySetupPkg = { name, extraArgs ? {} }: setupPkg { inherit name extraArgs; callPackage = pythonCallPackage; }; | ||
6 | in | ||
7 | rec { | 2 | rec { |
8 | miasm = pySetupPkg { name = "miasm"; }; | 3 | miasm = pkgs.python3Packages.callPackage ./pkgs/miasm/package.nix {}; |
9 | 4 | ||
10 | msynth = pySetupPkg { | 5 | msynth = pkgs.python3Packages.callPackage ./pkgs/msynth/package.nix { inherit miasm; }; |
11 | name = "msynth"; | ||
12 | extraArgs = { inherit miasm; }; | ||
13 | }; | ||
14 | 6 | ||
15 | passwdqc = setupPkg { name = "passwdqc"; }; | 7 | passwdqc = pkgs.callPackage ./pkgs/passwdqc/package.nix {}; |
16 | } | 8 | } |