Skip to content

Commit

Permalink
Merge pull request #132 from serokell/release
Browse files Browse the repository at this point in the history
Release preparations
  • Loading branch information
infinisil authored Oct 31, 2023
2 parents 141b9b1 + 8b6ccc6 commit 7e9e06e
Show file tree
Hide file tree
Showing 9 changed files with 59 additions and 28 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
14 changes: 14 additions & 0 deletions MAINTENANCE.md
Original file line number Diff line number Diff line change
@@ -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.
5 changes: 0 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
44 changes: 31 additions & 13 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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";

Expand Down
16 changes: 8 additions & 8 deletions nixfmt.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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/
Expand Down
1 change: 1 addition & 0 deletions src/Nixfmt.hs
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
module Nixfmt
( errorBundlePretty
, ParseErrorBundle
, Width
, format
, formatVerify
) where
Expand Down
2 changes: 1 addition & 1 deletion src/Nixfmt/Parser/Float.hs
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
1 change: 1 addition & 0 deletions src/Nixfmt/Predoc.hs
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ module Nixfmt.Predoc
, hardline
, emptyline
, newline
, DocE
, Doc
, Pretty
, pretty
Expand Down

0 comments on commit 7e9e06e

Please sign in to comment.