[arch-commits] Commit in git-annex/repos (6 files)

Felix Yan felixonmars at archlinux.org
Fri Aug 18 16:00:33 UTC 2017


    Date: Friday, August 18, 2017 @ 16:00:29
  Author: felixonmars
Revision: 252509

archrelease: copy trunk to community-testing-i686, community-testing-x86_64

Added:
  git-annex/repos/community-testing-i686/PKGBUILD
    (from rev 252508, git-annex/trunk/PKGBUILD)
  git-annex/repos/community-testing-x86_64/PKGBUILD
    (from rev 252508, git-annex/trunk/PKGBUILD)
Deleted:
  git-annex/repos/community-testing-i686/PKGBUILD
  git-annex/repos/community-testing-i686/quickcheck-2.10.patch
  git-annex/repos/community-testing-x86_64/PKGBUILD
  git-annex/repos/community-testing-x86_64/quickcheck-2.10.patch

------------------------------------------------+
 /PKGBUILD                                      |  106 +++++++++++++++++++++++
 community-testing-i686/PKGBUILD                |   66 --------------
 community-testing-i686/quickcheck-2.10.patch   |   75 ----------------
 community-testing-x86_64/PKGBUILD              |   66 --------------
 community-testing-x86_64/quickcheck-2.10.patch |   75 ----------------
 5 files changed, 106 insertions(+), 282 deletions(-)

Deleted: community-testing-i686/PKGBUILD
===================================================================
--- community-testing-i686/PKGBUILD	2017-08-18 15:59:54 UTC (rev 252508)
+++ community-testing-i686/PKGBUILD	2017-08-18 16:00:29 UTC (rev 252509)
@@ -1,66 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Arch Haskell Team <arch-haskell at haskell.org>
-
-pkgname=git-annex
-pkgver=6.20170520
-pkgrel=69
-pkgdesc="Manage files with git, without checking their contents into git"
-url="http://git-annex.branchable.com/"
-license=("AGPL3")
-arch=('i686' 'x86_64')
-depends=('git' 'rsync' 'ghc-libs' "haskell-aeson" "haskell-async" "haskell-aws"
-         "haskell-blaze-builder" "haskell-bloomfilter" "haskell-byteable" "haskell-case-insensitive"
-         "haskell-clientsession" "haskell-concurrent-output" "haskell-conduit" "haskell-crypto-api"
-         "haskell-cryptonite" "haskell-data-default" "haskell-dav" "haskell-dbus"
-         "haskell-disk-free-space" "haskell-dlist" "haskell-dns" "haskell-edit-distance"
-         "haskell-esqueleto" "haskell-exceptions" "haskell-fdo-notify" "haskell-feed"
-         "haskell-hinotify" "haskell-hslogger" "haskell-http-client" "haskell-http-conduit"
-         "haskell-http-types" "haskell-ifelse" "haskell-magic" "haskell-memory"
-         "haskell-monad-control" "haskell-monad-logger" "haskell-mountpoints" "haskell-mtl"
-         "haskell-network" "haskell-network-info" "haskell-network-multicast" "haskell-network-uri"
-         "haskell-old-locale" "haskell-optparse-applicative" "haskell-path-pieces"
-         "haskell-persistent" "haskell-persistent-sqlite" "haskell-persistent-template"
-         "haskell-quickcheck" "haskell-random" "haskell-regex-tdfa" "haskell-resourcet"
-         "haskell-safesemaphore" "haskell-sandi" "haskell-securemem" "haskell-shakespeare"
-         "haskell-socks" "haskell-split" "haskell-stm" "haskell-stm-chans" "haskell-tasty"
-         "haskell-tasty-hunit" "haskell-tasty-quickcheck" "haskell-tasty-rerun" "haskell-text"
-         "haskell-torrent" "haskell-unix-compat" "haskell-unordered-containers"
-         "haskell-utf8-string" "haskell-uuid" "haskell-wai" "haskell-wai-extra" "haskell-warp"
-         "haskell-warp-tls" "haskell-yesod" "haskell-yesod-core" "haskell-yesod-default"
-         "haskell-yesod-form" "haskell-yesod-static")
-makedepends=("chrpath" 'ghc')
-source=("git+https://git.joeyh.name/git/git-annex.git#tag=$pkgver"
-        quickcheck-2.10.patch)
-sha512sums=('SKIP'
-            'a987bb49072fa27bdbb061bffa9174e75c1e7cfa1e139945465262557c1bd31832373e2684d9ff83b682dcb6b5cfdf2f40e86a8cedf118fb768f9c5827318f4c')
-
-prepare() {
-  cd git-annex
-  patch -p1 -i ../quickcheck-2.10.patch
-  sed -i '3i module Build.BuildVersion where' Build/BuildVersion.hs
-  sed -i '10i module Build.DistributionUpdate where' Build/DistributionUpdate.hs
-  sed -e '/Windows/d' -e '/Win32/d' -e '/WinProcess/d' -e '/OSX/d' -e '/FSEvents/d' \
-      -e '/NullSoft/d' -e '/Command.Benchmark/d' -e '/MakeMans/d' -e '/InstallDesktopFile/d' \
-      -e '/LinuxMkLibs/d' -e '/EvilSplicer/d' -e '/EvilLinker/d' -e '/Standalone/d' \
-      -i git-annex.cabal
-}
-
-build() {
-  cd git-annex
-
-  runhaskell Setup configure -O --prefix=/usr --enable-executable-dynamic --docdir="/usr/share/doc/$pkgname" \
-    -fnetwork-uri -fconcurrentoutput -ftorrentparser \
-    -ftestsuite -f-androidsplice -f-android -fproduction -fpairing -fwebapp \
-    -fassistant -fwebdav -fs3 -f-benchmark -fdbus -fmagicmime
-  runhaskell Setup build
-}
-
-package() {
-  cd git-annex
-  runhaskell Setup copy --destdir="$pkgdir"
-  make GHC="ghc -dynamic" BUILDER=true DESTDIR="$pkgdir" install-misc
-
-  rm "$pkgdir"/usr/share/doc/git-annex/COPYRIGHT
-  rmdir "$pkgdir"/usr/share/doc/git-annex "$pkgdir"/usr/share/doc
-}

Copied: git-annex/repos/community-testing-i686/PKGBUILD (from rev 252508, git-annex/trunk/PKGBUILD)
===================================================================
--- community-testing-i686/PKGBUILD	                        (rev 0)
+++ community-testing-i686/PKGBUILD	2017-08-18 16:00:29 UTC (rev 252509)
@@ -0,0 +1,53 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Arch Haskell Team <arch-haskell at haskell.org>
+
+pkgname=git-annex
+pkgver=6.20170818
+pkgrel=1
+pkgdesc="Manage files with git, without checking their contents into git"
+url="http://git-annex.branchable.com/"
+license=("AGPL3")
+arch=('i686' 'x86_64')
+depends=('git' 'rsync' 'ghc-libs' "haskell-aeson" "haskell-async" "haskell-aws"
+         "haskell-blaze-builder" "haskell-bloomfilter" "haskell-byteable" "haskell-case-insensitive"
+         "haskell-clientsession" "haskell-concurrent-output" "haskell-conduit" "haskell-crypto-api"
+         "haskell-cryptonite" "haskell-data-default" "haskell-dav" "haskell-dbus"
+         "haskell-disk-free-space" "haskell-dlist" "haskell-dns" "haskell-edit-distance"
+         "haskell-esqueleto" "haskell-exceptions" "haskell-fdo-notify" "haskell-feed"
+         "haskell-hinotify" "haskell-hslogger" "haskell-http-client" "haskell-http-conduit"
+         "haskell-http-types" "haskell-ifelse" "haskell-magic" "haskell-memory"
+         "haskell-monad-control" "haskell-monad-logger" "haskell-mountpoints" "haskell-mtl"
+         "haskell-network" "haskell-network-info" "haskell-network-multicast" "haskell-network-uri"
+         "haskell-old-locale" "haskell-optparse-applicative" "haskell-path-pieces"
+         "haskell-persistent" "haskell-persistent-sqlite" "haskell-persistent-template"
+         "haskell-quickcheck" "haskell-random" "haskell-regex-tdfa" "haskell-resourcet"
+         "haskell-safesemaphore" "haskell-sandi" "haskell-securemem" "haskell-shakespeare"
+         "haskell-socks" "haskell-split" "haskell-stm" "haskell-stm-chans" "haskell-tasty"
+         "haskell-tasty-hunit" "haskell-tasty-quickcheck" "haskell-tasty-rerun" "haskell-text"
+         "haskell-torrent" "haskell-unix-compat" "haskell-unordered-containers"
+         "haskell-utf8-string" "haskell-uuid" "haskell-wai" "haskell-wai-extra" "haskell-warp"
+         "haskell-warp-tls" "haskell-yesod" "haskell-yesod-core" "haskell-yesod-default"
+         "haskell-yesod-form" "haskell-yesod-static")
+makedepends=("chrpath" 'ghc')
+source=("git+https://git.joeyh.name/git/git-annex.git#tag=$pkgver")
+sha512sums=('SKIP')
+
+build() {
+  cd git-annex
+
+  runhaskell Setup configure -O --prefix=/usr --enable-executable-dynamic --docdir="/usr/share/doc/$pkgname" \
+    -fnetwork-uri -fconcurrentoutput -ftorrentparser \
+    -ftestsuite -f-androidsplice -f-android -fproduction -fpairing -fwebapp \
+    -fassistant -fwebdav -fs3 -f-benchmark -fdbus -fmagicmime
+  runhaskell Setup build
+}
+
+package() {
+  cd git-annex
+  runhaskell Setup copy --destdir="$pkgdir"
+  make GHC="ghc -dynamic" BUILDER=true DESTDIR="$pkgdir" install-misc
+
+  rm "$pkgdir"/usr/share/doc/git-annex/COPYRIGHT
+  rmdir "$pkgdir"/usr/share/doc/git-annex "$pkgdir"/usr/share/doc
+}

Deleted: community-testing-i686/quickcheck-2.10.patch
===================================================================
--- community-testing-i686/quickcheck-2.10.patch	2017-08-18 15:59:54 UTC (rev 252508)
+++ community-testing-i686/quickcheck-2.10.patch	2017-08-18 16:00:29 UTC (rev 252509)
@@ -1,75 +0,0 @@
-From 75cecbbe3fdafdb6652e95ac17cd755c28e67f20 Mon Sep 17 00:00:00 2001
-From: Joey Hess <joeyh at joeyh.name>
-Date: Sat, 17 Jun 2017 13:04:48 -0400
-Subject: [PATCH] Fix build with QuickCheck 2.10.
-
-QuickCheck added an Arbitrary instance for CTime aka EpochTime. However,
-while git-annex's instance disallowed times before the epoch, QuickCheck's
-does not. So, rather than using its instance, convert from an Integer.
-
-This commit was sponsored by Thomas Hochstein on Patreon.
----
- CHANGELOG             | 6 ++++++
- Key.hs                | 2 +-
- Utility/InodeCache.hs | 3 ++-
- Utility/QuickCheck.hs | 3 ---
- 4 files changed, 9 insertions(+), 5 deletions(-)
-
-diff --git a/CHANGELOG b/CHANGELOG
-index 1d8f45c..9dbb235 100644
---- a/CHANGELOG
-+++ b/CHANGELOG
-@@ -1,3 +1,9 @@
-+git-annex (6.20170521) UNRELEASED; urgency=medium
-+
-+  * Fix build with QuickCheck 2.10.
-+
-+ -- Joey Hess <id at joeyh.name>  Sat, 17 Jun 2017 13:02:24 -0400
-+
- git-annex (6.20170520) unstable; urgency=medium
- 
-   * move --to=here moves from all reachable remotes to the local repository.
-diff --git a/Key.hs b/Key.hs
-index 8672c82..44e9ace 100644
---- a/Key.hs
-+++ b/Key.hs
-@@ -147,7 +147,7 @@ instance Arbitrary Key where
- 		<$> (listOf1 $ elements $ ['A'..'Z'] ++ ['a'..'z'] ++ ['0'..'9'] ++ "-_\r\n \t")
- 		<*> (parseKeyVariety <$> (listOf1 $ elements ['A'..'Z'])) -- BACKEND
- 		<*> ((abs <$>) <$> arbitrary) -- size cannot be negative
--		<*> arbitrary
-+		<*> ((abs . fromInteger <$>) <$> arbitrary) -- mtime cannot be negative
- 		<*> ((abs <$>) <$> arbitrary) -- chunksize cannot be negative
- 		<*> ((succ . abs <$>) <$> arbitrary) -- chunknum cannot be 0 or negative
- 
-diff --git a/Utility/InodeCache.hs b/Utility/InodeCache.hs
-index e91771a..7e2d999 100644
---- a/Utility/InodeCache.hs
-+++ b/Utility/InodeCache.hs
-@@ -210,7 +210,8 @@ instance Arbitrary InodeCache where
- 		let prim = InodeCachePrim
- 			<$> arbitrary
- 			<*> arbitrary
--			<*> arbitrary
-+			-- timestamp cannot be negative
-+			<*> (abs . fromInteger <$> arbitrary)
- 		in InodeCache <$> prim
- 
- #ifdef mingw32_HOST_OS
-diff --git a/Utility/QuickCheck.hs b/Utility/QuickCheck.hs
-index 0181ea9..e89d103 100644
---- a/Utility/QuickCheck.hs
-+++ b/Utility/QuickCheck.hs
-@@ -35,9 +35,6 @@ instance (Arbitrary v, Ord v) => Arbitrary (S.Set v) where
- instance Arbitrary POSIXTime where
- 	arbitrary = fromInteger <$> nonNegative arbitrarySizedIntegral
- 
--instance Arbitrary EpochTime where
--	arbitrary = fromInteger <$> nonNegative arbitrarySizedIntegral
--
- {- Pids are never negative, or 0. -}
- instance Arbitrary ProcessID where
- 	arbitrary = arbitrarySizedBoundedIntegral `suchThat` (> 0)
--- 
-2.8.0.rc3
-

Deleted: community-testing-x86_64/PKGBUILD
===================================================================
--- community-testing-x86_64/PKGBUILD	2017-08-18 15:59:54 UTC (rev 252508)
+++ community-testing-x86_64/PKGBUILD	2017-08-18 16:00:29 UTC (rev 252509)
@@ -1,66 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Arch Haskell Team <arch-haskell at haskell.org>
-
-pkgname=git-annex
-pkgver=6.20170520
-pkgrel=69
-pkgdesc="Manage files with git, without checking their contents into git"
-url="http://git-annex.branchable.com/"
-license=("AGPL3")
-arch=('i686' 'x86_64')
-depends=('git' 'rsync' 'ghc-libs' "haskell-aeson" "haskell-async" "haskell-aws"
-         "haskell-blaze-builder" "haskell-bloomfilter" "haskell-byteable" "haskell-case-insensitive"
-         "haskell-clientsession" "haskell-concurrent-output" "haskell-conduit" "haskell-crypto-api"
-         "haskell-cryptonite" "haskell-data-default" "haskell-dav" "haskell-dbus"
-         "haskell-disk-free-space" "haskell-dlist" "haskell-dns" "haskell-edit-distance"
-         "haskell-esqueleto" "haskell-exceptions" "haskell-fdo-notify" "haskell-feed"
-         "haskell-hinotify" "haskell-hslogger" "haskell-http-client" "haskell-http-conduit"
-         "haskell-http-types" "haskell-ifelse" "haskell-magic" "haskell-memory"
-         "haskell-monad-control" "haskell-monad-logger" "haskell-mountpoints" "haskell-mtl"
-         "haskell-network" "haskell-network-info" "haskell-network-multicast" "haskell-network-uri"
-         "haskell-old-locale" "haskell-optparse-applicative" "haskell-path-pieces"
-         "haskell-persistent" "haskell-persistent-sqlite" "haskell-persistent-template"
-         "haskell-quickcheck" "haskell-random" "haskell-regex-tdfa" "haskell-resourcet"
-         "haskell-safesemaphore" "haskell-sandi" "haskell-securemem" "haskell-shakespeare"
-         "haskell-socks" "haskell-split" "haskell-stm" "haskell-stm-chans" "haskell-tasty"
-         "haskell-tasty-hunit" "haskell-tasty-quickcheck" "haskell-tasty-rerun" "haskell-text"
-         "haskell-torrent" "haskell-unix-compat" "haskell-unordered-containers"
-         "haskell-utf8-string" "haskell-uuid" "haskell-wai" "haskell-wai-extra" "haskell-warp"
-         "haskell-warp-tls" "haskell-yesod" "haskell-yesod-core" "haskell-yesod-default"
-         "haskell-yesod-form" "haskell-yesod-static")
-makedepends=("chrpath" 'ghc')
-source=("git+https://git.joeyh.name/git/git-annex.git#tag=$pkgver"
-        quickcheck-2.10.patch)
-sha512sums=('SKIP'
-            'a987bb49072fa27bdbb061bffa9174e75c1e7cfa1e139945465262557c1bd31832373e2684d9ff83b682dcb6b5cfdf2f40e86a8cedf118fb768f9c5827318f4c')
-
-prepare() {
-  cd git-annex
-  patch -p1 -i ../quickcheck-2.10.patch
-  sed -i '3i module Build.BuildVersion where' Build/BuildVersion.hs
-  sed -i '10i module Build.DistributionUpdate where' Build/DistributionUpdate.hs
-  sed -e '/Windows/d' -e '/Win32/d' -e '/WinProcess/d' -e '/OSX/d' -e '/FSEvents/d' \
-      -e '/NullSoft/d' -e '/Command.Benchmark/d' -e '/MakeMans/d' -e '/InstallDesktopFile/d' \
-      -e '/LinuxMkLibs/d' -e '/EvilSplicer/d' -e '/EvilLinker/d' -e '/Standalone/d' \
-      -i git-annex.cabal
-}
-
-build() {
-  cd git-annex
-
-  runhaskell Setup configure -O --prefix=/usr --enable-executable-dynamic --docdir="/usr/share/doc/$pkgname" \
-    -fnetwork-uri -fconcurrentoutput -ftorrentparser \
-    -ftestsuite -f-androidsplice -f-android -fproduction -fpairing -fwebapp \
-    -fassistant -fwebdav -fs3 -f-benchmark -fdbus -fmagicmime
-  runhaskell Setup build
-}
-
-package() {
-  cd git-annex
-  runhaskell Setup copy --destdir="$pkgdir"
-  make GHC="ghc -dynamic" BUILDER=true DESTDIR="$pkgdir" install-misc
-
-  rm "$pkgdir"/usr/share/doc/git-annex/COPYRIGHT
-  rmdir "$pkgdir"/usr/share/doc/git-annex "$pkgdir"/usr/share/doc
-}

Copied: git-annex/repos/community-testing-x86_64/PKGBUILD (from rev 252508, git-annex/trunk/PKGBUILD)
===================================================================
--- community-testing-x86_64/PKGBUILD	                        (rev 0)
+++ community-testing-x86_64/PKGBUILD	2017-08-18 16:00:29 UTC (rev 252509)
@@ -0,0 +1,53 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Arch Haskell Team <arch-haskell at haskell.org>
+
+pkgname=git-annex
+pkgver=6.20170818
+pkgrel=1
+pkgdesc="Manage files with git, without checking their contents into git"
+url="http://git-annex.branchable.com/"
+license=("AGPL3")
+arch=('i686' 'x86_64')
+depends=('git' 'rsync' 'ghc-libs' "haskell-aeson" "haskell-async" "haskell-aws"
+         "haskell-blaze-builder" "haskell-bloomfilter" "haskell-byteable" "haskell-case-insensitive"
+         "haskell-clientsession" "haskell-concurrent-output" "haskell-conduit" "haskell-crypto-api"
+         "haskell-cryptonite" "haskell-data-default" "haskell-dav" "haskell-dbus"
+         "haskell-disk-free-space" "haskell-dlist" "haskell-dns" "haskell-edit-distance"
+         "haskell-esqueleto" "haskell-exceptions" "haskell-fdo-notify" "haskell-feed"
+         "haskell-hinotify" "haskell-hslogger" "haskell-http-client" "haskell-http-conduit"
+         "haskell-http-types" "haskell-ifelse" "haskell-magic" "haskell-memory"
+         "haskell-monad-control" "haskell-monad-logger" "haskell-mountpoints" "haskell-mtl"
+         "haskell-network" "haskell-network-info" "haskell-network-multicast" "haskell-network-uri"
+         "haskell-old-locale" "haskell-optparse-applicative" "haskell-path-pieces"
+         "haskell-persistent" "haskell-persistent-sqlite" "haskell-persistent-template"
+         "haskell-quickcheck" "haskell-random" "haskell-regex-tdfa" "haskell-resourcet"
+         "haskell-safesemaphore" "haskell-sandi" "haskell-securemem" "haskell-shakespeare"
+         "haskell-socks" "haskell-split" "haskell-stm" "haskell-stm-chans" "haskell-tasty"
+         "haskell-tasty-hunit" "haskell-tasty-quickcheck" "haskell-tasty-rerun" "haskell-text"
+         "haskell-torrent" "haskell-unix-compat" "haskell-unordered-containers"
+         "haskell-utf8-string" "haskell-uuid" "haskell-wai" "haskell-wai-extra" "haskell-warp"
+         "haskell-warp-tls" "haskell-yesod" "haskell-yesod-core" "haskell-yesod-default"
+         "haskell-yesod-form" "haskell-yesod-static")
+makedepends=("chrpath" 'ghc')
+source=("git+https://git.joeyh.name/git/git-annex.git#tag=$pkgver")
+sha512sums=('SKIP')
+
+build() {
+  cd git-annex
+
+  runhaskell Setup configure -O --prefix=/usr --enable-executable-dynamic --docdir="/usr/share/doc/$pkgname" \
+    -fnetwork-uri -fconcurrentoutput -ftorrentparser \
+    -ftestsuite -f-androidsplice -f-android -fproduction -fpairing -fwebapp \
+    -fassistant -fwebdav -fs3 -f-benchmark -fdbus -fmagicmime
+  runhaskell Setup build
+}
+
+package() {
+  cd git-annex
+  runhaskell Setup copy --destdir="$pkgdir"
+  make GHC="ghc -dynamic" BUILDER=true DESTDIR="$pkgdir" install-misc
+
+  rm "$pkgdir"/usr/share/doc/git-annex/COPYRIGHT
+  rmdir "$pkgdir"/usr/share/doc/git-annex "$pkgdir"/usr/share/doc
+}

Deleted: community-testing-x86_64/quickcheck-2.10.patch
===================================================================
--- community-testing-x86_64/quickcheck-2.10.patch	2017-08-18 15:59:54 UTC (rev 252508)
+++ community-testing-x86_64/quickcheck-2.10.patch	2017-08-18 16:00:29 UTC (rev 252509)
@@ -1,75 +0,0 @@
-From 75cecbbe3fdafdb6652e95ac17cd755c28e67f20 Mon Sep 17 00:00:00 2001
-From: Joey Hess <joeyh at joeyh.name>
-Date: Sat, 17 Jun 2017 13:04:48 -0400
-Subject: [PATCH] Fix build with QuickCheck 2.10.
-
-QuickCheck added an Arbitrary instance for CTime aka EpochTime. However,
-while git-annex's instance disallowed times before the epoch, QuickCheck's
-does not. So, rather than using its instance, convert from an Integer.
-
-This commit was sponsored by Thomas Hochstein on Patreon.
----
- CHANGELOG             | 6 ++++++
- Key.hs                | 2 +-
- Utility/InodeCache.hs | 3 ++-
- Utility/QuickCheck.hs | 3 ---
- 4 files changed, 9 insertions(+), 5 deletions(-)
-
-diff --git a/CHANGELOG b/CHANGELOG
-index 1d8f45c..9dbb235 100644
---- a/CHANGELOG
-+++ b/CHANGELOG
-@@ -1,3 +1,9 @@
-+git-annex (6.20170521) UNRELEASED; urgency=medium
-+
-+  * Fix build with QuickCheck 2.10.
-+
-+ -- Joey Hess <id at joeyh.name>  Sat, 17 Jun 2017 13:02:24 -0400
-+
- git-annex (6.20170520) unstable; urgency=medium
- 
-   * move --to=here moves from all reachable remotes to the local repository.
-diff --git a/Key.hs b/Key.hs
-index 8672c82..44e9ace 100644
---- a/Key.hs
-+++ b/Key.hs
-@@ -147,7 +147,7 @@ instance Arbitrary Key where
- 		<$> (listOf1 $ elements $ ['A'..'Z'] ++ ['a'..'z'] ++ ['0'..'9'] ++ "-_\r\n \t")
- 		<*> (parseKeyVariety <$> (listOf1 $ elements ['A'..'Z'])) -- BACKEND
- 		<*> ((abs <$>) <$> arbitrary) -- size cannot be negative
--		<*> arbitrary
-+		<*> ((abs . fromInteger <$>) <$> arbitrary) -- mtime cannot be negative
- 		<*> ((abs <$>) <$> arbitrary) -- chunksize cannot be negative
- 		<*> ((succ . abs <$>) <$> arbitrary) -- chunknum cannot be 0 or negative
- 
-diff --git a/Utility/InodeCache.hs b/Utility/InodeCache.hs
-index e91771a..7e2d999 100644
---- a/Utility/InodeCache.hs
-+++ b/Utility/InodeCache.hs
-@@ -210,7 +210,8 @@ instance Arbitrary InodeCache where
- 		let prim = InodeCachePrim
- 			<$> arbitrary
- 			<*> arbitrary
--			<*> arbitrary
-+			-- timestamp cannot be negative
-+			<*> (abs . fromInteger <$> arbitrary)
- 		in InodeCache <$> prim
- 
- #ifdef mingw32_HOST_OS
-diff --git a/Utility/QuickCheck.hs b/Utility/QuickCheck.hs
-index 0181ea9..e89d103 100644
---- a/Utility/QuickCheck.hs
-+++ b/Utility/QuickCheck.hs
-@@ -35,9 +35,6 @@ instance (Arbitrary v, Ord v) => Arbitrary (S.Set v) where
- instance Arbitrary POSIXTime where
- 	arbitrary = fromInteger <$> nonNegative arbitrarySizedIntegral
- 
--instance Arbitrary EpochTime where
--	arbitrary = fromInteger <$> nonNegative arbitrarySizedIntegral
--
- {- Pids are never negative, or 0. -}
- instance Arbitrary ProcessID where
- 	arbitrary = arbitrarySizedBoundedIntegral `suchThat` (> 0)
--- 
-2.8.0.rc3
-



More information about the arch-commits mailing list