From 6c8ba79371470b63bc510c3a1a1131b50d0d6445 Mon Sep 17 00:00:00 2001 From: Benedikt Peetz Date: Sat, 21 Mar 2026 19:53:48 +0100 Subject: feat(flake): Use the released git https inputs --- flake.lock | 38 +++++++++++++++++++++++--------------- flake.nix | 17 ++++++++++++++--- 2 files changed, 37 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index 0e1c398..685ede5 100644 --- a/flake.lock +++ b/flake.lock @@ -33,26 +33,32 @@ }, "rocie-mobile": { "inputs": { - "crane": "crane", + "crane": [ + "crane" + ], "nixpkgs": [ "nixpkgs" ], - "rust-overlay": "rust-overlay", + "rust-overlay": [ + "rust-overlay" + ], "treefmt-nix": [ "treefmt-nix" ] }, "locked": { - "dirtyRev": "f6a3fb9c4d8dd86f78c9f75a23c1ac35bf35d4eb-dirty", - "dirtyShortRev": "f6a3fb9-dirty", - "lastModified": 1773902714, - "narHash": "sha256-90eMtdHW/J6Oigfha/a2vjMepGlna5va9gqP6SQYx04=", + "lastModified": 1774118765, + "narHash": "sha256-YHCNeo9amdHBD/sk+SYEdNFYajy+6I6IIyFN37bwNk8=", + "ref": "prime", + "rev": "c0b29e4be7f0fff59934ef6e7c52dea2ee31e0b3", + "revCount": 18, "type": "git", - "url": "file:../rocie-mobile" + "url": "https://git.foss-syndicate.org/bpeetz/rocie/web-client" }, "original": { + "ref": "prime", "type": "git", - "url": "file:../rocie-mobile" + "url": "https://git.foss-syndicate.org/bpeetz/rocie/web-client" } }, "rocie-server": { @@ -67,38 +73,40 @@ "locked": { "lastModified": 1773896435, "narHash": "sha256-WK8Nv8F9pfXHnNL1Tj3J/MvEEa28NZHKgK1r6xm2Wwc=", - "ref": "refs/heads/prime", + "ref": "prime", "rev": "15dfb099b13ad68b4f286fa9def77f083f79e1b2", "revCount": 49, "type": "git", - "url": "file:../rocie-server" + "url": "https://git.foss-syndicate.org/bpeetz/rocie/server" }, "original": { + "ref": "prime", "type": "git", - "url": "file:../rocie-server" + "url": "https://git.foss-syndicate.org/bpeetz/rocie/server" } }, "root": { "inputs": { + "crane": "crane", "nixpkgs": "nixpkgs", "rocie-mobile": "rocie-mobile", "rocie-server": "rocie-server", + "rust-overlay": "rust-overlay", "treefmt-nix": "treefmt-nix" } }, "rust-overlay": { "inputs": { "nixpkgs": [ - "rocie-mobile", "nixpkgs" ] }, "locked": { - "lastModified": 1773889863, - "narHash": "sha256-tSsmZOHBgq4qfu5MNCAEsKZL1cI4avNLw2oUTXWeb74=", + "lastModified": 1774062094, + "narHash": "sha256-ba3c+hS7KzEiwtZRGHagIAYdcmdY3rCSWVCyn64rx7s=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "dbfd51be2692cb7022e301d14c139accb4ee63f0", + "rev": "c807e83cc2e32adc35f51138b3bdef722c0812ab", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index b793868..44e1e42 100644 --- a/flake.nix +++ b/flake.nix @@ -14,15 +14,26 @@ inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable-small"; + # Inputs for following + rust-overlay = { + url = "github:oxalica/rust-overlay"; + inputs = { + nixpkgs.follows = "nixpkgs"; + }; + }; + crane.url = "github:ipetkov/crane"; + rocie-mobile = { - url = "git+file:../rocie-mobile"; + url = "git+https://git.foss-syndicate.org/bpeetz/rocie/web-client?ref=prime"; inputs = { nixpkgs.follows = "nixpkgs"; treefmt-nix.follows = "treefmt-nix"; + rust-overlay.follows = "rust-overlay"; + crane.follows = "crane"; }; }; rocie-server = { - url = "git+file:../rocie-server"; + url = "git+https://git.foss-syndicate.org/bpeetz/rocie/server?ref=prime"; inputs = { nixpkgs.follows = "nixpkgs"; treefmt-nix.follows = "treefmt-nix"; @@ -43,10 +54,10 @@ treefmt-nix, rocie-mobile, rocie-server, + ... }: let system = "x86_64-linux"; pkgs = nixpkgs.legacyPackages."${system}"; - inherit (pkgs) lib; treefmtEval = import ./treefmt.nix {inherit treefmt-nix pkgs;}; -- cgit 1.4.1