diff --git a/pkgs/by-name/op/opensbi/package.nix b/pkgs/by-name/op/opensbi/package.nix
index 6dabf942c200..de08b61f0892 100644
--- a/pkgs/by-name/op/opensbi/package.nix
+++ b/pkgs/by-name/op/opensbi/package.nix
@@ -8,15 +8,15 @@
   withFDT ? null,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "opensbi";
-  version = "1.5.1";
+  version = "1.6";
 
   src = fetchFromGitHub {
     owner = "riscv-software-src";
     repo = "opensbi";
-    rev = "v${version}";
-    hash = "sha256-qb3orbmZJtesIBj9F2OX+BhrlctymZA1ZIbV/GVa0lU=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-X3j+4hdNDq36O/vFdlnd/QvDVIkXtvFbheFaZwf4GQY=";
   };
 
   postPatch = ''
@@ -45,11 +45,11 @@ stdenv.mkDerivation rec {
   dontStrip = true;
   dontPatchELF = true;
 
-  meta = with lib; {
+  meta = {
     description = "RISC-V Open Source Supervisor Binary Interface";
     homepage = "https://github.com/riscv-software-src/opensbi";
-    license = licenses.bsd2;
-    maintainers = with maintainers; [
+    license = lib.licenses.bsd2;
+    maintainers = with lib.maintainers; [
       ius
       nickcao
       zhaofengli
@@ -59,4 +59,4 @@ stdenv.mkDerivation rec {
       "riscv32-linux"
     ];
   };
-}
+})