Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

resholve: 0.4.2 -> 0.5.0

+8 -5
+3 -3
pkgs/development/misc/resholve/deps.nix
··· 60 60 # resholve's primary dependency is this developer build of the oil shell. 61 61 oildev = python27Packages.buildPythonPackage rec { 62 62 pname = "oildev-unstable"; 63 - version = "2020-03-31"; 63 + version = "2021-02-26"; 64 64 65 65 src = fetchFromGitHub { 66 66 owner = "oilshell"; 67 67 repo = "oil"; 68 - rev = "ea80cdad7ae1152a25bd2a30b87fe3c2ad32394a"; 69 - sha256 = "0pxn0f8qbdman4gppx93zwml7s5byqfw560n079v68qjgzh2brq2"; 68 + rev = "11c6bd3ca0e126862c7a1f938c8510779837affa"; 69 + hash = "sha256-UTQywtx+Dn1/qx5uocqgGn7oFYW4R5DbuiRNF8t/BzY="; 70 70 71 71 /* 72 72 It's not critical to drop most of these; the primary target is
+5 -2
pkgs/development/misc/resholve/resholve.nix
··· 11 11 , doCheck ? true 12 12 }: 13 13 let 14 - version = "0.4.2"; 14 + version = "0.5.0"; 15 15 rSrc = fetchFromGitHub { 16 16 owner = "abathur"; 17 17 repo = "resholve"; 18 18 rev = "v${version}"; 19 - hash = "sha256-ArUQjqh4LRvFLzHiTIcae0q/VFxFF/X9eOFeRnYmTO0="; 19 + hash = "sha256-dscmT0ss1buP56QzQtfs2HANr9oWWMxCS+fwBIKBxv4="; 20 20 }; 21 21 deps = callPackage ./deps.nix { 22 22 /* ··· 29 29 "${rSrc}/0002-add_MANIFEST_in.patch" 30 30 "${rSrc}/0003-fix_codegen_shebang.patch" 31 31 "${rSrc}/0004-disable-internal-py-yajl-for-nix-built.patch" 32 + "${rSrc}/0005_revert_libc_locale.patch" 33 + "${rSrc}/0006_disable_failing_libc_tests.patch" 34 + "${rSrc}/0007_restore_root_init_py.patch" 32 35 ]; 33 36 }; 34 37 in