diff --git a/‎scarb/src/ops/resolve.rs‎
Lines changed: 3 additions & 4 deletions b/‎scarb/src/ops/resolve.rs‎
Lines changed: 3 additions & 4 deletions
diff --git a/‎scarb/src/resolver/provider.rs‎
Lines changed: 10 additions & 11 deletions b/‎scarb/src/resolver/provider.rs‎
Lines changed: 10 additions & 11 deletions
@@ -261,10 +261,9 @@ pub fn resolve_workspace_with_opts(
         .block_on(TryFutureExt::into_future(async {
             let mut patch_map = PatchMap::new();
 
-            for (source, patches) in ws.patch() {
-                patch_map.insert(source.clone(), patches.clone());
-            }
-
+            // Insert the implicit patches that redirect `core`/`starknet`/etc. to the bundled
+            // `std` source first, so that user-defined `[patch]` entries (inserted below) can
+            // override them, e.g. to redirect `core` itself to a custom source.
             let cairo_version = crate::version::get().cairo.version.parse().unwrap();
             let version_req = DependencyVersionReq::exact(&cairo_version);
             let builtin_patches = [
 
@@ -518,21 +518,20 @@ impl DependencyProvider for PubGrubDependencyProvider {
 
             let deps = deps
                 .iter()
-                .map(|dependency| {
-                    let package_id = PackageId::new(
-                        dependency.name.clone(),
-                        dependency.version.clone(),
-                        dependency.source.expect(
-                            "source set to `None` is filtered out when searching the lockfile",
-                        ),
-                    );
-                    Ok((
+                // Path source dependencies (for example a `core` package redirected to a local
+                // path via `[patch]`) are not recorded with a source in the lockfile. Locking
+                // never occurs on path sources, so they are resolved through their own (main
+                // package) resolution rather than this locked shortcut - skip them here.
+                .filter_map(|dependency| {
+                    let source = dependency.source?;
+                    let package_id =
+                        PackageId::new(dependency.name.clone(), dependency.version.clone(), source);
+                    Some((
                         package_id,
                         DependencyVersionReq::exact(&dependency.version.clone()),
                     ))
                 })
-                .collect::<Result<Vec<(PackageId, DependencyVersionReq)>, DependencyProviderError>>(
-                )?;
+                .collect_vec();
             let constraints = deps
                 .into_iter()
                 .map(|(package_id, req)| (package_id.into(), req.into()))