From 85abe2cbda65f58193ead15403daff00caac39da Mon Sep 17 00:00:00 2001 From: Anton-Latukha Date: Mon, 17 Jan 2022 19:17:02 +0200 Subject: [PATCH] upd nix submodule Solves #610. Adds a bunch of new tests that do not pass. Puts `eval-okay-hash` into proper deprecation. --- data/nix | 2 +- tests/NixLanguageTests.hs | 20 ++++++++++++++------ 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/data/nix b/data/nix index 61e816217..008ddef4b 160000 --- a/data/nix +++ b/data/nix @@ -1 +1 @@ -Subproject commit 61e816217bfdfffd39c130c7cd24f07e640098fc +Subproject commit 008ddef4b08e9bee530a5a4c597c88b344089021 diff --git a/tests/NixLanguageTests.hs b/tests/NixLanguageTests.hs index 95cd89e88..6549bddb0 100644 --- a/tests/NixLanguageTests.hs +++ b/tests/NixLanguageTests.hs @@ -56,20 +56,28 @@ groupBy key = Map.fromListWith (<>) . fmap (key &&& pure) -- previously passed. newFailingTests :: Set String newFailingTests = Set.fromList - [ - "eval-okay-hash" - , "eval-okay-path" -- #128 + [ "eval-okay-path" -- #128 , "eval-okay-fromTOML" - , "eval-okay-ind-string" -- #1000 #610 + , "eval-okay-zipAttrsWith" + , "eval-okay-tojson" + , "eval-okay-search-path" + , "eval-okay-sort" + , "eval-okay-path-antiquotation" + , "eval-okay-groupBy" + , "eval-okay-getattrpos-functionargs" + , "eval-okay-floor-ceil" + , "eval-okay-attrs6" ] -- | Upstream tests that test cases that HNix disaded as a misfeature that is used so rarely -- that it more effective to fix it & lint it out of existance. deprecatedRareNixQuirkTests :: Set String deprecatedRareNixQuirkTests = Set.fromList $ - one - -- A rare quirk of Nix that is proper to fix&enforce then to support (see git commit history) + [ -- A rare quirk of Nix that is proper to fix&enforce then to support (see git commit history) "eval-okay-strings-as-attrs-names" + -- Nix upstream removed this test alltogather + , "eval-okay-hash" + ] genTests :: IO TestTree genTests =