diff --git a/Cargo.lock b/Cargo.lock index b5724a9..39c0d7a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1070,7 +1070,7 @@ checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" [[package]] name = "ironhide" -version = "1.0.8" +version = "1.0.9" dependencies = [ "attohttpc", "atty", diff --git a/Cargo.toml b/Cargo.toml index c81bfd6..93de8dc 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ironhide" -version = "1.0.8" +version = "1.0.9" authors = ["IronCore Labs "] categories = ["cryptography"] description = "Tool to easily encrypt and decrypt files to users and groups. Similar to GPG, but usable at scale." diff --git a/flake.lock b/flake.lock index fb3290e..9e96172 100644 --- a/flake.lock +++ b/flake.lock @@ -1,27 +1,15 @@ { "nodes": { "flake-utils": { - "locked": { - "lastModified": 1676283394, - "narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073", - "type": "github" + "inputs": { + "systems": "systems" }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_2": { "locked": { - "lastModified": 1659877975, - "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { @@ -32,11 +20,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1678654296, - "narHash": "sha256-aVfw3ThpY7vkUeF1rFy10NAkpKDS2imj3IakrzT0Occ=", + "lastModified": 1725634671, + "narHash": "sha256-v3rIhsJBOMLR8e/RNWxr828tB+WywYIoajrZKFM+0Gg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5a1dc8acd977ff3dccd1328b7c4a6995429a656b", + "rev": "574d1eac1c200690e27b8eb4e24887f8df7ac27c", "type": "github" }, "original": { @@ -48,11 +36,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1665296151, - "narHash": "sha256-uOB0oxqxN9K7XGF1hcnY+PQnlQJ+3bP2vCn/+Ru/bbc=", + "lastModified": 1718428119, + "narHash": "sha256-WdWDpNaq6u1IPtxtYHHWpl5BmabtpmLnMAx0RdJ/vo8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "14ccaaedd95a488dd7ae142757884d8e125b3363", + "rev": "e6cea36f83499eb4e9cd184c8a8e823296b50ad5", "type": "github" }, "original": { @@ -71,15 +59,14 @@ }, "rust-overlay": { "inputs": { - "flake-utils": "flake-utils_2", "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1707963067, - "narHash": "sha256-1vmNGzAIenei+keS8vIUNYVkEGwEwF+3FR7/bXU/r18=", + "lastModified": 1725848835, + "narHash": "sha256-u4lCr+tOEWhsFiww5G04U5jUNzaQJi0/ZMIDGiLeT14=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "23f224428779539eb4dc13f6a77c97ffe4680d74", + "rev": "2ef910a6276a2f34513d18f2f826a8dea72c3b3f", "type": "github" }, "original": { @@ -87,6 +74,21 @@ "repo": "rust-overlay", "type": "github" } + }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 5dea345..058707a 100644 --- a/flake.nix +++ b/flake.nix @@ -12,7 +12,6 @@ nixpkgs, rust-overlay, flake-utils, - ... }: flake-utils.lib.eachDefaultSystem (system: let overlays = [(import rust-overlay)]; @@ -23,16 +22,22 @@ in rec { # `nix build` packages = { - ironhide = pkgs.rustPlatform.buildRustPackage { - pname = cargoToml.package.name; - version = cargoToml.package.version; - src = ./.; - cargoLock.lockFile = ./Cargo.lock; - nativeBuildInputs = with pkgs; - [rusttoolchain] - ++ pkgs.lib.optionals pkgs.stdenv.isDarwin - (with pkgs.darwin.apple_sdk.frameworks; [Security SystemConfiguration]); - }; + ironhide = + (pkgs.makeRustPlatform { + cargo = rusttoolchain; + rustc = rusttoolchain; + }) + .buildRustPackage { + # ironhide = pkgs.rustPlatform.buildRustPackage { + pname = cargoToml.package.name; + inherit (cargoToml.package) version; + src = ./.; + cargoLock.lockFile = ./Cargo.lock; + nativeBuildInputs = with pkgs; + [rusttoolchain] + ++ lib.optionals stdenv.isDarwin + (with darwin.apple_sdk.frameworks; [Security SystemConfiguration]); + }; default = packages.ironhide; }; @@ -40,8 +45,8 @@ devShells.default = pkgs.mkShell { buildInputs = with pkgs; [rusttoolchain] - ++ pkgs.lib.optionals pkgs.stdenv.isDarwin - (with pkgs.darwin.apple_sdk.frameworks; [Security SystemConfiguration]); + ++ lib.optionals stdenv.isDarwin + (with darwin.apple_sdk.frameworks; [Security SystemConfiguration]); }; }); }