Merge remote-tracking branch 'origin/master' into pantry

snoyberg · snoyberg · commit 75345927cf77 · 2018-08-07T12:04:43.000+03:00
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -15,6 +15,22 @@ Major changes:
       must be specified in `extra-deps`.
     * The `extra-dep` key in `packages` is no longer supported; please
       move any such specifications to `extra-deps`.
+
+Behavior changes:
+
+Other enhancements:
+
+Bug fixes:
+
+
+## v1.9.0 (release candidate)
+
+Release notes:
+
+* We will be deleting the Ubuntu, Debian, CentOS, Fedora, and Arch package repos from `download.fpcomplete.com` soon.  These have been deprecated for over a year and have not received new releases, but were left in place for compatibility with older scripts.
+
+Major changes:
+
 * `GHCJS` support is being downgraded to 'experimental'. At time of writing the upcoming release is 1.8. A warning notifying the user of the experimental status of `GHCJS` will be incorporated into 1.8.
 
 Behavior changes:
@@ -96,6 +112,8 @@ Other enhancements:
 * It is possible to specify the Hackage base URL to upload packages to, instead
   of the default of `https://hackage.haskell.org/`, by using `hackage-base-url`
   configuration option.
+* When using Nix, if a specific minor version of GHC is not requested, the
+  latest minor version in the given major branch will be used automatically.
 
 Bug fixes:
 
diff --git a/package.yaml b/package.yaml
@@ -1,5 +1,5 @@
 name: stack
-version: '1.8.0'
+version: '1.10.0'
 synopsis: The Haskell Tool Stack
 description: ! 'Please see the README.md for usage information, and
   the wiki on Github for more details.  Also, note that
@@ -61,7 +61,7 @@ dependencies:
 - generic-deriving
 - hackage-security
 - hashable
-- hpack >= 0.29
+- hpack >= 0.29.6
 - hpc
 - http-client
 - http-client-tls
diff --git a/src/Stack/Config/Nix.hs b/src/Stack/Config/Nix.hs
@@ -53,23 +53,28 @@ nixOptsFromMonoid NixOptsMonoid{..} os = do
 
 nixCompiler :: WantedCompiler -> Either StringException T.Text
 nixCompiler compilerVersion =
-  let -- These are the latest minor versions for each respective major version available in nixpkgs
-      fixMinor "8.2" = "8.2.1"
-      fixMinor "8.0" = "8.0.2"
-      fixMinor "7.10" = "7.10.3"
-      fixMinor "7.8" = "7.8.4"
-      fixMinor "7.6" = "7.6.3"
-      fixMinor "7.4" = "7.4.2"
-      fixMinor "7.2" = "7.2.2"
-      fixMinor "6.12" = "6.12.3"
-      fixMinor "6.10" = "6.10.4"
-      fixMinor v = v
-      nixCompilerFromVersion v = T.append (T.pack "haskell.compiler.ghc")
-                                          (T.filter (/= '.')
-                                             (fixMinor (displayC v)))
-  in case compilerVersion of
-       WCGhc v -> Right $ nixCompilerFromVersion v
-       WCGhcjs{} -> Left $ stringException "Only GHC is supported by stack --nix"
+  case compilerVersion of
+    WCGhc version ->
+      case T.split (== '.') (displayC version) of
+        x : y : minor ->
+          Right $
+          case minor of
+            [] ->
+              -- The minor version is not specified. Select the latest minor
+              -- version in Nixpkgs corresponding to the requested major
+              -- version.
+              let major = T.concat [x, y] in
+              "(let compilers = builtins.filter \
+              \(name: builtins.match \
+              \\"ghc" <> major <> "[[:digit:]]*\" name != null) \
+              \(lib.attrNames haskell.compiler); in \
+              \if compilers == [] \
+              \then abort \"No compiler found for GHC "
+              <> displayC version <> "\"\
+              \else haskell.compiler.${builtins.head compilers})"
+            _ -> "haskell.compiler.ghc" <> T.concat (x : y : minor)
+        _ -> Left $ stringException "GHC major version not specified"
+    WCGhcjs{} -> Left $ stringException "Only GHC is supported by stack --nix"
 
 -- Exceptions thown specifically by Stack.Nix
 data StackNixException
diff --git a/src/Stack/Package.hs b/src/Stack/Package.hs
@@ -1,5 +1,4 @@
 {-# LANGUAGE NoImplicitPrelude #-}
-{-# LANGUAGE CPP #-}
 {-# LANGUAGE LambdaCase #-}
 {-# LANGUAGE TupleSections #-}
 {-# LANGUAGE ScopedTypeVariables #-}
diff --git a/src/Stack/PrettyPrint.hs b/src/Stack/PrettyPrint.hs
@@ -151,57 +151,59 @@ debugBracket msg f = do
   output $ "Finished in" <+> displayMilliseconds diff <> ":" <+> msg
   return x
 
+--   The following syles do not affect the colour of the background.
+
 -- | Style an 'AnsiDoc' as an error. Should be used sparingly, not to style
 --   entire long messages. For example, it's used to style the "Error:"
 --   label for an error message, not the entire message.
 styleError :: AnsiDoc -> AnsiDoc
-styleError = dullred . ondullblack
+styleError = dullred
 
 -- | Style an 'AnsiDoc' as a warning. Should be used sparingly, not to style
 --   entire long messages. For example, it's used to style the "Warning:"
 --   label for an error message, not the entire message.
 styleWarning :: AnsiDoc -> AnsiDoc
-styleWarning = yellow . ondullblack
+styleWarning = dullyellow
 
 -- | Style an 'AnsiDoc' in a way to emphasize that it is a particularly good
 --   thing.
 styleGood :: AnsiDoc -> AnsiDoc
-styleGood = green . ondullblack
+styleGood = green
 
 -- | Style an 'AnsiDoc' as a shell command, i.e. when suggesting something
 --   to the user that should be typed in directly as written.
 styleShell :: AnsiDoc -> AnsiDoc
-styleShell = magenta . ondullblack
+styleShell = magenta
 
 -- | Style an 'AnsiDoc' as a filename. See 'styleDir' for directories.
 styleFile :: AnsiDoc -> AnsiDoc
-styleFile = bold . white . ondullblack
+styleFile = dullcyan
 
 -- | Style an 'AsciDoc' as a URL.  For now using the same style as files.
 styleUrl :: AnsiDoc -> AnsiDoc
 styleUrl = styleFile
 
 -- | Style an 'AnsiDoc' as a directory name. See 'styleFile' for files.
 styleDir :: AnsiDoc -> AnsiDoc
-styleDir = bold . blue . ondullblack
+styleDir = bold . blue
 
 -- | Style used to highlight part of a recommended course of action.
 styleRecommendation :: AnsiDoc -> AnsiDoc
-styleRecommendation = bold . green . ondullblack
+styleRecommendation = bold . green
 
 -- | Style an 'AnsiDoc' in a way that emphasizes that it is related to
 --   a current thing. For example, could be used when talking about the
 --   current package we're processing when outputting the name of it.
 styleCurrent :: AnsiDoc -> AnsiDoc
-styleCurrent = yellow . ondullblack
+styleCurrent = dullyellow
 
 -- TODO: figure out how to describe this
 styleTarget :: AnsiDoc -> AnsiDoc
-styleTarget = cyan . ondullblack
+styleTarget = cyan
 
 -- | Style an 'AnsiDoc' as a module name
 styleModule :: AnsiDoc -> AnsiDoc
-styleModule = magenta . ondullblack -- TODO: what color should this be?
+styleModule = magenta -- TODO: what color should this be?
 
 instance Display (Path b File) where
     display = styleFile . fromString . toFilePath
diff --git a/stack-nightly.yaml b/stack-nightly.yaml
@@ -1,4 +1,4 @@
-resolver: nightly-2018-07-31
+resolver: nightly-2018-08-04
 
 # docker:
 #   enable: true
diff --git a/stack.yaml b/stack.yaml
@@ -18,7 +18,7 @@ flags:
     supported-build: true
 extra-deps:
 - infer-license-0.2.0@rev:0
-- hpack-0.29.5@rev:0
+- hpack-0.29.6@rev:0
 - githash-0.1.0.1@rev:0
 
 ghc-options:
diff --git a/subs/pantry/src/Pantry.hs b/subs/pantry/src/Pantry.hs
@@ -495,7 +495,7 @@ hpack pkgDir = do
         he <- view $ pantryConfigL.to pcHpackExecutable
         case he of
             HpackBundled -> do
-                r <- liftIO $ Hpack.hpackResult $ Hpack.setTarget (toFilePath hpackFile) Hpack.defaultOptions
+                r <- liftIO $ Hpack.hpackResult $ Hpack.setProgramName "stack" $ Hpack.setTarget (toFilePath hpackFile) Hpack.defaultOptions
                 forM_ (Hpack.resultWarnings r) (logWarn . fromString)
                 let cabalFile = fromString . Hpack.resultCabalFile $ r
                 case Hpack.resultStatus r of
diff --git a/subs/stack.yaml b/subs/stack.yaml
@@ -2,3 +2,6 @@ resolver: lts-12.0
 packages:
 - pantry
 - curator
+extra-deps:
+- infer-license-0.2.0@rev:0
+- hpack-0.29.6@rev:0
diff --git a/test/integration/tests/3520-revision-matching/files/bad-stack.yaml b/test/integration/tests/3520-revision-matching/files/bad-stack.yaml
@@ -1,4 +1,4 @@
-resolver: lts-11.19
+resolver: lts-10.10
 
 package-indices:
 - name: Hackage00
diff --git a/test/integration/tests/3520-revision-matching/files/good-stack.yaml b/test/integration/tests/3520-revision-matching/files/good-stack.yaml
@@ -1,4 +1,4 @@
-resolver: lts-11.19
+resolver: lts-10.10
 
 package-indices:
 - name: Hackage00

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`{-# LANGUAGE NoImplicitPrelude #-}`
`2`		`-{-# LANGUAGE CPP #-}`
`3`	`2`	`{-# LANGUAGE LambdaCase #-}`
`4`	`3`	`{-# LANGUAGE TupleSections #-}`
`5`	`4`	`{-# LANGUAGE ScopedTypeVariables #-}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-resolver: nightly-2018-07-31`
	`1`	`+resolver: nightly-2018-08-04`
`2`	`2`
`3`	`3`	`# docker:`
`4`	`4`	`# enable: true`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-resolver: lts-11.19`
	`1`	`+resolver: lts-10.10`
`2`	`2`
`3`	`3`	`package-indices:`
`4`	`4`	`- name: Hackage00`