Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 171aa0d90bcf
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 7a37ed59a40b
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on May 3, 2018

  1. fetchs3: allow to name the derivation output (#39823) 

    * fetchs3: add configurable name

Change the default from "foo" to the basename of the s3 URL and make it
configurable.

* fetchs3: fix error on missing credentials.session_token

The session token should default to null instead of failing

* fetchs3: make use of the region argument

Set it to null if you don't want to use it

* fetchs3: prefer local build

Fetcher-types spend more time on network than CPU

(cherry picked from commit f7abcb0)
    @zimbatm
    zimbatm committed May 3, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    nbbeeken Neal Beeken
    GPG key ID: 22F3C38EA1A0C076
    Verified
    Learn about vigilant mode
    Copy the full SHA
    7a37ed5 View commit details
Showing with 13 additions and 5 deletions.
  1. +13 −5 pkgs/build-support/fetchs3/default.nix
18 changes: 13 additions & 5 deletions pkgs/build-support/fetchs3/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{ stdenvNoCC, runCommand, awscli }:

{ s3url
, name ? builtins.baseNameOf s3url
, sha256
, region ? "us-east-1"
, credentials ? null # Default to looking at local EC2 metadata service
@@ -10,16 +11,23 @@
}:

let
credentialAttrs = stdenvNoCC.lib.optionalAttrs (credentials != null) {
AWS_ACCESS_KEY_ID = credentials.access_key_id;
AWS_SECRET_ACCESS_KEY = credentials.secret_access_key;
AWS_SESSION_TOKEN = credentials.session_token ? null;
mkCredentials = { access_key_id, secret_access_key, session_token ? null }: {
AWS_ACCESS_KEY_ID = access_key_id;
AWS_SECRET_ACCESS_KEY = secret_access_key;
AWS_SESSION_TOKEN = session_token;
};
in runCommand "foo" ({

credentialAttrs = stdenvNoCC.lib.optionalAttrs (credentials != null) (mkCredentials credentials);
in runCommand name ({
nativeBuildInputs = [ awscli ];

outputHashAlgo = "sha256";
outputHash = sha256;
outputHashMode = if recursiveHash then "recursive" else "flat";

preferLocalBuild = true;

AWS_DEFAULT_REGION = region;
} // credentialAttrs) (if postFetch != null then ''
downloadedFile="$(mktemp)"
aws s3 cp ${s3url} $downloadedFile