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: 50a5c1853d57
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: d0677e6d45c4
Choose a head ref
  • 2 commits
  • 44 files changed
  • 1 contributor

Commits on Jul 31, 2020

  1. attr: inline syscall patch

    Unfortunately the output of git.savannah.nongnu.org changes with each
    gitweb update. This means that the current has
    “0gja54fz79a9ma6b4mprnjxq77l5yg2z9xknlwhmkcrfnam02qxp” is no longer
    correct:
    
    $ nix-prefetch-url
    https://git.savannah.nongnu.org/cgit/attr.git/patch/\?id=14adc898a36948267bfe5c63b399996879e94c98
    1g8sky52rjg9fpmrddza1af89s9qd4bzsbxqb7mc5bv8gyh10s1k
    
    Normally, we use fetchpatch to strip this out, but unfortunately attr
    cannot use fetchpatch due to being used in bootstrapping fetchurl.
    That is, it can’t use a custom postFetch since <nix/fetchurl.nix>
    doesn’t support that.
    
    To solve this problem, just inline the patch for now.
    matthewbauer authored and FRidh committed Jul 31, 2020
    Copy the full SHA
    f36899e View commit details
    Browse the repository at this point in the history
  2. treewide: add warning comment to “boot” packages

    This adds a warning to the top of each “boot” package that reads:
    
      Note: this package is used for bootstrapping fetchurl, and thus cannot
      use fetchpatch! All mutable patches (generated by GitHub or cgit) that
      are needed here should be included directly in Nixpkgs as files.
    
    This makes it clear to maintainer that they may need to treat this
    package a little differently than others. Importantly, we can’t use
    fetchpatch here due to using <nix/fetchurl.nix>. To avoid having stale
    hashes, we need to include patches that are subject to changing
    overtime (for instance, gitweb’s patches contain a version number at
    the bottom).
    matthewbauer authored and FRidh committed Jul 31, 2020
    Copy the full SHA
    d0677e6 View commit details
    Browse the repository at this point in the history