diff -Nru haskell-concurrent-supply-0.1.8/debian/changelog haskell-concurrent-supply-0.1.8/debian/changelog
--- haskell-concurrent-supply-0.1.8/debian/changelog	2022-12-10 10:33:03.000000000 +0000
+++ haskell-concurrent-supply-0.1.8/debian/changelog	2023-01-03 16:13:19.000000000 +0000
@@ -1,8 +1,8 @@
-haskell-concurrent-supply (0.1.8-6build1) lunar; urgency=medium
+haskell-concurrent-supply (0.1.8-7) unstable; urgency=medium
 
-  * Rebuild against new GHC ABI.
+  * Disable RTS -N globally (fixes FTBFS on riscv64/others) (Closes: #1027640)
 
- -- Gianfranco Costamagna <locutusofborg@debian.org>  Sat, 10 Dec 2022 11:33:03 +0100
+ -- Scott Talbert <swt@techie.net>  Tue, 03 Jan 2023 11:13:19 -0500
 
 haskell-concurrent-supply (0.1.8-6) unstable; urgency=medium
 
diff -Nru haskell-concurrent-supply-0.1.8/debian/patches/no-rts-n haskell-concurrent-supply-0.1.8/debian/patches/no-rts-n
--- haskell-concurrent-supply-0.1.8/debian/patches/no-rts-n	1970-01-01 00:00:00.000000000 +0000
+++ haskell-concurrent-supply-0.1.8/debian/patches/no-rts-n	2023-01-03 16:11:23.000000000 +0000
@@ -0,0 +1,11 @@
+--- a/concurrent-supply.cabal
++++ b/concurrent-supply.cabal
+@@ -42,7 +42,7 @@ test-suite properties
+   type: exitcode-stdio-1.0
+   main-is: properties.hs
+   default-language: Haskell2010
+-  ghc-options: -w -threaded -rtsopts -with-rtsopts=-N
++  ghc-options: -w -threaded -rtsopts
+   hs-source-dirs: test
+ 
+   if !flag(test-properties)
diff -Nru haskell-concurrent-supply-0.1.8/debian/patches/no-smp-arches haskell-concurrent-supply-0.1.8/debian/patches/no-smp-arches
--- haskell-concurrent-supply-0.1.8/debian/patches/no-smp-arches	2022-07-29 19:15:09.000000000 +0000
+++ haskell-concurrent-supply-0.1.8/debian/patches/no-smp-arches	1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +0,0 @@
---- a/concurrent-supply.cabal
-+++ b/concurrent-supply.cabal
-@@ -42,7 +42,10 @@ test-suite properties
-   type: exitcode-stdio-1.0
-   main-is: properties.hs
-   default-language: Haskell2010
--  ghc-options: -w -threaded -rtsopts -with-rtsopts=-N
-+  if arch(arm) || arch(mips) || arch(s390x) || arch(i386)
-+    ghc-options: -w -threaded -rtsopts
-+  else
-+    ghc-options: -w -threaded -rtsopts -with-rtsopts=-N
-   hs-source-dirs: test
- 
-   if !flag(test-properties)
diff -Nru haskell-concurrent-supply-0.1.8/debian/patches/series haskell-concurrent-supply-0.1.8/debian/patches/series
--- haskell-concurrent-supply-0.1.8/debian/patches/series	2022-05-05 21:10:43.000000000 +0000
+++ haskell-concurrent-supply-0.1.8/debian/patches/series	2023-01-03 16:10:20.000000000 +0000
@@ -1,2 +1,2 @@
 newer-deps
-no-smp-arches
+no-rts-n