From 4a45bf1de46f827ebd60a4ad237a47344c1ed62d Mon Sep 17 00:00:00 2001 From: Kevin Amado Date: Sun, 30 Jan 2022 21:56:25 -0500 Subject: [PATCH] feat: update inputs and format --- default.nix | 2 +- flake.lock | 6 ++-- flake.nix | 94 ++++++++++++++++++++++++++--------------------------- 3 files changed, 51 insertions(+), 51 deletions(-) diff --git a/default.nix b/default.nix index d57658d..76bb75f 100644 --- a/default.nix +++ b/default.nix @@ -10,4 +10,4 @@ let }; flake = import flakeCompatSrc { src = ./.; }; in -flake.defaultNix.defaultPackage + flake.defaultNix.defaultPackage diff --git a/flake.lock b/flake.lock index 3e07165..f2db5c4 100644 --- a/flake.lock +++ b/flake.lock @@ -25,11 +25,11 @@ ] }, "locked": { - "lastModified": 1643584963, - "narHash": "sha256-yj/Lu9V0CZXC+9QRnkD2Lwd9jw3pbixUS7AuULGXuaw=", + "lastModified": 1643597368, + "narHash": "sha256-P8VJio7BGjHGYDjIZmVM2RlmpgcL1/W7PxQvDVFOT38=", "owner": "kamadorueda", "repo": "alejandra", - "rev": "9b6797f30d52bad6b5d889e6f24946ddba15a56a", + "rev": "969023c1d6bf11ba13d1ffe91f938602fb33b185", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 2712633..4e609f1 100644 --- a/flake.nix +++ b/flake.nix @@ -29,56 +29,56 @@ system: let nixpkgs = import inputs.nixpkgs { inherit system; }; - cargoToml = builtins.fromTOML ( builtins.readFile ./Cargo.toml ); + 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; }; + 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 ]; + { + 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 ]; + }; }; - }; - 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 - inputs.alejandra.outputs.defaultPackage.${ system } - 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 + inputs.alejandra.outputs.defaultPackage.${ system } + nixpkgs.jq + nixpkgs.nodejs + nixpkgs.nodePackages.prettier + nixpkgs.nodePackages.prettier-plugin-toml + nixpkgs.shfmt + treefmt + ]; + }; + } ); }