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

switch to zero underscores for sandbox profiles; remove generateFrameworkProfile

Browse Source
This commit is contained in:
Jude Taylor
2015-11-21 12:10:33 -08:00
parent a63346e33c
commit 69e7f3bb74
11 changed files with 29 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/stdenv/generic/default.nix
+11 -11
View File
@@ -12,8 +12,8 @@ let lib = import ../../../lib; in lib.makeOverridable (
, extraBuildInputs ? []
, __stdenvImpureHostDeps ? []
, __extraImpureHostDeps ? []
, _stdenvSandboxProfile ? ""
, _extraSandboxProfile ? ""
, stdenvSandboxProfile ? ""
, extraSandboxProfile ? ""
}:
let
@@ -102,8 +102,8 @@ let
, outputs ? [ "out" ]
, __impureHostDeps ? []
, __propagatedImpureHostDeps ? []
, _sandboxProfile ? ""
, _propagatedSandboxProfile ? ""
, sandboxProfile ? ""
, propagatedSandboxProfile ? ""
, ... } @ attrs:
let
pos' =
@@ -154,12 +154,12 @@ let
(removeAttrs attrs
["meta" "passthru" "crossAttrs" "pos"
"__impureHostDeps" "__propagatedImpureHostDeps"
"_sandboxProfile" "_propagatedSandboxProfile"])
"sandboxProfile" "propagatedSandboxProfile"])
// (let
computedSandboxProfile =
lib.concatMap (input: input._propagatedSandboxProfile or []) (extraBuildInputs ++ buildInputs ++ nativeBuildInputs);
lib.concatMap (input: input.__propagatedSandboxProfile or []) (extraBuildInputs ++ buildInputs ++ nativeBuildInputs);
computedPropagatedSandboxProfile =
lib.concatMap (input: input._propagatedSandboxProfile or []) (propagatedBuildInputs ++ propagatedNativeBuildInputs);
lib.concatMap (input: input.__propagatedSandboxProfile or []) (propagatedBuildInputs ++ propagatedNativeBuildInputs);
in
{
builder = attrs.realBuilder or shell;
@@ -178,11 +178,11 @@ let
(if crossConfig == null then propagatedBuildInputs else []);
} // ifDarwin {
# TODO: remove lib.unique once nix has a list canonicalization primitive
_sandboxProfile =
let profiles = [ _extraSandboxProfile ] ++ computedSandboxProfile ++ computedPropagatedSandboxProfile ++ [ _propagatedSandboxProfile _sandboxProfile ];
__sandboxProfile =
let profiles = [ extraSandboxProfile ] ++ computedSandboxProfile ++ computedPropagatedSandboxProfile ++ [ propagatedSandboxProfile sandboxProfile ];
final = lib.concatStringsSep "\n" (lib.filter (x: x != "") (lib.unique profiles));
in final;
_propagatedSandboxProfile = lib.unique (computedPropagatedSandboxProfile ++ [ _propagatedSandboxProfile ]);
__propagatedSandboxProfile = lib.unique (computedPropagatedSandboxProfile ++ [ propagatedSandboxProfile ]);
} // (if outputs' != [ "out" ] then {
outputs = outputs';
} else { })))) (
@@ -219,7 +219,7 @@ let
inherit preHook initialPath shell defaultNativeBuildInputs;
}
// ifDarwin {
_sandboxProfile = _stdenvSandboxProfile;
__sandboxProfile = stdenvSandboxProfile;
})
// rec {
pkgs/stdenv/pure-darwin/default.nix
+5 -5
View File
@@ -50,7 +50,7 @@ in rec {
inherit (bootstrapFiles) mkdir bzip2 cpio;
_sandboxProfile = binShClosure + libSystemProfile;
__sandboxProfile = binShClosure + libSystemProfile;
};
stageFun = step: last: {shell ? "${bootstrapTools}/bin/sh",
@@ -93,8 +93,8 @@ in rec {
};
# The stdenvs themselves don't use mkDerivation, so I need to specify this here
_stdenvSandboxProfile = binShClosure + libSystemProfile;
_extraSandboxProfile = binShClosure + libSystemProfile;
stdenvSandboxProfile = binShClosure + libSystemProfile;
extraSandboxProfile = binShClosure + libSystemProfile;
extraAttrs = { inherit platform; };
overrides = pkgs: (overrides pkgs) // { fetchurl = thisStdenv.fetchurlBoot; };
@@ -269,8 +269,8 @@ in rec {
export PATH_LOCALE=${pkgs.darwin.locale}/share/locale
'';
_stdenvSandboxProfile = binShClosure + libSystemProfile;
_extraSandboxProfile = binShClosure + libSystemProfile;
stdenvSandboxProfile = binShClosure + libSystemProfile;
extraSandboxProfile = binShClosure + libSystemProfile;
initialPath = import ../common-path.nix { inherit pkgs; };
shell = "${pkgs.bash}/bin/bash";