From 5898c2060433d803865df3a9af4408d0443de8b8 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 27 Nov 2015 08:19:50 -0500 Subject: [PATCH] Add idrisPackages to all-packages.nix --- pkgs/development/idris-modules/default.nix | 18 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 20 insertions(+) create mode 100644 pkgs/development/idris-modules/default.nix diff --git a/pkgs/development/idris-modules/default.nix b/pkgs/development/idris-modules/default.nix new file mode 100644 index 000000000000..d07619724fe1 --- /dev/null +++ b/pkgs/development/idris-modules/default.nix @@ -0,0 +1,18 @@ +{ pkgs, idris, overrides ? (self: super: {}) }: let + inherit (pkgs.lib) callPackageWith fix' extends; + + /* Taken from haskell-modules/default.nix, should probably abstract this away */ + callPackageWithScope = scope: drv: args: (callPackageWith scope drv args) // { + overrideScope = f: callPackageWithScope (mkScope (fix' (extends f scope.__unfix__))) drv args; + }; + + mkScope = scope : pkgs // pkgs.xorg // pkgs.gnome // scope; + + idrisPackages = self: let + defaultScope = mkScope self; + + callPackage = callPackageWithScope defaultScope; + in { + withPackages = packages: callPackage ./with-packages-wrapper.nix { inherit packages idris; }; + }; +in fix' (extends overrides idrisPackages) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 760f3309be34..f482a74881c3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4121,6 +4121,8 @@ let icedtea_web = icedtea8_web; + idrisPackages = callPackage ../development/idris-modules { inherit (haskellPackages) idris; }; + ikarus = callPackage ../development/compilers/ikarus { }; intercal = callPackage ../development/compilers/intercal { };