From 86528d63ad31c1845cd37855ec799682ea2598f9 Mon Sep 17 00:00:00 2001 From: quapka Date: Mon, 12 Aug 2024 18:28:41 +0200 Subject: Add default targets for all lib and shim builds --- flake.nix | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/flake.nix b/flake.nix index a243613..371fa92 100644 --- a/flake.nix +++ b/flake.nix @@ -591,18 +591,29 @@ ); loadVersions = { libName, function }: - pkgs.lib.mapAttrs (rev: specs: function { ${libName} = specs; }) ( - builtins.fromJSON (builtins.readFile ./nix/${libName}_pkg_versions.json) - ); + let + versions = builtins.fromJSON (builtins.readFile ./nix/${libName}_pkg_versions.json); + firstVersion = builtins.elemAt (pkgs.lib.attrsets.attrValues versions) 0; + in + pkgs.lib.mapAttrs (rev: specs: function { ${libName} = specs; }) versions + // { + default = function { ${libName} = firstVersion; }; + }; + loadVersionsForShim = { libName, function }: - pkgs.lib.mapAttrs (rev: specs: function specs) ( - builtins.fromJSON (builtins.readFile ./nix/${libName}_pkg_versions.json) - ); + let + versions = builtins.fromJSON (builtins.readFile ./nix/${libName}_pkg_versions.json); + firstVersion = builtins.elemAt (pkgs.lib.attrsets.attrValues versions) 0; + in + pkgs.lib.mapAttrs (rev: specs: function specs) versions + // (with pkgs.lib; { + default = function firstVersion; + }); in { packages = rec { - default = openssl.v331; + default = openssl.default; tomcrypt = loadVersions { libName = "tomcrypt"; function = buildECTesterStandalone; -- cgit v1.3.1