From f6cbc9a788aed12e8337da149ecf1f9255778102 Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Wed, 14 May 2025 10:53:26 +0800
Subject: [PATCH 01/10] moarvm: add prince213 to maintainers

---
 pkgs/development/interpreters/rakudo/moarvm.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/interpreters/rakudo/moarvm.nix b/pkgs/development/interpreters/rakudo/moarvm.nix
index b08a5e054915..42b5b657442f 100644
--- a/pkgs/development/interpreters/rakudo/moarvm.nix
+++ b/pkgs/development/interpreters/rakudo/moarvm.nix
@@ -43,6 +43,7 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [
       thoughtpolice
       sgo
+      prince213
     ];
     mainProgram = "moar";
     platforms = platforms.unix;

From b16a33ccfee61f3f4c7da98e2bac32a6b748e387 Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Wed, 14 May 2025 10:54:41 +0800
Subject: [PATCH 02/10] nqp: add prince213 to maintainers

---
 pkgs/development/interpreters/rakudo/nqp.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/interpreters/rakudo/nqp.nix b/pkgs/development/interpreters/rakudo/nqp.nix
index e0ef64022138..e730af8143f5 100644
--- a/pkgs/development/interpreters/rakudo/nqp.nix
+++ b/pkgs/development/interpreters/rakudo/nqp.nix
@@ -47,6 +47,7 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [
       thoughtpolice
       sgo
+      prince213
     ];
   };
 }

From a26654fb7194e791b51515c055ba285d90f6e5a1 Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Wed, 14 May 2025 10:54:59 +0800
Subject: [PATCH 03/10] rakudo: add prince213 to maintainers

---
 pkgs/development/interpreters/rakudo/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/interpreters/rakudo/default.nix b/pkgs/development/interpreters/rakudo/default.nix
index ce69c2b8488d..643b7688572b 100644
--- a/pkgs/development/interpreters/rakudo/default.nix
+++ b/pkgs/development/interpreters/rakudo/default.nix
@@ -50,6 +50,7 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [
       thoughtpolice
       sgo
+      prince213
     ];
   };
 }

From 8bf80c7a93c0f37dfdc4779709f82655996ee13e Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Wed, 14 May 2025 16:32:10 +0800
Subject: [PATCH 04/10] moarvm: avoid with lib;

---
 pkgs/development/interpreters/rakudo/moarvm.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/interpreters/rakudo/moarvm.nix b/pkgs/development/interpreters/rakudo/moarvm.nix
index 42b5b657442f..76b183182c5c 100644
--- a/pkgs/development/interpreters/rakudo/moarvm.nix
+++ b/pkgs/development/interpreters/rakudo/moarvm.nix
@@ -36,16 +36,16 @@ stdenv.mkDerivation rec {
 
   configureScript = "${perl}/bin/perl ./Configure.pl";
 
-  meta = with lib; {
+  meta = {
     description = "VM with adaptive optimization and JIT compilation, built for Rakudo";
     homepage = "https://moarvm.org";
-    license = licenses.artistic2;
-    maintainers = with maintainers; [
+    license = lib.licenses.artistic2;
+    maintainers = with lib.maintainers; [
       thoughtpolice
       sgo
       prince213
     ];
     mainProgram = "moar";
-    platforms = platforms.unix;
+    platforms = lib.platforms.unix;
   };
 }

From cd8b75530f5ad5147b04ac002091b84bff5a3a6e Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Wed, 14 May 2025 16:33:54 +0800
Subject: [PATCH 05/10] moarvm: 2025.03 -> 2025.04

---
 pkgs/development/interpreters/rakudo/moarvm.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/rakudo/moarvm.nix b/pkgs/development/interpreters/rakudo/moarvm.nix
index 76b183182c5c..4cc67ca70253 100644
--- a/pkgs/development/interpreters/rakudo/moarvm.nix
+++ b/pkgs/development/interpreters/rakudo/moarvm.nix
@@ -7,14 +7,14 @@
 
 stdenv.mkDerivation rec {
   pname = "moarvm";
-  version = "2025.03";
+  version = "2025.04";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "moarvm";
     repo = "moarvm";
     rev = version;
-    hash = "sha256-8uvO4GcediL0ysYWApEo6C583nw5QcrjN+0EmO2NKWo=";
+    hash = "sha256-g2L7pEFU/ECNRYcNORH66qYKIAO7Uqtk3pFxyvxgKT4=";
     fetchSubmodules = true;
   };
 

From 6d644816e108c1f311d070549bb6d8ca7a0fe96a Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Wed, 14 May 2025 16:36:35 +0800
Subject: [PATCH 06/10] nqp: avoid with lib;

---
 pkgs/development/interpreters/rakudo/nqp.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/interpreters/rakudo/nqp.nix b/pkgs/development/interpreters/rakudo/nqp.nix
index e730af8143f5..672a05265a1a 100644
--- a/pkgs/development/interpreters/rakudo/nqp.nix
+++ b/pkgs/development/interpreters/rakudo/nqp.nix
@@ -39,12 +39,12 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  meta = with lib; {
+  meta = {
     description = "Not Quite Perl -- a lightweight Raku-like environment for virtual machines";
     homepage = "https://github.com/Raku/nqp";
-    license = licenses.artistic2;
-    platforms = platforms.unix;
-    maintainers = with maintainers; [
+    license = lib.licenses.artistic2;
+    platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; [
       thoughtpolice
       sgo
       prince213

From 40dee9f7406fadb999c20615b99bc84067f9c451 Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Wed, 14 May 2025 16:37:53 +0800
Subject: [PATCH 07/10] nqp: fix description

---
 pkgs/development/interpreters/rakudo/nqp.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/interpreters/rakudo/nqp.nix b/pkgs/development/interpreters/rakudo/nqp.nix
index 672a05265a1a..5c60d567d75d 100644
--- a/pkgs/development/interpreters/rakudo/nqp.nix
+++ b/pkgs/development/interpreters/rakudo/nqp.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
   doCheck = true;
 
   meta = {
-    description = "Not Quite Perl -- a lightweight Raku-like environment for virtual machines";
+    description = "Lightweight Raku-like environment for virtual machines";
     homepage = "https://github.com/Raku/nqp";
     license = lib.licenses.artistic2;
     platforms = lib.platforms.unix;

From 94a7e3ebae4cfb4bf141c5329c4d2c53e3944455 Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Wed, 14 May 2025 16:38:26 +0800
Subject: [PATCH 08/10] nqp: 2025.03 -> 2025.04

---
 pkgs/development/interpreters/rakudo/nqp.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/rakudo/nqp.nix b/pkgs/development/interpreters/rakudo/nqp.nix
index 5c60d567d75d..fa532fc94a09 100644
--- a/pkgs/development/interpreters/rakudo/nqp.nix
+++ b/pkgs/development/interpreters/rakudo/nqp.nix
@@ -8,14 +8,14 @@
 
 stdenv.mkDerivation rec {
   pname = "nqp";
-  version = "2025.03";
+  version = "2025.04";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "raku";
     repo = "nqp";
     rev = version;
-    hash = "sha256-/+MfjR7J2fwwMu8oRaBqjKi1dI0+6WZENzpymXEYN/Q=";
+    hash = "sha256-X/xPtsGhGSV3QkD4pvuhJYueH9nksbmf+CLqORUdtJc=";
     fetchSubmodules = true;
   };
 

From 0dba895dbc715770dd9822a0dad8126fc1eeea2a Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Wed, 14 May 2025 16:40:57 +0800
Subject: [PATCH 09/10] rakudo: avoid with lib;

---
 pkgs/development/interpreters/rakudo/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/interpreters/rakudo/default.nix b/pkgs/development/interpreters/rakudo/default.nix
index 643b7688572b..374f1a323a14 100644
--- a/pkgs/development/interpreters/rakudo/default.nix
+++ b/pkgs/development/interpreters/rakudo/default.nix
@@ -42,12 +42,12 @@ stdenv.mkDerivation rec {
     remove-references-to -t ${stdenv.cc.cc} "$(readlink -f $out/share/perl6/runtime/dynext/libperl6_ops_moar${stdenv.hostPlatform.extensions.sharedLibrary})"
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Raku implementation on top of Moar virtual machine";
     homepage = "https://rakudo.org";
-    license = licenses.artistic2;
-    platforms = platforms.unix;
-    maintainers = with maintainers; [
+    license = lib.licenses.artistic2;
+    platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; [
       thoughtpolice
       sgo
       prince213

From b55b748b84d34733e5c67ba8b51c1341de946999 Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Wed, 14 May 2025 16:41:26 +0800
Subject: [PATCH 10/10] rakudo: 2025.03 -> 2025.04

---
 pkgs/development/interpreters/rakudo/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/rakudo/default.nix b/pkgs/development/interpreters/rakudo/default.nix
index 374f1a323a14..3a6c9c7fbab9 100644
--- a/pkgs/development/interpreters/rakudo/default.nix
+++ b/pkgs/development/interpreters/rakudo/default.nix
@@ -12,14 +12,14 @@
 
 stdenv.mkDerivation rec {
   pname = "rakudo";
-  version = "2025.03";
+  version = "2025.04";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "rakudo";
     repo = "rakudo";
     rev = version;
-    hash = "sha256-7gqBjhPtD4gm3D3uNlzOFftETvgbdQn7TKlKaEke/hg=";
+    hash = "sha256-gVW1CB2LbgXV4uApmcl0/uxkcl9/PKk8sxj2R5dgowI=";
     fetchSubmodules = true;
   };