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

Generalize Derivation type to better support unresolved derivations #3446

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

Generalize Derivation type to better support unresolved derivations #3446

wants to merge 40 commits into from

Commits on Mar 25, 2020

  1. Parameterize the derivation types 

    This will allow us to express intermediate values of
`hashDerivationModulo` in the following commit.
    @Ericson2314
    Ericson2314 committed Mar 25, 2020
    Configuration menu
    Copy the full SHA
    e3d5ea8 View commit details
    Browse the repository at this point in the history

Commits on Mar 30, 2020

  1. Merge branch 'no-stringly-typed-derivation-output' into HEAD

    @Ericson2314
    Ericson2314 committed Mar 30, 2020
    Configuration menu
    Copy the full SHA
    97b895f View commit details
    Browse the repository at this point in the history

  2. Make hashDerivationModulo mutualy recursive with the memoizer

    @Ericson2314
    Ericson2314 committed Mar 30, 2020
    Configuration menu
    Copy the full SHA
    556f880 View commit details
    Browse the repository at this point in the history

  3. Separate derivation resolving from derivation hashing 

    Use the newly parameterized derivation types to enforce the invariants
needed to split these.
    @Ericson2314
    Ericson2314 committed Mar 30, 2020
    Configuration menu
    Copy the full SHA
    4fb285d View commit details
    Browse the repository at this point in the history

  4. Continue generalizing, and fix some probable bugs from the last version

    @Ericson2314
    Ericson2314 committed Mar 30, 2020
    Configuration menu
    Copy the full SHA
    c467f42 View commit details
    Browse the repository at this point in the history

Commits on May 28, 2020

  1. Merge branch 'master' of github.com:NixOS/nix into just-derivation-te… 

    …mplate
    @meditans
    meditans committed May 28, 2020
    Configuration menu
    Copy the full SHA
    d63e46f View commit details
    Browse the repository at this point in the history

  2. Merge branch 'no-stringly-typed-derivation-output' of github.com:Eric… 

    …son2314/nix into derivation-template
    @meditans
    meditans committed May 28, 2020
    Configuration menu
    Copy the full SHA
    67fb548 View commit details
    Browse the repository at this point in the history

  3. Temp - resolution of merge errors

    @meditans
    meditans committed May 28, 2020
    Configuration menu
    Copy the full SHA
    5deb144 View commit details
    Browse the repository at this point in the history

Commits on May 29, 2020

  1. Fix other errors from merge

    @meditans
    meditans committed May 29, 2020
    Configuration menu
    Copy the full SHA
    dca1d8e View commit details
    Browse the repository at this point in the history

  2. Merge branch 'just-derivation-template' of github.com:obsidiansystems… 

    …/nix into derivation-template-temp
    @meditans
    meditans committed May 29, 2020
    Configuration menu
    Copy the full SHA
    6699112 View commit details
    Browse the repository at this point in the history

Commits on Jun 21, 2020

  1. Merge remote-tracking branch 'upstream/master' into just-derivation-t… 

    …emplate
    @Ericson2314
    Ericson2314 committed Jun 21, 2020
    Configuration menu
    Copy the full SHA
    b7e2e6e View commit details
    Browse the repository at this point in the history

  2. Merge branch 'just-derivation-template' into derivation-template

    @Ericson2314
    Ericson2314 committed Jun 21, 2020
    Configuration menu
    Copy the full SHA
    109a7f1 View commit details
    Browse the repository at this point in the history

Commits on Jul 3, 2020

  1. Merge branch 'master' of github.com:NixOS/nix into just-derivation-te… 

    …mplate
    @Ericson2314
    Ericson2314 committed Jul 3, 2020
    Configuration menu
    Copy the full SHA
    e27912e View commit details
    Browse the repository at this point in the history

  2. Merge branch 'just-derivation-template' of github.com:Ericson2314/nix… 

    … into derivation-template
    @Ericson2314
    Ericson2314 committed Jul 3, 2020
    Configuration menu
    Copy the full SHA
    1b2bdbe View commit details
    Browse the repository at this point in the history

Commits on Aug 8, 2020

  1. Merge remote-tracking branch 'upstream/master' into just-derivation-t… 

    …emplate
    @Ericson2314
    Ericson2314 committed Aug 8, 2020
    Configuration menu
    Copy the full SHA
    659ea7c View commit details
    Browse the repository at this point in the history

  2. Merge commit 'bf9f040112c33213910faef40077122f1932d462' into derivati… 

    …on-template
    @Ericson2314
    Ericson2314 committed Aug 8, 2020
    Configuration menu
    Copy the full SHA
    be65d04 View commit details
    Browse the repository at this point in the history

  3. WIP fix

    @Ericson2314
    Ericson2314 committed Aug 8, 2020
    Configuration menu
    Copy the full SHA
    76a0444 View commit details
    Browse the repository at this point in the history

  4. Fix some bugs

    @Ericson2314
    Ericson2314 committed Aug 8, 2020
    Configuration menu
    Copy the full SHA
    a1847bb View commit details
    Browse the repository at this point in the history

  5. Add assertion to help navigate generics

    @Ericson2314
    Ericson2314 committed Aug 8, 2020
    Configuration menu
    Copy the full SHA
    ef4d731 View commit details
    Browse the repository at this point in the history

Commits on Aug 9, 2020

  1. Merge branch 'just-derivation-template' into derivation-template

    @Ericson2314
    Ericson2314 committed Aug 9, 2020
    Configuration menu
    Copy the full SHA
    4d67856 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'single-ca-drv-build' of github.com:obsidiansystems/nix … 

    …into just-derivation-template
    @Ericson2314
    Ericson2314 committed Aug 9, 2020
    Configuration menu
    Copy the full SHA
    80d94b1 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'just-derivation-template' of github.com:Ericson2314/nix… 

    … into derivation-template
    @Ericson2314
    Ericson2314 committed Aug 9, 2020
    Configuration menu
    Copy the full SHA
    49f7e41 View commit details
    Browse the repository at this point in the history

  4. Copy the derivation name too when baking/unbaking

    @Ericson2314
    Ericson2314 committed Aug 9, 2020
    Configuration menu
    Copy the full SHA
    17e4ea5 View commit details
    Browse the repository at this point in the history

  5. Deduplicate some code

    @Ericson2314
    Ericson2314 committed Aug 9, 2020
    Configuration menu
    Copy the full SHA
    e069dd1 View commit details
    Browse the repository at this point in the history

  6. Fix env var placeholder for floating CA derivations

    @Ericson2314
    Ericson2314 committed Aug 9, 2020
    Configuration menu
    Copy the full SHA
    817d8e4 View commit details
    Browse the repository at this point in the history

  7. Get testsuite passing!

    @Ericson2314
    Ericson2314 committed Aug 9, 2020
    Configuration menu
    Copy the full SHA
    aef4dbb View commit details
    Browse the repository at this point in the history

  8. Work around Clang 7 bug 

    See comment for details.
    @Ericson2314
    Ericson2314 committed Aug 9, 2020
    Configuration menu
    Copy the full SHA
    df70e44 View commit details
    Browse the repository at this point in the history

  9. Merge branch 'derivation-header-include-order' of github.com:Ericson2… 

    …314/nix into HEAD
    @Ericson2314
    Ericson2314 committed Aug 9, 2020
    Configuration menu
    Copy the full SHA
    71823b6 View commit details
    Browse the repository at this point in the history

Commits on Aug 10, 2020

  1. Merge branch 'single-ca-drv-build' of github.com:obsidiansystems/nix … 

    …into derivation-template
    @Ericson2314
    Ericson2314 committed Aug 10, 2020
    Configuration menu
    Copy the full SHA
    5b176c6 View commit details
    Browse the repository at this point in the history

  2. Merge commit '71823b6ddb77590b35172761580212a30dc98477' into derivati… 

    …on-template
    @Ericson2314
    Ericson2314 committed Aug 10, 2020
    Configuration menu
    Copy the full SHA
    292cc62 View commit details
    Browse the repository at this point in the history

Commits on Aug 11, 2020

  1. Merge branch 'output-env-var-unconditional' of github.com:obsidiansys… 

    …tems/nix into derivation-template
    @Ericson2314
    Ericson2314 committed Aug 11, 2020
    Configuration menu
    Copy the full SHA
    f8f3a20 View commit details
    Browse the repository at this point in the history

  2. Fix up output env vars in bakeDerivationPaths 

    This is much better than making the caller responsible.
    @Ericson2314
    Ericson2314 committed Aug 11, 2020
    Configuration menu
    Copy the full SHA
    4051ae8 View commit details
    Browse the repository at this point in the history

Commits on Aug 18, 2020

  1. Merge remote-tracking branch 'obsidian/single-ca-drv-build' into deri… 

    …vation-template
    @Ericson2314
    Ericson2314 committed Aug 18, 2020
    Configuration menu
    Copy the full SHA
    15c7f4c View commit details
    Browse the repository at this point in the history

  2. erge branch 'trustless-remote-builder-simple' of github.com:obsidians… 

    …ystems/nix into derivation-template
    @Ericson2314
    Ericson2314 committed Aug 18, 2020
    Configuration menu
    Copy the full SHA
    7ef1fdb View commit details
    Browse the repository at this point in the history

Commits on May 19, 2023

  1. Merge commit '5f263e1fb7596dc08a483d076177f2a65596f047' into just-der… 

    …ivation-template
    @Ericson2314
    Ericson2314 committed May 19, 2023
    Configuration menu
    Copy the full SHA
    b2cd85b View commit details
    Browse the repository at this point in the history

  2. Merge branch 'just-derivation-template' into derivation-template

    @Ericson2314
    Ericson2314 committed May 19, 2023
    Configuration menu
    Copy the full SHA
    c982c11 View commit details
    Browse the repository at this point in the history

  3. Merge commit '0d7376bd8a790da9e7c888d4330cfb17928c68d8' into derivati… 

    …on-template
    @Ericson2314
    Ericson2314 committed May 19, 2023
    Configuration menu
    Copy the full SHA
    962ac87 View commit details
    Browse the repository at this point in the history

  4. Merge commit '7a911b678356f28679424ca1051608ed01663b42' into just-der… 

    …ivation-template
    @Ericson2314
    Ericson2314 committed May 19, 2023
    Configuration menu
    Copy the full SHA
    288b664 View commit details
    Browse the repository at this point in the history

  5. Merge commit '1b5c24662b670cc1041794197052b4473e4e47f0' into just-der… 

    …ivation-template
    @Ericson2314
    Ericson2314 committed May 19, 2023
    Configuration menu
    Copy the full SHA
    9f21205 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'just-derivation-template' into derivation-template

    @Ericson2314
    Ericson2314 committed May 19, 2023
    Configuration menu
    Copy the full SHA
    71ec5a8 View commit details
    Browse the repository at this point in the history