swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-21 21:09:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

use single underscore for sandboxProfile

Browse source
This commit is contained in:
Jude Taylor 2015-11-21 11:17:30 -08:00
parent db995a95ee
commit a63346e33c
10 changed files with 26 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/applications/editors/vim/default.nix
View file

@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
]; ];
}; };
__sandboxProfile = stdenv.lib.sandbox.allowFileRead "/dev/ptmx"; _sandboxProfile = stdenv.lib.sandbox.allowFileRead "/dev/ptmx";
# To fix the trouble in vim73, that it cannot cross-build with this patch # To fix the trouble in vim73, that it cannot cross-build with this patch
# to bypass a configure script check that cannot be done cross-building. # to bypass a configure script check that cannot be done cross-building.

2
pkgs/applications/version-management/git-and-tools/git/default.nix
View file

@ -37,7 +37,7 @@ stdenv.mkDerivation {
NIX_LDFLAGS = stdenv.lib.optionalString (!stdenv.isDarwin) "-lgcc_s"; NIX_LDFLAGS = stdenv.lib.optionalString (!stdenv.isDarwin) "-lgcc_s";
# without this, git fails when trying to check for /etc/gitconfig existence # without this, git fails when trying to check for /etc/gitconfig existence
__propagatedSandboxProfile = stdenv.lib.sandbox.allowDirectoryList "/etc"; _propagatedSandboxProfile = stdenv.lib.sandbox.allowDirectoryList "/etc";
makeFlags = "prefix=\${out} sysconfdir=/etc/ PERL_PATH=${perl}/bin/perl SHELL_PATH=${stdenv.shell} " makeFlags = "prefix=\${out} sysconfdir=/etc/ PERL_PATH=${perl}/bin/perl SHELL_PATH=${stdenv.shell} "
+ (if pythonSupport then "PYTHON_PATH=${python}/bin/python" else "NO_PYTHON=1") + (if pythonSupport then "PYTHON_PATH=${python}/bin/python" else "NO_PYTHON=1")

2
pkgs/development/interpreters/perl/5.20/default.nix
View file

@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
--replace "/bin/pwd" "$pwd" --replace "/bin/pwd" "$pwd"
''; '';
__sandboxProfile = stdenv.lib.sandbox.allow "ipc-sysv-sem"; _sandboxProfile = stdenv.lib.sandbox.allow "ipc-sysv-sem";
# Build a thread-safe Perl with a dynamic libperls.o. We need the # Build a thread-safe Perl with a dynamic libperls.o. We need the
# "installstyle" option to ensure that modules are put under # "installstyle" option to ensure that modules are put under

6
pkgs/os-specific/darwin/apple-sdk/default.nix
View file

@ -97,11 +97,11 @@ let
propagatedBuildInputs = deps; propagatedBuildInputs = deps;
# allows building the symlink tree # allows building the symlink tree
__sandboxProfile = '' _sandboxProfile = ''
(allow file-read* (subpath "/System/Library/Frameworks/${name}.framework")) (allow file-read* (subpath "/System/Library/Frameworks/${name}.framework"))
''; '';
__propagatedSandboxProfile = stdenv.lib.sandbox.importProfile (generateFrameworkProfile name); _propagatedSandboxProfile = stdenv.lib.sandbox.importProfile (generateFrameworkProfile name);
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Apple SDK framework ${name}"; description = "Apple SDK framework ${name}";
@ -165,7 +165,7 @@ in rec {
}); });
CoreServices = stdenv.lib.overrideDerivation super.CoreServices (drv: { CoreServices = stdenv.lib.overrideDerivation super.CoreServices (drv: {
__propagatedSandboxProfile = drv.__propagatedSandboxProfile ++ ['' _propagatedSandboxProfile = drv._propagatedSandboxProfile ++ [''
(allow mach-lookup (global-name "com.apple.CoreServices.coreservicesd")) (allow mach-lookup (global-name "com.apple.CoreServices.coreservicesd"))
'']; ''];
}); });

2
pkgs/os-specific/darwin/apple-sdk/generate-framework-profile.nix
View file

@ -14,7 +14,7 @@ let path = "/System/Library/Frameworks/${frameworkName}.framework";
in runCommand "${frameworkName}-profile.sb" { in runCommand "${frameworkName}-profile.sb" {
# __noChroot lite # __noChroot lite
__sandboxProfile = '' _sandboxProfile = ''
(allow file* (subpath "/")) (allow file* (subpath "/"))
''; '';

2
pkgs/os-specific/darwin/apple-source-releases/CF/default.nix
View file

@ -8,7 +8,7 @@ appleDerivation {
patches = [ ./add-cf-initialize.patch ./add-cfmachport.patch ./cf-bridging.patch ]; patches = [ ./add-cf-initialize.patch ./add-cfmachport.patch ./cf-bridging.patch ];
__propagatedSandboxProfile = stdenv.lib.sandbox.importProfile (generateFrameworkProfile "CoreFoundation"); _propagatedSandboxProfile = stdenv.lib.sandbox.importProfile (generateFrameworkProfile "CoreFoundation");
preBuild = '' preBuild = ''
substituteInPlace Makefile \ substituteInPlace Makefile \

2
pkgs/os-specific/darwin/apple-source-releases/adv_cmds/default.nix
View file

@ -81,7 +81,7 @@ in appleDerivation {
]; ];
# ps uses this syscall to get process info # ps uses this syscall to get process info
__propagatedSandboxProfile = stdenv.lib.sandbox.allow "mach-priv-task-port"; _propagatedSandboxProfile = stdenv.lib.sandbox.allow "mach-priv-task-port";
meta = { meta = {
platforms = stdenv.lib.platforms.darwin; platforms = stdenv.lib.platforms.darwin;

2
pkgs/os-specific/darwin/apple-source-releases/configd/default.nix
View file

@ -7,7 +7,7 @@ appleDerivation {
propagatedBuildInputs = [ Security ]; propagatedBuildInputs = [ Security ];
__propagatedSandboxProfile = '' _propagatedSandboxProfile = ''
(allow mach-lookup (global-name "com.apple.SystemConfiguration.configd")) (allow mach-lookup (global-name "com.apple.SystemConfiguration.configd"))
''; '';

22
pkgs/stdenv/generic/default.nix
View file

@ -12,8 +12,8 @@ let lib = import ../../../lib; in lib.makeOverridable (
, extraBuildInputs ? [] , extraBuildInputs ? []
, __stdenvImpureHostDeps ? [] , __stdenvImpureHostDeps ? []
, __extraImpureHostDeps ? [] , __extraImpureHostDeps ? []
, __stdenvSandboxProfile ? "" , _stdenvSandboxProfile ? ""
, __extraSandboxProfile ? "" , _extraSandboxProfile ? ""
}: }:
let let
@ -102,8 +102,8 @@ let
, outputs ? [ "out" ] , outputs ? [ "out" ]
, __impureHostDeps ? [] , __impureHostDeps ? []
, __propagatedImpureHostDeps ? [] , __propagatedImpureHostDeps ? []
, __sandboxProfile ? "" , _sandboxProfile ? ""
, __propagatedSandboxProfile ? "" , _propagatedSandboxProfile ? ""
, ... } @ attrs: , ... } @ attrs:
let let
pos' = pos' =
@ -154,12 +154,12 @@ let
(removeAttrs attrs (removeAttrs attrs
["meta" "passthru" "crossAttrs" "pos" ["meta" "passthru" "crossAttrs" "pos"
"__impureHostDeps" "__propagatedImpureHostDeps" "__impureHostDeps" "__propagatedImpureHostDeps"
"__sandboxProfile" "__propagatedSandboxProfile"]) "_sandboxProfile" "_propagatedSandboxProfile"])
// (let // (let
computedSandboxProfile = computedSandboxProfile =
lib.concatMap (input: input.__propagatedSandboxProfile or []) (extraBuildInputs ++ buildInputs ++ nativeBuildInputs); lib.concatMap (input: input._propagatedSandboxProfile or []) (extraBuildInputs ++ buildInputs ++ nativeBuildInputs);
computedPropagatedSandboxProfile = computedPropagatedSandboxProfile =
lib.concatMap (input: input.__propagatedSandboxProfile or []) (propagatedBuildInputs ++ propagatedNativeBuildInputs); lib.concatMap (input: input._propagatedSandboxProfile or []) (propagatedBuildInputs ++ propagatedNativeBuildInputs);
in in
{ {
builder = attrs.realBuilder or shell; builder = attrs.realBuilder or shell;
@ -178,11 +178,11 @@ let
(if crossConfig == null then propagatedBuildInputs else []); (if crossConfig == null then propagatedBuildInputs else []);
} // ifDarwin { } // ifDarwin {
# TODO: remove lib.unique once nix has a list canonicalization primitive # TODO: remove lib.unique once nix has a list canonicalization primitive
__sandboxProfile = _sandboxProfile =
let profiles = [ __extraSandboxProfile ] ++ computedSandboxProfile ++ computedPropagatedSandboxProfile ++ [ __propagatedSandboxProfile __sandboxProfile ]; let profiles = [ _extraSandboxProfile ] ++ computedSandboxProfile ++ computedPropagatedSandboxProfile ++ [ _propagatedSandboxProfile _sandboxProfile ];
final = lib.concatStringsSep "\n" (lib.filter (x: x != "") (lib.unique profiles)); final = lib.concatStringsSep "\n" (lib.filter (x: x != "") (lib.unique profiles));
in final; in final;
__propagatedSandboxProfile = lib.unique (computedPropagatedSandboxProfile ++ [ __propagatedSandboxProfile ]); _propagatedSandboxProfile = lib.unique (computedPropagatedSandboxProfile ++ [ _propagatedSandboxProfile ]);
} // (if outputs' != [ "out" ] then { } // (if outputs' != [ "out" ] then {
outputs = outputs'; outputs = outputs';
} else { })))) ( } else { })))) (
@ -219,7 +219,7 @@ let
inherit preHook initialPath shell defaultNativeBuildInputs; inherit preHook initialPath shell defaultNativeBuildInputs;
} }
// ifDarwin { // ifDarwin {
__sandboxProfile = __stdenvSandboxProfile; _sandboxProfile = _stdenvSandboxProfile;
}) })
// rec { // rec {

10
pkgs/stdenv/pure-darwin/default.nix
View file

@ -50,7 +50,7 @@ in rec {
inherit (bootstrapFiles) mkdir bzip2 cpio; inherit (bootstrapFiles) mkdir bzip2 cpio;
__sandboxProfile = binShClosure + libSystemProfile; _sandboxProfile = binShClosure + libSystemProfile;
}; };
stageFun = step: last: {shell ? "${bootstrapTools}/bin/sh", 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 # The stdenvs themselves don't use mkDerivation, so I need to specify this here
__stdenvSandboxProfile = binShClosure + libSystemProfile; _stdenvSandboxProfile = binShClosure + libSystemProfile;
__extraSandboxProfile = binShClosure + libSystemProfile; _extraSandboxProfile = binShClosure + libSystemProfile;
extraAttrs = { inherit platform; }; extraAttrs = { inherit platform; };
overrides = pkgs: (overrides pkgs) // { fetchurl = thisStdenv.fetchurlBoot; }; overrides = pkgs: (overrides pkgs) // { fetchurl = thisStdenv.fetchurlBoot; };
@ -269,8 +269,8 @@ in rec {
export PATH_LOCALE=${pkgs.darwin.locale}/share/locale export PATH_LOCALE=${pkgs.darwin.locale}/share/locale
''; '';
__stdenvSandboxProfile = binShClosure + libSystemProfile; _stdenvSandboxProfile = binShClosure + libSystemProfile;
__extraSandboxProfile = binShClosure + libSystemProfile; _extraSandboxProfile = binShClosure + libSystemProfile;
initialPath = import ../common-path.nix { inherit pkgs; }; initialPath = import ../common-path.nix { inherit pkgs; };
shell = "${pkgs.bash}/bin/bash"; shell = "${pkgs.bash}/bin/bash";