diff options
| author | Travis A. Everett <travis.a.everett@gmail.com> | 2023-09-21 22:33:38 -0500 |
|---|---|---|
| committer | Travis A. Everett <travis.a.everett@gmail.com> | 2023-09-21 22:37:36 -0500 |
| commit | 6ae601dd25d7fe7b9478279627ddf4ea9f43b9d7 (patch) | |
| tree | 23f71dd13781663e896244bb0b9ef2a0cc76f2dc /pkgs/development/misc | |
| parent | ad3239f992917d434cd70979bf3f207e47b919f0 (diff) | |
resholve: fix oildev
This broke after the python2 update in #256132. Also including a dep removal that I inadvertently left out the last time I updated this.
Diffstat (limited to 'pkgs/development/misc')
| -rw-r--r-- | pkgs/development/misc/resholve/oildev.nix | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/pkgs/development/misc/resholve/oildev.nix b/pkgs/development/misc/resholve/oildev.nix index de3ac08ec99da..3e7dbc8e0108c 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"; |