Skip to content

Commit 0fbd56c

Browse files
alexbiehlalexbiehl
authored
Merge branch 'master' into new-install
2 parents 638c78e + c718a22 commit 0fbd56c

File tree

8 files changed

+32
-20
lines changed

8 files changed

+32
-20
lines changed

‎Cabal/Cabal.cabal

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ extra-source-files:
2727
doc/conf.py doc/config-and-install.rst doc/developing-packages.rst
2828
doc/images/Cabal-dark.png doc/index.rst doc/installing-packages.rst
2929
doc/intro.rst doc/misc.rst doc/nix-local-build-overview.rst
30-
doc/nix-local-build.rst doc/README.md doc/references.inc
30+
doc/nix-local-build.rst doc/file-format-changelog.rst doc/README.md
31+
doc/references.inc
3132

3233
-- Generated with 'make gen-extra-source-files'
3334
-- Do NOT edit this section manually; instead, run the script.

‎Cabal/Distribution/Simple/Glob.hs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ module Distribution.Simple.Glob (
1818
GlobSyntaxError(..),
1919
GlobResult(..),
2020
globMatches,
21-
matchFileGlob,
2221
matchDirFileGlob,
2322
matchDirFileGlob',
2423
fileGlobMatches,
@@ -193,9 +192,6 @@ parseFileGlob version filepath = case reverse (splitDirectories filepath) of
193192
| version >= mkVersion [2,4] = MultiDotEnabled
194193
| otherwise = MultiDotDisabled
195194

196-
matchFileGlob :: Verbosity -> Version -> FilePath -> IO [GlobResult FilePath]
197-
matchFileGlob verbosity version = matchDirFileGlob verbosity version "."
198-
199195
-- | Like 'matchDirFileGlob'', but will 'die'' when the glob matches
200196
-- no files.
201197
matchDirFileGlob :: Verbosity -> Version -> FilePath -> FilePath -> IO [GlobResult FilePath]

‎Cabal/Distribution/Simple/Haddock.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,7 @@ haddock pkg_descr lbi suffixes flags' = do
306306
CBench _ -> (when (flag haddockBenchmarks) $ smsg >> doExe component) >> return index
307307

308308
for_ (extraDocFiles pkg_descr) $ \ fpath -> do
309-
files <- fmap globMatches $ matchFileGlob verbosity (specVersion pkg_descr) fpath
309+
files <- fmap globMatches $ matchDirFileGlob verbosity (specVersion pkg_descr) "." fpath
310310
for_ files $ copyFileTo verbosity (unDir $ argOutputDir commonArgs)
311311

312312
-- ------------------------------------------------------------------------------

‎Cabal/Distribution/Simple/SrcDist.hs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ listPackageSourcesMaybeExecutable verbosity pkg_descr =
149149
-- Extra source files.
150150
fmap concat . for (extraSrcFiles pkg_descr) $ \fpath ->
151151
fmap globMatches $
152-
matchFileGlob verbosity (specVersion pkg_descr) fpath
152+
matchDirFileGlob verbosity (specVersion pkg_descr) "." fpath
153153

154154
-- | List those source files that should be copied with ordinary permissions.
155155
listPackageSourcesOrdinary :: Verbosity
@@ -223,7 +223,7 @@ listPackageSourcesOrdinary verbosity pkg_descr pps =
223223
, fmap concat
224224
. for (extraDocFiles pkg_descr) $ \ filename ->
225225
fmap globMatches $
226-
matchFileGlob verbosity (specVersion pkg_descr) filename
226+
matchDirFileGlob verbosity (specVersion pkg_descr) "." filename
227227

228228
-- License file(s).
229229
, return (licenseFiles pkg_descr)

‎Cabal/doc/file-format-changelog.rst

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
Cabal file format changelog
2+
===========================
3+
4+
Changes in 2.4
5+
--------------
6+
7+
* Wildcard matching has been expanded. All previous wildcard
8+
expressions are still valid; some will match strictly more files
9+
than before. Specifically:
10+
11+
* Double-star (``**``) wildcards are now accepted for recursive
12+
matching immediately before the final slash; they must be followed
13+
by a filename wildcard (e.g., ``foo/**/*.html`` is valid;
14+
``foo/**/bar/*.html`` and ``foo/**/**/*.html``,
15+
``foo/**/bar.html`` are all invalid). As ``**`` was an error in
16+
globs before, this does not affect any existing ``.cabal`` files
17+
that previously worked.
18+
19+
* Wildcards now match when the pattern's extensions form a suffix of
20+
the candidate file's extension, rather than requiring strict
21+
equality (e.g., previously ``*.html`` did not match
22+
``foo.en.html``, but now it does).

‎Cabal/doc/index.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,4 @@ Welcome to the Cabal User Guide
1212
bugs-and-stability
1313
nix-local-build-overview
1414
nix-integration
15+
file-format-changelog

‎cabal-install/Distribution/Client/CmdUpdate.hs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ import Distribution.Client.Setup
3636
import Distribution.Simple.Setup
3737
( HaddockFlags, fromFlagOrDefault )
3838
import Distribution.Simple.Utils
39-
( die', notice, wrapText, writeFileAtomic, noticeNoWrap, intercalate )
39+
( die', notice, wrapText, writeFileAtomic, noticeNoWrap )
4040
import Distribution.Verbosity
4141
( Verbosity, normal, lessVerbose )
4242
import Distribution.Client.IndexUtils.Timestamp
@@ -52,6 +52,7 @@ import Data.Maybe (fromJust)
5252
import qualified Distribution.Compat.ReadP as ReadP
5353
import qualified Text.PrettyPrint as Disp
5454

55+
import Control.Monad (unless, when, mapM, mapM_)
5556
import Control.Monad (unless, when, mapM, mapM_)
5657
import Control.Exception (catch, throwIO)
5758
import qualified Data.Set as Set

‎cabal-install/bootstrap.sh

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -261,15 +261,10 @@ HACKAGE_SECURITY_VER="0.5.3.0"; HACKAGE_SECURITY_VER_REGEXP="0\.5\.((2\.[2-9]|[3
261261
# >= 0.5.2 && < 0.6
262262
TAR_VER="0.5.1.0"; TAR_VER_REGEXP="0\.5\.([1-9]|1[0-9]|0\.[3-9]|0\.1[0-9])\.?"
263263
# >= 0.5.0.3 && < 0.6
264-
# These two are temporary: https://github.com/jgm/zip-archive/pull/47
265-
OLD_LOCALE_VER="1.0.0.7"; OLD_LOCALE_REGEXP="1\.0\.?\.?"
266-
# >= 1.0.0.0 && < 1.1.0.0
267-
OLD_TIME_VER="1.1.0.3"; OLD_TIME_REGEXP="1\.1\.(0\.[3-9]|[1-9]\.?)"
268-
# >= 1.1.0.3 && < 1.2
269264
DIGEST_VER="0.0.1.2"; DIGEST_REGEXP="0\.0\.(1\.[2-9]|[2-9]\.?)"
270265
# >= 0.0.1.2 && < 0.1
271-
ZIP_ARCHIVE_VER="0.3.2.5"; ZIP_ARCHIVE_REGEXP="0\.3\.(2\.[5-9]|[3-9]\.?)"
272-
# >= 0.3.2.5 && < 0.4
266+
ZIP_ARCHIVE_VER="0.3.3"; ZIP_ARCHIVE_REGEXP="0\.3\.[3-9]"
267+
# >= 0.3.3 && < 0.4
273268

274269
HACKAGE_URL="https://hackage.haskell.org/package"
275270

@@ -461,8 +456,6 @@ info_pkg "echo" ${ECHO_VER} ${ECHO_VER_REGEXP}
461456
info_pkg "edit-distance" ${EDIT_DISTANCE_VER} ${EDIT_DISTANCE_VER_REGEXP}
462457
info_pkg "ed25519" ${ED25519_VER} ${ED25519_VER_REGEXP}
463458
info_pkg "tar" ${TAR_VER} ${TAR_VER_REGEXP}
464-
info_pkg "old-locale" ${OLD_LOCALE_VER} ${OLD_LOCALE_REGEXP}
465-
info_pkg "old-time" ${OLD_TIME_VER} ${OLD_TIME_REGEXP}
466459
info_pkg "digest" ${DIGEST_VER} ${DIGEST_REGEXP}
467460
info_pkg "zip-archive" ${ZIP_ARCHIVE_VER} ${ZIP_ARCHIVE_REGEXP}
468461
info_pkg "hackage-security" ${HACKAGE_SECURITY_VER} \
@@ -501,8 +494,6 @@ do_pkg "echo" ${ECHO_VER} ${ECHO_VER_REGEXP}
501494
do_pkg "edit-distance" ${EDIT_DISTANCE_VER} ${EDIT_DISTANCE_VER_REGEXP}
502495
do_pkg "ed25519" ${ED25519_VER} ${ED25519_VER_REGEXP}
503496
do_pkg "tar" ${TAR_VER} ${TAR_VER_REGEXP}
504-
do_pkg "old-locale" ${OLD_LOCALE_VER} ${OLD_LOCALE_REGEXP}
505-
do_pkg "old-time" ${OLD_TIME_VER} ${OLD_TIME_REGEXP}
506497
do_pkg "digest" ${DIGEST_VER} ${DIGEST_REGEXP}
507498
do_pkg "zip-archive" ${ZIP_ARCHIVE_VER} ${ZIP_ARCHIVE_REGEXP}
508499
do_pkg "hackage-security" ${HACKAGE_SECURITY_VER} \

0 commit comments

Comments
 (0)