From 36ae6401d7b5c5e55b8df5098a207f1bde5585e7 Mon Sep 17 00:00:00 2001 From: Michal S Date: Mon, 5 Sep 2022 21:49:56 +0100 Subject: [PATCH] Fix flake.nix and update flake.lock --- flake.lock | 18 +++++++++--------- flake.nix | 20 ++++++-------------- 2 files changed, 15 insertions(+), 23 deletions(-) diff --git a/flake.lock b/flake.lock index c0638ca..e0e49f0 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1659610603, - "narHash": "sha256-LYgASYSPYo7O71WfeUOaEUzYfzuXm8c8eavJcel+pfI=", + "lastModified": 1662220400, + "narHash": "sha256-9o2OGQqu4xyLZP9K6kNe1pTHnyPz0Wr3raGYnr9AIgY=", "owner": "nix-community", "repo": "naersk", - "rev": "c6a45e4277fa58abd524681466d3450f896dc094", + "rev": "6944160c19cb591eb85bbf9b2f2768a935623ed3", "type": "github" }, "original": { @@ -20,11 +20,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1660551188, - "narHash": "sha256-a1LARMMYQ8DPx1BgoI/UN4bXe12hhZkCNqdxNi6uS0g=", + "lastModified": 1662096612, + "narHash": "sha256-R+Q8l5JuyJryRPdiIaYpO5O3A55rT+/pItBrKcy7LM4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "441dc5d512153039f19ef198e662e4f3dbb9fd65", + "rev": "21de2b973f9fee595a7a1ac4693efff791245c34", "type": "github" }, "original": { @@ -34,11 +34,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1660566196, - "narHash": "sha256-mjObRMshcxAyK7J5ZJ5/nP0uEu8Ym5trrVsj1253nUc=", + "lastModified": 1662410893, + "narHash": "sha256-jmZjdA/n92OpUdaEjU7QJNsa1np+u+JWDj300x3K3XY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "07a564964c0dfb1fa15f9be701b2fba55b252a9d", + "rev": "680818a51b7fb6886db8900e2fb1582305b45f77", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index e7601f6..b0a4131 100644 --- a/flake.nix +++ b/flake.nix @@ -12,23 +12,18 @@ naersk-lib = naersk.lib."${system}"; in rec { - packages.amethyst = naersk-lib.buildPackage { - pname = "ame"; + packages.jade = naersk-lib.buildPackage { + pname = "jade"; root = ./.; - nativeBuildInputs = with pkgs; [ - openssl - sqlite - pkg-config - ]; }; - packages.default = packages.amethyst; + packages.default = packages.jade; - apps.amethyst = utils.lib.mkApp { - drv = packages.amethyst; + apps.jade = utils.lib.mkApp { + drv = packages.jade; }; - apps.default = apps.amethyst; + apps.default = apps.jade; devShells.default = pkgs.mkShell { nativeBuildInputs = with pkgs; [ @@ -37,9 +32,6 @@ rustfmt cargo-audit clippy - openssl - sqlite - pkg-config ]; }; });