diff options
author | Sven Bartscher <kritzefitz@debian.org> | 2016-07-09 19:52:05 +0200 |
---|---|---|
committer | Sven Bartscher <kritzefitz@debian.org> | 2016-07-09 19:52:05 +0200 |
commit | 3bf8d134647982242363aa24bbd84e43199b382e (patch) | |
tree | 615ebe7c4eee9ba37d65f2cf740fe7749b9401ec /Dh_Haskell.sh | |
parent | d5b409940017fb01d323361870b39936ab25fff4 (diff) |
strip_hash isn't needed anymore, because ghc-pkg up from 8.0.1 can
handle full package ids, so we don't need to strip the hash ourselves.
Diffstat (limited to 'Dh_Haskell.sh')
-rw-r--r-- | Dh_Haskell.sh | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/Dh_Haskell.sh b/Dh_Haskell.sh index 6237ef1..276a21f 100644 --- a/Dh_Haskell.sh +++ b/Dh_Haskell.sh @@ -106,10 +106,6 @@ hc_hoogle(){ echo "/usr/lib/${hc}-doc/hoogle/" } -strip_hash(){ - echo "$1" | sed 's/-[^-]\+$//' -} - sort_uniq(){ { for i in "$@" ; do @@ -143,7 +139,7 @@ providing_package_for_ghc(){ local lib local hc hc=$1 - dep=`strip_hash $2` + dep=$2 dirs=`ghc_pkg_field $hc $dep library-dirs | grep -i ^library-dirs | cut -d':' -f 2` lib=`ghc_pkg_field $hc $dep hs-libraries | grep -i ^hs-libraries | sed -e 's|hs-libraries: *\([^ ]*\).*|\1|' ` for dir in $dirs ; do @@ -163,7 +159,7 @@ providing_package_for_ghc_prof(){ local lib local hc hc=$1 - dep=`strip_hash $2` + dep=$2 dirs=`ghc_pkg_field $hc $dep library-dirs | grep -i ^library-dirs | cut -d':' -f 2` lib=`ghc_pkg_field $hc $dep hs-libraries | grep -i ^hs-libraries | sed -e 's|hs-libraries: *\([^ ]*\).*|\1|' ` for dir in $dirs ; do |