helix v23.10 (#6)

conda-forge · Apr 1, 2024 · 43084c4 · 43084c4
1 parent 622fc47
commit 43084c4
Show file tree

Hide file tree

Showing 15 changed files with 98 additions and 34 deletions.
diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml
diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml
diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml
@@ -1,3 +1,7 @@
+c_stdlib:
+- sysroot
+c_stdlib_version:
+- '2.12'
 cdt_name:
 - cos6
 channel_sources:
@@ -14,3 +18,6 @@ rust_compiler:
 - rust
 target_platform:
 - linux-64
+zip_keys:
+- - c_stdlib_version
+  - cdt_name
diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml
@@ -1,13 +1,19 @@
 MACOSX_DEPLOYMENT_TARGET:
 - '10.9'
+MACOSX_SDK_VERSION:
+- '10.12'
+c_stdlib:
+- macosx_deployment_target
+c_stdlib_version:
+- '10.9'
 channel_sources:
 - conda-forge
 channel_targets:
 - conda-forge main
 cxx_compiler:
 - clangxx
 cxx_compiler_version:
-- '15'
+- '16'
 macos_machine:
 - x86_64-apple-darwin13.4.0
 rust_compiler:

diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml
@@ -1,13 +1,17 @@
 MACOSX_DEPLOYMENT_TARGET:
 - '11.0'
+c_stdlib:
+- macosx_deployment_target
+c_stdlib_version:
+- '11.0'
 channel_sources:
 - conda-forge
 channel_targets:
 - conda-forge main
 cxx_compiler:
 - clangxx
 cxx_compiler_version:
-- '15'
+- '16'
 macos_machine:
 - arm64-apple-darwin20.0.0
 rust_compiler:

diff --git a/.gitignore b/.gitignore
diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh
diff --git a/.scripts/logging_utils.sh b/.scripts/logging_utils.sh
diff --git a/.scripts/run_docker_build.sh b/.scripts/run_docker_build.sh
diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh
diff --git a/README.md b/README.md
diff --git a/build-locally.py b/build-locally.py
diff --git a/recipe/build.sh b/recipe/build.sh
@@ -2,6 +2,8 @@
 
 set -o xtrace -o nounset -o pipefail -o errexit
 
+# https://github.com/jaredramirez/tree-sitter-rescript/pull/2
+sed -i'' -e s/65609807c628477f3b94052e7ef895885ac51c3c/467dcf99f68c47823d7b378779a6b282d7ef9782/g languages.toml
 
 cargo-bundle-licenses \
     --format yaml \

diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml
@@ -0,0 +1,2 @@
+MACOSX_SDK_VERSION:        # [osx and x86_64]
+  - '10.12'                # [osx and x86_64]
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -1,4 +1,4 @@
-{% set version = "23.05" %}
+{% set version = "23.10" %}
 {% set name = "helix" %}
 
 package:
@@ -7,7 +7,7 @@ package:
 
 source:
   url: https://github.com/helix-editor/helix/releases/download/{{ version }}/{{ name }}-{{ version }}-source.tar.xz
-  sha256: c1ca69facde99d708175c686ce5bf3585e119e372c83e1c3dc1d562c7a8e3d87
+  sha256: 4e7bcac200b1a15bc9f196bdfd161e4e448dc670359349ae14c18ccc512153e8
 
 build:
   number: 0