refactor: rename modules.drv-parts => modules.dream2nix

2024-10-05 19:07:46 +03:00 · 2023-08-31 15:03:07 +02:00 · 2023-08-31 15:03:07 +02:00 · c5f5b03944
commit c5f5b03944
parent f4371d3e9b
105 changed files with 56 additions and 56 deletions
--- a/examples/dream2nix-repo/default.nix
+++ b/examples/dream2nix-repo/default.nix
@ -13,7 +13,7 @@
    nixpkgs.lib.evalModules {
      specialArgs.dream2nix = dream2nix;
      specialArgs.packageSets.nixpkgs = nixpkgs;
-      modules = [module ./settings.nix dream2nix.modules.drv-parts.core];
+      modules = [module ./settings.nix dream2nix.modules.dream2nix.core];
    };

  # like callPackage for modules
--- a/examples/dream2nix-repo/packages/hello/default.nix
+++ b/examples/dream2nix-repo/packages/hello/default.nix
@ -5,7 +5,7 @@
  ...
 }: {
  imports = [
-    dream2nix.modules.drv-parts.mkDerivation
+    dream2nix.modules.dream2nix.mkDerivation
  ];

  name = "hello";
--- a/examples/packages/basics/derivation/default.nix
+++ b/examples/packages/basics/derivation/default.nix
@ -6,7 +6,7 @@
 }: {
  # select builtins.derivation as a backend for this package
  imports = [
-    dream2nix.modules.drv-parts.builtins-derivation
+    dream2nix.modules.dream2nix.builtins-derivation
  ];

  name = "test";
--- a/examples/packages/basics/htop-with-flags/default.nix
+++ b/examples/packages/basics/htop-with-flags/default.nix
@ -9,7 +9,7 @@
 in {
  # select mkDerivation as a backend for this package
  imports = [
-    dream2nix.modules.drv-parts.mkDerivation
+    dream2nix.modules.dream2nix.mkDerivation
  ];

  config = {
--- a/examples/packages/basics/mkDerivation/default.nix
+++ b/examples/packages/basics/mkDerivation/default.nix
@ -6,7 +6,7 @@
 }: {
  # select mkDerivation as a backend for this package
  imports = [
-    dream2nix.modules.drv-parts.mkDerivation
+    dream2nix.modules.dream2nix.mkDerivation
  ];

  deps = {nixpkgs, ...}: {
--- a/examples/packages/multi-language/python-nodejs/default.nix
+++ b/examples/packages/multi-language/python-nodejs/default.nix
@ -13,9 +13,9 @@
  l = lib // builtins;
 in {
  imports = [
-    dream2nix.modules.drv-parts.nodejs-package-lock
-    dream2nix.modules.drv-parts.nodejs-granular
-    dream2nix.modules.drv-parts.pip
+    dream2nix.modules.dream2nix.nodejs-package-lock
+    dream2nix.modules.dream2nix.nodejs-granular
+    dream2nix.modules.dream2nix.pip
  ];

  name = "isso";
--- a/examples/packages/single-language/nodejs-no-lock/default.nix
+++ b/examples/packages/single-language/nodejs-no-lock/default.nix
@ -8,8 +8,8 @@
  system = config.deps.stdenv.system;
 in {
  imports = [
-    dream2nix.modules.drv-parts.nodejs-package-json
-    dream2nix.modules.drv-parts.nodejs-granular
+    dream2nix.modules.dream2nix.nodejs-package-json
+    dream2nix.modules.dream2nix.nodejs-granular
  ];

  mkDerivation = {
--- a/examples/packages/single-language/nodejs-prettier-devshell/default.nix
+++ b/examples/packages/single-language/nodejs-prettier-devshell/default.nix
@ -7,7 +7,7 @@
  l = lib // builtins;
 in {
  imports = [
-    dream2nix.modules.drv-parts.nodejs-devshell
+    dream2nix.modules.dream2nix.nodejs-devshell
  ];

  mkDerivation = {
--- a/examples/packages/single-language/nodejs-prettier-node-modules/default.nix
+++ b/examples/packages/single-language/nodejs-prettier-node-modules/default.nix
@ -7,7 +7,7 @@
  l = lib // builtins;
 in {
  imports = [
-    dream2nix.modules.drv-parts.nodejs-node-modules
+    dream2nix.modules.dream2nix.nodejs-node-modules
  ];

  mkDerivation = {
--- a/examples/packages/single-language/nodejs-prettier/default.nix
+++ b/examples/packages/single-language/nodejs-prettier/default.nix
@ -7,8 +7,8 @@
  l = lib // builtins;
 in {
  imports = [
-    dream2nix.modules.drv-parts.nodejs-package-lock
-    dream2nix.modules.drv-parts.nodejs-granular
+    dream2nix.modules.dream2nix.nodejs-package-lock
+    dream2nix.modules.dream2nix.nodejs-granular
  ];

  mkDerivation = {
--- a/examples/packages/single-language/php-project/default.nix
+++ b/examples/packages/single-language/php-project/default.nix
@ -5,8 +5,8 @@
  ...
 }: {
  imports = [
-    dream2nix.modules.drv-parts.php-composer-lock
-    dream2nix.modules.drv-parts.php-granular
+    dream2nix.modules.dream2nix.php-composer-lock
+    dream2nix.modules.dream2nix.php-granular
  ];

  mkDerivation = {
--- a/examples/packages/single-language/python-ansible/default.nix
+++ b/examples/packages/single-language/python-ansible/default.nix
@ -7,7 +7,7 @@
  l = lib // builtins;
 in {
  imports = [
-    dream2nix.modules.drv-parts.pip
+    dream2nix.modules.dream2nix.pip
  ];

  deps = {nixpkgs, ...}: {
--- a/examples/packages/single-language/python-apache-airflow/default.nix
+++ b/examples/packages/single-language/python-apache-airflow/default.nix
@ -8,7 +8,7 @@
  python = config.deps.python;
 in {
  imports = [
-    dream2nix.modules.drv-parts.pip
+    dream2nix.modules.dream2nix.pip
  ];

  deps = {
--- a/examples/packages/single-language/python-odoo/default.nix
+++ b/examples/packages/single-language/python-odoo/default.nix
@ -15,7 +15,7 @@
  };
 in {
  imports = [
-    dream2nix.modules.drv-parts.pip
+    dream2nix.modules.dream2nix.pip
  ];

  deps = {nixpkgs, ...}: {
--- a/examples/packages/single-language/python-pillow/default.nix
+++ b/examples/packages/single-language/python-pillow/default.nix
@ -9,7 +9,7 @@
  l = lib // builtins;
 in {
  imports = [
-    dream2nix.modules.drv-parts.pip
+    dream2nix.modules.dream2nix.pip
  ];

  deps = {nixpkgs, ...}: {
--- a/examples/packages/single-language/python-pyproject-dependencies/default.nix
+++ b/examples/packages/single-language/python-pyproject-dependencies/default.nix
@ -12,7 +12,7 @@
  ];
 in {
  imports = [
-    dream2nix.modules.drv-parts.pip
+    dream2nix.modules.dream2nix.pip
  ];

  name = "pyproject-dependencies";
--- a/examples/packages/single-language/rust-ripgrep/default.nix
+++ b/examples/packages/single-language/rust-ripgrep/default.nix
@ -7,8 +7,8 @@
  l = lib // builtins;
 in {
  imports = [
-    dream2nix.modules.drv-parts.rust-cargo-lock
-    dream2nix.modules.drv-parts.rust-crane
+    dream2nix.modules.dream2nix.rust-cargo-lock
+    dream2nix.modules.dream2nix.rust-crane
  ];

  deps = {nixpkgs, ...}: {
--- a/examples/packages/single-language/rust-workspace-version-inheritance/default.nix
+++ b/examples/packages/single-language/rust-workspace-version-inheritance/default.nix
@ -7,8 +7,8 @@
  l = lib // builtins;
 in {
  imports = [
-    dream2nix.modules.drv-parts.rust-cargo-lock
-    dream2nix.modules.drv-parts.rust-crane
+    dream2nix.modules.dream2nix.rust-cargo-lock
+    dream2nix.modules.dream2nix.rust-crane
  ];

  mkDerivation = {
--- a/misc/benchmarks/builtins-derivation-modules-vs-pkg-func.nix
+++ b/misc/benchmarks/builtins-derivation-modules-vs-pkg-func.nix
@ -7,7 +7,7 @@
    nixpkgs.lib.evalModules {
      specialArgs.dream2nix = dream2nix;
      specialArgs.packageSets.nixpkgs = nixpkgs;
-      modules = [module dream2nix.modules.drv-parts.core];
+      modules = [module dream2nix.modules.dream2nix.core];
    };

  # like callPackage for modules
@ -39,7 +39,7 @@
    num:
      callModule {
        imports = [
-          dream2nix.modules.drv-parts.builtins-derivation
+          dream2nix.modules.dream2nix.builtins-derivation
        ];
        name = "hello-${num}";
        version = "2.12.1";
--- a/misc/benchmarks/mkDerivation-modules-vs-pkg-func.nix
+++ b/misc/benchmarks/mkDerivation-modules-vs-pkg-func.nix
@ -7,7 +7,7 @@
    nixpkgs.lib.evalModules {
      specialArgs.dream2nix = dream2nix;
      specialArgs.packageSets.nixpkgs = nixpkgs;
-      modules = [module dream2nix.modules.drv-parts.core];
+      modules = [module dream2nix.modules.dream2nix.core];
    };

  # like callPackage for modules
@ -40,7 +40,7 @@
  modules = lib.genAttrs (map toString (lib.range 0 numPkgs)) (num:
    callModule rec {
      imports = [
-        dream2nix.modules.drv-parts.mkDerivation
+        dream2nix.modules.dream2nix.mkDerivation
      ];
      name = "hello-${num}";
      version = "2.12.1";
--- a/modules/dream2nix/_template/default.nix
+++ b/modules/dream2nix/_template/default.nix
--- a/modules/dream2nix/_template/interface.nix
+++ b/modules/dream2nix/_template/interface.nix
--- a/modules/dream2nix/buildPythonPackage/default.nix
+++ b/modules/dream2nix/buildPythonPackage/default.nix
--- a/modules/dream2nix/buildPythonPackage/implementation.nix
+++ b/modules/dream2nix/buildPythonPackage/implementation.nix
--- a/modules/dream2nix/buildPythonPackage/interface.nix
+++ b/modules/dream2nix/buildPythonPackage/interface.nix
--- a/modules/dream2nix/buildRustPackage/default.nix
+++ b/modules/dream2nix/buildRustPackage/default.nix
@ -159,7 +159,7 @@
    dreamLockInterface.packages;
 in {
  imports = [
-    # dream2nix.modules.drv-parts.mkDerivation
+    # dream2nix.modules.dream2nix.mkDerivation
  ];

  public = lib.mkForce {
--- a/modules/dream2nix/buildRustPackage/utils.nix
+++ b/modules/dream2nix/buildRustPackage/utils.nix
--- a/modules/dream2nix/buildRustPackage/vendor.nix
+++ b/modules/dream2nix/buildRustPackage/vendor.nix
--- a/modules/dream2nix/builtins-derivation/default.nix
+++ b/modules/dream2nix/builtins-derivation/default.nix
--- a/modules/dream2nix/builtins-derivation/implementation.nix
+++ b/modules/dream2nix/builtins-derivation/implementation.nix
--- a/modules/dream2nix/builtins-derivation/interface.nix
+++ b/modules/dream2nix/builtins-derivation/interface.nix
--- a/modules/dream2nix/core/default.nix
+++ b/modules/dream2nix/core/default.nix
--- a/modules/dream2nix/core/deps/default.nix
+++ b/modules/dream2nix/core/deps/default.nix
--- a/modules/dream2nix/core/docs/book.toml
+++ b/modules/dream2nix/core/docs/book.toml
--- a/modules/dream2nix/core/docs/default.nix
+++ b/modules/dream2nix/core/docs/default.nix
--- a/modules/dream2nix/core/docs/options.xsl
+++ b/modules/dream2nix/core/docs/options.xsl
--- a/modules/dream2nix/core/docs/src/SUMMARY.md
+++ b/modules/dream2nix/core/docs/src/SUMMARY.md
--- a/modules/dream2nix/core/docs/src/highlight.js
+++ b/modules/dream2nix/core/docs/src/highlight.js
--- a/modules/dream2nix/core/docs/theme/favicon.png
+++ b/modules/dream2nix/core/docs/theme/favicon.png
--- a/modules/dream2nix/core/env/default.nix
+++ b/modules/dream2nix/core/env/default.nix
--- a/modules/dream2nix/core/eval-cache/default.nix
+++ b/modules/dream2nix/core/eval-cache/default.nix
--- a/modules/dream2nix/core/eval-cache/interface.nix
+++ b/modules/dream2nix/core/eval-cache/interface.nix
--- a/modules/dream2nix/core/flags/default.nix
+++ b/modules/dream2nix/core/flags/default.nix
--- a/modules/dream2nix/core/lock/default.nix
+++ b/modules/dream2nix/core/lock/default.nix
--- a/modules/dream2nix/core/lock/interface.nix
+++ b/modules/dream2nix/core/lock/interface.nix
--- a/modules/dream2nix/core/public/default.nix
+++ b/modules/dream2nix/core/public/default.nix
--- a/modules/dream2nix/core/public/interface.nix
+++ b/modules/dream2nix/core/public/interface.nix
--- a/modules/dream2nix/core/public/optsPackage.nix
+++ b/modules/dream2nix/core/public/optsPackage.nix
--- a/modules/dream2nix/core/public/optsPackageCompat.nix
+++ b/modules/dream2nix/core/public/optsPackageCompat.nix
--- a/modules/dream2nix/core/public/optsPackageDrvParts.nix
+++ b/modules/dream2nix/core/public/optsPackageDrvParts.nix
--- a/modules/dream2nix/core/ui/default.nix
+++ b/modules/dream2nix/core/ui/default.nix
--- a/modules/dream2nix/core/ui/interface.nix
+++ b/modules/dream2nix/core/ui/interface.nix
--- a/modules/dream2nix/derivation-common/options.nix
+++ b/modules/dream2nix/derivation-common/options.nix
--- a/modules/dream2nix/mkDerivation-sane-defaults/default.nix
+++ b/modules/dream2nix/mkDerivation-sane-defaults/default.nix
--- a/modules/dream2nix/mkDerivation/default.nix
+++ b/modules/dream2nix/mkDerivation/default.nix
--- a/modules/dream2nix/mkDerivation/implementation.nix
+++ b/modules/dream2nix/mkDerivation/implementation.nix
--- a/modules/dream2nix/mkDerivation/interface.nix
+++ b/modules/dream2nix/mkDerivation/interface.nix
@ -16,7 +16,7 @@
  # detected as modules by accident. (derivations are attrs as well as modules)
  drvPart = let
    type = t.submoduleWith {
-      modules = [dream2nix.modules.drv-parts.core];
+      modules = [dream2nix.modules.dream2nix.core];
      inherit specialArgs;
    };
  in
--- a/modules/dream2nix/nixpkgs-overrides/default.nix
+++ b/modules/dream2nix/nixpkgs-overrides/default.nix
--- a/modules/dream2nix/nixpkgs-overrides/interface.nix
+++ b/modules/dream2nix/nixpkgs-overrides/interface.nix
--- a/modules/dream2nix/nodejs-devshell/default.nix
+++ b/modules/dream2nix/nodejs-devshell/default.nix
@ -12,8 +12,8 @@
 in {
  imports = [
    ./interface.nix
-    dream2nix.modules.drv-parts.mkDerivation
-    dream2nix.modules.drv-parts.nodejs-package-lock
+    dream2nix.modules.dream2nix.mkDerivation
+    dream2nix.modules.dream2nix.nodejs-package-lock
  ];

  nodejs-devshell.nodeModules = {
--- a/modules/dream2nix/nodejs-devshell/interface.nix
+++ b/modules/dream2nix/nodejs-devshell/interface.nix
@ -14,8 +14,8 @@ in {
      type = t.submoduleWith {
        specialArgs = {inherit packageSets dream2nix;};
        modules = [
-          dream2nix.modules.drv-parts.core
-          dream2nix.modules.drv-parts.nodejs-node-modules
+          dream2nix.modules.dream2nix.core
+          dream2nix.modules.dream2nix.nodejs-node-modules
        ];
      };
    };
--- a/modules/dream2nix/nodejs-granular/buildPhase.nix
+++ b/modules/dream2nix/nodejs-granular/buildPhase.nix
--- a/modules/dream2nix/nodejs-granular/configurePhase.nix
+++ b/modules/dream2nix/nodejs-granular/configurePhase.nix
--- a/modules/dream2nix/nodejs-granular/default.nix
+++ b/modules/dream2nix/nodejs-granular/default.nix
@ -276,7 +276,7 @@
 in {
  imports = [
    ./interface.nix
-    dream2nix.modules.drv-parts.mkDerivation
+    dream2nix.modules.dream2nix.mkDerivation
    (commonModule defaultPackageName defaultPackageVersion)
  ];
  deps = {nixpkgs, ...}:
--- a/modules/dream2nix/nodejs-granular/devShell.nix
+++ b/modules/dream2nix/nodejs-granular/devShell.nix
--- a/modules/dream2nix/nodejs-granular/fix-package.py
+++ b/modules/dream2nix/nodejs-granular/fix-package.py
--- a/modules/dream2nix/nodejs-granular/install-deps.py
+++ b/modules/dream2nix/nodejs-granular/install-deps.py
--- a/modules/dream2nix/nodejs-granular/installPhase.nix
+++ b/modules/dream2nix/nodejs-granular/installPhase.nix
--- a/modules/dream2nix/nodejs-granular/interface.nix
+++ b/modules/dream2nix/nodejs-granular/interface.nix
@ -36,8 +36,8 @@ in {
    deps = {
      type = t.attrsOf (t.attrsOf (t.submodule {
        imports = [
-          dream2nix.modules.drv-parts.core
-          dream2nix.modules.drv-parts.mkDerivation
+          dream2nix.modules.dream2nix.core
+          dream2nix.modules.dream2nix.mkDerivation
          ./interface.nix
        ];
        _module.args = {inherit dream2nix packageSets;};
--- a/modules/dream2nix/nodejs-granular/link-bins.py
+++ b/modules/dream2nix/nodejs-granular/link-bins.py
--- a/modules/dream2nix/nodejs-granular/unpackPhase.nix
+++ b/modules/dream2nix/nodejs-granular/unpackPhase.nix
--- a/modules/dream2nix/nodejs-node-modules/default.nix
+++ b/modules/dream2nix/nodejs-node-modules/default.nix
@ -9,9 +9,9 @@
  cfg = config.nodejs-devshell;
 in {
  imports = [
-    dream2nix.modules.drv-parts.mkDerivation
-    dream2nix.modules.drv-parts.nodejs-package-lock
-    dream2nix.modules.drv-parts.nodejs-granular
+    dream2nix.modules.dream2nix.mkDerivation
+    dream2nix.modules.dream2nix.nodejs-package-lock
+    dream2nix.modules.dream2nix.nodejs-granular
  ];

  mkDerivation = {
--- a/modules/dream2nix/nodejs-package-json/default.nix
+++ b/modules/dream2nix/nodejs-package-json/default.nix
--- a/modules/dream2nix/nodejs-package-json/interface.nix
+++ b/modules/dream2nix/nodejs-package-json/interface.nix
--- a/modules/dream2nix/nodejs-package-lock/default.nix
+++ b/modules/dream2nix/nodejs-package-lock/default.nix
--- a/modules/dream2nix/nodejs-package-lock/interface.nix
+++ b/modules/dream2nix/nodejs-package-lock/interface.nix
--- a/modules/dream2nix/nodejs-package-lock/translate.nix
+++ b/modules/dream2nix/nodejs-package-lock/translate.nix
--- a/modules/dream2nix/package-func/default.nix
+++ b/modules/dream2nix/package-func/default.nix
--- a/modules/dream2nix/package-func/implementation.nix
+++ b/modules/dream2nix/package-func/implementation.nix
--- a/modules/dream2nix/package-func/interface.nix
+++ b/modules/dream2nix/package-func/interface.nix
--- a/modules/dream2nix/php-composer-lock/default.nix
+++ b/modules/dream2nix/php-composer-lock/default.nix
--- a/modules/dream2nix/php-composer-lock/interface.nix
+++ b/modules/dream2nix/php-composer-lock/interface.nix
--- a/modules/dream2nix/php-composer-lock/translate.nix
+++ b/modules/dream2nix/php-composer-lock/translate.nix
--- a/modules/dream2nix/php-granular/default.nix
+++ b/modules/dream2nix/php-granular/default.nix
@ -156,7 +156,7 @@

    module = {config, ...}: {
      imports = [
-        dream2nix.modules.drv-parts.mkDerivation
+        dream2nix.modules.dream2nix.mkDerivation
      ];
      deps = {nixpkgs, ...}:
        l.mapAttrs (_: l.mkDefault) {
--- a/modules/dream2nix/php-granular/devShell.nix
+++ b/modules/dream2nix/php-granular/devShell.nix
--- a/modules/dream2nix/php-granular/interface.nix
+++ b/modules/dream2nix/php-granular/interface.nix
@ -12,8 +12,8 @@ in {
    deps = {
      type = t.attrsOf (t.attrsOf (t.submodule {
        imports = [
-          dream2nix.modules.drv-parts.core
-          dream2nix.modules.drv-parts.mkDerivation
+          dream2nix.modules.dream2nix.core
+          dream2nix.modules.dream2nix.mkDerivation
          ./interface.nix
        ];
        _module.args = {inherit dream2nix packageSets;};
--- a/modules/dream2nix/pip-hotfixes/default.nix
+++ b/modules/dream2nix/pip-hotfixes/default.nix
--- a/modules/dream2nix/pip-hotfixes/interface.nix
+++ b/modules/dream2nix/pip-hotfixes/interface.nix
--- a/modules/dream2nix/pip/default.nix
+++ b/modules/dream2nix/pip/default.nix
@ -53,7 +53,7 @@

  commonModule = {config, ...}: {
    imports = [
-      dream2nix.modules.drv-parts.mkDerivation
+      dream2nix.modules.dream2nix.mkDerivation
      ../buildPythonPackage
    ];
    config = {
--- a/modules/dream2nix/pip/interface.nix
+++ b/modules/dream2nix/pip/interface.nix
@ -78,7 +78,7 @@ in {

    drvs = l.mkOption {
      type = t.lazyAttrsOf (t.submoduleWith {
-        modules = [dream2nix.modules.drv-parts.core];
+        modules = [dream2nix.modules.dream2nix.core];
        specialArgs = {inherit packageSets dream2nix;};
      });
      description = "drv-parts modules that define python dependencies";
--- a/modules/dream2nix/rust-cargo-lock/default.nix
+++ b/modules/dream2nix/rust-cargo-lock/default.nix
--- a/modules/dream2nix/rust-cargo-lock/findAllCrates.nix
+++ b/modules/dream2nix/rust-cargo-lock/findAllCrates.nix
--- a/modules/dream2nix/rust-cargo-lock/interface.nix
+++ b/modules/dream2nix/rust-cargo-lock/interface.nix
--- a/modules/dream2nix/rust-cargo-lock/translate.nix
+++ b/modules/dream2nix/rust-cargo-lock/translate.nix
--- a/modules/dream2nix/rust-crane/crane.nix
+++ b/modules/dream2nix/rust-crane/crane.nix
--- a/modules/dream2nix/rust-crane/default.nix
+++ b/modules/dream2nix/rust-crane/default.nix
@ -189,7 +189,7 @@
 in {
  imports = [
    ./interface.nix
-    dream2nix.modules.drv-parts.mkDerivation
+    dream2nix.modules.dream2nix.mkDerivation
  ];

  rust-crane.depsDrv = {
--- a/modules/dream2nix/rust-crane/devshell.nix
+++ b/modules/dream2nix/rust-crane/devshell.nix
--- a/modules/dream2nix/rust-crane/interface.nix
+++ b/modules/dream2nix/rust-crane/interface.nix
@ -56,7 +56,7 @@ in {
    };
    depsDrv = {
      type = t.submoduleWith {
-        modules = [dream2nix.modules.drv-parts.mkDerivation];
+        modules = [dream2nix.modules.dream2nix.mkDerivation];
        inherit specialArgs;
      };
      description = "A single derivation with all dependencies of the package";
--- a/modules/dream2nix/rust-crane/patch-workspace-deps.jq
+++ b/modules/dream2nix/rust-crane/patch-workspace-deps.jq
--- a/modules/dream2nix/rust-crane/utils.nix
+++ b/modules/dream2nix/rust-crane/utils.nix
--- a/Show More
+++ b/Show More