diff --git a/flake.lock b/flake.lock index 8bd3d5e..54aec8e 100644 --- a/flake.lock +++ b/flake.lock @@ -1,26 +1,5 @@ { "nodes": { - "fenix": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ], - "rust-analyzer-src": "rust-analyzer-src" - }, - "locked": { - "lastModified": 1695190922, - "narHash": "sha256-X4pQTj34pNbQK8MMIxYeuuOniNzzI5A79amorTmMloQ=", - "owner": "nix-community", - "repo": "fenix", - "rev": "a00ca48f236fc574e6932d78e27f25f21006fb1a", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "fenix", - "type": "github" - } - }, "flake-utils": { "inputs": { "systems": "systems" @@ -46,11 +25,11 @@ ] }, "locked": { - "lastModified": 1694081375, - "narHash": "sha256-vzJXOUnmkMCm3xw8yfPP5m8kypQ3BhAIRe4RRCWpzy8=", + "lastModified": 1698420672, + "narHash": "sha256-/TdeHMPRjjdJub7p7+w55vyABrsJlt5QkznPYy55vKA=", "owner": "nmattia", "repo": "naersk", - "rev": "3f976d822b7b37fc6fb8e6f157c2dd05e7e94e89", + "rev": "aeb58d5e8faead8980a807c840232697982d47b9", "type": "github" }, "original": { @@ -61,11 +40,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1694959747, - "narHash": "sha256-CXQ2MuledDVlVM5dLC4pB41cFlBWxRw4tCBsFrq3cRk=", + "lastModified": 1700390070, + "narHash": "sha256-de9KYi8rSJpqvBfNwscWdalIJXPo8NjdIZcEJum1mH0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "970a59bd19eff3752ce552935687100c46e820a5", + "rev": "e4ad989506ec7d71f7302cc3067abd82730a4beb", "type": "github" }, "original": { @@ -76,29 +55,11 @@ }, "root": { "inputs": { - "fenix": "fenix", "flake-utils": "flake-utils", "naersk": "naersk", "nixpkgs": "nixpkgs" } }, - "rust-analyzer-src": { - "flake": false, - "locked": { - "lastModified": 1695155769, - "narHash": "sha256-1eoWaMkGpqADYaMIabnKiMzxHNhoO1L7Z2XPHJgVn4Y=", - "owner": "rust-lang", - "repo": "rust-analyzer", - "rev": "0427a239eba36a87914dca2c7760f125b6d8fbb0", - "type": "github" - }, - "original": { - "owner": "rust-lang", - "ref": "nightly", - "repo": "rust-analyzer", - "type": "github" - } - }, "systems": { "locked": { "lastModified": 1681028828, diff --git a/flake.nix b/flake.nix index fbdb2e2..20ac731 100644 --- a/flake.nix +++ b/flake.nix @@ -3,50 +3,38 @@ inputs = { nixpkgs.url = "nixpkgs/nixos-unstable"; flake-utils.url = "github:numtide/flake-utils"; - fenix = { - url = "github:nix-community/fenix"; - inputs.nixpkgs.follows = "nixpkgs"; - }; naersk = { url = "github:nmattia/naersk"; inputs.nixpkgs.follows = "nixpkgs"; }; }; - outputs = { self, nixpkgs, flake-utils, fenix, naersk }: + outputs = { self, nixpkgs, flake-utils, naersk }: flake-utils.lib.eachDefaultSystem ( - system: let + system: + let pkgs = import nixpkgs { inherit system; }; - rust-toolchain = fenix.packages."${system}".stable.defaultToolchain; - rust-analyzer = fenix.packages."${system}".stable.rust-analyzer; - rust-src = fenix.packages."${system}".stable.rust-src; - naersk-lib = naersk.lib.${system}.override { - cargo = rust-toolchain; - rustc = rust-toolchain; - }; + naersk' = pkgs.callPackage naersk { }; in - rec { - packages.azirevpn = naersk-lib.buildPackage { - pname = "azirevpn"; - root = ./.; - }; - packages.default = packages.azirevpn; - apps.azirevpn = flake-utils.lib.mkApp { - drv = packages.azirevpn; - }; - apps.default = apps.azirevpn; - devShells.default = pkgs.mkShell { - name = "azirevpn-env"; - buildInputs = [ - rust-analyzer - rust-toolchain - ]; - shellHook = '' - export RUST_SRC_PATH="${rust-src}/lib/rustlib/src/rust/library" - ''; - }; - } + rec { + packages.azirevpn = naersk'.buildPackage { + root = ./.; + }; + packages.default = packages.azirevpn; + apps.azirevpn = flake-utils.lib.mkApp { + drv = packages.azirevpn; + }; + apps.default = apps.azirevpn; + devShells.default = pkgs.mkShell { + name = "azirevpn-env"; + buildInputs = [ + pkgs.cargo + pkgs.rust-analyzer + pkgs.rustc + ]; + }; + } ); } diff --git a/rust-toolchain b/rust-toolchain deleted file mode 100644 index 3ef3ba7..0000000 --- a/rust-toolchain +++ /dev/null @@ -1,3 +0,0 @@ -[toolchain] -channel = "1.53.0" -components = [ "cargo", "rustfmt", "clippy", "rust-analysis", "rust-src" ]