Update to Nixpkgs 23.05

- Patchelf 0.13.0 -> 0.13.1

flake.nix

@@ -7,7 +7,7 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
     nimble.follows = "eris/nimble";
-    nixpkgs.url = "github:ehmry/nixpkgs/sigil-21.11";
+    nixpkgs.url = "github:ehmry/nixpkgs/sigil-23.05";
   };
 
   nixConfig = {

overlay/default.nix

@@ -6,13 +6,13 @@ let
   # on whether the host or target system is Genode.
 
   overrideHost = attrs: drv:
-    if hostPlatform.isGenode then drv.override attrs else drv;
+    if stdenv.hostPlatform.isGenode then drv.override attrs else drv;
 
   overrideAttrsHost = f: drv:
-    if hostPlatform.isGenode then drv.overrideAttrs f else drv;
+    if stdenv.hostPlatform.isGenode then drv.overrideAttrs f else drv;
 
   overrideAttrsTarget = f: drv:
-    if targetPlatform.isGenode then drv.overrideAttrs f else drv;
+    if stdenv.targetPlatform.isGenode then drv.overrideAttrs f else drv;
 
   addPatches' = patches: attrs: { patches = attrs.patches or [ ] ++ patches; };
 
@@ -25,7 +25,7 @@ let
 
   nullPkgs =
     # Nullify these packages to find problems early.
-    if hostPlatform.isGenode then
+    if stdenv.hostPlatform.isGenode then
       builtins.listToAttrs (map (name: {
         inherit name;
         value = final.hello;
@@ -82,12 +82,11 @@ in nullPkgs // {
 
   erisPatchHook =
     final.buildPackages.nimPackages.callPackage ./eris-patch-hook {
-      patchelf = prev.patchelf.overrideAttrs (attrs: {
-        patches = attrs.patches or [ ] ++ [
+      patchelf = prev.patchelf_0_13.overrideAttrs ({ patches ? [], ... }: {
+        patches = patches ++ [
           ./patchelf/dynstr.patch
           ./patchelf/shiftFile.patch
           ./patchelf/disable-assert.patch
-          ./patchelf/rpath.patch
         ];
       });
     };
@@ -140,7 +139,7 @@ in nullPkgs // {
 
   linuxPackages =
     # Dummy package.
-    if hostPlatform.isGenode then {
+    if stdenv.hostPlatform.isGenode then {
       extend = _: final.linuxPackages;
       features = { };
       kernel = {
@@ -153,7 +152,7 @@ in nullPkgs // {
     } else
       prev.linuxPackages;
 
-  llvmPackages = if targetPlatform.isGenode then
+  llvmPackages = if stdenv.targetPlatform.isGenode then
     final.llvmPackages_11
   else
     prev.llvmPackages;
@@ -171,7 +170,7 @@ in nullPkgs // {
     # Packages from the Nimble flake with adjustments.
     prev.nimPackages.overrideScope' (final': prev':
       with final'; {
-        buildNimPackage = if hostPlatform.isGenode then
+        buildNimPackage = if stdenv.hostPlatform.isGenode then
           ({ nimFlags ? [ ], ... }@args:
             prev'.buildNimPackage (args // {
               nimBackend = "cpp";

overlay/patchelf/rpath.patch

@@ -1,19 +0,0 @@
-commit 32003f90f7eb0d685913cf49a05f32f3125855b0
-Author: Emery Hemingway <ehmry@posteo.net>
-Date:   2022-05-18 20:17:03 -0500
-
-    Fix replacement of empty rpath with an empty rpath
-
-diff --git a/src/patchelf.cc b/src/patchelf.cc
-index fd1e7b7..b9f58cd 100644
---- a/src/patchelf.cc
-+++ b/src/patchelf.cc
-@@ -1426,7 +1426,7 @@ void ElfFile<ElfFileParamNames>::modifyRPath(RPathOp op,
- 
- 
-     if (newRPath.size() <= rpathSize) {
--        strcpy(rpath, newRPath.c_str());
-+        if (rpath) strcpy(rpath, newRPath.c_str());
-         return;
-     }
- 

packages/genodelabs/default.nix

@@ -4,7 +4,7 @@ let
   inherit (final) lib;
   inherit (prev.buildPackages) buildPackages;
 
-  platform = final.targetPlatform;
+  platform = final.stdenv.targetPlatform;
 
   arch = with platform;
     if isx86_64 then

packages/solo5/default.nix

@@ -28,7 +28,7 @@ in stdenv.mkDerivation {
   configurePhase = with stdenv; ''
     runHook preConfigure
     sh configure.sh
-    ${lib.optionalString (hostPlatform.isAarch64) "rm -fr tests/test_fpu"}
+    ${lib.optionalString (stdenv.hostPlatform.isAarch64) "rm -fr tests/test_fpu"}
     rm -fr tests/test_tls
     runHook postConfigure
   '';

tests/default.nix

@@ -23,7 +23,7 @@ let
       ];
 
       core = builtins.filter (core:
-        builtins.any (x: x == testPkgs.hostPlatform.system) core.platforms) [
+        builtins.any (x: x == testPkgs.stdenv.hostPlatform.system) core.platforms) [
           /* # Need to fix the QEMU boot parameters?
              {
                prefix = "hw-pc-";