From 95b2d7b3efbf1ea764207d982d0ccedae1f61656 Mon Sep 17 00:00:00 2001
From: Phil Ewels <phil@seqera.io>
Date: Mon, 3 Oct 2022 11:05:35 +0200
Subject: [PATCH 1/2] Don't skip base.config when skipping nf-core/configs

---
 nf_core/pipeline-template/nextflow.config | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nf_core/pipeline-template/nextflow.config b/nf_core/pipeline-template/nextflow.config
index bc222cb6e4..737341c4b0 100644
--- a/nf_core/pipeline-template/nextflow.config
+++ b/nf_core/pipeline-template/nextflow.config
@@ -59,10 +59,11 @@ params {
     max_time                   = '240.h'
 
 }
-{% if nf_core_configs %}
+
 // Load base.config by default for all pipelines
 includeConfig 'conf/base.config'
 
+{% if nf_core_configs -%}
 // Load nf-core custom profiles from different Institutions
 try {
     includeConfig "${params.custom_config_base}/nfcore_custom.config"
@@ -77,9 +78,8 @@ try {
 // } catch (Exception e) {
 //   System.err.println("WARNING: Could not load nf-core/config/{{ short_name }} profiles: ${params.custom_config_base}/pipeline/{{ short_name }}.config")
 // }
-
-
 {% endif %}
+
 profiles {
     debug { process.beforeScript = 'echo $HOSTNAME' }
     conda {

From 11829516ff48c42ca0377751e63458141dde6c54 Mon Sep 17 00:00:00 2001
From: Phil Ewels <phil@seqera.io>
Date: Mon, 3 Oct 2022 11:06:49 +0200
Subject: [PATCH 2/2] Changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5b238a419f..9721600cc1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@
 - Add a 'recommend' methods description text to MultiQC to help pipeline users report pipeline usage in publications ([#1749](https://github.com/nf-core/tools/pull/1749))
 - Fix template spacing modified by JINJA ([#1830](https://github.com/nf-core/tools/pull/1830))
 - Fix MultiQC execution on template [#1855](https://github.com/nf-core/tools/pull/1855)
+- Don't skip including `base.config` when skipping nf-core/configs
 
 ### Linting