1 files changed, 24 insertions, 41 deletions

diff --git a/internal/rosa/package/gnu.az b/internal/rosa/package/gnu.az
index b2a0fd8f..3eb48ab5 100644
--- a/internal/rosa/package/gnu.az
+++ b/internal/rosa/package/gnu.az
@@ -22,11 +22,8 @@ chmod +w tests/test-c32ispunct.sh && echo '#!/bin/sh' > tests/test-c32ispunct.sh
 		defaults = false;
 	};
 
-	inputs = [
-		diffutils,
-
-		kernel-headers,
-	];
+	tools = [ diffutils ];
+	inputs = [ kernel-headers ];
 }
 
 package autoconf {
@@ -51,7 +48,7 @@ package autoconf {
 		];
 	};
 
-	inputs = [
+	tools = [
 		m4,
 		perl,
 		bash,
@@ -90,7 +87,7 @@ test_disable '#!/bin/sh' t/pr9.sh
 
 	exec = make {};
 
-	inputs = [
+	tools = [
 		grep,
 		gzip,
 		autoconf,
@@ -122,7 +119,7 @@ package libtool {
 		];
 	};
 
-	inputs = [
+	tools = [
 		m4,
 		diffutils,
 	];
@@ -166,12 +163,8 @@ test_disable '#!/bin/sh' testsuite/read-error-stale-errno.sh
 `;
 
 	exec = make {};
-
-	inputs = [
-		diffutils,
-
-		kernel-headers,
-	];
+	tools = [ diffutils ];
+	inputs = [ kernel-headers ];
 }
 
 package diffutils {
@@ -248,8 +241,7 @@ test_disable 'int main(){return 0;}' gnulib-tests/test-c32ispunct.c
 `;
 
 	exec = make {};
-
-	inputs = [ diffutils ];
+	tools = [ diffutils ];
 }
 
 package gettext {
@@ -283,13 +275,13 @@ touch gettext-tools/autotools/archive.dir.tar
 
 	exec = make {};
 
-	inputs = [
+	tools = [
 		diffutils,
 		gzip,
 		sed,
-
-		kernel-headers,
 	];
+
+	inputs = [ kernel-headers ];
 }
 
 package findutils {
@@ -314,7 +306,7 @@ echo 'int main(){return 0;}' > tests/xargs/test-sigusr.c
 
 	exec = make {};
 
-	inputs = [
+	tools = [
 		diffutils,
 		sed,
 	];
@@ -377,12 +369,12 @@ test_disable 'int main(){return 0;}' gnulib-tests/test-lchown.c
 		};
 	};
 
-	inputs = [
+	tools = [
 		perl,
 		bash,
-
-		kernel-headers,
 	];
+
+	inputs = [ kernel-headers ];
 }
 
 package tar {
@@ -413,7 +405,7 @@ package tar {
 		];
 	};
 
-	inputs = [
+	tools = [
 		diffutils,
 
 		gzip,
@@ -439,7 +431,7 @@ package texinfo {
 		check = nil;
 	};
 
-	inputs = [ perl ];
+	tools = [ perl ];
 
 	runtime = [
 		perl,
@@ -461,7 +453,7 @@ package gperf {
 
 	exec = make {};
 
-	inputs = [ diffutils ];
+	tools = [ diffutils ];
 }
 
 package bc {
@@ -482,9 +474,7 @@ package bc {
 
 	exec = make {};
 
-	inputs = [
-		texinfo,
-	];
+	tools = [ texinfo ];
 }
 
 package libiconv {
@@ -517,7 +507,7 @@ package parallel {
 	bin = [ "bash" ];
 	exec = make {};
 
-	inputs = [
+	tools = [
 		perl,
 		bash,
 	];
@@ -546,10 +536,7 @@ test_disable 'int main(){return 0;}' tests/test-c32ispunct.c
 `;
 
 	exec = make {};
-
-	inputs = [
-		diffutils,
-	];
+	tools = [ diffutils ];
 }
 
 package libtasn1 {
@@ -587,7 +574,6 @@ package readline {
 	};
 
 	inputs = [ ncurses ];
-	runtime = [ ncurses ];
 }
 
 package gmp {
@@ -609,7 +595,7 @@ package gmp {
 
 	exec = make {};
 
-	inputs = [ m4 ];
+	tools = [ m4 ];
 }
 
 package mpfr {
@@ -628,7 +614,6 @@ package mpfr {
 	exec = make {};
 
 	inputs = [ gmp ];
-	runtime = [ gmp ];
 }
 
 package mpc {
@@ -652,13 +637,11 @@ package mpc {
 		generate = "autoreconf -vfi";
 	};
 
-	inputs = [
+	tools = [
 		automake,
 		libtool,
 		texinfo,
-
-		mpfr,
 	];
 
-	runtime = [ mpfr ];
+	inputs = [ mpfr ];
 }