Skip to content

Commit

Permalink
meta: Fix copyright headers
Browse files Browse the repository at this point in the history 
* Use the © symbol, because it is beautiful and compact
* Add year
* Unify the comment style using multiline comments where possible
  • Loading branch information
@kirelagin
kirelagin committed May 12, 2019
1 parent ec767f0 commit 484b92e
Show file tree
Hide file tree
Showing 19 changed files with 91 additions and 54 deletions.
5 changes: 3 additions & 2 deletions .stylish-haskell.yaml
View file
@@ -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:
Expand Down
9 changes: 6 additions & 3 deletions CHANGELOG.md
View file
@@ -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

Expand Down
9 changes: 6 additions & 3 deletions README.md
View file
@@ -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`

Expand Down
8 changes: 5 additions & 3 deletions Setup.hs
View file
@@ -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
5 changes: 3 additions & 2 deletions default.nix
View file
@@ -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> { } }:
Expand Down
6 changes: 4 additions & 2 deletions js/JSInterface.hs
View file
@@ -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
Expand Down
10 changes: 6 additions & 4 deletions js/index.html
View file
@@ -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>
Expand Down
8 changes: 4 additions & 4 deletions js/js-interface-wrapper.js
View file
@@ -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}
Expand Down
8 changes: 5 additions & 3 deletions main/Main.hs
View file
@@ -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 #-}

Expand Down
11 changes: 6 additions & 5 deletions nixfmt.cabal
View file
@@ -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
Expand All @@ -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
Expand Down
5 changes: 5 additions & 0 deletions release.nix
View file
@@ -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;
Expand Down
5 changes: 3 additions & 2 deletions shell.nix
View file
@@ -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> { } }:
Expand Down
8 changes: 5 additions & 3 deletions src/Nixfmt.hs
View file
@@ -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
Expand Down
8 changes: 5 additions & 3 deletions src/Nixfmt/Lexer.hs
View file
@@ -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 #-}

Expand Down
8 changes: 5 additions & 3 deletions src/Nixfmt/Parser.hs
View file
@@ -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 #-}

Expand Down
8 changes: 5 additions & 3 deletions src/Nixfmt/Predoc.hs
View file
@@ -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 #-}
Expand Down
8 changes: 5 additions & 3 deletions src/Nixfmt/Pretty.hs
View file
@@ -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 #-}

Expand Down
8 changes: 5 additions & 3 deletions src/Nixfmt/Types.hs
View file
@@ -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 #-}

Expand Down
8 changes: 5 additions & 3 deletions src/Nixfmt/Util.hs
View file
@@ -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
Expand Down

0 comments on commit 484b92e

Please sign in to comment.