diff --git a/.pre-commit-entry.sh b/.pre-commit-entry.sh index 9bb713b0..b48a02e7 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.3.0 + https://github.com/kamadorueda/alejandra/tarball/1.4.0 echo INFO: running Alejandra: result-alejandra/bin/alejandra -- -q "${@}" diff --git a/CHANGELOG.md b/CHANGELOG.md index 2e3aa624..a59fb432 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,12 @@ Types of changes - Security in case of vulnerabilities. --> +## [1.4.0] - 2022-05-19 + +### Added + +- A pre-commit hook (requires Alejandra to be installed in the host). + ## [1.3.0] - 2022-05-09 ### Added @@ -553,7 +559,8 @@ Types of changes --- -[unreleased]: https://github.com/kamadorueda/alejandra/compare/1.3.0...HEAD +[unreleased]: https://github.com/kamadorueda/alejandra/compare/1.4.0...HEAD +[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 [1.1.0]: https://github.com/kamadorueda/alejandra/compare/1.0.0...1.1.0 diff --git a/Cargo.lock b/Cargo.lock index 3ca66d0e..2accbb84 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4,7 +4,7 @@ version = 3 [[package]] name = "alejandra_cli" -version = "1.3.0" +version = "1.4.0" dependencies = [ "alejandra_engine", "atty", @@ -18,7 +18,7 @@ dependencies = [ [[package]] name = "alejandra_engine" -version = "1.3.0" +version = "1.4.0" dependencies = [ "mimalloc", "rnix", diff --git a/README.md b/README.md index 68cfcd1f..22f31cb6 100644 --- a/README.md +++ b/README.md @@ -106,7 +106,7 @@ ```yaml repos: - repo: https://github.com/kamadorueda/alejandra - rev: 1.3.0 + rev: 1.4.0 hooks: # Choose one of the following: - id: alejandra # Requires Nix to be previously installed in the system @@ -124,11 +124,11 @@ Please visit: You can download a binary for your platform: -- [aarch64-unknown-linux-musl](https://github.com/kamadorueda/alejandra/releases/download/1.3.0/alejandra-aarch64-unknown-linux-musl) -- [armv6l-unknown-linux-musleabihf](https://github.com/kamadorueda/alejandra/releases/download/1.3.0/alejandra-armv6l-unknown-linux-musleabihf) -- [armv7l-unknown-linux-musleabihf](https://github.com/kamadorueda/alejandra/releases/download/1.3.0/alejandra-armv7l-unknown-linux-musleabihf) -- [i686-unknown-linux-musl](https://github.com/kamadorueda/alejandra/releases/download/1.3.0/alejandra-i686-unknown-linux-musl) -- [x86_64-unknown-linux-musl](https://github.com/kamadorueda/alejandra/releases/download/1.3.0/alejandra-x86_64-unknown-linux-musl) +- [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) Make it executable (`$ chmod +x`) and run Alejandra with: @@ -152,7 +152,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.3.0 + $ nix profile install github:kamadorueda/alejandra/1.4.0 ``` - Nix stable: @@ -160,11 +160,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.3.0 - $ nix-env -ivA aarch64-linux -f https://github.com/kamadorueda/alejandra/tarball/1.3.0 - $ nix-env -ivA i686-linux -f https://github.com/kamadorueda/alejandra/tarball/1.3.0 - $ nix-env -ivA x86_64-darwin -f https://github.com/kamadorueda/alejandra/tarball/1.3.0 - $ nix-env -ivA x86_64-linux -f https://github.com/kamadorueda/alejandra/tarball/1.3.0 + $ 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 ``` Then run Alejandra with: @@ -182,7 +182,7 @@ $ alejandra --help inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"; - alejandra.url = "github:kamadorueda/alejandra/1.3.0"; + alejandra.url = "github:kamadorueda/alejandra/1.4.0"; alejandra.inputs.nixpkgs.follows = "nixpkgs"; }; @@ -212,7 +212,7 @@ $ alejandra --help let alejandra = (import (builtins.fetchTarball { - url = "https://github.com/kamadorueda/alejandra/tarball/1.3.0"; + url = "https://github.com/kamadorueda/alejandra/tarball/1.4.0"; sha256 = "0000000000000000000000000000000000000000000000000000"; })) # Pick one from: aarch64-darwin, aarch64-linux, i686-linux, x86_64-darwin, x86_64-linux diff --git a/flake.nix b/flake.nix index 142716ef..da25b521 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.3.0+${builtins.substring 0 8 date}.${commit}"; + version = "1.4.0+${builtins.substring 0 8 date}.${commit}"; nixpkgsForHost = host: import inputs.nixpkgs { diff --git a/front/Cargo.lock b/front/Cargo.lock index feff16e2..e9b6a813 100644 --- a/front/Cargo.lock +++ b/front/Cargo.lock @@ -4,7 +4,7 @@ version = 3 [[package]] name = "alejandra_engine" -version = "1.3.0" +version = "1.4.0" dependencies = [ "mimalloc", "rnix", @@ -13,7 +13,7 @@ dependencies = [ [[package]] name = "alejandra_front" -version = "1.3.0" +version = "1.4.0" dependencies = [ "alejandra_engine", "console_error_panic_hook", diff --git a/front/Cargo.toml b/front/Cargo.toml index 6a502b49..1370a4a4 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.3.0" +version = "1.4.0" [profile.release] lto = true diff --git a/integrations/vscode/package.json b/integrations/vscode/package.json index 3881ba0c..c0796587 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.3.0" + "version": "1.4.0" } diff --git a/src/alejandra_cli/Cargo.toml b/src/alejandra_cli/Cargo.toml index 5b11ddef..8c45b9ca 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.3.0" +version = "1.4.0" diff --git a/src/alejandra_engine/Cargo.toml b/src/alejandra_engine/Cargo.toml index a991160f..81ae3f4b 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.3.0" +version = "1.4.0" diff --git a/src/alejandra_engine/src/version.rs b/src/alejandra_engine/src/version.rs index 9397951c..48a0e4cb 100644 --- a/src/alejandra_engine/src/version.rs +++ b/src/alejandra_engine/src/version.rs @@ -1 +1 @@ -pub const VERSION: &str = "1.3.0"; +pub const VERSION: &str = "1.4.0";