[Git][ghc/ghc][wip/marge_bot_batch_merge_job] 5 commits: users-guide: Fix -rtsopts default

[Marge Bot]

 Marge Bot pushed to branch wip/marge_bot_batch_merge_job at Glasgow Haskell Compiler / GHC


Commits:
a1ef3db5 by Kirill Elagin at 2019-05-19T20:12:47Z
users-guide: Fix -rtsopts default
- - - - -
ea13c329 by Javran Cheng at 2019-05-19T20:12:48Z
Fix doc for Data.Function.fix.

Doc-only change.

- - - - -
2d08ce41 by Shayne Fletcher at 2019-05-19T20:12:49Z
Update resolver for for happy 1.19.10

- - - - -
9d357ecb by Ben Gamari at 2019-05-19T20:12:50Z
gitlab-ci: Allow Windows Hadrian build to fail

Due to #16574.
- - - - -
c79afdb7 by Ben Gamari at 2019-05-19T20:12:50Z
Update .gitlab-ci.yml
- - - - -


4 changed files:

- .gitlab-ci.yml
- docs/users_guide/phases.rst
- hadrian/stack.yaml
- libraries/base/Data/Function.hs


Changes:

=====================================
.gitlab-ci.yml
=====================================
@@ -560,6 +560,8 @@ validate-x86_64-linux-fedora27:
   stage: full-build
   variables:
     GHC_VERSION: "8.6.2"
+  # due to #16574 this currently fails
+  allow_failure: true
   script:
     - |
       python boot


=====================================
docs/users_guide/phases.rst
=====================================
@@ -937,7 +937,7 @@ for example).
     :type: dynamic
     :category: linking
 
-    :default: all
+    :default: some
 
     This option affects the processing of RTS control options given
     either on the command line or via the :envvar:`GHCRTS` environment


=====================================
hadrian/stack.yaml
=====================================
@@ -1,7 +1,7 @@
 # For more information, see: http://docs.haskellstack.org/en/stable/yaml_configuration.html
 
 # Specifies the GHC version and set of packages available (e.g., lts-3.5, nightly-2015-09-21, ghc-7.10.2)
-resolver: lts-13.14
+resolver: lts-13.21
 
 # Local packages, usually specified by relative directory name
 packages:


=====================================
libraries/base/Data/Function.hs
=====================================
@@ -45,7 +45,7 @@ infixl 1 &
 -- 120
 --
 -- Instead of making a recursive call, we introduce a dummy parameter @rec@;
--- when used within 'fix', this parameter then refers to 'fix' argument, hence
+-- when used within 'fix', this parameter then refers to 'fix'’s argument, hence
 -- the recursion is reintroduced.
 fix :: (a -> a) -> a
 fix f = let x = f x in x



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/compare/609366ccf49a41a860fab5f22d0fe73aad0c4cce...c79afdb7fbdfe0fe4584b70b08c846bfc83ad9ad

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/compare/609366ccf49a41a860fab5f22d0fe73aad0c4cce...c79afdb7fbdfe0fe4584b70b08c846bfc83ad9ad
You're receiving this email because of your account on gitlab.haskell.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20190519/f3de92d0/attachment-0001.html>