From 608c6aceb07e009cce39bfcc12a5f69366315f63 Mon Sep 17 00:00:00 2001 From: randogoth Date: Sat, 4 Jul 2026 18:29:48 +0300 Subject: [PATCH] lock oberon flake input (ref=main) Co-Authored-By: Claude Opus 4.8 --- flake.lock | 38 ++++++++++++++++++++++++++++++++++++++ flake.nix | 6 ++++-- 2 files changed, 42 insertions(+), 2 deletions(-) diff --git a/flake.lock b/flake.lock index d794d5e..cd6eaf8 100644 --- a/flake.lock +++ b/flake.lock @@ -87,6 +87,43 @@ "type": "github" } }, + "nixpkgs_2": { + "locked": { + "lastModified": 1782959384, + "narHash": "sha256-xnJJk+ct+D2+wdRxj1wk36w5zV9RVESwRqcklPdt3fM=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "65179426c83bb3f6bc14898b42ea1c6f01d374b0", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "oberon": { + "inputs": { + "nixpkgs": "nixpkgs_2" + }, + "locked": { + "dir": "server/oberon", + "lastModified": 1783177860, + "narHash": "sha256-p8S1qCtsffP41ARCDgDeGBeY6O1e0+o7EkSJUt7B5c4=", + "ref": "main", + "rev": "cc15b067f45732e100ea7d6a89aef80b59e1e573", + "revCount": 94, + "type": "git", + "url": "ssh://git@codeberg.org/randogoth/xfay.git" + }, + "original": { + "dir": "server/oberon", + "ref": "main", + "type": "git", + "url": "ssh://git@codeberg.org/randogoth/xfay.git" + } + }, "praxis": { "flake": false, "locked": { @@ -160,6 +197,7 @@ "jirorian": "jirorian", "nfc_web": "nfc_web", "nixpkgs": "nixpkgs", + "oberon": "oberon", "praxis": "praxis", "scopesessions": "scopesessions", "sops-nix": "sops-nix", diff --git a/flake.nix b/flake.nix index 4f5eae6..905eb2e 100644 --- a/flake.nix +++ b/flake.nix @@ -33,10 +33,12 @@ jirorian.url = "git+ssh://git@codeberg.org/randogoth/jirorian.git"; jirorian.inputs.nixpkgs.follows = "nixpkgs"; - # oberon lives in the private xfay monorepo (server/oberon). It pins its own + # oberon lives in the private xfay monorepo on the `main` branch + # (server/oberon) — pinned with ref=main because the repo's default branch is + # fax-machine-experiment, which does not contain the server. It pins its own # nixpkgs (nixos-unstable, for Dart 3.11) and must NOT follow ours — 25.11's # Dart 3.9 is too old for its resolved lockfile. - oberon.url = "git+ssh://git@codeberg.org/randogoth/xfay.git?dir=server/oberon"; + oberon.url = "git+ssh://git@codeberg.org/randogoth/xfay.git?ref=main&dir=server/oberon"; }; outputs = { self, nixpkgs, sops-nix, ... }@inputs: