Merge pull request #171 from NixOS/condense-copyright

Condense REUSE 3.0 copyright and license notes
NixOS · Mar 26, 2024 · 2aebff9 · 2aebff9
2 parents a81f922 + c22e51f
commit 2aebff9
Show file tree

Hide file tree

Showing 24 changed files with 5 additions and 156 deletions.
diff --git a/.reuse/dep5 b/.reuse/dep5
@@ -1,34 +1,8 @@
 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 
-Files: .github/ISSUE_TEMPLATE/formatting-suggestion.md
-Copyright: 2019 Serokell <[email protected]>
-           2019 Lars Jellema <[email protected]>
-License: MPL-2.0
-
-Files: npins/*
-Copyright: 2024 Silvan Mosberger <[email protected]>
-License: MPL-2.0
-
-Files: test/diff/*
-Copyright: 2024 piegames <[email protected]>
-License: MPL-2.0
-
-Files: test/correct/*
-Copyright: 2022 Serokell <[email protected]>
-           2022 Lars Jellema <[email protected]>
-License: MPL-2.0
-
-Files: test/changed/*
-Copyright: 2022 Serokell <[email protected]>
-           2022 Lars Jellema <[email protected]>
-License: MPL-2.0
-
-Files: test/invalid/*
-Copyright: 2022 Serokell <[email protected]>
-           2022 Lars Jellema <[email protected]>
-License: MPL-2.0
-
-Files: flake.lock
-Copyright: 2020 Serokell <[email protected]>
-           2022 Yorick van Pelt <[email protected]>
+Files: *
+Copyright: 2019-2022 Serokell <[email protected]>
+           2019-2022 Lars Jellema <[email protected]>
+           2023-2024 piegames <[email protected]>
+           2024 Silvan Mosberger <[email protected]>
 License: MPL-2.0
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,10 +1,3 @@
-<!-- © 2019 Serokell <[email protected]>
-   - © 2019 Lars Jellema <[email protected]>
-   -
-   - SPDX-License-Identifier: MPL-2.0
-   -->
-
-
 # Revision history for nixfmt
 
 ## Unreleased

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -1,9 +1,3 @@
-<!-- © 2019 Serokell <[email protected]>
-   - © 2019 Lars Jellema <[email protected]>
-   -
-   - SPDX-License-Identifier: MPL-2.0
-   -->
-
 # Contribution Guidelines
 
 We welcome issues and pull requests at https://github.com/serokell/nixfmt.

diff --git a/MAINTENANCE.md b/MAINTENANCE.md
@@ -1,8 +1,3 @@
-<!-- © 2023 piegames <[email protected]>
-   -
-   - SPDX-License-Identifier: MPL-2.0
-   -->
-
 # Maintainer documentation
 
 ## Making a new release

diff --git a/README.md b/README.md
@@ -1,9 +1,3 @@
-<!-- © 2019 Serokell <[email protected]>
-   - © 2019 Lars Jellema <[email protected]>
-   -
-   - SPDX-License-Identifier: MPL-2.0
-   -->
-
 # `nixfmt`
 
 `nixfmt` is a formatter for Nix code, intended to easily apply a uniform style.

diff --git a/default.nix b/default.nix
@@ -1,9 +1,3 @@
-# © 2019 Serokell <[email protected]>
-# © 2019 Lars Jellema <[email protected]>
-# © 2024 Silvan Mosberger <[email protected]>
-#
-# SPDX-License-Identifier: MPL-2.0
-
 let
   sources = import ./npins;
 in

diff --git a/flake.nix b/flake.nix
@@ -1,7 +1,3 @@
-# © 2019 Serokell <[email protected]>
-# © 2019 Lars Jellema <[email protected]>
-#
-# SPDX-License-Identifier: MPL-2.0
 {
 
   inputs.flake-utils.url = "github:numtide/flake-utils";

diff --git a/main/Main.hs b/main/Main.hs
@@ -1,9 +1,3 @@
-{- © 2019 Serokell <[email protected]>
- - © 2019 Lars Jellema <[email protected]>
- -
- - SPDX-License-Identifier: MPL-2.0
- -}
-
 {-# LANGUAGE DeriveDataTypeable, NamedFieldPuns, MultiWayIf #-}
 
 module Main where

diff --git a/main/System/IO/Atomic.hs b/main/System/IO/Atomic.hs
@@ -1,8 +1,3 @@
-{- © 2019 Serokell <[email protected]>
- -
- - SPDX-License-Identifier: MPL-2.0
- -}
-
 -- | Atomic file IO.
 --
 -- This modules allows one to replace the contents of a file atomically by

diff --git a/main/System/IO/Utf8.hs b/main/System/IO/Utf8.hs
@@ -1,8 +1,3 @@
-{- © 2019 Serokell <[email protected]>
- -
- - SPDX-License-Identifier: MPL-2.0
- -}
-
 {-# LANGUAGE LambdaCase   #-}
 {-# LANGUAGE ViewPatterns #-}
 

diff --git a/nixfmt.cabal b/nixfmt.cabal
@@ -1,10 +1,4 @@
 cabal-version:       2.0
-
--- © 2022 Serokell <[email protected]>
--- © 2022 Lars Jellema <[email protected]>
---
--- SPDX-License-Identifier: MPL-2.0
-
 name:                nixfmt
 version:             0.6.0
 synopsis:            An opinionated formatter for Nix

diff --git a/shell.nix b/shell.nix
@@ -1,3 +1 @@
-# © 2024 Silvan Mosberger <[email protected]>
-# SPDX-License-Identifier: MPL-2.0
 (import ./default.nix { }).shell
diff --git a/src/Nixfmt.hs b/src/Nixfmt.hs
@@ -1,9 +1,3 @@
-{- © 2019 Serokell <[email protected]>
- - © 2019 Lars Jellema <[email protected]>
- -
- - SPDX-License-Identifier: MPL-2.0
- -}
-
 module Nixfmt
     ( errorBundlePretty
     , ParseErrorBundle

diff --git a/src/Nixfmt/Lexer.hs b/src/Nixfmt/Lexer.hs
@@ -1,9 +1,3 @@
-{- © 2019 Serokell <[email protected]>
- - © 2019 Lars Jellema <[email protected]>
- -
- - SPDX-License-Identifier: MPL-2.0
- -}
-
 {-# LANGUAGE BlockArguments, FlexibleContexts, LambdaCase, OverloadedStrings, TupleSections #-}
 
 module Nixfmt.Lexer (lexeme, pushTrivia, takeTrivia, whole) where

diff --git a/src/Nixfmt/Parser.hs b/src/Nixfmt/Parser.hs
@@ -1,9 +1,3 @@
-{- © 2019 Serokell <[email protected]>
- - © 2019 Lars Jellema <[email protected]>
- -
- - SPDX-License-Identifier: MPL-2.0
- -}
-
 {-# LANGUAGE FlexibleInstances, OverloadedStrings #-}
 
 module Nixfmt.Parser where

diff --git a/src/Nixfmt/Parser/Float.hs b/src/Nixfmt/Parser/Float.hs
@@ -1,9 +1,3 @@
-{- © 2022 Serokell <[email protected]>
- - © 2022 Lars Jellema <[email protected]>
- -
- - SPDX-License-Identifier: MPL-2.0
- -}
-
 {-# LANGUAGE TypeFamilies, TypeApplications, ScopedTypeVariables, TypeOperators #-}
 
 module Nixfmt.Parser.Float (floatParse) where

diff --git a/src/Nixfmt/Predoc.hs b/src/Nixfmt/Predoc.hs
@@ -1,9 +1,3 @@
-{- © 2019 Serokell <[email protected]>
- - © 2019 Lars Jellema <[email protected]>
- -
- - SPDX-License-Identifier: MPL-2.0
- -}
-
 {-# LANGUAGE FlexibleInstances, OverloadedStrings, LambdaCase #-}
 
 module Nixfmt.Predoc

diff --git a/src/Nixfmt/Pretty.hs b/src/Nixfmt/Pretty.hs
@@ -1,9 +1,3 @@
-{- © 2019 Serokell <[email protected]>
- - © 2019 Lars Jellema <[email protected]>
- -
- - SPDX-License-Identifier: MPL-2.0
- -}
-
 {-# LANGUAGE FlexibleInstances, OverloadedStrings, RankNTypes, TupleSections, LambdaCase #-}
 
 module Nixfmt.Pretty where

diff --git a/src/Nixfmt/Types.hs b/src/Nixfmt/Types.hs
@@ -1,9 +1,3 @@
-{- © 2019 Serokell <[email protected]>
- - © 2019 Lars Jellema <[email protected]>
- -
- - SPDX-License-Identifier: MPL-2.0
- -}
-
 {-# LANGUAGE DeriveFoldable, OverloadedStrings, RankNTypes, LambdaCase, TupleSections, FlexibleInstances #-}
 
 module Nixfmt.Types where

diff --git a/src/Nixfmt/Util.hs b/src/Nixfmt/Util.hs
@@ -1,9 +1,3 @@
-{- © 2019 Serokell <[email protected]>
- - © 2019 Lars Jellema <[email protected]>
- -
- - SPDX-License-Identifier: MPL-2.0
- -}
-
 {-# LANGUAGE TupleSections #-}
 
 module Nixfmt.Util

diff --git a/standard.md b/standard.md
@@ -1,9 +1,3 @@
-<!-- © 2024 piegames <[email protected]>
-   - © 2024 Silvan Mosberger <[email protected]>
-   -
-   - SPDX-License-Identifier: MPL-2.0
-   -->
-
 # Standard Nix format
 
 This document describes the standard Nix format, as first established [by RFC 166](https://github.com/NixOS/rfcs/blob/master/rfcs/0166-nix-formatting.md#standard-nix-format).

diff --git a/team/README.md b/team/README.md
@@ -1,8 +1,3 @@
-<!-- © 2024 Silvan Mosberger <[email protected]>
-   -
-   - SPDX-License-Identifier: MPL-2.0
-   -->
-
 # Nix formatting team
 
 This page collects information and processes for the Nix formatting team.

diff --git a/test/README.md b/test/README.md
@@ -1,9 +1,3 @@
-<!-- © 2022 Serokell <[email protected]>
-   - © 2022 Lars Jellema <[email protected]>
-   -
-   - SPDX-License-Identifier: MPL-2.0
-   -->
-
 Tests in `correct` are formatted the way they should be.
 Running `nixfmt --verify` on them should result in the output being the same as
 the input.

diff --git a/test/test.sh b/test/test.sh
@@ -1,6 +1,4 @@
 #!/usr/bin/env bash
-# © 2024 piegames <[email protected]>
-# SPDX-License-Identifier: MPL-2.0
 
 set -euo pipefail