chore(modules): move core modules to ./modules/core

2024-12-23 06:21:30 +03:00 · 2023-07-29 11:58:57 +02:00 · 2023-07-29 11:58:57 +02:00 · ef388ef84c
commit ef388ef84c
parent fee831dd8f
28 changed files with 11 additions and 12 deletions
--- a/examples/dream2nix-packages/htop-with-flags/default.nix
+++ b/examples/dream2nix-packages/htop-with-flags/default.nix
@ -21,6 +21,7 @@ in {
        IOKit
        lm_sensors
        ncurses
+        stdenv
        systemd
        ;
    };
--- a/modules/drv-parts/builtins-derivation/implementation.nix
+++ b/modules/drv-parts/builtins-derivation/implementation.nix
@ -31,6 +31,7 @@
  '';
 in {
  imports = [
+    ../core
    ../package-func/implementation.nix
  ];

--- a/modules/drv-parts/builtins-derivation/interface.nix
+++ b/modules/drv-parts/builtins-derivation/interface.nix
@ -19,7 +19,6 @@
  };
 in {
  imports = [
-    ../public
    ../package-func/interface.nix
  ];

--- a/modules/drv-parts/core/default.nix
+++ b/modules/drv-parts/core/default.nix
@ -1,12 +1,12 @@
 {
  imports = [
-    ../docs
-    ../deps
-    ../env
-    ../eval-cache
-    ../flags
-    ../lock
-    ../public
-    ../ui
+    ./docs
+    ./deps
+    ./env
+    ./eval-cache
+    ./flags
+    ./lock
+    ./public
+    ./ui
  ];
 }
--- a/modules/drv-parts/core/deps/default.nix
+++ b/modules/drv-parts/core/deps/default.nix
--- a/modules/drv-parts/core/docs/book.toml
+++ b/modules/drv-parts/core/docs/book.toml
--- a/modules/drv-parts/core/docs/default.nix
+++ b/modules/drv-parts/core/docs/default.nix
--- a/modules/drv-parts/core/docs/options.xsl
+++ b/modules/drv-parts/core/docs/options.xsl
--- a/modules/drv-parts/core/docs/src/SUMMARY.md
+++ b/modules/drv-parts/core/docs/src/SUMMARY.md
--- a/modules/drv-parts/core/docs/src/highlight.js
+++ b/modules/drv-parts/core/docs/src/highlight.js
--- a/modules/drv-parts/core/docs/theme/favicon.png
+++ b/modules/drv-parts/core/docs/theme/favicon.png
--- a/modules/drv-parts/core/env/default.nix
+++ b/modules/drv-parts/core/env/default.nix
--- a/modules/drv-parts/core/eval-cache/default.nix
+++ b/modules/drv-parts/core/eval-cache/default.nix
--- a/modules/drv-parts/core/eval-cache/interface.nix
+++ b/modules/drv-parts/core/eval-cache/interface.nix
--- a/modules/drv-parts/core/flags/default.nix
+++ b/modules/drv-parts/core/flags/default.nix
--- a/modules/drv-parts/core/lock/default.nix
+++ b/modules/drv-parts/core/lock/default.nix
--- a/modules/drv-parts/core/lock/interface.nix
+++ b/modules/drv-parts/core/lock/interface.nix
--- a/modules/drv-parts/core/public/default.nix
+++ b/modules/drv-parts/core/public/default.nix
--- a/modules/drv-parts/core/public/interface.nix
+++ b/modules/drv-parts/core/public/interface.nix
--- a/modules/drv-parts/core/public/optsPackage.nix
+++ b/modules/drv-parts/core/public/optsPackage.nix
--- a/modules/drv-parts/core/public/optsPackageCompat.nix
+++ b/modules/drv-parts/core/public/optsPackageCompat.nix
--- a/modules/drv-parts/core/public/optsPackageDrvParts.nix
+++ b/modules/drv-parts/core/public/optsPackageDrvParts.nix
--- a/modules/drv-parts/core/ui/default.nix
+++ b/modules/drv-parts/core/ui/default.nix
--- a/modules/drv-parts/core/ui/interface.nix
+++ b/modules/drv-parts/core/ui/interface.nix
--- a/modules/drv-parts/mkDerivation/implementation.nix
+++ b/modules/drv-parts/mkDerivation/implementation.nix
@ -41,6 +41,7 @@
    });
 in {
  imports = [
+    ../core
    ../package-func/implementation.nix
  ];

--- a/modules/drv-parts/mkDerivation/interface.nix
+++ b/modules/drv-parts/mkDerivation/interface.nix
@ -222,7 +222,6 @@
  };
 in {
  imports = [
-    ../public/interface.nix
    ../package-func/interface.nix
  ];

--- a/modules/drv-parts/nodejs-package-json/default.nix
+++ b/modules/drv-parts/nodejs-package-json/default.nix
@ -29,7 +29,6 @@ in {
  imports = [
    ./interface.nix
    ../nodejs-package-lock
-    ../lock
  ];
  config = {
    deps = {nixpkgs, ...}:
--- a/modules/drv-parts/pip/default.nix
+++ b/modules/drv-parts/pip/default.nix
@ -97,7 +97,6 @@ in {
  imports = [
    commonModule
    ./interface.nix
-    ../lock
  ];

  config = {