Merge pull request #42861 from Infinisil/fix/idris-forks

Idris packages clean ups and updates

83 files changed, 119 insertions, 434 deletions

diff --git a/pkgs/development/idris-modules/array.nix b/pkgs/development/idris-modules/array.nix
index cab7ccbcf7a..38d25827d50 100644
--- a/pkgs/development/idris-modules/array.nix
+++ b/pkgs/development/idris-modules/array.nix
@@ -1,18 +1,11 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
-, base
 , lib
-, idris
 }:
-build-idris-package  {
+build-idris-package {
   name = "array";
   version = "2016-10-14";
 
-  idrisDeps = [ prelude base ];
-
-  extraBuildInputs = [ idris ];
-
   src = fetchFromGitHub {
     owner = "idris-hackers";
     repo = "idris-array";
@@ -25,6 +18,5 @@ build-idris-package  {
     homepage = https://github.com/idris-hackers/idris-array;
     license = lib.licenses.bsd3;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/bi.nix b/pkgs/development/idris-modules/bi.nix
index 47a81a06676..d16d9b2245d 100644
--- a/pkgs/development/idris-modules/bi.nix
+++ b/pkgs/development/idris-modules/bi.nix
@@ -1,16 +1,14 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
 , contrib
 , pruviloj
 , lib
-, idris
 }:
 build-idris-package  {
   name = "bi";
   version = "2018-06-25";
 
-  idrisDeps = [ prelude contrib pruviloj ];
+  idrisDeps = [ contrib pruviloj ];
 
   src = fetchFromGitHub {
     owner = "sbp";
@@ -24,6 +22,5 @@ build-idris-package  {
     homepage = https://github.com/sbp/idris-bi;
     license = lib.licenses.bsd3;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/bifunctors.nix b/pkgs/development/idris-modules/bifunctors.nix
index d8212fa3830..53b4fb0a004 100644
--- a/pkgs/development/idris-modules/bifunctors.nix
+++ b/pkgs/development/idris-modules/bifunctors.nix
@@ -1,16 +1,11 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
-, base
 , lib
-, idris
 }:
 build-idris-package  {
   name = "bifunctors";
   version = "2017-02-07";
 
-  idrisDeps = [ prelude base ];
-
   src = fetchFromGitHub {
     owner = "japesinator";
     repo = "Idris-Bifunctors";
@@ -26,6 +21,5 @@ build-idris-package  {
     description = "A small bifunctor library for idris";
     homepage = https://github.com/japesinator/Idris-Bifunctors;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/build-builtin-package.nix b/pkgs/development/idris-modules/build-builtin-package.nix
index 44efa97a531..1cd687058b3 100644
--- a/pkgs/development/idris-modules/build-builtin-package.nix
+++ b/pkgs/development/idris-modules/build-builtin-package.nix
@@ -10,6 +10,9 @@ build-idris-package {
   inherit name version;
   inherit (idris) src;
 
+  noPrelude = true;
+  noBase = true;
+
   idrisDeps = deps;
 
   postUnpack = ''
diff --git a/pkgs/development/idris-modules/build-idris-package.nix b/pkgs/development/idris-modules/build-idris-package.nix
index 0416e76afa9..7168eb2c956 100644
--- a/pkgs/development/idris-modules/build-idris-package.nix
+++ b/pkgs/development/idris-modules/build-idris-package.nix
@@ -1,23 +1,29 @@
 # Build an idris package
-{ stdenv, idrisPackages, gmp }:
+{ stdenv, lib, idrisPackages, gmp }:
   { idrisDeps ? []
+  , noPrelude ? false
+  , noBase ? false
   , name
   , version
-  , src
-  , meta
   , extraBuildInputs ? []
-  , postUnpack ? ""
-  , doCheck ? true
-  }:
+  , ...
+  }@attrs:
 let
-  idris-with-packages = idrisPackages.with-packages idrisDeps;
+  allIdrisDeps = idrisDeps
+    ++ lib.optional (!noPrelude) idrisPackages.prelude
+    ++ lib.optional (!noBase) idrisPackages.base;
+  idris-with-packages = idrisPackages.with-packages allIdrisDeps;
+  newAttrs = builtins.removeAttrs attrs [ "idrisDeps" "extraBuildInputs" "name" "version" ] // {
+    meta = attrs.meta // {
+      platforms = attrs.meta.platforms or idrisPackages.idris.meta.platforms;
+    };
+  };
 in
 stdenv.mkDerivation ({
-
   name = "${name}-${version}";
 
-  inherit postUnpack src doCheck meta;
-
+  buildInputs = [ idris-with-packages gmp ] ++ extraBuildInputs;
+  propagatedBuildInputs = allIdrisDeps;
 
   # Some packages use the style
   # opts = -i ../../path/to/package
@@ -27,20 +33,18 @@ stdenv.mkDerivation ({
   '';
 
   buildPhase = ''
-    ${idris-with-packages}/bin/idris --build *.ipkg
+    idris --build *.ipkg
   '';
 
   checkPhase = ''
     if grep -q test *.ipkg; then
-      ${idris-with-packages}/bin/idris --testpkg *.ipkg
+      idris --testpkg *.ipkg
     fi
   '';
 
   installPhase = ''
-    ${idris-with-packages}/bin/idris --install *.ipkg --ibcsubdir $out/libs
+    idris --install *.ipkg --ibcsubdir $out/libs
+    IDRIS_DOC_PATH=$out/doc idris --installdoc *.ipkg || true
   '';
 
-  buildInputs = [ gmp ] ++ extraBuildInputs;
-
-  propagatedBuildInputs = idrisDeps;
-})
+} // newAttrs)
diff --git a/pkgs/development/idris-modules/bytes.nix b/pkgs/development/idris-modules/bytes.nix
index 2e5518c953c..ad63cb28399 100644
--- a/pkgs/development/idris-modules/bytes.nix
+++ b/pkgs/development/idris-modules/bytes.nix
@@ -1,18 +1,11 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
 , lib
-, idris
 }:
-
 build-idris-package  {
   name = "bytes";
   version = "2018-02-10";
 
-  idrisDeps = [ prelude ];
-
-  extraBuildInputs = [ idris ];
-
   src = fetchFromGitHub {
     owner = "ziman";
     repo = "idris-bytes";
@@ -24,6 +17,5 @@ build-idris-package  {
     description = "FFI-based byte buffers for Idris";
     homepage = https://github.com/ziman/idris-bytes;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/canvas.nix b/pkgs/development/idris-modules/canvas.nix
index f29d59e5050..72e5e3f5be7 100644
--- a/pkgs/development/idris-modules/canvas.nix
+++ b/pkgs/development/idris-modules/canvas.nix
@@ -1,15 +1,11 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
 , lib
-, idris
 }:
 build-idris-package  {
   name = "canvas";
   version = "2017-11-09";
 
-  idrisDeps = [ prelude ];
-
   src = fetchFromGitHub {
     owner = "JinWuZhao";
     repo = "idriscanvas";
@@ -21,6 +17,5 @@ build-idris-package  {
     description = "Idris FFI binding for html5 canvas 2d api";
     homepage = https://github.com/JinWuZhao/idriscanvas;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/categories.nix b/pkgs/development/idris-modules/categories.nix
index 32be0f6a379..1e234b3f693 100644
--- a/pkgs/development/idris-modules/categories.nix
+++ b/pkgs/development/idris-modules/categories.nix
@@ -1,27 +1,22 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
-, base
 , lib
-, idris
 }:
 build-idris-package  {
   name = "categories";
-  version = "2017-03-01";
-
-  idrisDeps = [ prelude base ];
+  version = "2018-07-02";
 
+  # https://github.com/danilkolikov/categories/pull/5
   src = fetchFromGitHub {
-    owner = "danilkolikov";
+    owner = "infinisil";
     repo = "categories";
-    rev = "933fe418d154e10df39ddb09a74419cb4c4a57e8";
-    sha256 = "1dmpcv13zh7j4k6s2nlpf08gmpawaqaqkbqbg8zrgw253piwb0ci";
+    rev = "9722d62297e5025431e91b271ab09c5d14867236";
+    sha256 = "1bbmm8zif5d5wckdaddw6q3c39w6ms1cxrlrmkdn7bik88dawff2";
   };
 
   meta = {
     description = "Category Theory";
     homepage = https://github.com/danilkolikov/categories;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/coda.nix b/pkgs/development/idris-modules/coda.nix
index ed51bcfec6d..7dbd1211088 100644
--- a/pkgs/development/idris-modules/coda.nix
+++ b/pkgs/development/idris-modules/coda.nix
@@ -1,16 +1,11 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
-, base
 , lib
-, idris
 }:
 build-idris-package  {
   name = "coda";
   version = "2018-01-25";
 
-  idrisDeps = [ prelude base ];
-
   src = fetchFromGitHub {
     owner = "ostera";
     repo = "idris-coda";
@@ -23,6 +18,5 @@ build-idris-package  {
     homepage = https://github.com/ostera/idris-coda;
     license = lib.licenses.bsd3;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/comonad.nix b/pkgs/development/idris-modules/comonad.nix
index 5ecd6d9c585..a47739d52b1 100644
--- a/pkgs/development/idris-modules/comonad.nix
+++ b/pkgs/development/idris-modules/comonad.nix
@@ -1,16 +1,11 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
-, base
 , lib
-, idris
 }:
 build-idris-package  {
   name = "comonad";
   version = "2018-02-26";
 
-  idrisDeps = [ prelude base ];
-
   src = fetchFromGitHub {
     owner = "vmchale";
     repo = "comonad";
@@ -23,6 +18,5 @@ build-idris-package  {
     homepage = https://github.com/vmchale/comonad;
     license = lib.licenses.bsd3;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/composition.nix b/pkgs/development/idris-modules/composition.nix
index 17dda31a5d1..de93d39395b 100644
--- a/pkgs/development/idris-modules/composition.nix
+++ b/pkgs/development/idris-modules/composition.nix
@@ -1,15 +1,13 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
 , hezarfen
 , lib
-, idris
 }:
 build-idris-package  {
   name = "composition";
   version = "2017-11-12";
 
-  idrisDeps = [ prelude hezarfen ];
+  idrisDeps = [ hezarfen ];
 
   src = fetchFromGitHub {
     owner = "vmchale";
@@ -23,6 +21,5 @@ build-idris-package  {
     homepage = https://github.com/vmchale/composition;
     license = lib.licenses.bsd3;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/config.nix b/pkgs/development/idris-modules/config.nix
index 29cb828e061..5c37961b7cb 100644
--- a/pkgs/development/idris-modules/config.nix
+++ b/pkgs/development/idris-modules/config.nix
@@ -1,18 +1,16 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
 , effects
 , containers
 , lightyear
 , test
 , lib
-, idris
 }:
 build-idris-package  {
   name = "config";
   version = "2017-11-06";
 
-  idrisDeps = [ prelude effects containers lightyear test ];
+  idrisDeps = [ effects containers lightyear test ];
 
   src = fetchFromGitHub {
     owner = "benclifford";
@@ -26,6 +24,5 @@ build-idris-package  {
     homepage = https://github.com/benclifford/idris-config;
     license = lib.licenses.bsd3;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/console.nix b/pkgs/development/idris-modules/console.nix
index 27b85c97c68..71785483ce6 100644
--- a/pkgs/development/idris-modules/console.nix
+++ b/pkgs/development/idris-modules/console.nix
@@ -1,17 +1,15 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
 , idrisscript
 , hrtime
 , webgl
 , lib
-, idris
 }:
 build-idris-package  {
   name = "console";
   version = "2017-04-20";
 
-  idrisDeps = [ prelude idrisscript hrtime webgl ];
+  idrisDeps = [ idrisscript hrtime webgl ];
 
   src = fetchFromGitHub {
     owner = "pierrebeaucamp";
@@ -25,6 +23,5 @@ build-idris-package  {
     homepage = https://github.com/pierrebeaucamp/idris-console;
     license = lib.licenses.asl20;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/containers.nix b/pkgs/development/idris-modules/containers.nix
index fe4e729d0e0..c12ea54f5f9 100644
--- a/pkgs/development/idris-modules/containers.nix
+++ b/pkgs/development/idris-modules/containers.nix
@@ -1,17 +1,14 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
 , effects
 , test
 , lib
-, idris
 }:
-
 build-idris-package  {
   name = "containers";
   version = "2017-09-10";
 
-  idrisDeps = [ prelude effects test ];
+  idrisDeps = [ effects test ];
 
   src = fetchFromGitHub {
     owner = "jfdm";
@@ -29,6 +26,5 @@ build-idris-package  {
     homepage = https://github.com/jfdm/idris-containers;
     license = lib.licenses.bsd3;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/cube.nix b/pkgs/development/idris-modules/cube.nix
index ce46c4538b5..7ccda5f21c0 100644
--- a/pkgs/development/idris-modules/cube.nix
+++ b/pkgs/development/idris-modules/cube.nix
@@ -1,17 +1,11 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
-, base
 , lib
-, idris
 }:
-
 build-idris-package  {
   name = "cube";
   version = "2017-07-05";
 
-  idrisDeps = [ prelude base ];
-
   src = fetchFromGitHub {
     owner = "aatxe";
     repo = "cube.idr";
@@ -24,6 +18,5 @@ build-idris-package  {
     homepage = https://github.com/aatxe/cube.idr;
     license = lib.licenses.agpl3;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/curses.nix b/pkgs/development/idris-modules/curses.nix
index 71bd9023840..98b42f827b9 100644
--- a/pkgs/development/idris-modules/curses.nix
+++ b/pkgs/development/idris-modules/curses.nix
@@ -1,18 +1,16 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
 , effects
 , lib
-, idris
 , ncurses
 }:
 build-idris-package  {
   name = "curses";
   version = "2017-10-12";
 
-  idrisDeps = [ prelude effects ];
+  idrisDeps = [ effects ];
 
-  extraBuildInputs = [ ncurses.out ncurses.dev ];
+  extraBuildInputs = [ ncurses ];
 
   postUnpack = ''
     sed -i 's/^libs = curses$/libs = ncurses/g' source/curses.ipkg
@@ -31,6 +29,5 @@ build-idris-package  {
     homepage = https://github.com/JakobBruenker/curses-idris;
     license = lib.licenses.mit;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/data.nix b/pkgs/development/idris-modules/data.nix
index 3cb78eabe96..1c515ec3975 100644
--- a/pkgs/development/idris-modules/data.nix
+++ b/pkgs/development/idris-modules/data.nix
@@ -1,15 +1,13 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
 , contrib
 , lib
-, idris
 }:
 build-idris-package  {
   name = "data";
   version = "2018-03-19";
 
-  idrisDeps = [ prelude contrib ];
+  idrisDeps = [ contrib ];
 
   src = fetchFromGitHub {
     owner = "jdevuyst";
@@ -23,6 +21,5 @@ build-idris-package  {
     homepage = https://github.com/jdevuyst/idris-data;
     license = lib.licenses.bsd3;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/derive.nix b/pkgs/development/idris-modules/derive.nix
index 6cc2ead71fc..7b6cb64cfe3 100644
--- a/pkgs/development/idris-modules/derive.nix
+++ b/pkgs/development/idris-modules/derive.nix
@@ -1,22 +1,21 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
 , contrib
 , pruviloj
 , lib
-, idris
 }:
 build-idris-package  {
   name = "derive";
-  version = "2018-02-15";
+  version = "2018-07-02";
 
-  idrisDeps = [ prelude contrib pruviloj ];
+  idrisDeps = [ contrib pruviloj ];
 
+  # https://github.com/david-christiansen/derive-all-the-instances/pull/9
   src = fetchFromGitHub {
-    owner = "davlum";
+    owner = "infinisil";
     repo = "derive-all-the-instances";
-    rev = "2c8956807bd094ba33569227de921c6726401c42";
-    sha256 = "0l7263s04r52ql292vnnx2kngld6s1dipmaz5na7m82lj9p4x17y";
+    rev = "61c3e12e26f599379299fcbb9c40a81bfc3e0604";
+    sha256 = "0g2lb8nrwqwf3gm5fir43cxz6db84n19xiwkv8cmmqc1fgy6v0qn";
   };
 
   meta = {
@@ -24,6 +23,5 @@ build-idris-package  {
     homepage = https://github.com/davlum/derive-all-the-instances;
     license = lib.licenses.mit;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/descncrunch.nix b/pkgs/development/idris-modules/descncrunch.nix
index 736b25c9684..8c808447f64 100644
--- a/pkgs/development/idris-modules/descncrunch.nix
+++ b/pkgs/development/idris-modules/descncrunch.nix
@@ -1,15 +1,13 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
 , pruviloj
 , lib
-, idris
 }:
 build-idris-package  {
   name = "descncrunch";
   version = "2017-11-15";
 
-  idrisDeps = [ prelude pruviloj ];
+  idrisDeps = [ pruviloj ];
 
   src = fetchFromGitHub {
     owner = "ahmadsalim";
@@ -23,6 +21,6 @@ build-idris-package  {
     homepage = https://github.com/ahmadsalim/desc-n-crunch;
     license = lib.licenses.gpl3;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
+    broken = true;
   };
 }
diff --git a/pkgs/development/idris-modules/dict.nix b/pkgs/development/idris-modules/dict.nix
index ea1cd5a9fe1..c17ed9eefa2 100644
--- a/pkgs/development/idris-modules/dict.nix
+++ b/pkgs/development/idris-modules/dict.nix
@@ -1,15 +1,13 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
 , contrib
 , lib
-, idris
 }:
 build-idris-package  {
   name = "dict";
   version = "2016-12-26";
 
-  idrisDeps = [ prelude contrib ];
+  idrisDeps = [ contrib ];
 
   src = fetchFromGitHub {
     owner = "be5invis";
@@ -27,6 +25,5 @@ build-idris-package  {
     homepage = https://github.com/be5invis/idris-dict;
     license = lib.licenses.mit;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/dom.nix b/pkgs/development/idris-modules/dom.nix
index 0aee97f92e6..e215e069609 100644
--- a/pkgs/development/idris-modules/dom.nix
+++ b/pkgs/development/idris-modules/dom.nix
@@ -1,17 +1,15 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
 , idrisscript
 , html
 , xhr
 , lib
-, idris
 }:
 build-idris-package  {
   name = "dom";
   version = "2017-04-22";
 
-  idrisDeps = [ prelude idrisscript html xhr ];
+  idrisDeps = [ idrisscript html xhr ];
 
   src = fetchFromGitHub {
     owner = "pierrebeaucamp";
@@ -25,6 +23,5 @@ build-idris-package  {
     homepage = https://github.com/pierrebeaucamp/idris-dom;
     license = lib.licenses.asl20;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/electron.nix b/pkgs/development/idris-modules/electron.nix
index 7dabfd8f45c..3989b8f4113 100644
--- a/pkgs/development/idris-modules/electron.nix
+++ b/pkgs/development/idris-modules/electron.nix
@@ -1,18 +1,15 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
 , contrib
 , jheiling-extras
 , jheiling-js
 , lib
-, idris
 }:
-
 build-idris-package  {
   name = "electron";
   version = "2016-03-07";
 
-  idrisDeps = [ prelude contrib jheiling-extras jheiling-js ];
+  idrisDeps = [ contrib jheiling-extras jheiling-js ];
 
   src = fetchFromGitHub {
     owner = "jheiling";
@@ -31,6 +28,5 @@ build-idris-package  {
     homepage = https://github.com/jheiling/idris-electron;
     license = lib.licenses.unlicense;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/eternal.nix b/pkgs/development/idris-modules/eternal.nix
index ddbc0d79b84..9e0529628fe 100644
--- a/pkgs/development/idris-modules/eternal.nix
+++ b/pkgs/development/idris-modules/eternal.nix
@@ -1,21 +1,19 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
 , effects
 , lib
-, idris
 }:
 build-idris-package  {
   name = "eternal";
-  version = "2018-01-25";
+  version = "2018-07-02";
 
-  idrisDeps = [ prelude effects ];
+  idrisDeps = [ effects ];
 
   src = fetchFromGitHub {
     owner = "Heather";
     repo = "Control.Eternal.Idris";
-    rev = "7ead56ce6065b55104460ace945adbce38fb13eb";
-    sha256 = "0b4zys4mhl6r4rbpdxr7n2n20cdc0nkh4lm8n5v4wxkmjzna5cpd";
+    rev = "2f84b0dd49a7a29a2f852ba96cabfe8322e0852b";
+    sha256 = "1x8cwngiqi05f3wll0niznm47jj2byivx4mh5xf4sb47kciwkxvs";
   };
 
   postUnpack = ''
@@ -30,6 +28,5 @@ build-idris-package  {
     homepage = https://github.com/Heather/Control.Eternal.Idris;
     license = lib.licenses.bsd3;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/farrp.nix b/pkgs/development/idris-modules/farrp.nix
index 2c88399eb3c..bf0e609a610 100644
--- a/pkgs/development/idris-modules/farrp.nix
+++ b/pkgs/development/idris-modules/farrp.nix
@@ -1,15 +1,13 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
 , effects
 , lib
-, idris
 }:
 build-idris-package  {
   name = "farrp";
   version = "2018-02-13";
 
-  idrisDeps = [ prelude effects ];
+  idrisDeps = [ effects ];
 
   src = fetchFromGitHub {
     owner = "lambda-11235";
@@ -23,6 +21,5 @@ build-idris-package  {
     homepage = https://github.com/lambda-11235/FarRP;
     license = lib.licenses.mit;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/free.nix b/pkgs/development/idris-modules/free.nix
index cc0820d3c64..8e979ea796e 100644
--- a/pkgs/development/idris-modules/free.nix
+++ b/pkgs/development/idris-modules/free.nix
@@ -1,15 +1,11 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
 , lib
-, idris
 }:
 build-idris-package  {
   name = "free";
   version = "2017-07-03";
 
-  idrisDeps = [ prelude ];
-
   src = fetchFromGitHub {
     owner = "idris-hackers";
     repo = "idris-free";
@@ -22,6 +18,5 @@ build-idris-package  {
     homepage = https://github.com/idris-hackers/idris-free;
     license = lib.licenses.bsd2;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/fsm.nix b/pkgs/development/idris-modules/fsm.nix
index 24f57af5257..c6d8d8cf913 100644
--- a/pkgs/development/idris-modules/fsm.nix
+++ b/pkgs/development/idris-modules/fsm.nix
@@ -1,16 +1,11 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
-, base
 , lib
-, idris
 }:
 build-idris-package  {
   name = "fsm";
   version = "2017-04-16";
 
-  idrisDeps = [ prelude base ];
-
   src = fetchFromGitHub {
     owner = "ctford";
     repo = "flying-spaghetti-monster";
@@ -23,6 +18,5 @@ build-idris-package  {
     homepage = https://github.com/ctford/flying-spaghetti-monster;
     license = lib.licenses.bsd3;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/glfw.nix b/pkgs/development/idris-modules/glfw.nix
index 041c18faedc..535f549a5eb 100644
--- a/pkgs/development/idris-modules/glfw.nix
+++ b/pkgs/development/idris-modules/glfw.nix
@@ -1,17 +1,14 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
 , effects
 , lib
-, idris
 , pkgs
 }:
-
 build-idris-package  {
   name = "glfw";
   version = "2016-12-05";
 
-  idrisDeps = [ prelude effects ];
+  idrisDeps = [ effects ];
 
   extraBuildInputs = [ pkgs.glfw ];
 
@@ -27,6 +24,5 @@ build-idris-package  {
     homepage = https://github.com/eckart/glfw-idris;
     license = lib.licenses.mit;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/graphviz.nix b/pkgs/development/idris-modules/graphviz.nix
index 3ea20d3d906..955b459289a 100644
--- a/pkgs/development/idris-modules/graphviz.nix
+++ b/pkgs/development/idris-modules/graphviz.nix
@@ -1,15 +1,13 @@
 { build-idris-package
 , fetchFromGitLab
-, prelude
 , lightyear
 , lib
-, idris
 }:
 build-idris-package  {
   name = "graphviz";
   version = "2017-01-16";
 
-  idrisDeps = [ prelude lightyear ];
+  idrisDeps = [ lightyear ];
 
   src = fetchFromGitLab {
     owner = "mgttlinger";
@@ -27,6 +25,5 @@ build-idris-package  {
     homepage = https://github.com/mgttlinger/idris-graphviz;
     license = lib.licenses.gpl3;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/hamt.nix b/pkgs/development/idris-modules/hamt.nix
index 7a2d0d77c83..17706d1b096 100644
--- a/pkgs/development/idris-modules/hamt.nix
+++ b/pkgs/development/idris-modules/hamt.nix
@@ -1,16 +1,14 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
 , contrib
 , effects
 , lib
-, idris
 }:
 build-idris-package  {
   name = "idris-hamt";
   version = "2016-11-15";
 
-  idrisDeps = [ prelude contrib effects ];
+  idrisDeps = [ contrib effects ];
 
   src = fetchFromGitHub {
     owner = "bamboo";
@@ -24,6 +22,5 @@ build-idris-package  {
     homepage = https://github.com/bamboo/idris-hamt;
     license = lib.licenses.bsd3;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/heyting-algebra.nix b/pkgs/development/idris-modules/heyting-algebra.nix
index 8a283eada8a..3fa546466c8 100644
--- a/pkgs/development/idris-modules/heyting-algebra.nix
+++ b/pkgs/development/idris-modules/heyting-algebra.nix
@@ -1,15 +1,13 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
 , contrib
 , lib
-, idris
 }:
 build-idris-package  {
   name = "heyting-algebra";
   version = "2017-08-18";
 
-  idrisDeps = [ prelude contrib ];
+  idrisDeps = [ contrib ];
 
   src = fetchFromGitHub {
     owner = "Risto-Stevcev";
@@ -23,6 +21,5 @@ build-idris-package  {
     homepage = https://github.com/Risto-Stevcev/idris-heyting-algebra;
     license = lib.licenses.mit;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/hezarfen.nix b/pkgs/development/idris-modules/hezarfen.nix
index 712508220a6..f538cb29850 100644
--- a/pkgs/development/idris-modules/hezarfen.nix
+++ b/pkgs/development/idris-modules/hezarfen.nix
@@ -1,16 +1,11 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
-, base
 , lib
-, idris
 }:
 build-idris-package  {
   name = "hezarfen";
   version = "2018-02-03";
 
-  idrisDeps = [ prelude base ];
-
   src = fetchFromGitHub {
     owner = "joom";
     repo = "hezarfen";
@@ -23,6 +18,5 @@ build-idris-package  {
     homepage = https://github.com/joom/hezarfen;
     license = lib.licenses.mit;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/hrtime.nix b/pkgs/development/idris-modules/hrtime.nix
index ba4df28ab26..09fabb6715d 100644
--- a/pkgs/development/idris-modules/hrtime.nix
+++ b/pkgs/development/idris-modules/hrtime.nix
@@ -1,15 +1,13 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
 , idrisscript
 , lib
-, idris
 }:
 build-idris-package  {
   name = "hrtime";
   version = "2017-04-16";
 
-  idrisDeps = [ prelude idrisscript ];
+  idrisDeps = [ idrisscript ];
 
   src = fetchFromGitHub {
     owner = "pierrebeaucamp";
@@ -23,6 +21,5 @@ build-idris-package  {
     homepage = https://github.com/pierrebeaucamp/idris-hrtime;
     license = lib.licenses.asl20;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/html.nix b/pkgs/development/idris-modules/html.nix
index deec5b0eb6d..a44f0e70252 100644
--- a/pkgs/development/idris-modules/html.nix
+++ b/pkgs/development/idris-modules/html.nix
@@ -1,17 +1,15 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
 , idrisscript
 , hrtime
 , webgl
 , lib
-, idris
 }:
 build-idris-package  {
   name = "html";
   version = "2017-04-23";
 
-  idrisDeps = [ prelude idrisscript hrtime webgl ];
+  idrisDeps = [ idrisscript hrtime webgl ];
 
   src = fetchFromGitHub {
     owner = "pierrebeaucamp";
@@ -29,6 +27,5 @@ build-idris-package  {
     homepage = https://github.com/pierrebeaucamp/idris-html;
     license = lib.licenses.asl20;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/http.nix b/pkgs/development/idris-modules/http.nix
index 800a3a2eeb4..beec74a2f65 100644
--- a/pkgs/development/idris-modules/http.nix
+++ b/pkgs/development/idris-modules/http.nix
@@ -1,17 +1,15 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
 , contrib
 , lightyear
 , bytes
 , lib
-, idris
 }:
 build-idris-package  {
   name = "http";
   version = "2018-02-25";
 
-  idrisDeps = [ prelude contrib lightyear bytes ];
+  idrisDeps = [ contrib lightyear bytes ];
 
   src = fetchFromGitHub {
     owner = "uwap";
@@ -25,6 +23,5 @@ build-idris-package  {
     homepage = https://github.com/uwap/idris-http;
     license = lib.licenses.bsd2;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/http4idris.nix b/pkgs/development/idris-modules/http4idris.nix
index 5b79644c3a0..80e95745f03 100644
--- a/pkgs/development/idris-modules/http4idris.nix
+++ b/pkgs/development/idris-modules/http4idris.nix
@@ -1,16 +1,13 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
 , contrib
 , lib
-, idris
 }:
-
 build-idris-package  {
   name = "http4idris";
   version = "2018-01-16";
 
-  idrisDeps = [ prelude contrib ];
+  idrisDeps = [ contrib ];
 
   src = fetchFromGitHub {
     owner = "A1kmm";
@@ -24,6 +21,5 @@ build-idris-package  {
     homepage = https://github.com/A1kmm/http4idris;
     license = lib.licenses.mit;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/iaia.nix b/pkgs/development/idris-modules/iaia.nix
index 5b4f450fdf7..f317b980d52 100644
--- a/pkgs/development/idris-modules/iaia.nix
+++ b/pkgs/development/idris-modules/iaia.nix
@@ -1,15 +1,13 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
 , contrib
 , lib
-, idris
 }:
 build-idris-package  {
   name = "iaia";
   version = "2017-11-10";
 
-  idrisDeps = [ prelude contrib ];
+  idrisDeps = [ contrib ];
 
   src = fetchFromGitHub {
     owner = "sellout";
@@ -23,6 +21,5 @@ build-idris-package  {
     homepage = https://github.com/sellout/Iaia;
     license = lib.licenses.mit;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/idrishighlighter.nix b/pkgs/development/idris-modules/idrishighlighter.nix
index f3d06216976..d8b469ca768 100644
--- a/pkgs/development/idris-modules/idrishighlighter.nix
+++ b/pkgs/development/idris-modules/idrishighlighter.nix
@@ -1,16 +1,14 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
 , effects
 , lightyear
 , lib
-, idris
 }:
 build-idris-package  {
   name = "idrishighlighter";
   version = "2018-02-22";
 
-  idrisDeps = [ prelude effects lightyear ];
+  idrisDeps = [ effects lightyear ];
 
   src = fetchFromGitHub {
     owner = "david-christiansen";
@@ -24,6 +22,5 @@ build-idris-package  {
     homepage = https://github.com/david-christiansen/idris-code-highlighter;
     license = lib.licenses.mit;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/idrisscript.nix b/pkgs/development/idris-modules/idrisscript.nix
index fd2f9e58218..4365c588769 100644
--- a/pkgs/development/idris-modules/idrisscript.nix
+++ b/pkgs/development/idris-modules/idrisscript.nix
@@ -1,16 +1,11 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
 , lib
-, idris
 }:
-
 build-idris-package  {
   name = "idrisscript";
   version = "2017-07-01";
 
-  idrisDeps = [ prelude ];
-
   src = fetchFromGitHub {
     owner = "idris-hackers";
     repo = "IdrisScript";
@@ -23,6 +18,5 @@ build-idris-package  {
     homepage = https://github.com/idris-hackers/IdrisScript;
     license = lib.licenses.bsd2;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/ipkgparser.nix b/pkgs/development/idris-modules/ipkgparser.nix
index cdc1d593c01..3a4c0954fe8 100644
--- a/pkgs/development/idris-modules/ipkgparser.nix
+++ b/pkgs/development/idris-modules/ipkgparser.nix
@@ -1,17 +1,15 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
 , contrib
 , effects
 , lightyear
 , lib
-, idris
 }:
 build-idris-package  {
   name = "ipkgparser";
   version = "2017-11-14";
 
-  idrisDeps = [ prelude contrib effects lightyear ];
+  idrisDeps = [ contrib effects lightyear ];
 
   src = fetchFromGitHub {
     owner = "emptyflash";
@@ -24,6 +22,5 @@ build-idris-package  {
     description = "Parser for Idris iPkg files written in Idris using Lightyear";
     homepage = https://github.com/emptyflash/idris-ipkg-parser;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/jheiling-extras.nix b/pkgs/development/idris-modules/jheiling-extras.nix
index 34981d28d3e..58f8a13864a 100644
--- a/pkgs/development/idris-modules/jheiling-extras.nix
+++ b/pkgs/development/idris-modules/jheiling-extras.nix
@@ -1,16 +1,13 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
 , contrib
 , lib
-, idris
 }:
-
 build-idris-package  {
   name = "extras";
   version = "2018-03-06";
 
-  idrisDeps = [ prelude contrib ];
+  idrisDeps = [ contrib ];
 
   src = fetchFromGitHub {
     owner = "jheiling";
@@ -24,6 +21,5 @@ build-idris-package  {
     homepage = https://github.com/jheiling/idris-extras;
     license = lib.licenses.unlicense;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/jheiling-js.nix b/pkgs/development/idris-modules/jheiling-js.nix
index 5139631b9d5..2281e4821f7 100644
--- a/pkgs/development/idris-modules/jheiling-js.nix
+++ b/pkgs/development/idris-modules/jheiling-js.nix
@@ -1,17 +1,14 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
 , contrib
 , jheiling-extras
 , lib
-, idris
 }:
-
 build-idris-package  {
   name = "jheiling-js";
   version = "2016-03-09";
 
-  idrisDeps = [ prelude contrib jheiling-extras ];
+  idrisDeps = [ contrib jheiling-extras ];
 
   src = fetchFromGitHub {
     owner = "jheiling";
@@ -25,6 +22,5 @@ build-idris-package  {
     homepage = https://github.com/jheiling/idris-js;
     license = lib.licenses.unlicense;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/js.nix b/pkgs/development/idris-modules/js.nix
index 0792a8c0f5d..55169caaa10 100644
--- a/pkgs/development/idris-modules/js.nix
+++ b/pkgs/development/idris-modules/js.nix
@@ -1,16 +1,14 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
 , contrib
 , pruviloj
 , lib
-, idris
 }:
 build-idris-package  {
   name = "js";
   version = "2018-11-27";
 
-  idrisDeps = [ prelude contrib pruviloj ];
+  idrisDeps = [ contrib pruviloj ];
 
   src = fetchFromGitHub {
     owner = "rbarreiro";
@@ -24,6 +22,5 @@ build-idris-package  {
     homepage = https://github.com/rbarreiro/idrisjs;
     license = lib.licenses.mit;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/lens.nix b/pkgs/development/idris-modules/lens.nix
index e97c7cfafda..490fd7bd2ed 100644
--- a/pkgs/development/idris-modules/lens.nix
+++ b/pkgs/development/idris-modules/lens.nix
@@ -1,16 +1,13 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
 , bifunctors
 , lib
-, idris
 }:
-
 build-idris-package  {
   name = "lens";
   version = "2017-09-25";
 
-  idrisDeps = [ prelude bifunctors ];
+  idrisDeps = [ bifunctors ];
 
   src = fetchFromGitHub {
     owner = "HuwCampbell";
@@ -24,6 +21,5 @@ build-idris-package  {
     homepage = https://github.com/HuwCampbell/idris-lens;
     license = lib.licenses.bsd3;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/lightyear.nix b/pkgs/development/idris-modules/lightyear.nix
index 6cedda0170f..fd014db30ef 100644
--- a/pkgs/development/idris-modules/lightyear.nix
+++ b/pkgs/development/idris-modules/lightyear.nix
@@ -1,17 +1,13 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
-, base
 , effects
 , lib
-, idris
 }:
-
 build-idris-package  {
   name = "lightyear";
   version = "2017-09-10";
 
-  idrisDeps = [ prelude base effects ];
+  idrisDeps = [ effects ];
 
   src = fetchFromGitHub {
     owner = "ziman";
@@ -25,6 +21,5 @@ build-idris-package  {
     homepage = https://github.com/ziman/lightyear;
     license = lib.licenses.bsd2;
     maintainers = with lib.maintainers; [ siddharthist brainrape ];
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/logic.nix b/pkgs/development/idris-modules/logic.nix
index 342a84882cd..2346c89c48c 100644
--- a/pkgs/development/idris-modules/logic.nix
+++ b/pkgs/development/idris-modules/logic.nix
@@ -1,15 +1,13 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
 , bifunctors
 , lib
-, idris
 }:
 build-idris-package  {
   name = "logic";
   version = "2016-12-02";
 
-  idrisDeps = [ prelude bifunctors ];
+  idrisDeps = [ bifunctors ];
 
   src = fetchFromGitHub {
     owner = "yurrriq";
@@ -26,6 +24,5 @@ build-idris-package  {
     homepage = https://github.com/yurrriq/idris-logic;
     license = lib.licenses.mit;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/mapping.nix b/pkgs/development/idris-modules/mapping.nix
index 84429c88765..a4ac168dc4f 100644
--- a/pkgs/development/idris-modules/mapping.nix
+++ b/pkgs/development/idris-modules/mapping.nix
@@ -1,16 +1,11 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
 , lib
-, idris
 }:
-
 build-idris-package  {
   name = "mapping";
   version = "2018-02-27";
 
-  idrisDeps = [ prelude ];
-
   src = fetchFromGitHub {
     owner = "zaoqi";
     repo = "Mapping.idr";
@@ -23,6 +18,5 @@ build-idris-package  {
     homepage = https://github.com/zaoqi/Mapping.idr;
     license = lib.licenses.agpl3;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/mhd.nix b/pkgs/development/idris-modules/mhd.nix
index eae30886cd6..9f4af7cc3b8 100644
--- a/pkgs/development/idris-modules/mhd.nix
+++ b/pkgs/development/idris-modules/mhd.nix
@@ -1,18 +1,15 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
 , contrib
 , effects
 , libmicrohttpd
 , lib
-, idris
 }:
-
 build-idris-package  {
   name = "mhd";
   version = "2016-04-22";
 
-  idrisDeps = [ prelude contrib effects ];
+  idrisDeps = [ contrib effects ];
 
   extraBuildInputs = [ libmicrohttpd ];
 
@@ -28,6 +25,5 @@ build-idris-package  {
     homepage = https://github.com/colin-adams/idris-libmicrohttpd;
     license = lib.licenses.lgpl21;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/pacman.nix b/pkgs/development/idris-modules/pacman.nix
index 3650a3990f2..4ebffa3e87c 100644
--- a/pkgs/development/idris-modules/pacman.nix
+++ b/pkgs/development/idris-modules/pacman.nix
@@ -1,16 +1,14 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
 , contrib
 , sdl2
 , lib
-, idris
 }:
 build-idris-package  {
   name = "pacman";
   version = "2017-11-10";
 
-  idrisDeps = [ prelude contrib sdl2 ];
+  idrisDeps = [ contrib sdl2 ];
 
   src = fetchFromGitHub {
     owner = "jdublu10";
@@ -27,6 +25,5 @@ build-idris-package  {
     description = "Proof that Idris is pacman complete";
     homepage = https://github.com/jdublu10/pacman;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/patricia.nix b/pkgs/development/idris-modules/patricia.nix
index e3c1cb82f28..9ba8c6bb2d4 100644
--- a/pkgs/development/idris-modules/patricia.nix
+++ b/pkgs/development/idris-modules/patricia.nix
@@ -1,15 +1,13 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
 , specdris
 , lib
-, idris
 }:
 build-idris-package  {
   name = "patricia";
   version = "2017-10-27";
 
-  idrisDeps = [ prelude specdris ];
+  idrisDeps = [ specdris ];
 
   src = fetchFromGitHub {
     owner = "ChShersh";
@@ -27,6 +25,5 @@ build-idris-package  {
     homepage = https://github.com/ChShersh/idris-patricia;
     license = lib.licenses.mit;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/permutations.nix b/pkgs/development/idris-modules/permutations.nix
index af93f4af5e0..8bcb67fa759 100644
--- a/pkgs/development/idris-modules/permutations.nix
+++ b/pkgs/development/idris-modules/permutations.nix
@@ -1,16 +1,11 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
-, base
 , lib
-, idris
 }:
 build-idris-package  {
   name = "permutations";
   version = "2018-01-19";
 
-  idrisDeps = [ prelude base ];
-
   src = fetchFromGitHub {
     owner = "vmchale";
     repo = "permutations";
@@ -27,6 +22,5 @@ build-idris-package  {
     homepage = https://github.com/vmchale/permutations;
     license = lib.licenses.bsd3;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/pfds.nix b/pkgs/development/idris-modules/pfds.nix
index 8ab75b9ee50..f9fbd26a0dd 100644
--- a/pkgs/development/idris-modules/pfds.nix
+++ b/pkgs/development/idris-modules/pfds.nix
@@ -1,15 +1,13 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
 , contrib
 , lib
-, idris
 }:
 build-idris-package  {
   name = "pfds";
   version = "2017-09-25";
 
-  idrisDeps = [ prelude contrib ];
+  idrisDeps = [ contrib ];
 
   src = fetchFromGitHub {
     owner = "timjb";
@@ -23,6 +21,5 @@ build-idris-package  {
     homepage = https://github.com/timjb/idris-pfds;
     license = lib.licenses.mit;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/pipes.nix b/pkgs/development/idris-modules/pipes.nix
index 943d8e470f0..0f62d73b9da 100644
--- a/pkgs/development/idris-modules/pipes.nix
+++ b/pkgs/development/idris-modules/pipes.nix
@@ -1,16 +1,11 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
-, base
 , lib
-, idris
 }:
 build-idris-package  {
   name = "pipes";
   version = "2017-12-02";
 
-  idrisDeps = [ prelude base ];
-
   src = fetchFromGitHub {
     owner = "QuentinDuval";
     repo = "IdrisPipes";
@@ -23,6 +18,5 @@ build-idris-package  {
     homepage = https://github.com/QuentinDuval/IdrisPipes;
     license = lib.licenses.bsd3;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/posix.nix b/pkgs/development/idris-modules/posix.nix
index c6c44874b06..194b60bd298 100644
--- a/pkgs/development/idris-modules/posix.nix
+++ b/pkgs/development/idris-modules/posix.nix
@@ -1,16 +1,11 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
-, base
 , lib
-, idris
 }:
 build-idris-package  {
   name = "posix";
   version = "2017-11-18";
 
-  idrisDeps = [ prelude base ];
-
   src = fetchFromGitHub {
     owner = "idris-hackers";
     repo = "idris-posix";
@@ -25,6 +20,5 @@ build-idris-package  {
     description = "System POSIX bindings for Idris.";
     homepage = https://github.com/idris-hackers/idris-posix;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/protobuf.nix b/pkgs/development/idris-modules/protobuf.nix
index 4b4c2694202..1c2a58a6b7c 100644
--- a/pkgs/development/idris-modules/protobuf.nix
+++ b/pkgs/development/idris-modules/protobuf.nix
@@ -1,15 +1,13 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
 , lightyear
 , lib
-, idris
 }:
 build-idris-package  {
   name = "protobuf";
   version = "2017-08-12";
 
-  idrisDeps = [ prelude lightyear ];
+  idrisDeps = [ lightyear ];
 
   src = fetchFromGitHub {
     owner = "artagnon";
@@ -23,6 +21,5 @@ build-idris-package  {
     homepage = https://github.com/artagnon/idris-protobuf;
     license = lib.licenses.asl20;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/rationals.nix b/pkgs/development/idris-modules/rationals.nix
index 693d580fdd5..7ce290c824e 100644
--- a/pkgs/development/idris-modules/rationals.nix
+++ b/pkgs/development/idris-modules/rationals.nix
@@ -1,16 +1,13 @@
-{ curl
-, build-idris-package
+{ build-idris-package
 , fetchFromGitHub
-, prelude
 , contrib
 , lib
-, idris
 }:
 build-idris-package {
   name = "rationals";
   version = "2017-04-29";
 
-  idrisDeps = [ prelude contrib ];
+  idrisDeps = [ contrib ];
 
   src = fetchFromGitHub {
     owner = "mcgordonite";
@@ -22,7 +19,6 @@ build-idris-package {
   meta = {
     description = "An idris rational number type built from paths in the Stern Brocot tree";
     homepage = https://github.com/mcgordonite/idris-binary-rationals;
-    inherit (idris.meta) platforms;
     maintainers = [ lib.maintainers.brainrape ];
   };
 }
diff --git a/pkgs/development/idris-modules/recursion_schemes.nix b/pkgs/development/idris-modules/recursion_schemes.nix
index 06e99da3608..78f3674aeab 100644
--- a/pkgs/development/idris-modules/recursion_schemes.nix
+++ b/pkgs/development/idris-modules/recursion_schemes.nix
@@ -1,19 +1,17 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
 , free
 , composition
 , comonad
 , bifunctors
 , hezarfen
 , lib
-, idris
 }:
 build-idris-package  {
   name = "recursion_schemes";
   version = "2018-01-19";
 
-  idrisDeps = [ prelude free composition comonad bifunctors hezarfen ];
+  idrisDeps = [ free composition comonad bifunctors hezarfen ];
 
   src = fetchFromGitHub {
     owner = "vmchale";
@@ -31,6 +29,5 @@ build-idris-package  {
     homepage = https://github.com/vmchale/recursion_schemes;
     license = lib.licenses.bsd3;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/refined.nix b/pkgs/development/idris-modules/refined.nix
index bd8e37f2b7f..00252b6a7cd 100644
--- a/pkgs/development/idris-modules/refined.nix
+++ b/pkgs/development/idris-modules/refined.nix
@@ -1,16 +1,11 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
-, base
 , lib
-, idris
 }:
 build-idris-package  {
   name = "refined";
   version = "2017-12-28";
 
-  idrisDeps = [ prelude base ];
-
   src = fetchFromGitHub {
     owner = "janschultecom";
     repo = "idris-refined";
@@ -27,6 +22,5 @@ build-idris-package  {
     homepage = https://github.com/janschultecom/idris-refined;
     license = lib.licenses.asl20;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/sdl.nix b/pkgs/development/idris-modules/sdl.nix
index 181959dca06..4495e60d6bb 100644
--- a/pkgs/development/idris-modules/sdl.nix
+++ b/pkgs/development/idris-modules/sdl.nix
@@ -1,20 +1,17 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
 , effects
 , lib
-, idris
 , SDL
 , SDL_gfx
 }:
-
 build-idris-package  {
   name = "sdl";
   version = "2017-03-24";
 
-  idrisDeps = [ prelude effects ];
+  idrisDeps = [ effects ];
 
-  extraBuildInputs = [ idris SDL SDL_gfx ];
+  extraBuildInputs = [ SDL SDL_gfx ];
 
   src = fetchFromGitHub {
     owner = "edwinb";
@@ -27,6 +24,7 @@ build-idris-package  {
     description = "SDL-idris framework for Idris";
     homepage = https://github.com/edwinb/SDL-idris;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
+    # Can't find file sdlrun.o
+    broken = true;
   };
 }
diff --git a/pkgs/development/idris-modules/sdl2.nix b/pkgs/development/idris-modules/sdl2.nix
index 46d4e9fb8dd..b0306040d73 100644
--- a/pkgs/development/idris-modules/sdl2.nix
+++ b/pkgs/development/idris-modules/sdl2.nix
@@ -1,21 +1,18 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
 , effects
 , lib
-, idris
 , pkgconfig
 , SDL2
 , SDL2_gfx
 }:
-
 build-idris-package  {
   name = "sdl2";
   version = "2018-01-19";
 
-  idrisDeps = [ prelude effects ];
+  idrisDeps = [ effects ];
 
-  extraBuildInputs = [ idris pkgconfig SDL2 SDL2_gfx ];
+  extraBuildInputs = [ pkgconfig SDL2 SDL2_gfx ];
 
   src = fetchFromGitHub {
     owner = "steshaw";
@@ -28,6 +25,7 @@ build-idris-package  {
     description = "SDL2 binding for Idris";
     homepage = https://github.com/steshaw/idris-sdl2;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
+    # Can't find file sdl2.o
+    broken = true;
   };
 }
diff --git a/pkgs/development/idris-modules/semidirect.nix b/pkgs/development/idris-modules/semidirect.nix
index d10a85eb4f4..8e7428665cd 100644
--- a/pkgs/development/idris-modules/semidirect.nix
+++ b/pkgs/development/idris-modules/semidirect.nix
@@ -1,28 +1,25 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
 , contrib
 , patricia
 , lib
-, idris
 }:
 build-idris-package  {
   name = "semidirect";
-  version = "2018-02-06";
+  version = "2018-07-02";
 
-  idrisDeps = [ prelude contrib patricia ];
+  idrisDeps = [ contrib patricia ];
 
   src = fetchFromGitHub {
     owner = "clayrat";
     repo = "idris-semidirect";
-    rev = "884c26c095784f8fd489c323d6673f2a8710a741";
-    sha256 = "0w36xkfxsqm6r91f0vs6qpmallrfwa09ql8i317xwm86nfk7akj9";
+    rev = "e19c58f7a25c53bba2ab058821e038bae3c093d2";
+    sha256 = "0182r9z34kbv3l78pw4qf48ng3hqj4sqzy53074mb0b2c3pikcrl";
   };
 
   meta = {
     description = "Semidirect products in Idris";
     homepage = https://github.com/clayrat/idris-semidirect;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/setoids.nix b/pkgs/development/idris-modules/setoids.nix
index 76bf127818c..6db49c3c3c9 100644
--- a/pkgs/development/idris-modules/setoids.nix
+++ b/pkgs/development/idris-modules/setoids.nix
@@ -1,26 +1,24 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
+, contrib
 , lib
-, idris
 }:
 build-idris-package  {
   name = "setoids";
-  version = "2017-03-13";
+  version = "2018-06-18";
 
-  idrisDeps = [ prelude ];
+  idrisDeps = [ contrib ];
 
   src = fetchFromGitHub {
     owner = "danilkolikov";
     repo = "setoids";
-    rev = "a50cfc010cb4321cc9b7988c0a4f387d83d34839";
-    sha256 = "0q0h2qj9vylkm16h70l78l2p5xjkx4qmg2a2ixfl8vq8b1zm8gch";
+    rev = "41b4af3b1a537d9471107a639ad77c7abee2de18";
+    sha256 = "0fl1g59s16vnrdnplps5ncv27j7a93nxp9cmqp2iavjxlzlzin1v";
   };
 
   meta = {
     description = "Idris proofs for extensional equalities";
     homepage = https://github.com/danilkolikov/setoids;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/smproc.nix b/pkgs/development/idris-modules/smproc.nix
index c751f27d1c9..97ed06d307a 100644
--- a/pkgs/development/idris-modules/smproc.nix
+++ b/pkgs/development/idris-modules/smproc.nix
@@ -1,16 +1,13 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
-, base
 , contrib
 , lib
-, idris
 }:
 build-idris-package  {
   name = "smproc";
   version = "2018-02-08";
 
-  idrisDeps = [ prelude base contrib ];
+  idrisDeps = [ contrib ];
 
   src = fetchFromGitHub {
     owner = "jameshaydon";
@@ -24,6 +21,5 @@ build-idris-package  {
     homepage = https://github.com/jameshaydon/smproc;
     license = lib.licenses.mit;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/snippets.nix b/pkgs/development/idris-modules/snippets.nix
index 9dc2dd3f8e2..c8d993ccb8a 100644
--- a/pkgs/development/idris-modules/snippets.nix
+++ b/pkgs/development/idris-modules/snippets.nix
@@ -1,15 +1,13 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
 , contrib
 , lib
-, idris
 }:
 build-idris-package  {
   name = "snippets";
   version = "2018-03-17";
 
-  idrisDeps = [ prelude contrib ];
+  idrisDeps = [ contrib ];
 
   src = fetchFromGitHub {
     owner = "palladin";
@@ -23,6 +21,5 @@ build-idris-package  {
     homepage = https://github.com/palladin/idris-snippets;
     license = lib.licenses.mit;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/software_foundations.nix b/pkgs/development/idris-modules/software_foundations.nix
index 3d16e91e10f..57748243302 100644
--- a/pkgs/development/idris-modules/software_foundations.nix
+++ b/pkgs/development/idris-modules/software_foundations.nix
@@ -1,15 +1,13 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
 , pruviloj
 , lib
-, idris
 }:
 build-idris-package  {
   name = "software_foundations";
   version = "2017-11-04";
 
-  idrisDeps = [ prelude pruviloj ];
+  idrisDeps = [ pruviloj ];
 
   src = fetchFromGitHub {
     owner = "idris-hackers";
@@ -22,6 +20,5 @@ build-idris-package  {
     description = "Code for Software Foundations in Idris";
     homepage = https://github.com/idris-hackers/software-foundations;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/specdris.nix b/pkgs/development/idris-modules/specdris.nix
index b18d4a07d46..06982a0b2ba 100644
--- a/pkgs/development/idris-modules/specdris.nix
+++ b/pkgs/development/idris-modules/specdris.nix
@@ -1,23 +1,20 @@
 { build-idris-package
-, fetchgit
-, prelude
-, base
+, fetchFromGitHub
 , effects
 , lib
-, idris
 }:
-
 build-idris-package {
   name = "specdris";
   version = "2018-01-23";
 
-  src = fetchgit {
-    url = "https://github.com/pheymann/specdris";
+  src = fetchFromGitHub {
+    owner = "pheymann";
+    repo = "specdris";
     rev = "625f88f5e118e53f30bcf5e5f3dcf48eb268ac21";
     sha256 = "1gc717xf4i7z75aqazy5wqm7b1dqfyx5pprdypxz1h3980m67fsa";
   };
 
-  idrisDeps = [ prelude base effects idris ];
+  idrisDeps = [ effects ];
 
   # tests use a different ipkg and directory structure
   doCheck = false;
diff --git a/pkgs/development/idris-modules/tap.nix b/pkgs/development/idris-modules/tap.nix
index 5f6eccd98cd..7f80a1ce3c5 100644
--- a/pkgs/development/idris-modules/tap.nix
+++ b/pkgs/development/idris-modules/tap.nix
@@ -1,15 +1,13 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
 , contrib
 , lib
-, idris
 }:
 build-idris-package  {
   name = "tap";
   version = "2017-04-08";
 
-  idrisDeps = [ prelude contrib ];
+  idrisDeps = [ contrib ];
 
   src = fetchFromGitHub {
     owner = "ostera";
@@ -27,6 +25,5 @@ build-idris-package  {
     homepage = https://github.com/ostera/tap-idris;
     license = lib.licenses.bsd3;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/test.nix b/pkgs/development/idris-modules/test.nix
index d0688c54a65..ccb575e270c 100644
--- a/pkgs/development/idris-modules/test.nix
+++ b/pkgs/development/idris-modules/test.nix
@@ -1,16 +1,13 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
 , effects
 , lib
-, idris
 }:
-
 build-idris-package  {
   name = "test";
   version = "2017-03-30";
 
-  idrisDeps = [ prelude effects ];
+  idrisDeps = [ effects ];
 
   src = fetchFromGitHub {
     owner = "jfdm";
@@ -19,7 +16,6 @@ build-idris-package  {
     sha256 = "1pmyhs3jx6wd0pzjd3igfxb9zjs8pqmk4ah352bxjrqdnhqwrl51";
   };
 
-
   doCheck = false;
 
   meta = {
@@ -27,6 +23,5 @@ build-idris-package  {
     homepage = https://github.com/jfdm/idris-testing;
     license = lib.licenses.bsd3;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/tlhydra.nix b/pkgs/development/idris-modules/tlhydra.nix
index 9106e485c5f..ffe1e46d86e 100644
--- a/pkgs/development/idris-modules/tlhydra.nix
+++ b/pkgs/development/idris-modules/tlhydra.nix
@@ -1,18 +1,15 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
 , effects
 , contrib
 , lightyear
 , lib
-, idris
 }:
-
 build-idris-package  {
   name = "tlhydra";
   version = "2017-13-26";
 
-  idrisDeps = [ prelude effects contrib lightyear ];
+  idrisDeps = [ effects contrib lightyear ];
 
   src = fetchFromGitHub {
     owner = "Termina1";
@@ -25,6 +22,5 @@ build-idris-package  {
     description = "Idris parser and serializer/deserealizer for TL language";
     homepage = https://github.com/Termina1/tlhydra;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/tomladris.nix b/pkgs/development/idris-modules/tomladris.nix
index a5d99d19284..402b5a01b76 100644
--- a/pkgs/development/idris-modules/tomladris.nix
+++ b/pkgs/development/idris-modules/tomladris.nix
@@ -1,17 +1,14 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
 , contrib
 , lightyear
 , lib
-, idris
 }:
-
 build-idris-package  {
   name = "tomladris";
   version = "2017-11-14";
 
-  idrisDeps = [ prelude lightyear contrib ];
+  idrisDeps = [ lightyear contrib ];
 
   src = fetchFromGitHub {
     owner = "emptyflash";
@@ -25,6 +22,5 @@ build-idris-package  {
     homepage = https://github.com/emptyflash/tomladris;
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ siddharthist brainrape ];
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/tp.nix b/pkgs/development/idris-modules/tp.nix
index db45f0408ab..1823e76c290 100644
--- a/pkgs/development/idris-modules/tp.nix
+++ b/pkgs/development/idris-modules/tp.nix
@@ -1,16 +1,11 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
-, base
 , lib
-, idris
 }:
 build-idris-package  {
   name = "tp";
   version = "2017-08-15";
 
-  idrisDeps = [ prelude base ];
-
   src = fetchFromGitHub {
     owner = "superfunc";
     repo = "tp";
@@ -26,6 +21,5 @@ build-idris-package  {
     homepage = https://github.com/superfunc/tp;
     license = lib.licenses.mit;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/tparsec.nix b/pkgs/development/idris-modules/tparsec.nix
index a2077fca20d..bd895a33bae 100644
--- a/pkgs/development/idris-modules/tparsec.nix
+++ b/pkgs/development/idris-modules/tparsec.nix
@@ -1,21 +1,16 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
 , lib
-, idris
 }:
-
 build-idris-package  {
   name = "tparsec";
-  version = "2017-12-12";
-
-  idrisDeps = [ prelude ];
+  version = "2018-06-26";
 
   src = fetchFromGitHub {
     owner = "gallais";
     repo = "idris-tparsec";
-    rev = "fb87d08f8f58c934f37d8324b43b0979abcf2183";
-    sha256 = "0362076bfs976gqki4b4pxblhnk4xglgx5v2aycjpxsxlpxh6cfd";
+    rev = "ca32d1a83f3de95f8979d48016e79d010f47b3c2";
+    sha256 = "1zjzk8xjmyyx1qwrdwwg7yjzcgj5wkbwpx8a3wpbj5sv4b5s2r30";
   };
 
   meta = {
@@ -23,6 +18,5 @@ build-idris-package  {
     homepage = https://github.com/gallais/idris-tparsec;
     license = lib.licenses.gpl3;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/transducers.nix b/pkgs/development/idris-modules/transducers.nix
index d63a11a0234..8f10f9bd247 100644
--- a/pkgs/development/idris-modules/transducers.nix
+++ b/pkgs/development/idris-modules/transducers.nix
@@ -1,16 +1,11 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
-, base
 , lib
-, idris
 }:
 build-idris-package  {
   name = "transducers";
   version = "2017-07-28";
 
-  idrisDeps = [ prelude base ];
-
   src = fetchFromGitHub {
     owner = "QuentinDuval";
     repo = "IdrisReducers";
@@ -23,6 +18,5 @@ build-idris-package  {
     homepage = https://github.com/QuentinDuval/IdrisReducers;
     license = lib.licenses.bsd3;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/trees.nix b/pkgs/development/idris-modules/trees.nix
index 78ad70690b3..69042e27d3d 100644
--- a/pkgs/development/idris-modules/trees.nix
+++ b/pkgs/development/idris-modules/trees.nix
@@ -1,16 +1,14 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
 , contrib
 , bi
 , lib
-, idris
 }:
 build-idris-package  {
   name = "trees";
   version = "2018-03-19";
 
-  idrisDeps = [ prelude contrib bi ];
+  idrisDeps = [ contrib bi ];
 
   src = fetchFromGitHub {
     owner = "clayrat";
@@ -23,6 +21,5 @@ build-idris-package  {
     description = "Trees in Idris";
     homepage = https://github.com/clayrat/idris-trees;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/union_type.nix b/pkgs/development/idris-modules/union_type.nix
index 845bec3d84e..3a6dced48ce 100644
--- a/pkgs/development/idris-modules/union_type.nix
+++ b/pkgs/development/idris-modules/union_type.nix
@@ -1,16 +1,11 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
-, base
 , lib
-, idris
 }:
 build-idris-package  {
   name = "union_type";
   version = "2018-01-30";
 
-  idrisDeps = [ prelude base ];
-
   src = fetchFromGitHub {
     owner = "berewt";
     repo = "UnionType";
@@ -23,6 +18,5 @@ build-idris-package  {
     homepage = https://github.com/berewt/UnionType;
     license = lib.licenses.mit;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/vdom.nix b/pkgs/development/idris-modules/vdom.nix
index 034bda583db..7f1ecb61c8e 100644
--- a/pkgs/development/idris-modules/vdom.nix
+++ b/pkgs/development/idris-modules/vdom.nix
@@ -1,16 +1,11 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
-, base
 , lib
-, idris
 }:
 build-idris-package  {
   name = "vdom";
   version = "0.6.0";
 
-  idrisDeps = [ prelude base ];
-
   src = fetchFromGitHub {
     owner = "brandondyck";
     repo = "idris-vdom";
@@ -23,6 +18,5 @@ build-idris-package  {
     homepage = https://github.com/brandondyck/idris-vdom;
     license = lib.licenses.mit;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/vecspace.nix b/pkgs/development/idris-modules/vecspace.nix
index d2fa9e31ae3..bf7e56cf8c0 100644
--- a/pkgs/development/idris-modules/vecspace.nix
+++ b/pkgs/development/idris-modules/vecspace.nix
@@ -1,15 +1,13 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
 , contrib
 , lib
-, idris
 }:
 build-idris-package  {
   name = "vecspace";
   version = "2018-01-12";
 
-  idrisDeps = [ prelude contrib ];
+  idrisDeps = [ contrib ];
 
   src = fetchFromGitHub {
     owner = "clayrat";
@@ -22,6 +20,5 @@ build-idris-package  {
     description = "Abstract vector spaces in Idris";
     homepage = https://github.com/clayrat/idris-vecspace;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/webgl.nix b/pkgs/development/idris-modules/webgl.nix
index 3793a812e57..ddd0dec03a4 100644
--- a/pkgs/development/idris-modules/webgl.nix
+++ b/pkgs/development/idris-modules/webgl.nix
@@ -1,15 +1,13 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
 , idrisscript
 , lib
-, idris
 }:
 build-idris-package  {
   name = "webgl";
   version = "2017-05-08";
 
-  idrisDeps = [ prelude idrisscript ];
+  idrisDeps = [ idrisscript ];
 
   src = fetchFromGitHub {
     owner = "pierrebeaucamp";
@@ -23,6 +21,5 @@ build-idris-package  {
     homepage = https://github.com/pierrebeaucamp/idris-webgl;
     license = lib.licenses.asl20;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/with-packages.nix b/pkgs/development/idris-modules/with-packages.nix
index 8b390d4bf5b..47136839d01 100644
--- a/pkgs/development/idris-modules/with-packages.nix
+++ b/pkgs/development/idris-modules/with-packages.nix
@@ -15,6 +15,6 @@ stdenv.lib.appendToName "with-packages" (symlinkJoin {
   postBuild = ''
     wrapProgram $out/bin/idris \
       --set IDRIS_LIBRARY_PATH $out/libs
-      '';
+  '';
 
 })
diff --git a/pkgs/development/idris-modules/wl-pprint.nix b/pkgs/development/idris-modules/wl-pprint.nix
index 55a926d780d..baceb2214e3 100644
--- a/pkgs/development/idris-modules/wl-pprint.nix
+++ b/pkgs/development/idris-modules/wl-pprint.nix
@@ -1,9 +1,6 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
-, base
 , lib
-, idris
 }:
 build-idris-package {
   name = "wl-pprint";
@@ -16,12 +13,9 @@ build-idris-package {
     sha256 = "0ifp76cqg340jkkzanx69vg76qivv53vh1lzv9zkp5f49prkwl5d";
   };
 
-  idrisDeps = [ prelude base ];
-
   meta = {
     description = "Wadler-Leijen pretty-printing library";
     homepage = https://github.com/shayan-najd/wl-pprint;
     license = lib.licenses.bsd2;
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/wyvern.nix b/pkgs/development/idris-modules/wyvern.nix
index a1724476f6c..870bf1a6b9b 100644
--- a/pkgs/development/idris-modules/wyvern.nix
+++ b/pkgs/development/idris-modules/wyvern.nix
@@ -1,16 +1,14 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
 , contrib
 , effects
 , lib
-, idris
 }:
 build-idris-package  {
   name = "wyvern";
   version = "2017-06-26";
 
-  idrisDeps = [ prelude contrib effects ];
+  idrisDeps = [ contrib effects ];
 
   src = fetchFromGitHub {
     owner = "ericqweinstein";
@@ -28,6 +26,5 @@ build-idris-package  {
     homepage = https://github.com/ericqweinstein/wyvern;
     license = lib.licenses.mit;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/xhr.nix b/pkgs/development/idris-modules/xhr.nix
index 15573cc9461..9e6f40b963f 100644
--- a/pkgs/development/idris-modules/xhr.nix
+++ b/pkgs/development/idris-modules/xhr.nix
@@ -1,15 +1,13 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
 , idrisscript
 , lib
-, idris
 }:
 build-idris-package  {
   name = "xhr";
   version = "2017-04-22";
 
-  idrisDeps = [ prelude idrisscript ];
+  idrisDeps = [ idrisscript ];
 
   src = fetchFromGitHub {
     owner = "pierrebeaucamp";
@@ -23,6 +21,5 @@ build-idris-package  {
     homepage = https://github.com/pierrebeaucamp/idris-xhr;
     license = lib.licenses.asl20;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/yaml.nix b/pkgs/development/idris-modules/yaml.nix
index ff935753ce9..ec689ce4805 100644
--- a/pkgs/development/idris-modules/yaml.nix
+++ b/pkgs/development/idris-modules/yaml.nix
@@ -1,16 +1,14 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
 , contrib
 , lightyear
 , lib
-, idris
 }:
 build-idris-package  {
   name = "yaml";
   version = "2018-01-25";
 
-  idrisDeps = [ prelude contrib lightyear ];
+  idrisDeps = [ contrib lightyear ];
 
   src = fetchFromGitHub {
     owner = "Heather";
@@ -24,6 +22,5 @@ build-idris-package  {
     homepage = https://github.com/Heather/Idris.Yaml;
     license = lib.licenses.mit;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/yampa.nix b/pkgs/development/idris-modules/yampa.nix
index 661a55bfd74..0231555b4ad 100644
--- a/pkgs/development/idris-modules/yampa.nix
+++ b/pkgs/development/idris-modules/yampa.nix
@@ -1,15 +1,13 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
 , bifunctors
 , lib
-, idris
 }:
 build-idris-package  {
   name = "yampa";
   version = "2016-07-05";
 
-  idrisDeps = [ prelude bifunctors ];
+  idrisDeps = [ bifunctors ];
 
   src = fetchFromGitHub {
     owner = "BartAdv";
@@ -22,6 +20,5 @@ build-idris-package  {
     description = "Idris implementation of Yampa FRP library as described in Reactive Programming through Dependent Types";
     homepage = https://github.com/BartAdv/idris-yampa;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
   };
 }