From c4788710aa8205339403b444fc6fa22b1c10641d Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 14 Feb 2024 04:20:00 +0000 Subject: [PATCH 1/3] mruby: 3.2.0 -> 3.3.0 Diff: https://github.com/mruby/mruby/compare/3.2.0...3.3.0 --- pkgs/development/compilers/mruby/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/mruby/default.nix b/pkgs/development/compilers/mruby/default.nix index 578dbf9c9837..59bfc8ce5e42 100644 --- a/pkgs/development/compilers/mruby/default.nix +++ b/pkgs/development/compilers/mruby/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "mruby"; - version = "3.2.0"; + version = "3.3.0"; src = fetchFromGitHub { owner = "mruby"; repo = "mruby"; rev = version; - sha256 = "sha256-MmrbWeg/G29YBvVrOtceTOZChrQ2kx9+apl7u7BiGjA="; + sha256 = "sha256-rCoEC1ioX6bOocPoPi+Lsn4PM8gY0DjKja1/MJvJ1n8="; }; nativeBuildInputs = [ rake ]; From 40612a98202b51ef83be135521f9fe267f27c1f5 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 14 Feb 2024 04:20:00 +0000 Subject: [PATCH 2/3] mruby: use finalAttrs pattern --- pkgs/development/compilers/mruby/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/mruby/default.nix b/pkgs/development/compilers/mruby/default.nix index 59bfc8ce5e42..35cdfb060c83 100644 --- a/pkgs/development/compilers/mruby/default.nix +++ b/pkgs/development/compilers/mruby/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, ruby, rake, fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mruby"; version = "3.3.0"; src = fetchFromGitHub { owner = "mruby"; repo = "mruby"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-rCoEC1ioX6bOocPoPi+Lsn4PM8gY0DjKja1/MJvJ1n8="; }; @@ -35,4 +35,4 @@ stdenv.mkDerivation rec { license = licenses.mit; platforms = platforms.all; }; -} +}) From 5fcfc83c97d6625bbfd6b85e3c73bdef1faf6336 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 14 Feb 2024 04:20:00 +0000 Subject: [PATCH 3/3] mruby: add version tester --- pkgs/development/compilers/mruby/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/mruby/default.nix b/pkgs/development/compilers/mruby/default.nix index 35cdfb060c83..0a081596616a 100644 --- a/pkgs/development/compilers/mruby/default.nix +++ b/pkgs/development/compilers/mruby/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, ruby, rake, fetchFromGitHub }: +{ lib, stdenv, ruby, rake, fetchFromGitHub, testers }: stdenv.mkDerivation (finalAttrs: { pname = "mruby"; @@ -28,11 +28,18 @@ stdenv.mkDerivation (finalAttrs: { checkTarget = "test"; + passthru.tests = { + version = testers.testVersion { + package = finalAttrs.finalPackage; + }; + }; + meta = with lib; { description = "An embeddable implementation of the Ruby language"; homepage = "https://mruby.org"; maintainers = with maintainers; [ nicknovitski marsam ]; license = licenses.mit; platforms = platforms.all; + mainProgram = "mruby"; }; })