From d6e45c3c1f755c47a0ac7d3254b48d8f43c262a3941ec0cad81db1d801cf4dd8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 20 Apr 2017 08:29:45 +0000 Subject: [PATCH 1/3] synchronize with lts:8 from configuration b950efb4c58ed112fa0f89869a729559002adce9 OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-generic-deriving?expand=0&rev=12 --- generic-deriving-1.11.1.tar.gz | 3 -- generic-deriving-1.11.2.tar.gz | 3 ++ generic-deriving.cabal | 95 ---------------------------------- ghc-generic-deriving.changes | 5 ++ ghc-generic-deriving.spec | 4 +- 5 files changed, 9 insertions(+), 101 deletions(-) delete mode 100644 generic-deriving-1.11.1.tar.gz create mode 100644 generic-deriving-1.11.2.tar.gz delete mode 100644 generic-deriving.cabal diff --git a/generic-deriving-1.11.1.tar.gz b/generic-deriving-1.11.1.tar.gz deleted file mode 100644 index 5ea544b..0000000 --- a/generic-deriving-1.11.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b38d427f990f3080108c565a81284217290a47be63bab7bf59036ece2e2cb0e9 -size 65456 diff --git a/generic-deriving-1.11.2.tar.gz b/generic-deriving-1.11.2.tar.gz new file mode 100644 index 0000000..49e811a --- /dev/null +++ b/generic-deriving-1.11.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:29960f2aa810abffc2f02658e7fa523cbfa4c92102e02d252482f9551bc122f9 +size 66546 diff --git a/generic-deriving.cabal b/generic-deriving.cabal deleted file mode 100644 index 83f7b78..0000000 --- a/generic-deriving.cabal +++ /dev/null @@ -1,95 +0,0 @@ -name: generic-deriving -version: 1.11.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.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.13 - - default-language: Haskell2010 - ghc-options: -Wall - -test-suite spec - type: exitcode-stdio-1.0 - main-is: Spec.hs - other-modules: ExampleSpec - TypeInTypeSpec - build-depends: base >= 4.3 && < 5 - , generic-deriving == 1.11.1 - , hspec >= 2 && < 3 - , template-haskell >= 2.4 && < 2.12 - 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 e137151..361fec7 100644 --- a/ghc-generic-deriving.changes +++ b/ghc-generic-deriving.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Apr 19 13:32:43 UTC 2017 - psimons@suse.com + +- Update to version 1.11.2 with cabal2obs. + ------------------------------------------------------------------- Fri Apr 7 10:28:59 UTC 2017 - psimons@suse.com diff --git a/ghc-generic-deriving.spec b/ghc-generic-deriving.spec index ec24992..f92fb8b 100644 --- a/ghc-generic-deriving.spec +++ b/ghc-generic-deriving.spec @@ -19,14 +19,13 @@ %global pkg_name generic-deriving %bcond_with tests Name: ghc-%{pkg_name} -Version: 1.11.1 +Version: 1.11.2 Release: 0 Summary: Generic programming library for generalised deriving License: BSD-3-Clause 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 -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 @@ -61,7 +60,6 @@ files. %prep %setup -q -n %{pkg_name}-%{version} -cp -p %{SOURCE1} %{pkg_name}.cabal %build %ghc_lib_build From 5716cb0ab526565844f328ddb42a22d810bcad6a850d7b6c516bd331255328c4 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Thu, 20 Apr 2017 18:55:46 +0000 Subject: [PATCH 2/3] Updating link to change in openSUSE:Factory/ghc-generic-deriving revision 5.0 OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-generic-deriving?expand=0&rev=927e0b06c02051a29ce9ee5f44bef9ce --- generic-deriving.cabal | 95 +++++++++++++++++++++++++++++++++++++++ ghc-generic-deriving.spec | 2 + 2 files changed, 97 insertions(+) create mode 100644 generic-deriving.cabal diff --git a/generic-deriving.cabal b/generic-deriving.cabal new file mode 100644 index 0000000..83f7b78 --- /dev/null +++ b/generic-deriving.cabal @@ -0,0 +1,95 @@ +name: generic-deriving +version: 1.11.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.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.13 + + default-language: Haskell2010 + ghc-options: -Wall + +test-suite spec + type: exitcode-stdio-1.0 + main-is: Spec.hs + other-modules: ExampleSpec + TypeInTypeSpec + build-depends: base >= 4.3 && < 5 + , generic-deriving == 1.11.1 + , hspec >= 2 && < 3 + , template-haskell >= 2.4 && < 2.12 + 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 f92fb8b..d593738 100644 --- a/ghc-generic-deriving.spec +++ b/ghc-generic-deriving.spec @@ -26,6 +26,7 @@ License: BSD-3-Clause 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 +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 92eb28a19d2105096ad6d3e6e573576dcdac3006ca01d571179bdfadb62e1e57 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Thu, 20 Apr 2017 18:55:46 +0000 Subject: [PATCH 3/3] Accepting request 487959 from devel:languages:haskell baserev update by copy to link target OBS-URL: https://build.opensuse.org/request/show/487959 OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-generic-deriving?expand=0&rev=13 --- generic-deriving.cabal | 95 --------------------------------------- ghc-generic-deriving.spec | 2 - 2 files changed, 97 deletions(-) delete mode 100644 generic-deriving.cabal diff --git a/generic-deriving.cabal b/generic-deriving.cabal deleted file mode 100644 index 83f7b78..0000000 --- a/generic-deriving.cabal +++ /dev/null @@ -1,95 +0,0 @@ -name: generic-deriving -version: 1.11.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.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.13 - - default-language: Haskell2010 - ghc-options: -Wall - -test-suite spec - type: exitcode-stdio-1.0 - main-is: Spec.hs - other-modules: ExampleSpec - TypeInTypeSpec - build-depends: base >= 4.3 && < 5 - , generic-deriving == 1.11.1 - , hspec >= 2 && < 3 - , template-haskell >= 2.4 && < 2.12 - 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 d593738..f92fb8b 100644 --- a/ghc-generic-deriving.spec +++ b/ghc-generic-deriving.spec @@ -26,7 +26,6 @@ License: BSD-3-Clause 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 -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 @@ -61,7 +60,6 @@ files. %prep %setup -q -n %{pkg_name}-%{version} -cp -p %{SOURCE1} %{pkg_name}.cabal %build %ghc_lib_build