diff --git a/Cargo.toml b/Cargo.toml index f101c0a..d46a7bc 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -32,3 +32,9 @@ tracing-actix-web = "0.7.14" color-eyre = "0.6.3" pretty_assertions = "1.4.1" sqlx = { version = "0.8.2", features = ["sqlite"] } + +[profile.dev] +opt-level = 0 + +[profile.release] +opt-level = 3 diff --git a/flake.lock b/flake.lock index 78ac072..79dd3b8 100644 --- a/flake.lock +++ b/flake.lock @@ -50,7 +50,37 @@ "type": "github" } }, + "naersk": { + "inputs": { + "nixpkgs": "nixpkgs" + }, + "locked": { + "lastModified": 1742901344, + "narHash": "sha256-o9dXcpfXpBm6+/SRqcQW0GzRkJymwyEAu5UD5LMDd3s=", + "owner": "nix-community", + "repo": "naersk", + "rev": "a75c0584b0d69de943babc899530e9c70c642b42", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "naersk", + "type": "github" + } + }, "nixpkgs": { + "locked": { + "lastModified": 0, + "narHash": "sha256-Q6pMP4a9ed636qilcYX8XUguvKl/0/LGXhHcRI91p0U=", + "path": "/nix/store/xq5rfjj1z2r8yx338arajg5vwsxh1fri-source", + "type": "path" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, + "nixpkgs_2": { "locked": { "lastModified": 1720031269, "narHash": "sha256-rwz8NJZV+387rnWpTYcXaRNvzUSnnF9aHONoJIYmiUQ=", @@ -66,7 +96,7 @@ "type": "github" } }, - "nixpkgs_2": { + "nixpkgs_3": { "locked": { "lastModified": 1718428119, "narHash": "sha256-WdWDpNaq6u1IPtxtYHHWpl5BmabtpmLnMAx0RdJ/vo8=", @@ -87,13 +117,14 @@ "blowfish": "blowfish", "cl-nix-lite": "cl-nix-lite", "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs", + "naersk": "naersk", + "nixpkgs": "nixpkgs_2", "rust-overlay": "rust-overlay" } }, "rust-overlay": { "inputs": { - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs_3" }, "locked": { "lastModified": 1720145907, diff --git a/flake.nix b/flake.nix index cb7cb50..6d835ec 100644 --- a/flake.nix +++ b/flake.nix @@ -6,6 +6,7 @@ flake-utils.url = "github:numtide/flake-utils"; cl-nix-lite.url = "github:hraban/cl-nix-lite"; rust-overlay.url = "github:oxalica/rust-overlay"; + naersk.url = "github:nix-community/naersk"; blowfish = { url = "github:nunocoracao/blowfish?rev=b6744efbf2d76023084498552a916b49d5a764d8"; flake = false; @@ -19,33 +20,35 @@ pkgs = nixpkgs.legacyPackages.${system}; src = ./.; - sbcl' = pkgs.sbcl.withPackages (ps: with ps; [ - hunchentoot - dexador - jzon - serapeum - deploy - spinneret - lass - cl-smtp - log4cl - cl_plus_ssl - fiveam - slite - clack - jingle - lack-middleware-static - lack-middleware-session - lack-middleware-mount - lack - lack-util - lack-component - woo - ningle - pkgs.openssl - pkgs.openssl.out - pkgs.openssl.dev - ]); + naersk' = pkgs.callPackage naersk {}; + + # sbcl' = pkgs.sbcl.withPackages (ps: with ps; [ + # hunchentoot + # dexador + # jzon + # serapeum + # deploy + # spinneret + # lass + # cl-smtp + # log4cl + # cl_plus_ssl + # fiveam + # slite + # clack + # jingle + # lack-middleware-static + # lack-middleware-session + # lack-middleware-mount + # lack + # lack-util + # lack-component + # woo + # ningle + # pkgs.openssl + # pkgs.openssl.out + # pkgs.openssl.dev + # ]); nbi = with pkgs; [ gcc stdenv @@ -63,12 +66,7 @@ hugo go nodejs - sbcl' - guile - guile-fibers - guile-quickcheck - guile-sjson - guile-config + # sbcl' clippy rustc cargo @@ -121,7 +119,7 @@ buildInputs = bi; nativeLibs = nativeLibs; }; - packages.default = pkgs.rustPlatform.buildRustPackage rec { + packages.default = naersk'.buildPackage rec { pname = "tfcapi"; version = "0.0.1"; src = ./.;