diff options
author | Travis A. Everett <travis.a.everett@gmail.com> | 2021-09-23 17:52:17 -0500 |
---|---|---|
committer | Raphael Megzari <raphael@megzari.com> | 2021-09-27 16:01:09 +0900 |
commit | 67ec4fa479b82a264ee647785df261f0f12b7f05 (patch) | |
tree | 74e678ea43cd8f8361bf985d3e31f8a15ec53f98 /pkgs/development/misc | |
parent | a649cbca0948c39c43c63b790c75b5b6e4db1564 (diff) |
resholve: fix review nits from #138080
Diffstat (limited to 'pkgs/development/misc')
-rw-r--r-- | pkgs/development/misc/resholve/default.nix | 3 | ||||
-rw-r--r-- | pkgs/development/misc/resholve/oildev.nix | 23 |
2 files changed, 17 insertions, 9 deletions
diff --git a/pkgs/development/misc/resholve/default.nix b/pkgs/development/misc/resholve/default.nix index 2c8b51b6e816d..cb32f9f9c756f 100644 --- a/pkgs/development/misc/resholve/default.nix +++ b/pkgs/development/misc/resholve/default.nix @@ -8,8 +8,7 @@ let in rec { resholve = callPackage ./resholve.nix { - inherit (source) rSrc; - inherit (source) version; + inherit (source) rSrc version; inherit (deps.oil) oildev; }; resholve-utils = callPackage ./resholve-utils.nix { diff --git a/pkgs/development/misc/resholve/oildev.nix b/pkgs/development/misc/resholve/oildev.nix index b15047b53ff9c..635aca9aa57a2 100644 --- a/pkgs/development/misc/resholve/oildev.nix +++ b/pkgs/development/misc/resholve/oildev.nix @@ -46,6 +46,11 @@ rec { nativeBuildInputs = [ git ]; }; + /* + Upstream isn't interested in packaging this as a library + (or accepting all of the patches we need to do so). + This creates one without disturbing upstream too much. + */ oildev = python27Packages.buildPythonPackage rec { pname = "oildev-unstable"; version = "2021-07-14"; @@ -61,22 +66,21 @@ rec { It's not critical to drop most of these; the primary target is the vendored fork of Python-2.7.13, which is ~ 55M and over 3200 files, dozens of which get interpreter script patches in fixup. + + Note: -f is necessary to keep it from being a pain to update + hash on rev updates. Command will fail w/o and not print hash. */ extraPostFetch = '' rm -rf Python-2.7.13 benchmarks metrics py-yajl rfc gold web testdata services demo devtools cpp ''; }; - # TODO: not sure why I'm having to set this for nix-build... - # can anyone tell if I'm doing something wrong? - SOURCE_DATE_EPOCH = 315532800; - # patch to support a python package, pass tests on macOS, etc. patchSrc = fetchFromGitHub { owner = "abathur"; repo = "nix-py-dev-oil"; - rev = "v0.8.12"; - hash = "sha256-/EvwxL201lGsioL0lIhzM8VTghe6FuVbc3PBJgY8c8E="; + rev = "v0.8.12.1"; + hash = "sha256-7JVnosdcvmVFN3h6SIeeqcJFcyFkai//fFuzi7ThNMY="; }; patches = [ "${patchSrc}/0001-add_setup_py.patch" @@ -102,7 +106,12 @@ rec { patchShebangs asdl build core doctools frontend native oil_lang ''; - # TODO: this may be obsolete? + /* + 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? |