c3c: 0.6.6 -> 0.7.0 (#394608)

authored by Arne Keller and committed by GitHub 20b2600f b2b07180

+36 -9
+6
maintainers/maintainer-list.nix
··· 9913 9913 github = "the-furry-hubofeverything"; 9914 9914 githubId = 53921912; 9915 9915 }; 9916 + hucancode = { 9917 + email = "hucancode@gmail.com"; 9918 + github = "hucancode"; 9919 + githubId = 15852849; 9920 + name = "Bang Nguyen Huu"; 9921 + }; 9916 9922 hufman = { 9917 9923 email = "hufman@gmail.com"; 9918 9924 github = "hufman";
+30 -9
pkgs/by-name/c3/c3c/package.nix
··· 9 9 libffi, 10 10 xar, 11 11 versionCheckHook, 12 + rev ? "unknown", 13 + debug ? false, 14 + checks ? true, 12 15 }: 13 - 16 + let 17 + inherit (lib.strings) optionalString; 18 + in 14 19 llvmPackages.stdenv.mkDerivation (finalAttrs: { 15 - pname = "c3c"; 16 - version = "0.6.6"; 20 + 21 + pname = "c3c${optionalString debug "-debug"}"; 22 + version = "0.7.0"; 17 23 18 24 src = fetchFromGitHub { 19 25 owner = "c3lang"; 20 26 repo = "c3c"; 21 27 tag = "v${finalAttrs.version}"; 22 - hash = "sha256-+rNj1SmiBYBw3Ncx2uS8X5OA/qDvJ8SFpZOQVRCgvmM="; 28 + hash = "sha256-SCUMyc8Gf7TAOXRppooNiyfbM84CUoIvokgvNgODqw8="; 23 29 }; 24 30 31 + cmakeBuildType = if debug then "Debug" else "Release"; 32 + 25 33 postPatch = '' 26 - substituteInPlace CMakeLists.txt \ 27 - --replace-fail "\''${LLVM_LIBRARY_DIRS}" "${llvmPackages.lld.lib}/lib ${llvmPackages.llvm.lib}/lib" 34 + substituteInPlace git_hash.cmake \ 35 + --replace-fail "\''${GIT_HASH}" "${rev}" 28 36 ''; 29 37 30 38 nativeBuildInputs = [ cmake ]; 39 + cmakeFlags = [ 40 + "-DC3_ENABLE_CLANGD_LSP=${if debug then "ON" else "OFF"}" 41 + "-DC3_LLD_DIR=${llvmPackages.lld.lib}/lib" 42 + "-DLLVM_CRT_LIBRARY_DIR=${llvmPackages.compiler-rt}/lib/darwin" 43 + ]; 31 44 32 45 buildInputs = [ 33 46 llvmPackages.llvm 34 47 llvmPackages.lld 48 + llvmPackages.compiler-rt 35 49 curl 36 50 libxml2 37 51 libffi ··· 39 53 40 54 nativeCheckInputs = [ python3 ]; 41 55 42 - doCheck = llvmPackages.stdenv.system == "x86_64-linux"; 56 + doCheck = 57 + lib.elem llvmPackages.stdenv.system [ 58 + "x86_64-linux" 59 + "x86_64-darwin" 60 + "aarch64-darwin" 61 + ] 62 + && checks; 43 63 44 64 checkPhase = '' 45 65 runHook preCheck 46 - ( cd ../resources/testproject; ../../build/c3c build ) 47 - ( cd ../test; python src/tester.py ../build/c3c test_suite ) 66 + ( cd ../resources/testproject; ../../build/c3c build --trust=full ) 67 + ( cd ../test; ../build/c3c compile-run -O1 src/test_suite_runner.c3 -- ../build/c3c test_suite ) 48 68 runHook postCheck 49 69 ''; 50 70 ··· 56 76 homepage = "https://github.com/c3lang/c3c"; 57 77 license = licenses.lgpl3Only; 58 78 maintainers = with maintainers; [ 79 + hucancode 59 80 anas 60 81 ]; 61 82 platforms = platforms.all;