From f248cc91ad7c1ca1e5ddfd20b43e3e9c0b103ba9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 8 Aug 2025 14:48:02 +0200 Subject: [PATCH] switch to flake-compat for private flake --- devFlake/flake-compat.nix | 299 ++++++++++++++++++++++++++++++ devFlake/{private => }/flake.lock | 0 devFlake/{private => }/flake.nix | 2 +- devFlake/private.narHash | 1 - devFlake/update-private-narhash | 12 -- docs/nix/options/flake-module.nix | 31 ++-- flake.nix | 20 +- 7 files changed, 316 insertions(+), 49 deletions(-) create mode 100644 devFlake/flake-compat.nix rename devFlake/{private => }/flake.lock (100%) rename devFlake/{private => }/flake.nix (94%) delete mode 100644 devFlake/private.narHash delete mode 100755 devFlake/update-private-narhash diff --git a/devFlake/flake-compat.nix b/devFlake/flake-compat.nix new file mode 100644 index 000000000..ddc1cd0e3 --- /dev/null +++ b/devFlake/flake-compat.nix @@ -0,0 +1,299 @@ +# Compatibility function to allow flakes to be used by +# non-flake-enabled Nix versions. Given a source tree containing a +# 'flake.nix' and 'flake.lock' file, it fetches the flake inputs and +# calls the flake's 'outputs' function. It then returns an attrset +# containing 'defaultNix' (to be used in 'default.nix'), 'shellNix' +# (to be used in 'shell.nix'). + +{ + src, + system ? builtins.currentSystem or "unknown-system", +}: + +let + + lockFilePath = src + "/flake.lock"; + + lockFile = builtins.fromJSON (builtins.readFile lockFilePath); + + fetchTree = + builtins.fetchTree or ( + info: + if info.type == "github" then + { + outPath = fetchTarball ( + { + url = "https://api.${info.host or "github.com"}/repos/${info.owner}/${info.repo}/tarball/${info.rev}"; + } + // (if info ? narHash then { sha256 = info.narHash; } else { }) + ); + rev = info.rev; + shortRev = builtins.substring 0 7 info.rev; + lastModified = info.lastModified; + lastModifiedDate = formatSecondsSinceEpoch info.lastModified; + narHash = info.narHash; + } + else if info.type == "git" then + { + outPath = builtins.fetchGit ( + { + url = info.url; + } + // (if info ? rev then { inherit (info) rev; } else { }) + // (if info ? ref then { inherit (info) ref; } else { }) + // (if info ? submodules then { inherit (info) submodules; } else { }) + ); + lastModified = info.lastModified; + lastModifiedDate = formatSecondsSinceEpoch info.lastModified; + narHash = info.narHash; + revCount = info.revCount or 0; + } + // ( + if info ? rev then + { + rev = info.rev; + shortRev = builtins.substring 0 7 info.rev; + } + else + { } + ) + else if info.type == "path" then + { + outPath = builtins.path { + path = info.path; + sha256 = info.narHash; + }; + narHash = info.narHash; + } + else if info.type == "tarball" then + { + outPath = fetchTarball ( + { inherit (info) url; } // (if info ? narHash then { sha256 = info.narHash; } else { }) + ); + } + else if info.type == "gitlab" then + { + inherit (info) rev narHash lastModified; + outPath = fetchTarball ( + { + url = "https://${info.host or "gitlab.com"}/api/v4/projects/${info.owner}%2F${info.repo}/repository/archive.tar.gz?sha=${info.rev}"; + } + // (if info ? narHash then { sha256 = info.narHash; } else { }) + ); + shortRev = builtins.substring 0 7 info.rev; + } + else if info.type == "sourcehut" then + { + inherit (info) rev narHash lastModified; + outPath = fetchTarball ( + { + url = "https://${info.host or "git.sr.ht"}/${info.owner}/${info.repo}/archive/${info.rev}.tar.gz"; + } + // (if info ? narHash then { sha256 = info.narHash; } else { }) + ); + shortRev = builtins.substring 0 7 info.rev; + } + else + # FIXME: add Mercurial, tarball inputs. + throw "flake input has unsupported input type '${info.type}'" + ); + + callFlake4 = + flakeSrc: locks: + let + flake = import (flakeSrc + "/flake.nix"); + + inputs = builtins.mapAttrs ( + _n: v: + if v.flake or true then + callFlake4 (fetchTree (v.locked // v.info)) v.inputs + else + fetchTree (v.locked // v.info) + ) locks; + + outputs = flakeSrc // (flake.outputs (inputs // { self = outputs; })); + in + assert flake.edition == 201909; + outputs; + + callLocklessFlake = + flakeSrc: + let + flake = import (flakeSrc + "/flake.nix"); + outputs = flakeSrc // (flake.outputs ({ self = outputs; })); + in + outputs; + + rootSrc = + let + # Try to clean the source tree by using fetchGit, if this source + # tree is a valid git repository. + tryFetchGit = + src: + if isGit && !isShallow then + let + res = builtins.fetchGit src; + in + if res.rev == "0000000000000000000000000000000000000000" then + removeAttrs res [ + "rev" + "shortRev" + ] + else + res + else + { + outPath = + # Massage `src` into a store path. + if builtins.isPath src then + if + dirOf (toString src) == builtins.storeDir + # `builtins.storePath` is not available in pure-eval mode. + && builtins ? currentSystem + then + # If it's already a store path, don't copy it again. + builtins.storePath src + else + "${src}" + else + src; + }; + # NB git worktrees have a file for .git, so we don't check the type of .git + isGit = builtins.pathExists (src + "/.git"); + isShallow = builtins.pathExists (src + "/.git/shallow"); + + in + { + lastModified = 0; + lastModifiedDate = formatSecondsSinceEpoch 0; + } + // (if src ? outPath then src else tryFetchGit src); + + # Format number of seconds in the Unix epoch as %Y%m%d%H%M%S. + formatSecondsSinceEpoch = + t: + let + rem = x: y: x - x / y * y; + days = t / 86400; + secondsInDay = rem t 86400; + hours = secondsInDay / 3600; + minutes = (rem secondsInDay 3600) / 60; + seconds = rem t 60; + + # Courtesy of https://stackoverflow.com/a/32158604. + z = days + 719468; + era = (if z >= 0 then z else z - 146096) / 146097; + doe = z - era * 146097; + yoe = (doe - doe / 1460 + doe / 36524 - doe / 146096) / 365; + y = yoe + era * 400; + doy = doe - (365 * yoe + yoe / 4 - yoe / 100); + mp = (5 * doy + 2) / 153; + d = doy - (153 * mp + 2) / 5 + 1; + m = mp + (if mp < 10 then 3 else -9); + y' = y + (if m <= 2 then 1 else 0); + + pad = s: if builtins.stringLength s < 2 then "0" + s else s; + in + "${toString y'}${pad (toString m)}${pad (toString d)}${pad (toString hours)}${pad (toString minutes)}${pad (toString seconds)}"; + + allNodes = builtins.mapAttrs ( + key: node: + let + sourceInfo = + if key == lockFile.root then + rootSrc + else + fetchTree (node.info or { } // removeAttrs node.locked [ "dir" ]); + + subdir = if key == lockFile.root then "" else node.locked.dir or ""; + + outPath = sourceInfo + ((if subdir == "" then "" else "/") + subdir); + + flake = import (outPath + "/flake.nix"); + + inputs = builtins.mapAttrs (_inputName: inputSpec: allNodes.${resolveInput inputSpec}) ( + node.inputs or { } + ); + + # Resolve a input spec into a node name. An input spec is + # either a node name, or a 'follows' path from the root + # node. + resolveInput = + inputSpec: if builtins.isList inputSpec then getInputByPath lockFile.root inputSpec else inputSpec; + + # Follow an input path (e.g. ["dwarffs" "nixpkgs"]) from the + # root node, returning the final node. + getInputByPath = + nodeName: path: + if path == [ ] then + nodeName + else + getInputByPath + # Since this could be a 'follows' input, call resolveInput. + (resolveInput lockFile.nodes.${nodeName}.inputs.${builtins.head path}) + (builtins.tail path); + + outputs = flake.outputs (inputs // { self = result; }); + + result = + outputs + # We add the sourceInfo attribute for its metadata, as they are + # relevant metadata for the flake. However, the outPath of the + # sourceInfo does not necessarily match the outPath of the flake, + # as the flake may be in a subdirectory of a source. + # This is shadowed in the next // + // sourceInfo + // { + # This shadows the sourceInfo.outPath + inherit outPath; + + inherit inputs; + inherit outputs; + inherit sourceInfo; + _type = "flake"; + }; + + in + if node.flake or true then + assert builtins.isFunction flake.outputs; + result + else + sourceInfo + ) lockFile.nodes; + + result = + if !(builtins.pathExists lockFilePath) then + callLocklessFlake rootSrc + else if lockFile.version == 4 then + callFlake4 rootSrc (lockFile.inputs) + else if lockFile.version >= 5 && lockFile.version <= 7 then + allNodes.${lockFile.root} + else + throw "lock file '${lockFilePath}' has unsupported version ${toString lockFile.version}"; + +in +rec { + outputs = result; + + defaultNix = + builtins.removeAttrs result [ "__functor" ] + // ( + if result ? defaultPackage.${system} then { default = result.defaultPackage.${system}; } else { } + ) + // ( + if result ? packages.${system}.default then + { default = result.packages.${system}.default; } + else + { } + ); + + shellNix = + defaultNix + // (if result ? devShell.${system} then { default = result.devShell.${system}; } else { }) + // ( + if result ? devShells.${system}.default then + { default = result.devShells.${system}.default; } + else + { } + ); +} diff --git a/devFlake/private/flake.lock b/devFlake/flake.lock similarity index 100% rename from devFlake/private/flake.lock rename to devFlake/flake.lock diff --git a/devFlake/private/flake.nix b/devFlake/flake.nix similarity index 94% rename from devFlake/private/flake.nix rename to devFlake/flake.nix index 44ffa70a7..7ce911c3b 100644 --- a/devFlake/private/flake.nix +++ b/devFlake/flake.nix @@ -15,5 +15,5 @@ inputs.systems.url = "github:nix-systems/default"; - outputs = _: { }; + outputs = inputs: inputs; } diff --git a/devFlake/private.narHash b/devFlake/private.narHash deleted file mode 100644 index 211411f21..000000000 --- a/devFlake/private.narHash +++ /dev/null @@ -1 +0,0 @@ -sha256-LdjcFZLL8WNldUO2LbdqFlss/ERiGeXVqMee0IxV2z0= diff --git a/devFlake/update-private-narhash b/devFlake/update-private-narhash deleted file mode 100755 index 900e573e1..000000000 --- a/devFlake/update-private-narhash +++ /dev/null @@ -1,12 +0,0 @@ -#!/usr/bin/env bash -# Used to update the private dev flake hash reference. -set -euo pipefail - -cd "$(dirname "$0")" - -echo "Updating $PWD/private.narHash" >&2 - -nix --extra-experimental-features 'flakes nix-command' flake lock ./private -nix --extra-experimental-features 'flakes nix-command' hash path ./private >./private.narHash - -echo OK \ No newline at end of file diff --git a/docs/nix/options/flake-module.nix b/docs/nix/options/flake-module.nix index 3ea9a178b..bd3718cad 100644 --- a/docs/nix/options/flake-module.nix +++ b/docs/nix/options/flake-module.nix @@ -1,8 +1,6 @@ { self, - config, - inputs, - privateInputs ? { }, + privateInputs, ... }: { @@ -170,22 +168,19 @@ # modules = docModules; # }; - packages = lib.optionalAttrs ((privateInputs ? nuschtos) || (inputs ? nuschtos)) { - docs-options = - (privateInputs.nuschtos or inputs.nuschtos) - .packages.${pkgs.stdenv.hostPlatform.system}.mkMultiSearch + packages = { + docs-options = privateInputs.nuschtos.packages.${pkgs.stdenv.hostPlatform.system}.mkMultiSearch { + inherit baseHref; + title = "Clan Options"; + # scopes = mapAttrsToList mkScope serviceModules; + scopes = [ { - inherit baseHref; - title = "Clan Options"; - # scopes = mapAttrsToList mkScope serviceModules; - scopes = [ - { - name = "Clan"; - modules = docModules; - urlPrefix = "https://git.clan.lol/clan/clan-core/src/branch/main/"; - } - ]; - }; + name = "Clan"; + modules = docModules; + urlPrefix = "https://git.clan.lol/clan/clan-core/src/branch/main/"; + } + ]; + }; }; }; } diff --git a/flake.nix b/flake.nix index f1414fd23..3b5fcfd13 100644 --- a/flake.nix +++ b/flake.nix @@ -50,24 +50,10 @@ pathExists ; - # Load private flake inputs if available - loadDevFlake = - path: - let - flakeHash = nixpkgs.lib.fileContents "${toString path}.narHash"; - flakePath = "path:${toString path}?narHash=${flakeHash}"; - in - builtins.getFlake (builtins.unsafeDiscardStringContext flakePath); - - devFlake = builtins.tryEval (loadDevFlake ./devFlake/private); - privateInputs = - if pathExists ./.skip-private-inputs then - { } - else if devFlake.success then - devFlake.value.inputs - else - { }; + (import ./devFlake/flake-compat.nix { + src = ./devFlake; + }).outputs; in flake-parts.lib.mkFlake { inherit inputs; } ( { ... }: