From 9d0c3dd6a747b1aeb9312041e17d8d72e9b1b713 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 24 Mar 2025 22:02:49 +0100 Subject: [PATCH] Formatting --- flake.nix | 44 ++++++++++++++++++++++------------------ packaging/components.nix | 11 ---------- 2 files changed, 24 insertions(+), 31 deletions(-) diff --git a/flake.nix b/flake.nix index a1a7b160c..54cf1a36d 100644 --- a/flake.nix +++ b/flake.nix @@ -310,27 +310,31 @@ closures = forAllSystems (system: self.packages.${system}.default.outPath); - closures_json = pkgs.runCommand "versions.json" - { - buildInputs = [ pkgs.jq ]; - passAsFile = [ "json" ]; - json = builtins.toJSON closures; - } '' - cat "$jsonPath" | jq . > $out - ''; - - closures_nix = pkgs.runCommand "versions.nix" - { - buildInputs = [ pkgs.jq ]; - passAsFile = [ "template" ]; - jsonPath = closures_json; - template = '' - builtins.fromJSON('''@closures@''') + closures_json = + pkgs.runCommand "versions.json" + { + buildInputs = [ pkgs.jq ]; + passAsFile = [ "json" ]; + json = builtins.toJSON closures; + } + '' + cat "$jsonPath" | jq . > $out + ''; + + closures_nix = + pkgs.runCommand "versions.nix" + { + buildInputs = [ pkgs.jq ]; + passAsFile = [ "template" ]; + jsonPath = closures_json; + template = '' + builtins.fromJSON('''@closures@''') + ''; + } + '' + export closures=$(cat "$jsonPath"); + substituteAll "$templatePath" "$out" ''; - } '' - export closures=$(cat "$jsonPath"); - substituteAll "$templatePath" "$out" - ''; in closures_nix; } diff --git a/packaging/components.nix b/packaging/components.nix index 4678e92ca..04b143bfe 100644 --- a/packaging/components.nix +++ b/packaging/components.nix @@ -50,17 +50,6 @@ let exts: userFn: stdenv.mkDerivation (lib.extends (lib.composeManyExtensions exts) userFn); setVersionLayer = finalAttrs: prevAttrs: { - /* - preConfigure = - prevAttrs.preConfigure or "" - + - # Update the repo-global .version file. - # Symlink ./.version points there, but by default only workDir is writable. - '' - chmod u+w ./.version - echo ${finalAttrs.version} > ./.version - ''; - */ }; localSourceLayer =