diff --git a/flake.lock b/flake.lock index 156c846..9a11122 100644 --- a/flake.lock +++ b/flake.lock @@ -74,28 +74,35 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "path": "../../../quixos-protocol", - "type": "path" + "lastModified": 1783886666, + "narHash": "sha256-B+WyKSrCS/3rjCN7opGjpkAxWDqB5A9K/ISKYxFeRyo=", + "ref": "refs/heads/exported", + "rev": "a8dc34db0ed32e74cee9859d7a9fbaa699cb0f4c", + "revCount": 2, + "type": "git", + "url": "https://gitea-external.egads.tutti.syntaxblitz.net/quixos/quixos-protocol.git" }, "original": { - "path": "../../../quixos-protocol", - "type": "path" - }, - "parent": [] + "ref": "refs/heads/exported", + "rev": "a8dc34db0ed32e74cee9859d7a9fbaa699cb0f4c", + "type": "git", + "url": "https://gitea-external.egads.tutti.syntaxblitz.net/quixos/quixos-protocol.git" + } }, "quixosNixHelpers": { "flake": false, "locked": { - "lastModified": 1783884081, - "narHash": "sha256-cxM6C4VDTu0uV3Vymz/ZTkTdk+K5RMzpmz6WQWYgCbg=", - "ref": "refs/heads/master", - "rev": "8dde1f6b82197e5c508ad4260e258ffecc7828a9", - "revCount": 4, + "lastModified": 1783886666, + "narHash": "sha256-y52TlYwH9RBzzyhpkY/eB21t85BE84idpsg8618MIHg=", + "ref": "refs/heads/exported", + "rev": "81e55657d9ce0ba092cffd69ee15179ea02aa598", + "revCount": 2, "type": "git", "url": "https://gitea-external.egads.tutti.syntaxblitz.net/quixos/quixos-nix-helpers.git" }, "original": { - "rev": "8dde1f6b82197e5c508ad4260e258ffecc7828a9", + "ref": "refs/heads/exported", + "rev": "81e55657d9ce0ba092cffd69ee15179ea02aa598", "type": "git", "url": "https://gitea-external.egads.tutti.syntaxblitz.net/quixos/quixos-nix-helpers.git" } diff --git a/flake.nix b/flake.nix index 5455a14..88b6b92 100644 --- a/flake.nix +++ b/flake.nix @@ -4,9 +4,9 @@ inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; flake-utils.url = "github:numtide/flake-utils"; - quixos-protocol.url = "path:../../../quixos-protocol"; + quixos-protocol.url = "git+https://gitea-external.egads.tutti.syntaxblitz.net/quixos/quixos-protocol.git?ref=refs/heads/exported&rev=a8dc34db0ed32e74cee9859d7a9fbaa699cb0f4c"; quixosNixHelpers = { - url = "git+https://gitea-external.egads.tutti.syntaxblitz.net/quixos/quixos-nix-helpers.git?rev=8dde1f6b82197e5c508ad4260e258ffecc7828a9"; + url = "git+https://gitea-external.egads.tutti.syntaxblitz.net/quixos/quixos-nix-helpers.git?ref=refs/heads/exported&rev=81e55657d9ce0ba092cffd69ee15179ea02aa598"; flake = false; }; }; @@ -29,8 +29,8 @@ devShellPackages = { pkgs, ... }: [ pkgs.protobuf ]; - devShellHook = { pkgs, ... }: '' - export QUIXOS_PROTO_PATH="${pkgs.protobuf}/include:$PWD/../../../quixos-protocol/proto''${QUIXOS_PROTO_PATH:+:$QUIXOS_PROTO_PATH}" + devShellHook = { inputs, pkgs, system, ... }: '' + export QUIXOS_PROTO_PATH="${pkgs.protobuf}/include:${inputs.quixos-protocol.packages.${system}.default}/proto''${QUIXOS_PROTO_PATH:+:$QUIXOS_PROTO_PATH}" ''; }; }