diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2018-11-11 14:28:08 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-11-11 14:28:08 +0100 |
| commit | 1d3bff25db1987ab7824f483ba0d6b316d8965b2 (patch) | |
| tree | b482c2a9d9d75db4e2571abe12af3596cea2660b /pkgs/stdenv | |
| parent | 5955c5113a39be8facd831ad86f03ed665d1655f (diff) | |
| parent | 02bf0e589653d34dc919b32a1d3c67b0d0bb2335 (diff) | |
| download | nixlib-1d3bff25db1987ab7824f483ba0d6b316d8965b2.tar nixlib-1d3bff25db1987ab7824f483ba0d6b316d8965b2.tar.gz nixlib-1d3bff25db1987ab7824f483ba0d6b316d8965b2.tar.bz2 nixlib-1d3bff25db1987ab7824f483ba0d6b316d8965b2.tar.lz nixlib-1d3bff25db1987ab7824f483ba0d6b316d8965b2.tar.xz nixlib-1d3bff25db1987ab7824f483ba0d6b316d8965b2.tar.zst nixlib-1d3bff25db1987ab7824f483ba0d6b316d8965b2.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/stdenv')
| -rw-r--r-- | pkgs/stdenv/generic/check-meta.nix | 12 | ||||
| -rw-r--r-- | pkgs/stdenv/generic/make-derivation.nix | 4 |
2 files changed, 13 insertions, 3 deletions
diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix index 26cd9f8beb96..0e93df855471 100644 --- a/pkgs/stdenv/generic/check-meta.nix +++ b/pkgs/stdenv/generic/check-meta.nix @@ -165,6 +165,16 @@ let platforms = listOf (either str lib.systems.parsedPlatform.types.system); hydraPlatforms = listOf str; broken = bool; + # TODO: refactor once something like Profpatsch's types-simple will land + tests = attrsOf (mkOptionType { + name = "test"; + check = x: isDerivation x && + x ? meta.timeout && + x ? meta.needsVMSupport; + merge = lib.options.mergeOneOption; + }); + needsVMSupport = bool; + timeout = int; # Weirder stuff that doesn't appear in the documentation? knownVulnerabilities = listOf str; @@ -184,8 +194,6 @@ let isIbusEngine = bool; isGutenprint = bool; badPlatforms = platforms; - # Hydra build timeout - timeout = int; }; checkMetaAttr = k: v: diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index 5b1fd4b8d158..a2ff42151a05 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -104,7 +104,9 @@ rec { ++ depsTargetTarget ++ depsTargetTargetPropagated) == 0; runtimeSensativeIfFixedOutput = fixedOutputDrv -> !noNonNativeDeps; supportedHardeningFlags = [ "fortify" "stackprotector" "pie" "pic" "strictoverflow" "format" "relro" "bindnow" ]; - defaultHardeningFlags = lib.remove "pie" supportedHardeningFlags; + defaultHardeningFlags = if stdenv.targetPlatform.isMusl + then supportedHardeningFlags + else lib.remove "pie" supportedHardeningFlags; enabledHardeningOptions = if builtins.elem "all" hardeningDisable then [] |