From fb5d9b77a6afa1e4acb08fd268fecdab4571b47a Mon Sep 17 00:00:00 2001
From: Emery Hemingway <ehmry@posteo.net>
Date: Fri, 5 Apr 2024 13:01:02 +0100
Subject: [PATCH 1/2] solo5: move to pkgs/by-name

---
 .../solo5/default.nix => by-name/so/solo5/package.nix}          | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{os-specific/solo5/default.nix => by-name/so/solo5/package.nix} (100%)

diff --git a/pkgs/os-specific/solo5/default.nix b/pkgs/by-name/so/solo5/package.nix
similarity index 100%
rename from pkgs/os-specific/solo5/default.nix
rename to pkgs/by-name/so/solo5/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9629737b55dc..b7e22c06aa4f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -28182,8 +28182,6 @@ with pkgs;
 
   smimesign = callPackage ../os-specific/darwin/smimesign { };
 
-  solo5 = callPackage ../os-specific/solo5 { };
-
   statik = callPackage ../development/tools/statik { };
 
   statifier = callPackage ../os-specific/linux/statifier { };

From a100859273fba3d8678ba7fd9f38e98749f466f1 Mon Sep 17 00:00:00 2001
From: Emery Hemingway <ehmry@posteo.net>
Date: Fri, 5 Apr 2024 12:57:14 +0100
Subject: [PATCH 2/2] solo5: 0.8.0 -> 0.8.1

---
 pkgs/by-name/so/solo5/package.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/so/solo5/package.nix b/pkgs/by-name/so/solo5/package.nix
index f235902a91cd..240c69a40a0f 100644
--- a/pkgs/by-name/so/solo5/package.nix
+++ b/pkgs/by-name/so/solo5/package.nix
@@ -2,7 +2,7 @@
 , pkg-config, qemu, syslinux, util-linux }:
 
 let
-  version = "0.8.0";
+  version = "0.8.1";
   # list of all theoretically available targets
   targets = [
     "genode"
@@ -21,7 +21,7 @@ in stdenv.mkDerivation {
 
   src = fetchurl {
     url = "https://github.com/Solo5/solo5/releases/download/v${version}/solo5-v${version}.tar.gz";
-    sha256 = "sha256-t80VOZ8Tr1Dq+mJfRPVLGqYprCaqegcQtDqdoHaSXW0=";
+    sha256 = "sha256-J1xcL/AdcLQ7Ph3TFwEaS9l4cWjDQsTaXTdBDcT7p6E=";
   };
 
   hardeningEnable = [ "pie" ];
@@ -63,13 +63,13 @@ in stdenv.mkDerivation {
     runHook postCheck
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Sandboxed execution environment";
     homepage = "https://github.com/solo5/solo5";
-    license = licenses.isc;
-    maintainers = [ maintainers.ehmry ];
+    license = lib.licenses.isc;
+    maintainers = with lib.maintainers; [ ehmry ];
     platforms = builtins.map ({arch, os}: "${arch}-${os}")
-      (cartesianProductOfSets {
+      (lib.cartesianProductOfSets {
         arch = [ "aarch64" "x86_64" ];
         os = [ "freebsd" "genode" "linux" "openbsd" ];
       });