Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

darcs 2.18.5 #203737

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+2 −87
Open

darcs 2.18.5 #203737

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
89 changes: 2 additions & 87 deletions Formula/d/darcs.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
class Darcs < Formula
desc "Distributed version control system that tracks changes, via Haskell"
homepage "https://darcs.net/"
url "https://hackage.haskell.org/package/darcs-2.18.4/darcs-2.18.4.tar.gz"
sha256 "f4bc276f2f785c8f8c9bcf97288f124a4e907540140213fe47b1049e2d240338"
url "https://hackage.haskell.org/package/darcs-2.18.5/darcs-2.18.5.tar.gz"
sha256 "e310692989e313191824f532a26c5eae712217444214266503d5eb5867f951ab"
license "GPL-2.0-or-later"

bottle do
Expand All @@ -21,18 +21,7 @@
uses_from_macos "ncurses"
uses_from_macos "zlib"

# Backport fixes for newer GHC[^1] and Cabal[^2]. Darcs uses a different
# patch file format and cannot be applied with the external patch DSL.
#
# * darcs diff --hash 32646b190e019de21a103e950c4eccdd66f7eadc
# * darcs diff --hash 50d9b0b402a896c83aa7929a50a0e0449838600f
# * darcs diff --hash 8da98f5de14034aa79a2860212fa34e99585e188
#
# [^1]: https://bugs.darcs.net/patch2422
# [^2]: https://bugs.darcs.net/patch2426
patch :DATA

def install

Check failure on line 24 in Formula/d/darcs.rb

View workflow job for this annotation

GitHub Actions / Linux

`brew install --verbose --formula --build-bottle darcs` failed on Linux! 

/tmp/darcs-20250110-5477-gj4zae/darcs-2.18.5/.brew_home/.config/cabal/config
Downloading the latest package list from hackage.haskell.org
Package list of hackage.haskell.org has been updated.
The index-state is set to 2025-01-10T04:07:23Z.
==> cabal v2-install --jobs=4 --max-backjumps=100000 --install-method=copy --installdir=/home/linuxbrew/.linuxbrew/Cellar/darcs/2.18.5/bin
Error: [Cabal-7107]
Could not resolve dependencies:
[__0] trying: darcs-2.18.5 (user goal)
[__1] next goal: base (dependency of darcs)
[__1] rejecting: base-4.20.0.0/installed-inplace (conflict: darcs => base>=4.10 && <4.20)
[__1] skipping: base; 4.21.0.0, 4.20.0.1, 4.20.0.0 (has the same characteristics that caused the previous version to fail: excluded by constraint '>=4.10 && <4.20' from 'darcs')
[__1] rejecting: base; 4.19.2.0, 4.19.1.0, 4.19.0.0, 4.18.2.1, 4.18.2.0, 4.18.1.0, 4.18.0.0, 4.17.2.1, 4.17.2.0, 4.17.1.0, 4.17.0.0, 4.16.4.0, 4.16.3.0, 4.16.2.0, 4.16.1.0, 4.16.0.0, 4.15.1.0, 4.15.0.0, 4.14.3.0, 4.14.2.0, 4.14.1.0, 4.14.0.0, 4.13.0.0, 4.12.0.0, 4.11.1.0, 4.11.0.0, 4.10.1.0, 4.10.0.0, 4.9.1.0, 4.9.0.0, 4.8.2.0, 4.8.1.0, 4.8.0.0, 4.7.0.2, 4.7.0.1, 4.7.0.0, 4.6.0.1, 4.6.0.0, 4.5.1.0, 4.5.0.0, 4.4.1.0, 4.4.0.0, 4.3.1.0, 4.3.0.0, 4.2.0.2, 4.2.0.1, 4.2.0.0, 4.1.0.0, 4.0.0.0, 3.0.3.2, 3.0.3.1 (constraint from non-reinstallable package requires installed instance)
[__1] fail (backjumping, conflict set: base, darcs)
After searching the rest of the dependency tree exhaustively, these were the goals I've had most trouble fulfilling: base, darcs


==> Formula
Path: /home/linuxbrew/.linuxbrew/Homebrew/Library/Taps/homebrew/homebrew-core/Formula/d/darcs.rb
==> Configuration
HOMEBREW_VERSION: 4.4.15-56-g6aac197
ORIGIN: https://github.com/Homebrew/brew
HEAD: 6aac197d556f60e82490dcb46fcbe7090c8934e9
Last commit: 11 hours ago
Branch: master
Core tap HEAD: 36d16c95994d6c29e0cfcabc64eed127c0f28c33
Core tap last commit: 12 hours ago
Core tap JSON: 10 Jan 06:19 UTC
HOMEBREW_PREFIX: /home/linuxbrew/.linuxbrew
HOMEBREW_BOOTSNAP: set
HOMEBREW_CASK_OPTS: []
HOMEBREW_COLOR: set
HOMEBREW_CURL_PATH: /usr/bin/curl
HOMEBREW_FAIL_LOG_LINES: 150
HOMEBREW_GITHUB_API_TOKEN: set
HOMEBREW_GIT_EMAIL: [email protected]
HOMEBREW_GIT_NAME: BrewTestBot
HOMEBREW_GIT_PATH: /usr/bin/git
HOMEBREW_LOGS: /github/home/bottles/logs
HOMEBREW_MAKE_JOBS: 4
HOMEBREW_NO_AUTO_UPDATE: set
HOMEBREW_NO_EMOJI: set
HOMEBREW_NO_ENV_HINTS: set
HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK: set
HOMEBREW_NO_INSTALL_FROM_API: set
HOMEBREW_SORBET_RUNTIME: set
HOMEBREW_VERIFY_ATTESTATIONS: set
Homebrew Ruby: 3.3.6 => /home/linuxbrew/.linuxbrew/Homebrew/Library/Homebrew/vendor/portable-ruby/3.3.6/bin/ruby
CPU: quad-core 64-bit zen3
Clang: N/A
Git: 2.47.0 => /usr/bin/git
Curl: 7.81.0 => /usr/bin/curl
Kernel: Linux 6.8.0-1017-azure x86_64 GNU/Linux
OS: Ubuntu 22.04.5 LTS
Host glibc: 2.35
/usr/bin/gcc: 11.4.0
/usr/bin/ruby: N/A
glibc: N/A
gcc@11: N/A
gcc: N/A
xorg: N/A
==> ENV
HOMEBREW_CC: gcc-11
HOMEBREW_CXX: g++-11
MAKEFLAGS: -j4
CMAKE_PREFIX_PATH: /home/linuxbrew/.linuxbrew/opt/[email protected]:/home/linuxbrew/.linuxbrew
PKG_CONFIG_PATH: /home/linuxbrew/.linuxbrew/opt/gmp/lib/pkgconfig:/home/linuxbrew/.linuxbrew/opt/ncurses/lib/pkgconfig:/home/linuxbrew/.linuxbrew/opt/zlib/lib/pkgconfig
PKG_CONFIG_LIBDIR: 
HOMEBREW_MAKE_JOBS: 4
HOMEBREW_GIT: /usr/bin/git
PATH: /home/linuxbrew/.linuxbrew/Homebrew/Library/Homebrew/shims/linux/super:/home/linuxbrew/.linuxbrew/opt/cabal-install/bin:/home/linuxbrew/.linuxbrew/opt/[email protected]/bin:/home/linuxbrew/.linuxbrew/opt/ncurses/bin:/usr/bin:/bin:/usr/sbin:/sbin

Logs:
     /github/home/bottles/logs/darcs/00.options.out
     /github/home/bottles/logs/darcs/01.cabal
     /github/home/bottles/logs/darcs/02.cabal
     /github/home/bottles/logs/darcs/02.cabal.cc
READ THIS: https://docs.brew.sh/Troubleshooting

::error::darcs 2.18.5 did not build

Check failure on line 24 in Formula/d/darcs.rb

View workflow job for this annotation

GitHub Actions / macOS 15-arm64

`brew install --verbose --formula --build-bottle darcs` failed on macOS Sequoia (15) on Apple Silicon! 

/private/tmp/darcs-20250110-6104-mywdx3/darcs-2.18.5/.brew_home/.config/cabal/config
Downloading the latest package list from hackage.haskell.org
Package list of hackage.haskell.org has been updated.
The index-state is set to 2025-01-10T04:07:23Z.
==> cabal v2-install --jobs=4 --max-backjumps=100000 --install-method=copy --installdir=/opt/homebrew/Cellar/darcs/2.18.5/bin
Error: [Cabal-7107]
Could not resolve dependencies:
[__0] trying: darcs-2.18.5 (user goal)
[__1] next goal: base (dependency of darcs)
[__1] rejecting: base-4.20.0.0/installed-inplace (conflict: darcs => base>=4.10 && <4.20)
[__1] skipping: base; 4.21.0.0, 4.20.0.1, 4.20.0.0 (has the same characteristics that caused the previous version to fail: excluded by constraint '>=4.10 && <4.20' from 'darcs')
[__1] rejecting: base; 4.19.2.0, 4.19.1.0, 4.19.0.0, 4.18.2.1, 4.18.2.0, 4.18.1.0, 4.18.0.0, 4.17.2.1, 4.17.2.0, 4.17.1.0, 4.17.0.0, 4.16.4.0, 4.16.3.0, 4.16.2.0, 4.16.1.0, 4.16.0.0, 4.15.1.0, 4.15.0.0, 4.14.3.0, 4.14.2.0, 4.14.1.0, 4.14.0.0, 4.13.0.0, 4.12.0.0, 4.11.1.0, 4.11.0.0, 4.10.1.0, 4.10.0.0, 4.9.1.0, 4.9.0.0, 4.8.2.0, 4.8.1.0, 4.8.0.0, 4.7.0.2, 4.7.0.1, 4.7.0.0, 4.6.0.1, 4.6.0.0, 4.5.1.0, 4.5.0.0, 4.4.1.0, 4.4.0.0, 4.3.1.0, 4.3.0.0, 4.2.0.2, 4.2.0.1, 4.2.0.0, 4.1.0.0, 4.0.0.0, 3.0.3.2, 3.0.3.1 (constraint from non-reinstallable package requires installed instance)
[__1] fail (backjumping, conflict set: base, darcs)
After searching the rest of the dependency tree exhaustively, these were the goals I've had most trouble fulfilling: base, darcs


==> Formula
Path: /opt/homebrew/Library/Taps/homebrew/homebrew-core/Formula/d/darcs.rb
==> Configuration
HOMEBREW_VERSION: 4.4.15-56-g6aac197
ORIGIN: https://github.com/Homebrew/brew
HEAD: 6aac197d556f60e82490dcb46fcbe7090c8934e9
Last commit: 11 hours ago
Branch: master
Core tap HEAD: 36d16c95994d6c29e0cfcabc64eed127c0f28c33
Core tap last commit: 12 hours ago
Core tap JSON: 10 Jan 06:19 UTC
Core cask tap JSON: 10 Jan 06:19 UTC
HOMEBREW_PREFIX: /opt/homebrew
HOMEBREW_CACHE: /Users/brew/Library/Caches/Homebrew
HOMEBREW_CASK_OPTS: []
HOMEBREW_COLOR: set
HOMEBREW_CURL_PATH: /usr/bin/curl
HOMEBREW_FAIL_LOG_LINES: 150
HOMEBREW_GITHUB_API_TOKEN: set
HOMEBREW_GIT_EMAIL: [email protected]
HOMEBREW_GIT_NAME: BrewTestBot
HOMEBREW_GIT_PATH: /usr/bin/git
HOMEBREW_LOGS: /Users/brew/actions-runner/_work/homebrew-core/homebrew-core/bottles/logs
HOMEBREW_MAKE_JOBS: 4
HOMEBREW_NO_AUTO_UPDATE: set
HOMEBREW_NO_EMOJI: set
HOMEBREW_NO_ENV_HINTS: set
HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK: set
HOMEBREW_NO_INSTALL_FROM_API: set
HOMEBREW_SORBET_RUNTIME: set
HOMEBREW_VERIFY_ATTESTATIONS: set
Homebrew Ruby: 3.3.6 => /opt/homebrew/Library/Homebrew/vendor/portable-ruby/3.3.6/bin/ruby
CPU: quad-core 64-bit dunno
Clang: 16.0.0 build 1600
Git: 2.39.5 => /usr/bin/git
Curl: 8.7.1 => /usr/bin/curl
macOS: 15.2-arm64
CLT: 16.2.0.0.1.1733547573
Xcode: 16.2
Rosetta 2: false
==> ENV
HOMEBREW_CC: clang
HOMEBREW_CXX: clang++
MAKEFLAGS: -j4
CMAKE_PREFIX_PATH: /opt/homebrew/opt/[email protected]:/opt/homebrew
CMAKE_INCLUDE_PATH: /Library/Developer/CommandLineTools/SDKs/MacOSX15.sdk/System/Library/Frameworks/OpenGL.framework/Versions/Current/Headers
CMAKE_LIBRARY_PATH: /Library/Developer/CommandLineTools/SDKs/MacOSX15.sdk/System/Library/Frameworks/OpenGL.framework/Versions/Current/Libraries
PKG_CONFIG_PATH: /opt/homebrew/opt/gmp/lib/pkgconfig
PKG_CONFIG_LIBDIR: /usr/lib/pkgconfig:/opt/homebrew/Library/Homebrew/os/mac/pkgconfig/15
HOMEBREW_MAKE_JOBS: 4
HOMEBREW_GIT: /usr/bin/git
HOMEBREW_SDKROOT: /Library/Developer/CommandLineTools/SDKs/MacOSX15.sdk
PATH: /opt/homebrew/Library/Homebrew/shims/mac/super:/opt/homebrew/opt/cabal-install/bin:/opt/homebrew/opt/[email protected]/bin:/usr/bin:/bin:/usr/sbin:/sbin

Logs:
     /Users/brew/actions-runner/_work/homebrew-core/homebrew-core/bottles/logs/darcs/00.options.out
     /Users/brew/actions-runner/_work/homebrew-core/homebrew-core/bottles/logs/darcs/01.cabal
     /Users/brew/actions-runner/_work/homebrew-core/homebrew-core/bottles/logs/darcs/02.cabal
     /Users/brew/actions-runner/_work
system "cabal", "v2-update"
system "cabal", "v2-install", *std_cabal_v2_args
end
Expand All @@ -48,77 +37,3 @@
assert_equal "hello homebrew!", (testpath/"my_repo_clone/foo").read
end
end

__END__
diff -rN -u old-darcs.net/darcs.cabal new-darcs.net/darcs.cabal
--- old-darcs.net/darcs.cabal 2025-01-05 10:09:26
+++ new-darcs.net/darcs.cabal 2025-01-05 10:09:26
@@ -123,7 +123,7 @@
-- ----------------------------------------------------------------------

custom-setup
- setup-depends: base >= 4.10 && < 4.20,
+ setup-depends: base >= 4.10 && < 4.21,
Cabal >= 2.4 && < 3.11,
process >= 1.2.3.0 && < 1.7,
filepath >= 1.4.1 && < 1.5.0.0,
@@ -412,7 +412,7 @@
else
build-depends: unix >= 2.7.1.0 && < 2.9

- build-depends: base >= 4.10 && < 4.20,
+ build-depends: base >= 4.10 && < 4.21,
safe >= 0.3.20 && < 0.4,
stm >= 2.1 && < 2.6,
binary >= 0.5 && < 0.11,
diff -rN -u old-darcs.net/Setup.hs new-darcs.net/Setup.hs
--- old-darcs.net/Setup.hs 2025-01-05 10:24:34
+++ new-darcs.net/Setup.hs 2025-01-05 10:24:34
@@ -8,7 +8,7 @@
import Distribution.Package ( packageVersion )
import Distribution.Version( Version )
import Distribution.Simple.LocalBuildInfo
- ( LocalBuildInfo(..), absoluteInstallDirs )
+ ( LocalBuildInfo(..), absoluteInstallDirs, buildDir )
import Distribution.Simple.InstallDirs (mandir, CopyDest (NoCopyDest))
import Distribution.Simple.Setup
(buildVerbosity, copyDest, copyVerbosity, fromFlag,
diff -rN -u old-darcs.net/darcs.cabal new-darcs.net/darcs.cabal
--- old-darcs.net/darcs.cabal 2025-01-05 10:24:34
+++ new-darcs.net/darcs.cabal 2025-01-05 10:24:34
@@ -124,7 +124,7 @@

custom-setup
setup-depends: base >= 4.10 && < 4.21,
- Cabal >= 2.4 && < 3.11,
+ Cabal >= 2.4 && < 3.13,
process >= 1.2.3.0 && < 1.7,
filepath >= 1.4.1 && < 1.5.0.0,
directory >= 1.2.7 && < 1.4
diff -rN -u old-darcs.net/darcs.cabal new-darcs.net/darcs.cabal
--- old-darcs.net/darcs.cabal 2025-01-05 10:13:57
+++ new-darcs.net/darcs.cabal 2025-01-05 10:13:57
@@ -464,9 +464,9 @@
if impl(ghc >= 9.8)
cpp-options: -DHAVE_CRYPTON_CONNECTION
build-depends: crypton-connection >= 0.4 && < 0.5,
- data-default-class >= 0.1.2.0 && < 0.1.3,
+ data-default >= 0.7.1.3 && < 0.9,
http-client-tls >= 0.3.5 && < 0.4,
- tls >= 2.0.6 && < 2.1
+ tls >= 2.0.6 && < 2.2
else
-- cannot use crypton-connection >= 0.4, so
-- constraining indirect dependency to work around problems
diff -rN -u old-darcs.net/src/Darcs/Util/HTTP.hs new-darcs.net/src/Darcs/Util/HTTP.hs
--- old-darcs.net/src/Darcs/Util/HTTP.hs 2025-01-05 10:13:57
+++ new-darcs.net/src/Darcs/Util/HTTP.hs 2025-01-05 10:13:57
@@ -46,7 +46,7 @@
)

#ifdef HAVE_CRYPTON_CONNECTION
-import Data.Default.Class ( def )
+import Data.Default ( def )
import qualified Network.Connection as NC
import Network.HTTP.Client.TLS
( mkManagerSettings
Loading