diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/x509-info/flake.lock | 35 | ||||
| -rw-r--r-- | src/x509-info/flake.nix | 48 |
2 files changed, 28 insertions, 55 deletions
diff --git a/src/x509-info/flake.lock b/src/x509-info/flake.lock index d4cb665..9080ba8 100644 --- a/src/x509-info/flake.lock +++ b/src/x509-info/flake.lock @@ -30,40 +30,8 @@ "type": "github" } }, - "naersk": { - "inputs": { - "nixpkgs": "nixpkgs" - }, - "locked": { - "lastModified": 1662220400, - "narHash": "sha256-9o2OGQqu4xyLZP9K6kNe1pTHnyPz0Wr3raGYnr9AIgY=", - "owner": "nmattia", - "repo": "naersk", - "rev": "6944160c19cb591eb85bbf9b2f2768a935623ed3", - "type": "github" - }, - "original": { - "owner": "nmattia", - "repo": "naersk", - "type": "github" - } - }, "nixpkgs": { "locked": { - "lastModified": 1666215963, - "narHash": "sha256-+kSNzDXqoEVEryrJ9WrvGSvi784xPMXkk7jTJPFdT/k=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "e66821278399ba9565178ce3b525e72275fe004e", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, - "nixpkgs_2": { - "locked": { "lastModified": 1666229941, "narHash": "sha256-0e6aB1+ZqKuQdyjwgHltHlWMYJZCn6b0gYxdTSfIKCE=", "owner": "NixOS", @@ -80,8 +48,7 @@ "root": { "inputs": { "flake-utils": "flake-utils", - "naersk": "naersk", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs", "rust-overlay": "rust-overlay" } }, diff --git a/src/x509-info/flake.nix b/src/x509-info/flake.nix index 4861588..ca1762f 100644 --- a/src/x509-info/flake.nix +++ b/src/x509-info/flake.nix @@ -8,48 +8,53 @@ url = "github:oxalica/rust-overlay"; inputs.nixpkgs.follows = "nixpkgs"; }; - naersk.url = "github:nmattia/naersk"; }; outputs = { self , flake-utils , nixpkgs - , naersk , rust-overlay }: + let + # Borrow project metadata from the Rust config + meta = (builtins.fromTOML (builtins.readFile ./Cargo.toml)).package; + inherit (meta) name version; + overlays = [ + # Rust helpers + (import rust-overlay) + # Build Rust toolchain using helpers from rust-overlay + (self: super: { + # This supplies cargo, rustc, rustfmt, etc. + rustToolchain = super.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml; + }) + ]; + in flake-utils.lib.eachDefaultSystem (system: let - overlays = [ (import rust-overlay) ]; - pkgs = import nixpkgs { inherit system overlays; }; - rust-toolchain = - (pkgs.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml).override { - extensions = [ "rust-src" ]; - }; - naersk-lib = naersk.lib."${system}".override { - rustc = rust-toolchain; - }; + pkgs = import nixpkgs { inherit overlays system; }; in - rec { - packages.x509-info = naersk-lib.buildPackage { - pname = "x509-info"; - root = ./.; - buildInputs = with pkgs; [ ]; + packages = rec { + default = x509-info; + x509-info = pkgs.rustPlatform.buildRustPackage { + pname = name; + inherit version; + src = ./.; + release = true; + cargoLock.lockFile = ./Cargo.lock; + }; }; - defaultPackage = packages.x509-info; - devShell = pkgs.mkShell { nativeBuildInputs = with pkgs; [ - rust-toolchain + rustToolchain cargo-audit cargo-deny - cargo-cross rust-analyzer - ] ++ pkgs.lib.optionals (pkgs.stdenv.isLinux) (with pkgs; [ cargo-watch ]); + ]; shellHook = '' cargo --version @@ -62,3 +67,4 @@ }; }; } + |