diff --git a/README.md b/README.md index 65ab65cf8c..85c2e58e78 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ Automate reproducible packaging for various language ecosystems
Documentation | - Examples + Examples

!!! Warning: dream2nix is unstable software. While simple UX is one of our main focus points, the APIs are still under development. Do expect changes that will break your setup. diff --git a/docs/src/intro.md b/docs/src/intro.md index 65ab65cf8c..85c2e58e78 100644 --- a/docs/src/intro.md +++ b/docs/src/intro.md @@ -8,7 +8,7 @@ Automate reproducible packaging for various language ecosystems
Documentation | - Examples + Examples

!!! Warning: dream2nix is unstable software. While simple UX is one of our main focus points, the APIs are still under development. Do expect changes that will break your setup. diff --git a/flake.nix b/flake.nix index 31f1a76d59..d978b82d0d 100644 --- a/flake.nix +++ b/flake.nix @@ -149,7 +149,7 @@ flake-parts.lib.mkFlake {inherit inputs;} { imports = [ ./templates - ./v1/nix/modules/flake-parts/all-modules.nix + ./modules/flake-parts/all-modules.nix ]; systems = [ "x86_64-linux" diff --git a/v1/nix/lib/internal/dreamLockUtils.nix b/lib/internal/dreamLockUtils.nix similarity index 100% rename from v1/nix/lib/internal/dreamLockUtils.nix rename to lib/internal/dreamLockUtils.nix diff --git a/v1/nix/lib/internal/fetchDreamLockSources.nix b/lib/internal/fetchDreamLockSources.nix similarity index 100% rename from v1/nix/lib/internal/fetchDreamLockSources.nix rename to lib/internal/fetchDreamLockSources.nix diff --git a/v1/nix/lib/internal/fetchers/archive/default.nix b/lib/internal/fetchers/archive/default.nix similarity index 100% rename from v1/nix/lib/internal/fetchers/archive/default.nix rename to lib/internal/fetchers/archive/default.nix diff --git a/v1/nix/lib/internal/fetchers/crates-io/default.nix b/lib/internal/fetchers/crates-io/default.nix similarity index 100% rename from v1/nix/lib/internal/fetchers/crates-io/default.nix rename to lib/internal/fetchers/crates-io/default.nix diff --git a/v1/nix/lib/internal/fetchers/extractSource.nix b/lib/internal/fetchers/extractSource.nix similarity index 100% rename from v1/nix/lib/internal/fetchers/extractSource.nix rename to lib/internal/fetchers/extractSource.nix diff --git a/v1/nix/lib/internal/fetchers/git/default.nix b/lib/internal/fetchers/git/default.nix similarity index 100% rename from v1/nix/lib/internal/fetchers/git/default.nix rename to lib/internal/fetchers/git/default.nix diff --git a/v1/nix/lib/internal/fetchers/github/default.nix b/lib/internal/fetchers/github/default.nix similarity index 100% rename from v1/nix/lib/internal/fetchers/github/default.nix rename to lib/internal/fetchers/github/default.nix diff --git a/v1/nix/lib/internal/fetchers/gitlab/default.nix b/lib/internal/fetchers/gitlab/default.nix similarity index 100% rename from v1/nix/lib/internal/fetchers/gitlab/default.nix rename to lib/internal/fetchers/gitlab/default.nix diff --git a/v1/nix/lib/internal/fetchers/http/default.nix b/lib/internal/fetchers/http/default.nix similarity index 100% rename from v1/nix/lib/internal/fetchers/http/default.nix rename to lib/internal/fetchers/http/default.nix diff --git a/v1/nix/lib/internal/fetchers/npm/default.nix b/lib/internal/fetchers/npm/default.nix similarity index 100% rename from v1/nix/lib/internal/fetchers/npm/default.nix rename to lib/internal/fetchers/npm/default.nix diff --git a/v1/nix/lib/internal/fetchers/path/default.nix b/lib/internal/fetchers/path/default.nix similarity index 100% rename from v1/nix/lib/internal/fetchers/path/default.nix rename to lib/internal/fetchers/path/default.nix diff --git a/v1/nix/lib/internal/fetchers/pypi-sdist/default.nix b/lib/internal/fetchers/pypi-sdist/default.nix similarity index 100% rename from v1/nix/lib/internal/fetchers/pypi-sdist/default.nix rename to lib/internal/fetchers/pypi-sdist/default.nix diff --git a/v1/nix/lib/internal/fetchers/pypi-wheel/default.nix b/lib/internal/fetchers/pypi-wheel/default.nix similarity index 100% rename from v1/nix/lib/internal/fetchers/pypi-wheel/default.nix rename to lib/internal/fetchers/pypi-wheel/default.nix diff --git a/v1/nix/lib/internal/getDreamLockSource.nix b/lib/internal/getDreamLockSource.nix similarity index 100% rename from v1/nix/lib/internal/getDreamLockSource.nix rename to lib/internal/getDreamLockSource.nix diff --git a/v1/nix/lib/internal/hashFile.nix b/lib/internal/hashFile.nix similarity index 100% rename from v1/nix/lib/internal/hashFile.nix rename to lib/internal/hashFile.nix diff --git a/v1/nix/lib/internal/hashPath.nix b/lib/internal/hashPath.nix similarity index 100% rename from v1/nix/lib/internal/hashPath.nix rename to lib/internal/hashPath.nix diff --git a/v1/nix/lib/internal/nodejsUtils.nix b/lib/internal/nodejsUtils.nix similarity index 100% rename from v1/nix/lib/internal/nodejsUtils.nix rename to lib/internal/nodejsUtils.nix diff --git a/v1/nix/lib/internal/parseSpdxId.nix b/lib/internal/parseSpdxId.nix similarity index 100% rename from v1/nix/lib/internal/parseSpdxId.nix rename to lib/internal/parseSpdxId.nix diff --git a/v1/nix/lib/internal/prepareSourceTree.nix b/lib/internal/prepareSourceTree.nix similarity index 100% rename from v1/nix/lib/internal/prepareSourceTree.nix rename to lib/internal/prepareSourceTree.nix diff --git a/v1/nix/lib/internal/readDreamLock.nix b/lib/internal/readDreamLock.nix similarity index 100% rename from v1/nix/lib/internal/readDreamLock.nix rename to lib/internal/readDreamLock.nix diff --git a/v1/nix/lib/internal/simpleTranslate.nix b/lib/internal/simpleTranslate.nix similarity index 100% rename from v1/nix/lib/internal/simpleTranslate.nix rename to lib/internal/simpleTranslate.nix diff --git a/v1/nix/modules/drv-parts/_template/default.nix b/modules/drv-parts/_template/default.nix similarity index 100% rename from v1/nix/modules/drv-parts/_template/default.nix rename to modules/drv-parts/_template/default.nix diff --git a/v1/nix/modules/drv-parts/_template/interface.nix b/modules/drv-parts/_template/interface.nix similarity index 100% rename from v1/nix/modules/drv-parts/_template/interface.nix rename to modules/drv-parts/_template/interface.nix diff --git a/v1/nix/modules/drv-parts/buildPythonPackage/default.nix b/modules/drv-parts/buildPythonPackage/default.nix similarity index 100% rename from v1/nix/modules/drv-parts/buildPythonPackage/default.nix rename to modules/drv-parts/buildPythonPackage/default.nix diff --git a/v1/nix/modules/drv-parts/buildPythonPackage/implementation.nix b/modules/drv-parts/buildPythonPackage/implementation.nix similarity index 100% rename from v1/nix/modules/drv-parts/buildPythonPackage/implementation.nix rename to modules/drv-parts/buildPythonPackage/implementation.nix diff --git a/v1/nix/modules/drv-parts/buildPythonPackage/interface.nix b/modules/drv-parts/buildPythonPackage/interface.nix similarity index 100% rename from v1/nix/modules/drv-parts/buildPythonPackage/interface.nix rename to modules/drv-parts/buildPythonPackage/interface.nix diff --git a/v1/nix/modules/drv-parts/eval-cache/default.nix b/modules/drv-parts/eval-cache/default.nix similarity index 100% rename from v1/nix/modules/drv-parts/eval-cache/default.nix rename to modules/drv-parts/eval-cache/default.nix diff --git a/v1/nix/modules/drv-parts/eval-cache/interface.nix b/modules/drv-parts/eval-cache/interface.nix similarity index 100% rename from v1/nix/modules/drv-parts/eval-cache/interface.nix rename to modules/drv-parts/eval-cache/interface.nix diff --git a/v1/nix/modules/drv-parts/lock/default.nix b/modules/drv-parts/lock/default.nix similarity index 100% rename from v1/nix/modules/drv-parts/lock/default.nix rename to modules/drv-parts/lock/default.nix diff --git a/v1/nix/modules/drv-parts/lock/interface.nix b/modules/drv-parts/lock/interface.nix similarity index 100% rename from v1/nix/modules/drv-parts/lock/interface.nix rename to modules/drv-parts/lock/interface.nix diff --git a/v1/nix/modules/drv-parts/nixpkgs-overrides/default.nix b/modules/drv-parts/nixpkgs-overrides/default.nix similarity index 100% rename from v1/nix/modules/drv-parts/nixpkgs-overrides/default.nix rename to modules/drv-parts/nixpkgs-overrides/default.nix diff --git a/v1/nix/modules/drv-parts/nixpkgs-overrides/interface.nix b/modules/drv-parts/nixpkgs-overrides/interface.nix similarity index 100% rename from v1/nix/modules/drv-parts/nixpkgs-overrides/interface.nix rename to modules/drv-parts/nixpkgs-overrides/interface.nix diff --git a/v1/nix/modules/drv-parts/nodejs-devshell/default.nix b/modules/drv-parts/nodejs-devshell/default.nix similarity index 100% rename from v1/nix/modules/drv-parts/nodejs-devshell/default.nix rename to modules/drv-parts/nodejs-devshell/default.nix diff --git a/v1/nix/modules/drv-parts/nodejs-devshell/interface.nix b/modules/drv-parts/nodejs-devshell/interface.nix similarity index 100% rename from v1/nix/modules/drv-parts/nodejs-devshell/interface.nix rename to modules/drv-parts/nodejs-devshell/interface.nix diff --git a/v1/nix/modules/drv-parts/nodejs-granular/buildPhase.nix b/modules/drv-parts/nodejs-granular/buildPhase.nix similarity index 100% rename from v1/nix/modules/drv-parts/nodejs-granular/buildPhase.nix rename to modules/drv-parts/nodejs-granular/buildPhase.nix diff --git a/v1/nix/modules/drv-parts/nodejs-granular/configurePhase.nix b/modules/drv-parts/nodejs-granular/configurePhase.nix similarity index 100% rename from v1/nix/modules/drv-parts/nodejs-granular/configurePhase.nix rename to modules/drv-parts/nodejs-granular/configurePhase.nix diff --git a/v1/nix/modules/drv-parts/nodejs-granular/default.nix b/modules/drv-parts/nodejs-granular/default.nix similarity index 100% rename from v1/nix/modules/drv-parts/nodejs-granular/default.nix rename to modules/drv-parts/nodejs-granular/default.nix diff --git a/v1/nix/modules/drv-parts/nodejs-granular/devShell.nix b/modules/drv-parts/nodejs-granular/devShell.nix similarity index 100% rename from v1/nix/modules/drv-parts/nodejs-granular/devShell.nix rename to modules/drv-parts/nodejs-granular/devShell.nix diff --git a/v1/nix/modules/drv-parts/nodejs-granular/fix-package.py b/modules/drv-parts/nodejs-granular/fix-package.py similarity index 100% rename from v1/nix/modules/drv-parts/nodejs-granular/fix-package.py rename to modules/drv-parts/nodejs-granular/fix-package.py diff --git a/v1/nix/modules/drv-parts/nodejs-granular/install-deps.py b/modules/drv-parts/nodejs-granular/install-deps.py similarity index 100% rename from v1/nix/modules/drv-parts/nodejs-granular/install-deps.py rename to modules/drv-parts/nodejs-granular/install-deps.py diff --git a/v1/nix/modules/drv-parts/nodejs-granular/installPhase.nix b/modules/drv-parts/nodejs-granular/installPhase.nix similarity index 100% rename from v1/nix/modules/drv-parts/nodejs-granular/installPhase.nix rename to modules/drv-parts/nodejs-granular/installPhase.nix diff --git a/v1/nix/modules/drv-parts/nodejs-granular/interface.nix b/modules/drv-parts/nodejs-granular/interface.nix similarity index 100% rename from v1/nix/modules/drv-parts/nodejs-granular/interface.nix rename to modules/drv-parts/nodejs-granular/interface.nix diff --git a/v1/nix/modules/drv-parts/nodejs-granular/link-bins.py b/modules/drv-parts/nodejs-granular/link-bins.py similarity index 100% rename from v1/nix/modules/drv-parts/nodejs-granular/link-bins.py rename to modules/drv-parts/nodejs-granular/link-bins.py diff --git a/v1/nix/modules/drv-parts/nodejs-granular/unpackPhase.nix b/modules/drv-parts/nodejs-granular/unpackPhase.nix similarity index 100% rename from v1/nix/modules/drv-parts/nodejs-granular/unpackPhase.nix rename to modules/drv-parts/nodejs-granular/unpackPhase.nix diff --git a/v1/nix/modules/drv-parts/nodejs-node-modules/default.nix b/modules/drv-parts/nodejs-node-modules/default.nix similarity index 100% rename from v1/nix/modules/drv-parts/nodejs-node-modules/default.nix rename to modules/drv-parts/nodejs-node-modules/default.nix diff --git a/v1/nix/modules/drv-parts/nodejs-package-json/default.nix b/modules/drv-parts/nodejs-package-json/default.nix similarity index 100% rename from v1/nix/modules/drv-parts/nodejs-package-json/default.nix rename to modules/drv-parts/nodejs-package-json/default.nix diff --git a/v1/nix/modules/drv-parts/nodejs-package-json/interface.nix b/modules/drv-parts/nodejs-package-json/interface.nix similarity index 100% rename from v1/nix/modules/drv-parts/nodejs-package-json/interface.nix rename to modules/drv-parts/nodejs-package-json/interface.nix diff --git a/v1/nix/modules/drv-parts/nodejs-package-lock/default.nix b/modules/drv-parts/nodejs-package-lock/default.nix similarity index 100% rename from v1/nix/modules/drv-parts/nodejs-package-lock/default.nix rename to modules/drv-parts/nodejs-package-lock/default.nix diff --git a/v1/nix/modules/drv-parts/nodejs-package-lock/interface.nix b/modules/drv-parts/nodejs-package-lock/interface.nix similarity index 100% rename from v1/nix/modules/drv-parts/nodejs-package-lock/interface.nix rename to modules/drv-parts/nodejs-package-lock/interface.nix diff --git a/v1/nix/modules/drv-parts/nodejs-package-lock/translate.nix b/modules/drv-parts/nodejs-package-lock/translate.nix similarity index 100% rename from v1/nix/modules/drv-parts/nodejs-package-lock/translate.nix rename to modules/drv-parts/nodejs-package-lock/translate.nix diff --git a/v1/nix/modules/drv-parts/pip/default.nix b/modules/drv-parts/pip/default.nix similarity index 100% rename from v1/nix/modules/drv-parts/pip/default.nix rename to modules/drv-parts/pip/default.nix diff --git a/v1/nix/modules/drv-parts/pip/interface.nix b/modules/drv-parts/pip/interface.nix similarity index 100% rename from v1/nix/modules/drv-parts/pip/interface.nix rename to modules/drv-parts/pip/interface.nix diff --git a/v1/nix/modules/drvs/ansible/default.nix b/modules/drvs/ansible/default.nix similarity index 100% rename from v1/nix/modules/drvs/ansible/default.nix rename to modules/drvs/ansible/default.nix diff --git a/v1/nix/modules/drvs/ansible/lock-x86_64-linux.json b/modules/drvs/ansible/lock-x86_64-linux.json similarity index 100% rename from v1/nix/modules/drvs/ansible/lock-x86_64-linux.json rename to modules/drvs/ansible/lock-x86_64-linux.json diff --git a/v1/nix/modules/drvs/apache-airflow/cache-x86_64-linux.json b/modules/drvs/apache-airflow/cache-x86_64-linux.json similarity index 100% rename from v1/nix/modules/drvs/apache-airflow/cache-x86_64-linux.json rename to modules/drvs/apache-airflow/cache-x86_64-linux.json diff --git a/v1/nix/modules/drvs/apache-airflow/default.nix b/modules/drvs/apache-airflow/default.nix similarity index 100% rename from v1/nix/modules/drvs/apache-airflow/default.nix rename to modules/drvs/apache-airflow/default.nix diff --git a/v1/nix/modules/drvs/apache-airflow/lock-x86_64-linux.json b/modules/drvs/apache-airflow/lock-x86_64-linux.json similarity index 100% rename from v1/nix/modules/drvs/apache-airflow/lock-x86_64-linux.json rename to modules/drvs/apache-airflow/lock-x86_64-linux.json diff --git a/v1/nix/modules/drvs/isso/default.nix b/modules/drvs/isso/default.nix similarity index 100% rename from v1/nix/modules/drvs/isso/default.nix rename to modules/drvs/isso/default.nix diff --git a/v1/nix/modules/drvs/isso/lock-x86_64-linux.json b/modules/drvs/isso/lock-x86_64-linux.json similarity index 100% rename from v1/nix/modules/drvs/isso/lock-x86_64-linux.json rename to modules/drvs/isso/lock-x86_64-linux.json diff --git a/v1/nix/modules/drvs/nodejs-no-lock/app.ts b/modules/drvs/nodejs-no-lock/app.ts similarity index 100% rename from v1/nix/modules/drvs/nodejs-no-lock/app.ts rename to modules/drvs/nodejs-no-lock/app.ts diff --git a/v1/nix/modules/drvs/nodejs-no-lock/default.nix b/modules/drvs/nodejs-no-lock/default.nix similarity index 91% rename from v1/nix/modules/drvs/nodejs-no-lock/default.nix rename to modules/drvs/nodejs-no-lock/default.nix index 04f427e5de..ffe30094f7 100644 --- a/v1/nix/modules/drvs/nodejs-no-lock/default.nix +++ b/modules/drvs/nodejs-no-lock/default.nix @@ -42,5 +42,5 @@ in { version = l.mkForce "0.0.0"; lock.lockFileRel = - l.mkForce "/v1/nix/modules/drvs/nodejs-no-lock/lock-${system}.json"; + l.mkForce "/modules/drvs/nodejs-no-lock/lock-${system}.json"; } diff --git a/v1/nix/modules/drvs/nodejs-no-lock/lock-x86_64-linux.json b/modules/drvs/nodejs-no-lock/lock-x86_64-linux.json similarity index 100% rename from v1/nix/modules/drvs/nodejs-no-lock/lock-x86_64-linux.json rename to modules/drvs/nodejs-no-lock/lock-x86_64-linux.json diff --git a/v1/nix/modules/drvs/nodejs-no-lock/package.json b/modules/drvs/nodejs-no-lock/package.json similarity index 100% rename from v1/nix/modules/drvs/nodejs-no-lock/package.json rename to modules/drvs/nodejs-no-lock/package.json diff --git a/v1/nix/modules/drvs/odoo/default.nix b/modules/drvs/odoo/default.nix similarity index 100% rename from v1/nix/modules/drvs/odoo/default.nix rename to modules/drvs/odoo/default.nix diff --git a/v1/nix/modules/drvs/odoo/lock-x86_64-linux.json b/modules/drvs/odoo/lock-x86_64-linux.json similarity index 100% rename from v1/nix/modules/drvs/odoo/lock-x86_64-linux.json rename to modules/drvs/odoo/lock-x86_64-linux.json diff --git a/v1/nix/modules/drvs/pillow/default.nix b/modules/drvs/pillow/default.nix similarity index 100% rename from v1/nix/modules/drvs/pillow/default.nix rename to modules/drvs/pillow/default.nix diff --git a/v1/nix/modules/drvs/pillow/lock-x86_64-linux.json b/modules/drvs/pillow/lock-x86_64-linux.json similarity index 100% rename from v1/nix/modules/drvs/pillow/lock-x86_64-linux.json rename to modules/drvs/pillow/lock-x86_64-linux.json diff --git a/v1/nix/modules/drvs/prettier-devshell/default.nix b/modules/drvs/prettier-devshell/default.nix similarity index 100% rename from v1/nix/modules/drvs/prettier-devshell/default.nix rename to modules/drvs/prettier-devshell/default.nix diff --git a/v1/nix/modules/drvs/prettier-node-modules/default.nix b/modules/drvs/prettier-node-modules/default.nix similarity index 100% rename from v1/nix/modules/drvs/prettier-node-modules/default.nix rename to modules/drvs/prettier-node-modules/default.nix diff --git a/v1/nix/modules/drvs/prettier/default.nix b/modules/drvs/prettier/default.nix similarity index 100% rename from v1/nix/modules/drvs/prettier/default.nix rename to modules/drvs/prettier/default.nix diff --git a/v1/nix/modules/flake-parts/_template.nix b/modules/flake-parts/_template.nix similarity index 100% rename from v1/nix/modules/flake-parts/_template.nix rename to modules/flake-parts/_template.nix diff --git a/v1/nix/modules/flake-parts/all-modules.nix b/modules/flake-parts/all-modules.nix similarity index 100% rename from v1/nix/modules/flake-parts/all-modules.nix rename to modules/flake-parts/all-modules.nix diff --git a/v1/nix/modules/flake-parts/apps.update-caches.nix b/modules/flake-parts/apps.update-caches.nix similarity index 100% rename from v1/nix/modules/flake-parts/apps.update-caches.nix rename to modules/flake-parts/apps.update-caches.nix diff --git a/v1/nix/modules/flake-parts/apps.update-locks.nix b/modules/flake-parts/apps.update-locks.nix similarity index 100% rename from v1/nix/modules/flake-parts/apps.update-locks.nix rename to modules/flake-parts/apps.update-locks.nix diff --git a/v1/nix/modules/flake-parts/drv-parts.nix b/modules/flake-parts/drv-parts.nix similarity index 100% rename from v1/nix/modules/flake-parts/drv-parts.nix rename to modules/flake-parts/drv-parts.nix diff --git a/v1/nix/modules/flake-parts/lib.evalModules.nix b/modules/flake-parts/lib.evalModules.nix similarity index 100% rename from v1/nix/modules/flake-parts/lib.evalModules.nix rename to modules/flake-parts/lib.evalModules.nix diff --git a/v1/nix/modules/flake-parts/packages.fetchPipMetadata.nix b/modules/flake-parts/packages.fetchPipMetadata.nix similarity index 100% rename from v1/nix/modules/flake-parts/packages.fetchPipMetadata.nix rename to modules/flake-parts/packages.fetchPipMetadata.nix diff --git a/v1/nix/modules/flake-parts/packages.nix b/modules/flake-parts/packages.nix similarity index 89% rename from v1/nix/modules/flake-parts/packages.nix rename to modules/flake-parts/packages.nix index c333b89d61..7ca009381e 100644 --- a/v1/nix/modules/flake-parts/packages.nix +++ b/modules/flake-parts/packages.nix @@ -13,9 +13,9 @@ }: let # A module imported into every package setting up the eval cache setup = {config, ...}: { - lock.lockFileRel = "/v1/nix/modules/drvs/${config.name}/lock-${system}.json"; + lock.lockFileRel = "/modules/drvs/${config.name}/lock-${system}.json"; lock.repoRoot = self; - eval-cache.cacheFileRel = "/v1/nix/modules/drvs/${config.name}/cache-${system}.json"; + eval-cache.cacheFileRel = "/modules/drvs/${config.name}/cache-${system}.json"; eval-cache.repoRoot = self; eval-cache.enable = true; deps.npm = inputs.nixpkgs.legacyPackages.${system}.nodejs.pkgs.npm.override (old: rec { diff --git a/v1/nix/modules/flake-parts/writers.nix b/modules/flake-parts/writers.nix similarity index 100% rename from v1/nix/modules/flake-parts/writers.nix rename to modules/flake-parts/writers.nix diff --git a/v1/nix/pkgs/fetchPipMetadata/default.nix b/pkgs/fetchPipMetadata/default.nix similarity index 100% rename from v1/nix/pkgs/fetchPipMetadata/default.nix rename to pkgs/fetchPipMetadata/default.nix diff --git a/v1/nix/pkgs/fetchPipMetadata/fetchPipMetadata.nix b/pkgs/fetchPipMetadata/fetchPipMetadata.nix similarity index 100% rename from v1/nix/pkgs/fetchPipMetadata/fetchPipMetadata.nix rename to pkgs/fetchPipMetadata/fetchPipMetadata.nix diff --git a/v1/nix/pkgs/fetchPipMetadata/filter-pypi-responses.py b/pkgs/fetchPipMetadata/filter-pypi-responses.py similarity index 100% rename from v1/nix/pkgs/fetchPipMetadata/filter-pypi-responses.py rename to pkgs/fetchPipMetadata/filter-pypi-responses.py diff --git a/v1/nix/pkgs/fetchPipMetadata/package.nix b/pkgs/fetchPipMetadata/package.nix similarity index 100% rename from v1/nix/pkgs/fetchPipMetadata/package.nix rename to pkgs/fetchPipMetadata/package.nix diff --git a/v1/nix/pkgs/fetchPipMetadata/src/.envrc b/pkgs/fetchPipMetadata/src/.envrc similarity index 100% rename from v1/nix/pkgs/fetchPipMetadata/src/.envrc rename to pkgs/fetchPipMetadata/src/.envrc diff --git a/v1/nix/pkgs/fetchPipMetadata/src/fetch_pip_metadata/__init__.py b/pkgs/fetchPipMetadata/src/fetch_pip_metadata/__init__.py similarity index 100% rename from v1/nix/pkgs/fetchPipMetadata/src/fetch_pip_metadata/__init__.py rename to pkgs/fetchPipMetadata/src/fetch_pip_metadata/__init__.py diff --git a/v1/nix/pkgs/fetchPipMetadata/src/fetch_pip_metadata/lock_file_from_report.py b/pkgs/fetchPipMetadata/src/fetch_pip_metadata/lock_file_from_report.py similarity index 100% rename from v1/nix/pkgs/fetchPipMetadata/src/fetch_pip_metadata/lock_file_from_report.py rename to pkgs/fetchPipMetadata/src/fetch_pip_metadata/lock_file_from_report.py diff --git a/v1/nix/pkgs/fetchPipMetadata/src/fetch_pip_metadata/pypi_proxy.py b/pkgs/fetchPipMetadata/src/fetch_pip_metadata/pypi_proxy.py similarity index 100% rename from v1/nix/pkgs/fetchPipMetadata/src/fetch_pip_metadata/pypi_proxy.py rename to pkgs/fetchPipMetadata/src/fetch_pip_metadata/pypi_proxy.py diff --git a/v1/nix/pkgs/fetchPipMetadata/src/pyproject.toml b/pkgs/fetchPipMetadata/src/pyproject.toml similarity index 100% rename from v1/nix/pkgs/fetchPipMetadata/src/pyproject.toml rename to pkgs/fetchPipMetadata/src/pyproject.toml diff --git a/v1/nix/pkgs/fetchPipMetadata/src/shell.nix b/pkgs/fetchPipMetadata/src/shell.nix similarity index 100% rename from v1/nix/pkgs/fetchPipMetadata/src/shell.nix rename to pkgs/fetchPipMetadata/src/shell.nix diff --git a/v1/nix/pkgs/fetchPipMetadata/src/tests/conftest.py b/pkgs/fetchPipMetadata/src/tests/conftest.py similarity index 100% rename from v1/nix/pkgs/fetchPipMetadata/src/tests/conftest.py rename to pkgs/fetchPipMetadata/src/tests/conftest.py diff --git a/v1/nix/pkgs/fetchPipMetadata/src/tests/test_evaluate_extras.py b/pkgs/fetchPipMetadata/src/tests/test_evaluate_extras.py similarity index 100% rename from v1/nix/pkgs/fetchPipMetadata/src/tests/test_evaluate_extras.py rename to pkgs/fetchPipMetadata/src/tests/test_evaluate_extras.py diff --git a/v1/nix/pkgs/fetchPipMetadata/src/tests/test_evaluate_requirements.py b/pkgs/fetchPipMetadata/src/tests/test_evaluate_requirements.py similarity index 100% rename from v1/nix/pkgs/fetchPipMetadata/src/tests/test_evaluate_requirements.py rename to pkgs/fetchPipMetadata/src/tests/test_evaluate_requirements.py diff --git a/v1/nix/pkgs/fetchPipMetadata/src/tests/test_lock_entry_from_report_entry.py b/pkgs/fetchPipMetadata/src/tests/test_lock_entry_from_report_entry.py similarity index 100% rename from v1/nix/pkgs/fetchPipMetadata/src/tests/test_lock_entry_from_report_entry.py rename to pkgs/fetchPipMetadata/src/tests/test_lock_entry_from_report_entry.py diff --git a/v1/nix/pkgs/fetchPipMetadata/src/tests/test_lock_file_from_report.py b/pkgs/fetchPipMetadata/src/tests/test_lock_file_from_report.py similarity index 100% rename from v1/nix/pkgs/fetchPipMetadata/src/tests/test_lock_file_from_report.py rename to pkgs/fetchPipMetadata/src/tests/test_lock_file_from_report.py diff --git a/v1/nix/pkgs/fetchPipMetadata/src/tests/test_lock_info_from_fod.py b/pkgs/fetchPipMetadata/src/tests/test_lock_info_from_fod.py similarity index 100% rename from v1/nix/pkgs/fetchPipMetadata/src/tests/test_lock_info_from_fod.py rename to pkgs/fetchPipMetadata/src/tests/test_lock_info_from_fod.py diff --git a/v1/nix/pkgs/fetchPipMetadata/src/tests/test_lock_info_from_path.py b/pkgs/fetchPipMetadata/src/tests/test_lock_info_from_path.py similarity index 100% rename from v1/nix/pkgs/fetchPipMetadata/src/tests/test_lock_info_from_path.py rename to pkgs/fetchPipMetadata/src/tests/test_lock_info_from_path.py diff --git a/v1/nix/pkgs/fetchPipMetadata/src/tests/test_path_from_file_url.py b/pkgs/fetchPipMetadata/src/tests/test_path_from_file_url.py similarity index 100% rename from v1/nix/pkgs/fetchPipMetadata/src/tests/test_path_from_file_url.py rename to pkgs/fetchPipMetadata/src/tests/test_path_from_file_url.py diff --git a/v1/nix/pkgs/fetchPipMetadata/src/tests/test_repo_root.py b/pkgs/fetchPipMetadata/src/tests/test_repo_root.py similarity index 100% rename from v1/nix/pkgs/fetchPipMetadata/src/tests/test_repo_root.py rename to pkgs/fetchPipMetadata/src/tests/test_repo_root.py diff --git a/v1/nix/pkgs/writers/default.nix b/pkgs/writers/default.nix similarity index 100% rename from v1/nix/pkgs/writers/default.nix rename to pkgs/writers/default.nix