Hello community, here is the log from the commit of package ghc-ghc-syb-utils for openSUSE:Factory checked in at 2017-06-21 13:55:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-ghc-syb-utils (Old) and /work/SRC/openSUSE:Factory/.ghc-ghc-syb-utils.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-ghc-syb-utils" Wed Jun 21 13:55:21 2017 rev:3 rq:504666 version:0.2.3.1 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-ghc-syb-utils/ghc-ghc-syb-utils.changes 2016-07-20 09:21:16.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-ghc-syb-utils.new/ghc-ghc-syb-utils.changes 2017-06-21 13:55:21.954822252 +0200 @@ -1,0 +2,5 @@ +Mon Jun 12 09:41:40 UTC 2017 - psim...@suse.com + +- Update to version 0.2.3.1. + +------------------------------------------------------------------- Old: ---- ghc-syb-utils-0.2.3.tar.gz New: ---- ghc-syb-utils-0.2.3.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-ghc-syb-utils.spec ++++++ --- /var/tmp/diff_new_pack.ZhiUgc/_old 2017-06-21 13:55:23.310631003 +0200 +++ /var/tmp/diff_new_pack.ZhiUgc/_new 2017-06-21 13:55:23.310631003 +0200 @@ -1,7 +1,7 @@ # # spec file for package ghc-ghc-syb-utils # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,21 +17,25 @@ %global pkg_name ghc-syb-utils +%bcond_with tests Name: ghc-%{pkg_name} -Version: 0.2.3 +Version: 0.2.3.1 Release: 0 Summary: Scrap Your Boilerplate utilities for the GHC API License: BSD-3-Clause -Group: System/Libraries +Group: Development/Languages/Other Url: https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz BuildRequires: ghc-Cabal-devel -# Begin cabal-rpm deps: BuildRequires: ghc-ghc-devel BuildRequires: ghc-rpm-macros BuildRequires: ghc-syb-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build -# End cabal-rpm deps +%if %{with tests} +BuildRequires: ghc-directory-devel +BuildRequires: ghc-filepath-devel +BuildRequires: ghc-ghc-paths-devel +%endif %description Scrap Your Boilerplate utilities for the GHC API. @@ -50,14 +54,14 @@ %prep %setup -q -n %{pkg_name}-%{version} - %build %ghc_lib_build - %install %ghc_lib_install +%check +%cabal_test %post devel %ghc_pkg_recache ++++++ ghc-syb-utils-0.2.3.tar.gz -> ghc-syb-utils-0.2.3.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ghc-syb-utils-0.2.3/GHC/SYB/Utils.hs new/ghc-syb-utils-0.2.3.1/GHC/SYB/Utils.hs --- old/ghc-syb-utils-0.2.3/GHC/SYB/Utils.hs 2015-01-15 01:09:53.000000000 +0100 +++ new/ghc-syb-utils-0.2.3.1/GHC/SYB/Utils.hs 2017-06-11 12:15:08.000000000 +0200 @@ -185,7 +185,9 @@ import Bag(Bag,bagToList) import Var(Var) import FastString(FastString) -#if __GLASGOW_HASKELL__ >= 709 +#if __GLASGOW_HASKELL__ >= 800 +import NameSet(NameSet,nameSetElemsStable) +#elif __GLASGOW_HASKELL__ >= 709 import NameSet(NameSet,nameSetElems) #else import NameSet(NameSet,nameSetToList) @@ -198,7 +200,10 @@ import Control.Monad import Data.List -#if __GLASGOW_HASKELL__ < 709 +#if __GLASGOW_HASKELL__ >= 800 +nameSetElems :: NameSet -> [Name] +nameSetElems = nameSetElemsStable +#elif __GLASGOW_HASKELL__ < 709 nameSetElems :: NameSet -> [Name] nameSetElems = nameSetToList #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ghc-syb-utils-0.2.3/ghc-syb-utils.cabal new/ghc-syb-utils-0.2.3.1/ghc-syb-utils.cabal --- old/ghc-syb-utils-0.2.3/ghc-syb-utils.cabal 2015-01-15 01:09:53.000000000 +0100 +++ new/ghc-syb-utils-0.2.3.1/ghc-syb-utils.cabal 2017-06-11 12:15:08.000000000 +0200 @@ -1,5 +1,5 @@ name: ghc-syb-utils -version: 0.2.3 +version: 0.2.3.1 license: BSD3 license-file: LICENSE author: Claus Reinke @@ -11,7 +11,7 @@ category: Development stability: provisional build-type: Simple -cabal-version: >= 1.6 +cabal-version: >= 1.8 tested-with: GHC ==7.8.3, GHC ==7.10.0 library @@ -31,3 +31,15 @@ ghc-options: -Wall exposed-modules: GHC.SYB.Utils + +test-suite regression-tests + type: exitcode-stdio-1.0 + hs-source-dirs: test + main-is: Regression.hs + build-depends: + base, + directory, + filepath, + ghc, + ghc-paths, + ghc-syb-utils diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ghc-syb-utils-0.2.3/test/Regression.hs new/ghc-syb-utils-0.2.3.1/test/Regression.hs --- old/ghc-syb-utils-0.2.3/test/Regression.hs 1970-01-01 01:00:00.000000000 +0100 +++ new/ghc-syb-utils-0.2.3.1/test/Regression.hs 2017-06-11 12:15:08.000000000 +0200 @@ -0,0 +1,50 @@ +module Main where + +import GHC.Paths ( libdir ) +import qualified GhcMake as Ghc +import qualified GHC as Ghc +import qualified HscTypes as Ghc +import MonadUtils ( liftIO ) +import System.Directory ( getCurrentDirectory ) +import System.FilePath ( (</>) ) +import System.Exit ( exitWith, ExitCode(..) ) +import Control.Monad ( when ) + +import GHC.SYB.Utils + +main :: IO () +main = do + pkg_dir <- getCurrentDirectory + let ex1 = pkg_dir </> "test" </> "test-cases" </> "GithubIssue9.hs" + Ghc.runGhc (Just libdir) $ do + dflags0 <- Ghc.getSessionDynFlags + let dflags = dflags0 + { Ghc.ghcLink = Ghc.NoLink + , Ghc.hscTarget = Ghc.HscAsm + } + Ghc.setSessionDynFlags dflags + env <- Ghc.getSession + Ghc.handleSourceError printErrorAndExit $ do + target <- Ghc.guessTarget ex1 Nothing + Ghc.setTargets [target] + ok <- Ghc.load Ghc.LoadAllTargets + when (not (Ghc.succeeded ok)) $ die + let mn = Ghc.mkModuleName "GithubIssue9" + msum <- Ghc.getModSummary mn + parsed <- Ghc.parseModule msum + liftIO $ do + putStrLn "===== Parsed Source ==================================" + putStrLn $ showData Parser 1 (Ghc.parsedSource parsed) + typechecked <- Ghc.typecheckModule parsed + liftIO $ do + putStrLn "===== Renamed Source =================================" + putStrLn $ showData Renamer 1 (Ghc.renamedSource typechecked) + putStrLn "===== Type-checked Source ============================" + putStrLn $ showData TypeChecker 1 (Ghc.typecheckedSource typechecked) + return () + +printErrorAndExit :: Ghc.SourceError -> Ghc.Ghc () +printErrorAndExit err = Ghc.printException err >> die + +die :: Ghc.Ghc () +die = liftIO $ exitWith (ExitFailure 1)