From 3724b8cfa8436b9ced841078a8934584b692fc79 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 7 Feb 2022 11:09:49 -0800 Subject: [PATCH] idrisPackages.protobuf: move to alias set --- pkgs/development/idris-modules/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/idris-modules/default.nix b/pkgs/development/idris-modules/default.nix index 781533694f22..ea8697482dab 100644 --- a/pkgs/development/idris-modules/default.nix +++ b/pkgs/development/idris-modules/default.nix @@ -1,4 +1,4 @@ -{ pkgs, idris-no-deps, overrides ? (self: super: {}) }: let +{ pkgs, config, idris-no-deps, overrides ? (self: super: {}) }: let inherit (pkgs.lib) callPackageWith fix' extends; /* Taken from haskell-modules/default.nix, should probably abstract this away */ @@ -145,8 +145,6 @@ posix = callPackage ./posix.nix {}; - protobuf = throw "idrisPackages.protobuf has been removed: abandoned by upstream"; # added 2022-02-06 - quantities = callPackage ./quantities.nix {}; rationals = callPackage ./rationals.nix {}; @@ -207,5 +205,8 @@ yampa = callPackage ./yampa.nix {}; - } // builtins_; + } // builtins_ // pkgs.lib.optionalAttrs (config.allowAliases or true) { + # removed packages + protobuf = throw "idrisPackages.protobuf has been removed: abandoned by upstream"; # Added 2022-02-06 + }; in fix' (extends overrides idrisPackages)