[Git][haskell-team/package-plan][master] update gtk-strut
Clint Adams
gitlab at salsa.debian.org
Sun Sep 1 00:15:32 BST 2019
Clint Adams pushed to branch master at Debian Haskell Group / package-plan
Commits:
aad08176 by Clint Adams at 2019-08-31T23:14:55Z
update gtk-strut
- - - - -
5 changed files:
- + additional-cabals/cabal-install-2.4.0.0.cabal
- packages.txt
- + patches/cabal-install/2.4.0.0/newer-deps
- − patches/cabal-install/2.4.0.0/remove-zip-archive
- patches/cabal-install/2.4.0.0/series
Changes:
=====================================
additional-cabals/cabal-install-2.4.0.0.cabal
=====================================
@@ -0,0 +1,351 @@
+Cabal-Version: >= 1.10
+-- NOTE: This file is autogenerated from 'cabal-install.cabal.pp'.
+-- DO NOT EDIT MANUALLY.
+-- To update this file, edit 'cabal-install.cabal.pp' and run
+-- 'make cabal-install-prod' in the project's root folder.
+Name: cabal-install
+Version: 2.4.0.0
+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: Cabal Development Team (see AUTHORS file)
+Maintainer: Cabal Development Team <cabal-devel at haskell.org>
+Copyright: 2003-2018, Cabal Development Team
+Category: Distribution
+Build-type: Custom
+Extra-Source-Files:
+ README.md bash-completion/cabal bootstrap.sh changelog
+ tests/README.md
+
+ -- Generated with 'make gen-extra-source-files'
+ -- Do NOT edit this section manually; instead, run the script.
+ -- BEGIN gen-extra-source-files
+ tests/IntegrationTests2/build/keep-going/cabal.project
+ tests/IntegrationTests2/build/keep-going/p/P.hs
+ tests/IntegrationTests2/build/keep-going/p/p.cabal
+ tests/IntegrationTests2/build/keep-going/q/Q.hs
+ tests/IntegrationTests2/build/keep-going/q/q.cabal
+ tests/IntegrationTests2/build/local-tarball/cabal.project
+ tests/IntegrationTests2/build/local-tarball/q/Q.hs
+ tests/IntegrationTests2/build/local-tarball/q/q.cabal
+ tests/IntegrationTests2/build/setup-custom1/A.hs
+ tests/IntegrationTests2/build/setup-custom1/Setup.hs
+ tests/IntegrationTests2/build/setup-custom1/a.cabal
+ tests/IntegrationTests2/build/setup-custom2/A.hs
+ tests/IntegrationTests2/build/setup-custom2/Setup.hs
+ tests/IntegrationTests2/build/setup-custom2/a.cabal
+ tests/IntegrationTests2/build/setup-simple/A.hs
+ tests/IntegrationTests2/build/setup-simple/Setup.hs
+ tests/IntegrationTests2/build/setup-simple/a.cabal
+ tests/IntegrationTests2/exception/bad-config/cabal.project
+ tests/IntegrationTests2/exception/build/Main.hs
+ tests/IntegrationTests2/exception/build/a.cabal
+ tests/IntegrationTests2/exception/configure/a.cabal
+ tests/IntegrationTests2/exception/no-pkg/empty.in
+ tests/IntegrationTests2/exception/no-pkg2/cabal.project
+ tests/IntegrationTests2/regression/3324/cabal.project
+ tests/IntegrationTests2/regression/3324/p/P.hs
+ tests/IntegrationTests2/regression/3324/p/p.cabal
+ tests/IntegrationTests2/regression/3324/q/Q.hs
+ tests/IntegrationTests2/regression/3324/q/q.cabal
+ tests/IntegrationTests2/targets/all-disabled/cabal.project
+ tests/IntegrationTests2/targets/all-disabled/p.cabal
+ tests/IntegrationTests2/targets/benchmarks-disabled/cabal.project
+ tests/IntegrationTests2/targets/benchmarks-disabled/p.cabal
+ tests/IntegrationTests2/targets/benchmarks-disabled/q/q.cabal
+ tests/IntegrationTests2/targets/complex/cabal.project
+ tests/IntegrationTests2/targets/complex/q/Q.hs
+ tests/IntegrationTests2/targets/complex/q/q.cabal
+ tests/IntegrationTests2/targets/empty-pkg/cabal.project
+ tests/IntegrationTests2/targets/empty-pkg/p.cabal
+ tests/IntegrationTests2/targets/empty/cabal.project
+ tests/IntegrationTests2/targets/empty/foo.hs
+ tests/IntegrationTests2/targets/exes-disabled/cabal.project
+ tests/IntegrationTests2/targets/exes-disabled/p/p.cabal
+ tests/IntegrationTests2/targets/exes-disabled/q/q.cabal
+ tests/IntegrationTests2/targets/lib-only/p.cabal
+ tests/IntegrationTests2/targets/libs-disabled/cabal.project
+ tests/IntegrationTests2/targets/libs-disabled/p/p.cabal
+ tests/IntegrationTests2/targets/libs-disabled/q/q.cabal
+ tests/IntegrationTests2/targets/multiple-exes/cabal.project
+ tests/IntegrationTests2/targets/multiple-exes/p.cabal
+ tests/IntegrationTests2/targets/multiple-libs/cabal.project
+ tests/IntegrationTests2/targets/multiple-libs/p/p.cabal
+ tests/IntegrationTests2/targets/multiple-libs/q/q.cabal
+ tests/IntegrationTests2/targets/multiple-tests/cabal.project
+ tests/IntegrationTests2/targets/multiple-tests/p.cabal
+ tests/IntegrationTests2/targets/simple/P.hs
+ tests/IntegrationTests2/targets/simple/cabal.project
+ tests/IntegrationTests2/targets/simple/p.cabal
+ tests/IntegrationTests2/targets/simple/q/QQ.hs
+ tests/IntegrationTests2/targets/simple/q/q.cabal
+ tests/IntegrationTests2/targets/test-only/p.cabal
+ tests/IntegrationTests2/targets/tests-disabled/cabal.project
+ tests/IntegrationTests2/targets/tests-disabled/p.cabal
+ tests/IntegrationTests2/targets/tests-disabled/q/q.cabal
+ tests/IntegrationTests2/targets/variety/cabal.project
+ tests/IntegrationTests2/targets/variety/p.cabal
+ -- END gen-extra-source-files
+
+ -- Additional manual extra-source-files:
+ tests/IntegrationTests2/build/local-tarball/p-0.1.tar.gz
+
+
+source-repository head
+ type: git
+ location: https://github.com/haskell/cabal/
+ subdir: cabal-install
+
+Flag native-dns
+ description: Enable use of the [resolv](https://hackage.haskell.org/package/resolv) & [windns](https://hackage.haskell.org/package/windns) packages for performing DNS lookups
+ default: True
+ manual: True
+
+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
+
+custom-setup
+ setup-depends:
+ Cabal >= 2.2,
+ base,
+ process >= 1.1.0.1 && < 1.7,
+ filepath >= 1.3 && < 1.5
+
+executable cabal
+ main-is: Main.hs
+ hs-source-dirs: main
+ default-language: Haskell2010
+ ghc-options: -Wall -fwarn-tabs
+ if impl(ghc >= 8.0)
+ ghc-options: -Wcompat
+ -Wnoncanonical-monad-instances
+ -Wnoncanonical-monadfail-instances
+
+ ghc-options: -rtsopts -threaded
+
+ -- On AIX, some legacy BSD operations such as flock(2) are provided by libbsd.a
+ if os(aix)
+ extra-libraries: bsd
+ hs-source-dirs: .
+ other-modules:
+ Distribution.Client.BuildReports.Anonymous
+ Distribution.Client.BuildReports.Storage
+ Distribution.Client.BuildReports.Types
+ Distribution.Client.BuildReports.Upload
+ Distribution.Client.Check
+ Distribution.Client.CmdBench
+ Distribution.Client.CmdBuild
+ Distribution.Client.CmdClean
+ Distribution.Client.CmdConfigure
+ Distribution.Client.CmdUpdate
+ Distribution.Client.CmdErrorMessages
+ Distribution.Client.CmdExec
+ Distribution.Client.CmdFreeze
+ Distribution.Client.CmdHaddock
+ Distribution.Client.CmdInstall
+ Distribution.Client.CmdRepl
+ Distribution.Client.CmdRun
+ Distribution.Client.CmdTest
+ Distribution.Client.CmdLegacy
+ Distribution.Client.CmdSdist
+ Distribution.Client.Compat.Directory
+ Distribution.Client.Compat.ExecutablePath
+ Distribution.Client.Compat.FileLock
+ Distribution.Client.Compat.FilePerms
+ Distribution.Client.Compat.Prelude
+ Distribution.Client.Compat.Process
+ Distribution.Client.Compat.Semaphore
+ Distribution.Client.Config
+ Distribution.Client.Configure
+ Distribution.Client.Dependency
+ Distribution.Client.Dependency.Types
+ Distribution.Client.DistDirLayout
+ Distribution.Client.Exec
+ Distribution.Client.Fetch
+ Distribution.Client.FetchUtils
+ Distribution.Client.FileMonitor
+ Distribution.Client.Freeze
+ Distribution.Client.GZipUtils
+ Distribution.Client.GenBounds
+ Distribution.Client.Get
+ Distribution.Client.Glob
+ Distribution.Client.GlobalFlags
+ Distribution.Client.Haddock
+ Distribution.Client.HttpUtils
+ Distribution.Client.IndexUtils
+ Distribution.Client.IndexUtils.Timestamp
+ 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.Nix
+ Distribution.Client.Outdated
+ Distribution.Client.PackageHash
+ Distribution.Client.PackageUtils
+ Distribution.Client.ParseUtils
+ Distribution.Client.ProjectBuilding
+ Distribution.Client.ProjectBuilding.Types
+ Distribution.Client.ProjectConfig
+ Distribution.Client.ProjectConfig.Legacy
+ Distribution.Client.ProjectConfig.Types
+ Distribution.Client.ProjectOrchestration
+ Distribution.Client.ProjectPlanOutput
+ Distribution.Client.ProjectPlanning
+ Distribution.Client.ProjectPlanning.Types
+ Distribution.Client.RebuildMonad
+ Distribution.Client.Reconfigure
+ Distribution.Client.Run
+ Distribution.Client.Sandbox
+ Distribution.Client.Sandbox.Index
+ Distribution.Client.Sandbox.PackageEnvironment
+ Distribution.Client.Sandbox.Timestamp
+ Distribution.Client.Sandbox.Types
+ Distribution.Client.SavedFlags
+ Distribution.Client.Security.DNS
+ Distribution.Client.Security.HTTP
+ Distribution.Client.Setup
+ Distribution.Client.SetupWrapper
+ Distribution.Client.SolverInstallPlan
+ Distribution.Client.SourceFiles
+ Distribution.Client.SourceRepoParse
+ Distribution.Client.SrcDist
+ Distribution.Client.Store
+ Distribution.Client.Tar
+ Distribution.Client.TargetSelector
+ Distribution.Client.Targets
+ Distribution.Client.Types
+ Distribution.Client.Update
+ Distribution.Client.Upload
+ Distribution.Client.Utils
+ Distribution.Client.Utils.Assertion
+ Distribution.Client.Utils.Json
+ Distribution.Client.VCS
+ Distribution.Client.Win32SelfUpgrade
+ Distribution.Client.World
+ 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.PSQ
+ Distribution.Solver.Modular.Package
+ Distribution.Solver.Modular.Preference
+ 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.InstSolverPackage
+ Distribution.Solver.Types.InstalledPreference
+ 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
+ Paths_cabal_install
+
+ build-depends:
+ async >= 2.0 && < 3,
+ array >= 0.4 && < 0.6,
+ base >= 4.6 && < 5,
+ base16-bytestring >= 0.1.1 && < 0.2,
+ binary >= 0.7 && < 0.9,
+ bytestring >= 0.10.2 && < 1,
+ Cabal == 2.4.*,
+ containers >= 0.5 && < 0.7,
+ cryptohash-sha256 >= 0.11 && < 0.12,
+ deepseq >= 1.3 && < 1.5,
+ directory >= 1.2.2.0 && < 1.4,
+ echo >= 0.1.3 && < 0.2,
+ edit-distance >= 0.2.2 && < 0.3,
+ filepath >= 1.3 && < 1.5,
+ hashable >= 1.0 && < 2,
+ HTTP >= 4000.1.5 && < 4000.4,
+ mtl >= 2.0 && < 3,
+ network-uri >= 2.6.0.2 && < 2.7,
+ network >= 2.6 && < 2.8,
+ pretty >= 1.1 && < 1.2,
+ process >= 1.1.0.2 && < 1.7,
+ random >= 1 && < 1.2,
+ stm >= 2.0 && < 3,
+ tar >= 0.5.0.3 && < 0.6,
+ time >= 1.4 && < 1.10,
+ zlib >= 0.5.3 && < 0.7,
+ hackage-security >= 0.5.2.2 && < 0.6,
+ text >= 1.2.3 && < 1.3,
+ zip-archive >= 0.3.2.5 && < 0.4,
+ parsec >= 3.1.13.0 && < 3.2
+
+ if flag(native-dns)
+ if os(windows)
+ build-depends: windns >= 0.1.0 && < 0.2
+ else
+ build-depends: resolv >= 0.1.1 && < 0.2
+
+ if os(windows)
+ build-depends: Win32 >= 2 && < 3
+ else
+ build-depends: unix >= 2.5 && < 2.9
+
+ if flag(debug-expensive-assertions)
+ cpp-options: -DDEBUG_EXPENSIVE_ASSERTIONS
+
+ if flag(debug-conflict-sets)
+ cpp-options: -DDEBUG_CONFLICT_SETS
+ build-depends: base >= 4.8
+
+ if flag(debug-tracetree)
+ cpp-options: -DDEBUG_TRACETREE
+ build-depends: tracetree >= 0.1 && < 0.2
=====================================
packages.txt
=====================================
@@ -356,7 +356,7 @@ gtk 0.15.2
gtk2hs-buildtools 0.13.5.0 binary
gtk3 0.15.1
gtk-sni-tray 0.1.6.0
-gtk-strut 0.1.2.1
+gtk-strut 0.1.3.0
gtk-traymanager 1.0.1
hackage-mirror 0.1.1.1 ignore # BROKEN: LTS 11: via aws
hackage-security 0.5.3.0
=====================================
patches/cabal-install/2.4.0.0/newer-deps
=====================================
@@ -0,0 +1,20 @@
+--- a/cabal-install.cabal
++++ b/cabal-install.cabal
+@@ -315,7 +315,7 @@
+ HTTP >= 4000.1.5 && < 4000.4,
+ mtl >= 2.0 && < 3,
+ network-uri >= 2.6.0.2 && < 2.7,
+- network >= 2.6 && < 2.8,
++ network >= 2.6 && < 2.9,
+ pretty >= 1.1 && < 1.2,
+ process >= 1.1.0.2 && < 1.7,
+ random >= 1 && < 1.2,
+@@ -325,7 +325,7 @@
+ zlib >= 0.5.3 && < 0.7,
+ hackage-security >= 0.5.2.2 && < 0.6,
+ text >= 1.2.3 && < 1.3,
+- zip-archive >= 0.3.2.5 && < 0.4,
++ zip-archive >= 0.3.2.5 && < 0.5,
+ parsec >= 3.1.13.0 && < 3.2
+
+ if flag(native-dns)
=====================================
patches/cabal-install/2.4.0.0/remove-zip-archive deleted
=====================================
@@ -1,200 +0,0 @@
-From 8217174d13c801d171d5f7e337f4bd77596cc530 Mon Sep 17 00:00:00 2001
-From: Emily Pillmore <emily at kadena.io>
-Date: Fri, 30 Nov 2018 23:06:05 -0500
-Subject: [PATCH] remove zip format code, zip-archive dependency, redundant +
- unused imports
-
-Index: b/Distribution/Client/CmdSdist.hs
-===================================================================
---- a/Distribution/Client/CmdSdist.hs
-+++ b/Distribution/Client/CmdSdist.hs
-@@ -58,20 +58,17 @@ import Distribution.Verbosity
-
- import qualified Codec.Archive.Tar as Tar
- import qualified Codec.Archive.Tar.Entry as Tar
--import qualified Codec.Archive.Zip as Zip
- import qualified Codec.Compression.GZip as GZip
- import Control.Exception
- ( throwIO )
- import Control.Monad
-- ( when, forM, forM_ )
-+ ( when, forM_ )
- import Control.Monad.Trans
- ( liftIO )
- import Control.Monad.State.Lazy
- ( StateT, modify, gets, evalStateT )
- import Control.Monad.Writer.Lazy
- ( WriterT, tell, execWriterT )
--import Data.Bits
-- ( shiftL )
- import qualified Data.ByteString.Char8 as BS
- import qualified Data.ByteString.Lazy.Char8 as BSL
- import Data.Either
-@@ -119,8 +116,7 @@ sdistCommand = CommandUI
- (choiceOpt
- [ (Flag TargzFormat, ([], ["targz"]),
- "Produce a '.tar.gz' format archive (default and required for uploading to hackage)")
-- , (Flag ZipFormat, ([], ["zip"]),
-- "Produce a '.zip' format archive")
-+ -- ...
- ]
- )
- , option ['o'] ["output-dir", "outputdir"]
-@@ -188,7 +184,6 @@ sdistAction SdistFlags{..} targetStrings
- ext = case format of
- SourceList _ -> "list"
- Archive TargzFormat -> "tar.gz"
-- Archive ZipFormat -> "zip"
-
- outputPath pkg = case mOutputPath' of
- Just path
-@@ -274,20 +269,7 @@ packageToSdist verbosity projectRootDir
- write . normalize . GZip.compress . Tar.write $ entries
- when (outputFile /= "-") $
- notice verbosity $ "Wrote tarball sdist to " ++ outputFile ++ "\n"
-- Archive ZipFormat -> do
-- let prefix = prettyShow (packageId pkg)
-- entries <- forM files $ \(perm, file) -> do
-- let perm' = case perm of
-- -- -rwxr-xr-x
-- Exec -> 0o010755 `shiftL` 16
-- -- -rw-r--r--
-- NoExec -> 0o010644 `shiftL` 16
-- contents <- BSL.readFile file
-- return $ (Zip.toEntry (prefix </> file) 0 contents) { Zip.eExternalFileAttributes = perm' }
-- let archive = foldr Zip.addEntryToArchive Zip.emptyArchive entries
-- write (Zip.fromArchive archive)
-- when (outputFile /= "-") $
-- notice verbosity $ "Wrote zip sdist to " ++ outputFile ++ "\n"
-+
- setCurrentDirectory oldPwd
-
- --
-Index: b/Distribution/Client/DistDirLayout.hs
-===================================================================
---- a/Distribution/Client/DistDirLayout.hs
-+++ b/Distribution/Client/DistDirLayout.hs
-@@ -230,8 +230,7 @@ defaultDistDirLayout projectRoot mdistDi
- where
- ext = case format of
- TargzFormat -> "tar.gz"
-- ZipFormat -> "zip"
--
-+
- distSdistDirectory = distDirectory </> "sdist"
-
- distTempDirectory = distDirectory </> "tmp"
-Index: b/Distribution/Client/Setup.hs
-===================================================================
---- a/Distribution/Client/Setup.hs
-+++ b/Distribution/Client/Setup.hs
-@@ -2298,7 +2298,7 @@ data SDistExFlags = SDistExFlags {
- }
- deriving (Show, Generic)
-
--data ArchiveFormat = TargzFormat | ZipFormat -- ...
-+data ArchiveFormat = TargzFormat -- ...
- deriving (Show, Eq)
-
- defaultSDistExFlags :: SDistExFlags
-@@ -2325,8 +2325,7 @@ sdistCommand = Cabal.sdistCommand {
- (choiceOpt
- [ (Flag TargzFormat, ([], ["targz"]),
- "Produce a '.tar.gz' format archive (default and required for uploading to hackage)")
-- , (Flag ZipFormat, ([], ["zip"]),
-- "Produce a '.zip' format archive")
-+ -- ...
- ])
- ]
-
-Index: b/Distribution/Client/SrcDist.hs
-===================================================================
---- a/Distribution/Client/SrcDist.hs
-+++ b/Distribution/Client/SrcDist.hs
-@@ -24,15 +24,13 @@ import Distribution.PackageDescription.P
- ( readGenericPackageDescription )
- import Distribution.Simple.Utils
- ( createDirectoryIfMissingVerbose, defaultPackageDesc
-- , warn, die', notice, withTempDirectory )
-+ , warn, notice, withTempDirectory )
- import Distribution.Client.Setup
- ( SDistFlags(..), SDistExFlags(..), ArchiveFormat(..) )
- import Distribution.Simple.Setup
- ( Flag(..), sdistCommand, flagToList, fromFlag, fromFlagOrDefault
- , defaultSDistFlags )
- import Distribution.Simple.BuildPaths ( srcPref)
--import Distribution.Simple.Program (requireProgram, simpleProgram, programPath)
--import Distribution.Simple.Program.Db (emptyProgramDb)
- import Distribution.Text ( display )
- import Distribution.Verbosity (Verbosity, normal, lessVerbose)
- import Distribution.Version (mkVersion, orLaterVersion, intersectVersionRanges)
-@@ -43,9 +41,7 @@ import Distribution.Compat.Exception
-
- import System.FilePath ((</>), (<.>))
- import Control.Monad (when, unless, liftM)
--import System.Directory (doesFileExist, removeFile, canonicalizePath, getTemporaryDirectory)
--import System.Process (runProcess, waitForProcess)
--import System.Exit (ExitCode(..))
-+import System.Directory (getTemporaryDirectory)
- import Control.Exception (IOException, evaluate)
-
- -- |Create a source distribution.
-@@ -103,7 +99,6 @@ sdist flags exflags = do
- format = fromFlag (sDistFormat exflags)
- createArchive = case format of
- TargzFormat -> createTarGzArchive
-- ZipFormat -> createZipArchive
-
- tarBallName :: PackageDescription -> String
- tarBallName = display . packageId
-@@ -117,38 +112,6 @@ createTarGzArchive verbosity pkg tmpDir
- where
- tarBallFilePath = targetPref </> tarBallName pkg <.> "tar.gz"
-
---- | Create a zip archive from a tree of source files.
--createZipArchive :: Verbosity -> PackageDescription -> FilePath -> FilePath
-- -> IO ()
--createZipArchive verbosity pkg tmpDir targetPref = do
-- let dir = tarBallName pkg
-- zipfile = targetPref </> dir <.> "zip"
-- (zipProg, _) <- requireProgram verbosity zipProgram emptyProgramDb
--
-- -- zip has an annoying habit of updating the target rather than creating
-- -- it from scratch. While that might sound like an optimisation, it doesn't
-- -- remove files already in the archive that are no longer present in the
-- -- uncompressed tree.
-- alreadyExists <- doesFileExist zipfile
-- when alreadyExists $ removeFile zipfile
--
-- -- We call zip with a different CWD, so have to make the path
-- -- absolute. Can't just use 'canonicalizePath zipfile' since this function
-- -- requires its argument to refer to an existing file.
-- zipfileAbs <- fmap (</> dir <.> "zip") . canonicalizePath $ targetPref
--
-- --TODO: use runProgramInvocation, but has to be able to set CWD
-- hnd <- runProcess (programPath zipProg) ["-q", "-r", zipfileAbs, dir]
-- (Just tmpDir)
-- Nothing Nothing Nothing Nothing
-- exitCode <- waitForProcess hnd
-- unless (exitCode == ExitSuccess) $
-- die' verbosity $ "Generating the zip file failed "
-- ++ "(zip returned exit code " ++ show exitCode ++ ")"
-- notice verbosity $ "Source zip archive created: " ++ zipfile
-- where
-- zipProgram = simpleProgram "zip"
--
- -- | List all source files of a given add-source dependency. Exits with error if
- -- something is wrong (e.g. there is no .cabal file in the given directory).
- allPackageSourceFiles :: Verbosity -> SetupScriptOptions -> FilePath
-Index: b/cabal-install.cabal
-===================================================================
---- a/cabal-install.cabal
-+++ b/cabal-install.cabal
-@@ -326,7 +326,6 @@ executable cabal
- zlib >= 0.5.3 && < 0.7,
- hackage-security >= 0.5.2.2 && < 0.6,
- text >= 1.2.3 && < 1.3,
-- zip-archive >= 0.3.2.5 && < 0.4,
- parsec >= 3.1.13.0 && < 3.2
-
- if flag(native-dns)
=====================================
patches/cabal-install/2.4.0.0/series
=====================================
@@ -1 +1 @@
-remove-zip-archive
+newer-deps
View it on GitLab: https://salsa.debian.org/haskell-team/package-plan/commit/aad08176a3c3ea882a40027eb9b7bbbed78c77ff
--
View it on GitLab: https://salsa.debian.org/haskell-team/package-plan/commit/aad08176a3c3ea882a40027eb9b7bbbed78c77ff
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-haskell-commits/attachments/20190831/4ee11244/attachment-0001.html>
More information about the Pkg-haskell-commits
mailing list