diff --git a/cabal-install-solver-3.10.2.1.tar.gz b/cabal-install-solver-3.10.2.1.tar.gz deleted file mode 100644 index 04c513f..0000000 --- a/cabal-install-solver-3.10.2.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:91d00728bc4b097da34a7a177a04a4b8eb38c5ae734458346484c432dea5d40a -size 86180 diff --git a/cabal-install-solver-3.10.3.0.tar.gz b/cabal-install-solver-3.10.3.0.tar.gz new file mode 100644 index 0000000..0f8b23d --- /dev/null +++ b/cabal-install-solver-3.10.3.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e1e4493e461a60c57a30893d951df9706432d5b250bb5d20d9bff2d89fbf237e +size 87158 diff --git a/cabal-install-solver.cabal b/cabal-install-solver.cabal new file mode 100644 index 0000000..4766c20 --- /dev/null +++ b/cabal-install-solver.cabal @@ -0,0 +1,149 @@ +cabal-version: 2.2 +name: cabal-install-solver +version: 3.10.3.0 +x-revision: 1 +synopsis: The command-line interface for Cabal and Hackage. +description: + The solver component used in cabal-install command-line program + +homepage: http://www.haskell.org/cabal/ +bug-reports: https://github.com/haskell/cabal/issues +license: BSD-3-Clause +license-file: LICENSE +author: Cabal Development Team (see AUTHORS file) +maintainer: Cabal Development Team +copyright: 2003-2023, Cabal Development Team +category: Distribution +build-type: Simple +extra-doc-files: + ChangeLog.md + +source-repository head + type: git + location: https://github.com/haskell/cabal/ + subdir: cabal-install-solver + +flag debug-expensive-assertions + description: Enable expensive assertions for testing or debugging + default: False + manual: True + +flag debug-conflict-sets + description: Add additional information to ConflictSets + default: False + manual: True + +flag debug-tracetree + description: Compile in support for tracetree (used to debug the solver) + default: False + manual: True + +library + default-language: Haskell2010 + hs-source-dirs: src + hs-source-dirs: src-assertion + ghc-options: + -Wall -Wcompat -Wnoncanonical-monad-instances + -fwarn-tabs -fwarn-incomplete-uni-patterns + + if impl(ghc <8.8) + ghc-options: -Wnoncanonical-monadfail-instances + if impl(ghc >=8.10) + ghc-options: -Wunused-packages + + exposed-modules: + Distribution.Client.Utils.Assertion + + Distribution.Solver.Compat.Prelude + Distribution.Solver.Modular + Distribution.Solver.Modular.Assignment + Distribution.Solver.Modular.Builder + Distribution.Solver.Modular.Configured + Distribution.Solver.Modular.ConfiguredConversion + Distribution.Solver.Modular.ConflictSet + Distribution.Solver.Modular.Cycles + Distribution.Solver.Modular.Dependency + Distribution.Solver.Modular.Explore + Distribution.Solver.Modular.Flag + Distribution.Solver.Modular.Index + Distribution.Solver.Modular.IndexConversion + Distribution.Solver.Modular.LabeledGraph + Distribution.Solver.Modular.Linking + Distribution.Solver.Modular.Log + Distribution.Solver.Modular.Message + Distribution.Solver.Modular.MessageUtils + Distribution.Solver.Modular.Package + Distribution.Solver.Modular.Preference + Distribution.Solver.Modular.PSQ + Distribution.Solver.Modular.RetryLog + Distribution.Solver.Modular.Solver + Distribution.Solver.Modular.Tree + Distribution.Solver.Modular.Validate + Distribution.Solver.Modular.Var + Distribution.Solver.Modular.Version + Distribution.Solver.Modular.WeightedPSQ + Distribution.Solver.Types.ComponentDeps + Distribution.Solver.Types.ConstraintSource + Distribution.Solver.Types.DependencyResolver + Distribution.Solver.Types.Flag + Distribution.Solver.Types.InstalledPreference + Distribution.Solver.Types.InstSolverPackage + Distribution.Solver.Types.LabeledPackageConstraint + Distribution.Solver.Types.OptionalStanza + Distribution.Solver.Types.PackageConstraint + Distribution.Solver.Types.PackageFixedDeps + Distribution.Solver.Types.PackageIndex + Distribution.Solver.Types.PackagePath + Distribution.Solver.Types.PackagePreferences + Distribution.Solver.Types.PkgConfigDb + Distribution.Solver.Types.Progress + Distribution.Solver.Types.ResolverPackage + Distribution.Solver.Types.Settings + Distribution.Solver.Types.SolverId + Distribution.Solver.Types.SolverPackage + Distribution.Solver.Types.SourcePackage + Distribution.Solver.Types.Variable + + build-depends: + , array >=0.4 && <0.6 + , base >=4.10 && <4.20 + , bytestring >=0.10.6.0 && <0.13 + , Cabal ^>=3.10.3 + , Cabal-syntax ^>=3.10 + , containers >=0.5.6.2 && <0.8 + , edit-distance ^>= 0.2.2 + , filepath ^>=1.4.0.0 || ^>=1.5.0.0 + , mtl >=2.0 && <2.4 + , pretty ^>=1.1 + , transformers >=0.4.2.0 && <0.7 + , text (>= 1.2.3.0 && < 1.3) || (>= 2.0 && < 2.2) + + if flag(debug-expensive-assertions) + cpp-options: -DDEBUG_EXPENSIVE_ASSERTIONS + + if flag(debug-conflict-sets) + cpp-options: -DDEBUG_CONFLICT_SETS + build-depends: base >=4.9 + + if flag(debug-tracetree) + cpp-options: -DDEBUG_TRACETREE + build-depends: tracetree ^>=0.1 + +Test-Suite unit-tests + default-language: Haskell2010 + ghc-options: -rtsopts -threaded + + type: exitcode-stdio-1.0 + main-is: UnitTests.hs + hs-source-dirs: tests + other-modules: + UnitTests.Distribution.Solver.Modular.MessageUtils + + build-depends: + , base >= 4.10 && <4.20 + , Cabal + , Cabal-syntax + , cabal-install-solver + , tasty >= 1.2.3 && <1.6 + , tasty-quickcheck + , tasty-hunit >= 0.10 diff --git a/ghc-cabal-install-solver.changes b/ghc-cabal-install-solver.changes index 7545a16..303ded3 100644 --- a/ghc-cabal-install-solver.changes +++ b/ghc-cabal-install-solver.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Thu Mar 28 17:54:10 UTC 2024 - Peter Simons + +- Update cabal-install-solver to version 3.10.3.0 revision 1. + 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-solver-3.10.3.0/src/ChangeLog.md + ------------------------------------------------------------------- Tue Nov 7 21:30:07 UTC 2023 - Peter Simons diff --git a/ghc-cabal-install-solver.spec b/ghc-cabal-install-solver.spec index 4251f83..99d21f4 100644 --- a/ghc-cabal-install-solver.spec +++ b/ghc-cabal-install-solver.spec @@ -1,7 +1,7 @@ # # spec file for package ghc-cabal-install-solver # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,12 +20,13 @@ %global pkgver %{pkg_name}-%{version} %bcond_with tests Name: ghc-%{pkg_name} -Version: 3.10.2.1 +Version: 3.10.3.0 Release: 0 Summary: The command-line interface for Cabal and Hackage License: BSD-3-Clause 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-Cabal-prof BuildRequires: ghc-Cabal-syntax-devel @@ -47,6 +48,8 @@ BuildRequires: ghc-mtl-prof BuildRequires: ghc-pretty-devel BuildRequires: ghc-pretty-prof BuildRequires: ghc-rpm-macros +BuildRequires: ghc-text-devel +BuildRequires: ghc-text-prof BuildRequires: ghc-transformers-devel BuildRequires: ghc-transformers-prof ExcludeArch: %{ix86} @@ -91,6 +94,7 @@ This package provides the Haskell %{pkg_name} profiling library. %prep %autosetup -n %{pkg_name}-%{version} +cp -p %{SOURCE1} %{pkg_name}.cabal %build %ghc_lib_build