meta: Fix copyright headers

kirelagin · kirelagin · commit 484b92e24c82 · 2019-05-12T12:04:06.000+02:00
* Use the © symbol, because it is beautiful and compact
* Add year
* Unify the comment style using multiline comments where possible
diff --git a/.stylish-haskell.yaml b/.stylish-haskell.yaml
@@ -1,5 +1,6 @@
-# Copyright Serokell OU <hi@serokell.io>
-# Copyright Lars Jellema <lars.jellema@gmail.com>
+# © 2019 Serokell <hi@serokell.io>
+# © 2019 Lars Jellema <lars.jellema@gmail.com>
+#
 # SPDX-License-Identifier: MPL-2.0
 
 steps:
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,9 @@
-<!-- Copyright Serokell OU <hi@serokell.io> -->
-<!-- Copyright Lars Jellema <lars.jellema@gmail.com> -->
-<!-- SPDX-License-Identifier: MPL-2.0 -->
+<!-- © 2019 Serokell <hi@serokell.io>
+   - © 2019 Lars Jellema <lars.jellema@gmail.com>
+   -
+   - SPDX-License-Identifier: MPL-2.0
+   -->
+
 
 # Revision history for nixfmt
 
diff --git a/README.md b/README.md
@@ -1,6 +1,9 @@
-<!-- Copyright Serokell OU <hi@serokell.io> -->
-<!-- Copyright Lars Jellema <lars.jellema@gmail.com> -->
-<!-- SPDX-License-Identifier: MPL-2.0 -->
+<!-- © 2019 Serokell <hi@serokell.io>
+   - © 2019 Lars Jellema <lars.jellema@gmail.com>
+   -
+   - SPDX-License-Identifier: MPL-2.0
+   -->
+
 
 # `nixfmt`
 
diff --git a/Setup.hs b/Setup.hs
@@ -1,6 +1,8 @@
--- Copyright Serokell OU <hi@serokell.io>
--- Copyright Lars Jellema <lars.jellema@gmail.com>
--- SPDX-License-Identifier: MPL-2.0
+{- © 2019 Serokell <hi@serokell.io>
+ - © 2019 Lars Jellema <lars.jellema@gmail.com>
+ -
+ - SPDX-License-Identifier: MPL-2.0
+ -}
 
 import Distribution.Simple
 main = defaultMain
diff --git a/default.nix b/default.nix
@@ -1,5 +1,6 @@
-# Copyright Serokell OU <hi@serokell.io>
-# Copyright Lars Jellema <lars.jellema@gmail.com>
+# © 2019 Serokell <hi@serokell.io>
+# © Lars Jellema <lars.jellema@gmail.com>
+#
 # SPDX-License-Identifier: MPL-2.0
 
 { pkgs ? import <nixpkgs> { } }:
diff --git a/js/JSInterface.hs b/js/JSInterface.hs
@@ -1,5 +1,7 @@
--- Copyright Serokell OU <hi@serokell.io>
--- SPDX-License-Identifier: MPL-2.0
+{- © 2019 Serokell <hi@serokell.io>
+ -
+ - SPDX-License-Identifier: MPL-2.0
+ -}
 
 {-# LANGUAGE OverloadedStrings #-}
 import GHCJS.Marshal
diff --git a/js/index.html b/js/index.html
@@ -1,8 +1,10 @@
 <!DOCTYPE html>
-<!--
-Copyright Serokell OU <hi@serokell.io>
-SPDX-License-Identifier: MPL-2.0
--->
+
+<!-- © 2019 Serokell <hi@serokell.io>
+   -
+   - SPDX-License-Identifier: MPL-2.0
+   -->
+
 <html>
   <head>
     <title>nixfmt online demo</title>
diff --git a/js/js-interface-wrapper.js b/js/js-interface-wrapper.js
@@ -1,7 +1,7 @@
-/*
-Copyright Serokell OU <hi@serokell.io>
-SPDX-License-Identifier: MPL-2.0
-*/
+/* © 2019 Serokell <hi@serokell.io>
+ *
+ * SPDX-License-Identifier: MPL-2.0
+ */
 
 function nixfmt(text, width=80, filename="<stdin>") {
     const param = {width, filename}
diff --git a/main/Main.hs b/main/Main.hs
@@ -1,6 +1,8 @@
--- Copyright Serokell OU <hi@serokell.io>
--- Copyright Lars Jellema <lars.jellema@gmail.com>
--- SPDX-License-Identifier: MPL-2.0
+{- © 2019 Serokell <hi@serokell.io>
+ - © 2019Lars Jellema <lars.jellema@gmail.com>
+ -
+ - SPDX-License-Identifier: MPL-2.0
+ -}
 
 {-# LANGUAGE DeriveDataTypeable #-}
 
diff --git a/nixfmt.cabal b/nixfmt.cabal
@@ -1,9 +1,10 @@
--- Copyright Serokell OU <hi@serokell.io>
--- Copyright Lars Jellema <lars.jellema@gmail.com>
--- SPDX-License-Identifier: MPL-2.0
-
 cabal-version:       >=1.10
 
+-- © 2019 Serokell <hi@serokell.io>
+-- © 2019 Lars Jellema <lars.jellema@gmail.com>
+--
+-- SPDX-License-Identifier: MPL-2.0
+
 name:                nixfmt
 version:             0.1.0
 synopsis:            An opinionated formatter for Nix
@@ -14,7 +15,7 @@ license:             MPL-2.0
 license-file:        LICENSE
 author:              Lars Jellema
 maintainer:          lars.jellema@gmail.com
--- copyright:
+copyright:           2019 Serokell, 2019 Lars Jellema
 category:            Development
 build-type:          Simple
 extra-source-files:  README.md, CHANGELOG.md
diff --git a/release.nix b/release.nix
@@ -1,3 +1,8 @@
+# © 2019 Serokell <hi@serokell.io>
+# © Lars Jellema <lars.jellema@gmail.com>
+#
+# SPDX-License-Identifier: MPL-2.0
+
 let
   pkgs = import <nixpkgs> { };
   inherit (pkgs) haskell;
diff --git a/shell.nix b/shell.nix
@@ -1,5 +1,6 @@
-# Copyright Serokell OU <hi@serokell.io>
-# Copyright Lars Jellema <lars.jellema@gmail.com>
+# © 2019 Serokell <hi@serokell.io>
+# © Lars Jellema <lars.jellema@gmail.com>
+#
 # SPDX-License-Identifier: MPL-2.0
 
 { pkgs ? import <nixpkgs> { } }:
diff --git a/src/Nixfmt.hs b/src/Nixfmt.hs
@@ -1,6 +1,8 @@
--- Copyright Serokell OU <hi@serokell.io>
--- Copyright Lars Jellema <lars.jellema@gmail.com>
--- SPDX-License-Identifier: MPL-2.0
+{- © 2019 Serokell <hi@serokell.io>
+ - © 2019 Lars Jellema <lars.jellema@gmail.com>
+ -
+ - SPDX-License-Identifier: MPL-2.0
+ -}
 
 module Nixfmt
     ( errorBundlePretty
diff --git a/src/Nixfmt/Lexer.hs b/src/Nixfmt/Lexer.hs
@@ -1,6 +1,8 @@
--- Copyright Serokell OU <hi@serokell.io>
--- Copyright Lars Jellema <lars.jellema@gmail.com>
--- SPDX-License-Identifier: MPL-2.0
+{- © 2019 Serokell <hi@serokell.io>
+ - © 2019 Lars Jellema <lars.jellema@gmail.com>
+ -
+ - SPDX-License-Identifier: MPL-2.0
+ -}
 
 {-# LANGUAGE LambdaCase, OverloadedStrings #-}
 
diff --git a/src/Nixfmt/Parser.hs b/src/Nixfmt/Parser.hs
@@ -1,6 +1,8 @@
--- Copyright Serokell OU <hi@serokell.io>
--- Copyright Lars Jellema <lars.jellema@gmail.com>
--- SPDX-License-Identifier: MPL-2.0
+{- © 2019 Serokell <hi@serokell.io>
+ - © 2019 Lars Jellema <lars.jellema@gmail.com>
+ -
+ - SPDX-License-Identifier: MPL-2.0
+ -}
 
 {-# LANGUAGE LambdaCase, OverloadedStrings #-}
 
diff --git a/src/Nixfmt/Predoc.hs b/src/Nixfmt/Predoc.hs
@@ -1,6 +1,8 @@
--- Copyright Serokell OU <hi@serokell.io>
--- Copyright Lars Jellema <lars.jellema@gmail.com>
--- SPDX-License-Identifier: MPL-2.0
+{- © 2019 Serokell <hi@serokell.io>
+ - © 2019 Lars Jellema <lars.jellema@gmail.com>
+ -
+ - SPDX-License-Identifier: MPL-2.0
+ -}
 
 {-# LANGUAGE DeriveFoldable, DeriveFunctor, FlexibleInstances,
              OverloadedStrings, StandaloneDeriving #-}
diff --git a/src/Nixfmt/Pretty.hs b/src/Nixfmt/Pretty.hs
@@ -1,6 +1,8 @@
--- Copyright Serokell OU <hi@serokell.io>
--- Copyright Lars Jellema <lars.jellema@gmail.com>
--- SPDX-License-Identifier: MPL-2.0
+{- © 2019 Serokell <hi@serokell.io>
+ - © 2019 Lars Jellema <lars.jellema@gmail.com>
+ -
+ - SPDX-License-Identifier: MPL-2.0
+ -}
 
 {-# LANGUAGE FlexibleInstances, LambdaCase, OverloadedStrings #-}
 
diff --git a/src/Nixfmt/Types.hs b/src/Nixfmt/Types.hs
@@ -1,6 +1,8 @@
--- Copyright Serokell OU <hi@serokell.io>
--- Copyright Lars Jellema <lars.jellema@gmail.com>
--- SPDX-License-Identifier: MPL-2.0
+{- © 2019 Serokell <hi@serokell.io>
+ - © 2019 Lars Jellema <lars.jellema@gmail.com>
+ -
+ - SPDX-License-Identifier: MPL-2.0
+ -}
 
 {-# LANGUAGE OverloadedStrings #-}
 
diff --git a/src/Nixfmt/Util.hs b/src/Nixfmt/Util.hs
@@ -1,6 +1,8 @@
--- Copyright Serokell OU <hi@serokell.io>
--- Copyright Lars Jellema <lars.jellema@gmail.com>
--- SPDX-License-Identifier: MPL-2.0
+{- © 2019 Serokell <hi@serokell.io>
+ - © 2019 Lars Jellema <lars.jellema@gmail.com>
+ -
+ - SPDX-License-Identifier: MPL-2.0
+ -}
 
 module Nixfmt.Util
     ( manyP
