From ac262a98d8b36aee08d407d77aa08e94d5c64a5a Mon Sep 17 00:00:00 2001 From: Kevin Amado Date: Thu, 3 Feb 2022 20:40:25 -0500 Subject: [PATCH] feat: update inputs --- flake.lock | 18 +++++----- flake.nix | 103 ++++++++++++++++++++++++++--------------------------- 2 files changed, 60 insertions(+), 61 deletions(-) diff --git a/flake.lock b/flake.lock index 5c187ed..8220759 100644 --- a/flake.lock +++ b/flake.lock @@ -10,11 +10,11 @@ ] }, "locked": { - "lastModified": 1643610217, - "narHash": "sha256-3cFZt9Eyz70s1CNYO3wJeUDgLUC9tC4s5hNpLtX3FQY=", + "lastModified": 1643869431, + "narHash": "sha256-M+khM8s4Kz70q1jCpNX+Cx/YH6cZnn32yCW4udZMCVk=", "owner": "nix-community", "repo": "fenix", - "rev": "bd91b6fddf7fdf90ad9924339fcb40f008f57447", + "rev": "2d64d0c1941b2b82d938e82790ea0e692889c23b", "type": "github" }, "original": { @@ -56,11 +56,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1643381941, - "narHash": "sha256-pHTwvnN4tTsEKkWlXQ8JMY423epos8wUOhthpwJjtpc=", + "lastModified": 1643472818, + "narHash": "sha256-qzVPxKDUubYIxKRSuDl/JgzXWSmGvUVYny9SxFMfPJM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5efc8ca954272c4376ac929f4c5ffefcc20551d5", + "rev": "7f65e4abd5ecaad12d2d26e4380d1a7d8edafea7", "type": "github" }, "original": { @@ -83,11 +83,11 @@ "rustAnalyzer": { "flake": false, "locked": { - "lastModified": 1643645003, - "narHash": "sha256-uz+MXBcGoIqzc6acGB7GjJQsTWKr341+fjjv+pQR8N8=", + "lastModified": 1643919078, + "narHash": "sha256-5TBwFN/KYMzTsarc1oNW4J2f0IraxqcRCamObbnFcng=", "owner": "rust-analyzer", "repo": "rust-analyzer", - "rev": "4800c05a206eb156617b76fdb30af0b6c2c0fb26", + "rev": "9597e55e9b933b82d190607f0fcf59654cdaccee", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index feb3ff4..0745e65 100644 --- a/flake.nix +++ b/flake.nix @@ -13,57 +13,56 @@ treefmt.inputs.flake-utils.follows = "flakeUtils"; treefmt.inputs.nixpkgs.follows = "nixpkgs"; }; - outputs = - inputs: inputs.flakeUtils.lib.eachSystem [ "x86_64-darwin" "x86_64-linux" ] ( - system: let - nixpkgs = import inputs.nixpkgs { inherit system; }; - cargoToml = builtins.fromTOML (builtins.readFile ./Cargo.toml); - treefmt = inputs.treefmt.defaultPackage.${system}; - fenix = inputs.fenix.packages.${system}; - fenixPlatform = nixpkgs.makeRustPlatform { inherit (fenix.latest) cargo rustc; }; - in - { - checks = { defaultPackage = inputs.self.defaultPackage.${system}; }; - defaultApp = { - type = "app"; - program = "${inputs.self.defaultPackage.${system}}/bin/alejandra"; + outputs = inputs: inputs.flakeUtils.lib.eachSystem [ "x86_64-darwin" "x86_64-linux" ] ( + system: let + nixpkgs = import inputs.nixpkgs { inherit system; }; + cargoToml = builtins.fromTOML (builtins.readFile ./Cargo.toml); + treefmt = inputs.treefmt.defaultPackage.${system}; + fenix = inputs.fenix.packages.${system}; + fenixPlatform = nixpkgs.makeRustPlatform { inherit (fenix.latest) cargo rustc; }; + in + { + checks = { defaultPackage = inputs.self.defaultPackage.${system}; }; + defaultApp = { + type = "app"; + program = "${inputs.self.defaultPackage.${system}}/bin/alejandra"; + }; + defaultPackage = fenixPlatform.buildRustPackage { + pname = cargoToml.package.name; + version = + let + commit = inputs.self.shortRev or "dirty"; + date = + inputs.self.lastModifiedDate or inputs.self.lastModified or "19700101"; + in + "${builtins.substring 0 8 date}_${commit}"; + src = inputs.self.sourceInfo; + cargoLock.lockFile = ./Cargo.lock; + meta = { + description = cargoToml.package.description; + homepage = "https://github.com/kamadorueda/alejandra"; + license = nixpkgs.lib.licenses.unlicense; + maintainers = [ nixpkgs.lib.maintainers.kamadorueda ]; }; - defaultPackage = fenixPlatform.buildRustPackage { - pname = cargoToml.package.name; - version = - let - commit = inputs.self.shortRev or "dirty"; - date = - inputs.self.lastModifiedDate or inputs.self.lastModified or "19700101"; - in - "${builtins.substring 0 8 date}_${commit}"; - src = inputs.self.sourceInfo; - cargoLock.lockFile = ./Cargo.lock; - meta = { - description = cargoToml.package.description; - homepage = "https://github.com/kamadorueda/alejandra"; - license = nixpkgs.lib.licenses.unlicense; - maintainers = [ nixpkgs.lib.maintainers.kamadorueda ]; - }; - }; - devShell = nixpkgs.mkShell { - name = "Alejandra"; - packages = [ - fenix.rust-analyzer - fenix.latest.cargo - fenix.latest.clippy - fenix.latest.rust-src - fenix.latest.rustc - fenix.latest.rustfmt - nixpkgs.cargo-tarpaulin - nixpkgs.jq - nixpkgs.nodejs - nixpkgs.nodePackages.prettier - nixpkgs.nodePackages.prettier-plugin-toml - nixpkgs.shfmt - treefmt - ]; - }; - } - ); + }; + devShell = nixpkgs.mkShell { + name = "Alejandra"; + packages = [ + fenix.rust-analyzer + fenix.latest.cargo + fenix.latest.clippy + fenix.latest.rust-src + fenix.latest.rustc + fenix.latest.rustfmt + nixpkgs.cargo-tarpaulin + nixpkgs.jq + nixpkgs.nodejs + nixpkgs.nodePackages.prettier + nixpkgs.nodePackages.prettier-plugin-toml + nixpkgs.shfmt + treefmt + ]; + }; + } + ); }