From 82425ca793a5c9e78afaf6ae7eeda9b0f7f77018 Mon Sep 17 00:00:00 2001 From: Gabriel Gonzalez Date: Sat, 9 Jan 2021 20:21:49 -0800 Subject: [PATCH] Fix support for extending Dhall package set * Fix `dhallPackages` to be defined using `callPackage` instead of `callPackages` This enables the `pkgs.dhallPackages.override` method * Export `pkgs.dhallPackages.callPackage` This is also necessary in order to easily extend `pkgs.dhallPackages` with new packages --- pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/dhall-packages.nix | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4060580edce..5cf5f776cad 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10615,7 +10615,7 @@ in dhall-text = haskell.lib.justStaticExecutables haskellPackages.dhall-text; - dhallPackages = callPackages ./dhall-packages.nix { }; + dhallPackages = callPackage ./dhall-packages.nix { }; duktape = callPackage ../development/interpreters/duktape { }; diff --git a/pkgs/top-level/dhall-packages.nix b/pkgs/top-level/dhall-packages.nix index c1c2c5f0e3b..5a3fb04748d 100644 --- a/pkgs/top-level/dhall-packages.nix +++ b/pkgs/top-level/dhall-packages.nix @@ -19,6 +19,7 @@ let in { inherit + callPackage buildDhallPackage buildDhallGitHubPackage buildDhallDirectoryPackage