renamed some filenames to not end with a period
Windows does not allow such filenames, which prevented cloning git-annex on windows.
This commit is contained in:
parent
20f86e43f7
commit
2d5036e440
15 changed files with 11 additions and 0 deletions
|
@ -0,0 +1,64 @@
|
|||
[[!comment format=mdwn
|
||||
username="seantparsons"
|
||||
avatar="http://cdn.libravatar.org/avatar/616fb81847630239dd1ab099138cb685"
|
||||
subject="Since the attachment doesn't appear to be there, here's the content."
|
||||
date="2017-10-22T20:32:21Z"
|
||||
content="""
|
||||
diff --git a/Annex/MetaData.hs b/Annex/MetaData.hs
|
||||
index e22ed05a6..355c5124a 100644
|
||||
--- a/Annex/MetaData.hs
|
||||
+++ b/Annex/MetaData.hs
|
||||
@@ -60,10 +60,11 @@ dateMetaData :: UTCTime -> MetaData -> MetaData
|
||||
dateMetaData mtime old = MetaData $ M.fromList $ filter isnew
|
||||
[ (yearMetaField, S.singleton $ toMetaValue $ show y)
|
||||
, (monthMetaField, S.singleton $ toMetaValue $ show m)
|
||||
+ , (dayMetaField, S.singleton $ toMetaValue $ show d)
|
||||
]
|
||||
where
|
||||
isnew (f, _) = S.null (currentMetaDataValues f old)
|
||||
- (y, m, _d) = toGregorian $ utctDay mtime
|
||||
+ (y, m, d) = toGregorian $ utctDay mtime
|
||||
|
||||
{- Parses field=value, field+=value, field-=value, field?=value -}
|
||||
parseModMeta :: String -> Either String ModMeta
|
||||
diff --git a/Annex/MetaData/StandardFields.hs b/Annex/MetaData/StandardFields.hs
|
||||
index c91b53930..b9ea47e2f 100644
|
||||
--- a/Annex/MetaData/StandardFields.hs
|
||||
+++ b/Annex/MetaData/StandardFields.hs
|
||||
@@ -9,6 +9,7 @@ module Annex.MetaData.StandardFields (
|
||||
tagMetaField,
|
||||
yearMetaField,
|
||||
monthMetaField,
|
||||
+ dayMetaField,
|
||||
lastChangedField,
|
||||
mkLastChangedField,
|
||||
isLastChangedField
|
||||
@@ -27,6 +28,9 @@ yearMetaField = mkMetaFieldUnchecked \"year\"
|
||||
monthMetaField :: MetaField
|
||||
monthMetaField = mkMetaFieldUnchecked \"month\"
|
||||
|
||||
+dayMetaField :: MetaField
|
||||
+dayMetaField = mkMetaFieldUnchecked \"day\"
|
||||
+
|
||||
lastChangedField :: MetaField
|
||||
lastChangedField = mkMetaFieldUnchecked lastchanged
|
||||
|
||||
diff --git a/stack.yaml b/stack.yaml
|
||||
index d84c4682e..ac601200e 100644
|
||||
--- a/stack.yaml
|
||||
+++ b/stack.yaml
|
||||
@@ -24,3 +24,11 @@ extra-deps:
|
||||
explicit-setup-deps:
|
||||
git-annex: true
|
||||
resolver: lts-9.9
|
||||
+nix:
|
||||
+ packages:
|
||||
+ - ncurses
|
||||
+ - icu
|
||||
+ - libcxx
|
||||
+ - gcc
|
||||
+ - zlib
|
||||
+ - rsync
|
||||
\ No newline at end of file
|
||||
|
||||
"""]]
|
|
@ -0,0 +1,12 @@
|
|||
[[!comment format=mdwn
|
||||
username="joey"
|
||||
subject="""comment 2"""
|
||||
date="2017-11-08T18:51:20Z"
|
||||
content="""
|
||||
Unfortunately the added nix section broke the i386-ancient build,
|
||||
which uses stack 1.0.4. That version of stack complains:
|
||||
|
||||
Executable named nix-shell not found on path: ["/usr/local/sbin","/usr/local/bin","/sbin","/bin","/usr/sbin","/usr/bin"]
|
||||
|
||||
So, I've reverted the addition of that section.
|
||||
"""]]
|
Loading…
Add table
Add a link
Reference in a new issue