diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-09-27 18:40:33 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-09-27 18:40:41 +0000 |
| commit | 030c5028b07afcedce7c5956015c629486cc79d9 (patch) | |
| tree | 4c3cb9c6cff0e30919a97fc0c1d3203446696f4e /pkgs/development/misc/resholve/oildev.nix | |
| parent | 4b852f7ef3cb92277f212ba7dc168da1073e65cc (diff) | |
| parent | 04c0744afbab2369baf4f134c544db3f24164d80 (diff) | |
| download | nixpkgs-030c5028b07afcedce7c5956015c629486cc79d9.tar nixpkgs-030c5028b07afcedce7c5956015c629486cc79d9.tar.gz nixpkgs-030c5028b07afcedce7c5956015c629486cc79d9.tar.bz2 nixpkgs-030c5028b07afcedce7c5956015c629486cc79d9.tar.lz nixpkgs-030c5028b07afcedce7c5956015c629486cc79d9.tar.xz nixpkgs-030c5028b07afcedce7c5956015c629486cc79d9.tar.zst nixpkgs-030c5028b07afcedce7c5956015c629486cc79d9.zip | |
Rebase onto c1a53897ad4290a1cbfa02fbe6f3869577b93744
Signed-off-by: Alyssa Ross <hi@alyssa.is>
Diffstat (limited to 'pkgs/development/misc/resholve/oildev.nix')
| -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 de3ac08ec99..3e7dbc8e010 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"; |