From bf3536b81a6ed5aecb37be0cfe1592043b54b936 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Sun, 8 Mar 2020 05:58:49 +0200 Subject: [PATCH] Don't ignore cabal files commercialhaskell/stack#5210 --- new-template.hsfiles | 1 - rio.hsfiles | 7 +++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/new-template.hsfiles b/new-template.hsfiles index b138e6c..a681f7e 100644 --- a/new-template.hsfiles +++ b/new-template.hsfiles @@ -114,5 +114,4 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. {-# START_FILE .gitignore #-} .stack-work/ -{{name}}.cabal *~ diff --git a/rio.hsfiles b/rio.hsfiles index de6d3f2..342e21a 100644 --- a/rio.hsfiles +++ b/rio.hsfiles @@ -1,5 +1,4 @@ {-# START_FILE .gitignore #-} -*.cabal *~ *.swp tarballs/ @@ -30,10 +29,10 @@ modification, are permitted provided that the following conditions are met: contributors may be used to endorse or promote products derived from this software without specific prior written permission. -THIS SOFTWARE IS PROVIDED BY THE {{copyright}}{{^copyright}}{{year}}{{^year}}2019{{/year}} {{author-name}}{{^author-name}}Author name here{{/author-name}}{{/copyright}} HOLDERS AND CONTRIBUTORS +THIS SOFTWARE IS PROVIDED BY THE {{copyright}}{{^copyright}}{{year}}{{^year}}2020{{/year}} {{author-name}}{{^author-name}}Author name here{{/author-name}}{{/copyright}} HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE {{copyright}}{{^copyright}}{{year}}{{^year}}2019{{/year}} {{author-name}}{{^author-name}}Author name here{{/author-name}}{{/copyright}} +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE {{copyright}}{{^copyright}}{{year}}{{^year}}2020{{/year}} {{author-name}}{{^author-name}}Author name here{{/author-name}}{{/copyright}} OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, @@ -99,7 +98,7 @@ github: {{github-username}}{{^github-username}}githubuser{{/github- license: BSD3 author: {{author-name}}{{^author-name}}Author name here{{/author-name}} maintainer: {{author-email}}{{^author-email}}example@example.com{{/author-email}} -copyright: {{copyright}}{{^copyright}}{{year}}{{^year}}2019{{/year}} {{author-name}}{{^author-name}}Author name here{{/author-name}}{{/copyright}} +copyright: {{copyright}}{{^copyright}}{{year}}{{^year}}2020{{/year}} {{author-name}}{{^author-name}}Author name here{{/author-name}}{{/copyright}} extra-source-files: - README.md