From f3970d49b9a4513da9c844d05e77e4a94617c2be Mon Sep 17 00:00:00 2001
From: Emily Pillmore <emily@kadena.io>
Date: Sat, 9 Mar 2019 15:15:34 -0500
Subject: [PATCH] Add principled 'fetchurl' + tests

Tests are masked until store work is done
---
 src/Nix/Builtins.hs                         |  9 +++++++--
 tests/EvalTests.hs                          | 22 ++++++++++++++++-----
 tests/eval-compare/builtins.fetchurl-01.nix |  5 +++++
 3 files changed, 29 insertions(+), 7 deletions(-)
 create mode 100644 tests/eval-compare/builtins.fetchurl-01.nix

diff --git a/src/Nix/Builtins.hs b/src/Nix/Builtins.hs
index 95ecf9f..d68cb51 100644
--- a/src/Nix/Builtins.hs
+++ b/src/Nix/Builtins.hs
@@ -1094,11 +1094,16 @@ fetchurl v = v >>= \case
  where
     go :: Maybe (NThunk m) -> NValue m -> m (NValue m)
     go _msha = \case
-        NVStr ns -> getURL (hackyStringIgnoreContext ns) >>= \case -- msha
+        NVStr ns -> noContextAttrs ns >>= getURL >>= \case -- msha
             Left e -> throwError e
             Right p -> toValue p
         v -> throwError $ ErrorCall $
-                 "builtins.fetchurl: Expected URI or string, got " ++ show v
+          "builtins.fetchurl: Expected URI or string, got " ++ show v
+  
+    noContextAttrs ns = case principledGetStringNoContext ns of
+      Nothing -> throwError $ ErrorCall $
+        "builtins.fetchurl: unsupported arguments to url"
+      Just t -> pure t
 
 partition_ :: forall e m. MonadNix e m
            => m (NValue m) -> m (NValue m) -> m (NValue m)
diff --git a/tests/EvalTests.hs b/tests/EvalTests.hs
index 7d4f6e1..c198248 100644
--- a/tests/EvalTests.hs
+++ b/tests/EvalTests.hs
@@ -13,6 +13,7 @@ import           Control.Monad.Catch
 import           Control.Monad (when)
 import           Control.Monad.IO.Class
 import qualified Data.HashMap.Lazy as M
+import           Data.List ((\\))
 import           Data.Maybe (isJust)
 import           Data.String.Interpolate.IsString
 import qualified Data.Set as S
@@ -41,7 +42,7 @@ case_zero_div = do
   assertNixEvalThrows "builtins.div 1.0 0.0"
 
 case_bit_ops = do
-    -- mic92 (2018-08-20): change to constantEqualText, 
+    -- mic92 (2018-08-20): change to constantEqualText,
     -- when hnix's nix fork supports bitAnd/bitOr/bitXor
     constantEqualText' "0" "builtins.bitAnd 1 0"
     constantEqualText' "1" "builtins.bitOr 1 1"
@@ -403,11 +404,15 @@ tests :: TestTree
 tests = $testGroupGenerator
 
 genEvalCompareTests = do
-    files <- filter ((==".nix") . takeExtension) <$> D.listDirectory testDir
-    return $ testGroup "Eval comparison tests" $ map mkTestCase files
+    td <- D.listDirectory testDir
+
+    let unmaskedFiles = filter ((==".nix") . takeExtension) td
+    let files = unmaskedFiles \\ maskedFiles
+
+    return $ testGroup "Eval comparison tests" $ map (mkTestCase testDir) files
   where
-    testDir = "tests/eval-compare"
-    mkTestCase f = testCase f $ assertEvalFileMatchesNix (testDir </> f)
+    mkTestCase td f = testCase f $ assertEvalFileMatchesNix (td </> f)
+
 
 instance (Show r, Show (NValueF m r), Eq r) => Eq (NValueF m r) where
     NVConstantF x == NVConstantF y = x == y
@@ -463,3 +468,10 @@ freeVarsEqual a xs = do
       xs' = S.fromList xs
       free = freeVars a'
   assertEqual "" xs' free
+
+maskedFiles :: [FilePath]
+maskedFiles =
+  [ "builtins.fetchurl-01.nix" ]
+
+testDir :: FilePath
+testDir = "tests/eval-compare"
diff --git a/tests/eval-compare/builtins.fetchurl-01.nix b/tests/eval-compare/builtins.fetchurl-01.nix
new file mode 100644
index 0000000..51694bf
--- /dev/null
+++ b/tests/eval-compare/builtins.fetchurl-01.nix
@@ -0,0 +1,5 @@
+with builtins;
+
+let a = fetchurl "https://haskell.org";
+
+in [ a (hasContext a) ]