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

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

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

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

wants to merge 57 commits into from

Commits on Jun 5, 2017

  1. Initial commit

    @Gabriella439
    Gabriella439 committed Jun 5, 2017
    Configuration menu
    Copy the full SHA
    cab6459 View commit details
    Browse the repository at this point in the history

  2. Add property tests

    @Gabriella439
    Gabriella439 committed Jun 5, 2017
    Configuration menu
    Copy the full SHA
    60439ee View commit details
    Browse the repository at this point in the history

  3. Update documentation

    @Gabriella439
    Gabriella439 committed Jun 5, 2017
    Configuration menu
    Copy the full SHA
    c035165 View commit details
    Browse the repository at this point in the history

  4. Add README.md

    @Gabriella439
    Gabriella439 committed Jun 5, 2017
    Configuration menu
    Copy the full SHA
    8b12912 View commit details
    Browse the repository at this point in the history

  5. Fix typo in haddocks

    @Gabriella439
    Gabriella439 committed Jun 5, 2017
    Configuration menu
    Copy the full SHA
    c5cea2d View commit details
    Browse the repository at this point in the history

Commits on Jun 7, 2017

  1. Change the builder field to a String 

    This field is not always a `FilePath`.  For example, `builder` can be
`"builtins.fetchURL`
    @Gabriella439
    Gabriella439 committed Jun 7, 2017
    Configuration menu
    Copy the full SHA
    9821e1a View commit details
    Browse the repository at this point in the history

  2. Polish source code

    @Gabriella439
    Gabriella439 committed Jun 7, 2017
    Configuration menu
    Copy the full SHA
    8df67c7 View commit details
    Browse the repository at this point in the history

Commits on Jun 8, 2017

  1. Add benchmark

    @Gabriella439
    Gabriella439 committed Jun 8, 2017
    Configuration menu
    Copy the full SHA
    c178a6d View commit details
    Browse the repository at this point in the history

Commits on Oct 21, 2017

  1. Add shell.nix

    Gabriel Gonzalez committed Oct 21, 2017
    Configuration menu
    Copy the full SHA
    1e1830a View commit details
    Browse the repository at this point in the history

  2. Add pretty-derivation executable

    Gabriel Gonzalez committed Oct 21, 2017
    Configuration menu
    Copy the full SHA
    52270b7 View commit details
    Browse the repository at this point in the history

  3. Document pretty-derivation in the README

    Gabriel Gonzalez committed Oct 21, 2017
    Configuration menu
    Copy the full SHA
    ad19d04 View commit details
    Browse the repository at this point in the history

  4. Version 1.0.0 → 1.0.1

    Gabriel Gonzalez committed Oct 21, 2017
    Configuration menu
    Copy the full SHA
    3b6ca71 View commit details
    Browse the repository at this point in the history

  5. Fix .cabal file

    Gabriel Gonzalez committed Oct 21, 2017
    Configuration menu
    Copy the full SHA
    eea98e0 View commit details
    Browse the repository at this point in the history

Commits on Nov 4, 2018

  1. Increase upper bounds on dependencies (haskell-nix#2) 

    Fixes haskell-nix#1
    @Gabriella439
    Gabriella439 authored Nov 4, 2018
    Configuration menu
    Copy the full SHA
    a932ba4 View commit details
    Browse the repository at this point in the history

  2. Version 1.0.1 → 1.0.2 (haskell-nix#3)

    @Gabriella439
    Gabriella439 authored Nov 4, 2018
    Configuration menu
    Copy the full SHA
    69cfd0e View commit details
    Browse the repository at this point in the history

Commits on Apr 27, 2020

  1. Higher order Derivation, filepath (haskell-nix#4)

    @sorki
    sorki authored Apr 27, 2020
    Configuration menu
    Copy the full SHA
    b108aa5 View commit details
    Browse the repository at this point in the history

  2. Fix shell.nix (haskell-nix#6)

    @Gabriella439
    Gabriella439 authored Apr 27, 2020
    Configuration menu
    Copy the full SHA
    db6d461 View commit details
    Browse the repository at this point in the history

  3. Version 1.0.2 → 1.1.0 (haskell-nix#5)

    @Gabriella439
    Gabriella439 authored Apr 27, 2020
    Configuration menu
    Copy the full SHA
    7e335a4 View commit details
    Browse the repository at this point in the history

Commits on Apr 30, 2020

  1. Delete references to release.nix from default.nix (haskell-nix#7)

    @sorki
    sorki authored Apr 30, 2020
    Configuration menu
    Copy the full SHA
    3f95b84 View commit details
    Browse the repository at this point in the history

Commits on May 19, 2020

  1. Add missing re-exports (haskell-nix#8) 

    * Expose parseDerivationWith, buildDerivationWith and textParser

* Version 1.1.0 → 1.1.1 (haskell-nix#8)
    @sorki
    sorki authored May 19, 2020
    Configuration menu
    Copy the full SHA
    69fb26a View commit details
    Browse the repository at this point in the history

  2. Version 1.1.0 → 1.1.1 (haskell-nix#9)

    @Gabriella439
    Gabriella439 authored May 19, 2020
    Configuration menu
    Copy the full SHA
    4fb51cf View commit details
    Browse the repository at this point in the history

Commits on Jan 2, 2021

  1. Bump QuickCheck dep to < 2.15 (haskell-nix#10)

    @cdepillabout
    cdepillabout authored Jan 2, 2021
    Configuration menu
    Copy the full SHA
    73e2ee5 View commit details
    Browse the repository at this point in the history

Commits on Mar 20, 2021

  1. GitHub Actions CI (haskell-nix#12) 

    Similar to Gabriella439/nix-diff#37
    @sorki
    sorki authored Mar 20, 2021
    Configuration menu
    Copy the full SHA
    bd19633 View commit details
    Browse the repository at this point in the history

Commits on Mar 21, 2021

  1. Improve performance of textParser (haskell-nix#13) 

    Fixes haskell-nix#11
    @Gabriella439
    Gabriella439 authored Mar 21, 2021
    Configuration menu
    Copy the full SHA
    33acefc View commit details
    Browse the repository at this point in the history

Commits on Mar 22, 2021

  1. Add installation instructions to readme (haskell-nix#14) 

    Only including instructions for Nix, since if you're using this project I think it's safe to assume you'll have Nix available.
    @RocketPuppy
    RocketPuppy authored Mar 22, 2021
    Configuration menu
    Copy the full SHA
    249bfc5 View commit details
    Browse the repository at this point in the history

Commits on Mar 26, 2021

  1. Build against attoparsec-0.14 (haskell-nix#15) 

    Related to commercialhaskell/stackage#5959
    @Gabriella439
    Gabriella439 authored Mar 26, 2021
    Configuration menu
    Copy the full SHA
    97c1fae View commit details
    Browse the repository at this point in the history

  2. Version 1.1.1 → 1.1.2 (haskell-nix#16)

    @Gabriella439
    Gabriella439 authored Mar 26, 2021
    Configuration menu
    Copy the full SHA
    196a51f View commit details
    Browse the repository at this point in the history

Commits on Dec 30, 2021

  1. Allow text-2.0 (haskell-nix#17) 

    https://hackage.haskell.org/package/text-2.0/changelog
    @sjakobi
    sjakobi authored Dec 30, 2021
    Configuration menu
    Copy the full SHA
    97ed33b View commit details
    Browse the repository at this point in the history

Commits on Apr 22, 2022

  1. ci: Update versions (haskell-nix#19)

    @sorki
    sorki authored Apr 22, 2022
    Configuration menu
    Copy the full SHA
    216fc99 View commit details
    Browse the repository at this point in the history

Commits on Jul 2, 2022

  1. Build against vector-0.13 (haskell-nix#20) 

    Related to commercialhaskell/stackage#6624
    @Gabriella439
    Gabriella439 authored Jul 2, 2022
    Configuration menu
    Copy the full SHA
    4d22dd5 View commit details
    Browse the repository at this point in the history

Commits on Jul 23, 2022

  1. Support derivations with content-addressed outputs

    @rickynils
    rickynils committed Jul 23, 2022
    Configuration menu
    Copy the full SHA
    7ace1d4 View commit details
    Browse the repository at this point in the history

Commits on Jul 24, 2022

  1. Also update vector bound for test suite, too

    @Gabriella439
    Gabriella439 authored Jul 24, 2022
    Configuration menu
    Copy the full SHA
    a581bc1 View commit details
    Browse the repository at this point in the history

Commits on Sep 2, 2022

  1. Increase upper bound on criterion (haskell-nix#21) 

    Related to commercialhaskell/stackage#6677
    @Gabriella439
    Gabriella439 authored Sep 2, 2022
    Configuration menu
    Copy the full SHA
    f4e9a41 View commit details
    Browse the repository at this point in the history

Commits on Sep 4, 2022

  1. Fix deadname

    @Gabriella439
    Gabriella439 authored Sep 4, 2022
    Configuration menu
    Copy the full SHA
    974d8f1 View commit details
    Browse the repository at this point in the history

  2. Fix deadname

    @Gabriella439
    Gabriella439 authored Sep 4, 2022
    Configuration menu
    Copy the full SHA
    e1789cc View commit details
    Browse the repository at this point in the history

  3. Fix deadname

    @Gabriella439
    Gabriella439 authored Sep 4, 2022
    Configuration menu
    Copy the full SHA
    188155e View commit details
    Browse the repository at this point in the history

Commits on Nov 20, 2023

  1. Bump bounds, update CI (haskell-nix#22) 

    * ci: Update

switch to proper fork, use `defaultCi3`.

* Bump upper bounds of containers, deepseq, text

Allow
- containers 0.7
- deepseq 1.5
- text 2.1

* Drop travis build status badge, add new ones

* Add Functor and Bifunctor for DerivationOutput
    @sorki
    sorki authored Nov 20, 2023
    Configuration menu
    Copy the full SHA
    ac33b21 View commit details
    Browse the repository at this point in the history

  2. Version 1.1.2 → 1.1.3 (haskell-nix#23)

    @Gabriella439
    Gabriella439 authored Nov 20, 2023
    Configuration menu
    Copy the full SHA
    0165fd4 View commit details
    Browse the repository at this point in the history

Commits on Dec 5, 2023

  1. Add outputName and drvOutput type parameters to Derivation 

    Allows to use custom types for both sides of the map.

The main reason for this is `hnix-store` which now uses
`DSum HashAlgo Digest` which combines `hashAlgo` and `hash` fields
of the `DerivationOutput` and `OutputName` type for the keys,
which is similar to how the newtype is done in the mainline Nix.
    @sorki
    sorki committed Dec 5, 2023
    Configuration menu
    Copy the full SHA
    1d97425 View commit details
    Browse the repository at this point in the history

  2. Add drvInputs parameter to Derivation, DerivationInputs type 

    Normalizes `inputsSrcs` and `inputsDrvs` into `inputs`.

Similar reasons as the previous commit. Allows to embed
mainline Nixes `BasicDerivation` into `Derivation` by using
`inputs` type that only provides source inputs.
    @sorki
    sorki committed Dec 5, 2023
    Configuration menu
    Copy the full SHA
    92dd4e7 View commit details
    Browse the repository at this point in the history

  3. Align nicely, return -> pure

    @sorki
    sorki committed Dec 5, 2023
    Configuration menu
    Copy the full SHA
    25c9c15 View commit details
    Browse the repository at this point in the history

  4. hlint: drop unused RecordWildcards, use <$>

    @sorki
    sorki committed Dec 5, 2023
    Configuration menu
    Copy the full SHA
    9d7cb76 View commit details
    Browse the repository at this point in the history

Commits on Dec 10, 2023

  1. Support derivations with content-addressed outputs 

    Forward port of haskell-nix#26
    @rickynils @sorki
    rickynils authored and sorki committed Dec 10, 2023
    Configuration menu
    Copy the full SHA
    cbc2572 View commit details
    Browse the repository at this point in the history

Commits on Oct 5, 2024

  1. Build against QuickCheck-2.15 (haskell-nix#27)

    @Gabriella439
    Gabriella439 authored Oct 5, 2024
    Configuration menu
    Copy the full SHA
    3f5b593 View commit details
    Browse the repository at this point in the history

Commits on Oct 30, 2024

  1. Merge branch 'main' into pr-24

    @Ericson2314
    Ericson2314 committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    7c06c33 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into pr-26

    @Ericson2314
    Ericson2314 committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    2e10dfb View commit details
    Browse the repository at this point in the history

  3. Merge branch 'pr-24' into pr-26

    @Ericson2314
    Ericson2314 committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    9c51ab0 View commit details
    Browse the repository at this point in the history

Commits on Oct 31, 2024

  1. Add 'nix-derivation/' from commit '9c51ab0d4500160035885ef85bbfce2169… 

    …dfd361'

git-subtree-dir: nix-derivation
git-subtree-mainline: 43fc6d4
git-subtree-split: 9c51ab0
    @Ericson2314
    Ericson2314 committed Oct 31, 2024
    Configuration menu
    Copy the full SHA
    eacb5eb View commit details
    Browse the repository at this point in the history

  2. Complete build with new nix-derivation 

    Tests don't pass, more work is needed.
    @Ericson2314
    Ericson2314 committed Oct 31, 2024
    Configuration menu
    Copy the full SHA
    ad1adfd View commit details
    Browse the repository at this point in the history

  3. Add support for dynamic derivations

    @Ericson2314
    Ericson2314 committed Oct 31, 2024
    Configuration menu
    Copy the full SHA
    b76952d View commit details
    Browse the repository at this point in the history

  4. Merge branch 'content-address-method-cleanup' into derivation-work

    @Ericson2314
    Ericson2314 committed Oct 31, 2024
    Configuration menu
    Copy the full SHA
    509fee9 View commit details
    Browse the repository at this point in the history

Commits on Nov 1, 2024

  1. Merge branch 'content-address-method-cleanup' into derivation-work

    @Ericson2314
    Ericson2314 committed Nov 1, 2024
    Configuration menu
    Copy the full SHA
    c28fac2 View commit details
    Browse the repository at this point in the history

Commits on Nov 4, 2024

  1. Merge branch 'master' into content-address-method-cleanup

    @Ericson2314
    Ericson2314 committed Nov 4, 2024
    Configuration menu
    Copy the full SHA
    4841894 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'content-address-method-cleanup' into derivation-work

    @Ericson2314
    Ericson2314 committed Nov 4, 2024
    Configuration menu
    Copy the full SHA
    a184f42 View commit details
    Browse the repository at this point in the history

Commits on Nov 5, 2024

  1. Progress integrating the derivation type 

    - 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
    Ericson2314 committed Nov 5, 2024
    Configuration menu
    Copy the full SHA
    61dc135 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into derivation-work

    @Ericson2314
    Ericson2314 committed Nov 5, 2024
    Configuration menu
    Copy the full SHA
    78d6ce7 View commit details
    Browse the repository at this point in the history

Commits on Nov 9, 2024

  1. WIP daemon protocol

    @Ericson2314
    Ericson2314 committed Nov 9, 2024
    Configuration menu
    Copy the full SHA
    1ebff0d View commit details
    Browse the repository at this point in the history