Accepting request 1324023 from devel:languages:haskell

Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/1324023
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/cabal-install?expand=0&rev=48

Cabal-absolute-datadir.patch

@@ -0,0 +1,44 @@
+From 1f8f9fd08fb90bd94668ac8a81c94e179fc8ab86 Mon Sep 17 00:00:00 2001
+From: Matthew Pickering <matthewtpickering@gmail.com>
+Date: Fri, 14 Mar 2025 12:55:51 +0000
+Subject: [PATCH] Set <pkgname_datadir> to an absolute path
+
+Ticket #10717 points out that the <pkgname>_datadir environment variable
+should be set to an absolute path since the test executables may
+change directory during their invocation.
+
+This is easily fixed by using the absoluteWorkingDirLBI
+function, which was introduced in 027bddfcdf3ba298376c60be1ccf664ebc394cec,
+
+Fixes #10717
+---
+ cabal-install/src/Distribution/Client/Run.hs  |  3 ++
+
+Index: cabal-install-3.14.1.1/src/Distribution/Client/Run.hs
+===================================================================
+--- cabal-install-3.14.1.1.orig/src/Distribution/Client/Run.hs	2001-09-09 01:46:40.000000000 +0000
++++ cabal-install-3.14.1.1/src/Distribution/Client/Run.hs	2025-08-05 12:02:41.575543029 +0000
+@@ -35,6 +35,7 @@ import Distribution.Simple.Flag (fromFla
+ import Distribution.Simple.LocalBuildInfo
+   ( ComponentName (..)
+   , LocalBuildInfo (..)
++  , absoluteWorkingDirLBI
+   , buildDir
+   , depLibraryPaths
+   , interpretSymbolicPathLBI
+@@ -143,6 +144,7 @@ splitRunArgs verbosity lbi args =
+ -- | Run a given executable.
+ run :: Verbosity -> LocalBuildInfo -> Executable -> [String] -> IO ()
+ run verbosity lbi exe exeArgs = do
++  curDir <- absoluteWorkingDirLBI lbi
+   let distPref = fromFlag $ configDistPref $ configFlags lbi
+       buildPref = buildDir lbi
+       pkg_descr = localPkgDescr lbi
+@@ -155,6 +157,7 @@ run verbosity lbi exe exeArgs = do
+           , -- Include any build-tool-depends on build tools internal to the current package.
+             withPrograms =
+               addInternalBuildTools
++                curDir
+                 pkg_descr
+                 lbi
+                 (buildInfo exe)

cabal-install-3.10.3.0.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a8e706f0cf30cd91e006ae8b38137aecf65983346f44d0cba4d7a60bbfa3da9e
-size 705703

cabal-install-3.14.1.1.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f11d364ab87fb46275a987e60453857732147780a8c592460eec8a16dbb6bace
+size 737643

cabal-install.cabal

@@ -1,8 +1,8 @@
-Cabal-Version:      2.2
+Cabal-Version:      3.0
 
 Name:               cabal-install
-Version:            3.10.3.0
-x-revision: 1
+Version:            3.14.1.1
+x-revision: 5
 Synopsis:           The command-line interface for Cabal and Hackage.
 Description:
     The \'cabal\' command-line program simplifies the process of managing
@@ -14,7 +14,7 @@ License:            BSD-3-Clause
 License-File:       LICENSE
 Author:             Cabal Development Team (see AUTHORS file)
 Maintainer:         Cabal Development Team <cabal-devel@haskell.org>
-Copyright:          2003-2023, Cabal Development Team
+Copyright:          2003-2024, Cabal Development Team
 Category:           Distribution
 Build-type:         Simple
 Extra-Source-Files:
@@ -41,25 +41,28 @@ Flag lukko
   manual:       True
 
 common warnings
-    ghc-options: -Wall -Wcompat -Wnoncanonical-monad-instances -Wincomplete-uni-patterns -Wincomplete-record-updates
+    ghc-options:
+      -Wall
+      -Wcompat
+      -Wnoncanonical-monad-instances
+      -Wincomplete-uni-patterns
+      -Wincomplete-record-updates
+      -Wno-unticked-promoted-constructors
+
     if impl(ghc < 8.8)
       ghc-options: -Wnoncanonical-monadfail-instances
-    if impl(ghc >=9.0)
-      -- Warning: even though introduced with GHC 8.10, -Wunused-packages
-      -- gives false positives with GHC 8.10.
-      ghc-options: -Wunused-packages
 
 common base-dep
-    build-depends: base >=4.10 && <4.20
+    build-depends: base >=4.13 && <4.22
 
 common cabal-dep
-    build-depends: Cabal ^>=3.10.3
+    build-depends: Cabal ^>=3.14
 
 common cabal-syntax-dep
-    build-depends: Cabal-syntax ^>=3.10
+    build-depends: Cabal-syntax ^>=3.14
 
 common cabal-install-solver-dep
-    build-depends: cabal-install-solver ^>=3.10
+    build-depends: cabal-install-solver ^>=3.14
 
 library
     import: warnings, base-dep, cabal-dep, cabal-syntax-dep, cabal-install-solver-dep
@@ -98,6 +101,7 @@ library
         Distribution.Client.CmdInstall.ClientInstallTargetSelector
         Distribution.Client.CmdLegacy
         Distribution.Client.CmdListBin
+        Distribution.Client.CmdPath
         Distribution.Client.CmdOutdated
         Distribution.Client.CmdRepl
         Distribution.Client.CmdRun
@@ -115,6 +119,7 @@ library
         Distribution.Client.Dependency
         Distribution.Client.Dependency.Types
         Distribution.Client.DistDirLayout
+        Distribution.Client.Errors
         Distribution.Client.Fetch
         Distribution.Client.FetchUtils
         Distribution.Client.FileMonitor
@@ -157,6 +162,8 @@ library
         Distribution.Client.PackageHash
         Distribution.Client.ParseUtils
         Distribution.Client.ProjectBuilding
+        Distribution.Client.ProjectBuilding.UnpackedPackage
+        Distribution.Client.ProjectBuilding.PackageFileMonitor
         Distribution.Client.ProjectBuilding.Types
         Distribution.Client.ProjectConfig
         Distribution.Client.ProjectConfig.Legacy
@@ -165,9 +172,11 @@ library
         Distribution.Client.ProjectOrchestration
         Distribution.Client.ProjectPlanOutput
         Distribution.Client.ProjectPlanning
+        Distribution.Client.ProjectPlanning.SetupPolicy
         Distribution.Client.ProjectPlanning.Types
         Distribution.Client.RebuildMonad
         Distribution.Client.Reconfigure
+        Distribution.Client.ReplFlags
         Distribution.Client.Run
         Distribution.Client.Sandbox
         Distribution.Client.Sandbox.PackageEnvironment
@@ -223,23 +232,24 @@ library
         edit-distance >= 0.2.2 && < 0.3,
         exceptions >= 0.10.4   && < 0.11,
         filepath   >= 1.4.0.0  && < 1.6,
-        hashable   >= 1.0      && < 1.5,
-        HTTP       >= 4000.1.5 && < 4000.5,
+        HTTP       >= 4000.1.5 && < 4000.6,
         mtl        >= 2.0      && < 2.4,
-        network-uri >= 2.6.0.2 && < 2.7,
+        network-uri >= 2.6.2.0 && < 2.7,
         pretty     >= 1.1      && < 1.2,
         process    >= 1.2.3.0  && < 1.7,
-        random     >= 1.2      && < 1.3,
+        random     >= 1.2      && < 1.4,
         stm        >= 2.0      && < 2.6,
-        tar        >= 0.5.0.3  && < 0.7,
-        time       >= 1.5.0.1  && < 1.13,
+        tar        >= 0.5.0.3  && < 0.8,
+        time       >= 1.5.0.1  && < 1.15,
         zlib       >= 0.5.3    && < 0.8,
         hackage-security >= 0.6.2.0 && < 0.7,
         text       >= 1.2.3    && < 1.3 || >= 2.0 && < 2.2,
         parsec     >= 3.1.13.0 && < 3.2,
+        open-browser >= 0.2.1.0 && < 0.5,
         regex-base  >= 0.94.0.0 && <0.95,
         regex-posix >= 0.96.0.0 && <0.97,
-        safe-exceptions >= 0.1.7.0 && < 0.2
+        safe-exceptions >= 0.1.7.0 && < 0.2,
+        semaphore-compat >= 1.0.0 && < 1.1
 
     if flag(native-dns)
       if os(windows)
@@ -251,14 +261,14 @@ library
       -- newer directory for symlinks
       build-depends: Win32 >= 2.8 && < 3, directory >=1.3.1.0
     else
-      build-depends: unix >= 2.5 && < 2.9
+      build-depends: unix >= 2.5 && < 2.8 || >= 2.8.6.0 && < 2.9
 
     if flag(lukko)
       build-depends: lukko >= 0.1 && <0.2
 
-   -- pull in process version with fixed waitForProcess error
-   if impl(ghc >=8.2)
-     build-depends: process >= 1.6.15.0
+    -- pull in process version with fixed waitForProcess error
+    if impl(ghc >=8.2)
+      build-depends: process >= 1.6.15.0
 
 
 executable cabal
@@ -321,7 +331,6 @@ test-suite unit-tests
       UnitTests.Distribution.Solver.Modular.WeightedPSQ
       UnitTests.Distribution.Solver.Types.OptionalStanza
       UnitTests.Options
-      UnitTests.TempTestDir
 
     build-depends:
           array,
@@ -329,6 +338,7 @@ test-suite unit-tests
           cabal-install,
           Cabal-tree-diff,
           Cabal-QuickCheck,
+          Cabal-tests,
           containers,
           directory,
           filepath,
@@ -340,10 +350,11 @@ test-suite unit-tests
           zlib,
           tasty >= 1.2.3 && <1.6,
           tasty-golden >=2.3.1.1 && <2.4,
-          tasty-quickcheck,
+          tasty-quickcheck ^>=0.11,
+          tasty-expected-failure,
           tasty-hunit >= 0.10,
           tree-diff,
-          QuickCheck >= 2.14.3 && <2.15
+          QuickCheck >= 2.14.3 && <2.16
 
 
 -- Tests to run with a limited stack and heap size
@@ -388,6 +399,7 @@ test-suite integration-tests2
         containers,
         directory,
         filepath,
+        process,
         tasty >= 1.2.3 && <1.6,
         tasty-hunit >= 0.10,
         tagged
@@ -410,16 +422,15 @@ test-suite long-tests
     UnitTests.Distribution.Solver.Modular.QuickCheck
     UnitTests.Distribution.Solver.Modular.QuickCheck.Utils
     UnitTests.Options
-    UnitTests.TempTestDir
 
   build-depends:
         Cabal-QuickCheck,
         Cabal-described,
+        Cabal-tests,
         cabal-install,
         containers,
         directory,
         filepath,
-        hashable,
         mtl,
         network-uri >= 2.6.2.0 && <2.7,
         random,
@@ -427,6 +438,6 @@ test-suite long-tests
         tasty >= 1.2.3 && <1.6,
         tasty-expected-failure,
         tasty-hunit >= 0.10,
-        tasty-quickcheck,
-        QuickCheck >= 2.14 && <2.15,
+        tasty-quickcheck <0.12,
+        QuickCheck >= 2.14 && <2.16,
         pretty-show >= 1.6.15

cabal-install.changes

@@ -1,3 +1,56 @@
+-------------------------------------------------------------------
+Sun Dec 14 18:02:19 UTC 2025 - Peter Simons <psimons@suse.com>
+
+- Update cabal-install to version 3.14.1.1 revision 5.
+  Upstream has revised the Cabal build instructions on Hackage.
+
+-------------------------------------------------------------------
+Tue Oct 21 11:01:54 UTC 2025 - Peter Simons <psimons@suse.com>
+
+- Update cabal-install to version 3.14.1.1 revision 4.
+  Upstream has revised the Cabal build instructions on Hackage.
+
+-------------------------------------------------------------------
+Tue Sep 30 21:36:56 UTC 2025 - Peter Simons <psimons@suse.com>
+
+- Update cabal-install to version 3.14.1.1 revision 3.
+  Upstream has revised the Cabal build instructions on Hackage.
+
+-------------------------------------------------------------------
+Tue Aug  5 12:05:47 UTC 2025 - Peter Simons <psimons@suse.com>
+
+- Appy "Cabal-absolute-datadir.patch" from GHC here as well.
+
+-------------------------------------------------------------------
+Mon Jul 22 12:59:18 UTC 2025 - Peter Simons <psimons@suse.com>
+
+- Update cabal-install to version 3.14.1.1 revision 2.
+  Upstream has edited the change log file since the last release in
+  a non-trivial way, i.e. they did more than just add a new entry
+  at the top. You can review the file at:
+  http://hackage.haskell.org/package/cabal-install-3.14.1.1/src/changelog
+
+-------------------------------------------------------------------
+Tue Jul 22 03:10:24 UTC 2025 - Peter Simons <psimons@suse.com>
+
+- Update cabal-install to version 3.12.1.0 revision 2.
+  Upstream has revised the Cabal build instructions on Hackage.
+
+-------------------------------------------------------------------
+Thu May  8 13:53:03 UTC 2025 - Peter Simons <psimons@suse.com>
+
+- Update cabal-install to version 3.12.1.0 revision 1.
+  Upstream has revised the Cabal build instructions on Hackage.
+
+-------------------------------------------------------------------
+Fri Jun 28 18:09:25 UTC 2024 - Peter Simons <psimons@suse.com>
+
+- Update cabal-install to version 3.12.1.0.
+  3.12.1.0 Artem Pelenitsyn <a.pelenitsyn@gmail.com> June 2024
+  	* See https://github.com/haskell/cabal/blob/master/release-notes/cabal-install-3.12.1.0.md
+
+  3.10.2.0 Hécate <hecate+github@glitchbra.in> August 2023
+
 -------------------------------------------------------------------
 Thu Mar 21 22:04:44 UTC 2024 - Peter Simons <psimons@suse.com>
 

cabal-install.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package cabal-install
 #
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2025 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -20,13 +20,14 @@
 %global pkgver %{pkg_name}-%{version}
 %bcond_with tests
 Name:           %{pkg_name}
-Version:        3.10.3.0
+Version:        3.14.1.1
 Release:        0
 Summary:        The command-line interface for Cabal and Hackage
 License:        BSD-3-Clause
 URL:            https://hackage.haskell.org/package/%{name}
 Source0:        https://hackage.haskell.org/package/%{name}-%{version}/%{name}-%{version}.tar.gz
-Source1:        https://hackage.haskell.org/package/%{name}-%{version}/revision/1.cabal#/%{name}.cabal
+Source1:        https://hackage.haskell.org/package/%{name}-%{version}/revision/5.cabal#/%{name}.cabal
+Patch01:        Cabal-absolute-datadir.patch
 BuildRequires:  chrpath
 BuildRequires:  ghc-Cabal-devel
 BuildRequires:  ghc-Cabal-prof
@@ -64,14 +65,14 @@ BuildRequires:  ghc-filepath-devel
 BuildRequires:  ghc-filepath-prof
 BuildRequires:  ghc-hackage-security-devel
 BuildRequires:  ghc-hackage-security-prof
-BuildRequires:  ghc-hashable-devel
-BuildRequires:  ghc-hashable-prof
 BuildRequires:  ghc-lukko-devel
 BuildRequires:  ghc-lukko-prof
 BuildRequires:  ghc-mtl-devel
 BuildRequires:  ghc-mtl-prof
 BuildRequires:  ghc-network-uri-devel
 BuildRequires:  ghc-network-uri-prof
+BuildRequires:  ghc-open-browser-devel
+BuildRequires:  ghc-open-browser-prof
 BuildRequires:  ghc-parsec-devel
 BuildRequires:  ghc-parsec-prof
 BuildRequires:  ghc-pretty-devel
@@ -89,6 +90,8 @@ BuildRequires:  ghc-resolv-prof
 BuildRequires:  ghc-rpm-macros
 BuildRequires:  ghc-safe-exceptions-devel
 BuildRequires:  ghc-safe-exceptions-prof
+BuildRequires:  ghc-semaphore-compat-devel
+BuildRequires:  ghc-semaphore-compat-prof
 BuildRequires:  ghc-stm-devel
 BuildRequires:  ghc-stm-prof
 BuildRequires:  ghc-tar-devel
@@ -107,6 +110,8 @@ BuildRequires:  ghc-Cabal-QuickCheck-devel
 BuildRequires:  ghc-Cabal-QuickCheck-prof
 BuildRequires:  ghc-Cabal-described-devel
 BuildRequires:  ghc-Cabal-described-prof
+BuildRequires:  ghc-Cabal-tests-devel
+BuildRequires:  ghc-Cabal-tests-prof
 BuildRequires:  ghc-Cabal-tree-diff-devel
 BuildRequires:  ghc-Cabal-tree-diff-prof
 BuildRequires:  ghc-QuickCheck-devel
@@ -167,7 +172,7 @@ Supplements:    (ghc-%{pkg_name}-devel and ghc-prof)
 This package provides the Haskell %{pkg_name} profiling library.
 
 %prep
-%autosetup
+%autosetup -p1
 cp -p %{SOURCE1} %{name}.cabal
 
 %build