Commit Graph

245 Commits

Author SHA1 Message Date
hsjobeki
44f946d814 init: package-lock.json V3 parser 2023-09-05 16:22:57 +02:00
Vincent Vanlaer
3fd2db74d3
Support git repositories in fetchPipMetadata; take 2 (#637)
* Make pip lock script use its own python version

To make the lock script independent of the python version used in the
user's project, it needs to use its own python environment. This was
already the case for the mitm proxy, but not yet for the lock script
itself. This commit ensures that the lock script uses its own python
environment, independent of the user python version, and shares it with
the mitm proxy.

* Fix IOKit dependency in htop example

* Add hash for git based packages

* Support install git dependencies

* Add test for pip with git dependency

* Update lockfiles for python example projects

This does not change any of the hashes or versions, just adds the type:
"url" property.

---------

Co-authored-by: DavHau <hsngrmpf+github@gmail.com>
2023-09-05 00:40:05 +02:00
DavHau
1c959a708c fix(pip): missing writeText dependency 2023-09-04 03:51:56 +00:00
DavHau
e0d25af360 refactor(fetchPipMetadata)
- add flake-module.nix
- remove custom logic to find the repo root
- use findRoot script to find repo root
- use gitMinimal instead of git
- use separate python version for lock script than the python version to lock for. This prevents rebuilds and allows defining a standalone fetchPipMetadata package
2023-09-03 22:47:21 +00:00
DavHau
cb801a7994 fix(pip): conflicting override priority 2023-09-03 12:35:07 +00:00
DavHau
f9ccbf3e3f feat(pip): add .devShell attribute to package 2023-09-03 12:35:07 +00:00
DavHau
203cd1c656 fix(pip): remove default for format
This prevents an error where mkDerivation.src is coerced to a string while it is null which leads to hard to debug scenarios

I don't think we need this default logic for the top-level. The logic is still kept for the dependencies.
2023-09-03 12:10:23 +00:00
DavHau
e2470b3171 fix(paths): fix computation of lock and cache file paths 2023-09-03 10:28:43 +00:00
DavHau
ddbd3a159b example-repo: use dream2nix.lib.evalModules 2023-09-03 01:09:42 +00:00
DavHau
5d561bbf35 Revert "Support install git dependencies"
This reverts commit ecffc169c3.
2023-09-02 23:50:02 +00:00
Vincent Vanlaer
ecffc169c3 Support install git dependencies 2023-09-02 23:41:36 +00:00
DavHau
ec55d1d74b cleanup: remove commented code 2023-09-02 23:38:22 +00:00
DavHau
87722db970 feat(paths): init new core module 'paths'
This is to improve package location finding at eval time and script execution time.

Deprecates options lock.{repoRoot,lockFileRel} as well as option eval-cache.{repoRoot, cacheFileRel}

Instead the user must now set:
  - paths.projectRoot: pointing to the repoRoot
  - paths.package: pointing to the package directory

- paths.projectRootFile can be used to define a marker file to find the project root. The default is '.git' but it could be set to 'flake.nix' for example
- lock files are by default put in the same directory as the package definition
2023-09-02 23:34:54 +00:00
DavHau
39885acca7 deps: simplify example 2023-09-02 19:35:04 +00:00
DavHau
c5f5b03944 refactor: rename modules.drv-parts => modules.dream2nix 2023-08-31 13:09:43 +00:00
DavHau
f4371d3e9b refactor(examples): re-categorize
new categories:
- basics
- single-language
- multi-language
2023-08-31 12:53:22 +00:00
DavHau
cf0bd2e99a
Port php to dream2nix modules (#623)
* init: composer

* initial attempt to translating composer lock

* fix(v1/php): use simpleTranslate2 instead of simpleTranslate

* chore: rebasing

* init: granular module

* lib/internal/simpleTranslate2: revert accidental changes

* php: fix php-granular builder module

* php-compser-lock: cleanup

---------

Co-authored-by: asrar <aszenz@gmail.com>
2023-08-29 17:47:13 +02:00
DavHau
9b721a5cd3 feat(rust-crane): get rid of depsDrvOptions and use mkDerivation as a submodule instead 2023-08-28 22:20:28 +00:00
DavHau
42ac2de3a3 feat(rust-crane): use mkDerivation instead of mainDrvOptions 2023-08-28 22:20:28 +00:00
DavHau
2954969468 refactor(rust-crane): move crane dependency out of config.deps 2023-08-28 22:20:28 +00:00
Yusuf Bera Ertan
6e8a22196b feat(rust): pass mkDerivation options to crane options, add options to specify arguments for main and deps derivations 2023-08-28 22:20:28 +00:00
Yusuf Bera Ertan
5b4775c457 refactor: remove devshell code from buildRustPackage 2023-08-28 22:20:28 +00:00
Yusuf Bera Ertan
39a895d579 feat(rust): add some options to crane builder, move rust drvs to examples dir 2023-08-28 22:20:28 +00:00
Yusuf Bera Ertan
b2ca3da052 feat(rust): port crane builder 2023-08-28 22:20:28 +00:00
Yusuf Bera Ertan
55b0141465 docs(rust): update some comments 2023-08-28 22:20:28 +00:00
DavHau
4ef27221f7 feat(rust): move v1/nix/modules to modules 2023-08-28 22:20:28 +00:00
DavHau
69560f5128 chore(v1): get rid of dreamLockUtils.nix 2023-08-28 22:20:28 +00:00
DavHau
4663912a1c tests: add nix unit tests for pip module 2023-08-28 15:27:03 +00:00
DavHau
678272fa4e pip: add internal option pip.rootDependencies
- this allows to select the rootDependencies manually or via an additional module like pip-hotfixes
2023-08-28 15:27:03 +00:00
DavHau
6646e20dfb refactor(pip): move flattenDependencies and ignoredDependencies to separate module pip-hotfixes 2023-08-28 15:27:03 +00:00
DavHau
b58cc53fac feat(pip): add option ignoredDependencies, to ignore dependencies like wheel
also add unzip to native build inputs to allow .zip sdist files
2023-08-28 15:27:03 +00:00
DavHau
919cd21990 feat(pip): add option flattenedDependencies for requirements specifications without root 2023-08-28 15:27:03 +00:00
DavHau
5724c1e389 lib.evalModules: fix reference to modules 2023-08-28 15:27:03 +00:00
DavHau
01496bcc72 modules: add standalone flake 2023-08-07 13:51:03 +00:00
DavHau
995aca8d7d all-modules: ignore files in module directory 2023-08-07 13:51:03 +00:00
DavHau
890d60bcb4 examples: move to /examples from /modules/drvs 2023-07-29 15:08:40 +02:00
DavHau
ef388ef84c chore(modules): move core modules to ./modules/core 2023-07-29 12:36:13 +02:00
DavHau
fee831dd8f drv-parts: migrate some examples from drv-parts repo 2023-07-29 12:36:13 +02:00
DavHau
92aa826648 refactor: move drv-parts into dream2nix
because managing a single repo is simpler than managing two.
2023-07-29 12:36:04 +02:00
DavHau
4dc2377896 packages.nix: fix typo 2023-07-29 09:45:31 +02:00
DavHau
c93ace7b6b chore: reformat docs for writers 2023-07-26 16:15:11 +02:00
DavHau
9023d3bf18 chore: format 2023-07-26 15:52:57 +02:00
Robert Hensing
3d4131046b Add module docs for writers 2023-07-26 15:52:57 +02:00
DavHau
cdfbf98a11 feat: add dream2nix.modules.drv-parts.core
This already includes the `lock` module and makes it easier to call dream2nix via evalModules
2023-07-24 14:39:01 +02:00
DavHau
96a11d4197 move v1/nix to top-level 2023-07-19 15:53:03 +02:00