[package-plan] 02/03: Downgrade Cabal (1.24.1.0) and cabal-install (1.24.0.1)

Ilias Tsitsimpis iliastsi-guest at moszumanska.debian.org
Mon Jan 30 16:13:50 UTC 2017


This is an automated email from the git hooks/post-receive script.

iliastsi-guest pushed a commit to branch master
in repository package-plan.

commit 44e752eedc6d56abd23d57e0f1e6ccea69b212e5
Author: Ilias Tsitsimpis <i.tsitsimpis at gmail.com>
Date:   Mon Jan 30 18:08:21 2017 +0200

    Downgrade Cabal (1.24.1.0) and cabal-install (1.24.0.1)
    
    Downgrade the versions of Cabal and cabal-install to much the ones
    available in the archive. Also, set their .cabal files in
    `additional-cabals`, since they have been modified in hackage.
---
 additional-cabals/Cabal-1.24.1.0.cabal         | 371 ++++++++++++++++++++++
 additional-cabals/cabal-install-1.24.0.1.cabal | 418 +++++++++++++++++++++++++
 packages.txt                                   |   4 +-
 patches/cabal-install/1.24.0.1/series          |   1 +
 patches/cabal-install/1.24.0.1/use-cryptohash  |  13 +
 5 files changed, 805 insertions(+), 2 deletions(-)

diff --git a/additional-cabals/Cabal-1.24.1.0.cabal b/additional-cabals/Cabal-1.24.1.0.cabal
new file mode 100644
index 0000000..ce10756
--- /dev/null
+++ b/additional-cabals/Cabal-1.24.1.0.cabal
@@ -0,0 +1,371 @@
+name: Cabal
+version: 1.24.1.0
+copyright: 2003-2006, Isaac Jones
+           2005-2011, Duncan Coutts
+license: BSD3
+license-file: LICENSE
+author: Isaac Jones <ijones at syntaxpolice.org>
+        Duncan Coutts <duncan at community.haskell.org>
+maintainer: cabal-devel at haskell.org
+homepage: http://www.haskell.org/cabal/
+bug-reports: https://github.com/haskell/cabal/issues
+synopsis: A framework for packaging Haskell software
+description:
+  The Haskell Common Architecture for Building Applications and
+  Libraries: a framework defining a common interface for authors to more
+  easily build their Haskell applications in a portable way.
+  .
+  The Haskell Cabal is part of a larger infrastructure for distributing,
+  organizing, and cataloging Haskell libraries and tools.
+category: Distribution
+cabal-version: >=1.10
+build-type: Simple
+-- If we use a new Cabal feature, this needs to be changed to Custom so
+-- we can bootstrap.
+
+extra-source-files:
+  README.md tests/README.md changelog
+  doc/Cabal.css doc/developing-packages.markdown doc/index.markdown
+  doc/installing-packages.markdown
+  doc/misc.markdown
+
+  -- Generated with 'misc/gen-extra-source-files.sh'
+  -- Do NOT edit this section manually; instead, run the script.
+  -- BEGIN gen-extra-source-files
+  tests/PackageTests/AllowNewer/AllowNewer.cabal
+  tests/PackageTests/AllowNewer/benchmarks/Bench.hs
+  tests/PackageTests/AllowNewer/src/Foo.hs
+  tests/PackageTests/AllowNewer/tests/Test.hs
+  tests/PackageTests/BenchmarkExeV10/Foo.hs
+  tests/PackageTests/BenchmarkExeV10/benchmarks/bench-Foo.hs
+  tests/PackageTests/BenchmarkExeV10/my.cabal
+  tests/PackageTests/BenchmarkOptions/BenchmarkOptions.cabal
+  tests/PackageTests/BenchmarkOptions/test-BenchmarkOptions.hs
+  tests/PackageTests/BenchmarkStanza/my.cabal
+  tests/PackageTests/BuildDeps/GlobalBuildDepsNotAdditive1/GlobalBuildDepsNotAdditive1.cabal
+  tests/PackageTests/BuildDeps/GlobalBuildDepsNotAdditive1/MyLibrary.hs
+  tests/PackageTests/BuildDeps/GlobalBuildDepsNotAdditive2/GlobalBuildDepsNotAdditive2.cabal
+  tests/PackageTests/BuildDeps/GlobalBuildDepsNotAdditive2/lemon.hs
+  tests/PackageTests/BuildDeps/InternalLibrary0/MyLibrary.hs
+  tests/PackageTests/BuildDeps/InternalLibrary0/my.cabal
+  tests/PackageTests/BuildDeps/InternalLibrary0/programs/lemon.hs
+  tests/PackageTests/BuildDeps/InternalLibrary1/MyLibrary.hs
+  tests/PackageTests/BuildDeps/InternalLibrary1/my.cabal
+  tests/PackageTests/BuildDeps/InternalLibrary1/programs/lemon.hs
+  tests/PackageTests/BuildDeps/InternalLibrary2/MyLibrary.hs
+  tests/PackageTests/BuildDeps/InternalLibrary2/my.cabal
+  tests/PackageTests/BuildDeps/InternalLibrary2/programs/lemon.hs
+  tests/PackageTests/BuildDeps/InternalLibrary2/to-install/MyLibrary.hs
+  tests/PackageTests/BuildDeps/InternalLibrary2/to-install/my.cabal
+  tests/PackageTests/BuildDeps/InternalLibrary3/MyLibrary.hs
+  tests/PackageTests/BuildDeps/InternalLibrary3/my.cabal
+  tests/PackageTests/BuildDeps/InternalLibrary3/programs/lemon.hs
+  tests/PackageTests/BuildDeps/InternalLibrary3/to-install/MyLibrary.hs
+  tests/PackageTests/BuildDeps/InternalLibrary3/to-install/my.cabal
+  tests/PackageTests/BuildDeps/InternalLibrary4/MyLibrary.hs
+  tests/PackageTests/BuildDeps/InternalLibrary4/my.cabal
+  tests/PackageTests/BuildDeps/InternalLibrary4/programs/lemon.hs
+  tests/PackageTests/BuildDeps/InternalLibrary4/to-install/MyLibrary.hs
+  tests/PackageTests/BuildDeps/InternalLibrary4/to-install/my.cabal
+  tests/PackageTests/BuildDeps/SameDepsAllRound/MyLibrary.hs
+  tests/PackageTests/BuildDeps/SameDepsAllRound/SameDepsAllRound.cabal
+  tests/PackageTests/BuildDeps/SameDepsAllRound/lemon.hs
+  tests/PackageTests/BuildDeps/SameDepsAllRound/pineapple.hs
+  tests/PackageTests/BuildDeps/TargetSpecificDeps1/MyLibrary.hs
+  tests/PackageTests/BuildDeps/TargetSpecificDeps1/lemon.hs
+  tests/PackageTests/BuildDeps/TargetSpecificDeps1/my.cabal
+  tests/PackageTests/BuildDeps/TargetSpecificDeps2/MyLibrary.hs
+  tests/PackageTests/BuildDeps/TargetSpecificDeps2/lemon.hs
+  tests/PackageTests/BuildDeps/TargetSpecificDeps2/my.cabal
+  tests/PackageTests/BuildDeps/TargetSpecificDeps3/MyLibrary.hs
+  tests/PackageTests/BuildDeps/TargetSpecificDeps3/lemon.hs
+  tests/PackageTests/BuildDeps/TargetSpecificDeps3/my.cabal
+  tests/PackageTests/BuildTestSuiteDetailedV09/Dummy2.hs
+  tests/PackageTests/BuildableField/BuildableField.cabal
+  tests/PackageTests/BuildableField/Main.hs
+  tests/PackageTests/CMain/Bar.hs
+  tests/PackageTests/CMain/foo.c
+  tests/PackageTests/CMain/my.cabal
+  tests/PackageTests/DeterministicAr/Lib.hs
+  tests/PackageTests/DeterministicAr/my.cabal
+  tests/PackageTests/DuplicateModuleName/DuplicateModuleName.cabal
+  tests/PackageTests/DuplicateModuleName/src/Foo.hs
+  tests/PackageTests/DuplicateModuleName/tests/Foo.hs
+  tests/PackageTests/DuplicateModuleName/tests2/Foo.hs
+  tests/PackageTests/EmptyLib/empty/empty.cabal
+  tests/PackageTests/GhcPkgGuess/SameDirectory/SameDirectory.cabal
+  tests/PackageTests/GhcPkgGuess/SameDirectory/ghc
+  tests/PackageTests/GhcPkgGuess/SameDirectory/ghc-pkg
+  tests/PackageTests/GhcPkgGuess/SameDirectoryGhcVersion/SameDirectory.cabal
+  tests/PackageTests/GhcPkgGuess/SameDirectoryGhcVersion/ghc-7.10
+  tests/PackageTests/GhcPkgGuess/SameDirectoryGhcVersion/ghc-pkg-ghc-7.10
+  tests/PackageTests/GhcPkgGuess/SameDirectoryVersion/SameDirectory.cabal
+  tests/PackageTests/GhcPkgGuess/SameDirectoryVersion/ghc-7.10
+  tests/PackageTests/GhcPkgGuess/SameDirectoryVersion/ghc-pkg-7.10
+  tests/PackageTests/GhcPkgGuess/Symlink/SameDirectory.cabal
+  tests/PackageTests/GhcPkgGuess/Symlink/bin/ghc
+  tests/PackageTests/GhcPkgGuess/Symlink/bin/ghc-pkg
+  tests/PackageTests/GhcPkgGuess/SymlinkGhcVersion/SameDirectory.cabal
+  tests/PackageTests/GhcPkgGuess/SymlinkGhcVersion/bin/ghc-7.10
+  tests/PackageTests/GhcPkgGuess/SymlinkGhcVersion/bin/ghc-pkg-7.10
+  tests/PackageTests/GhcPkgGuess/SymlinkVersion/SameDirectory.cabal
+  tests/PackageTests/GhcPkgGuess/SymlinkVersion/bin/ghc-7.10
+  tests/PackageTests/GhcPkgGuess/SymlinkVersion/bin/ghc-pkg-ghc-7.10
+  tests/PackageTests/Haddock/CPP.hs
+  tests/PackageTests/Haddock/Literate.lhs
+  tests/PackageTests/Haddock/NoCPP.hs
+  tests/PackageTests/Haddock/Simple.hs
+  tests/PackageTests/Haddock/my.cabal
+  tests/PackageTests/HaddockNewline/A.hs
+  tests/PackageTests/HaddockNewline/HaddockNewline.cabal
+  tests/PackageTests/HaddockNewline/Setup.hs
+  tests/PackageTests/Options.hs
+  tests/PackageTests/OrderFlags/Foo.hs
+  tests/PackageTests/OrderFlags/my.cabal
+  tests/PackageTests/PathsModule/Executable/Main.hs
+  tests/PackageTests/PathsModule/Executable/my.cabal
+  tests/PackageTests/PathsModule/Library/my.cabal
+  tests/PackageTests/PreProcess/Foo.hsc
+  tests/PackageTests/PreProcess/Main.hs
+  tests/PackageTests/PreProcess/my.cabal
+  tests/PackageTests/PreProcessExtraSources/Foo.hsc
+  tests/PackageTests/PreProcessExtraSources/Main.hs
+  tests/PackageTests/PreProcessExtraSources/my.cabal
+  tests/PackageTests/ReexportedModules/ReexportedModules.cabal
+  tests/PackageTests/TemplateHaskell/dynamic/Exe.hs
+  tests/PackageTests/TemplateHaskell/dynamic/Lib.hs
+  tests/PackageTests/TemplateHaskell/dynamic/TH.hs
+  tests/PackageTests/TemplateHaskell/dynamic/my.cabal
+  tests/PackageTests/TemplateHaskell/profiling/Exe.hs
+  tests/PackageTests/TemplateHaskell/profiling/Lib.hs
+  tests/PackageTests/TemplateHaskell/profiling/TH.hs
+  tests/PackageTests/TemplateHaskell/profiling/my.cabal
+  tests/PackageTests/TemplateHaskell/vanilla/Exe.hs
+  tests/PackageTests/TemplateHaskell/vanilla/Lib.hs
+  tests/PackageTests/TemplateHaskell/vanilla/TH.hs
+  tests/PackageTests/TemplateHaskell/vanilla/my.cabal
+  tests/PackageTests/TestNameCollision/child/Child.hs
+  tests/PackageTests/TestNameCollision/child/child.cabal
+  tests/PackageTests/TestNameCollision/child/tests/Test.hs
+  tests/PackageTests/TestNameCollision/parent/Parent.hs
+  tests/PackageTests/TestNameCollision/parent/parent.cabal
+  tests/PackageTests/TestOptions/TestOptions.cabal
+  tests/PackageTests/TestOptions/test-TestOptions.hs
+  tests/PackageTests/TestStanza/my.cabal
+  tests/PackageTests/TestSuiteTests/ExeV10/Foo.hs
+  tests/PackageTests/TestSuiteTests/ExeV10/my.cabal
+  tests/PackageTests/TestSuiteTests/ExeV10/tests/test-Foo.hs
+  tests/PackageTests/TestSuiteTests/ExeV10/tests/test-Short.hs
+  tests/PackageTests/TestSuiteTests/LibV09/Lib.hs
+  tests/PackageTests/TestSuiteTests/LibV09/LibV09.cabal
+  tests/PackageTests/TestSuiteTests/LibV09/tests/Deadlock.hs
+  tests/PackageTests/Tests.hs
+  tests/PackageTests/UniqueIPID/P1/M.hs
+  tests/PackageTests/UniqueIPID/P1/my.cabal
+  tests/PackageTests/UniqueIPID/P2/M.hs
+  tests/PackageTests/UniqueIPID/P2/my.cabal
+  tests/PackageTests/multInst/my.cabal
+  tests/Setup.hs
+  tests/hackage/check.sh
+  tests/hackage/download.sh
+  tests/hackage/unpack.sh
+  tests/misc/ghc-supported-languages.hs
+  -- END gen-extra-source-files
+
+source-repository head
+  type:     git
+  location: https://github.com/haskell/cabal/
+  subdir:   Cabal
+
+flag bundled-binary-generic
+  default: False
+
+library
+  build-depends:
+    array      >= 0.1 && < 0.6,
+    base       >= 4.5 && < 5,
+    bytestring >= 0.9 && < 1,
+    containers >= 0.4 && < 0.6,
+    deepseq    >= 1.3 && < 1.5,
+    directory  >= 1.1 && < 1.3,
+    filepath   >= 1.3 && < 1.5,
+    pretty     >= 1.1 && < 1.2,
+    process    >= 1.1.0.1 && < 1.5,
+    time       >= 1.4 && < 1.7
+
+  if flag(bundled-binary-generic)
+    build-depends: binary >= 0.5 && < 0.7
+  else
+    build-depends: binary >= 0.7 && < 0.9
+
+  -- Needed for GHC.Generics before GHC 7.6
+  if impl(ghc < 7.6)
+    build-depends: ghc-prim >= 0.2 && < 0.3
+
+  if !os(windows)
+    build-depends:
+      unix >= 2.5 && < 2.8
+
+  if os(windows)
+    build-depends:
+      Win32 >= 2.2 && < 2.4
+
+  ghc-options: -Wall -fno-ignore-asserts -fwarn-tabs
+  if impl(ghc >= 8.0)
+    ghc-options: -Wcompat -Wnoncanonical-monad-instances
+                 -Wnoncanonical-monadfail-instances
+
+  exposed-modules:
+    Distribution.Compat.CreatePipe
+    Distribution.Compat.Environment
+    Distribution.Compat.Exception
+    Distribution.Compat.Internal.TempFile
+    Distribution.Compat.ReadP
+    Distribution.Compat.Semigroup
+    Distribution.Compiler
+    Distribution.InstalledPackageInfo
+    Distribution.License
+    Distribution.Make
+    Distribution.ModuleName
+    Distribution.Package
+    Distribution.PackageDescription
+    Distribution.PackageDescription.Check
+    Distribution.PackageDescription.Configuration
+    Distribution.PackageDescription.Parse
+    Distribution.PackageDescription.PrettyPrint
+    Distribution.PackageDescription.Utils
+    Distribution.ParseUtils
+    Distribution.ReadE
+    Distribution.Simple
+    Distribution.Simple.Bench
+    Distribution.Simple.Build
+    Distribution.Simple.Build.Macros
+    Distribution.Simple.Build.PathsModule
+    Distribution.Simple.BuildPaths
+    Distribution.Simple.BuildTarget
+    Distribution.Simple.CCompiler
+    Distribution.Simple.Command
+    Distribution.Simple.Compiler
+    Distribution.Simple.Configure
+    Distribution.Simple.GHC
+    Distribution.Simple.GHCJS
+    Distribution.Simple.Haddock
+    Distribution.Simple.HaskellSuite
+    Distribution.Simple.Hpc
+    Distribution.Simple.Install
+    Distribution.Simple.InstallDirs
+    Distribution.Simple.JHC
+    Distribution.Simple.LHC
+    Distribution.Simple.LocalBuildInfo
+    Distribution.Simple.PackageIndex
+    Distribution.Simple.PreProcess
+    Distribution.Simple.PreProcess.Unlit
+    Distribution.Simple.Program
+    Distribution.Simple.Program.Ar
+    Distribution.Simple.Program.Builtin
+    Distribution.Simple.Program.Db
+    Distribution.Simple.Program.Find
+    Distribution.Simple.Program.GHC
+    Distribution.Simple.Program.HcPkg
+    Distribution.Simple.Program.Hpc
+    Distribution.Simple.Program.Internal
+    Distribution.Simple.Program.Ld
+    Distribution.Simple.Program.Run
+    Distribution.Simple.Program.Script
+    Distribution.Simple.Program.Strip
+    Distribution.Simple.Program.Types
+    Distribution.Simple.Register
+    Distribution.Simple.Setup
+    Distribution.Simple.SrcDist
+    Distribution.Simple.Test
+    Distribution.Simple.Test.ExeV10
+    Distribution.Simple.Test.LibV09
+    Distribution.Simple.Test.Log
+    Distribution.Simple.UHC
+    Distribution.Simple.UserHooks
+    Distribution.Simple.Utils
+    Distribution.System
+    Distribution.TestSuite
+    Distribution.Text
+    Distribution.Utils.NubList
+    Distribution.Verbosity
+    Distribution.Version
+    Language.Haskell.Extension
+    Distribution.Compat.Binary
+
+  other-modules:
+    Distribution.Compat.CopyFile
+    Distribution.Compat.GetShortPathName
+    Distribution.Compat.MonadFail
+    Distribution.GetOpt
+    Distribution.Lex
+    Distribution.Simple.GHC.Internal
+    Distribution.Simple.GHC.IPI642
+    Distribution.Simple.GHC.IPIConvert
+    Distribution.Simple.GHC.ImplInfo
+    Paths_Cabal
+
+  if flag(bundled-binary-generic)
+    other-modules:
+      Distribution.Compat.Binary.Class
+      Distribution.Compat.Binary.Generic
+
+  default-language: Haskell98
+
+-- Small, fast running tests.
+test-suite unit-tests
+  type: exitcode-stdio-1.0
+  hs-source-dirs: tests
+  other-modules:
+    Test.Laws
+    Test.QuickCheck.Utils
+    UnitTests.Distribution.Compat.CreatePipe
+    UnitTests.Distribution.Compat.ReadP
+    UnitTests.Distribution.Simple.Program.Internal
+    UnitTests.Distribution.Simple.Utils
+    UnitTests.Distribution.System
+    UnitTests.Distribution.Utils.NubList
+    UnitTests.Distribution.Version
+  main-is: UnitTests.hs
+  build-depends:
+    base,
+    directory,
+    tasty,
+    tasty-hunit,
+    tasty-quickcheck,
+    pretty,
+    QuickCheck >= 2.7 && < 2.10,
+    Cabal
+  ghc-options: -Wall
+  default-language: Haskell98
+
+-- Large, system tests that build packages.
+test-suite package-tests
+  type: exitcode-stdio-1.0
+  main-is: PackageTests.hs
+  other-modules:
+    PackageTests.BenchmarkStanza.Check
+    PackageTests.TestStanza.Check
+    PackageTests.DeterministicAr.Check
+    PackageTests.TestSuiteTests.ExeV10.Check
+    PackageTests.PackageTester
+  hs-source-dirs: tests
+  build-depends:
+    base,
+    containers,
+    tagged,
+    tasty,
+    tasty-hunit,
+    transformers,
+    Cabal,
+    process,
+    directory,
+    filepath,
+    bytestring,
+    regex-posix,
+    old-time
+  if !os(windows)
+    build-depends: unix, exceptions
+  ghc-options: -Wall -rtsopts
+  default-extensions: CPP
+  default-language: Haskell98
diff --git a/additional-cabals/cabal-install-1.24.0.1.cabal b/additional-cabals/cabal-install-1.24.0.1.cabal
new file mode 100644
index 0000000..639d8ed
--- /dev/null
+++ b/additional-cabals/cabal-install-1.24.0.1.cabal
@@ -0,0 +1,418 @@
+Name:               cabal-install
+Version:            1.24.0.1
+Synopsis:           The command-line interface for Cabal and Hackage.
+Description:
+    The \'cabal\' command-line program simplifies the process of managing
+    Haskell software by automating the fetching, configuration, compilation
+    and installation of Haskell libraries and programs.
+homepage:           http://www.haskell.org/cabal/
+bug-reports:        https://github.com/haskell/cabal/issues
+License:            BSD3
+License-File:       LICENSE
+Author:             Lemmih <lemmih at gmail.com>
+                    Paolo Martini <paolo at nemail.it>
+                    Bjorn Bringert <bjorn at bringert.net>
+                    Isaac Potoczny-Jones <ijones at syntaxpolice.org>
+                    Duncan Coutts <duncan at community.haskell.org>
+Maintainer:         cabal-devel at haskell.org
+Copyright:          2005 Lemmih <lemmih at gmail.com>
+                    2006 Paolo Martini <paolo at nemail.it>
+                    2007 Bjorn Bringert <bjorn at bringert.net>
+                    2007 Isaac Potoczny-Jones <ijones at syntaxpolice.org>
+                    2007-2012 Duncan Coutts <duncan at community.haskell.org>
+Category:           Distribution
+Build-type:         Custom
+Cabal-Version:      >= 1.10
+Extra-Source-Files:
+  README.md bash-completion/cabal bootstrap.sh changelog
+  tests/README.md
+
+  -- Generated with '../Cabal/misc/gen-extra-source-files.sh'
+  -- Do NOT edit this section manually; instead, run the script.
+  -- BEGIN gen-extra-source-files
+  tests/IntegrationTests/custom-setup/common.sh
+  tests/IntegrationTests/custom-setup/should_run/Cabal-99998/Cabal.cabal
+  tests/IntegrationTests/custom-setup/should_run/Cabal-99998/CabalMessage.hs
+  tests/IntegrationTests/custom-setup/should_run/Cabal-99999/Cabal.cabal
+  tests/IntegrationTests/custom-setup/should_run/Cabal-99999/CabalMessage.hs
+  tests/IntegrationTests/custom-setup/should_run/custom-setup-without-cabal-defaultMain/Setup.hs
+  tests/IntegrationTests/custom-setup/should_run/custom-setup-without-cabal-defaultMain/custom-setup-without-cabal-defaultMain.cabal
+  tests/IntegrationTests/custom-setup/should_run/custom-setup-without-cabal/Setup.hs
+  tests/IntegrationTests/custom-setup/should_run/custom-setup-without-cabal/custom-setup-without-cabal.cabal
+  tests/IntegrationTests/custom-setup/should_run/custom-setup/Setup.hs
+  tests/IntegrationTests/custom-setup/should_run/custom-setup/custom-setup.cabal
+  tests/IntegrationTests/custom-setup/should_run/custom_setup_without_Cabal_doesnt_allow_Cabal_import.sh
+  tests/IntegrationTests/custom-setup/should_run/custom_setup_without_Cabal_doesnt_require_Cabal.sh
+  tests/IntegrationTests/custom-setup/should_run/installs_Cabal_as_setup_dep.sh
+  tests/IntegrationTests/custom/common.sh
+  tests/IntegrationTests/custom/should_run/plain.err
+  tests/IntegrationTests/custom/should_run/plain.sh
+  tests/IntegrationTests/custom/should_run/plain/A.hs
+  tests/IntegrationTests/custom/should_run/plain/Setup.hs
+  tests/IntegrationTests/custom/should_run/plain/plain.cabal
+  tests/IntegrationTests/exec/common.sh
+  tests/IntegrationTests/exec/should_fail/exit_with_failure_without_args.err
+  tests/IntegrationTests/exec/should_fail/exit_with_failure_without_args.sh
+  tests/IntegrationTests/exec/should_run/Foo.hs
+  tests/IntegrationTests/exec/should_run/My.hs
+  tests/IntegrationTests/exec/should_run/adds_sandbox_bin_directory_to_path.out
+  tests/IntegrationTests/exec/should_run/adds_sandbox_bin_directory_to_path.sh
+  tests/IntegrationTests/exec/should_run/auto_configures_on_exec.out
+  tests/IntegrationTests/exec/should_run/auto_configures_on_exec.sh
+  tests/IntegrationTests/exec/should_run/can_run_executables_installed_in_sandbox.out
+  tests/IntegrationTests/exec/should_run/can_run_executables_installed_in_sandbox.sh
+  tests/IntegrationTests/exec/should_run/configures_cabal_to_use_sandbox.sh
+  tests/IntegrationTests/exec/should_run/configures_ghc_to_use_sandbox.sh
+  tests/IntegrationTests/exec/should_run/my.cabal
+  tests/IntegrationTests/exec/should_run/runs_given_command.out
+  tests/IntegrationTests/exec/should_run/runs_given_command.sh
+  tests/IntegrationTests/freeze/common.sh
+  tests/IntegrationTests/freeze/should_run/disable_benchmarks_freezes_bench_deps.sh
+  tests/IntegrationTests/freeze/should_run/disable_tests_freezes_test_deps.sh
+  tests/IntegrationTests/freeze/should_run/does_not_freeze_nondeps.sh
+  tests/IntegrationTests/freeze/should_run/does_not_freeze_self.sh
+  tests/IntegrationTests/freeze/should_run/dry_run_does_not_create_config.sh
+  tests/IntegrationTests/freeze/should_run/enable_benchmarks_freezes_bench_deps.sh
+  tests/IntegrationTests/freeze/should_run/enable_tests_freezes_test_deps.sh
+  tests/IntegrationTests/freeze/should_run/freezes_direct_dependencies.sh
+  tests/IntegrationTests/freeze/should_run/freezes_transitive_dependencies.sh
+  tests/IntegrationTests/freeze/should_run/my.cabal
+  tests/IntegrationTests/freeze/should_run/runs_without_error.sh
+  tests/IntegrationTests/manpage/common.sh
+  tests/IntegrationTests/manpage/should_run/outputs_manpage.sh
+  tests/IntegrationTests/multiple-source/common.sh
+  tests/IntegrationTests/multiple-source/should_run/finds_second_source_of_multiple_source.sh
+  tests/IntegrationTests/multiple-source/should_run/p/Setup.hs
+  tests/IntegrationTests/multiple-source/should_run/p/p.cabal
+  tests/IntegrationTests/multiple-source/should_run/q/Setup.hs
+  tests/IntegrationTests/multiple-source/should_run/q/q.cabal
+  tests/IntegrationTests/new-build/monitor_cabal_files.sh
+  tests/IntegrationTests/new-build/monitor_cabal_files/p/P.hs
+  tests/IntegrationTests/new-build/monitor_cabal_files/p/Setup.hs
+  tests/IntegrationTests/new-build/monitor_cabal_files/p/p.cabal
+  tests/IntegrationTests/new-build/monitor_cabal_files/q/Main.hs
+  tests/IntegrationTests/new-build/monitor_cabal_files/q/Setup.hs
+  tests/IntegrationTests/new-build/monitor_cabal_files/q/q-broken.cabal.in
+  tests/IntegrationTests/new-build/monitor_cabal_files/q/q-fixed.cabal.in
+  tests/IntegrationTests/regression/common.sh
+  tests/IntegrationTests/regression/t3199.sh
+  tests/IntegrationTests/regression/t3199/Main.hs
+  tests/IntegrationTests/regression/t3199/Setup.hs
+  tests/IntegrationTests/regression/t3199/test-3199.cabal
+  tests/IntegrationTests/sandbox-sources/common.sh
+  tests/IntegrationTests/sandbox-sources/should_fail/fail_removing_source_thats_not_registered.err
+  tests/IntegrationTests/sandbox-sources/should_fail/fail_removing_source_thats_not_registered.sh
+  tests/IntegrationTests/sandbox-sources/should_fail/p/Setup.hs
+  tests/IntegrationTests/sandbox-sources/should_fail/p/p.cabal
+  tests/IntegrationTests/sandbox-sources/should_fail/q/Setup.hs
+  tests/IntegrationTests/sandbox-sources/should_fail/q/q.cabal
+  tests/IntegrationTests/sandbox-sources/should_run/p/Setup.hs
+  tests/IntegrationTests/sandbox-sources/should_run/p/p.cabal
+  tests/IntegrationTests/sandbox-sources/should_run/q/Setup.hs
+  tests/IntegrationTests/sandbox-sources/should_run/q/q.cabal
+  tests/IntegrationTests/sandbox-sources/should_run/remove_nonexistent_source.sh
+  tests/IntegrationTests/sandbox-sources/should_run/report_success_removing_source.out
+  tests/IntegrationTests/sandbox-sources/should_run/report_success_removing_source.sh
+  tests/IntegrationTests/user-config/common.sh
+  tests/IntegrationTests/user-config/should_fail/doesnt_overwrite_without_f.err
+  tests/IntegrationTests/user-config/should_fail/doesnt_overwrite_without_f.sh
+  tests/IntegrationTests/user-config/should_run/overwrites_with_f.out
+  tests/IntegrationTests/user-config/should_run/overwrites_with_f.sh
+  tests/IntegrationTests/user-config/should_run/runs_without_error.out
+  tests/IntegrationTests/user-config/should_run/runs_without_error.sh
+  tests/IntegrationTests/user-config/should_run/uses_CABAL_CONFIG.out
+  tests/IntegrationTests/user-config/should_run/uses_CABAL_CONFIG.sh
+  -- END gen-extra-source-files
+
+source-repository head
+  type:     git
+  location: https://github.com/haskell/cabal/
+  subdir:   cabal-install
+
+Flag old-bytestring
+  description:  Use bytestring < 0.10.2 and bytestring-builder
+  default: False
+
+Flag old-directory
+  description:  Use directory < 1.2 and old-time
+  default:      False
+
+Flag network-uri
+  description:  Get Network.URI from the network-uri package
+  default:      True
+
+executable cabal
+    main-is:        Main.hs
+    ghc-options:    -Wall -fwarn-tabs
+    if impl(ghc >= 8.0)
+        ghc-options: -Wcompat
+                     -Wnoncanonical-monad-instances
+                     -Wnoncanonical-monadfail-instances
+
+    other-modules:
+        Distribution.Client.BuildTarget
+        Distribution.Client.BuildReports.Anonymous
+        Distribution.Client.BuildReports.Storage
+        Distribution.Client.BuildReports.Types
+        Distribution.Client.BuildReports.Upload
+        Distribution.Client.Check
+        Distribution.Client.CmdBuild
+        Distribution.Client.CmdConfigure
+        Distribution.Client.CmdRepl
+        Distribution.Client.ComponentDeps
+        Distribution.Client.Config
+        Distribution.Client.Configure
+        Distribution.Client.Dependency
+        Distribution.Client.Dependency.TopDown
+        Distribution.Client.Dependency.TopDown.Constraints
+        Distribution.Client.Dependency.TopDown.Types
+        Distribution.Client.Dependency.Types
+        Distribution.Client.Dependency.Modular
+        Distribution.Client.Dependency.Modular.Assignment
+        Distribution.Client.Dependency.Modular.Builder
+        Distribution.Client.Dependency.Modular.Configured
+        Distribution.Client.Dependency.Modular.ConfiguredConversion
+        Distribution.Client.Dependency.Modular.ConflictSet
+        Distribution.Client.Dependency.Modular.Cycles
+        Distribution.Client.Dependency.Modular.Dependency
+        Distribution.Client.Dependency.Modular.Explore
+        Distribution.Client.Dependency.Modular.Flag
+        Distribution.Client.Dependency.Modular.Index
+        Distribution.Client.Dependency.Modular.IndexConversion
+        Distribution.Client.Dependency.Modular.Linking
+        Distribution.Client.Dependency.Modular.Log
+        Distribution.Client.Dependency.Modular.Message
+        Distribution.Client.Dependency.Modular.Package
+        Distribution.Client.Dependency.Modular.Preference
+        Distribution.Client.Dependency.Modular.PSQ
+        Distribution.Client.Dependency.Modular.Solver
+        Distribution.Client.Dependency.Modular.Tree
+        Distribution.Client.Dependency.Modular.Validate
+        Distribution.Client.Dependency.Modular.Var
+        Distribution.Client.Dependency.Modular.Version
+        Distribution.Client.DistDirLayout
+        Distribution.Client.Exec
+        Distribution.Client.Fetch
+        Distribution.Client.FetchUtils
+        Distribution.Client.FileMonitor
+        Distribution.Client.Freeze
+        Distribution.Client.GenBounds
+        Distribution.Client.Get
+        Distribution.Client.Glob
+        Distribution.Client.GlobalFlags
+        Distribution.Client.GZipUtils
+        Distribution.Client.Haddock
+        Distribution.Client.HttpUtils
+        Distribution.Client.IndexUtils
+        Distribution.Client.Init
+        Distribution.Client.Init.Heuristics
+        Distribution.Client.Init.Licenses
+        Distribution.Client.Init.Types
+        Distribution.Client.Install
+        Distribution.Client.InstallPlan
+        Distribution.Client.InstallSymlink
+        Distribution.Client.JobControl
+        Distribution.Client.List
+        Distribution.Client.Manpage
+        Distribution.Client.PackageHash
+        Distribution.Client.PackageIndex
+        Distribution.Client.PackageUtils
+        Distribution.Client.ParseUtils
+        Distribution.Client.PkgConfigDb
+        Distribution.Client.PlanIndex
+        Distribution.Client.ProjectBuilding
+        Distribution.Client.ProjectConfig
+        Distribution.Client.ProjectConfig.Types
+        Distribution.Client.ProjectConfig.Legacy
+        Distribution.Client.ProjectOrchestration
+        Distribution.Client.ProjectPlanning
+        Distribution.Client.ProjectPlanning.Types
+        Distribution.Client.ProjectPlanOutput
+        Distribution.Client.Run
+        Distribution.Client.RebuildMonad
+        Distribution.Client.Sandbox
+        Distribution.Client.Sandbox.Index
+        Distribution.Client.Sandbox.PackageEnvironment
+        Distribution.Client.Sandbox.Timestamp
+        Distribution.Client.Sandbox.Types
+        Distribution.Client.Security.HTTP
+        Distribution.Client.Setup
+        Distribution.Client.SetupWrapper
+        Distribution.Client.SrcDist
+        Distribution.Client.Tar
+        Distribution.Client.Targets
+        Distribution.Client.Types
+        Distribution.Client.Update
+        Distribution.Client.Upload
+        Distribution.Client.Utils
+        Distribution.Client.Utils.LabeledGraph
+        Distribution.Client.Utils.Json
+        Distribution.Client.World
+        Distribution.Client.Win32SelfUpgrade
+        Distribution.Client.Compat.ExecutablePath
+        Distribution.Client.Compat.FilePerms
+        Distribution.Client.Compat.Process
+        Distribution.Client.Compat.Semaphore
+        Distribution.Client.Compat.Time
+        Paths_cabal_install
+
+    -- NOTE: when updating build-depends, don't forget to update version regexps
+    -- in bootstrap.sh.
+    build-depends:
+        async      >= 2.0      && < 3,
+        array      >= 0.4      && < 0.6,
+        base       >= 4.5      && < 5,
+        base16-bytestring >= 0.1.1 && < 0.2,
+        binary     >= 0.5      && < 0.9,
+        bytestring >= 0.9      && < 1,
+        Cabal      >= 1.24     && < 1.25,
+        containers >= 0.4      && < 0.6,
+        cryptohash-sha256 >= 0.11 && < 0.12,
+        filepath   >= 1.3      && < 1.5,
+        hashable   >= 1.0      && < 2,
+        HTTP       >= 4000.1.5 && < 4000.4,
+        mtl        >= 2.0      && < 3,
+        pretty     >= 1.1      && < 1.2,
+        random     >= 1        && < 1.2,
+        stm        >= 2.0      && < 3,
+        tar        >= 0.5.0.3  && < 0.6,
+        time       >= 1.4      && < 1.7,
+        zlib       >= 0.5.3    && < 0.7,
+        hackage-security >= 0.5.2.2 && < 0.6
+
+    if flag(old-bytestring)
+      build-depends: bytestring <  0.10.2, bytestring-builder >= 0.10 && < 1
+    else
+      build-depends: bytestring >= 0.10.2
+
+    if flag(old-directory)
+      build-depends: directory >= 1.1 && < 1.2, old-time >= 1 && < 1.2,
+                     process   >= 1.0.1.1  && < 1.1.0.2
+    else
+      build-depends: directory >= 1.2 && < 1.3,
+                     process   >= 1.1.0.2  && < 1.5
+
+    -- NOTE: you MUST include the network dependency even when network-uri
+    -- is pulled in, otherwise the constraint solver doesn't have enough
+    -- information
+    if flag(network-uri)
+      build-depends: network-uri >= 2.6 && < 2.7, network >= 2.6 && < 2.7
+    else
+      build-depends: network     >= 2.4 && < 2.6
+
+    -- Needed for GHC.Generics before GHC 7.6
+    if impl(ghc < 7.6)
+      build-depends: ghc-prim >= 0.2 && < 0.3
+
+    if os(windows)
+      build-depends: Win32 >= 2 && < 3
+    else
+      build-depends: unix >= 2.5 && < 2.8
+
+    if arch(arm) && impl(ghc < 7.6)
+       -- older ghc on arm does not support -threaded
+       cc-options:  -DCABAL_NO_THREADED
+    else
+       ghc-options: -threaded
+
+    c-sources: cbits/getnumcores.c
+    default-language: Haskell2010
+
+-- Small, fast running tests.
+Test-Suite unit-tests
+  type: exitcode-stdio-1.0
+  main-is: UnitTests.hs
+  hs-source-dirs: tests, .
+  ghc-options: -Wall -fwarn-tabs
+  other-modules:
+    UnitTests.Distribution.Client.ArbitraryInstances
+    UnitTests.Distribution.Client.Targets
+    UnitTests.Distribution.Client.Compat.Time
+    UnitTests.Distribution.Client.Dependency.Modular.PSQ
+    UnitTests.Distribution.Client.Dependency.Modular.Solver
+    UnitTests.Distribution.Client.Dependency.Modular.DSL
+    UnitTests.Distribution.Client.FileMonitor
+    UnitTests.Distribution.Client.Glob
+    UnitTests.Distribution.Client.GZipUtils
+    UnitTests.Distribution.Client.Sandbox
+    UnitTests.Distribution.Client.Sandbox.Timestamp
+    UnitTests.Distribution.Client.Tar
+    UnitTests.Distribution.Client.UserConfig
+    UnitTests.Distribution.Client.ProjectConfig
+    UnitTests.Options
+  build-depends:
+        base,
+        array,
+        bytestring,
+        Cabal,
+        containers,
+        mtl,
+        pretty,
+        process,
+        directory,
+        filepath,
+        hashable,
+        stm,
+        tar,
+        time,
+        HTTP,
+        zlib,
+        binary,
+        random,
+        hackage-security,
+        tasty,
+        tasty-hunit,
+        tasty-quickcheck,
+        tagged,
+        QuickCheck >= 2.8.2
+
+  if flag(old-directory)
+    build-depends: old-time
+
+  if flag(network-uri)
+    build-depends: network-uri >= 2.6, network >= 2.6
+  else
+    build-depends: network-uri < 2.6, network < 2.6
+
+  if impl(ghc < 7.6)
+    build-depends: ghc-prim >= 0.2 && < 0.3
+
+  if os(windows)
+    build-depends: Win32
+  else
+    build-depends: unix
+
+  if arch(arm)
+    cc-options:  -DCABAL_NO_THREADED
+  else
+    ghc-options: -threaded
+  default-language: Haskell2010
+
+test-suite integration-tests
+  type: exitcode-stdio-1.0
+  hs-source-dirs: tests
+  main-is: IntegrationTests.hs
+  build-depends:
+    Cabal,
+    async,
+    base,
+    bytestring,
+    directory,
+    filepath,
+    process,
+    regex-posix,
+    tasty,
+    tasty-hunit
+
+  if os(windows)
+    build-depends: Win32 >= 2 && < 3
+  else
+    build-depends: unix >= 2.5 && < 2.8
+
+  if arch(arm)
+    cc-options:  -DCABAL_NO_THREADED
+  else
+    ghc-options: -threaded
+
+  ghc-options: -Wall -fwarn-tabs -fno-ignore-asserts
+  default-language: Haskell2010
diff --git a/packages.txt b/packages.txt
index dd79d58..f098f73 100644
--- a/packages.txt
+++ b/packages.txt
@@ -73,11 +73,11 @@ bytestring-progress 1.0.7
 bytestring-show 0.3.5.6
 bzlib 0.5.0.5
 c2hs 0.28.1 binary notest
-Cabal 1.24.2.0 ghcpkg notest ahead
+Cabal 1.24.1.0 ghcpkg notest
 cabal-debian 4.35.6 binary -f-local-debian key
 cabal-file-th 0.2.3
 cabal-helper 0.7.2.0
-cabal-install 1.24.0.2 binary ahead
+cabal-install 1.24.0.1 binary
 cairo 0.13.3.1
 carettah 0.4.2 binary
 case-insensitive 1.2.0.7
diff --git a/patches/cabal-install/1.24.0.1/series b/patches/cabal-install/1.24.0.1/series
new file mode 100644
index 0000000..087bcfb
--- /dev/null
+++ b/patches/cabal-install/1.24.0.1/series
@@ -0,0 +1 @@
+use-cryptohash
diff --git a/patches/cabal-install/1.24.0.1/use-cryptohash b/patches/cabal-install/1.24.0.1/use-cryptohash
new file mode 100644
index 0000000..54da515
--- /dev/null
+++ b/patches/cabal-install/1.24.0.1/use-cryptohash
@@ -0,0 +1,13 @@
+Index: b/cabal-install.cabal
+===================================================================
+--- a/cabal-install.cabal
++++ b/cabal-install.cabal
+@@ -267,7 +267,7 @@ executable cabal
+         bytestring >= 0.9      && < 1,
+         Cabal      >= 1.24     && < 1.25,
+         containers >= 0.4      && < 0.6,
+-        cryptohash-sha256 >= 0.11 && < 0.12,
++        cryptohash,
+         filepath   >= 1.3      && < 1.5,
+         hashable   >= 1.0      && < 2,
+         HTTP       >= 4000.1.5 && < 4000.4,

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-haskell/package-plan.git



More information about the Pkg-haskell-commits mailing list