nixpkgs mirror (for testing) github.com/NixOS/nixpkgs
nix

resholve: fix review nits from #138080

authored by

Travis A. Everett and committed by
Raphael Megzari
67ec4fa4 a649cbca

+17 -9
+1 -2
pkgs/development/misc/resholve/default.nix
··· 8 8 in 9 9 rec { 10 10 resholve = callPackage ./resholve.nix { 11 - inherit (source) rSrc; 12 - inherit (source) version; 11 + inherit (source) rSrc version; 13 12 inherit (deps.oil) oildev; 14 13 }; 15 14 resholve-utils = callPackage ./resholve-utils.nix {
+16 -7
pkgs/development/misc/resholve/oildev.nix
··· 46 46 nativeBuildInputs = [ git ]; 47 47 }; 48 48 49 + /* 50 + Upstream isn't interested in packaging this as a library 51 + (or accepting all of the patches we need to do so). 52 + This creates one without disturbing upstream too much. 53 + */ 49 54 oildev = python27Packages.buildPythonPackage rec { 50 55 pname = "oildev-unstable"; 51 56 version = "2021-07-14"; ··· 66 61 It's not critical to drop most of these; the primary target is 67 62 the vendored fork of Python-2.7.13, which is ~ 55M and over 3200 68 63 files, dozens of which get interpreter script patches in fixup. 64 + 65 + Note: -f is necessary to keep it from being a pain to update 66 + hash on rev updates. Command will fail w/o and not print hash. 69 67 */ 70 68 extraPostFetch = '' 71 69 rm -rf Python-2.7.13 benchmarks metrics py-yajl rfc gold web testdata services demo devtools cpp 72 70 ''; 73 71 }; 74 72 75 - # TODO: not sure why I'm having to set this for nix-build... 76 - # can anyone tell if I'm doing something wrong? 77 - SOURCE_DATE_EPOCH = 315532800; 78 - 79 73 # patch to support a python package, pass tests on macOS, etc. 80 74 patchSrc = fetchFromGitHub { 81 75 owner = "abathur"; 82 76 repo = "nix-py-dev-oil"; 83 - rev = "v0.8.12"; 84 - hash = "sha256-/EvwxL201lGsioL0lIhzM8VTghe6FuVbc3PBJgY8c8E="; 77 + rev = "v0.8.12.1"; 78 + hash = "sha256-7JVnosdcvmVFN3h6SIeeqcJFcyFkai//fFuzi7ThNMY="; 85 79 }; 86 80 patches = [ 87 81 "${patchSrc}/0001-add_setup_py.patch" ··· 106 102 patchShebangs asdl build core doctools frontend native oil_lang 107 103 ''; 108 104 109 - # TODO: this may be obsolete? 105 + /* 106 + We did convince oil to upstream an env for specifying 107 + this to support a shell.nix. Would need a patch if they 108 + later drop this support. See: 109 + https://github.com/oilshell/oil/blob/46900310c7e4a07a6223eb6c08e4f26460aad285/doctools/cmark.py#L30-L34 110 + */ 110 111 _NIX_SHELL_LIBCMARK = "${cmark}/lib/libcmark${stdenv.hostPlatform.extensions.sharedLibrary}"; 111 112 112 113 # See earlier note on glibcLocales TODO: verify needed?