diff --git a/CHANGELOG.md b/CHANGELOG.md index 0def3fd..db0d65e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,19 @@ Types of changes - Security in case of vulnerabilities. --> +## [1.1.0] - 2022-03-10 + +### Added + +- Emacs integration instructions. +- A `--quiet` flag to the CLI which hide output details, + disable the TUI + and only print error messages. + +### Changed + +- Updated dependencies to its latest version. + ## [1.0.0] - 2022-03-03 ### Added @@ -510,7 +523,8 @@ Types of changes --- -[unreleased]: https://github.com/kamadorueda/alejandra/compare/1.0.0...HEAD +[unreleased]: https://github.com/kamadorueda/alejandra/compare/1.1.0...HEAD +[1.1.0]: https://github.com/kamadorueda/alejandra/compare/1.0.0...1.1.0 [1.0.0]: https://github.com/kamadorueda/alejandra/compare/0.7.0...1.0.0 [0.7.0]: https://github.com/kamadorueda/alejandra/compare/0.6.0...0.7.0 [0.6.0]: https://github.com/kamadorueda/alejandra/compare/0.5.0...0.6.0 diff --git a/Cargo.lock b/Cargo.lock index 68e7117..09acebe 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4,7 +4,7 @@ version = 3 [[package]] name = "alejandra_cli" -version = "1.0.0" +version = "1.1.0" dependencies = [ "alejandra_engine", "atty", @@ -18,7 +18,7 @@ dependencies = [ [[package]] name = "alejandra_engine" -version = "1.0.0" +version = "1.1.0" dependencies = [ "mimalloc", "rnix", @@ -77,9 +77,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "clap" -version = "3.1.5" +version = "3.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ced1892c55c910c1219e98d6fc8d71f6bddba7905866ce740066d8bfea859312" +checksum = "d8c93436c21e4698bacadf42917db28b23017027a4deccb35dbe47a7e7840123" dependencies = [ "atty", "bitflags", diff --git a/README.md b/README.md index 3e19cbe..0e1af18 100644 --- a/README.md +++ b/README.md @@ -108,11 +108,11 @@ Please visit: You can download a binary for your platform: -- [aarch64-unknown-linux-musl](https://github.com/kamadorueda/alejandra/releases/download/1.0.0/alejandra-aarch64-unknown-linux-musl) -- [armv6l-unknown-linux-musleabihf](https://github.com/kamadorueda/alejandra/releases/download/1.0.0/alejandra-armv6l-unknown-linux-musleabihf) -- [armv7l-unknown-linux-musleabihf](https://github.com/kamadorueda/alejandra/releases/download/1.0.0/alejandra-armv7l-unknown-linux-musleabihf) -- [i686-unknown-linux-musl](https://github.com/kamadorueda/alejandra/releases/download/1.0.0/alejandra-i686-unknown-linux-musl) -- [x86_64-unknown-linux-musl](https://github.com/kamadorueda/alejandra/releases/download/1.0.0/alejandra-x86_64-unknown-linux-musl) +- [aarch64-unknown-linux-musl](https://github.com/kamadorueda/alejandra/releases/download/1.1.0/alejandra-aarch64-unknown-linux-musl) +- [armv6l-unknown-linux-musleabihf](https://github.com/kamadorueda/alejandra/releases/download/1.1.0/alejandra-armv6l-unknown-linux-musleabihf) +- [armv7l-unknown-linux-musleabihf](https://github.com/kamadorueda/alejandra/releases/download/1.1.0/alejandra-armv7l-unknown-linux-musleabihf) +- [i686-unknown-linux-musl](https://github.com/kamadorueda/alejandra/releases/download/1.1.0/alejandra-i686-unknown-linux-musl) +- [x86_64-unknown-linux-musl](https://github.com/kamadorueda/alejandra/releases/download/1.1.0/alejandra-x86_64-unknown-linux-musl) Make it executable (`$ chmod +x`) and run Alejandra with: @@ -136,7 +136,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.0.0 + $ nix profile install github:kamadorueda/alejandra/1.1.0 ``` - Nix stable: @@ -144,10 +144,10 @@ 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.0.0 - $ nix-env -ivA aarch64-linux -f https://github.com/kamadorueda/alejandra/tarball/1.0.0 - $ nix-env -ivA x86_64-darwin -f https://github.com/kamadorueda/alejandra/tarball/1.0.0 - $ nix-env -ivA x86_64-linux -f https://github.com/kamadorueda/alejandra/tarball/1.0.0 + $ nix-env -ivA aarch64-darwin -f https://github.com/kamadorueda/alejandra/tarball/1.1.0 + $ nix-env -ivA aarch64-linux -f https://github.com/kamadorueda/alejandra/tarball/1.1.0 + $ nix-env -ivA x86_64-darwin -f https://github.com/kamadorueda/alejandra/tarball/1.1.0 + $ nix-env -ivA x86_64-linux -f https://github.com/kamadorueda/alejandra/tarball/1.1.0 ``` Then run Alejandra with: @@ -165,7 +165,7 @@ $ alejandra --help inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"; - alejandra.url = "github:kamadorueda/alejandra/1.0.0"; + alejandra.url = "github:kamadorueda/alejandra/1.1.0"; alejandra.inputs.nixpkgs.follows = "nixpkgs"; }; @@ -195,7 +195,7 @@ $ alejandra --help let alejandra = (import (builtins.fetchTarball { - url = "https://github.com/kamadorueda/alejandra/tarball/1.0.0"; + url = "https://github.com/kamadorueda/alejandra/tarball/1.1.0"; sha256 = "0000000000000000000000000000000000000000000000000000"; })) # Pick one from: aarch64-linux, aarch64-linux, x86_64-darwin, x86_64-linux diff --git a/flake.lock b/flake.lock index 9970fef..3021fd9 100644 --- a/flake.lock +++ b/flake.lock @@ -18,11 +18,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1646331602, - "narHash": "sha256-cRuytTfel52z947yKfJcZU7zbQBgM16qqTf+oJkVwtg=", + "lastModified": 1646506091, + "narHash": "sha256-sWNAJE2m+HOh1jtXlHcnhxsj6/sXrHgbqVNcVRlveK4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ad267cc9cf3d5a6ae63940df31eb31382d6356e6", + "rev": "3e644bd62489b516292c816f70bf0052c693b3c7", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index ba44192..fd7aec4 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.0.0+${builtins.substring 0 8 date}.${commit}"; + version = "1.1.0+${builtins.substring 0 8 date}.${commit}"; nixpkgsForHost = host: import inputs.nixpkgs { diff --git a/front/Cargo.lock b/front/Cargo.lock index 61460bb..6a0bbfd 100644 --- a/front/Cargo.lock +++ b/front/Cargo.lock @@ -4,7 +4,7 @@ version = 3 [[package]] name = "alejandra_engine" -version = "1.0.0" +version = "1.1.0" dependencies = [ "mimalloc", "rnix", @@ -13,7 +13,7 @@ dependencies = [ [[package]] name = "alejandra_front" -version = "1.0.0" +version = "1.1.0" dependencies = [ "alejandra_engine", "console_error_panic_hook", diff --git a/front/Cargo.toml b/front/Cargo.toml index 11420bf..8186ff2 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.0.0" +version = "1.1.0" [profile.release] lto = true diff --git a/front/flake.lock b/front/flake.lock index 48492fc..c91093f 100644 --- a/front/flake.lock +++ b/front/flake.lock @@ -8,11 +8,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1646288712, - "narHash": "sha256-8HgwXpSnG8MVCqGPyjEqkVycE8qsxYPfoExc0FCOsU0=", + "lastModified": 1646893503, + "narHash": "sha256-N4Wn8FUXUC1h1DkL8X9I7VMvIv0fLLLjeJX3uFyzvRQ=", "owner": "nix-community", "repo": "fenix", - "rev": "df8c8cd9154589ef8693c912dd6bfb59c1b90c69", + "rev": "aad7f0a3e44ecfc9e2c5f1a45387d193c1c51aa6", "type": "github" }, "original": { @@ -23,11 +23,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1646331602, - "narHash": "sha256-cRuytTfel52z947yKfJcZU7zbQBgM16qqTf+oJkVwtg=", + "lastModified": 1646506091, + "narHash": "sha256-sWNAJE2m+HOh1jtXlHcnhxsj6/sXrHgbqVNcVRlveK4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ad267cc9cf3d5a6ae63940df31eb31382d6356e6", + "rev": "3e644bd62489b516292c816f70bf0052c693b3c7", "type": "github" }, "original": { @@ -46,11 +46,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1646159224, - "narHash": "sha256-QD19fOVrwGZh9ikdXx3nOWmcIY+NVJnkdoPrrdtIfmc=", + "lastModified": 1646862342, + "narHash": "sha256-zXd3qsIcQFDFMB6p8bSpkOKjTuBTvYuM4GkPYxEfQdA=", "owner": "rust-analyzer", "repo": "rust-analyzer", - "rev": "a55dd29e88c6f2aa37c39b790ab7036596e74686", + "rev": "5b51cb835a356cf79cba00cf5c65d51cadeea7f1", "type": "github" }, "original": { diff --git a/integrations/vscode/package.json b/integrations/vscode/package.json index 36c4451..a1344d8 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.0.0" + "version": "1.1.0" } diff --git a/src/alejandra_cli/Cargo.toml b/src/alejandra_cli/Cargo.toml index fd208e4..7264663 100644 --- a/src/alejandra_cli/Cargo.toml +++ b/src/alejandra_cli/Cargo.toml @@ -18,4 +18,4 @@ description = "The Uncompromising Nix Code Formatter" edition = "2021" name = "alejandra_cli" repository = "https://github.com/kamadorueda/alejandra" -version = "1.0.0" +version = "1.1.0" diff --git a/src/alejandra_cli/src/cli.rs b/src/alejandra_cli/src/cli.rs index 462c0d7..d847db3 100644 --- a/src/alejandra_cli/src/cli.rs +++ b/src/alejandra_cli/src/cli.rs @@ -65,12 +65,13 @@ pub(crate) fn parse(args: Vec) -> clap::ArgMatches { Kevin Amado ~ @kamadorueda on GitHub, matrix.org and Gmail. Thomas Bereknyei ~ @tomberek on GitHub and matrix.org. Piegames ~ @piegamesde on GitHub. - Joachim Ernst ~ @0x4A6F on GitHub. + Joachim Ernst ~ @0x4A6F on GitHub. David Arnold ~ @blaggacao on GitHub and matrix.org. David Hauer ~ @DavHau on GitHub. Fabian Möller ~ @B4dM4n on GitHub. Rok Garbas ~ @garbas on GitHub. Yorick van Pelt ~ @yorickvP on GitHub. + Jörg Thalheim ~ @Mic92 on GitHub. Vincent Ambo ~ @tazjin on GitHub. Mr Hedgehog ~ @ModdedGamers on GitHub. Tristan Maat ~ @TLATER on GitHub. diff --git a/src/alejandra_engine/Cargo.toml b/src/alejandra_engine/Cargo.toml index 913f5a4..ebb2d78 100644 --- a/src/alejandra_engine/Cargo.toml +++ b/src/alejandra_engine/Cargo.toml @@ -32,4 +32,4 @@ description = "The Uncompromising Nix Code Formatter" edition = "2021" name = "alejandra_engine" repository = "https://github.com/kamadorueda/alejandra" -version = "1.0.0" +version = "1.1.0" diff --git a/src/alejandra_engine/src/version.rs b/src/alejandra_engine/src/version.rs index 72b08b9..d1bc1fa 100644 --- a/src/alejandra_engine/src/version.rs +++ b/src/alejandra_engine/src/version.rs @@ -1 +1 @@ -pub const VERSION: &str = "1.0.0"; +pub const VERSION: &str = "1.1.0";