ante: unstable-2023-12-18 -> 0-unstable-2025-07-12

Emily 9ef13361 e6a984ea

+31 -15
+31 -15
pkgs/by-name/an/ante/package.nix
··· 1 1 { 2 + stdenv, 2 3 fetchFromGitHub, 3 4 lib, 5 + zlib, 4 6 libffi, 5 7 libxml2, 6 - llvmPackages_16, 8 + llvmPackages_18, 7 9 ncurses, 10 + darwin, 8 11 rustPlatform, 9 12 }: 10 13 11 14 rustPlatform.buildRustPackage { 12 15 pname = "ante"; 13 - version = "unstable-2023-12-18"; 16 + version = "0-unstable-2025-07-12"; 14 17 src = fetchFromGitHub { 15 18 owner = "jfecher"; 16 19 repo = "ante"; 17 - rev = "e38231ffa51b84a2ca53b4b0439d1ca5e0dea32a"; 18 - hash = "sha256-UKEoOm+Jc0YUwO74Tn038MLeX/c3d2z8I0cTBVfX61U="; 20 + rev = "e1f68f00937ae39badcc42a48c0078b608f294bf"; 21 + fetchSubmodules = true; 22 + hash = "sha256-mbjV7S705bSseA/P31jiJiktpUEQ8hS+M4kcs2AM1/Y="; 19 23 }; 20 24 21 - cargoHash = "sha256-uOOSxRoc59XzJT5oVO2NOYC0BwrNq4X6Jd/gQz0ZBp8="; 25 + cargoHash = "sha256-cRF1JFqWpGGQO3fIGcatVY1pp65CvNeM/6LFYDJxdpM="; 22 26 23 - /* 24 - https://crates.io/crates/llvm-sys#llvm-compatibility 25 - llvm-sys requires a specific version of llvmPackages, 26 - that is not the same as the one included by default with rustPlatform. 27 - */ 28 - nativeBuildInputs = [ llvmPackages_16.llvm ]; 27 + strictDeps = true; 28 + 29 + nativeBuildInputs = [ llvmPackages_18.llvm ]; 29 30 buildInputs = [ 31 + zlib 30 32 libffi 31 33 libxml2 32 34 ncurses 33 35 ]; 34 36 35 37 postPatch = '' 36 - substituteInPlace tests/golden_tests.rs --replace \ 38 + substituteInPlace tests/golden_tests.rs --replace-fail \ 37 39 'target/debug' "target/$(rustc -vV | sed -n 's|host: ||p')/release" 40 + 41 + substituteInPlace src/util/mod.rs \ 42 + --replace-fail '"gcc"' '"${lib.getExe llvmPackages_18.clang}"' 38 43 ''; 39 44 preBuild = 40 45 let 41 - major = lib.versions.major llvmPackages_16.llvm.version; 42 - minor = lib.versions.minor llvmPackages_16.llvm.version; 46 + major = lib.versions.major llvmPackages_18.llvm.version; 47 + minor = lib.versions.minor llvmPackages_18.llvm.version; 43 48 llvm-sys-ver = "${major}${builtins.substring 0 1 minor}"; 44 49 in 45 50 '' 46 51 # On some architectures llvm-sys is not using the package listed inside nativeBuildInputs 47 - export LLVM_SYS_${llvm-sys-ver}_PREFIX=${llvmPackages_16.llvm.dev} 52 + export LLVM_SYS_${llvm-sys-ver}_PREFIX=${llvmPackages_18.llvm.dev} 48 53 export ANTE_STDLIB_DIR=$out/lib 49 54 mkdir -p $ANTE_STDLIB_DIR 50 55 cp -r $src/stdlib/* $ANTE_STDLIB_DIR 51 56 ''; 57 + # Ante uses the default LLVM target which, because we currently 58 + # don’t include a Darwin version in the target, seemingly defaults 59 + # to the host macOS version, which makes `ld(1)` warn about the 60 + # mismatching deployment targets, which breaks the tests. 61 + # 62 + # TODO: Remove this once it stops being necessary. 63 + preCheck = lib.optionalString stdenv.hostPlatform.isDarwin '' 64 + export MACOSX_DEPLOYMENT_TARGET=$( 65 + ${lib.getExe' darwin.DarwinTools "sw_vers"} -productVersion 66 + ) 67 + ''; 52 68 53 69 meta = with lib; { 54 70 homepage = "https://antelang.org/";