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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: c93fd4a25e36
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 7f23d9fc5f21
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Apr 17, 2019

  1. make-derivation: put patches in all derivations 

    This puts patches in all derivations even if it unspecified by the
derivation. By default it will be an empty list. This simplifies
overrides, as we can now assume that patches is a valid name so that
this works:

self: super: {
  mypkg = super.pkg.overrideAttrs (o: {
    patches = o.patches ++ [ ./my-very-own.patch ];
  });
}

That is, you don’t need to provide a default "or []", make-derivation
provides one for you.

Unfortunately, this is a mass rebuild.
    @matthewbauer
    matthewbauer committed Apr 17, 2019
    Copy the full SHA
    c7ccb9f View commit details

Commits on Apr 23, 2019

  1. Merge pull request #59755 from matthewbauer/patches-in-make-derivation 

    make-derivation: put patches in all derivations
    @matthewbauer
    matthewbauer authored Apr 23, 2019
    Copy the full SHA
    7f23d9f View commit details
Showing with 4 additions and 0 deletions.
  1. +4 −0 pkgs/stdenv/generic/make-derivation.nix
4 changes: 4 additions & 0 deletions pkgs/stdenv/generic/make-derivation.nix
View file
Original file line number Diff line number Diff line change
@@ -86,6 +86,8 @@ in rec {
, hardeningEnable ? []
, hardeningDisable ? []

, patches ? []

, ... } @ attrs:

let
@@ -235,6 +237,8 @@ in rec {
++ optional (elem "host" configurePlatforms) "--host=${stdenv.hostPlatform.config}"
++ optional (elem "target" configurePlatforms) "--target=${stdenv.targetPlatform.config}";

inherit patches;

inherit doCheck doInstallCheck;

inherit outputs;