From 503dd548155361d40ff96fc3b42459b0223afb64 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Thu, 1 Jun 2023 19:45:14 +0200 Subject: [PATCH] 23.05 --- .envrc | 1 + .gitignore | 1 + flake.lock | 29 +++++++++++------------------ flake.nix | 2 ++ 4 files changed, 15 insertions(+), 18 deletions(-) create mode 100644 .envrc diff --git a/.envrc b/.envrc new file mode 100644 index 0000000..3550a30 --- /dev/null +++ b/.envrc @@ -0,0 +1 @@ +use flake diff --git a/.gitignore b/.gitignore index d956e7f..14aceaf 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /target .env result +.direnv diff --git a/flake.lock b/flake.lock index 1892dbf..486719b 100644 --- a/flake.lock +++ b/flake.lock @@ -17,7 +17,9 @@ }, "naersk": { "inputs": { - "nixpkgs": "nixpkgs" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { "lastModified": 1655042882, @@ -35,25 +37,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 0, - "narHash": "sha256-A9RkoGrxzsmMm0vily18p92Rasb+MbdDMaSnzmywXKw=", - "path": "/nix/store/dycwkjqxlc93s7ch3c932d0f9xvfch33-source", - "type": "path" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, - "nixpkgs_2": { - "locked": { - "lastModified": 0, - "narHash": "sha256-A9RkoGrxzsmMm0vily18p92Rasb+MbdDMaSnzmywXKw=", - "path": "/nix/store/dycwkjqxlc93s7ch3c932d0f9xvfch33-source", - "type": "path" + "lastModified": 1685636445, + "narHash": "sha256-Cw7qu994bLHRJNy8gsvcGSYHKFFwaGYiI35jcEpO4HI=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "08f66773ab4ad3ad1b63c54133397b2c8b0e69b8", + "type": "github" }, "original": { "id": "nixpkgs", + "ref": "release-23.05", "type": "indirect" } }, @@ -61,7 +54,7 @@ "inputs": { "flake-utils": "flake-utils", "naersk": "naersk", - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs" } } }, diff --git a/flake.nix b/flake.nix index 0eda1e4..6491830 100644 --- a/flake.nix +++ b/flake.nix @@ -1,7 +1,9 @@ { inputs = { + nixpkgs.url = "nixpkgs/release-23.05"; flake-utils.url = "github:numtide/flake-utils"; naersk.url = "github:nix-community/naersk"; + naersk.inputs.nixpkgs.follows = "nixpkgs"; }; outputs = { self, nixpkgs, flake-utils, naersk }: