Merge pull request #141 from nf-core/minimap-patch

Remove necessity of patch

modules.json

@@ -119,8 +119,7 @@
                     },
                     "minimap2/index": {
                         "branch": "master",
-                        "git_sha": "5e34754d42cd2d5d248ca8673c0a53cdf5624905",
+                        "git_sha": "5e34754d42cd2d5d248ca8673c0a53cdf5624905"
-                        "patch": "modules/nf-core/minimap2/index/minimap2-index.diff"
                     },
                     "motus/merge": {
                         "branch": "master",

modules/nf-core/minimap2/index/main.nf

@@ -7,11 +7,11 @@ process MINIMAP2_INDEX {
         'quay.io/biocontainers/minimap2:2.21--h5bf99c6_0' }"
 
     input:
-    path fasta
+    tuple val(meta), path(fasta)
 
     output:
-    path "*.mmi"        , emit: index
+    tuple val(meta), path("*.mmi"), emit: index
-    path "versions.yml" , emit: versions
+    path "versions.yml"           , emit: versions
 
     when:
     task.ext.when == null || task.ext.when

modules/nf-core/minimap2/index/minimap2-index.diff

@@ -1,20 +0,0 @@
-Changes in module 'nf-core/minimap2/index'
---- modules/nf-core/minimap2/index/main.nf
-+++ modules/nf-core/minimap2/index/main.nf
-@@ -7,11 +7,11 @@
-         'quay.io/biocontainers/minimap2:2.21--h5bf99c6_0' }"
- 
-     input:
--    tuple val(meta), path(fasta)
-+    path fasta
- 
-     output:
--    tuple val(meta), path("*.mmi"), emit: index
--    path "versions.yml"           , emit: versions
-+    path "*.mmi"        , emit: index
-+    path "versions.yml" , emit: versions
- 
-     when:
-     task.ext.when == null || task.ext.when
-
-************************************************************

subworkflows/local/longread_hostremoval.nf

@@ -18,7 +18,7 @@ workflow LONGREAD_HOSTREMOVAL {
     ch_multiqc_files  = Channel.empty()
 
     if ( !params.longread_hostremoval_index ) {
-        ch_minimap2_index = MINIMAP2_INDEX ( reference ).index
+        ch_minimap2_index = MINIMAP2_INDEX ( [ [], reference ] ).index.map { it[1] }
         ch_versions       = ch_versions.mix( MINIMAP2_INDEX.out.versions )
     } else {
         ch_minimap2_index = index