aboutsummaryrefslogtreecommitdiffstats
path: root/flake.nix
diff options
context:
space:
mode:
authorEllie Huxtable <ellie@atuin.sh>2024-10-22 16:58:25 -0700
committerGitHub <noreply@github.com>2024-10-22 16:58:25 -0700
commit2e332c247d69719a3fd7182f6fdb7dbc117be1d5 (patch)
treedee7ba8be006b9d5f3a21f549ba539cab49e01b3 /flake.nix
parentchore(deps): bump lukemathwalker/cargo-chef (#2427) (diff)
downloadatuin-2e332c247d69719a3fd7182f6fdb7dbc117be1d5.zip
chore: update to rust 1.82 (#2432)
Diffstat (limited to 'flake.nix')
-rw-r--r--flake.nix98
1 files changed, 51 insertions, 47 deletions
diff --git a/flake.nix b/flake.nix
index 19a8034a..4c9383f0 100644
--- a/flake.nix
+++ b/flake.nix
@@ -11,58 +11,62 @@
inputs.nixpkgs.follows = "nixpkgs";
};
};
- outputs = {
- self,
- nixpkgs,
- flake-utils,
- fenix,
- ...
- }:
- flake-utils.lib.eachDefaultSystem (system: let
- pkgs = nixpkgs.outputs.legacyPackages.${system};
- in {
- packages.atuin = pkgs.callPackage ./atuin.nix {
- inherit (pkgs.darwin.apple_sdk.frameworks) Security SystemConfiguration AppKit;
- rustPlatform = let
- toolchain =
- fenix.packages.${system}.fromToolchainFile
- {
- file = ./rust-toolchain.toml;
- sha256 = "sha256-3jVIIf5XPnUU1CRaTyAiO0XHVbJl12MSx3eucTXCjtE=";
+ outputs =
+ { self
+ , nixpkgs
+ , flake-utils
+ , fenix
+ , ...
+ }:
+ flake-utils.lib.eachDefaultSystem
+ (system:
+ let
+ pkgs = nixpkgs.outputs.legacyPackages.${system};
+ in
+ {
+ packages.atuin = pkgs.callPackage ./atuin.nix {
+ inherit (pkgs.darwin.apple_sdk.frameworks) Security SystemConfiguration AppKit;
+ rustPlatform =
+ let
+ toolchain =
+ fenix.packages.${system}.fromToolchainFile
+ {
+ file = ./rust-toolchain.toml;
+ sha256 = "sha256-yMuSb5eQPO/bHv+Bcf/US8LVMbf/G/0MSfiPwBhiPpk=";
+ };
+ in
+ pkgs.makeRustPlatform {
+ cargo = toolchain;
+ rustc = toolchain;
};
- in
- pkgs.makeRustPlatform {
- cargo = toolchain;
- rustc = toolchain;
- };
- };
- packages.default = self.outputs.packages.${system}.atuin;
+ };
+ packages.default = self.outputs.packages.${system}.atuin;
- devShells.default = self.packages.${system}.default.overrideAttrs (super: {
- nativeBuildInputs = with pkgs;
- super.nativeBuildInputs
- ++ [
- cargo-edit
- clippy
- rustfmt
- ];
- RUST_SRC_PATH = "${pkgs.rustPlatform.rustLibSrc}";
+ devShells.default = self.packages.${system}.default.overrideAttrs (super: {
+ nativeBuildInputs = with pkgs;
+ super.nativeBuildInputs
+ ++ [
+ cargo-edit
+ clippy
+ rustfmt
+ ];
+ RUST_SRC_PATH = "${pkgs.rustPlatform.rustLibSrc}";
- shellHook = ''
- echo >&2 "Setting development database path"
- export ATUIN_DB_PATH="/tmp/atuin_dev.db"
- export ATUIN_RECORD_STORE_PATH="/tmp/atuin_records.db"
+ shellHook = ''
+ echo >&2 "Setting development database path"
+ export ATUIN_DB_PATH="/tmp/atuin_dev.db"
+ export ATUIN_RECORD_STORE_PATH="/tmp/atuin_records.db"
- if [ -e "''${ATUIN_DB_PATH}" ]; then
- echo >&2 "''${ATUIN_DB_PATH} already exists, you might want to double-check that"
- fi
+ if [ -e "''${ATUIN_DB_PATH}" ]; then
+ echo >&2 "''${ATUIN_DB_PATH} already exists, you might want to double-check that"
+ fi
- if [ -e "''${ATUIN_RECORD_STORE_PATH}" ]; then
- echo >&2 "''${ATUIN_RECORD_STORE_PATH} already exists, you might want to double-check that"
- fi
- '';
- });
- })
+ if [ -e "''${ATUIN_RECORD_STORE_PATH}" ]; then
+ echo >&2 "''${ATUIN_RECORD_STORE_PATH} already exists, you might want to double-check that"
+ fi
+ '';
+ });
+ })
// {
overlays.default = final: prev: {
inherit (self.packages.${final.system}) atuin;