From 93fb8497467fbef2ef220c73403e15c8b559dfa5dfa12c0d3382ed8aee9a2b33 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 22 Feb 2017 18:16:21 +0000 Subject: [PATCH 1/2] synchronize with lts-8 package sett from configuration 0cb270c8d22a0823ab5130d95cc499e186cf864e OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-network?expand=0&rev=24 --- ghc-network.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ghc-network.spec b/ghc-network.spec index 178ba47..8ed7d49 100644 --- a/ghc-network.spec +++ b/ghc-network.spec @@ -1,7 +1,7 @@ # # spec file for package ghc-network # -# 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 From 9a92000828f999886d3ec16e0ef9bf4a95d45738b693ab46c636cd5d4831dee9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 9 Jun 2017 08:49:16 +0000 Subject: [PATCH 2/2] synchronize with lts:8 at revision 97123ba011ee3f996611368abf5e9181a89582ad OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-network?expand=0&rev=25 --- ghc-network.changes | 5 ++ ghc-network.spec | 4 +- network-2.6.3.1.tar.gz | 3 - network-2.6.3.2.tar.gz | 3 + network.cabal | 125 +++++++++++++++++++++++++++++++++++++++++ 5 files changed, 136 insertions(+), 4 deletions(-) delete mode 100644 network-2.6.3.1.tar.gz create mode 100644 network-2.6.3.2.tar.gz create mode 100644 network.cabal diff --git a/ghc-network.changes b/ghc-network.changes index 56f3dc1..48169c9 100644 --- a/ghc-network.changes +++ b/ghc-network.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jun 8 11:08:22 UTC 2017 - psimons@suse.com + +- Update to version 2.6.3.2 revision 1. + ------------------------------------------------------------------- Wed Aug 17 18:31:55 UTC 2016 - psimons@suse.com diff --git a/ghc-network.spec b/ghc-network.spec index 8ed7d49..b32628e 100644 --- a/ghc-network.spec +++ b/ghc-network.spec @@ -19,13 +19,14 @@ %global pkg_name network %bcond_with tests Name: ghc-%{pkg_name} -Version: 2.6.3.1 +Version: 2.6.3.2 Release: 0 Summary: Low-level networking interface 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-bytestring-devel BuildRequires: ghc-rpm-macros @@ -65,6 +66,7 @@ This package provides the Haskell %{pkg_name} library development files. %prep %setup -q -n %{pkg_name}-%{version} +cp -p %{SOURCE1} %{pkg_name}.cabal %build %ghc_lib_build diff --git a/network-2.6.3.1.tar.gz b/network-2.6.3.1.tar.gz deleted file mode 100644 index 544d230..0000000 --- a/network-2.6.3.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:57045f5e2bedc095670182130a6d1134fcc65d097824ac5b03933876067d82e6 -size 120418 diff --git a/network-2.6.3.2.tar.gz b/network-2.6.3.2.tar.gz new file mode 100644 index 0000000..be2197c --- /dev/null +++ b/network-2.6.3.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:354477074eaf2c0e134f4a7ae17694ffc747d484133463e95fae57ecbe48c0b6 +size 122892 diff --git a/network.cabal b/network.cabal new file mode 100644 index 0000000..32ce1da --- /dev/null +++ b/network.cabal @@ -0,0 +1,125 @@ +name: network +version: 2.6.3.2 +x-revision: 1 +license: BSD3 +license-file: LICENSE +maintainer: Kazu Yamamoto, Evan Borden +synopsis: Low-level networking interface +description: + This package provides a low-level networking interface. + . + In network-2.6 the @Network.URI@ module was split off into its own + package, network-uri-2.6. If you're using the @Network.URI@ module + you can automatically get it from the right package by adding this + to your .cabal file: + . + > flag network-uri + > description: Get Network.URI from the network-uri package + > default: True + > + > library + > -- ... + > if flag(network-uri) + > build-depends: network-uri >= 2.6, network >= 2.6 + > else + > build-depends: network-uri < 2.6, network < 2.6 + . + That is, get the module from either network < 2.6 or from + network-uri >= 2.6. +category: Network +build-type: Configure +cabal-version: >=1.8 +extra-tmp-files: + config.log config.status autom4te.cache network.buildinfo + include/HsNetworkConfig.h +extra-source-files: + README.md CHANGELOG.md + examples/*.hs tests/*.hs config.guess config.sub install-sh + configure.ac configure network.buildinfo.in + include/HsNetworkConfig.h.in include/HsNet.h + -- C sources only used on some systems + cbits/ancilData.c cbits/asyncAccept.c cbits/initWinSock.c + cbits/winSockErr.c +homepage: https://github.com/haskell/network +bug-reports: https://github.com/haskell/network/issues +tested-with: GHC == 7.8.4, GHC == 7.10.1, GHC == 7.10.2, GHC == 8.0.1, GHC == 8.0.2 + +library + exposed-modules: + Network + Network.BSD + Network.Socket + Network.Socket.ByteString + Network.Socket.ByteString.Lazy + Network.Socket.Internal + other-modules: + Network.Socket.ByteString.Internal + Network.Socket.Types + + if !os(windows) + other-modules: + Network.Socket.ByteString.IOVec + Network.Socket.ByteString.Lazy.Posix + Network.Socket.ByteString.MsgHdr + if os(windows) + other-modules: + Network.Socket.ByteString.Lazy.Windows + + build-depends: + base >= 4.6 && < 5, + bytestring < 0.11 + + if !os(windows) + build-depends: + unix >= 2 + + extensions: + CPP, DeriveDataTypeable, ForeignFunctionInterface, TypeSynonymInstances + include-dirs: include + includes: HsNet.h + install-includes: HsNet.h HsNetworkConfig.h + c-sources: cbits/HsNet.c + ghc-options: -Wall -fwarn-tabs + +test-suite simple + hs-source-dirs: tests + main-is: Simple.hs + type: exitcode-stdio-1.0 + + build-depends: + base < 5, + bytestring, + HUnit, + network, + test-framework, + test-framework-hunit + +test-suite regression + hs-source-dirs: tests + main-is: Regression.hs + type: exitcode-stdio-1.0 + + build-depends: + base < 5, + bytestring, + HUnit, + network, + test-framework, + test-framework-hunit + -- Some of the bugs only occur in the threaded RTS + ghc-options: -Wall -threaded + +test-suite doctest + hs-source-dirs: tests + main-is: doctests.hs + type: exitcode-stdio-1.0 + + build-depends: + base < 5, + doctest >= 0.10.1 + + ghc-options: -Wall + +source-repository head + type: git + location: git://github.com/haskell/network.git