From 18fe24f335f4b841b7f6354e7a86eae0103943af Mon Sep 17 00:00:00 2001 From: Kevin Amado Date: Wed, 22 Jun 2022 15:51:54 -0600 Subject: [PATCH] feat: release 1.5.0 --- .pre-commit-entry.sh | 2 +- CHANGELOG.md | 18 +++++++++++--- Cargo.lock | 4 +-- README.md | 38 +++++++++++++++-------------- flake.nix | 2 +- front/Cargo.lock | 4 +-- front/Cargo.toml | 2 +- integrations/pre-commit/README.md | 2 +- integrations/vscode/package.json | 2 +- src/alejandra_cli/Cargo.toml | 2 +- src/alejandra_engine/Cargo.toml | 2 +- src/alejandra_engine/src/version.rs | 2 +- 12 files changed, 46 insertions(+), 34 deletions(-) diff --git a/.pre-commit-entry.sh b/.pre-commit-entry.sh index b48a02e..a417aac 100755 --- a/.pre-commit-entry.sh +++ b/.pre-commit-entry.sh @@ -20,7 +20,7 @@ echo INFO: building Alejandra nix-build \ --attr ${system} \ --out-link result-alejandra \ - https://github.com/kamadorueda/alejandra/tarball/1.4.0 + https://github.com/kamadorueda/alejandra/tarball/1.5.0 echo INFO: running Alejandra: result-alejandra/bin/alejandra -- -q "${@}" diff --git a/CHANGELOG.md b/CHANGELOG.md index e85f430..afda1a4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,18 +20,27 @@ Types of changes +## [1.5.0] - 2022-06-22 + +### Changed + +- Updated dependencies to its latest version. + ## [1.4.0] - 2022-05-19 ### Added @@ -574,7 +583,8 @@ Before releasing update dependencies with: --- -[unreleased]: https://github.com/kamadorueda/alejandra/compare/1.4.0...HEAD +[unreleased]: https://github.com/kamadorueda/alejandra/compare/1.5.0...HEAD +[1.5.0]: https://github.com/kamadorueda/alejandra/compare/1.4.0...1.5.0 [1.4.0]: https://github.com/kamadorueda/alejandra/compare/1.3.0...1.4.0 [1.3.0]: https://github.com/kamadorueda/alejandra/compare/1.2.0...1.3.0 [1.2.0]: https://github.com/kamadorueda/alejandra/compare/1.1.0...1.2.0 diff --git a/Cargo.lock b/Cargo.lock index fe370a1..685cd3d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4,7 +4,7 @@ version = 3 [[package]] name = "alejandra_cli" -version = "1.4.0" +version = "1.5.0" dependencies = [ "alejandra_engine", "atty", @@ -18,7 +18,7 @@ dependencies = [ [[package]] name = "alejandra_engine" -version = "1.4.0" +version = "1.5.0" dependencies = [ "mimalloc", "rnix", diff --git a/README.md b/README.md index de2430b..2ed7982 100644 --- a/README.md +++ b/README.md @@ -110,11 +110,11 @@ Please visit: You can download a binary for your platform: -- [aarch64-unknown-linux-musl](https://github.com/kamadorueda/alejandra/releases/download/1.4.0/alejandra-aarch64-unknown-linux-musl) -- [armv6l-unknown-linux-musleabihf](https://github.com/kamadorueda/alejandra/releases/download/1.4.0/alejandra-armv6l-unknown-linux-musleabihf) -- [armv7l-unknown-linux-musleabihf](https://github.com/kamadorueda/alejandra/releases/download/1.4.0/alejandra-armv7l-unknown-linux-musleabihf) -- [i686-unknown-linux-musl](https://github.com/kamadorueda/alejandra/releases/download/1.4.0/alejandra-i686-unknown-linux-musl) -- [x86_64-unknown-linux-musl](https://github.com/kamadorueda/alejandra/releases/download/1.4.0/alejandra-x86_64-unknown-linux-musl) +- [aarch64-unknown-linux-musl](https://github.com/kamadorueda/alejandra/releases/download/1.5.0/alejandra-aarch64-unknown-linux-musl) +- [armv6l-unknown-linux-musleabihf](https://github.com/kamadorueda/alejandra/releases/download/1.5.0/alejandra-armv6l-unknown-linux-musleabihf) +- [armv7l-unknown-linux-musleabihf](https://github.com/kamadorueda/alejandra/releases/download/1.5.0/alejandra-armv7l-unknown-linux-musleabihf) +- [i686-unknown-linux-musl](https://github.com/kamadorueda/alejandra/releases/download/1.5.0/alejandra-i686-unknown-linux-musl) +- [x86_64-unknown-linux-musl](https://github.com/kamadorueda/alejandra/releases/download/1.5.0/alejandra-x86_64-unknown-linux-musl) Make it executable (`$ chmod +x`) and run Alejandra with: @@ -138,7 +138,7 @@ Please visit: [search.nixos.org/packages?query=alejandra](https://search.nixos.o - Nix with [Flakes](https://nixos.wiki/wiki/Flakes): ```bash - $ nix profile install github:kamadorueda/alejandra/1.4.0 + $ nix profile install github:kamadorueda/alejandra/1.5.0 ``` - Nix stable: @@ -146,11 +146,11 @@ Please visit: [search.nixos.org/packages?query=alejandra](https://search.nixos.o Pick one depending on your platform: ```bash - $ nix-env -ivA aarch64-darwin -f https://github.com/kamadorueda/alejandra/tarball/1.4.0 - $ nix-env -ivA aarch64-linux -f https://github.com/kamadorueda/alejandra/tarball/1.4.0 - $ nix-env -ivA i686-linux -f https://github.com/kamadorueda/alejandra/tarball/1.4.0 - $ nix-env -ivA x86_64-darwin -f https://github.com/kamadorueda/alejandra/tarball/1.4.0 - $ nix-env -ivA x86_64-linux -f https://github.com/kamadorueda/alejandra/tarball/1.4.0 + $ nix-env -ivA aarch64-darwin -f https://github.com/kamadorueda/alejandra/tarball/1.5.0 + $ nix-env -ivA aarch64-linux -f https://github.com/kamadorueda/alejandra/tarball/1.5.0 + $ nix-env -ivA i686-linux -f https://github.com/kamadorueda/alejandra/tarball/1.5.0 + $ nix-env -ivA x86_64-darwin -f https://github.com/kamadorueda/alejandra/tarball/1.5.0 + $ nix-env -ivA x86_64-linux -f https://github.com/kamadorueda/alejandra/tarball/1.5.0 ``` Then run Alejandra with: @@ -168,7 +168,7 @@ $ alejandra --help inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"; - alejandra.url = "github:kamadorueda/alejandra/1.4.0"; + alejandra.url = "github:kamadorueda/alejandra/1.5.0"; alejandra.inputs.nixpkgs.follows = "nixpkgs"; }; @@ -198,7 +198,7 @@ $ alejandra --help let alejandra = (import (builtins.fetchTarball { - url = "https://github.com/kamadorueda/alejandra/tarball/1.4.0"; + url = "https://github.com/kamadorueda/alejandra/tarball/1.5.0"; sha256 = "0000000000000000000000000000000000000000000000000000"; })) # Pick one from: aarch64-darwin, aarch64-linux, i686-linux, x86_64-darwin, x86_64-linux @@ -310,17 +310,17 @@ Thank you ❤️ 1. Checkout [Nixpkgs](https://github.com/nixos/nixpkgs) and run: ```bash - $ nix-env -qaP --json --drv-path > before + $ nix-env -qaf . --drv-path --xml > before ``` 1. Now format with Alejandra and run: ```bash - $ nix-env -qaP --json --drv-path > after + $ nix-env -qaf . --drv-path --xml > after ``` - As of 2022-02-21, - there are 46 differences in a set of 36314 derivations + As of 2022-06-22, + there are 41 differences in a set of 38109 derivations because of things like this: ``` @@ -331,6 +331,8 @@ Thank you ❤️ you get a semantical difference. This is something that should be solved on Nixpkgs - and not a bug in Alejandra. For example: + and not a bug in Alejandra. + For example: + - https://github.com/NixOS/nixpkgs/pull/178378 - https://github.com/NixOS/nixpkgs/pull/157760 diff --git a/flake.nix b/flake.nix index da25b52..4137baf 100644 --- a/flake.nix +++ b/flake.nix @@ -11,7 +11,7 @@ outputs = inputs: let commit = inputs.self.shortRev or "dirty"; date = inputs.self.lastModifiedDate or inputs.self.lastModified or "19700101"; - version = "1.4.0+${builtins.substring 0 8 date}.${commit}"; + version = "1.5.0+${builtins.substring 0 8 date}.${commit}"; nixpkgsForHost = host: import inputs.nixpkgs { diff --git a/front/Cargo.lock b/front/Cargo.lock index 5a6a108..89fc904 100644 --- a/front/Cargo.lock +++ b/front/Cargo.lock @@ -4,7 +4,7 @@ version = 3 [[package]] name = "alejandra_engine" -version = "1.4.0" +version = "1.5.0" dependencies = [ "mimalloc", "rnix", @@ -13,7 +13,7 @@ dependencies = [ [[package]] name = "alejandra_front" -version = "1.4.0" +version = "1.5.0" dependencies = [ "alejandra_engine", "console_error_panic_hook", diff --git a/front/Cargo.toml b/front/Cargo.toml index 1370a4a..a8afbb6 100644 --- a/front/Cargo.toml +++ b/front/Cargo.toml @@ -13,7 +13,7 @@ description = "The Uncompromising Nix Code Formatter" edition = "2021" name = "alejandra_front" repository = "https://github.com/kamadorueda/alejandra" -version = "1.4.0" +version = "1.5.0" [profile.release] lto = true diff --git a/integrations/pre-commit/README.md b/integrations/pre-commit/README.md index dcffea9..bcb213e 100644 --- a/integrations/pre-commit/README.md +++ b/integrations/pre-commit/README.md @@ -8,7 +8,7 @@ with contents: ```yaml repos: - repo: https://github.com/kamadorueda/alejandra - rev: 1.4.0 + rev: 1.5.0 # Choose either the 'alejandra' or 'alejandra-system' hook # depending on what pre-requisites you have: hooks: diff --git a/integrations/vscode/package.json b/integrations/vscode/package.json index c079658..9ac7e29 100644 --- a/integrations/vscode/package.json +++ b/integrations/vscode/package.json @@ -65,5 +65,5 @@ "type": "git", "url": "https://github.com/kamadorueda/alejandra" }, - "version": "1.4.0" + "version": "1.5.0" } diff --git a/src/alejandra_cli/Cargo.toml b/src/alejandra_cli/Cargo.toml index 8c45b9c..21e9a24 100644 --- a/src/alejandra_cli/Cargo.toml +++ b/src/alejandra_cli/Cargo.toml @@ -19,4 +19,4 @@ edition = "2021" license = "Unlicense" name = "alejandra_cli" repository = "https://github.com/kamadorueda/alejandra" -version = "1.4.0" +version = "1.5.0" diff --git a/src/alejandra_engine/Cargo.toml b/src/alejandra_engine/Cargo.toml index 81ae3f4..b181cfa 100644 --- a/src/alejandra_engine/Cargo.toml +++ b/src/alejandra_engine/Cargo.toml @@ -33,4 +33,4 @@ edition = "2021" license = "Unlicense" name = "alejandra_engine" repository = "https://github.com/kamadorueda/alejandra" -version = "1.4.0" +version = "1.5.0" diff --git a/src/alejandra_engine/src/version.rs b/src/alejandra_engine/src/version.rs index 48a0e4c..b076346 100644 --- a/src/alejandra_engine/src/version.rs +++ b/src/alejandra_engine/src/version.rs @@ -1 +1 @@ -pub const VERSION: &str = "1.4.0"; +pub const VERSION: &str = "1.5.0";