From 48e2c63a66993741c8792e4e08b0aa6fa12d0758 Mon Sep 17 00:00:00 2001 From: Fabricio C Zuardi Date: Thu, 4 May 2023 02:39:26 -0300 Subject: [PATCH] build(flake): add python3 as buildInput and update flake.lock Re: https://github.com/mycitadel/mycitadel-desktop/issues/68#issuecomment-1534090116 Re: https://github.com/mycitadel/mycitadel-desktop/issues/68#issuecomment-1534110984 Re: https://github.com/mycitadel/mycitadel-desktop/issues/68#issuecomment-1534819976 --- flake.lock | 134 +++++++++++++++++++++++++++++++++++------------------ flake.nix | 10 ++-- 2 files changed, 96 insertions(+), 48 deletions(-) diff --git a/flake.lock b/flake.lock index 747ff6c..95c8042 100644 --- a/flake.lock +++ b/flake.lock @@ -4,17 +4,17 @@ "inputs": { "flake-compat": "flake-compat", "flake-utils": "flake-utils", - "nix-std": "nix-std", "nixpkgs": [ "nixpkgs" - ] + ], + "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1652066362, - "narHash": "sha256-7IbUwa5hNr59tprauturJK1a6xY5W9426dPJNKku2DI=", + "lastModified": 1683134812, + "narHash": "sha256-yUiArtneEBCTYt7rOg/tLr1iv4AmjFu5tdGa0OVpjbo=", "owner": "ipetkov", "repo": "crane", - "rev": "f7fa3b6d700a574c94982e907c65a07b76d2056d", + "rev": "8708b19627b2dfc2d1ac332b74383b8abdd429f0", "type": "github" }, "original": { @@ -31,11 +31,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1652077709, - "narHash": "sha256-tvpHXGtgopAV+DkCFNDa1FIgz3ByKX/kzsL8Eypzq2E=", + "lastModified": 1683181309, + "narHash": "sha256-+uTI+MzioDC01a/8STyaalCGtkeJTblamlwhaX6XoUM=", "owner": "nix-community", "repo": "fenix", - "rev": "4fd8f4e9ccc72d82b1f79ab2ab00a95adb12169c", + "rev": "2e6694d1e079b6c62341a449af18646a288a8c82", "type": "github" }, "original": { @@ -47,11 +47,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1650374568, - "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=", + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", "owner": "edolstra", "repo": "flake-compat", - "rev": "b4a34015c698c7793d592d66adbab377907a2be8", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", "type": "github" }, "original": { @@ -63,11 +63,11 @@ "flake-compat_2": { "flake": false, "locked": { - "lastModified": 1650374568, - "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=", + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", "owner": "edolstra", "repo": "flake-compat", - "rev": "b4a34015c698c7793d592d66adbab377907a2be8", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", "type": "github" }, "original": { @@ -77,12 +77,15 @@ } }, "flake-utils": { + "inputs": { + "systems": "systems" + }, "locked": { - "lastModified": 1649676176, - "narHash": "sha256-OWKJratjt2RW151VUlJPRALb7OU2S5s+f0vLj4o1bHM=", + "lastModified": 1681202837, + "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", "owner": "numtide", "repo": "flake-utils", - "rev": "a4b154ebbdc88c8498a5c7b01589addc9e9cb678", + "rev": "cfacdce06f30d2b68473a46042957675eebb3401", "type": "github" }, "original": { @@ -92,12 +95,15 @@ } }, "flake-utils_2": { + "inputs": { + "systems": "systems_2" + }, "locked": { - "lastModified": 1649676176, - "narHash": "sha256-OWKJratjt2RW151VUlJPRALb7OU2S5s+f0vLj4o1bHM=", + "lastModified": 1681202837, + "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", "owner": "numtide", "repo": "flake-utils", - "rev": "a4b154ebbdc88c8498a5c7b01589addc9e9cb678", + "rev": "cfacdce06f30d2b68473a46042957675eebb3401", "type": "github" }, "original": { @@ -113,11 +119,11 @@ ] }, "locked": { - "lastModified": 1651574473, - "narHash": "sha256-wQhFORvRjo8LB2hTmETmv6cbyKGDPbfWqvZ/0chnDE4=", + "lastModified": 1679567394, + "narHash": "sha256-ZvLuzPeARDLiQUt6zSZFGOs+HZmE+3g4QURc8mkBsfM=", "owner": "nix-community", "repo": "naersk", - "rev": "f21309b38e1da0d61b881b6b6d41b81c1aed4e1d", + "rev": "88cd22380154a2c36799fe8098888f0f59861a15", "type": "github" }, "original": { @@ -126,28 +132,13 @@ "type": "github" } }, - "nix-std": { - "locked": { - "lastModified": 1647625366, - "narHash": "sha256-jR4tpiQDs4GNJC6MzfrNyOFIhVH3o203qR+YNB++GYo=", - "owner": "chessai", - "repo": "nix-std", - "rev": "8b8d32582e298da2c15b4c13ca48ba7994ef96df", - "type": "github" - }, - "original": { - "owner": "chessai", - "repo": "nix-std", - "type": "github" - } - }, "nixpkgs": { "locked": { - "lastModified": 1652153470, - "narHash": "sha256-6dq25xDg2refaC5I3+b4KI7/l1abrQJ+uCKeL4aC/E0=", + "lastModified": 1683207820, + "narHash": "sha256-r0G2gpEzGF0Vzxcf8kBcyJi3cIakqNDl1YCuMciANfg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "4f907176e446fd75239917b1e8e5d3fb44beeb3d", + "rev": "12a2201d6199684a751e22e0c2073b703a028030", "type": "github" }, "original": { @@ -169,11 +160,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1651933512, - "narHash": "sha256-dM1vc+dZ/xZ1XSOFnutXjpJnnzu6xs9qikZnLmrFi7Y=", + "lastModified": 1683114408, + "narHash": "sha256-MJo/tEm3edH9ydW8wdb1bTc7mwjzgCK69gLWwdu9BcE=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "5d5bbec9b60010dd7389a084c56693baf6bda780", + "rev": "60f4b3e26e8656bbe8b65530e237e3907c9565f3", "type": "github" }, "original": { @@ -182,6 +173,61 @@ "repo": "rust-analyzer", "type": "github" } + }, + "rust-overlay": { + "inputs": { + "flake-utils": [ + "crane", + "flake-utils" + ], + "nixpkgs": [ + "crane", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1683080331, + "narHash": "sha256-nGDvJ1DAxZIwdn6ww8IFwzoHb2rqBP4wv/65Wt5vflk=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "d59c3fa0cba8336e115b376c2d9e91053aa59e56", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_2": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 6c4f764..78d711a 100644 --- a/flake.nix +++ b/flake.nix @@ -39,10 +39,12 @@ commonArgs = { src = ./.; - buildInputs = [ - pkgs.pango - pkgs.atk - pkgs.gtk3 + buildInputs = with pkgs; [ + python311 + pango + atk + gtk3 + wrapGAppsHook ]; nativeBuildInputs = [ pkgs.pkgconfig