Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Inline nix-derivation (and PRs), extend #289

Draft
wants to merge 67 commits into
base: master
Choose a base branch
from
Draft

Inline nix-derivation (and PRs), extend #289

wants to merge 67 commits into from

Conversation

Ericson2314
Copy link
Member

@Ericson2314 Ericson2314 commented Oct 31, 2024 •
edited
Loading

  • Move the derivation types to core, cut down parameters somewhat
  • Rename (the rest of) nix-derivation to hnix-store-aterm, since I want to de-center ATerm as "the canonical form", and put it on the same level as the JSON.

Depends on #288

Gabriella439 and others added 30 commits June 4, 2017 19:39
@Gabriella439
Initial commit
cab6459
@Gabriella439
Add property tests
60439ee
@Gabriella439
Update documentation
c035165
@Gabriella439
Add README.md
8b12912
@Gabriella439
Fix typo in haddocks
c5cea2d
@Gabriella439
Change the builder field to a String
9821e1a 
This field is not always a `FilePath`.  For example, `builder` can be
`"builtins.fetchURL`
@Gabriella439
Polish source code
8df67c7
@Gabriella439
Add benchmark
c178a6d
Add shell.nix
1e1830a
Add pretty-derivation executable
52270b7
Document pretty-derivation in the README
ad19d04
Version 1.0.0 → 1.0.1
3b6ca71
Fix .cabal file
eea98e0
@Gabriella439
Increase upper bounds on dependencies (haskell-nix#2)
a932ba4 
Fixes haskell-nix#1
@Gabriella439
Version 1.0.1 → 1.0.2 (haskell-nix#3)
69cfd0e
@sorki
Higher order Derivation, filepath (haskell-nix#4)
b108aa5
@Gabriella439
Fix shell.nix (haskell-nix#6)
db6d461
@Gabriella439
Version 1.0.2 → 1.1.0 (haskell-nix#5)
7e335a4
@sorki
Delete references to release.nix from default.nix (haskell-nix#7)
3f95b84
@sorki
Add missing re-exports (haskell-nix#8)
69fb26a 
* Expose parseDerivationWith, buildDerivationWith and textParser

* Version 1.1.0 → 1.1.1 (haskell-nix#8)
@Gabriella439
Version 1.1.0 → 1.1.1 (haskell-nix#9)
4fb51cf
@cdepillabout
Bump QuickCheck dep to < 2.15 (haskell-nix#10)
73e2ee5
@sorki
GitHub Actions CI (haskell-nix#12)
bd19633 
Similar to Gabriella439/nix-diff#37
@Gabriella439
Improve performance of textParser (haskell-nix#13)
33acefc 
Fixes haskell-nix#11
@RocketPuppy
Add installation instructions to readme (haskell-nix#14)
249bfc5 
Only including instructions for Nix, since if you're using this project I think it's safe to assume you'll have Nix available.
@Gabriella439
Build against attoparsec-0.14 (haskell-nix#15)
97c1fae 
Related to commercialhaskell/stackage#5959
@Gabriella439
Version 1.1.1 → 1.1.2 (haskell-nix#16)
196a51f
@sjakobi
Allow text-2.0 (haskell-nix#17)
97ed33b 
https://hackage.haskell.org/package/text-2.0/changelog
@sorki
ci: Update versions (haskell-nix#19)
216fc99
@Gabriella439
Build against vector-0.13 (haskell-nix#20)
4d22dd5 
Related to commercialhaskell/stackage#6624
This was referenced Nov 1, 2024
Closed
Open
@Ericson2314 Ericson2314 mentioned this pull request Nov 4, 2024
Open
@Ericson2314
Copy link
Member Author

What I've started doing is

  1. Move the derivation types to core, cut down parameters somewhat
  2. Rename (the rest of) nix-derivation to hnix-store-aterm, since I want to de-center ATerm as "the canonical form", and put it on the same level as the JSON.

@Ericson2314
Progress integrating the derivation type
61dc135 
- The type is now in `hnix-store-core`

- The serialization logic (the rest of `nix-derivation`) is now called `hnix-store-aterm`

Most type errors are fixed.
@Ericson2314
Merge branch 'master' into derivation-work
78d6ce7
@Ericson2314
WIP daemon protocol
1ebff0d
@Ericson2314
Progress on hnix-core-aterm
115af91
@Ericson2314
Everything builds but the ATerm tests
e39462b
@Ericson2314
Import qualified post, derivation outputs in protocol
16cf064
@Ericson2314
Get hnix-store-aterm tests building
a0f0a86
@Ericson2314
Sort inputs in test file
35017eb 
The example sorted names before hashes, but `Nix` (at least these days)
and `hnix-store` do not do that.

Delete the redundant copies in `hnix-store-core`
@Ericson2314
Better errors for quick check test
7b27443
@Ericson2314
Get hnix-store-aterm tests passing!
50a1cd6
@Ericson2314
Copy link
Member Author

OK @sorki this now build completely, but I have introduced a regression in the daemon test suite.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@Ericson2314 @Gabriella439 @sorki @cdepillabout @RocketPuppy @sjakobi @rickynils