From 3b771c02caef397c2406a6663ab69ac9749f8f26 Mon Sep 17 00:00:00 2001
From: Charlotte Van Petegem <charlotte@vanpetegem.me>
Date: Sun, 24 Sep 2023 11:13:45 +0200
Subject: [PATCH] patches: Add resholve fix patch

---
 patches/256612.patch | 48 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)
 create mode 100644 patches/256612.patch

diff --git a/patches/256612.patch b/patches/256612.patch
new file mode 100644
index 00000000..83547f20
--- /dev/null
+++ b/patches/256612.patch
@@ -0,0 +1,48 @@
+diff --git a/pkgs/development/misc/resholve/oildev.nix b/pkgs/development/misc/resholve/oildev.nix
+index de3ac08ec99da5..3e7dbc8e0108cc 100644
+--- a/pkgs/development/misc/resholve/oildev.nix
++++ b/pkgs/development/misc/resholve/oildev.nix
+@@ -9,8 +9,7 @@
+ , # py-yajl deps
+   git
+ , # oil deps
+-  cmark
+-, file
++  file
+ , glibcLocales
+ , six
+ , typing
+@@ -80,8 +79,8 @@ rec {
+     patchSrc = fetchFromGitHub {
+       owner = "abathur";
+       repo = "nix-py-dev-oil";
+-      rev = "v0.14.0.0";
+-      hash = "sha256-U6uR8G6yB2xwuDE/fznco23mVFSVdCxPUNdCRYz4Mj8=";
++      rev = "v0.14.0.1";
++      hash = "sha256-47+986+SohdtoNzTYAgF2vPPWgakyg0VCmR+MgxMzTk=";
+     };
+     patches = [
+       "${patchSrc}/0001-add_setup_py.patch"
+@@ -93,6 +92,7 @@ rec {
+       "${patchSrc}/0010-disable-line-input.patch"
+       "${patchSrc}/0011-disable-fanos.patch"
+       "${patchSrc}/0012-disable-doc-cmark.patch"
++      "${patchSrc}/0013-fix-pyverify.patch"
+     ];
+ 
+     configureFlags = [
+@@ -118,14 +118,6 @@ rec {
+       substituteInPlace osh/cmd_parse.py --replace 'elif self.c_id == Id.Op_LParen' 'elif False'
+     '';
+ 
+-    /*
+-    We did convince oil to upstream an env for specifying
+-    this to support a shell.nix. Would need a patch if they
+-    later drop this support. See:
+-    https://github.com/oilshell/oil/blob/46900310c7e4a07a6223eb6c08e4f26460aad285/doctools/cmark.py#L30-L34
+-    */
+-    _NIX_SHELL_LIBCMARK = "${cmark}/lib/libcmark${stdenv.hostPlatform.extensions.sharedLibrary}";
+-
+     # See earlier note on glibcLocales TODO: verify needed?
+     LOCALE_ARCHIVE = lib.optionalString (stdenv.buildPlatform.libc == "glibc") "${glibcLocales}/lib/locale/locale-archive";
+