public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #120316 from regnat/easy-ca

Browse Source 
Make it easy to try out content-addressed derivations
This commit is contained in:
Eelco Dolstra 2021-04-26 16:21:05 +02:00 committed by GitHub
commit 6b19be4124
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/stdenv/generic/make-derivation.nix
View File

@ -89,6 +89,10 @@ in rec {
, patches ? [] , patches ? []
, __contentAddressed ?
(! attrs ? outputHash) # Fixed-output drvs can't be content addressed too
&& (config.contentAddressedByDefault or false)
, ... } @ attrs: , ... } @ attrs:
let let
@ -253,6 +257,12 @@ in rec {
inherit doCheck doInstallCheck; inherit doCheck doInstallCheck;
inherit outputs; inherit outputs;
} // lib.optionalAttrs (__contentAddressed) {
inherit __contentAddressed;
# Provide default values for outputHashMode and outputHashAlgo because
# most people won't care about these anyways
outputHashAlgo = attrs.outputHashAlgo or "sha256";
outputHashMode = attrs.outputHashMode or "recursive";
} // lib.optionalAttrs (stdenv.hostPlatform != stdenv.buildPlatform) { } // lib.optionalAttrs (stdenv.hostPlatform != stdenv.buildPlatform) {
cmakeFlags = cmakeFlags =
(/**/ if lib.isString cmakeFlags then [cmakeFlags] (/**/ if lib.isString cmakeFlags then [cmakeFlags]