diff --git a/.reuse/dep5 b/.reuse/dep5 index adf3c9d7..f844c95b 100644 --- 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 - 2019 Lars Jellema -License: MPL-2.0 - -Files: npins/* -Copyright: 2024 Silvan Mosberger -License: MPL-2.0 - -Files: test/diff/* -Copyright: 2024 piegames -License: MPL-2.0 - -Files: test/correct/* -Copyright: 2022 Serokell - 2022 Lars Jellema -License: MPL-2.0 - -Files: test/changed/* -Copyright: 2022 Serokell - 2022 Lars Jellema -License: MPL-2.0 - -Files: test/invalid/* -Copyright: 2022 Serokell - 2022 Lars Jellema -License: MPL-2.0 - -Files: flake.lock -Copyright: 2020 Serokell - 2022 Yorick van Pelt +Files: * +Copyright: 2019-2022 Serokell + 2019-2022 Lars Jellema + 2023-2024 piegames + 2024 Silvan Mosberger License: MPL-2.0 diff --git a/CHANGELOG.md b/CHANGELOG.md index 0322c7a1..4c8dc922 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,10 +1,3 @@ - - - # Revision history for nixfmt ## Unreleased diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index ad44e371..b81e2fd6 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,9 +1,3 @@ - - # Contribution Guidelines We welcome issues and pull requests at https://github.com/serokell/nixfmt. diff --git a/MAINTENANCE.md b/MAINTENANCE.md index a50a8a35..172b9901 100644 --- a/MAINTENANCE.md +++ b/MAINTENANCE.md @@ -1,8 +1,3 @@ - - # Maintainer documentation ## Making a new release diff --git a/README.md b/README.md index 2979ccd4..d0d80773 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,3 @@ - - # `nixfmt` `nixfmt` is a formatter for Nix code, intended to easily apply a uniform style. diff --git a/default.nix b/default.nix index 7e4a8de8..c634445d 100644 --- a/default.nix +++ b/default.nix @@ -1,9 +1,3 @@ -# © 2019 Serokell -# © 2019 Lars Jellema -# © 2024 Silvan Mosberger -# -# SPDX-License-Identifier: MPL-2.0 - let sources = import ./npins; in diff --git a/flake.nix b/flake.nix index 7aeb170e..bb3c4fb5 100644 --- a/flake.nix +++ b/flake.nix @@ -1,7 +1,3 @@ -# © 2019 Serokell -# © 2019 Lars Jellema -# -# SPDX-License-Identifier: MPL-2.0 { inputs.flake-utils.url = "github:numtide/flake-utils"; diff --git a/main/Main.hs b/main/Main.hs index 04d2754d..ac243a9d 100644 --- a/main/Main.hs +++ b/main/Main.hs @@ -1,9 +1,3 @@ -{- © 2019 Serokell - - © 2019 Lars Jellema - - - - 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 index b02fa88b..91e36097 100644 --- a/main/System/IO/Atomic.hs +++ b/main/System/IO/Atomic.hs @@ -1,8 +1,3 @@ -{- © 2019 Serokell - - - - 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 index 83678fa1..a53fc05c 100644 --- a/main/System/IO/Utf8.hs +++ b/main/System/IO/Utf8.hs @@ -1,8 +1,3 @@ -{- © 2019 Serokell - - - - SPDX-License-Identifier: MPL-2.0 - -} - {-# LANGUAGE LambdaCase #-} {-# LANGUAGE ViewPatterns #-} diff --git a/nixfmt.cabal b/nixfmt.cabal index 776d1f80..99bd48b1 100644 --- a/nixfmt.cabal +++ b/nixfmt.cabal @@ -1,10 +1,4 @@ cabal-version: 2.0 - --- © 2022 Serokell --- © 2022 Lars Jellema --- --- 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 index 1f6114d8..fbd4670b 100644 --- a/shell.nix +++ b/shell.nix @@ -1,3 +1 @@ -# © 2024 Silvan Mosberger -# SPDX-License-Identifier: MPL-2.0 (import ./default.nix { }).shell diff --git a/src/Nixfmt.hs b/src/Nixfmt.hs index 6bf93190..4b3648df 100644 --- a/src/Nixfmt.hs +++ b/src/Nixfmt.hs @@ -1,9 +1,3 @@ -{- © 2019 Serokell - - © 2019 Lars Jellema - - - - SPDX-License-Identifier: MPL-2.0 - -} - module Nixfmt ( errorBundlePretty , ParseErrorBundle diff --git a/src/Nixfmt/Lexer.hs b/src/Nixfmt/Lexer.hs index 3b5a6dcd..82da9ab7 100644 --- a/src/Nixfmt/Lexer.hs +++ b/src/Nixfmt/Lexer.hs @@ -1,9 +1,3 @@ -{- © 2019 Serokell - - © 2019 Lars Jellema - - - - 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 index 92ca7622..2cb96b02 100644 --- a/src/Nixfmt/Parser.hs +++ b/src/Nixfmt/Parser.hs @@ -1,9 +1,3 @@ -{- © 2019 Serokell - - © 2019 Lars Jellema - - - - 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 index 660ac839..e77845f1 100644 --- a/src/Nixfmt/Parser/Float.hs +++ b/src/Nixfmt/Parser/Float.hs @@ -1,9 +1,3 @@ -{- © 2022 Serokell - - © 2022 Lars Jellema - - - - 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 index a4934478..3ddf7826 100644 --- a/src/Nixfmt/Predoc.hs +++ b/src/Nixfmt/Predoc.hs @@ -1,9 +1,3 @@ -{- © 2019 Serokell - - © 2019 Lars Jellema - - - - 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 index d0cf7b09..19b163c8 100644 --- a/src/Nixfmt/Pretty.hs +++ b/src/Nixfmt/Pretty.hs @@ -1,9 +1,3 @@ -{- © 2019 Serokell - - © 2019 Lars Jellema - - - - 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 index c3530746..242895a5 100644 --- a/src/Nixfmt/Types.hs +++ b/src/Nixfmt/Types.hs @@ -1,9 +1,3 @@ -{- © 2019 Serokell - - © 2019 Lars Jellema - - - - 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 index 0fab01a4..021fc72a 100644 --- a/src/Nixfmt/Util.hs +++ b/src/Nixfmt/Util.hs @@ -1,9 +1,3 @@ -{- © 2019 Serokell - - © 2019 Lars Jellema - - - - SPDX-License-Identifier: MPL-2.0 - -} - {-# LANGUAGE TupleSections #-} module Nixfmt.Util diff --git a/standard.md b/standard.md index aa409c6d..d8be3b0d 100644 --- a/standard.md +++ b/standard.md @@ -1,9 +1,3 @@ - - # 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 index 35263f0f..594e51e1 100644 --- a/team/README.md +++ b/team/README.md @@ -1,8 +1,3 @@ - - # Nix formatting team This page collects information and processes for the Nix formatting team. diff --git a/test/README.md b/test/README.md index 8c1dfe4c..270827f9 100644 --- a/test/README.md +++ b/test/README.md @@ -1,9 +1,3 @@ - - 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 index 8bdef272..4862dcca 100755 --- a/test/test.sh +++ b/test/test.sh @@ -1,6 +1,4 @@ #!/usr/bin/env bash -# © 2024 piegames -# SPDX-License-Identifier: MPL-2.0 set -euo pipefail