Hello community, here is the log from the commit of package ghc-bits for openSUSE:Factory checked in at 2016-10-23 12:50:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-bits (Old) and /work/SRC/openSUSE:Factory/.ghc-bits.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-bits" Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-bits/ghc-bits.changes 2016-09-25 14:34:41.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-bits.new/ghc-bits.changes 2016-10-23 12:50:44.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Sep 15 06:58:06 UTC 2016 - [email protected] + +- Update to version 0.5 revision 0 with cabal2obs. + +------------------------------------------------------------------- Old: ---- bits-0.4.tar.gz New: ---- bits-0.5.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-bits.spec ++++++ --- /var/tmp/diff_new_pack.OEHJzM/_old 2016-10-23 12:50:45.000000000 +0200 +++ /var/tmp/diff_new_pack.OEHJzM/_new 2016-10-23 12:50:45.000000000 +0200 @@ -19,15 +19,14 @@ %global pkg_name bits %bcond_with tests Name: ghc-%{pkg_name} -Version: 0.4 +Version: 0.5 Release: 0 Summary: Various bit twiddling and bitwise serialization primitives 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-bytes-devel BuildRequires: ghc-mtl-devel BuildRequires: ghc-rpm-macros @@ -38,7 +37,6 @@ BuildRequires: ghc-doctest-devel BuildRequires: ghc-filepath-devel %endif -# End cabal-rpm deps %description Various bit twiddling and bitwise serialization primitives. @@ -57,20 +55,14 @@ %prep %setup -q -n %{pkg_name}-%{version} - %build %ghc_lib_build - %install %ghc_lib_install - %check -%if %{with tests} -%{cabal} test -%endif - +%cabal_test %post devel %ghc_pkg_recache ++++++ bits-0.4.tar.gz -> bits-0.5.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bits-0.4/.travis.yml new/bits-0.5/.travis.yml --- old/bits-0.4/.travis.yml 2014-11-07 22:13:37.000000000 +0100 +++ new/bits-0.5/.travis.yml 2016-06-16 00:08:49.000000000 +0200 @@ -1,16 +1,100 @@ -language: haskell +# This file has been generated -- see https://github.com/hvr/multi-ghc-travis +language: c +sudo: false + +cache: + directories: + - $HOME/.cabsnap + - $HOME/.cabal/packages + +before_cache: + - rm -fv $HOME/.cabal/packages/hackage.haskell.org/build-reports.log + - rm -fv $HOME/.cabal/packages/hackage.haskell.org/00-index.tar + +matrix: + include: + - env: CABALVER=1.18 GHCVER=7.8.4 + compiler: ": #GHC 7.8.4" + addons: {apt: {packages: [cabal-install-1.18,ghc-7.8.4,hlint], sources: [hvr-ghc]}} + - env: CABALVER=1.22 GHCVER=7.10.3 + compiler: ": #GHC 7.10.3" + addons: {apt: {packages: [cabal-install-1.22,ghc-7.10.3,hlint], sources: [hvr-ghc]}} + - env: CABALVER=1.24 GHCVER=8.0.1 + compiler: ": #GHC 8.0.1" + addons: {apt: {packages: [cabal-install-1.24,ghc-8.0.1,hlint], sources: [hvr-ghc]}} + - env: CABALVER=1.24 GHCVER=head + compiler: ": #GHC head" + addons: {apt: {packages: [cabal-install-1.24,ghc-head,hlint], sources: [hvr-ghc]}} + + allow_failures: + - env: CABALVER=1.24 GHCVER=head + before_install: - # Uncomment whenever hackage is down. - # - mkdir -p ~/.cabal && cp travis/config ~/.cabal/config && cabal update - - cabal update - - travis/cabal-apt-install $mode + - unset CC + - export PATH=/opt/ghc/$GHCVER/bin:/opt/cabal/$CABALVER/bin:$PATH install: - - cabal configure -flib-Werror $mode - - cabal build + - cabal --version + - echo "$(ghc --version) [$(ghc --print-project-git-commit-id 2> /dev/null || echo '?')]" + - if [ -f $HOME/.cabal/packages/hackage.haskell.org/00-index.tar.gz ]; + then + zcat $HOME/.cabal/packages/hackage.haskell.org/00-index.tar.gz > + $HOME/.cabal/packages/hackage.haskell.org/00-index.tar; + fi + - travis_retry cabal update -v + - sed -i 's/^jobs:/-- jobs:/' ${HOME}/.cabal/config + - cabal install --only-dependencies --enable-tests --dry -v > installplan.txt + - sed -i -e '1,/^Resolving /d' installplan.txt; cat installplan.txt +# check whether current requested install-plan matches cached package-db snapshot + - if diff -u installplan.txt $HOME/.cabsnap/installplan.txt; + then + echo "cabal build-cache HIT"; + rm -rfv .ghc; + cp -a $HOME/.cabsnap/ghc $HOME/.ghc; + cp -a $HOME/.cabsnap/lib $HOME/.cabsnap/share $HOME/.cabsnap/bin $HOME/.cabal/; + else + echo "cabal build-cache MISS"; + rm -rf $HOME/.cabsnap; + mkdir -p $HOME/.ghc $HOME/.cabal/lib $HOME/.cabal/share $HOME/.cabal/bin; + cabal install -j --only-dependencies --enable-tests; + if [ "$GHCVER" = "7.10.3" ]; then cabal install Cabal-1.22.4.0; fi; + fi + +# snapshot package-db on cache miss + - if [ ! -d $HOME/.cabsnap ]; + then + echo "snapshotting package-db to build-cache"; + mkdir $HOME/.cabsnap; + cp -a $HOME/.ghc $HOME/.cabsnap/ghc; + cp -a $HOME/.cabal/lib $HOME/.cabal/share $HOME/.cabal/bin installplan.txt $HOME/.cabsnap/; + fi + +# Here starts the actual work to be performed for the package under +# test; any command which exits with a non-zero exit code causes the +# build to fail. script: - - $script && hlint src --cpp-define HLINT + # -v2 provides useful information for debugging + - cabal configure --enable-tests -v2 + + # this builds all libraries and executables + # (including tests/benchmarks) + - cabal build + - cabal test --show-details=always + + # tests that a source-distribution can be generated + - cabal sdist + - hlint src --cpp-define HLINT + + # check that the generated source-distribution can be built & installed + - export SRC_TGZ=$(cabal info . | awk '{print $2 ".tar.gz";exit}') ; + cd dist/; + if [ -f "$SRC_TGZ" ]; then + cabal install --force-reinstalls "$SRC_TGZ"; + else + echo "expected '$SRC_TGZ' not found"; + exit 1; + fi notifications: irc: @@ -20,5 +104,4 @@ template: - "\x0313bits\x03/\x0306%{branch}\x03 \x0314%{commit}\x03 %{build_url} %{message}" -env: - - mode="--enable-tests" script="cabal test --show-details=always" +# EOF diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bits-0.4/AUTHORS.markdown new/bits-0.5/AUTHORS.markdown --- old/bits-0.4/AUTHORS.markdown 2014-11-07 22:13:37.000000000 +0100 +++ new/bits-0.5/AUTHORS.markdown 2016-06-16 00:08:49.000000000 +0200 @@ -2,7 +2,7 @@ `bits` was spun out of work that was being done on the `analytics` repository in bitwise encodings for compression schemes. -You can watch contributors carry on the quest for bragging rights in the [contributors graph](https://github.com/analytics/bits/graphs/contributors). +You can watch contributors carry on the quest for bragging rights in the [contributors graph](https://github.com/ekmett/bits/graphs/contributors). Omission from this list is by no means an attempt to discount your contribution. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bits-0.4/CHANGELOG.markdown new/bits-0.5/CHANGELOG.markdown --- old/bits-0.4/CHANGELOG.markdown 2014-11-07 22:13:37.000000000 +0100 +++ new/bits-0.5/CHANGELOG.markdown 2016-06-16 00:08:49.000000000 +0200 @@ -1,3 +1,8 @@ +0.5 +--- +* ghc 8 support +* Fixed doctests + 0.4 --- * Embrace `FiniteBits` from GHC 7.8.3 now that a platform has shipped with it. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bits-0.4/README.markdown new/bits-0.5/README.markdown --- old/bits-0.4/README.markdown 2014-11-07 22:13:37.000000000 +0100 +++ new/bits-0.5/README.markdown 2016-06-16 00:08:49.000000000 +0200 @@ -1,7 +1,7 @@ bits ===== -[](http://travis-ci.org/analytics/bits) +[](https://hackage.haskell.org/package/bits) [](http://travis-ci.org/ekmett/bits) This package provides a number of tools that are useful for dealing with files or data on a bitwise basis. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bits-0.4/Setup.lhs new/bits-0.5/Setup.lhs --- old/bits-0.4/Setup.lhs 2014-11-07 22:13:37.000000000 +0100 +++ new/bits-0.5/Setup.lhs 2016-06-16 00:08:49.000000000 +0200 @@ -11,7 +11,7 @@ import Distribution.Simple.Utils ( rewriteFile, createDirectoryIfMissingVerbose, copyFiles ) import Distribution.Simple.BuildPaths ( autogenModulesDir ) import Distribution.Simple.Setup ( BuildFlags(buildVerbosity), Flag(..), fromFlag, HaddockFlags(haddockDistPref)) -import Distribution.Simple.LocalBuildInfo ( withLibLBI, withTestLBI, LocalBuildInfo(), ComponentLocalBuildInfo(componentPackageDeps) ) +import Distribution.Simple.LocalBuildInfo ( withLibLBI, withTestLBI, LocalBuildInfo(buildDir), ComponentLocalBuildInfo(componentPackageDeps) ) import Distribution.Text ( display ) import Distribution.Verbosity ( Verbosity, normal ) import System.FilePath ( (</>) ) @@ -41,6 +41,13 @@ withTestLBI pkg lbi $ \suite suitecfg -> do rewriteFile (dir </> "Build_" ++ testName suite ++ ".hs") $ unlines [ "module Build_" ++ testName suite ++ " where" + , "" + , "autogen_dir :: String" + , "autogen_dir = " ++ show dir + , "" + , "build_dir :: String" + , "build_dir = " ++ show (buildDir lbi) + , "" , "deps :: [String]" , "deps = " ++ (show $ formatdeps (testDeps libcfg suitecfg)) ] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bits-0.4/bits.cabal new/bits-0.5/bits.cabal --- old/bits-0.4/bits.cabal 2014-11-07 22:13:37.000000000 +0100 +++ new/bits-0.5/bits.cabal 2016-06-16 00:08:49.000000000 +0200 @@ -1,17 +1,17 @@ name: bits category: Data, Serialization -version: 0.4 +version: 0.5 license: BSD3 cabal-version: >= 1.8 license-file: LICENSE author: Edward A. Kmett maintainer: Edward A. Kmett <[email protected]> stability: experimental -homepage: http://github.com/analytics/bits -bug-reports: http://github.com/analytics/bits/issues +homepage: http://github.com/ekmett/bits +bug-reports: http://github.com/ekmett/bits/issues copyright: Copyright (C) 2013 Edward A. Kmett build-type: Custom -tested-with: GHC == 7.8.3 +tested-with: GHC == 7.8.4, GHC == 7.10.3, GHC == 8.0.1 synopsis: Various bit twiddling and bitwise serialization primitives description: Various bit twiddling and bitwise serialization primitives @@ -28,32 +28,25 @@ source-repository head type: git - location: git://github.com/analytics/bits.git + location: git://github.com/ekmett/bits.git -- You can disable the doctests test suite with -f-test-doctests flag test-doctests default: True manual: True -flag lib-Werror - default: False - manual: True - library build-depends: base >= 4.7 && < 5, bytes >= 0.11 && < 1, mtl >= 2.0 && < 2.3, - transformers >= 0.2 && < 0.5 + transformers >= 0.2 && < 0.6 exposed-modules: Data.Bits.Coding Data.Bits.Coded Data.Bits.Extras - if flag(lib-Werror) - ghc-options: -Werror - c-sources: cbits/debruijn.c ghc-options: -Wall -fwarn-tabs -O2 hs-source-dirs: src @@ -63,6 +56,7 @@ main-is: doctests.hs ghc-options: -Wall -threaded hs-source-dirs: tests + c-sources: cbits/debruijn.c if !flag(test-doctests) buildable: False @@ -72,6 +66,3 @@ directory >= 1.0, doctest >= 0.9.1, filepath >= 1.2 - - if impl(ghc<7.6.1) - ghc-options: -Werror diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bits-0.4/src/Data/Bits/Coding.hs new/bits-0.5/src/Data/Bits/Coding.hs --- old/bits-0.4/src/Data/Bits/Coding.hs 2014-11-07 22:13:37.000000000 +0100 +++ new/bits-0.5/src/Data/Bits/Coding.hs 2016-06-16 00:08:49.000000000 +0200 @@ -56,7 +56,7 @@ {-# INLINE (<*>) #-} instance Monad m => Monad (Coding m) where - return a = Coding $ \ k -> k a + return = pure {-# INLINE return #-} Coding m >>= f = Coding $ \ k -> m $ \a -> runCoding (f a) k {-# INLINE (>>=) #-} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bits-0.4/tests/doctests.hsc new/bits-0.5/tests/doctests.hsc --- old/bits-0.4/tests/doctests.hsc 2014-11-07 22:13:37.000000000 +0100 +++ new/bits-0.5/tests/doctests.hsc 2016-06-16 00:08:49.000000000 +0200 @@ -15,7 +15,7 @@ ----------------------------------------------------------------------------- module Main where -import Build_doctests (deps) +import Build_doctests (autogen_dir, build_dir, deps) import Control.Applicative import Control.Monad import Data.List @@ -54,11 +54,12 @@ main :: IO () main = withUnicode $ getSources >>= \sources -> doctest $ "-isrc" - : "-idist/build/autogen" + : ("-i" ++ autogen_dir) : "-optP-include" - : "-optPdist/build/autogen/cabal_macros.h" + : ("-optP" ++ autogen_dir ++ "/cabal_macros.h") : "-hide-all-packages" : "-Iincludes" + : (build_dir ++ "/doctests/doctests-tmp/cbits/debruijn.o") : map ("-package="++) deps ++ sources getSources :: IO [FilePath]
