diff --git a/comps-f18.xml.in b/comps-f18.xml.in
index a4a33452..6abb6fc9 100644
--- a/comps-f18.xml.in
+++ b/comps-f18.xml.in
@@ -1671,7 +1671,6 @@
systemtap
texinfo
valgrind
- alex
alleyoop
aplus-fsf
archmage
@@ -1705,7 +1704,6 @@
cvsgraph
cvsps
cvsweb
- darcs
dejagnu
ecl
ElectricFence
@@ -1730,7 +1728,6 @@
gcl-emacs
gcl-xemacs
gforth
- ghc
giggle
git-annex
git-cola
@@ -1741,9 +1738,7 @@
gpsim
gputils
gtranslator
- happy
highlight
- hugs98
iasl
imake
insight
@@ -3506,37 +3501,27 @@
false
emacs-haskell-mode
- alex
- cabal-install
- cabal-dev
- cabal2spec
- darcs
- ghc
- ghc-darcs-devel
- ghc-editline-devel
- ghc-ghc-paths-devel
- ghc-hakyll-devel
- ghc-hamlet-devel
- ghc-happstack-server-devel
- ghc-haskell-platform-devel
- ghc-hledger-devel
- ghc-hlint-devel
- ghc-leksah-devel
- ghc-regexpr-devel
- ghc-rpm-macros
- ghc-snap-core-devel
- ghc-xmonad-contrib-devel
- gtk2hs-buildtools
- happy
- haskell-platform
- hlint
- hscolour
- cpphs
- hugs98
- hugs98-demos
- leksah
- xmobar
- xmonad
+ cabal-dev
+ cabal-rpm
+ darcs
+ ghc
+ ghc-darcs-devel
+ ghc-editline-devel
+ ghc-ghc-paths-devel
+ ghc-hakyll-devel
+ ghc-hamlet-devel
+ ghc-happstack-server-devel
+ ghc-hledger-devel
+ ghc-hlint-devel
+ ghc-leksah-devel
+ ghc-regexpr-devel
+ ghc-rpm-macros
+ ghc-snap-core-devel
+ ghc-xmonad-contrib-devel
+ gtk2hs-buildtools
+ haskell-platform
+ hlint
+ hscolour
diff --git a/comps-f19.xml.in b/comps-f19.xml.in
index 89329cfa..eccbfe41 100644
--- a/comps-f19.xml.in
+++ b/comps-f19.xml.in
@@ -1684,7 +1684,6 @@
systemtap
texinfo
valgrind
- alex
alleyoop
aplus-fsf
archmage
@@ -1718,7 +1717,6 @@
cvsgraph
cvsps
cvsweb
- darcs
dejagnu
ecl
ElectricFence
@@ -1743,7 +1741,6 @@
gcl-emacs
gcl-xemacs
gforth
- ghc
giggle
git-annex
git-cola
@@ -1754,9 +1751,7 @@
gpsim
gputils
gtranslator
- happy
highlight
- hugs98
iasl
imake
insight
@@ -3519,37 +3514,27 @@
false
emacs-haskell-mode
- alex
- cabal-install
- cabal-dev
- cabal2spec
- darcs
- ghc
- ghc-darcs-devel
- ghc-editline-devel
- ghc-ghc-paths-devel
- ghc-hakyll-devel
- ghc-hamlet-devel
- ghc-happstack-server-devel
- ghc-haskell-platform-devel
- ghc-hledger-devel
- ghc-hlint-devel
- ghc-leksah-devel
- ghc-regexpr-devel
- ghc-rpm-macros
- ghc-snap-core-devel
- ghc-xmonad-contrib-devel
- gtk2hs-buildtools
- happy
- haskell-platform
- hlint
- hscolour
- cpphs
- hugs98
- hugs98-demos
- leksah
- xmobar
- xmonad
+ cabal-dev
+ cabal-rpm
+ darcs
+ ghc
+ ghc-darcs-devel
+ ghc-editline-devel
+ ghc-ghc-paths-devel
+ ghc-hakyll-devel
+ ghc-hamlet-devel
+ ghc-happstack-server-devel
+ ghc-hledger-devel
+ ghc-hlint-devel
+ ghc-leksah-devel
+ ghc-regexpr-devel
+ ghc-rpm-macros
+ ghc-snap-core-devel
+ ghc-xmonad-contrib-devel
+ gtk2hs-buildtools
+ haskell-platform
+ hlint
+ hscolour