From 8ec83a00ad9e589fc8f51300f1992ae15df64ae0 Mon Sep 17 00:00:00 2001 From: Franck Cuny Date: Tue, 1 Nov 2022 08:42:15 -0700 Subject: build: configure rust overlay to follow nixpkgs --- src/x509-info/flake.lock | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) (limited to 'src/x509-info/flake.lock') diff --git a/src/x509-info/flake.lock b/src/x509-info/flake.lock index 610cec8..d4cb665 100644 --- a/src/x509-info/flake.lock +++ b/src/x509-info/flake.lock @@ -77,22 +77,6 @@ "type": "github" } }, - "nixpkgs_3": { - "locked": { - "lastModified": 1665296151, - "narHash": "sha256-uOB0oxqxN9K7XGF1hcnY+PQnlQJ+3bP2vCn/+Ru/bbc=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "14ccaaedd95a488dd7ae142757884d8e125b3363", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "root": { "inputs": { "flake-utils": "flake-utils", @@ -104,7 +88,9 @@ "rust-overlay": { "inputs": { "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs_3" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { "lastModified": 1666234887, -- cgit v1.2.3 From 04a4d34e94c6333768a136ef8f40d367629f7e00 Mon Sep 17 00:00:00 2001 From: Franck Cuny Date: Tue, 1 Nov 2022 08:51:36 -0700 Subject: build: get rid of naersk We can build a rust binary without naesrk,with the help of `buildRustPackage`. Simplify a bit the overall build by consuming information from Cargo.toml and Cargo.lock. --- src/x509-info/flake.lock | 35 +---------------------------------- 1 file changed, 1 insertion(+), 34 deletions(-) (limited to 'src/x509-info/flake.lock') diff --git a/src/x509-info/flake.lock b/src/x509-info/flake.lock index d4cb665..9080ba8 100644 --- a/src/x509-info/flake.lock +++ b/src/x509-info/flake.lock @@ -30,39 +30,7 @@ "type": "github" } }, - "naersk": { - "inputs": { - "nixpkgs": "nixpkgs" - }, - "locked": { - "lastModified": 1662220400, - "narHash": "sha256-9o2OGQqu4xyLZP9K6kNe1pTHnyPz0Wr3raGYnr9AIgY=", - "owner": "nmattia", - "repo": "naersk", - "rev": "6944160c19cb591eb85bbf9b2f2768a935623ed3", - "type": "github" - }, - "original": { - "owner": "nmattia", - "repo": "naersk", - "type": "github" - } - }, "nixpkgs": { - "locked": { - "lastModified": 1666215963, - "narHash": "sha256-+kSNzDXqoEVEryrJ9WrvGSvi784xPMXkk7jTJPFdT/k=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "e66821278399ba9565178ce3b525e72275fe004e", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, - "nixpkgs_2": { "locked": { "lastModified": 1666229941, "narHash": "sha256-0e6aB1+ZqKuQdyjwgHltHlWMYJZCn6b0gYxdTSfIKCE=", @@ -80,8 +48,7 @@ "root": { "inputs": { "flake-utils": "flake-utils", - "naersk": "naersk", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs", "rust-overlay": "rust-overlay" } }, -- cgit v1.2.3 From 03a62e4114ab546c3b3eec8f83403e06341aed85 Mon Sep 17 00:00:00 2001 From: Franck Cuny Date: Tue, 1 Nov 2022 17:31:41 -0700 Subject: build: add pre-commit checks --- src/x509-info/flake.lock | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'src/x509-info/flake.lock') diff --git a/src/x509-info/flake.lock b/src/x509-info/flake.lock index 9080ba8..af07128 100644 --- a/src/x509-info/flake.lock +++ b/src/x509-info/flake.lock @@ -45,10 +45,34 @@ "type": "github" } }, + "pre-commit-hooks": { + "inputs": { + "flake-utils": [ + "flake-utils" + ], + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1666604592, + "narHash": "sha256-Bxy7xeVAwC0yxFaeYZM7N9Us/ebxpMC9TCceKEFeay4=", + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "rev": "1b436f36e2812c589e6d830e3223059ea9661100", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "type": "github" + } + }, "root": { "inputs": { "flake-utils": "flake-utils", "nixpkgs": "nixpkgs", + "pre-commit-hooks": "pre-commit-hooks", "rust-overlay": "rust-overlay" } }, -- cgit v1.2.3 From 521cff79e048e4e4c16138b0552133f1b6d6619a Mon Sep 17 00:00:00 2001 From: Franck Cuny Date: Tue, 1 Nov 2022 17:45:58 -0700 Subject: build: follow flake-inputs for rust overlay --- src/x509-info/flake.lock | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) (limited to 'src/x509-info/flake.lock') diff --git a/src/x509-info/flake.lock b/src/x509-info/flake.lock index af07128..c3ece1f 100644 --- a/src/x509-info/flake.lock +++ b/src/x509-info/flake.lock @@ -15,21 +15,6 @@ "type": "github" } }, - "flake-utils_2": { - "locked": { - "lastModified": 1659877975, - "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "nixpkgs": { "locked": { "lastModified": 1666229941, @@ -78,7 +63,9 @@ }, "rust-overlay": { "inputs": { - "flake-utils": "flake-utils_2", + "flake-utils": [ + "flake-utils" + ], "nixpkgs": [ "nixpkgs" ] -- cgit v1.2.3