From 8bb5e037bc51fa262771d6c662b5c74a436d6503 Mon Sep 17 00:00:00 2001 From: Olivier 'reivilibre Date: Sat, 28 Oct 2023 21:54:12 +0100 Subject: [PATCH] Fixup flake for development --- .envrc | 2 ++ .gitignore | 1 + flake.lock | 61 ++++++++++++++++++++++++++++++++++-------------------- flake.nix | 2 +- 4 files changed, 43 insertions(+), 23 deletions(-) create mode 100644 .envrc diff --git a/.envrc b/.envrc new file mode 100644 index 0000000..e3fecb3 --- /dev/null +++ b/.envrc @@ -0,0 +1,2 @@ +use flake + diff --git a/.gitignore b/.gitignore index 4b67560..cd90f3d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /target /.idea /.env +/.direnv diff --git a/flake.lock b/flake.lock index f5594aa..7f8bdb2 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1652722411, - "narHash": "sha256-FxzNgYiH9c91hUVAntcjrqY//KOTUPP2a4e8Wyuysxg=", + "lastModified": 1698420672, + "narHash": "sha256-/TdeHMPRjjdJub7p7+w55vyABrsJlt5QkznPYy55vKA=", "owner": "nix-community", "repo": "naersk", - "rev": "94beb7a3edfeb3bcda65fa3f2ebc48ec6b40bf72", + "rev": "aeb58d5e8faead8980a807c840232697982d47b9", "type": "github" }, "original": { @@ -20,12 +20,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1653117584, - "narHash": "sha256-5uUrHeHBIaySBTrRExcCoW8fBBYVSDjDYDU5A6iOl+k=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "f4dfed73ee886b115a99e5b85fdfbeb683290d83", - "type": "github" + "lastModified": 1695825837, + "narHash": "sha256-4Ne11kNRnQsmSJCRSSNkFRSnHC4Y5gPDBIQGjjPfJiU=", + "path": "/nix/store/mrqyw5xdivdymj83v5d9jzzs2ifmw8h0-source", + "rev": "5cfafa12d57374f48bcc36fda3274ada276cf69e", + "type": "path" }, "original": { "id": "nixpkgs", @@ -34,12 +33,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1653117584, - "narHash": "sha256-5uUrHeHBIaySBTrRExcCoW8fBBYVSDjDYDU5A6iOl+k=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "f4dfed73ee886b115a99e5b85fdfbeb683290d83", - "type": "github" + "lastModified": 1695825837, + "narHash": "sha256-4Ne11kNRnQsmSJCRSSNkFRSnHC4Y5gPDBIQGjjPfJiU=", + "path": "/nix/store/mrqyw5xdivdymj83v5d9jzzs2ifmw8h0-source", + "rev": "5cfafa12d57374f48bcc36fda3274ada276cf69e", + "type": "path" }, "original": { "id": "nixpkgs", @@ -57,22 +55,41 @@ "src": { "flake": false, "locked": { - "narHash": "sha256-rokT3gG2BKALiOQ5kSaf0FKXzH9dGnR8t3nsAH7YsLc=", - "path": ".", + "lastModified": 0, + "narHash": "sha256-BzAD04MXi8kqeGvPrcgQtxYxkLrPuVqMUvoukS6FCng=", + "path": "./.", "type": "path" }, "original": { - "path": ".", + "path": "./.", "type": "path" } }, - "utils": { + "systems": { "locked": { - "lastModified": 1652776076, - "narHash": "sha256-gzTw/v1vj4dOVbpBSJX4J0DwUR6LIyXo7/SuuTJp1kM=", + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "utils": { + "inputs": { + "systems": "systems" + }, + "locked": { + "lastModified": 1694529238, + "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", "owner": "numtide", "repo": "flake-utils", - "rev": "04c1b180862888302ddfb2e3ad9eaa63afc60cf8", + "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 3404377..ea8c297 100644 --- a/flake.nix +++ b/flake.nix @@ -39,7 +39,7 @@ # `nix develop` devShell = pkgs.mkShell { - nativeBuildInputs = with pkgs; [ rustc cargo ]; + nativeBuildInputs = with pkgs; [ rustc cargo openssl pkg-config ]; }; }); }