Merge branch 'local-archives' of https://github.com/loewenstein/stack

Author: snoyberg

src/Stack/Snapshot.hs

@@ -285,9 +285,9 @@ loadResolver (ResolverCustom url loc) = do
             }
           resolveLocalArchive pl = pl
           resolveLocalFilePath path =
-            if not $ isURI path && FilePath.isRelative path
-              then FilePath.dropFileName fp FilePath.</> FilePath.normalise path
-              else path
+            if isURI path || FilePath.isAbsolute path
+              then path
+              else FilePath.dropFileName fp FilePath.</> FilePath.normalise path
 
       WithJSONWarnings (sd0, mparentResolver, mcompiler) warnings <-
         liftIO (decodeFileEither fp) >>= either

test/integration/tests/1265-extensible-snapshots/files/local-snapshot.yaml renamed to test/integration/tests/1265-extensible-snapshots/files/snapshots/local-snapshot.yaml

@@ -1,3 +1,3 @@
-resolver: local-snapshot.yaml
+resolver: snapshots/local-snapshot.yaml
 packages: []
 allow-newer: true

test/integration/tests/1265-extensible-snapshots/files/package-0.1.2.3.tar.gz renamed to test/integration/tests/1265-extensible-snapshots/files/snapshots/package-0.1.2.3.tar.gz

@@ -1,3 +1,3 @@
-resolver: remote-snapshot.yaml
+resolver: snapshots/remote-snapshot.yaml
 packages: []
 allow-newer: true