From 9cf93ba13587dba8116fa99279e51cf60c7bde88 Mon Sep 17 00:00:00 2001 From: Scott Olson Date: Thu, 18 Feb 2016 22:10:43 -0600 Subject: [PATCH 1/2] Simplify fetchurl assertion logic. The two lines I removed technically assert the exact same thing, since `!a -> b` is equivalent to `a || b`. So, I replaced the two lines with the more symmetric form to make it clearer. --- pkgs/build-support/fetchurl/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/build-support/fetchurl/default.nix b/pkgs/build-support/fetchurl/default.nix index 804974954d1..2c802bb3679 100644 --- a/pkgs/build-support/fetchurl/default.nix +++ b/pkgs/build-support/fetchurl/default.nix @@ -85,8 +85,7 @@ in }: assert builtins.isList urls; -assert urls != [] -> url == ""; -assert url != "" -> urls == []; +assert urls == [] || url == ""; let From 43a523526dfe924e59b0eadf9319bb1a72fad743 Mon Sep 17 00:00:00 2001 From: Scott Olson Date: Fri, 19 Feb 2016 03:13:10 -0600 Subject: [PATCH 2/2] Require at least one of url or urls in fetchurl. --- pkgs/build-support/fetchurl/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/fetchurl/default.nix b/pkgs/build-support/fetchurl/default.nix index 2c802bb3679..d4b46cf9e9d 100644 --- a/pkgs/build-support/fetchurl/default.nix +++ b/pkgs/build-support/fetchurl/default.nix @@ -85,7 +85,7 @@ in }: assert builtins.isList urls; -assert urls == [] || url == ""; +assert (urls == []) != (url == ""); let