From 74d3b4ff1cd1b34c8680f53a1eef5498177e2026 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Tue, 6 Oct 2020 14:44:26 +0200
Subject: [PATCH] Fall back to old behaviour for git references, prefer
 resolved_reference

---
 bin/poetry2nix    | 7 ++++++-
 mk-poetry-dep.nix | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/bin/poetry2nix b/bin/poetry2nix
index 5627faf..a573b28 100755
--- a/bin/poetry2nix
+++ b/bin/poetry2nix
@@ -23,6 +23,11 @@ parser_lock.add_argument(
 
 
 def fetch_git(pkg):
+    try:
+        reference = pkg["source"]["resolved_reference"]
+    except KeyError:
+        reference = pkg["source"]["reference"]
+
     return (
         pkg["name"],
         subprocess.run(
@@ -32,7 +37,7 @@ def fetch_git(pkg):
                 "--url",
                 pkg["source"]["url"],
                 "--rev",
-                pkg["source"]["resolved_reference"],
+                reference,
             ],
             stdout=subprocess.PIPE,
             stderr=subprocess.PIPE,
diff --git a/mk-poetry-dep.nix b/mk-poetry-dep.nix
index f683379..e765165 100644
--- a/mk-poetry-dep.nix
+++ b/mk-poetry-dep.nix
@@ -157,7 +157,7 @@ pythonPackages.callPackage
           (
             builtins.fetchGit {
               inherit (source) url;
-              rev = source.resolved_reference;
+              rev = source.resolved_reference or source.reference;
               ref = sourceSpec.branch or sourceSpec.rev or sourceSpec.tag or "HEAD";
             }
           ) else if isLocal then (poetryLib.cleanPythonSources { src = localDepPath; }) else