[packages/darcs] Up to 2.18.5
arekm
arekm at pld-linux.org
Thu May 21 22:43:59 CEST 2026
commit 52d534305c4a4a169b0ac04a7156855c1f065b90
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Thu May 21 22:43:40 2026 +0200
Up to 2.18.5
darcs-ghc72.patch | 142 --------------------------------------
darcs-relax-regex-libs-deps.patch | 69 ------------------
darcs-tests-ghc72.patch | 26 -------
darcs.spec | 70 ++++++++++++-------
4 files changed, 44 insertions(+), 263 deletions(-)
---
diff --git a/darcs.spec b/darcs.spec
index fc1ef1e..bd75a1a 100644
--- a/darcs.spec
+++ b/darcs.spec
@@ -5,25 +5,47 @@
Summary: David's Advanced Revision Control System - yet another replacement for CVS
Summary(pl.UTF-8): David's Advanced Revision Control System - jeszcze jeden zamiennik CVS-a
Name: darcs
-Version: 2.5.2
-Release: 2
-License: GPL v2
+Version: 2.18.5
+Release: 1
+License: GPL v2+
Group: Development/Version Control
-Source0: http://darcs.net/releases/%{name}-%{version}.tar.gz
-# Source0-md5: 491b6ca01dec245a16112ad2c7e07dc1
-Patch0: %{name}-ghc72.patch
-Patch1: %{name}-relax-regex-libs-deps.patch
-Patch2: %{name}-tests-ghc72.patch
+Source0: https://hackage.haskell.org/package/%{name}-%{version}/%{name}-%{version}.tar.gz
+# Source0-md5: ec7ea359c4ed83626641995ae0ff07c3
URL: http://darcs.net/
BuildRequires: curl-devel >= 7.19.1
-BuildRequires: ghc >= 6.12.3
-BuildRequires: ghc-hashed-storage >= 0.5
-BuildRequires: ghc-haskeline >= 0.6.1
+BuildRequires: ghc >= 8.2
+BuildRequires: ghc-async
+BuildRequires: ghc-attoparsec
+BuildRequires: ghc-base16-bytestring
+BuildRequires: ghc-conduit
+BuildRequires: ghc-constraints
+BuildRequires: ghc-cryptonite
+BuildRequires: ghc-data-ordlist
+BuildRequires: ghc-fgl
+BuildRequires: ghc-hashable
+BuildRequires: ghc-haskeline
+BuildRequires: ghc-html
+BuildRequires: ghc-http-conduit
+BuildRequires: ghc-http-types
+BuildRequires: ghc-memory
BuildRequires: ghc-mmap >= 1:0.5
-BuildRequires: ghc-tar >= 0.3
-BuildRequires: ghc-terminfo >= 0.3
-BuildRequires: ghc-utf8-string >= 0.3
-BuildRequires: ghc-zlib >= 0.5.1.0
+BuildRequires: ghc-network
+BuildRequires: ghc-network-uri
+BuildRequires: ghc-old-time
+BuildRequires: ghc-regex-applicative
+BuildRequires: ghc-regex-base
+BuildRequires: ghc-regex-tdfa
+BuildRequires: ghc-safe
+BuildRequires: ghc-tar >= 0.5
+BuildRequires: ghc-temporary
+BuildRequires: ghc-terminal-size
+BuildRequires: ghc-terminfo >= 0.4.0.2
+BuildRequires: ghc-tls
+BuildRequires: ghc-unix-compat
+BuildRequires: ghc-utf8-string
+BuildRequires: ghc-vector
+BuildRequires: ghc-zip-archive
+BuildRequires: ghc-zlib >= 0.6.1.2
BuildRequires: gmp-devel
BuildRequires: pkgconfig
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -66,28 +88,24 @@ Pakiet ten dostarcza bashowe uzupełnianie nazw dla darcsa.
%prep
%setup -q
-%patch -P0 -p1
-%patch -P1 -p1
-%patch -P2 -p1
%build
-runhaskell Setup.lhs configure -v2 \
+runhaskell Setup.hs configure -v2 \
--prefix=%{_prefix} \
--libdir=%{_libdir} \
--libexecdir=%{_libexecdir} \
--docdir=%{_docdir}/%{name}-%{version} \
- --flags="curl curl-pipelining terminfo color mmap"
+ --flags="terminfo threaded executable"
-runhaskell Setup.lhs build
-%{?with_tests:runhaskell Setup.lhs test}
+runhaskell Setup.hs build
+%{?with_tests:runhaskell Setup.hs test}
-runhaskell Setup.lhs haddock --executables \
- --css=doc/darcs.css
+runhaskell Setup.hs haddock --executables
%install
rm -rf $RPM_BUILD_ROOT
-runhaskell Setup.lhs copy --destdir=$RPM_BUILD_ROOT
+runhaskell Setup.hs copy --destdir=$RPM_BUILD_ROOT
# work around automatic haddock docs installation
rm -rf %{name}-%{version}-doc
@@ -105,7 +123,7 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
-%doc NEWS README
+%doc CHANGELOG.md README.md
%attr(755,root,root) %{_bindir}/*
%{_mandir}/man1/*
diff --git a/darcs-ghc72.patch b/darcs-ghc72.patch
deleted file mode 100644
index 22dfea8..0000000
--- a/darcs-ghc72.patch
+++ /dev/null
@@ -1,142 +0,0 @@
-diff --git a/Distribution/ShellHarness.hs b/Distribution/ShellHarness.hs
-index 78a8a9b..949b752 100644
---- a/Distribution/ShellHarness.hs
-+++ b/Distribution/ShellHarness.hs
-@@ -12,10 +12,9 @@ import System.Environment ( getEnv, getEnvironment )
- import System.Exit ( ExitCode (..) )
- import System.FilePath
- import System.IO
--import System( system )
- import System.Process ( ProcessHandle,
- runInteractiveProcess, waitForProcess,
-- getProcessExitCode )
-+ getProcessExitCode, system )
- import Data.Maybe
- import Data.List ( isInfixOf, isPrefixOf, (\\), nubBy, isSuffixOf )
- import Control.Concurrent
-diff --git a/darcs.cabal b/darcs.cabal
-index 887a27b..56e36fa 100644
---- a/darcs.cabal
-+++ b/darcs.cabal
-@@ -124,7 +124,7 @@ Executable witnesses
- else
- buildable: True
-
-- build-tools: ghc >= 6.10 && < 7.2
-+ build-tools: ghc >= 6.10 && < 7.4
-
- hs-source-dirs: src
- include-dirs: src
-@@ -182,7 +182,7 @@ Executable witnesses
- text == 0.11.*,
- old-time == 1.0.*,
- directory >= 1.0.0.0 && < 1.2.0.0,
-- process == 1.0.*,
-+ process >= 1.0 && < 1.2,
- containers >= 0.1 && < 0.5,
- array >= 0.1 && < 0.4,
- random == 1.0.*,
-@@ -192,7 +192,7 @@ Executable witnesses
- test-framework >= 0.2.2,
- test-framework-quickcheck2 >= 0.2.2
- if !os(windows)
-- build-depends: unix >= 1.0 && < 2.5
-+ build-depends: unix >= 1.0 && < 2.6
- if flag(http)
- build-depends: network >= 2.2 && < 2.4,
- HTTP >= 3000.0 && < 4000.2
-@@ -208,7 +208,7 @@ Library
- else
- buildable: True
-
-- build-tools: ghc >= 6.10 && < 7.2
-+ build-tools: ghc >= 6.10 && < 7.4
-
- hs-source-dirs: src
- include-dirs: src
-@@ -385,14 +385,14 @@ Library
- tar == 0.3.*
-
- if !os(windows)
-- build-depends: unix >= 1.0 && < 2.5
-+ build-depends: unix >= 1.0 && < 2.6
-
- build-depends: base >= 3,
- bytestring >= 0.9.0 && < 0.10,
- text == 0.11.*,
- old-time == 1.0.*,
- directory >= 1.0.0.0 && < 1.2.0.0,
-- process == 1.0.*,
-+ process >= 1.0 && < 1.2,
- containers >= 0.1 && < 0.5,
- array >= 0.1 && < 0.4,
- random == 1.0.*
-@@ -483,7 +483,7 @@ Executable darcs
- src/umask.c
- src/Crypt/sha2.c
-
-- build-tools: ghc >= 6.10 && < 7.2
-+ build-tools: ghc >= 6.10 && < 7.4
-
- -- We need optimizations, regardless of what Hackage says
- -- Note: "if true" works around a cabal bug with order of flag composition
-@@ -533,14 +533,14 @@ Executable darcs
- tar == 0.3.*
-
- if !os(windows)
-- build-depends: unix >= 1.0 && < 2.5
-+ build-depends: unix >= 1.0 && < 2.6
-
- build-depends: base >= 3,
- bytestring >= 0.9.0 && < 0.10,
- text == 0.11.*,
- old-time == 1.0.*,
- directory >= 1.0.0.0 && < 1.2.0.0,
-- process == 1.0.*,
-+ process >= 1.0 && < 1.2,
- containers >= 0.1 && < 0.5,
- array >= 0.1 && < 0.4,
- random == 1.0.*
-@@ -615,7 +615,7 @@ Executable unit
- else
- buildable: True
-
-- build-tools: ghc >= 6.10 && < 7.2
-+ build-tools: ghc >= 6.10 && < 7.4
-
- build-depends: base < 5,
- extensible-exceptions >= 0.1 && < 0.2,
-@@ -678,7 +678,7 @@ Executable unit
- cc-options: -DHAVE_SIGINFO_H
-
- if !os(windows)
-- build-depends: unix >= 1.0 && < 2.5
-+ build-depends: unix >= 1.0 && < 2.6
-
- build-depends: base >= 3,
- bytestring >= 0.9.0 && < 0.10,
-@@ -686,7 +686,7 @@ Executable unit
- text == 0.11.*,
- old-time == 1.0.*,
- directory >= 1.0.0.0 && < 1.2.0.0,
-- process == 1.0.*,
-+ process >= 1.0 && < 1.2,
- containers >= 0.1 && < 0.5,
- array >= 0.1 && < 0.4,
- hashed-storage >= 0.5.2 && < 0.6,
-diff --git a/src/Darcs/RepoPath.hs b/src/Darcs/RepoPath.hs
-index aa00156..8c5432b 100644
---- a/src/Darcs/RepoPath.hs
-+++ b/src/Darcs/RepoPath.hs
-@@ -60,11 +60,9 @@ import qualified Darcs.Patch.FileName as PatchFileName ( FileName, fp2fn, fn2fp
- #include "impossible.h"
-
- class FilePathOrURL a where
-- {-# INLINE toPath #-}
- toPath :: a -> String
-
- class FilePathOrURL a => FilePathLike a where
-- {-# INLINE toFilePath #-}
- toFilePath :: a -> FilePath
-
- -- | Paths which are relative to the local darcs repository and normalized.
diff --git a/darcs-relax-regex-libs-deps.patch b/darcs-relax-regex-libs-deps.patch
deleted file mode 100644
index 1b6a37d..0000000
--- a/darcs-relax-regex-libs-deps.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-diff -rN -u old-darcs-2.5.2/darcs.cabal new-darcs-2.5.2/darcs.cabal
---- old-darcs-2.5.2/darcs.cabal 2011-06-03 20:24:32.079482374 +0200
-+++ new-darcs-2.5.2/darcs.cabal 2011-06-03 20:24:32.080482374 +0200
-@@ -166,11 +166,11 @@
- cpp-options: -DWIN32
- c-sources: src/win32/send_email.c
- build-depends: unix-compat >= 0.1.2,
-- regex-posix >= 0.94.4 && < 0.95
-+ regex-posix >= 0.94.4 && < 0.96
-
- build-depends: base < 5,
- extensible-exceptions >= 0.1 && < 0.2,
-- regex-compat >= 0.71 && < 0.94,
-+ regex-compat >= 0.71 && < 0.96,
- mtl >= 1.0 && < 2.1,
- parsec >= 2.0 && < 3.2,
- html == 1.0.*,
-@@ -368,14 +368,14 @@
- cpp-options: -DWIN32
- c-sources: src/win32/send_email.c
- build-depends: unix-compat >= 0.1.2,
-- regex-posix >= 0.94.4 && < 0.95
-+ regex-posix >= 0.94.4 && < 0.96
-
- if os(solaris)
- cc-options: -DHAVE_SIGINFO_H
-
- build-depends: base < 5,
- extensible-exceptions >= 0.1 && < 0.2,
-- regex-compat >= 0.71 && < 0.94,
-+ regex-compat >= 0.71 && < 0.96,
- mtl >= 1.0 && < 2.1,
- parsec >= 2.0 && < 3.2,
- html == 1.0.*,
-@@ -516,14 +516,14 @@
- cpp-options: -DWIN32
- c-sources: src/win32/send_email.c
- build-depends: unix-compat >= 0.1.2,
-- regex-posix >= 0.94.4 && < 0.95
-+ regex-posix >= 0.94.4 && < 0.96
-
- if os(solaris)
- cc-options: -DHAVE_SIGINFO_H
-
- build-depends: base < 5,
- extensible-exceptions >= 0.1 && < 0.2,
-- regex-compat >= 0.71 && < 0.94,
-+ regex-compat >= 0.71 && < 0.96,
- mtl >= 1.0 && < 2.1,
- parsec >= 2.0 && < 3.2,
- html == 1.0.*,
-@@ -619,7 +619,7 @@
-
- build-depends: base < 5,
- extensible-exceptions >= 0.1 && < 0.2,
-- regex-compat >= 0.71 && < 0.94,
-+ regex-compat >= 0.71 && < 0.96,
- mtl >= 1.0 && < 2.1,
- parsec >= 2.0 && < 3.2,
- html == 1.0.*,
-@@ -672,7 +672,7 @@
- cpp-options: -DWIN32
- c-sources: src/win32/send_email.c
- build-depends: unix-compat >= 0.1.2,
-- regex-posix >= 0.94.4 && < 0.95
-+ regex-posix >= 0.94.4 && < 0.96
-
- if os(solaris)
- cc-options: -DHAVE_SIGINFO_H
diff --git a/darcs-tests-ghc72.patch b/darcs-tests-ghc72.patch
deleted file mode 100644
index c43df9a..0000000
--- a/darcs-tests-ghc72.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/tests/hspwd.hs b/tests/hspwd.hs
-index b93a7d5..f6fe2dd 100644
---- a/tests/hspwd.hs
-+++ b/tests/hspwd.hs
-@@ -1,5 +1,5 @@
- module Main where
-
--import Directory ( getCurrentDirectory )
-+import System.Directory ( getCurrentDirectory )
-
- main = getCurrentDirectory >>= putStr
-diff --git a/tests/trackdown-bisect-helper.hs b/tests/trackdown-bisect-helper.hs
-index 5c325c4..7fcb4a4 100644
---- a/tests/trackdown-bisect-helper.hs
-+++ b/tests/trackdown-bisect-helper.hs
-@@ -15,8 +15,9 @@ patches with the linear implementation.
-
-
- import Control.Monad
-+import System.Environment
- import System.IO
--import System
-+import System.Process
- import System.Random
- import Data.List
- import Control.Exception
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/darcs.git/commitdiff/52d534305c4a4a169b0ac04a7156855c1f065b90
More information about the pld-cvs-commit
mailing list