From 7a1a0036e6f6108bd12f65d2473bf080e3841da4 Mon Sep 17 00:00:00 2001 From: Lorenzo Manacorda Date: Wed, 25 Jul 2018 15:55:16 +0200 Subject: [PATCH] buildMaven: Check for authenticated attribute The `authenticated` attribute is not always present in the `project-info.json` produced by maven2nix[0] We therefore check for its presence, and default it to false. [0]: https://github.com/NixOS/mvn2nix-maven-plugin/issues/5#issuecomment-311846950 --- pkgs/build-support/build-maven.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/build-maven.nix b/pkgs/build-support/build-maven.nix index 30df3e8e733..b9da06c43c8 100644 --- a/pkgs/build-support/build-maven.nix +++ b/pkgs/build-support/build-maven.nix @@ -16,10 +16,11 @@ infoFile: let script = writeText "build-maven-repository.sh" '' ${lib.concatStrings (map (dep: let inherit (dep) - url sha1 groupId artifactId version - authenticated metadata repository-id; + url sha1 groupId artifactId + version metadata repository-id; versionDir = dep.unresolved-version or version; + authenticated = dep.authenticated or false; fetch = (if authenticated then requireFile else fetchurl) { inherit url sha1;