git.iko.soy/haskell.nix
on iko/ghcjs-patch-master help sign in
Patch singletons to use modified Uniq type (#333)
commit4d43ee22199f9443f00fd696607c99c378f68b47 authorViktor Kronvall <viktor.kronvall@gmail.com> dateSat 30 Nov 2019, 21:38 (7 years ago) parentd235470
8 files changed+56
compare with iko/ghcjs-patch-master
unifiedsplit
patches/ghc862/default.nix+1 patches/ghc862/singletons-2.5.1.patch+13 patches/ghc863/default.nix+1 patches/ghc863/singletons-2.5.1.patch+13 patches/ghc864/default.nix+1 patches/ghc864/singletons-2.5.1.patch+13 patches/ghc865/default.nix+1 patches/ghc865/singletons-2.5.1.patch+13
patches/ghc862/default.nix+1
@@ -7,4 +7,5 @@
77 packages.time.patches = [ ({ version, revision }: if version == "1.8.0.2" && revision == 0 then ./time-1.8.0.2.patch else null) ];
88 packages.transformers.patches = [ ({ version, revision }: if version == "0.5.5.0" && revision == 0 then ./transformers-0.5.5.0.patch else null) ];
99 packages.unix.patches = [ ({ version, revision }: if version == "2.7.2.2" && revision == 0 then ./unix-2.7.2.2.patch else null) ];
10+ packages.singletons.patches = [ ({ version, revision }: if version == "2.5.1" && revision == 0 then ./singletons-2.5.1.patch else null) ];
1011}
patches/ghc862/singletons-2.5.1.patchnew file+13
@@ -0,0 +1,13 @@
1+diff --git a/src/Data/Singletons/Util.hs b/src/Data/Singletons/Util.hs
2+index 0f8f788..0ada2fe 100644
3+--- a/src/Data/Singletons/Util.hs
4++++ b/src/Data/Singletons/Util.hs
5+@@ -96,7 +96,7 @@ qNewUnique :: DsMonad q => q Int
6+ qNewUnique = do
7+ Name _ flav <- qNewName "x"
8+ case flav of
9+- NameU n -> return n
10++ NameU n -> return (fromInteger n)
11+ _ -> error "Internal error: `qNewName` didn't return a NameU"
12+
13+ checkForRep :: Quasi q => [Name] -> q ()
patches/ghc863/default.nix+1
@@ -7,4 +7,5 @@
77 packages.time.patches = [ ({ version, revision }: if version == "1.8.0.2" && revision == 0 then ./time-1.8.0.2.patch else null) ];
88 packages.transformers.patches = [ ({ version, revision }: if version == "0.5.5.0" && revision == 0 then ./transformers-0.5.5.0.patch else null) ];
99 packages.unix.patches = [ ({ version, revision }: if version == "2.7.2.2" && revision == 0 then ./unix-2.7.2.2.patch else null) ];
10+ packages.singletons.patches = [ ({ version, revision }: if version == "2.5.1" && revision == 0 then ./singletons-2.5.1.patch else null) ];
1011}
patches/ghc863/singletons-2.5.1.patchnew file+13
@@ -0,0 +1,13 @@
1+diff --git a/src/Data/Singletons/Util.hs b/src/Data/Singletons/Util.hs
2+index 0f8f788..0ada2fe 100644
3+--- a/src/Data/Singletons/Util.hs
4++++ b/src/Data/Singletons/Util.hs
5+@@ -96,7 +96,7 @@ qNewUnique :: DsMonad q => q Int
6+ qNewUnique = do
7+ Name _ flav <- qNewName "x"
8+ case flav of
9+- NameU n -> return n
10++ NameU n -> return (fromInteger n)
11+ _ -> error "Internal error: `qNewName` didn't return a NameU"
12+
13+ checkForRep :: Quasi q => [Name] -> q ()
patches/ghc864/default.nix+1
@@ -4,4 +4,5 @@
44 packages.hpc.patches = [ ({ version, revision }: if version == "0.6.0.3" && revision == 0 then ./hpc-0.6.0.3.patch else null) ];
55 packages.parsec.patches = [ ({ version, revision }: if version == "3.1.13.0" && revision == 0 then ./parsec-3.1.13.0.patch else null) ];
66 packages.unix.patches = [ ({ version, revision }: if version == "2.7.2.2" && revision == 0 then ./unix-2.7.2.2.patch else null) ];
7+ packages.singletons.patches = [ ({ version, revision }: if version == "2.5.1" && revision == 0 then ./singletons-2.5.1.patch else null) ];
78}
patches/ghc864/singletons-2.5.1.patchnew file+13
@@ -0,0 +1,13 @@
1+diff --git a/src/Data/Singletons/Util.hs b/src/Data/Singletons/Util.hs
2+index 0f8f788..0ada2fe 100644
3+--- a/src/Data/Singletons/Util.hs
4++++ b/src/Data/Singletons/Util.hs
5+@@ -96,7 +96,7 @@ qNewUnique :: DsMonad q => q Int
6+ qNewUnique = do
7+ Name _ flav <- qNewName "x"
8+ case flav of
9+- NameU n -> return n
10++ NameU n -> return (fromInteger n)
11+ _ -> error "Internal error: `qNewName` didn't return a NameU"
12+
13+ checkForRep :: Quasi q => [Name] -> q ()
patches/ghc865/default.nix+1
@@ -4,4 +4,5 @@
44 packages.hpc.patches = [ ({ version, revision }: if version == "0.6.0.3" && revision == 0 then ./hpc-0.6.0.3.patch else null) ];
55 packages.parsec.patches = [ ({ version, revision }: if version == "3.1.13.0" && revision == 0 then ./parsec-3.1.13.0.patch else null) ];
66 packages.unix.patches = [ ({ version, revision }: if version == "2.7.2.2" && revision == 0 then ./unix-2.7.2.2.patch else null) ];
7+ packages.singletons.patches = [ ({ version, revision }: if version == "2.5.1" && revision == 0 then ./singletons-2.5.1.patch else null) ];
78}
patches/ghc865/singletons-2.5.1.patchnew file+13
@@ -0,0 +1,13 @@
1+diff --git a/src/Data/Singletons/Util.hs b/src/Data/Singletons/Util.hs
2+index 0f8f788..0ada2fe 100644
3+--- a/src/Data/Singletons/Util.hs
4++++ b/src/Data/Singletons/Util.hs
5+@@ -96,7 +96,7 @@ qNewUnique :: DsMonad q => q Int
6+ qNewUnique = do
7+ Name _ flav <- qNewName "x"
8+ case flav of
9+- NameU n -> return n
10++ NameU n -> return (fromInteger n)
11+ _ -> error "Internal error: `qNewName` didn't return a NameU"
12+
13+ checkForRep :: Quasi q => [Name] -> q ()