Merge pull request #132 from serokell/release

Release preparations

CHANGELOG.md

@@ -9,6 +9,8 @@
 
 ## Unreleased
 
+## 0.6.0 -- 2023-10-31
+
 * Fix escaping of interpolations after dollar signs.
 * Fix nixfmt trying to allocate temp files that aren't used.
 * Don't write if files didn't change, fixing treefmt compatibility

MAINTENANCE.md

@@ -0,0 +1,14 @@
+<!-- © 2023 piegames <git@piegames.de>
+ -
+ - SPDX-License-Identifier: MPL-2.0
+ -->
+
+# Maintainer documentation
+
+## Making a new release
+
+- Check the commit log if anything is missing from the change log.
+- Check dependency versions in `nixfmt.cabal`, bump upper bounds if possible.
+- Bump the version.
+- Give it a git tag.
+- Upload to hackage using `cabal sdist`. See https://hackage.haskell.org/upload for details.

README.md

@@ -48,11 +48,6 @@ Haskell dependencies will be built by Cabal.
 * `nixfmt file.nix` – format the file in place
 
 
-## For Contributors
-
-We welcome issues and pull requests on GitHub.
-
-
 ## About Serokell
 
 `nixfmt` is maintained and funded with :heart: by

flake.nix

@@ -8,7 +8,7 @@
 
  inputs = {
  nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
- nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-22.05";
+ nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-23.05";
 
  flake-utils.url = "github:numtide/flake-utils";
 

nixfmt.cabal

@@ -6,7 +6,7 @@ cabal-version: 2.0
 -- SPDX-License-Identifier: MPL-2.0
 
 name: nixfmt
-version: 0.5.0
+version: 0.6.0
 synopsis: An opinionated formatter for Nix
 description:
  A formatter for Nix that ensures consistent and clear formatting by forgetting
@@ -41,11 +41,11 @@ executable nixfmt
  else
  buildable: True
  build-depends:
- base >= 4.12.0 && < 4.17
+ base >= 4.12.0 && < 4.19
  , cmdargs >= 0.10.20 && < 0.11
  , nixfmt
- , unix >= 2.7.2 && < 2.8
- , text >= 1.2.3 && < 1.3
+ , unix >= 2.7.2 && < 2.9
+ , text >= 1.2.3 && < 2.2
 
  -- for System.IO.Atomic
  , directory >= 1.3.3 && < 1.4
@@ -86,11 +86,11 @@ library
 
  hs-source-dirs: src
  build-depends:
- base >= 4.12.0 && < 4.17
- , megaparsec >= 9.0.1 && < 9.3
+ base >= 4.12.0 && < 4.19
+ , megaparsec >= 9.0.1 && < 9.6
  , parser-combinators >= 1.0.3 && < 1.4
  , scientific >= 0.3.0 && < 0.4.0
- , text >= 1.2.3 && < 1.3
+ , text >= 1.2.3 && < 2.2
  default-language: Haskell2010
  ghc-options:
  -Wall
@@ -113,7 +113,7 @@ executable js-interface
  -Wredundant-constraints
  -Wno-orphans
  build-depends:
- base >= 4.12.0 && < 4.17
+ base >= 4.12.0 && < 4.19
  , ghcjs-base >= 0.2.0 && < 0.3
  , nixfmt
  hs-source-dirs: js/

src/Nixfmt.hs

@@ -7,6 +7,7 @@
 module Nixfmt
  ( errorBundlePretty
  , ParseErrorBundle
+ , Width
  , format
  , formatVerify
  ) where

src/Nixfmt/Parser/Float.hs

@@ -4,7 +4,7 @@
  - SPDX-License-Identifier: MPL-2.0
  -}
 
-{-# LANGUAGE TypeFamilies, TypeApplications, ScopedTypeVariables #-}
+{-# LANGUAGE TypeFamilies, TypeApplications, ScopedTypeVariables, TypeOperators #-}
 
 module Nixfmt.Parser.Float (floatParse) where
 

src/Nixfmt/Predoc.hs

@@ -24,6 +24,7 @@ module Nixfmt.Predoc
  , hardline
  , emptyline
  , newline
+ , DocE
  , Doc
  , Pretty
  , pretty