cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

resholve: fix oildev

Browse source 
This broke after the python2 update in #256132. Also including a dep
removal that I inadvertently left out the last time I updated this.
This commit is contained in:
Travis A. Everett 2023-09-21 22:33:38 -05:00
parent ad3239f992
commit 6ae601dd25
1 changed files with 4 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
pkgs/development/misc/resholve/oildev.nix
View file

@ -9,8 +9,7 @@
, # py-yajl deps , # py-yajl deps
git git
, # oil deps , # oil deps
cmark file
, file
, glibcLocales , glibcLocales
, six , six
, typing , typing
@ -80,8 +79,8 @@ rec {
patchSrc = fetchFromGitHub { patchSrc = fetchFromGitHub {
owner = "abathur"; owner = "abathur";
repo = "nix-py-dev-oil"; repo = "nix-py-dev-oil";
rev = "v0.14.0.0"; rev = "v0.14.0.1";
hash = "sha256-U6uR8G6yB2xwuDE/fznco23mVFSVdCxPUNdCRYz4Mj8="; hash = "sha256-47+986+SohdtoNzTYAgF2vPPWgakyg0VCmR+MgxMzTk=";
}; };
patches = [ patches = [
"${patchSrc}/0001-add_setup_py.patch" "${patchSrc}/0001-add_setup_py.patch"
@ -93,6 +92,7 @@ rec {
"${patchSrc}/0010-disable-line-input.patch" "${patchSrc}/0010-disable-line-input.patch"
"${patchSrc}/0011-disable-fanos.patch" "${patchSrc}/0011-disable-fanos.patch"
"${patchSrc}/0012-disable-doc-cmark.patch" "${patchSrc}/0012-disable-doc-cmark.patch"
"${patchSrc}/0013-fix-pyverify.patch"
]; ];
configureFlags = [ configureFlags = [
@ -118,14 +118,6 @@ rec {
substituteInPlace osh/cmd_parse.py --replace 'elif self.c_id == Id.Op_LParen' 'elif False' 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? # See earlier note on glibcLocales TODO: verify needed?
LOCALE_ARCHIVE = lib.optionalString (stdenv.buildPlatform.libc == "glibc") "${glibcLocales}/lib/locale/locale-archive"; LOCALE_ARCHIVE = lib.optionalString (stdenv.buildPlatform.libc == "glibc") "${glibcLocales}/lib/locale/locale-archive";