From b57dbad89058e1d043139fe00c4371f8a87fbfb4 Mon Sep 17 00:00:00 2001 From: Olivier 'reivilibre Date: Sat, 1 Apr 2023 16:57:04 +0100 Subject: [PATCH] Simplify flake lock --- flake.lock | 82 ++++++++++-------------------------------------------- flake.nix | 3 +- 2 files changed, 15 insertions(+), 70 deletions(-) diff --git a/flake.lock b/flake.lock index 663200e..09ab414 100644 --- a/flake.lock +++ b/flake.lock @@ -1,30 +1,15 @@ { "nodes": { - "flake-utils": { - "locked": { - "lastModified": 1653893745, - "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "naersk": { "inputs": { "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1653413650, - "narHash": "sha256-wojDHjb+eU80MPH+3HQaK0liUy8EgR95rvmCl24i58Y=", + "lastModified": 1662220400, + "narHash": "sha256-9o2OGQqu4xyLZP9K6kNe1pTHnyPz0Wr3raGYnr9AIgY=", "owner": "nix-community", "repo": "naersk", - "rev": "69daaceebe12c070cd5ae69ba38f277bbf033695", + "rev": "6944160c19cb591eb85bbf9b2f2768a935623ed3", "type": "github" }, "original": { @@ -35,12 +20,10 @@ }, "nixpkgs": { "locked": { - "lastModified": 1653738054, - "narHash": "sha256-IaR8iLN4Ms3f5EjU1CJkXSc49ZzyS5qv03DtVAti6/s=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "17b62c338f2a0862a58bb6951556beecd98ccda9", - "type": "github" + "lastModified": 0, + "narHash": "sha256-50235YW76Jnx4okogoJv/sMz+WNnqC+0DqtkV3jm2XM=", + "path": "/nix/store/aw7bxjysi3wd3xia5qh7qqwsbqmyqbya-source", + "type": "path" }, "original": { "id": "nixpkgs", @@ -49,67 +32,30 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1653738054, - "narHash": "sha256-IaR8iLN4Ms3f5EjU1CJkXSc49ZzyS5qv03DtVAti6/s=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "17b62c338f2a0862a58bb6951556beecd98ccda9", - "type": "github" + "lastModified": 0, + "narHash": "sha256-50235YW76Jnx4okogoJv/sMz+WNnqC+0DqtkV3jm2XM=", + "path": "/nix/store/aw7bxjysi3wd3xia5qh7qqwsbqmyqbya-source", + "type": "path" }, "original": { "id": "nixpkgs", "type": "indirect" } }, - "nixpkgs_3": { - "locked": { - "lastModified": 1654176133, - "narHash": "sha256-XhjUlU+q9LPFM8Z7X3h504vS2FUToCyKhaf5hVF6nsw=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "63f15db5291aec276924d907d3e083e74d68e8b9", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "nixpkgs", - "type": "github" - } - }, - "poetry2nix": { - "inputs": { - "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs_3" - }, - "locked": { - "lastModified": 1653561148, - "narHash": "sha256-JzAttqACdvMOTwkzkJ0jFF8MWIo8Uau4w/XUMyqpnd8=", - "owner": "nix-community", - "repo": "poetry2nix", - "rev": "3b01c3e3dc57d511848d8433153ab67db79640e1", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "poetry2nix", - "type": "github" - } - }, "root": { "inputs": { "naersk": "naersk", "nixpkgs": "nixpkgs_2", - "poetry2nix": "poetry2nix", "utils": "utils" } }, "utils": { "locked": { - "lastModified": 1652776076, - "narHash": "sha256-gzTw/v1vj4dOVbpBSJX4J0DwUR6LIyXo7/SuuTJp1kM=", + "lastModified": 1659877975, + "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", "owner": "numtide", "repo": "flake-utils", - "rev": "04c1b180862888302ddfb2e3ad9eaa63afc60cf8", + "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 6ccfb2c..fe10a2f 100644 --- a/flake.nix +++ b/flake.nix @@ -4,10 +4,9 @@ inputs = { utils.url = "github:numtide/flake-utils"; naersk.url = "github:nix-community/naersk"; - poetry2nix.url = "github:nix-community/poetry2nix"; }; - outputs = { self, nixpkgs, utils, naersk, poetry2nix }: + outputs = { self, nixpkgs, utils, naersk }: utils.lib.eachDefaultSystem (system: let pkgs = nixpkgs.legacyPackages."${system}"; naersk-lib = naersk.lib."${system}";