|
11 | 11 | inputs.nixpkgs.follows = "nixpkgs";
|
12 | 12 | };
|
13 | 13 | };
|
14 |
| - outputs = { |
15 |
| - self, |
16 |
| - nixpkgs, |
17 |
| - flake-utils, |
18 |
| - fenix, |
19 |
| - ... |
20 |
| - }: |
21 |
| - flake-utils.lib.eachDefaultSystem (system: let |
22 |
| - pkgs = nixpkgs.outputs.legacyPackages.${system}; |
23 |
| - in { |
24 |
| - packages.atuin = pkgs.callPackage ./atuin.nix { |
25 |
| - inherit (pkgs.darwin.apple_sdk.frameworks) Security SystemConfiguration AppKit; |
26 |
| - rustPlatform = let |
27 |
| - toolchain = |
28 |
| - fenix.packages.${system}.fromToolchainFile |
29 |
| - { |
30 |
| - file = ./rust-toolchain.toml; |
31 |
| - sha256 = "sha256-3jVIIf5XPnUU1CRaTyAiO0XHVbJl12MSx3eucTXCjtE="; |
| 14 | + outputs = |
| 15 | + { self |
| 16 | + , nixpkgs |
| 17 | + , flake-utils |
| 18 | + , fenix |
| 19 | + , ... |
| 20 | + }: |
| 21 | + flake-utils.lib.eachDefaultSystem |
| 22 | + (system: |
| 23 | + let |
| 24 | + pkgs = nixpkgs.outputs.legacyPackages.${system}; |
| 25 | + in |
| 26 | + { |
| 27 | + packages.atuin = pkgs.callPackage ./atuin.nix { |
| 28 | + inherit (pkgs.darwin.apple_sdk.frameworks) Security SystemConfiguration AppKit; |
| 29 | + rustPlatform = |
| 30 | + let |
| 31 | + toolchain = |
| 32 | + fenix.packages.${system}.fromToolchainFile |
| 33 | + { |
| 34 | + file = ./rust-toolchain.toml; |
| 35 | + sha256 = "sha256-yMuSb5eQPO/bHv+Bcf/US8LVMbf/G/0MSfiPwBhiPpk="; |
| 36 | + }; |
| 37 | + in |
| 38 | + pkgs.makeRustPlatform { |
| 39 | + cargo = toolchain; |
| 40 | + rustc = toolchain; |
32 | 41 | };
|
33 |
| - in |
34 |
| - pkgs.makeRustPlatform { |
35 |
| - cargo = toolchain; |
36 |
| - rustc = toolchain; |
37 |
| - }; |
38 |
| - }; |
39 |
| - packages.default = self.outputs.packages.${system}.atuin; |
| 42 | + }; |
| 43 | + packages.default = self.outputs.packages.${system}.atuin; |
40 | 44 |
|
41 |
| - devShells.default = self.packages.${system}.default.overrideAttrs (super: { |
42 |
| - nativeBuildInputs = with pkgs; |
43 |
| - super.nativeBuildInputs |
44 |
| - ++ [ |
45 |
| - cargo-edit |
46 |
| - clippy |
47 |
| - rustfmt |
48 |
| - ]; |
49 |
| - RUST_SRC_PATH = "${pkgs.rustPlatform.rustLibSrc}"; |
| 45 | + devShells.default = self.packages.${system}.default.overrideAttrs (super: { |
| 46 | + nativeBuildInputs = with pkgs; |
| 47 | + super.nativeBuildInputs |
| 48 | + ++ [ |
| 49 | + cargo-edit |
| 50 | + clippy |
| 51 | + rustfmt |
| 52 | + ]; |
| 53 | + RUST_SRC_PATH = "${pkgs.rustPlatform.rustLibSrc}"; |
50 | 54 |
|
51 |
| - shellHook = '' |
52 |
| - echo >&2 "Setting development database path" |
53 |
| - export ATUIN_DB_PATH="/tmp/atuin_dev.db" |
54 |
| - export ATUIN_RECORD_STORE_PATH="/tmp/atuin_records.db" |
| 55 | + shellHook = '' |
| 56 | + echo >&2 "Setting development database path" |
| 57 | + export ATUIN_DB_PATH="/tmp/atuin_dev.db" |
| 58 | + export ATUIN_RECORD_STORE_PATH="/tmp/atuin_records.db" |
55 | 59 |
|
56 |
| - if [ -e "''${ATUIN_DB_PATH}" ]; then |
57 |
| - echo >&2 "''${ATUIN_DB_PATH} already exists, you might want to double-check that" |
58 |
| - fi |
| 60 | + if [ -e "''${ATUIN_DB_PATH}" ]; then |
| 61 | + echo >&2 "''${ATUIN_DB_PATH} already exists, you might want to double-check that" |
| 62 | + fi |
59 | 63 |
|
60 |
| - if [ -e "''${ATUIN_RECORD_STORE_PATH}" ]; then |
61 |
| - echo >&2 "''${ATUIN_RECORD_STORE_PATH} already exists, you might want to double-check that" |
62 |
| - fi |
63 |
| - ''; |
64 |
| - }); |
65 |
| - }) |
| 64 | + if [ -e "''${ATUIN_RECORD_STORE_PATH}" ]; then |
| 65 | + echo >&2 "''${ATUIN_RECORD_STORE_PATH} already exists, you might want to double-check that" |
| 66 | + fi |
| 67 | + ''; |
| 68 | + }); |
| 69 | + }) |
66 | 70 | // {
|
67 | 71 | overlays.default = final: prev: {
|
68 | 72 | inherit (self.packages.${final.system}) atuin;
|
|
0 commit comments