From 1c6dd5b47e1c86e943ac473b9d7200290ba7b619 Mon Sep 17 00:00:00 2001 From: Tom McLaughlin Date: Mon, 16 Sep 2024 17:20:07 -0700 Subject: [PATCH] Remove makeEnvironmentPrime --- codedown.nix | 6 --- codedown/makeEnvironmentPrime.nix | 62 ------------------------------- 2 files changed, 68 deletions(-) delete mode 100644 codedown/makeEnvironmentPrime.nix diff --git a/codedown.nix b/codedown.nix index 11786bb..64f23f2 100644 --- a/codedown.nix +++ b/codedown.nix @@ -45,8 +45,6 @@ let in rec { - nixpkgsStableSearcher = common.searcher pkgsStable; - spellchecker = pkgsUnstable.callPackage ./language_servers/markdown-spellcheck-lsp {}; languages = languagesFn false; @@ -94,10 +92,6 @@ rec { inherit pkgsStable pkgsUnstable pkgsMaster; }; - makeEnvironmentPrime = callPackage ./codedown/makeEnvironmentPrime.nix { - inherit mkCodeDownEnvironment; - }; - validateCodeDownEnvironment = callPackage ./codedown/validateCodeDownEnvironment.nix {}; # Exposed so it's easier to compute build dependencies in the presence of IFD diff --git a/codedown/makeEnvironmentPrime.nix b/codedown/makeEnvironmentPrime.nix deleted file mode 100644 index 4ce55ea..0000000 --- a/codedown/makeEnvironmentPrime.nix +++ /dev/null @@ -1,62 +0,0 @@ -{ callPackage -, lib -, fetchgit -, fetchFromGitHub -, system - -, mkCodeDownEnvironment -, name ? "codedown-environment" -}: - -{ - channels ? {} - , packages ? {} -}: - -with lib; - -let - importedOverlays = []; - - importedChannels = builtins.mapAttrs (name: value: let imported = import value; in - if (builtins.isFunction imported && builtins.hasAttr "overlays" (builtins.functionArgs imported)) then imported { overlays = importedOverlays; inherit system; } - else if (builtins.isFunction imported) then imported { inherit fetchgit fetchFromGitHub; } - else imported - ) channels; - - kernelPackages = filterAttrs (k: _: hasPrefix "codedown.kernels." k) packages; - nonKernelPackages = filterAttrs (k: _: !(hasPrefix "codedown.kernels." k)) packages; - - getByChannelAndPackageName = k: v: let - parts = strings.splitString "." k; - in - if builtins.length parts == 1 then null - else { - channel = head parts; - attr = concatStringsSep "." (tail parts); - }; - - repackPackages = packages: if builtins.isList packages then packages else - mapAttrsToList (n: v: { name = n; settings = v; }) packages; - -in - -mkCodeDownEnvironment { - inherit channels; - environmentName = name; - - kernels = mapAttrsToList (n: v: { - name = builtins.substring (builtins.stringLength "codedown.kernels.") (builtins.stringLength n) n; - channel = "codedown"; - args = if hasAttr "packages" v then v // { packages = repackPackages v.packages; } else v; - }) kernelPackages; - - otherPackages = let - byChannelAndPackageName = filterAttrs (n: v: v != null) (mapAttrs (k: v: getByChannelAndPackageName k v) nonKernelPackages); - in - mapAttrsToList (n: v: { - channel = v.channel; - attr = v.attr; - contents = getAttr v.attr importedChannels.${v.channel}; - }) byChannelAndPackageName; -}