diff --git a/cabal2arch.cabal b/cabal2arch.cabal --- a/cabal2arch.cabal +++ b/cabal2arch.cabal @@ -1,5 +1,5 @@ name: cabal2arch -version: 0.7.7 +version: 0.8.0 homepage: http://github.com/archhaskell/ synopsis: Create Arch Linux packages from Cabal packages. description: Create Arch Linux packages from Cabal packages. diff --git a/data/ghc-provides.txt b/data/ghc-provides.txt --- a/data/ghc-provides.txt +++ b/data/ghc-provides.txt @@ -1,77 +1,14 @@ -## -## Core packages and their versions. These come with -## ghc, so we should be right. -## -## http://haskell.org/haskellwiki/Libraries_released_with_GHC -## -## And what Arch Linux thinks GHC provides: -## -## http://repos.archlinux.org/wsvn/packages/ghc/repos/extra-x86_64/PKGBUILD -## -## Note: we could just list these directly, and have yaourt solve them. -## -## NEW POLICY: -## We rely on all "provides" from the GHC library to be listed explicitly. -## - -base==4.1.0.0 -dph-base -dph-par -dph-prim-interface -dph-prim-par -dph-prim-seq -dph-seq -ghc -ghc-prim -integer -integer-gmp -ghc-binary - -## Official Provides: http://repos.archlinux.org/wsvn/packages/ghc/repos/extra-x86_64/PKGBUILD -#array==0.3.0.1 -#bytestring==0.9.1.7 -#cabal==1.8.0.6 -#containers==0.3.0.0 -#directory==1.0.1.1 -#extensible-exceptions==0.1.1.1 -#filepath==1.1.0.4 -#haskell98==1.0.1.1 -#hpc==0.5.0.5 -#old-locale==1.0.0.2 -#old-time==1.0.0.5 -#pretty==1.0.1.1 -#process==1.0.1.3 -#random==1.0.0.2 -#syb==0.1.0.2 -#template-haskell==2.4.0.1 -#time==1.1.4 -#unix==2.4.0.2 -#haddock==2.6.0 -## utf8-string # +# GHC core packages and their versions. # -## Removed in 6.12.x -# html==1.0.1.2 -# integer==0.1.0.0 -# QuickCheck==1.2.0.0 -# haskell-src==1.0.1.3 -# parsec==2.1.0.0 -# packedstring==0.1.0.1 -# parallel==1.1.0.0 -# network==2.2.0.1 -# mtl==1.1.0.2 -# stm==2.1.1.2 -# HUnit==1.2.0.3 -# xhtml==3000.2.0.1 -# regex-base==0.72.0.2 -# regex-compat==0.71.0.1 -# regex-posix==0.72.0.2 +# http://haskell.org/haskellwiki/Libraries_released_with_GHC # -## Removed in 6.10.x -# editline -# ALUT==2.1.0.0 -# cgi==3001.1.5.1 -# fgl==5.4.1.1 -- gone -# GLUT==2.1.1.1 -# OpenAL==1.3.1.1 -- gone -# readline==1.0.1.0 + +base ==4.3.1.0 +bin-package-db ==0.0.0.0 +ffi ==1.0 +ghc ==7.0.2 +ghc-binary ==0.5.0.2 +ghc-prim ==0.2.0.0 +integer-gmp ==0.2.0.3 +rts ==1.0 diff --git a/data/library-providers.txt b/data/library-providers.txt --- a/data/library-providers.txt +++ b/data/library-providers.txt @@ -1,110 +1,98 @@ -# This file lists external library dependencies and the ArchLinux -# packages providing them. For example, if the openssl package -# provides libssl.so, there should be a line # -# ssl openssl +# This file lists external library dependencies and the ArchLinux packages +# providing them. # -Imlib2 imlib2 -SDL sdl -adns adns -alut freealut -bz2 bzip2 -cblas blas -crack cracklib -crypto openssl -curl curl -freetype freetype2 -glib glib2 -wmflite libwmf -il devil - -jpeg libjpeg -ldap libldap -pcap libpcap -png libpng -x11 libx11 -xrandr libxrandr -xml2 libxml2 -libxml libxml2 -exif libexif -tiff libtiff -sndfile libsndfile -gcrypt libgcrypt -gnutls gnutls -gnutls-extra gnutls -fftw3 fftw - -pq postgresql -ssl openssl -wx wxgtk -odbc unixodbc -z zlib -curses ncurses -xslt libxslt -uuid e2fsprogs -ev libev -pthread glibc -m glibc -gl mesa -glu mesa -glut freeglut -db_cxx db -sqlite3 sqlite3 -xdamage libxdamage - -icui18n icu -icuuc icu -icudata icu - -netsnmp net-snmp -asound alsa-lib -ffi libffi -ogg libogg -theora libtheora -mtp libmtp -cv opencv -highgui opencv -xss libxss -idn libidn -libgsasl gsasl -event libevent -gcc_s gcc-libs -stdc++ gcc-libs - -# subsumed into glib - -gobject glib2 -gmodule glib2 -gio glib2 -gthread glib +adns adns +alut freealut +asound alsa-lib +bz2 bzip2 +cairo cairo +cblas blas +crack cracklib +crypt glibc +crypto openssl +csound64 csound5 +curl curl +curses ncurses +cv opencv +db_cxx db +doublefann fann +event libevent +ev libev +exif libexif +ffi libffi +fftw3 fftw +freetype freetype2 +gcc_s gcc-libs +gcrypt libgcrypt +gdk gtk +gdk-x11-2.0 gtk2 +gio glib2 +glib glib2 +gl mesa +glu mesa +glut freeglut +gmodule glib2 gnome-vfs-module -gstreamer-audio gstreamer0.10-base -gstreamer-base gstreamer0.10 -gstreamer-controller gstreamer0.10 -gstreamer-dataprotocol gstreamer0.10 -gstreamer-net gstreamer0.10 +gnutls-extra gnutls +gnutls gnutls +gobject glib2 +gstreamer-audio gstreamer0.10-base +gstreamer-base gstreamer0.10 +gstreamer-controller gstreamer0.10 +gstreamer-dataprotocol gstreamer0.10 +gstreamer gstreamer0.10 +gstreamer-net gstreamer0.10 +gstreamer-plugins-base gstreamer0.10-base +gthread glib +gtk+ gtk2 +gtk-x11-2.0 gtk2 +highgui opencv +icudata icu +icui18n icu +icuuc icu +idn libidn +il devil +Imlib2 imlib2 +jpeg libjpeg +ldap libldap +libgsasl gsasl +libxml libxml2 +m glibc +mtp libmtp +ncurses ncurses +ncursesw ncurses +netsnmp net-snmp +odbc unixodbc +ogg libogg ogremain - -webkit libwebkit -cairo cairo -pango pango -pangocairo pango -gtk+ gtk2 -gdk gtk -gdk-x11-2.0 gtk2 -gtk-x11-2.0 gtk2 -vte vte -xine xine-lib -ncurses ncurses -ncursesw ncurses -panel ncurses - -gstreamer gstreamer0.10 -gstreamer-plugins-base gstreamer0.10-base - -# Packages from AUR -xenctrl xen -csound64 csound5 -doublefann fann -zmq zeromq +panel ncurses +pangocairo pango +pango pango +pcap libpcap +png libpng +pq postgresql +pthread glibc +SDL sdl +sndfile libsndfile +sqlite3 sqlite3 +ssl openssl +stdc++ gcc-libs +theora libtheora +tiff libtiff +uuid e2fsprogs +vte vte +webkit libwebkit +wmflite libwmf +wx wxgtk +x11 libx11 +xdamage libxdamage +xenctrl xen +xine xine-lib +xml2 libxml2 +xrandr libxrandr +xslt libxslt +xss libxss +zmq zeromq +z zlib diff --git a/data/platform-provides.txt b/data/platform-provides.txt --- a/data/platform-provides.txt +++ b/data/platform-provides.txt @@ -1,44 +1,55 @@ -# Packages in GHC 6.12 -array ==0.3.0.1 -bytestring ==0.9.1.7 -Cabal ==1.8.0.6 -containers ==0.3.0.0 -directory ==1.0.1.1 -extensible-exceptions ==0.1.1.1 -filepath ==1.1.0.4 -haskell98 ==1.0.1.1 -hpc ==0.5.0.5 -old-locale ==1.0.0.2 -old-time ==1.0.0.5 -pretty ==1.0.1.1 -process ==1.0.1.3 -random ==1.0.0.2 -syb ==0.1.0.2 -template-haskell ==2.4.0.1 -time ==1.1.4 -unix ==2.4.0.2 -# Packages in HP 2010.2 -cgi ==3001.1.7.3 -fgl ==5.4.2.3 -GLUT ==2.1.2.1 -haskell-src ==1.0.1.3 -html ==1.0.1.2 -HUnit ==1.2.2.1 -mtl ==1.1.0.2, -network ==2.2.1.7 -OpenGL ==2.2.3.0 -parallel ==2.2.0.1 -parsec ==2.1.0.1 -QuickCheck ==2.1.1.1 -regex-base ==0.93.2 -regex-compat ==0.93.1 -regex-posix ==0.94.2 -stm ==2.1.2.1 -xhtml ==3000.2.0.1 -zlib ==0.5.2.0 -HTTP ==4000.0.9 -deepseq ==1.1.0.0 -cabal-install ==0.8.2 -alex ==2.3.3 -happy ==1.18.5 -haddock ==2.7.2 +# Packages that are not part of GHC, but are required by Haskell Platform. + +# HP 2011.2.0.0 packages provided by GHC 7.0.2: +array ==0.3.0.2 +bytestring ==0.9.1.10 +Cabal ==1.10.1.0 +containers ==0.4.0.0 +directory ==1.1.0.0 +extensible-exceptions ==0.1.1.2 +filepath ==1.2.0.0 +haskell2010 ==1.0.0.0 +haskell98 ==1.1.0.1 +hpc ==0.5.0.6 +old-locale ==1.0.0.2 +old-time ==1.0.0.6 +pretty ==1.0.1.2 +process ==1.0.1.5 +random ==1.0.0.3 +template-haskell ==2.5.0.0 +time ==1.2.0.3 +unix ==2.4.2.0 + +# HP 2011.2.0.0 packages not provided by GHC 7.0.2: +cgi ==3001.1.7.4 +fgl ==5.4.2.3 +GLUT ==2.1.2.1 +haskell-src ==1.0.1.4 +html ==1.0.1.2 +HUnit ==1.2.2.3 +network ==2.3.0.2 +OpenGL ==2.2.3.0 +parallel ==3.1.0.1 +parsec ==3.1.1 +QuickCheck ==2.4.0.1 +regex-base ==0.93.2 +regex-compat ==0.93.1 +regex-posix ==0.94.4 +stm ==2.2.0.1 +syb ==0.3 +xhtml ==3000.2.0.1 +zlib ==0.5.3.1 +HTTP ==4000.1.1 +deepseq ==1.1.0.2 + +# HP proposals: +text ==0.11.0.5 +transformers ==0.2.2.0 +mtl ==2.0.1.0 + +# Build tools: +cabal-install ==0.10.2 +alex ==2.3.5 +happy ==1.18.6 +hscolour ==1.17 +haddock ==2.9.2