From 43b2fb1ab1557f2c0a0b639b80481d7213c469968c65fac6c906ad461e7af204 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 1 Jul 2018 01:01:10 +0000 Subject: [PATCH 1/4] osc copypac from project:devel:languages:haskell:ghc-8.4.x package:ghc-generic-deriving revision:6, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-generic-deriving?expand=0&rev=29 --- generic-deriving-1.12.1.tar.gz | 3 -- generic-deriving-1.12.2.tar.gz | 3 ++ generic-deriving.cabal | 99 ---------------------------------- ghc-generic-deriving.spec | 5 +- 4 files changed, 5 insertions(+), 105 deletions(-) delete mode 100644 generic-deriving-1.12.1.tar.gz create mode 100644 generic-deriving-1.12.2.tar.gz delete mode 100644 generic-deriving.cabal diff --git a/generic-deriving-1.12.1.tar.gz b/generic-deriving-1.12.1.tar.gz deleted file mode 100644 index e06aaa6..0000000 --- a/generic-deriving-1.12.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f5fd3f733a20deee5a6e752969edac1e04a90e2ee34e005fccb5d35a5c129473 -size 67982 diff --git a/generic-deriving-1.12.2.tar.gz b/generic-deriving-1.12.2.tar.gz new file mode 100644 index 0000000..6b9d8ac --- /dev/null +++ b/generic-deriving-1.12.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5688b85ff1e3484e3f6073a52f99624a41c8b01ddaab9fcec20afa242f33edc4 +size 64159 diff --git a/generic-deriving.cabal b/generic-deriving.cabal deleted file mode 100644 index e5239f7..0000000 --- a/generic-deriving.cabal +++ /dev/null @@ -1,99 +0,0 @@ -name: generic-deriving -version: 1.12.1 -x-revision: 1 -synopsis: Generic programming library for generalised deriving. -description: - - This package provides functionality for generalising the deriving mechanism - in Haskell to arbitrary classes. It was first described in the paper: - . - * /A generic deriving mechanism for Haskell/. - Jose Pedro Magalhaes, Atze Dijkstra, Johan Jeuring, and Andres Loeh. - Haskell'10. - . - The current implementation integrates with the new GHC Generics. See - for more information. - Template Haskell code is provided for supporting older GHCs. - -homepage: https://github.com/dreixel/generic-deriving -bug-reports: https://github.com/dreixel/generic-deriving/issues -category: Generics -copyright: 2011-2013 Universiteit Utrecht, University of Oxford -license: BSD3 -license-file: LICENSE -author: José Pedro Magalhães -maintainer: generics@haskell.org -stability: experimental -build-type: Simple -cabal-version: >= 1.10 -tested-with: GHC == 7.0.4 - , GHC == 7.2.2 - , GHC == 7.4.2 - , GHC == 7.6.3 - , GHC == 7.8.4 - , GHC == 7.10.3 - , GHC == 8.0.2 - , GHC == 8.2.2 - , GHC == 8.4.1 -extra-source-files: CHANGELOG.md - , README.md - -source-repository head - type: git - location: https://github.com/dreixel/generic-deriving - -flag base-4-9 - description: Use base-4.9 or later. This version of base uses a - DataKinds-based encoding of GHC generics metadata. - default: True - -library - hs-source-dirs: src - exposed-modules: Generics.Deriving - Generics.Deriving.Base - Generics.Deriving.Instances - Generics.Deriving.Copoint - Generics.Deriving.ConNames - Generics.Deriving.Enum - Generics.Deriving.Eq - Generics.Deriving.Foldable - Generics.Deriving.Functor - Generics.Deriving.Monoid - Generics.Deriving.Semigroup - Generics.Deriving.Show - Generics.Deriving.Traversable - Generics.Deriving.Uniplate - - Generics.Deriving.TH - - other-modules: Generics.Deriving.Base.Internal - Generics.Deriving.TH.Internal - Paths_generic_deriving - if flag(base-4-9) - build-depends: base >= 4.9 && < 5 - other-modules: Generics.Deriving.TH.Post4_9 - else - build-depends: base >= 4.3 && < 4.9 - other-modules: Generics.Deriving.TH.Pre4_9 - - build-depends: containers >= 0.1 && < 0.6 - , ghc-prim < 1 - , template-haskell >= 2.4 && < 2.14 - - default-language: Haskell2010 - ghc-options: -Wall - -test-suite spec - type: exitcode-stdio-1.0 - main-is: Spec.hs - other-modules: EmptyCaseSpec - ExampleSpec - TypeInTypeSpec - build-depends: base >= 4.3 && < 5 - , generic-deriving - , hspec >= 2 && < 3 - , template-haskell >= 2.4 && < 2.14 - build-tool-depends: hspec-discover:hspec-discover - hs-source-dirs: tests - default-language: Haskell2010 - ghc-options: -Wall -threaded -rtsopts diff --git a/ghc-generic-deriving.spec b/ghc-generic-deriving.spec index 9c03d37..33e2ed0 100644 --- a/ghc-generic-deriving.spec +++ b/ghc-generic-deriving.spec @@ -19,18 +19,18 @@ %global pkg_name generic-deriving %bcond_with tests Name: ghc-%{pkg_name} -Version: 1.12.1 +Version: 1.12.2 Release: 0 Summary: Generic programming library for generalised deriving License: BSD-3-Clause Group: Development/Libraries/Haskell URL: https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz -Source1: https://hackage.haskell.org/package/%{pkg_name}-%{version}/revision/1.cabal#/%{pkg_name}.cabal BuildRequires: ghc-Cabal-devel BuildRequires: ghc-containers-devel BuildRequires: ghc-rpm-macros BuildRequires: ghc-template-haskell-devel +BuildRequires: ghc-th-abstraction-devel %if %{with tests} BuildRequires: ghc-hspec-devel %endif @@ -60,7 +60,6 @@ files. %prep %setup -q -n %{pkg_name}-%{version} -cp -p %{SOURCE1} %{pkg_name}.cabal %build %ghc_lib_build From 5ebe558678e3f71068a4df1e6b1e753a5f98e217a371a489394a00958a9b6c73 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 11 Jul 2018 01:01:40 +0000 Subject: [PATCH 2/4] osc copypac from project:devel:languages:haskell:ghc-8.4.x package:ghc-generic-deriving revision:7, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-generic-deriving?expand=0&rev=30 --- generic-deriving.cabal | 100 +++++++++++++++++++++++++++++++++++ ghc-generic-deriving.changes | 11 ++++ ghc-generic-deriving.spec | 2 + 3 files changed, 113 insertions(+) create mode 100644 generic-deriving.cabal diff --git a/generic-deriving.cabal b/generic-deriving.cabal new file mode 100644 index 0000000..53762a4 --- /dev/null +++ b/generic-deriving.cabal @@ -0,0 +1,100 @@ +name: generic-deriving +version: 1.12.2 +x-revision: 1 +synopsis: Generic programming library for generalised deriving. +description: + + This package provides functionality for generalising the deriving mechanism + in Haskell to arbitrary classes. It was first described in the paper: + . + * /A generic deriving mechanism for Haskell/. + Jose Pedro Magalhaes, Atze Dijkstra, Johan Jeuring, and Andres Loeh. + Haskell'10. + . + The current implementation integrates with the new GHC Generics. See + for more information. + Template Haskell code is provided for supporting older GHCs. + +homepage: https://github.com/dreixel/generic-deriving +bug-reports: https://github.com/dreixel/generic-deriving/issues +category: Generics +copyright: 2011-2013 Universiteit Utrecht, University of Oxford +license: BSD3 +license-file: LICENSE +author: José Pedro Magalhães +maintainer: generics@haskell.org +stability: experimental +build-type: Simple +cabal-version: >= 1.10 +tested-with: GHC == 7.0.4 + , GHC == 7.2.2 + , GHC == 7.4.2 + , GHC == 7.6.3 + , GHC == 7.8.4 + , GHC == 7.10.3 + , GHC == 8.0.2 + , GHC == 8.2.2 + , GHC == 8.4.3 +extra-source-files: CHANGELOG.md + , README.md + +source-repository head + type: git + location: https://github.com/dreixel/generic-deriving + +flag base-4-9 + description: Use base-4.9 or later. This version of base uses a + DataKinds-based encoding of GHC generics metadata. + default: True + +library + hs-source-dirs: src + exposed-modules: Generics.Deriving + Generics.Deriving.Base + Generics.Deriving.Instances + Generics.Deriving.Copoint + Generics.Deriving.ConNames + Generics.Deriving.Enum + Generics.Deriving.Eq + Generics.Deriving.Foldable + Generics.Deriving.Functor + Generics.Deriving.Monoid + Generics.Deriving.Semigroup + Generics.Deriving.Show + Generics.Deriving.Traversable + Generics.Deriving.Uniplate + + Generics.Deriving.TH + + other-modules: Generics.Deriving.Base.Internal + Generics.Deriving.TH.Internal + Paths_generic_deriving + if flag(base-4-9) + build-depends: base >= 4.9 && < 5 + other-modules: Generics.Deriving.TH.Post4_9 + else + build-depends: base >= 4.3 && < 4.9 + other-modules: Generics.Deriving.TH.Pre4_9 + + build-depends: containers >= 0.1 && < 0.7 + , ghc-prim < 1 + , template-haskell >= 2.4 && < 2.15 + , th-abstraction >= 0.2.7 && < 0.3 + + default-language: Haskell2010 + ghc-options: -Wall + +test-suite spec + type: exitcode-stdio-1.0 + main-is: Spec.hs + other-modules: EmptyCaseSpec + ExampleSpec + TypeInTypeSpec + build-depends: base >= 4.3 && < 5 + , generic-deriving + , hspec >= 2 && < 3 + , template-haskell >= 2.4 && < 2.15 + build-tool-depends: hspec-discover:hspec-discover + hs-source-dirs: tests + default-language: Haskell2010 + ghc-options: -Wall -threaded -rtsopts diff --git a/ghc-generic-deriving.changes b/ghc-generic-deriving.changes index 076f717..d6b1729 100644 --- a/ghc-generic-deriving.changes +++ b/ghc-generic-deriving.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Mon Jul 9 19:45:07 UTC 2018 - psimons@suse.com + +- Update generic-deriving to version 1.12.2. + # 1.12.2 [2018.06.28] + * Backport the `Generic(1)` instances for `Data.Ord.Down`, introduced in + `base-4.12`. Add `GEq`, `GShow`, `GSemigroup`, `GMonoid`, `GFunctor`, + `GFoldable`, `GTraversable`, and `GCopoint` instances for `Down`. + * Refactor internals using `th-abstraction`. + * Adapt to `Maybe` moving to `GHC.Maybe` in GHC 8.6. + ------------------------------------------------------------------- Mon May 14 17:02:11 UTC 2018 - psimons@suse.com diff --git a/ghc-generic-deriving.spec b/ghc-generic-deriving.spec index 33e2ed0..d78c65c 100644 --- a/ghc-generic-deriving.spec +++ b/ghc-generic-deriving.spec @@ -26,6 +26,7 @@ License: BSD-3-Clause Group: Development/Libraries/Haskell URL: https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz +Source1: https://hackage.haskell.org/package/%{pkg_name}-%{version}/revision/1.cabal#/%{pkg_name}.cabal BuildRequires: ghc-Cabal-devel BuildRequires: ghc-containers-devel BuildRequires: ghc-rpm-macros @@ -60,6 +61,7 @@ files. %prep %setup -q -n %{pkg_name}-%{version} +cp -p %{SOURCE1} %{pkg_name}.cabal %build %ghc_lib_build From c58abbef2f6c4db673dd1e3d8857e53edb0addac03484c1a3749e4ca7d5b4b91 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 15 Jul 2018 01:01:47 +0000 Subject: [PATCH 3/4] osc copypac from project:devel:languages:haskell:ghc-8.4.x package:ghc-generic-deriving revision:8, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-generic-deriving?expand=0&rev=31 --- ghc-generic-deriving.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ghc-generic-deriving.changes b/ghc-generic-deriving.changes index d6b1729..aeac632 100644 --- a/ghc-generic-deriving.changes +++ b/ghc-generic-deriving.changes @@ -1,5 +1,5 @@ ------------------------------------------------------------------- -Mon Jul 9 19:45:07 UTC 2018 - psimons@suse.com +Fri Jul 13 14:31:34 UTC 2018 - psimons@suse.com - Update generic-deriving to version 1.12.2. # 1.12.2 [2018.06.28] From b8635a73a9e9d0c75f07078adca900efa61044379ac3d5052ab7d65cc4778862 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 18 Jul 2018 14:40:20 +0000 Subject: [PATCH 4/4] osc copypac from project:devel:languages:haskell:ghc-8.4.x package:ghc-generic-deriving revision:9, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-generic-deriving?expand=0&rev=32 --- ghc-generic-deriving.changes | 45 ++++++++++++++++++++---------------- 1 file changed, 25 insertions(+), 20 deletions(-) diff --git a/ghc-generic-deriving.changes b/ghc-generic-deriving.changes index aeac632..399bb25 100644 --- a/ghc-generic-deriving.changes +++ b/ghc-generic-deriving.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jul 18 14:26:25 UTC 2018 - psimons@suse.com + +- Cosmetic: replace tabs with blanks, strip trailing white space, + and update copyright headers with spec-cleaner. + ------------------------------------------------------------------- Fri Jul 13 14:31:34 UTC 2018 - psimons@suse.com @@ -70,11 +76,11 @@ Mon May 23 21:09:37 UTC 2016 - mimi.vx@gmail.com - update to 1.10.4.1 * Fix Haddock parsing issue on GHC 8.0 * Backported MonadPlus and MonadZip instances for U1, and made the Functor, - Foldable, Traversable, Alternative, and Monad instances for U1 lazier to - correspond with base-4.9 + Foldable, Traversable, Alternative, and Monad instances for U1 lazier to + correspond with base-4.9 * Backported Enum, Bounded, Ix, Functor, Applicative, Monad, MonadFix, MonadPlus, - MonadZip, Foldable, Traversable, and Data instances (introduced in base-4.9) - for datatypes in the Generics.Deriving.Base module + MonadZip, Foldable, Traversable, and Data instances (introduced in base-4.9) + for datatypes in the Generics.Deriving.Base module * Added Generics.Deriving.Semigroup * Added GMonoid instance for Data.Monoid.Alt * Fixed a bug in the GEnum instances for unsigned Integral types @@ -82,28 +88,28 @@ Mon May 23 21:09:37 UTC 2016 - mimi.vx@gmail.com * Made instances polykinded where possible * On GHC 8.0 and up, Generics.Deriving.TH uses the new type literal-based machinery * Rewrote the Template Haskell code to be robust. Among other things, this fixes - a bug with deriving Generic1 instances on GHC 7.8, and makes it easier to - derive Generic1 instances for datatypes that utilize GHC 8.0's - -XTypeInType extension. + a bug with deriving Generic1 instances on GHC 7.8, and makes it easier to + derive Generic1 instances for datatypes that utilize GHC 8.0's + -XTypeInType extension. * Added deriveAll0 and makeRep0 for symmetry with deriveAll1 and makeRep1 * AddedmakeRep0FromType and makeRep1FromType to make it easier to pass in the type - instance + instance * Added functions with the suffix -WithKindSigs to allow generating type synonyms - with explicit kind signatures in the presence of kind-polymorphic type - variables. This is necessary for some datatypes that use -XTypeInType to have - derived Generic(1) instances, but is not turned on by default since the TH - kind inference is not perfect and would cause otherwise valid code to be - rejected. Use only if you know what you are doing. + with explicit kind signatures in the presence of kind-polymorphic type + variables. This is necessary for some datatypes that use -XTypeInType to have + derived Generic(1) instances, but is not turned on by default since the TH + kind inference is not perfect and would cause otherwise valid code to be + rejected. Use only if you know what you are doing. * Fixed bug where a datatype with a single, nullary constructor would generate - incorrect Generic instances + incorrect Generic instances * More sensible GEnum instances for fixed-size integral types * Added GCopoint, GEnum, GEq, GFoldable, GFunctor, GMonoid, GShow, and GTraversable - instances for datatypes introduced in GHC 8.0 + instances for datatypes introduced in GHC 8.0 * Backported Generic(1) instances added in GHC 8.0. Specifically, Generic instances - for Complex (base-4.4 and later) ExitCode, and Version; and Generic1 instances - for Complex (base-4.4 and later) and Proxy (base-4.7 and later). Added GEnum, - GEq, GFoldable, GFunctor, GIx, GShow, and GTraversable instances for these - datatypes where appropriate. + for Complex (base-4.4 and later) ExitCode, and Version; and Generic1 instances + for Complex (base-4.4 and later) and Proxy (base-4.7 and later). Added GEnum, + GEq, GFoldable, GFunctor, GIx, GShow, and GTraversable instances for these + datatypes where appropriate. ------------------------------------------------------------------- Mon May 16 11:06:21 UTC 2016 - mimi.vx@gmail.com @@ -119,4 +125,3 @@ Wed May 11 19:06:19 UTC 2016 - mimi.vx@gmail.com Sat Feb 13 18:24:02 UTC 2016 - mimi.vx@gmail.com - ghc-generic-deriving generated by st2obs scritpt -