chore: reformat Nix files with alejandra

This commit is contained in:
Harsh Shandilya 2023-02-22 18:25:01 +00:00
parent baa7902ec3
commit 8f0408e6c9
3 changed files with 79 additions and 64 deletions

View file

@ -1,6 +1,8 @@
(import (let lock = builtins.fromJSON (builtins.readFile ./flake.lock); (import (let
in fetchTarball { lock = builtins.fromJSON (builtins.readFile ./flake.lock);
url = in
"https://github.com/edolstra/flake-compat/archive/${lock.nodes.flake-compat.locked.rev}.tar.gz"; fetchTarball {
url = "https://github.com/edolstra/flake-compat/archive/${lock.nodes.flake-compat.locked.rev}.tar.gz";
sha256 = lock.nodes.flake-compat.locked.narHash; sha256 = lock.nodes.flake-compat.locked.narHash;
}) { src = ./.; }).defaultNix }) {src = ./.;})
.defaultNix

View file

@ -2,9 +2,9 @@
description = "clipboard-substitutor"; description = "clipboard-substitutor";
inputs = { inputs = {
nixpkgs = { url = "github:NixOS/nixpkgs/nixpkgs-unstable"; }; nixpkgs = {url = "github:NixOS/nixpkgs/nixpkgs-unstable";};
flake-utils = { url = "github:numtide/flake-utils"; }; flake-utils = {url = "github:numtide/flake-utils";};
flake-compat = { flake-compat = {
url = "github:edolstra/flake-compat"; url = "github:edolstra/flake-compat";
@ -35,13 +35,19 @@
}; };
}; };
outputs = outputs = {
{ self, nixpkgs, crane, flake-utils, advisory-db, rust-overlay, ... }: self,
flake-utils.lib.eachDefaultSystem (system: nixpkgs,
let crane,
flake-utils,
advisory-db,
rust-overlay,
...
}:
flake-utils.lib.eachDefaultSystem (system: let
pkgs = import nixpkgs { pkgs = import nixpkgs {
inherit system; inherit system;
overlays = [ (import rust-overlay) ]; overlays = [(import rust-overlay)];
}; };
rustStable = rustStable =
@ -49,9 +55,10 @@
craneLib = (crane.mkLib pkgs).overrideToolchain rustStable; craneLib = (crane.mkLib pkgs).overrideToolchain rustStable;
src = ./.; src = ./.;
buildInputs = with pkgs; buildInputs = with pkgs;
[ xorg.libxcb python39 ] ++ pkgs.lib.optionals stdenv.isDarwin [xorg.libxcb python39]
[ pkgs.darwin.apple_sdk.frameworks.AppKit ]; ++ pkgs.lib.optionals stdenv.isDarwin
cargoArtifacts = craneLib.buildDepsOnly { inherit src buildInputs; }; [pkgs.darwin.apple_sdk.frameworks.AppKit];
cargoArtifacts = craneLib.buildDepsOnly {inherit src buildInputs;};
clipboard-substitutor = craneLib.buildPackage { clipboard-substitutor = craneLib.buildPackage {
inherit src buildInputs; inherit src buildInputs;
@ -61,9 +68,9 @@
inherit cargoArtifacts src buildInputs; inherit cargoArtifacts src buildInputs;
cargoClippyExtraArgs = "--all-targets -- --deny warnings"; cargoClippyExtraArgs = "--all-targets -- --deny warnings";
}; };
clipboard-substitutor-fmt = craneLib.cargoFmt { inherit src; }; clipboard-substitutor-fmt = craneLib.cargoFmt {inherit src;};
clipboard-substitutor-audit = clipboard-substitutor-audit =
craneLib.cargoAudit { inherit src advisory-db; }; craneLib.cargoAudit {inherit src advisory-db;};
clipboard-substitutor-nextest = craneLib.cargoNextest { clipboard-substitutor-nextest = craneLib.cargoNextest {
inherit cargoArtifacts src buildInputs; inherit cargoArtifacts src buildInputs;
partitions = 1; partitions = 1;
@ -73,13 +80,17 @@
checks = { checks = {
# TODO: migrate to cargo-audit # TODO: migrate to cargo-audit
# clipboard-substitutor-audit # clipboard-substitutor-audit
inherit clipboard-substitutor clipboard-substitutor-clippy inherit
clipboard-substitutor-fmt clipboard-substitutor-nextest; clipboard-substitutor
clipboard-substitutor-clippy
clipboard-substitutor-fmt
clipboard-substitutor-nextest
;
}; };
packages.default = clipboard-substitutor; packages.default = clipboard-substitutor;
apps.default = flake-utils.lib.mkApp { drv = clipboard-substitutor; }; apps.default = flake-utils.lib.mkApp {drv = clipboard-substitutor;};
devShells.default = pkgs.mkShell { devShells.default = pkgs.mkShell {
inputsFrom = builtins.attrValues self.checks; inputsFrom = builtins.attrValues self.checks;

View file

@ -1,6 +1,8 @@
(import (let lock = builtins.fromJSON (builtins.readFile ./flake.lock); (import (let
in fetchTarball { lock = builtins.fromJSON (builtins.readFile ./flake.lock);
url = in
"https://github.com/edolstra/flake-compat/archive/${lock.nodes.flake-compat.locked.rev}.tar.gz"; fetchTarball {
url = "https://github.com/edolstra/flake-compat/archive/${lock.nodes.flake-compat.locked.rev}.tar.gz";
sha256 = lock.nodes.flake-compat.locked.narHash; sha256 = lock.nodes.flake-compat.locked.narHash;
}) { src = ./.; }).shellNix }) {src = ./.;})
.shellNix