Merge branch 'staging-next' into staging

2 files changed, 8 insertions, 5 deletions

diff --git a/pkgs/development/misc/resholve/deps.nix b/pkgs/development/misc/resholve/deps.nix
index 86bcba5707590..6a1d9c77b5a0c 100644
--- a/pkgs/development/misc/resholve/deps.nix
+++ b/pkgs/development/misc/resholve/deps.nix
@@ -60,13 +60,13 @@ rec {
   # resholve's primary dependency is this developer build of the oil shell.
   oildev = python27Packages.buildPythonPackage rec {
     pname = "oildev-unstable";
-    version = "2020-03-31";
+    version = "2021-02-26";
 
     src = fetchFromGitHub {
       owner = "oilshell";
       repo = "oil";
-      rev = "ea80cdad7ae1152a25bd2a30b87fe3c2ad32394a";
-      sha256 = "0pxn0f8qbdman4gppx93zwml7s5byqfw560n079v68qjgzh2brq2";
+      rev = "11c6bd3ca0e126862c7a1f938c8510779837affa";
+      hash = "sha256-UTQywtx+Dn1/qx5uocqgGn7oFYW4R5DbuiRNF8t/BzY=";
 
       /*
       It's not critical to drop most of these; the primary target is
diff --git a/pkgs/development/misc/resholve/resholve.nix b/pkgs/development/misc/resholve/resholve.nix
index e8b4ed2cfb258..9b1cc921cd02e 100644
--- a/pkgs/development/misc/resholve/resholve.nix
+++ b/pkgs/development/misc/resholve/resholve.nix
@@ -11,12 +11,12 @@
 , doCheck ? true
 }:
 let
-  version = "0.4.2";
+  version = "0.5.0";
   rSrc = fetchFromGitHub {
     owner = "abathur";
     repo = "resholve";
     rev = "v${version}";
-    hash = "sha256-ArUQjqh4LRvFLzHiTIcae0q/VFxFF/X9eOFeRnYmTO0=";
+    hash = "sha256-dscmT0ss1buP56QzQtfs2HANr9oWWMxCS+fwBIKBxv4=";
   };
   deps = callPackage ./deps.nix {
     /*
@@ -29,6 +29,9 @@ let
       "${rSrc}/0002-add_MANIFEST_in.patch"
       "${rSrc}/0003-fix_codegen_shebang.patch"
       "${rSrc}/0004-disable-internal-py-yajl-for-nix-built.patch"
+      "${rSrc}/0005_revert_libc_locale.patch"
+      "${rSrc}/0006_disable_failing_libc_tests.patch"
+      "${rSrc}/0007_restore_root_init_py.patch"
     ];
   };
 in