From 9f7ac9269852b12a220a8cc48d1879ddfab0a115 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sat, 26 Mar 2022 09:44:27 +0100 Subject: [PATCH] dhall-text: remove at 1.0.18 dhall-text has been deprecated upstream and no longer builds with the other dhall packages we are shipping. --- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- pkgs/top-level/release-haskell.nix | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 2731c0bd3fc7..64b6cf2cdd11 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -256,6 +256,7 @@ mapAliases ({ demjson = with python3Packages; toPythonApplication demjson; # Added 2022-01-18 desktop_file_utils = throw "'desktop_file_utils' has been renamed to/replaced by 'desktop-file-utils'"; # Converted to throw 2022-02-22 devicemapper = throw "'devicemapper' has been renamed to/replaced by 'lvm2'"; # Converted to throw 2022-02-22 + dhall-text = throw "'dhall-text' has been deprecated in favor of the 'dhall text' command from 'dhall'"; # Added 2022-03-26 digikam5 = throw "'digikam5' has been renamed to/replaced by 'digikam'"; # Converted to throw 2022-02-22 displaycal = throw "displaycal has been removed from nixpkgs, as it hasn't migrated to python3"; # Added 2022-01-12 dmtx = throw "'dmtx' has been renamed to/replaced by 'dmtx-utils'"; # Converted to throw 2022-02-22 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4a2a408ed701..49e4972e0dcb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13787,8 +13787,6 @@ with pkgs; dhall-nixpkgs = haskell.lib.compose.justStaticExecutables haskellPackages.dhall-nixpkgs; - dhall-text = haskell.lib.compose.justStaticExecutables haskellPackages.dhall-text; - dhallPackages = recurseIntoAttrs (callPackage ./dhall-packages.nix { }); duktape = callPackage ../development/interpreters/duktape { }; diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index 88ff5a6ae9f9..c69d03d0ef7f 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -157,7 +157,6 @@ let dhall-lsp-server dhall-json dhall-nix - dhall-text diagrams-builder elm2nix fffuu