diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2017-11-14T14·10+0100 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2017-11-14T14·10+0100 |
| commit | 2c39e4eca000037f704ad81d589f60964f6f13a7 (patch) | |
| tree | d8d737de7dc000eb0c14114696360b193349e122 /tests/lang | |
| parent | 5773d667ee26efb4b977b9109da509d46d8378b5 (diff) | |
Revert "Don't parse "x:x" as a URI"
This reverts commit f90f660b243866b8860eeb24cc4a345d32cc7ce7.
This broke Hydra's release.nix, which contained
preCheck = ''export LOGNAME=${LOGNAME:-foo}'';
Diffstat (limited to 'tests/lang')
| -rw-r--r-- | tests/lang/lib.nix | 2 | ||||
| -rw-r--r-- | tests/lang/parse-okay-url.nix | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/tests/lang/lib.nix b/tests/lang/lib.nix index 1c63b2f31d..028a538314 100644 --- a/tests/lang/lib.nix +++ b/tests/lang/lib.nix @@ -49,7 +49,7 @@ rec { if comp (head list2) (head list1) then [(head list2)] ++ mergeLists comp list1 (tail list2) else [(head list1)] ++ mergeLists comp (tail list1) list2; - id = x:x; # sic + id = x: x; const = x: y: x; diff --git a/tests/lang/parse-okay-url.nix b/tests/lang/parse-okay-url.nix index fb74d66f09..fce3b13ee6 100644 --- a/tests/lang/parse-okay-url.nix +++ b/tests/lang/parse-okay-url.nix @@ -1,8 +1,7 @@ -[ +[ x:x https://svn.cs.uu.nl:12443/repos/trace/trunk http://www2.mplayerhq.hu/MPlayer/releases/fonts/font-arial-iso-8859-1.tar.bz2 http://losser.st-lab.cs.uu.nl/~armijn/.nix/gcc-3.3.4-static-nix.tar.gz http://fpdownload.macromedia.com/get/shockwave/flash/english/linux/7.0r25/install_flash_player_7_linux.tar.gz ftp://ftp.gtk.org/pub/gtk/v1.2/gtk+-1.2.10.tar.gz - channel:nixos-17.09 ] |