From 598462adbd5322dee73893cb135ce2389f293665 Mon Sep 17 00:00:00 2001 From: Tomodachi94 Date: Thu, 6 Jun 2024 18:22:38 -0700 Subject: [PATCH 1/3] c3c: specify meta.mainProgram causes a warning when we try to use lib.getExe in later commits --- pkgs/development/compilers/c3c/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/compilers/c3c/default.nix b/pkgs/development/compilers/c3c/default.nix index 4310ad931792..d394ecbc4c21 100644 --- a/pkgs/development/compilers/c3c/default.nix +++ b/pkgs/development/compilers/c3c/default.nix @@ -56,5 +56,6 @@ llvmPackages.stdenv.mkDerivation rec { license = licenses.lgpl3Only; maintainers = with maintainers; [ luc65r ]; platforms = platforms.all; + mainProgram = "c3c"; }; } From e44f0528f422979c4877620f29cb155b477a618c Mon Sep 17 00:00:00 2001 From: Tomodachi94 Date: Thu, 6 Jun 2024 18:22:57 -0700 Subject: [PATCH 2/3] c3c: add version check --- pkgs/development/compilers/c3c/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/compilers/c3c/default.nix b/pkgs/development/compilers/c3c/default.nix index d394ecbc4c21..440fe155b39b 100644 --- a/pkgs/development/compilers/c3c/default.nix +++ b/pkgs/development/compilers/c3c/default.nix @@ -7,6 +7,7 @@ , libxml2 , libffi , xar +, testers }: llvmPackages.stdenv.mkDerivation rec { @@ -50,6 +51,12 @@ llvmPackages.stdenv.mkDerivation rec { runHook postCheck ''; + passthru.tests = { + version = testers.testVersion { + package = c3c; + }; + }; + meta = with lib; { description = "Compiler for the C3 language"; homepage = "https://github.com/c3lang/c3c"; From 3760be881c18292c29354dcba253c0c125ff5858 Mon Sep 17 00:00:00 2001 From: Tomodachi94 Date: Thu, 6 Jun 2024 18:27:51 -0700 Subject: [PATCH 3/3] c3c: migrate to finalAttrs pattern --- pkgs/development/compilers/c3c/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/compilers/c3c/default.nix b/pkgs/development/compilers/c3c/default.nix index 440fe155b39b..2577f1321d74 100644 --- a/pkgs/development/compilers/c3c/default.nix +++ b/pkgs/development/compilers/c3c/default.nix @@ -10,14 +10,14 @@ , testers }: -llvmPackages.stdenv.mkDerivation rec { +llvmPackages.stdenv.mkDerivation (finalAttrs: { pname = "c3c"; version = "0.5.5"; src = fetchFromGitHub { owner = "c3lang"; - repo = pname; - rev = "refs/tags/${version}"; + repo = "c3c"; + rev = "refs/tags/${finalAttrs.version}"; hash = "sha256-iOljE1BRVc92NJZj+nr1G6KkBTCwJEUOadXHUDNoPGk="; }; @@ -53,7 +53,7 @@ llvmPackages.stdenv.mkDerivation rec { passthru.tests = { version = testers.testVersion { - package = c3c; + package = finalAttrs.finalPackage; }; }; @@ -65,4 +65,4 @@ llvmPackages.stdenv.mkDerivation rec { platforms = platforms.all; mainProgram = "c3c"; }; -} +})