diff options
-rw-r--r-- | Cargo.lock | 2 | ||||
-rw-r--r-- | bin/Cargo.toml | 2 | ||||
-rw-r--r-- | flake.lock | 35 | ||||
-rw-r--r-- | flake.nix | 10 |
4 files changed, 43 insertions, 6 deletions
@@ -388,7 +388,7 @@ checksum = "b203e79e90905594272c1c97c7af701533d42adaab0beb3859018e477d54a3b0" | |||
388 | 388 | ||
389 | [[package]] | 389 | [[package]] |
390 | name = "statix" | 390 | name = "statix" |
391 | version = "0.3.1" | 391 | version = "0.3.2" |
392 | dependencies = [ | 392 | dependencies = [ |
393 | "ariadne", | 393 | "ariadne", |
394 | "clap", | 394 | "clap", |
diff --git a/bin/Cargo.toml b/bin/Cargo.toml index f9fd9b5..1beb712 100644 --- a/bin/Cargo.toml +++ b/bin/Cargo.toml | |||
@@ -1,6 +1,6 @@ | |||
1 | [package] | 1 | [package] |
2 | name = "statix" | 2 | name = "statix" |
3 | version = "0.3.1" | 3 | version = "0.3.2" |
4 | edition = "2018" | 4 | edition = "2018" |
5 | license = "MIT" | 5 | license = "MIT" |
6 | authors = [ "Akshay <[email protected]>" ] | 6 | authors = [ "Akshay <[email protected]>" ] |
@@ -1,5 +1,23 @@ | |||
1 | { | 1 | { |
2 | "nodes": { | 2 | "nodes": { |
3 | "gitignore": { | ||
4 | "inputs": { | ||
5 | "nixpkgs": "nixpkgs" | ||
6 | }, | ||
7 | "locked": { | ||
8 | "lastModified": 1635165013, | ||
9 | "narHash": "sha256-o/BdVjNwcB6jOmzZjOH703BesSkkS5O7ej3xhyO8hAY=", | ||
10 | "owner": "hercules-ci", | ||
11 | "repo": "gitignore.nix", | ||
12 | "rev": "5b9e0ff9d3b551234b4f3eb3983744fa354b17f1", | ||
13 | "type": "github" | ||
14 | }, | ||
15 | "original": { | ||
16 | "owner": "hercules-ci", | ||
17 | "repo": "gitignore.nix", | ||
18 | "type": "github" | ||
19 | } | ||
20 | }, | ||
3 | "import-cargo": { | 21 | "import-cargo": { |
4 | "locked": { | 22 | "locked": { |
5 | "lastModified": 1594305518, | 23 | "lastModified": 1594305518, |
@@ -33,6 +51,20 @@ | |||
33 | }, | 51 | }, |
34 | "nixpkgs": { | 52 | "nixpkgs": { |
35 | "locked": { | 53 | "locked": { |
54 | "lastModified": 1632846328, | ||
55 | "narHash": "sha256-sFi6YtlGK30TBB9o6CW7LG9mYHkgtKeWbSLAjjrNTX0=", | ||
56 | "owner": "NixOS", | ||
57 | "repo": "nixpkgs", | ||
58 | "rev": "2b71ddd869ad592510553d09fe89c9709fa26b2b", | ||
59 | "type": "github" | ||
60 | }, | ||
61 | "original": { | ||
62 | "id": "nixpkgs", | ||
63 | "type": "indirect" | ||
64 | } | ||
65 | }, | ||
66 | "nixpkgs_2": { | ||
67 | "locked": { | ||
36 | "lastModified": 1633422745, | 68 | "lastModified": 1633422745, |
37 | "narHash": "sha256-gA6Ok64nPbkjHk3Oanq4641EeYkjcKhisDF9wBjLxEk=", | 69 | "narHash": "sha256-gA6Ok64nPbkjHk3Oanq4641EeYkjcKhisDF9wBjLxEk=", |
38 | "owner": "nixos", | 70 | "owner": "nixos", |
@@ -49,9 +81,10 @@ | |||
49 | }, | 81 | }, |
50 | "root": { | 82 | "root": { |
51 | "inputs": { | 83 | "inputs": { |
84 | "gitignore": "gitignore", | ||
52 | "import-cargo": "import-cargo", | 85 | "import-cargo": "import-cargo", |
53 | "mozillapkgs": "mozillapkgs", | 86 | "mozillapkgs": "mozillapkgs", |
54 | "nixpkgs": "nixpkgs" | 87 | "nixpkgs": "nixpkgs_2" |
55 | } | 88 | } |
56 | } | 89 | } |
57 | }, | 90 | }, |
@@ -8,7 +8,9 @@ | |||
8 | flake = false; | 8 | flake = false; |
9 | }; | 9 | }; |
10 | 10 | ||
11 | import-cargo.url = github:edolstra/import-cargo; | 11 | import-cargo.url = "github:edolstra/import-cargo"; |
12 | |||
13 | gitignore.url = "github:hercules-ci/gitignore.nix"; | ||
12 | 14 | ||
13 | }; | 15 | }; |
14 | 16 | ||
@@ -17,10 +19,12 @@ | |||
17 | , nixpkgs | 19 | , nixpkgs |
18 | , mozillapkgs | 20 | , mozillapkgs |
19 | , import-cargo | 21 | , import-cargo |
22 | , gitignore | ||
20 | , ... | 23 | , ... |
21 | }: | 24 | }: |
22 | let | 25 | let |
23 | inherit (import-cargo.builders) importCargo; | 26 | inherit (import-cargo.builders) importCargo; |
27 | inherit (gitignore.lib) gitignoreSource; | ||
24 | 28 | ||
25 | supportedSystems = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ]; | 29 | supportedSystems = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ]; |
26 | forAllSystems = nixpkgs.lib.genAttrs supportedSystems; | 30 | forAllSystems = nixpkgs.lib.genAttrs supportedSystems; |
@@ -49,9 +53,9 @@ | |||
49 | 53 | ||
50 | statix = with final; pkgs.stdenv.mkDerivation { | 54 | statix = with final; pkgs.stdenv.mkDerivation { |
51 | pname = "statix"; | 55 | pname = "statix"; |
52 | version = "v0.3.1"; | 56 | version = "v0.3.2"; |
53 | src = builtins.path { | 57 | src = builtins.path { |
54 | path = ./.; | 58 | path = gitignoreSource ./.; |
55 | name = "statix"; | 59 | name = "statix"; |
56 | }; | 60 | }; |
57 | nativeBuildInputs = [ | 61 | nativeBuildInputs = [ |