diff --git a/.pre-commit-entry.sh b/.pre-commit-entry.sh index a417aac..7880333 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.5.0 + https://github.com/kamadorueda/alejandra/tarball/2.0.0 echo INFO: running Alejandra: result-alejandra/bin/alejandra -- -q "${@}" diff --git a/CHANGELOG.md b/CHANGELOG.md index 4ba8893..be5989f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,8 @@ Types of changes - Security in case of vulnerabilities. --> +## [2.0.0] - 2022-07-13 + ### Added - A [Style Guide](./STYLE.md), @@ -639,7 +641,8 @@ Types of changes --- -[unreleased]: https://github.com/kamadorueda/alejandra/compare/1.5.0...HEAD +[unreleased]: https://github.com/kamadorueda/alejandra/compare/2.0.0...HEAD +[2.0.0]: https://github.com/kamadorueda/alejandra/compare/1.5.0...2.0.0 [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 diff --git a/Cargo.lock b/Cargo.lock index 2f383e4..b71706e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4,7 +4,7 @@ version = 3 [[package]] name = "alejandra" -version = "1.5.0" +version = "2.0.0" dependencies = [ "mimalloc", "rnix", @@ -13,7 +13,7 @@ dependencies = [ [[package]] name = "alejandra_cli" -version = "1.5.0" +version = "2.0.0" dependencies = [ "alejandra", "atty", diff --git a/README.md b/README.md index 5730447..25dd518 100644 --- a/README.md +++ b/README.md @@ -113,11 +113,11 @@ Please visit: You can download a binary for your platform: -- [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) +- [aarch64-unknown-linux-musl](https://github.com/kamadorueda/alejandra/releases/download/2.0.0/alejandra-aarch64-unknown-linux-musl) +- [armv6l-unknown-linux-musleabihf](https://github.com/kamadorueda/alejandra/releases/download/2.0.0/alejandra-armv6l-unknown-linux-musleabihf) +- [armv7l-unknown-linux-musleabihf](https://github.com/kamadorueda/alejandra/releases/download/2.0.0/alejandra-armv7l-unknown-linux-musleabihf) +- [i686-unknown-linux-musl](https://github.com/kamadorueda/alejandra/releases/download/2.0.0/alejandra-i686-unknown-linux-musl) +- [x86_64-unknown-linux-musl](https://github.com/kamadorueda/alejandra/releases/download/2.0.0/alejandra-x86_64-unknown-linux-musl) Make it executable (`$ chmod +x`) and run Alejandra with: @@ -141,13 +141,13 @@ Please visit: [search.nixos.org/packages?query=alejandra](https://search.nixos.o - Nix stable: ```bash - $ nix-env -ivf https://github.com/kamadorueda/alejandra/tarball/1.5.0 + $ nix-env -ivf https://github.com/kamadorueda/alejandra/tarball/2.0.0 ``` - Nix with [Flakes](https://nixos.wiki/wiki/Flakes): ```bash - $ nix profile install github:kamadorueda/alejandra/1.5.0 + $ nix profile install github:kamadorueda/alejandra/2.0.0 ``` Then run Alejandra with: @@ -164,7 +164,7 @@ $ alejandra --help let alejandra = (import (builtins.fetchTarball { - url = "https://github.com/kamadorueda/alejandra/tarball/1.5.0"; + url = "https://github.com/kamadorueda/alejandra/tarball/2.0.0"; sha256 = "0000000000000000000000000000000000000000000000000000"; }) {}) .outPath; @@ -180,7 +180,7 @@ $ alejandra --help inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"; - alejandra.url = "github:kamadorueda/alejandra/1.5.0"; + alejandra.url = "github:kamadorueda/alejandra/2.0.0"; alejandra.inputs.nixpkgs.follows = "nixpkgs"; }; diff --git a/flake.nix b/flake.nix index cadec60..e65e611 100644 --- a/flake.nix +++ b/flake.nix @@ -14,7 +14,7 @@ outputs = inputs: let commit = inputs.self.shortRev or "dirty"; date = inputs.self.lastModifiedDate or inputs.self.lastModified or "19700101"; - version = "1.5.0+${builtins.substring 0 8 date}.${commit}"; + version = "2.0.0+${builtins.substring 0 8 date}.${commit}"; nixpkgsForHost = host: import inputs.nixpkgs { diff --git a/front/Cargo.lock b/front/Cargo.lock index 7a0a6f4..1fc459e 100644 --- a/front/Cargo.lock +++ b/front/Cargo.lock @@ -4,7 +4,7 @@ version = 3 [[package]] name = "alejandra" -version = "1.5.0" +version = "2.0.0" dependencies = [ "mimalloc", "rnix", @@ -13,7 +13,7 @@ dependencies = [ [[package]] name = "alejandra_front" -version = "1.5.0" +version = "2.0.0" dependencies = [ "alejandra", "console_error_panic_hook", diff --git a/front/Cargo.toml b/front/Cargo.toml index b4ee9ac..723bf78 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.5.0" +version = "2.0.0" [profile.release] lto = true diff --git a/integrations/pre-commit/README.md b/integrations/pre-commit/README.md index bcb213e..1a706d4 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.5.0 + rev: 2.0.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 9ac7e29..c56b29e 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.5.0" + "version": "2.0.0" } diff --git a/src/alejandra/Cargo.toml b/src/alejandra/Cargo.toml index 93061b4..af8f6c7 100644 --- a/src/alejandra/Cargo.toml +++ b/src/alejandra/Cargo.toml @@ -33,4 +33,4 @@ edition = "2021" license = "Unlicense" name = "alejandra" repository = "https://github.com/kamadorueda/alejandra" -version = "1.5.0" +version = "2.0.0" diff --git a/src/alejandra/src/version.rs b/src/alejandra/src/version.rs index ab91a14..6fe53a8 100644 --- a/src/alejandra/src/version.rs +++ b/src/alejandra/src/version.rs @@ -1,2 +1,2 @@ /// The version of Alejandra. -pub const VERSION: &str = "1.5.0"; +pub const VERSION: &str = "2.0.0"; diff --git a/src/alejandra_cli/Cargo.toml b/src/alejandra_cli/Cargo.toml index 061f29f..484d604 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.5.0" +version = "2.0.0"