nix-community/dream2nix
1
1
Fork 0
mirror of https://github.com/nix-community/dream2nix.git synced 2024-12-25 23:41:42 +03:00
Code Issues Projects Releases Wiki Activity
1,619 Commits 74 Branches 0 Tags 43 MiB
b49c9bb57f
Commit Graph

1619 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Yang, Bo
81f165f528 Fix error when src is a local directory 
I encountered the following error when running `nix develop`
```
       > Cannot copy . to .: destination already exists!
       > Did you specify two "srcs" with the same "name"?
       > do not know how to unpack source archive .
       For full logs, run 'nix log /nix/store/fy1mpipp9xb7ds1m081q5x7f3c53j8i2-python3.10-default.drv'.
```

The error can be fixed with this PR. See https://nixos.org/manual/nixpkgs/stable/#sec-pkgs-mkShell-usage
 2023-03-23 05:02:06 +00:00
DavHau
00f5be531b
Merge pull request #497 from phaer/fixes 
small fixes + python: read egg-info metadata, not requirements.txt
 2023-03-22 23:33:24 +08:00
DavHau
f2b02bc056 chore(v1): remove some packages from checks (temporarily) 2023-03-22 23:30:58 +08:00
DavHau
694d895f2c fix(nixpkgs-overrides): fix attrs from nixpkgs not applied 2023-03-22 23:17:55 +08:00
phaer
bd4b8b36a6 fix(fetchPip): re-add requirements.txt support 2023-03-22 23:17:55 +08:00
phaer
fa58684291 fix(eval-cache): prevent infinite recursion in doc 2023-03-22 23:17:55 +08:00
phaer
a47ec7511a fix(nixpkgs-overrides): only extract existing pkgs 2023-03-22 23:17:55 +08:00
phaer
eb9e70bdd2 feat(fetch-python-reqs): read egg-info, not... 
...requirements.txt. The latter was a dirty hack as its meant for
environments and doesn't really include package metadata.
egg-info + dist info seems to cover most of pypi.
 2023-03-22 23:17:55 +08:00
DavHau
6e9c012806
Merge pull request #498 from nix-community/lock 
Add module `lock`: Generic lock file interactions
 2023-03-22 23:16:51 +08:00
DavHau
dce1cbc2ef feat(updateFODHash): fixes + rename to compureFODHash 2023-03-22 23:09:08 +08:00
DavHau
a984457902 fix(lock): fix config.name refs and makeDrv 2023-03-22 12:50:03 +08:00
phaer
f07cfcaf71 fix(tests): use alejandra from nixpkgs 2023-03-22 12:06:42 +08:00
phaer
2f162e68e8 chore(lock): move updateFODHash to lock part 2023-03-22 12:03:41 +08:00
phaer
530a05eec0 fix(lock): simplify & clarify log msg... 
We don't need to build dependencies separately anymore, as we now check
the drv_path in the nix build log.

Also, the hash found does not have to be "new", it could be the same as
before.
 2023-03-22 12:03:41 +08:00
phaer
7ba5d4abc9 feat(lock): re-implement in python... 
as discussed during the last weekly, where we've implemented a
prototype, this replaces the nix + jq magic with python.

it requires more SLOCs and error handling could further be improved,
but i think it helps readability and makes the logic of parsing
nix build logs a bit more robust by checking that we get a hash
for the drv_path we expected.

Empty hash is replaced by l.fakeSha256 to silence a nix warning.
 2023-03-22 12:03:41 +08:00
DavHau
8a85ff2904 feat(lock): init lock module for generic locking via json file 2023-03-22 12:03:41 +08:00
DavHau
58e6e18ce4 chore(fetchPip): remove unused args 2023-03-22 10:53:55 +08:00
DavHau
f04f032418 Handle zip files in write-dependency-tree 
Authored-by: @phaer
 2023-03-21 12:53:50 +07:00
DavHau
b1b5887ce8 chore(fetchPythonRequirements): rename to fetchPip 2023-03-21 12:44:05 +07:00
DavHau
a677084257 chore(fetchPythonRequirements): refactor code 
- add and improve comments
- reduce nesting in several places
- move requirementsFiles flag logic to python
- MAX_DATE -> maxDate
- respect column 80 wherever possible
 2023-03-21 12:35:54 +07:00
Arnout Engelen
fd490e1c9d
PHP: don't override patchPhase 
The advantage is that this means the original `patchPhase` becomes
available again, so people can use `patches` in overrides.
 2023-03-20 12:12:41 +01:00
DavHau
4aa6e86907 chore(v1): move name & version to top-level 2023-03-19 14:46:59 +07:00
DavHau
fa5668eef3 chore: remove unused arguments from some legacy modules 2023-03-19 14:25:53 +07:00
DavHau
13904ccd31 chore: fix comment in ./src/modules/builders/implementation.nix 2023-03-19 14:24:12 +07:00
DavHau
f6b2e4bd41 fix(devShell): remove pinned nix from devShell 2023-03-19 14:23:40 +07:00
DavHau
1038c66dce chore(v1): update drv-parts 2023-03-19 14:23:04 +07:00
DavHau
92caa82c50
Merge pull request #495 from raboof/no-root-for-dist-source 
PHP: don't set rootName for `dist` type `path`
 2023-03-18 18:46:42 +07:00
Arnout Engelen
c6fafff4c0
PHP: don't set rootName for dist type path 
It looks like `rootName` should be set to the *parent* name,
but currently points at the name of the dependency component.

Fixes #488, though it seems this was changed intentionally by
@tinybeachthor in #311 (specifically 156d7e0f50),
so this might break something else?
 2023-03-18 12:14:17 +01:00
DavHau
7f422cf4f3
Merge pull request #490 from raboof/document-adding-projects.toml-to-git 
Document adding `project.toml` to git more explicitly
 2023-03-17 19:47:28 +07:00
Arnout Engelen
0987c82ee2
Document adding project.toml to git more explicitly 
Easy to miss for beginning users :)
 2023-03-17 11:25:46 +01:00
DavHau
b33c9b858d
Merge pull request #489 from raboof/document-inspecting-generic-lockfile 
Document inspecting the generic lockfile
 2023-03-17 17:15:47 +07:00
Arnout Engelen
88b0e94dfa
Document inspecting the generic lockfile 2023-03-17 09:25:32 +01:00
DavHau
b33fb62466
Merge pull request #486 from phaer/merge-v1 
v1: merge attrs-from-nixpkgs into nixpkgs-override
 2023-03-17 12:36:02 +07:00
phaer
0007206ea1 feat: merge attrs-from-... into nixpkgs-overrides 2023-03-15 14:12:48 +01:00
DavHau
1d36c7f3ce
Merge pull request #485 from nix-community/merge-v1 
Init module system based dream2nix (towards V1 API)
 2023-03-13 19:53:45 +07:00
DavHau
e8e2978bd4 chore(v1/drvs): update json cache files 2023-03-13 13:38:35 +07:00
DavHau
2404e5e449 fix(v1/eval-cache): several fixes 2023-03-13 13:36:52 +07:00
DavHau
fe667757c8 chore(v1/docs): add doc comments to some flake-parts modules 2023-03-13 12:46:11 +07:00
DavHau
7f2d9e53fa fix(format): reformat write-dependency-tree.py 2023-03-13 12:46:11 +07:00
DavHau
182cdf306d fix(v1/packages): update FOD hashes for all python packages 2023-03-13 12:46:11 +07:00
DavHau
969847352f fix(v1/packages): only output for x86_64-linux 2023-03-13 12:46:11 +07:00
DavHau
d152844a15 fix(fetchPythonRequirements): output sorted dict 2023-03-13 12:46:11 +07:00
DavHau
600a2cbecc chore(formatting): reformat v1 code - python files 2023-03-13 12:46:11 +07:00
DavHau
d96e7234e3 chore(formatting): format v1 code with alejandra 2023-03-13 12:46:11 +07:00
DavHau
3cf6d7fcac chore(formatting): use alejandra from nixpkgs 2023-03-13 12:46:11 +07:00
DavHau
ac63eb584f feat: integrate v1 into top-level fake 2023-03-13 12:46:11 +07:00
DavHau
93102e5fdf feat(mach-nix): init module nixpkgs-overrides 2023-03-13 12:46:11 +07:00
DavHau
6210b38ef3 chore: switch nixpkgs to nixos-22.11 and update FOD hashes 2023-03-13 12:46:11 +07:00
phaer
71c396138c feat(mach-nix): use drv-parts for dependencies. 2023-03-13 12:46:11 +07:00
phaer
52a6fc802a style(mach-nix): add makeModuleFromDerivation 2023-03-13 12:46:11 +07:00