Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
base: b0df5a6816b6
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: a762c0e304d4
Choose a head ref
  • 5 commits
  • 2 files changed
  • 1 contributor

Commits on May 13, 2020

  1. maintainers/scripts/update.nix: Import lib into scope

    This will make it easier to change it if we want to decouple from pkgs.
    jtojnar committed May 13, 2020
    Copy the full SHA
    8f50956 View commit details
    Browse the repository at this point in the history
  2. maintainers/scripts/update.nix: derivation is the final station

    It does not make sense to look for derivations within derivations,
    not even when `recurseForDerivations` is true. Nix does not do that either:
    
    https://github.com/NixOS/nix/blob/ebc024df2287085d48ed6194aa756fd70c07f76c/src/libexpr/get-drvs.cc#L346-L355
    jtojnar committed May 13, 2020
    Copy the full SHA
    fab2ee8 View commit details
    Browse the repository at this point in the history
  3. maintainers/scripts/update.nix: refactor package collector

    The `packagesWith` function expected an attrSet but `packagesWithUpdateScript`
    could be passing it a derivation or a list when the attribute path
    supplied by user through the `--argstr path` argument pointed to one.
    It only worked because derivations are also attrSets and contain their
    outputs as attributes, and did not work for lists at all.
    
    Additionally, the improper handling would cause the `src` attribute
    to be built in some rare cases (`mkYarnPackage` seems to trigger this).
    
    Rewriting the `packagesWith` function to be inductive with a derivation
    as a base case and attrSets and lists as inductive steps is much cleaner
    and also fixes the unnecessary build.
    jtojnar committed May 13, 2020
    Copy the full SHA
    3f3aeb7 View commit details
    Browse the repository at this point in the history
  4. Copy the full SHA
    96f3c62 View commit details
    Browse the repository at this point in the history

Commits on May 15, 2020

  1. Copy the full SHA
    a762c0e View commit details
    Browse the repository at this point in the history