From 652c2452b11decef5168feeb08c9c0f132df50a6 Mon Sep 17 00:00:00 2001
From: Denis Buzdalov <public@buzden.ru>
Date: Wed, 15 Sep 2021 19:33:22 +0300
Subject: [PATCH] [ upstream ] Adopt to changes of `Name` type from
 idris-lang/Idris2#1926

---
 src/Generics/Derive.idr | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/Generics/Derive.idr b/src/Generics/Derive.idr
index 7d9cca5..52a6b9b 100644
--- a/src/Generics/Derive.idr
+++ b/src/Generics/Derive.idr
@@ -124,16 +124,16 @@ int = primVal . I
 -- to a function (`con`) wrapped in a `TTImp`.
 private
 appNSName : Name -> (con : TTImp) -> TTImp
-appNSName (NS (MkNS ss) (UN s)) con = let ss' = listOf $ reverse $ map str ss
-                                       in con .$ ss' .$ str s
-appNSName n con                     = let s = str $ nameStr n
-                                       in `(~(con) []) .$ s
+appNSName (NS (MkNS ss) (UN $ Basic s)) con = let ss' = listOf $ reverse $ map str ss
+                                              in con .$ ss' .$ str s
+appNSName n con                             = let s = str $ nameStr n
+                                               in `(~(con) []) .$ s
 
 -- creates an ArgName's TTImp from an argument's index and name
 private
 argNameTTImp : (Int,Name) -> TTImp
-argNameTTImp (k, UN n) = `(NamedArg)   .$ int k .$ str n
-argNameTTImp (k, _)    = `(UnnamedArg) .$ int k
+argNameTTImp (k, UN $ Basic n) = `(NamedArg)   .$ int k .$ str n
+argNameTTImp (k, _)            = `(UnnamedArg) .$ int k
 
 -- creates a ConInfo's TTImp from a `ParamCon`.
 private
@@ -321,6 +321,8 @@ Show = ShowVis Public
 
 %runElab derive "Namespace" [Generic,Meta,Eq,Ord]
 
+%runElab derive "UserName" [Generic,Meta,Eq,Ord]
+
 %runElab derive "Name" [Generic,Meta,Eq,Ord]
 
 %runElab derive "Count" [Generic,Meta,Show,Eq,Ord]