From ca2fa1ccd73c1385caaade4a747df12f061863f2 Mon Sep 17 00:00:00 2001 From: Heitor Augusto Date: Sat, 3 May 2025 12:05:00 -0300 Subject: [PATCH 1/9] rojo: remove `with lib` from meta --- pkgs/by-name/ro/rojo/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ro/rojo/package.nix b/pkgs/by-name/ro/rojo/package.nix index a0849be55e55..951d82f7c531 100644 --- a/pkgs/by-name/ro/rojo/package.nix +++ b/pkgs/by-name/ro/rojo/package.nix @@ -36,7 +36,7 @@ rustPlatform.buildRustPackage rec { # tests flaky on darwin on hydra doCheck = !stdenv.hostPlatform.isDarwin; - meta = with lib; { + meta = { description = "Project management tool for Roblox"; mainProgram = "rojo"; longDescription = '' @@ -45,7 +45,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://rojo.space"; downloadPage = "https://github.com/rojo-rbx/rojo/releases/tag/v${version}"; changelog = "https://github.com/rojo-rbx/rojo/raw/v${version}/CHANGELOG.md"; - license = licenses.mpl20; - maintainers = with maintainers; [ wackbyte ]; + license = lib.licenses.mpl20; + maintainers = with lib.maintainers; [ wackbyte ]; }; } From 5d7f4573eac0769c9e7951f6017cebb8ebeca989 Mon Sep 17 00:00:00 2001 From: Heitor Augusto Date: Sat, 3 May 2025 12:10:13 -0300 Subject: [PATCH 2/9] rojo: update meta attributes --- pkgs/by-name/ro/rojo/package.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/ro/rojo/package.nix b/pkgs/by-name/ro/rojo/package.nix index 951d82f7c531..8c2434f16fed 100644 --- a/pkgs/by-name/ro/rojo/package.nix +++ b/pkgs/by-name/ro/rojo/package.nix @@ -37,15 +37,15 @@ rustPlatform.buildRustPackage rec { doCheck = !stdenv.hostPlatform.isDarwin; meta = { + changelog = "https://github.com/rojo-rbx/rojo/blob/v${version}/CHANGELOG.md"; description = "Project management tool for Roblox"; - mainProgram = "rojo"; - longDescription = '' - Rojo is a tool designed to enable Roblox developers to use professional-grade software engineering tools. - ''; - homepage = "https://rojo.space"; downloadPage = "https://github.com/rojo-rbx/rojo/releases/tag/v${version}"; - changelog = "https://github.com/rojo-rbx/rojo/raw/v${version}/CHANGELOG.md"; + homepage = "https://rojo.space"; license = lib.licenses.mpl20; + longDescription = '' + Tool designed to enable Roblox developers to use professional-grade software engineering tools. + ''; + mainProgram = "rojo"; maintainers = with lib.maintainers; [ wackbyte ]; }; } From 534beae7128faa8bd258dc4f6363f19c65d6c3e6 Mon Sep 17 00:00:00 2001 From: Heitor Augusto Date: Sat, 3 May 2025 12:11:16 -0300 Subject: [PATCH 3/9] rojo: remove darwin frameworks Reduces closure size --- pkgs/by-name/ro/rojo/package.nix | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/ro/rojo/package.nix b/pkgs/by-name/ro/rojo/package.nix index 8c2434f16fed..40c6bfc99a78 100644 --- a/pkgs/by-name/ro/rojo/package.nix +++ b/pkgs/by-name/ro/rojo/package.nix @@ -1,12 +1,11 @@ { lib, stdenv, - fetchFromGitHub, rustPlatform, + fetchFromGitHub, pkg-config, openssl, }: - rustPlatform.buildRustPackage rec { pname = "rojo"; version = "7.5.0"; @@ -22,13 +21,8 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-naItqyJaIxFZuswbrE8RZqMffGy1MaIa0RX9RLOWmyw="; - nativeBuildInputs = [ - pkg-config - ]; - - buildInputs = [ - openssl - ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ openssl ]; # reqwest's native-tls-vendored feature flag uses vendored openssl. this disables that OPENSSL_NO_VENDOR = "1"; From 5a3ea8c347ffb86a6cd527d7591b76377701ecb0 Mon Sep 17 00:00:00 2001 From: Heitor Augusto Date: Sat, 3 May 2025 12:14:09 -0300 Subject: [PATCH 4/9] rojo: use `finalAttrs` instead of `rec` --- pkgs/by-name/ro/rojo/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/ro/rojo/package.nix b/pkgs/by-name/ro/rojo/package.nix index 40c6bfc99a78..e06c6648ffa9 100644 --- a/pkgs/by-name/ro/rojo/package.nix +++ b/pkgs/by-name/ro/rojo/package.nix @@ -6,14 +6,14 @@ pkg-config, openssl, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "rojo"; version = "7.5.0"; src = fetchFromGitHub { owner = "rojo-rbx"; repo = "rojo"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-aCwQ07z7MhBS4C03npwjQOmfJXwD7trYo/upT3GAkHU="; fetchSubmodules = true; }; @@ -31,9 +31,9 @@ rustPlatform.buildRustPackage rec { doCheck = !stdenv.hostPlatform.isDarwin; meta = { - changelog = "https://github.com/rojo-rbx/rojo/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/rojo-rbx/rojo/blob/v${finalAttrs.version}/CHANGELOG.md"; description = "Project management tool for Roblox"; - downloadPage = "https://github.com/rojo-rbx/rojo/releases/tag/v${version}"; + downloadPage = "https://github.com/rojo-rbx/rojo/releases/tag/v${finalAttrs.version}"; homepage = "https://rojo.space"; license = lib.licenses.mpl20; longDescription = '' @@ -42,4 +42,4 @@ rustPlatform.buildRustPackage rec { mainProgram = "rojo"; maintainers = with lib.maintainers; [ wackbyte ]; }; -} +}) From f439c3e80fbc96269d6f9b09f9bcdb5a04b1847f Mon Sep 17 00:00:00 2001 From: Heitor Augusto Date: Sat, 3 May 2025 12:15:00 -0300 Subject: [PATCH 5/9] rojo: add updateScript --- pkgs/by-name/ro/rojo/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/ro/rojo/package.nix b/pkgs/by-name/ro/rojo/package.nix index e06c6648ffa9..1826ccf8a1c3 100644 --- a/pkgs/by-name/ro/rojo/package.nix +++ b/pkgs/by-name/ro/rojo/package.nix @@ -5,6 +5,7 @@ fetchFromGitHub, pkg-config, openssl, + nix-update-script, }: rustPlatform.buildRustPackage (finalAttrs: { pname = "rojo"; @@ -30,6 +31,8 @@ rustPlatform.buildRustPackage (finalAttrs: { # tests flaky on darwin on hydra doCheck = !stdenv.hostPlatform.isDarwin; + passthru.updateScript = nix-update-script { }; + meta = { changelog = "https://github.com/rojo-rbx/rojo/blob/v${finalAttrs.version}/CHANGELOG.md"; description = "Project management tool for Roblox"; From be795031fe5edf229fec3045e9a5eff571e653f9 Mon Sep 17 00:00:00 2001 From: Heitor Augusto Date: Sat, 3 May 2025 12:16:22 -0300 Subject: [PATCH 6/9] rojo: refactor --- pkgs/by-name/ro/rojo/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ro/rojo/package.nix b/pkgs/by-name/ro/rojo/package.nix index 1826ccf8a1c3..b9ffe39d18c7 100644 --- a/pkgs/by-name/ro/rojo/package.nix +++ b/pkgs/by-name/ro/rojo/package.nix @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage (finalAttrs: { buildInputs = [ openssl ]; # reqwest's native-tls-vendored feature flag uses vendored openssl. this disables that - OPENSSL_NO_VENDOR = "1"; + env.OPENSSL_NO_VENDOR = true; # tests flaky on darwin on hydra doCheck = !stdenv.hostPlatform.isDarwin; From 3587cd3e4624a8300364295c6ce43f455be5564c Mon Sep 17 00:00:00 2001 From: Heitor Augusto Date: Sat, 3 May 2025 12:38:19 -0300 Subject: [PATCH 7/9] rojo: 7.5.0 -> 7.5.1 Changelog: https://github.com/rojo-rbx/rojo/releases/tag/v7.5.1 Diff: https://github.com/rojo-rbx/rojo/compare/v7.5.0...v7.5.1 --- pkgs/by-name/ro/rojo/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ro/rojo/package.nix b/pkgs/by-name/ro/rojo/package.nix index b9ffe39d18c7..98ba0af5c25d 100644 --- a/pkgs/by-name/ro/rojo/package.nix +++ b/pkgs/by-name/ro/rojo/package.nix @@ -9,18 +9,18 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "rojo"; - version = "7.5.0"; + version = "7.5.1"; src = fetchFromGitHub { owner = "rojo-rbx"; repo = "rojo"; - rev = "v${finalAttrs.version}"; - hash = "sha256-aCwQ07z7MhBS4C03npwjQOmfJXwD7trYo/upT3GAkHU="; + tag = "v${finalAttrs.version}"; + hash = "sha256-awMio62guyP5qZH4i5hwXV5re6o45HDwqIJb3Dd71Is="; fetchSubmodules = true; }; useFetchCargoVendor = true; - cargoHash = "sha256-naItqyJaIxFZuswbrE8RZqMffGy1MaIa0RX9RLOWmyw="; + cargoHash = "sha256-iWRjXC+JaBA/z2eOHiiqFFtS2gug5/hkIpYrPdHyux0="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ]; From 74f6f2f3c53521d73ce71c67786e635855901f5b Mon Sep 17 00:00:00 2001 From: Heitor Augusto Date: Sat, 3 May 2025 12:40:10 -0300 Subject: [PATCH 8/9] rojo: add HeitorAugustoLN as a maintainer --- pkgs/by-name/ro/rojo/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ro/rojo/package.nix b/pkgs/by-name/ro/rojo/package.nix index 98ba0af5c25d..6b17b94a2e36 100644 --- a/pkgs/by-name/ro/rojo/package.nix +++ b/pkgs/by-name/ro/rojo/package.nix @@ -43,6 +43,9 @@ rustPlatform.buildRustPackage (finalAttrs: { Tool designed to enable Roblox developers to use professional-grade software engineering tools. ''; mainProgram = "rojo"; - maintainers = with lib.maintainers; [ wackbyte ]; + maintainers = with lib.maintainers; [ + wackbyte + HeitorAugustoLN + ]; }; }) From d94ff30aca59c95b40f6fa6b71d974461e373080 Mon Sep 17 00:00:00 2001 From: Heitor Augusto Date: Sat, 3 May 2025 12:44:32 -0300 Subject: [PATCH 9/9] rojo: add versionCheckHook --- pkgs/by-name/ro/rojo/package.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/by-name/ro/rojo/package.nix b/pkgs/by-name/ro/rojo/package.nix index 6b17b94a2e36..70f806c21100 100644 --- a/pkgs/by-name/ro/rojo/package.nix +++ b/pkgs/by-name/ro/rojo/package.nix @@ -5,6 +5,7 @@ fetchFromGitHub, pkg-config, openssl, + versionCheckHook, nix-update-script, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -31,6 +32,11 @@ rustPlatform.buildRustPackage (finalAttrs: { # tests flaky on darwin on hydra doCheck = !stdenv.hostPlatform.isDarwin; + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgram = "${placeholder "out"}/bin/rojo"; + versionCheckProgramArg = "--version"; + passthru.updateScript = nix-update-script { }; meta = {