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

allow networking by default and remove it from derivations

Browse Source
This commit is contained in:
Jude Taylor 2015-11-14 13:51:50 -08:00
parent 163acc0efa
commit 131e831cb9
6 changed files with 3 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/sandbox.nix
View File

@ -35,13 +35,6 @@ genActions = actionName: let
"${actionName}DirectoryList" = self."${actionName}FileReadMetadata"; "${actionName}DirectoryList" = self."${actionName}FileReadMetadata";
"${actionName}FileWrite" = applyToFiles action "file-write*"; "${actionName}FileWrite" = applyToFiles action "file-write*";
"${actionName}FileWriteMetadata" = applyToFiles action "file-write-metadata"; "${actionName}FileWriteMetadata" = applyToFiles action "file-write-metadata";
"${actionName}Network" = sexp [ actionName "network*" ];
"${actionName}NetworkBind" = sexp [ actionName "network-bind" ];
"${actionName}NetworkInbound" = sexp [ actionName "network-inbound" ];
"${actionName}NetworkOutbound" = sexp [ actionName "network-outbound" ];
"${actionName}NetworkLocal" = sexp [ actionName "network*" (sexp [ "local" "ip" ]) ];
"${actionName}NetworkInboundLocal" = sexp [ actionName "network-inbound" (sexp [ "local" "ip" ]) ];
"${actionName}NetworkOutboundLocal" = sexp [ actionName "network-outbound" (sexp [ "local" "ip" ]) ];
}; };
in self; in self;

2
pkgs/build-support/fetchurl/default.nix
View File

@ -118,8 +118,6 @@ if (!hasHash) then throw "Specify hash for fetchurl fixed-output derivation: ${s
outputHashMode = if recursiveHash then "recursive" else "flat"; outputHashMode = if recursiveHash then "recursive" else "flat";
__sandboxProfile = stdenv.lib.sandbox.allowNetworkOutbound;
inherit curlOpts showURLs mirrorsFile impureEnvVars postFetch downloadToTemp; inherit curlOpts showURLs mirrorsFile impureEnvVars postFetch downloadToTemp;
# Doing the download on a remote machine just duplicates network # Doing the download on a remote machine just duplicates network

5
pkgs/development/haskell-modules/configuration-common.nix
View File

@ -923,9 +923,4 @@ self: super: {
hscurses = overrideCabal super.hscurses (drv: { hscurses = overrideCabal super.hscurses (drv: {
librarySystemDepends = (drv.librarySystemDepends or []) ++ [ pkgs.ncurses ]; librarySystemDepends = (drv.librarySystemDepends or []) ++ [ pkgs.ncurses ];
}); });
streaming-commons = pkgs.stdenv.lib.overrideDerivation super.streaming-commons (drv: {
__sandboxProfile = drv.__sandboxProfile +
pkgs.stdenv.lib.sandbox.allowNetworkLocal;
});
} }

3
pkgs/stdenv/pure-darwin/standard-sandbox.sb
View File

@ -67,3 +67,6 @@
(allow mach-lookup (allow mach-lookup
(global-name "com.apple.system.notification_center") (global-name "com.apple.system.notification_center")
(global-name "com.apple.system.opendirectoryd.libinfo")) (global-name "com.apple.system.opendirectoryd.libinfo"))
; allow networking on localhost
(allow network* (local ip) (remote unix-socket))

1
pkgs/top-level/perl-packages.nix
View File

@ -8266,7 +8266,6 @@ let self = _self // overrides; _self = with self; {
url = mirror://cpan/authors/id/E/ET/ETHER/Net-HTTP-6.09.tar.gz; url = mirror://cpan/authors/id/E/ET/ETHER/Net-HTTP-6.09.tar.gz;
sha256 = "52762b939d84806908ba544581c5708375f7938c3c0e496c128ca3fbc425e58d"; sha256 = "52762b939d84806908ba544581c5708375f7938c3c0e496c128ca3fbc425e58d";
}; };
__sandboxProfile = stdenv.lib.sandbox.allowNetworkLocal;
propagatedBuildInputs = [ URI ]; propagatedBuildInputs = [ URI ];
meta = { meta = {
description = "Low-level HTTP connection (client)"; description = "Low-level HTTP connection (client)";

4
pkgs/top-level/python-packages.nix
View File

@ -3759,8 +3759,6 @@ let
substituteInPlace test-requirements.txt --replace 'nose==1.3' 'nose' substituteInPlace test-requirements.txt --replace 'nose==1.3' 'nose'
''; '';
__sandboxProfile = pkgs.lib.sandbox.allowNetwork;
doCheck = !isPy3k; # lots of transient failures doCheck = !isPy3k; # lots of transient failures
checkPhase = '' checkPhase = ''
# Not worth the trouble # Not worth the trouble
@ -6550,8 +6548,6 @@ let
sha256 = "02rknqarwy7p50693cqswbibqwgxzrfzdq4yhwqxbdmhbsmh0rk6"; sha256 = "02rknqarwy7p50693cqswbibqwgxzrfzdq4yhwqxbdmhbsmh0rk6";
}; };
__sandboxProfile = pkgs.lib.sandbox.allowNetwork;
# Only test dependencies # Only test dependencies
buildInputs = with self; [ pkgs.git gevent geventhttpclient mock fastimport ]; buildInputs = with self; [ pkgs.git gevent geventhttpclient mock fastimport ];