From 0bc09f58e797f37bce4027d56b2112112d2a06ac Mon Sep 17 00:00:00 2001
From: Federico Ravasio <ravasio.federico@gmail.com>
Date: Thu, 20 Oct 2022 08:55:38 +0000
Subject: [PATCH] fix: eval error on poetry 1.2 when a dev dependency is from
 git

---
 default.nix                               |  2 +-
 tests/default.nix                         |  1 +
 tests/git-deps-1_2_0/default.nix          |  8 ++++++++
 tests/git-deps-1_2_0/git_deps/__init__.py |  0
 tests/git-deps-1_2_0/poetry.lock          | 22 ++++++++++++++++++++++
 tests/git-deps-1_2_0/pyproject.toml       | 15 +++++++++++++++
 6 files changed, 47 insertions(+), 1 deletion(-)
 create mode 100644 tests/git-deps-1_2_0/default.nix
 create mode 100644 tests/git-deps-1_2_0/git_deps/__init__.py
 create mode 100644 tests/git-deps-1_2_0/poetry.lock
 create mode 100644 tests/git-deps-1_2_0/pyproject.toml

diff --git a/default.nix b/default.nix
index 5f565a6..ec19a3c 100644
--- a/default.nix
+++ b/default.nix
@@ -202,7 +202,7 @@ lib.makeScope pkgs.newScope (self: {
                       sourceSpec = (
                         (normalizePackageSet pyProject.tool.poetry.dependencies or { }).${normalizedName}
                           or (normalizePackageSet pyProject.tool.poetry.dev-dependencies or { }).${normalizedName}
-                          or (normalizePackageSet pyProject.tool.poetry.group.dev.dependencies { }).${normalizedName} # Poetry 1.2.0+
+                          or (normalizePackageSet pyProject.tool.poetry.group.dev.dependencies or { }).${normalizedName} # Poetry 1.2.0+
                           or { }
                       );
                     }
diff --git a/tests/default.nix b/tests/default.nix
index cb2db12..d83503d 100644
--- a/tests/default.nix
+++ b/tests/default.nix
@@ -47,6 +47,7 @@ builtins.removeAttrs
   file-wheel-deps = callTest ./file-wheel-deps { };
   file-wheel-deps-level2 = callTest ./file-wheel-deps-level2 { };
   git-deps = callTest ./git-deps { };
+  git-deps-1_2_0 = callTest ./git-deps-1_2_0 { };
   git-deps-pinned = callTest ./git-deps-pinned { };
   in-list = callTest ./in-list { };
   cli = poetry2nix;
diff --git a/tests/git-deps-1_2_0/default.nix b/tests/git-deps-1_2_0/default.nix
new file mode 100644
index 0000000..7941317
--- /dev/null
+++ b/tests/git-deps-1_2_0/default.nix
@@ -0,0 +1,8 @@
+{ lib, poetry2nix, python3 }:
+
+poetry2nix.mkPoetryApplication {
+  python = python3;
+  pyproject = ./pyproject.toml;
+  poetrylock = ./poetry.lock;
+  src = lib.cleanSource ./.;
+}
diff --git a/tests/git-deps-1_2_0/git_deps/__init__.py b/tests/git-deps-1_2_0/git_deps/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/tests/git-deps-1_2_0/poetry.lock b/tests/git-deps-1_2_0/poetry.lock
new file mode 100644
index 0000000..e1391f5
--- /dev/null
+++ b/tests/git-deps-1_2_0/poetry.lock
@@ -0,0 +1,22 @@
+[[package]]
+name = "colorama"
+version = "0.4.4"
+description = "Cross-platform colored terminal text."
+category = "dev"
+optional = false
+python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
+develop = false
+
+[package.source]
+type = "git"
+url = "https://github.com/tartley/colorama.git"
+reference = "4321bbfda9aa190acdad05eb901d3b59439f0ec9"
+resolved_reference = "4321bbfda9aa190acdad05eb901d3b59439f0ec9"
+
+[metadata]
+lock-version = "1.1"
+python-versions = "^3.6"
+content-hash = "cf3328f9b1d26a4b56fa6280838582940d6af2352ed39272c062503e302b8445"
+
+[metadata.files]
+colorama = []
diff --git a/tests/git-deps-1_2_0/pyproject.toml b/tests/git-deps-1_2_0/pyproject.toml
new file mode 100644
index 0000000..fd7f03c
--- /dev/null
+++ b/tests/git-deps-1_2_0/pyproject.toml
@@ -0,0 +1,15 @@
+[tool.poetry]
+name = "git-deps"
+version = "0.1.0"
+description = "poetry2nix test"
+authors = ["Your Name <you@example.com>"]
+
+[tool.poetry.dependencies]
+python = "^3.6"
+
+[tool.poetry.group.dev.dependencies]
+colorama = { git = "https://github.com/tartley/colorama.git", rev = "4321bbfda9aa190acdad05eb901d3b59439f0ec9" }
+
+[build-system]
+requires = ["poetry-core"]
+build-backend = "poetry.core.masonry.api"