diff options
Diffstat (limited to 'corepkgs')
| -rw-r--r-- | corepkgs/config.nix.in | 1 | ||||
| -rw-r--r-- | corepkgs/fetchurl.nix | 15 | ||||
| -rw-r--r-- | corepkgs/imported-drv-to-derivation.nix | 4 |
3 files changed, 3 insertions, 17 deletions
diff --git a/corepkgs/config.nix.in b/corepkgs/config.nix.in index 8918f4ddde8d..90e8edbea833 100644 --- a/corepkgs/config.nix.in +++ b/corepkgs/config.nix.in @@ -12,7 +12,6 @@ in rec { tar = "@tar@"; tarFlags = "@tarFlags@"; tr = "@tr@"; - curl = "@curl@"; nixBinDir = fromEnv "NIX_BIN_DIR" "@bindir@"; nixPrefix = "@prefix@"; diff --git a/corepkgs/fetchurl.nix b/corepkgs/fetchurl.nix index 1ce88593cff2..64d1f121f81c 100644 --- a/corepkgs/fetchurl.nix +++ b/corepkgs/fetchurl.nix @@ -5,20 +5,9 @@ with import <nix/config.nix>; assert (outputHash != "" && outputHashAlgo != "") || md5 != "" || sha1 != "" || sha256 != ""; -let - - builder = builtins.toFile "fetchurl.sh" - ('' - echo "downloading $url into $out" - ${curl} --fail --location --max-redirs 20 --insecure "$url" > "$out" - '' + (if executable then "${coreutils}/chmod +x $out" else "")); - -in - derivation { name = baseNameOf (toString url); - builder = shell; - args = [ "-e" builder ]; + builder = "builtin:fetchurl"; # New-style output content requirements. outputHashAlgo = if outputHashAlgo != "" then outputHashAlgo else @@ -39,6 +28,4 @@ derivation { # by definition pure. "http_proxy" "https_proxy" "ftp_proxy" "all_proxy" "no_proxy" ]; - - inherit chrootDeps; } diff --git a/corepkgs/imported-drv-to-derivation.nix b/corepkgs/imported-drv-to-derivation.nix index bdb60169860a..eab8b050e8ff 100644 --- a/corepkgs/imported-drv-to-derivation.nix +++ b/corepkgs/imported-drv-to-derivation.nix @@ -1,10 +1,10 @@ -attrs @ { drvPath, outputs, ... }: +attrs @ { drvPath, outputs, name, ... }: let commonAttrs = (builtins.listToAttrs outputsList) // { all = map (x: x.value) outputsList; - inherit drvPath; + inherit drvPath name; type = "derivation"; }; |