From bc6433bf3edaa7e26ec7db5a25bc235d5fd94161 Mon Sep 17 00:00:00 2001
From: Jacob Heider <jacob@pkgx.dev>
Date: Thu, 2 May 2024 14:15:24 -0400
Subject: [PATCH] fix(curve-dalek.rust)

with the release of rust 1.78 we can undo these... tweaks.

fix deno specifically

Revert "fix deno specifically"

This reverts commit 4dbe7bd82386dc429a6d448b2004c3df4f0c9807.

revert deno
---
 projects/crates.io/gitui/package.yml         | 15 ++++-----------
 projects/crates.io/lighthouse/package.yml    | 14 +++-----------
 projects/crates.io/rtx-cli/package.yml       | 11 ++---------
 projects/crates.io/versio/package.yml        | 18 ++++--------------
 projects/fuellabs.github.io/sway/package.yml | 17 +++++------------
 projects/iroh.computer/package.yml           | 11 +++--------
 projects/mise.jdx.dev/package.yml            | 11 ++---------
 7 files changed, 23 insertions(+), 74 deletions(-)

diff --git a/projects/crates.io/gitui/package.yml b/projects/crates.io/gitui/package.yml
index 84a99eb2..75e96616 100644
--- a/projects/crates.io/gitui/package.yml
+++ b/projects/crates.io/gitui/package.yml
@@ -1,5 +1,5 @@
 distributable:
-  url: https://github.com/extrawurst/gitui/archive/refs/tags/v{{version}}.tar.gz
+  url: https://github.com/extrawurst/gitui/archive/refs/tags/{{version.tag}}.tar.gz
   strip-components: 1
 
 provides:
@@ -7,7 +7,6 @@ provides:
 
 versions:
   github: extrawurst/gitui/tags
-  strip: /v/
 
 dependencies:
   perl.org: '*'
@@ -17,20 +16,14 @@ dependencies:
 
 build:
   dependencies:
-    rust-lang.org: '>=1.60'
+    rust-lang.org: ^1.78 # stdsimd changes
     rust-lang.org/cargo: '*'
-  script:
-    # curve25519-dalek 4.1.2 introduces some odd simd issues on x86-64
-    - run: sed -i
-        -e 's/version = "4.1.2"/version = "4.1.1"/'
-        -e 's/0a677b8922c94e01bdbb12126b0bc852f00447528dee1782229af9c720c3f348/e89b8c6a2e4b1f45971ad09761aafb85514a84744b67a95e32c3cc1352d1f65c/'
-        Cargo.lock
-    - cargo install --path . --locked --root {{prefix}}
+  script: cargo install --path . --locked --root {{prefix}}
   env:
     linux:
       RUSTFLAGS: '-C linker=cc'
       # See: https://docs.rs/openssl/latest/openssl/#manual
       OPENSSL_NO_VENDOR: true # Always find OpenSSL in the system, even if the vendored feature is enabled.
-      OPENSSL_DIR: '{{ deps.openssl.org.prefix }}' # Use tea's openssl installation directory
+      OPENSSL_DIR: '{{ deps.openssl.org.prefix }}' # Use pkgx's openssl installation directory
 
 test: gitui --version
diff --git a/projects/crates.io/lighthouse/package.yml b/projects/crates.io/lighthouse/package.yml
index 57b47694..31fddcab 100644
--- a/projects/crates.io/lighthouse/package.yml
+++ b/projects/crates.io/lighthouse/package.yml
@@ -1,28 +1,20 @@
 distributable:
-  url: https://github.com/sigp/lighthouse/archive/refs/tags/v{{ version }}.tar.gz
+  url: https://github.com/sigp/lighthouse/archive/refs/tags/{{ version.tag }}.tar.gz
   strip-components: 1
 
 versions:
   github: sigp/lighthouse
-  strip: /^v/
 
 dependencies:
   zlib.net: ^1
 
 build:
   dependencies:
-    rust-lang.org: ^1.66
+    rust-lang.org: ^1.78 # stdsimd changes
     rust-lang.org/cargo: '*'
     cmake.org: ^3.12
     protobuf.dev: '*'
-  script:
-    # curve25519-dalek 4.1.2 introduces some odd simd issues on x86-64
-    - run: sed -i
-        -e 's/version = "4.1.2"/version = "4.1.1"/'
-        -e 's/0a677b8922c94e01bdbb12126b0bc852f00447528dee1782229af9c720c3f348/e89b8c6a2e4b1f45971ad09761aafb85514a84744b67a95e32c3cc1352d1f65c/'
-        Cargo.lock
-      if: '>=5.0.0'
-    - make CARGO_INSTALL_EXTRA_FLAGS="--root {{prefix}}"
+  script: make CARGO_INSTALL_EXTRA_FLAGS="--root {{prefix}}"
   test: make test-release
 
 provides:
diff --git a/projects/crates.io/rtx-cli/package.yml b/projects/crates.io/rtx-cli/package.yml
index 34b3170e..40c31f85 100644
--- a/projects/crates.io/rtx-cli/package.yml
+++ b/projects/crates.io/rtx-cli/package.yml
@@ -1,5 +1,5 @@
 distributable:
-  url: https://github.com/jdx/mise/archive/refs/tags/v{{version}}.tar.gz
+  url: https://github.com/jdx/mise/archive/refs/tags/{{version.tag}}.tar.gz
   strip-components: 1
 
 # renamed at 2024.1.0
@@ -17,17 +17,10 @@ dependencies:
 
 build:
   dependencies:
-    rust-lang.org: ^1.70
+    rust-lang.org: ^1.78 # stdsimd changes
     rust-lang.org/cargo: '*'
     freedesktop.org/pkg-config: '*'
   script:
-    # curve25519-dalek 4.1.2 introduces some odd simd issues on x86-64
-    - run: sed -i
-        -e 's/version = "4.1.2"/version = "4.1.1"/'
-        -e 's/0a677b8922c94e01bdbb12126b0bc852f00447528dee1782229af9c720c3f348/e89b8c6a2e4b1f45971ad09761aafb85514a84744b67a95e32c3cc1352d1f65c/'
-        Cargo.lock
-      if: '>=2024.2.6'
-
     - cargo install --locked --path . --root {{prefix}}
     # FIXME: <2024 isn't matching like it should. this should be split at 2024.1.0
     - run: |
diff --git a/projects/crates.io/versio/package.yml b/projects/crates.io/versio/package.yml
index 9d851ae7..362c5af0 100644
--- a/projects/crates.io/versio/package.yml
+++ b/projects/crates.io/versio/package.yml
@@ -1,5 +1,5 @@
 distributable:
-  url: https://github.com/chaaz/versio/archive/refs/tags/v{{ version }}.tar.gz
+  url: https://github.com/chaaz/versio/archive/refs/tags/{{ version.tag }}.tar.gz
   strip-components: 1
 
 provides:
@@ -7,7 +7,6 @@ provides:
 
 versions:
   github: chaaz/versio
-  strip: /v/
 
 dependencies:
   openssl.org: ^1.1
@@ -18,18 +17,9 @@ dependencies:
 
 build:
   dependencies:
-    rust-lang.org: '>=1.65'
+    rust-lang.org: ^1.78 # stdsimd changes
     rust-lang.org/cargo: '*'
     freedesktop.org/pkg-config: '*'
-  script:
-    # curve25519-dalek 4.1.2 introduces some odd simd issues on x86-64
-    - run: sed -i
-        -e 's/version = "4.1.2"/version = "4.1.1"/'
-        -e 's/0a677b8922c94e01bdbb12126b0bc852f00447528dee1782229af9c720c3f348/e89b8c6a2e4b1f45971ad09761aafb85514a84744b67a95e32c3cc1352d1f65c/'
-        Cargo.lock
-      if: 0.8.3
-    - cargo install --locked --path . --root {{prefix}}
+  script: cargo install --locked --path . --root {{prefix}}
 
-test:
-  script:
-    - test "$(versio --version)" = "versio {{version}}"
+test: test "$(versio --version)" = "versio {{version}}"
diff --git a/projects/fuellabs.github.io/sway/package.yml b/projects/fuellabs.github.io/sway/package.yml
index b310d3b9..5d6877e9 100644
--- a/projects/fuellabs.github.io/sway/package.yml
+++ b/projects/fuellabs.github.io/sway/package.yml
@@ -1,5 +1,5 @@
 distributable:
-  url: https://github.com/FuelLabs/sway/archive/refs/tags/v{{version}}.tar.gz
+  url: https://github.com/FuelLabs/sway/archive/refs/tags/{{version.tag}}.tar.gz
   strip-components: 1
 
 versions:
@@ -14,24 +14,17 @@ dependencies:
 
 build:
   dependencies:
-    rust-lang.org: 1
+    rust-lang.org: ^1.78 # stdsimd changes
     rust-lang.org/cargo: ^0
     # needed to build openssl module
     perl.org: '*'
     gnu.org/make: '*'
-  script:
-    # curve25519-dalek 4.1.2 introduces some odd simd issues on x86-64
-    - run: sed -i
-        -e 's/version = "4.1.2"/version = "4.1.1"/'
-        -e 's/0a677b8922c94e01bdbb12126b0bc852f00447528dee1782229af9c720c3f348/e89b8c6a2e4b1f45971ad09761aafb85514a84744b67a95e32c3cc1352d1f65c/'
-        Cargo.lock
-      if: '>=0.51.0'
-    - cargo install --locked --path forc --root {{prefix}}
+  script: cargo install --locked --path forc --root {{prefix}}
 
 test:
   script:
-    - forc new tea_test
-    - cd tea_test
+    - forc new pkgx_test
+    - cd pkgx_test
     - cat $FIXTURE >src/main.sw
     - forc test
   fixture: |
diff --git a/projects/iroh.computer/package.yml b/projects/iroh.computer/package.yml
index 1bee357b..1510b8d8 100644
--- a/projects/iroh.computer/package.yml
+++ b/projects/iroh.computer/package.yml
@@ -1,20 +1,15 @@
 distributable:
-  url: https://github.com/n0-computer/iroh/archive/refs/tags/v{{version}}.tar.gz
+  url: https://github.com/n0-computer/iroh/archive/refs/tags/{{version.tag}}.tar.gz
   strip-components: 1
 
 versions:
-  github: n0-computer/iroh/releases/tags
+  github: n0-computer/iroh
 
 build:
   dependencies:
     rust-lang.org/cargo: '*'
-    rust-lang.org: '^1.70'
+    rust-lang.org: ^1.78 # stdsimd changes
   script:
-    # curve25519-dalek 4.1.2 introduces some odd simd issues on x86-64
-    - run: sed -i
-        -e 's/version = "4.1.2"/version = "4.1.1"/'
-        -e 's/0a677b8922c94e01bdbb12126b0bc852f00447528dee1782229af9c720c3f348/e89b8c6a2e4b1f45971ad09761aafb85514a84744b67a95e32c3cc1352d1f65c/'
-        Cargo.lock
     - run: cargo install --path . --locked --root {{prefix}}
       if: <0.6.0
     - run: cargo install --path iroh --locked --root {{prefix}}
diff --git a/projects/mise.jdx.dev/package.yml b/projects/mise.jdx.dev/package.yml
index 6afd14d4..56272e35 100644
--- a/projects/mise.jdx.dev/package.yml
+++ b/projects/mise.jdx.dev/package.yml
@@ -1,5 +1,5 @@
 distributable:
-  url: https://github.com/jdx/mise/archive/refs/tags/v{{version}}.tar.gz
+  url: https://github.com/jdx/mise/archive/refs/tags/{{version.tag}}.tar.gz
   strip-components: 1
 
 # renamed at 2024.1.0
@@ -19,17 +19,10 @@ dependencies:
 
 build:
   dependencies:
-    rust-lang.org: ^1.70
+    rust-lang.org: ^1.78 # stdsimd changes
     rust-lang.org/cargo: '*'
     freedesktop.org/pkg-config: '*'
   script:
-    # curve25519-dalek 4.1.2 introduces some odd simd issues on x86-64
-    - run: sed -i
-        -e 's/version = "4.1.2"/version = "4.1.1"/'
-        -e 's/0a677b8922c94e01bdbb12126b0bc852f00447528dee1782229af9c720c3f348/e89b8c6a2e4b1f45971ad09761aafb85514a84744b67a95e32c3cc1352d1f65c/'
-        Cargo.lock
-      if: '>=2024.2.6'
-
     - cargo install --locked --path . --root {{prefix}}
     # FIXME: <2024 isn't matching like it should. this should be split at 2024.1.0
     - run: |