Merge pull request #1424 from nf-core/bump_sortmerna

patch sortmerna to 4.3.7 for ARM compatibility
nf-core · Oct 22, 2024 · 3671d59 · 3671d59
2 parents 10b67df + 82dfdf2
commit 3671d59
Show file tree

Hide file tree

Showing 8 changed files with 681 additions and 160 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - [PR #1418](https://github.com/nf-core/rnaseq/pull/1418) - Bump versions back to 3.17.0 after release
 - [PR #1422](https://github.com/nf-core/rnaseq/pull/1422) - Bump lots of modules so that conda versions have ARM builds
 - [PR #1423](https://github.com/nf-core/rnaseq/pull/1423) - Bump STAR version for version with ARM Conda build
+- [PR #1424](https://github.com/nf-core/rnaseq/pull/1424) - Patch sortmerna to 4.3.7 for ARM compatibility
 
 ## [[3.16.1](https://github.com/nf-core/rnaseq/releases/tag/3.16.1)] - 2024-10-16
 

diff --git a/modules.json b/modules.json
@@ -215,7 +215,8 @@
                     "sortmerna": {
                         "branch": "master",
                         "git_sha": "666652151335353eef2fcd58880bcef5bc2928e1",
-                        "installed_by": ["fastq_qc_trim_filter_setstrandedness", "modules"]
+                        "installed_by": ["fastq_qc_trim_filter_setstrandedness", "modules"],
+                        "patch": "modules/nf-core/sortmerna/sortmerna.diff"
                     },
                     "star/align": {
                         "branch": "master",

diff --git a/modules/nf-core/sortmerna/environment.yml b/modules/nf-core/sortmerna/environment.yml
diff --git a/modules/nf-core/sortmerna/main.nf b/modules/nf-core/sortmerna/main.nf