Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Glasgow Haskell Compiler
Packages
Cabal
Commits
f8aa4db4
Commit
f8aa4db4
authored
Oct 04, 2016
by
Ben Gamari
🐢
Browse files
PackageEnvironment: Sort constraints in produced freeze file
This makes freeze files a bit more version-control-friendly.
parent
b858bed7
Changes
1
Hide whitespace changes
Inline
Side-by-side
cabal-install/Distribution/Client/Sandbox/PackageEnvironment.hs
View file @
f8aa4db4
...
...
@@ -40,7 +40,8 @@ import Distribution.Client.ParseUtils ( parseFields, ppFields, ppSection )
import
Distribution.Client.Setup
(
GlobalFlags
(
..
),
ConfigExFlags
(
..
)
,
InstallFlags
(
..
)
,
defaultSandboxLocation
)
import
Distribution.Utils.NubList
(
toNubList
)
import
Distribution.Client.Targets
(
userConstraintPackageName
)
import
Distribution.Utils.NubList
(
toNubList
)
import
Distribution.Simple.Compiler
(
Compiler
,
PackageDB
(
..
)
,
compilerFlavor
,
showCompilerIdWithAbi
)
import
Distribution.Simple.InstallDirs
(
InstallDirs
(
..
),
PathTemplate
...
...
@@ -60,8 +61,9 @@ import Distribution.ParseUtils ( FieldDescr(..), ParseResult(..)
import
Distribution.System
(
Platform
)
import
Distribution.Verbosity
(
Verbosity
,
normal
)
import
Control.Monad
(
foldM
,
liftM2
,
when
,
unless
)
import
Data.List
(
partition
)
import
Data.List
(
partition
,
sortBy
)
import
Data.Maybe
(
isJust
)
import
Data.Ord
(
comparing
)
import
Distribution.Compat.Exception
(
catchIO
)
import
Distribution.Compat.Semigroup
import
System.Directory
(
doesDirectoryExist
,
doesFileExist
...
...
@@ -399,7 +401,7 @@ pkgEnvFieldDescrs src = [
,
commaNewLineListField
"constraints"
(
Text
.
disp
.
fst
)
((
\
pc
->
(
pc
,
src
))
`
fmap
`
Text
.
parse
)
(
configExConstraints
.
savedConfigureExFlags
.
pkgEnvSavedConfig
)
(
sortConstraints
.
configExConstraints
.
savedConfigureExFlags
.
pkgEnvSavedConfig
)
(
\
v
pkgEnv
->
updateConfigureExFlags
pkgEnv
(
\
flags
->
flags
{
configExConstraints
=
v
}))
...
...
@@ -434,6 +436,8 @@ pkgEnvFieldDescrs src = [
}
}
sortConstraints
=
sortBy
(
comparing
$
userConstraintPackageName
.
fst
)
-- | Read the package environment file.
readPackageEnvironmentFile
::
ConstraintSource
->
PackageEnvironment
->
FilePath
->
IO
(
Maybe
(
ParseResult
PackageEnvironment
))
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment