From 7ec54c61b7db2aba29fa03a69ce88900465eb9d5 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Mon, 2 Jul 2018 03:33:13 +0200 Subject: idrisPackages: install docs --- pkgs/development/idris-modules/build-idris-package.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'pkgs') diff --git a/pkgs/development/idris-modules/build-idris-package.nix b/pkgs/development/idris-modules/build-idris-package.nix index 0416e76afa9e..9378acb12a39 100644 --- a/pkgs/development/idris-modules/build-idris-package.nix +++ b/pkgs/development/idris-modules/build-idris-package.nix @@ -38,6 +38,7 @@ stdenv.mkDerivation ({ installPhase = '' ${idris-with-packages}/bin/idris --install *.ipkg --ibcsubdir $out/libs + IDRIS_DOC_PATH=$out/doc ${idris-with-packages}/bin/idris --installdoc *.ipkg ''; buildInputs = [ gmp ] ++ extraBuildInputs; -- cgit 1.4.1 From e79b302f894d8ee34b6579329a254b56f29240c4 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Mon, 2 Jul 2018 05:18:08 +0200 Subject: idris: Clean up package builder --- .../idris-modules/build-builtin-package.nix | 2 ++ .../idris-modules/build-idris-package.nix | 36 +++++++++++----------- pkgs/development/idris-modules/with-packages.nix | 2 +- 3 files changed, 21 insertions(+), 19 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/idris-modules/build-builtin-package.nix b/pkgs/development/idris-modules/build-builtin-package.nix index 44efa97a5319..a90bb8c11b63 100644 --- a/pkgs/development/idris-modules/build-builtin-package.nix +++ b/pkgs/development/idris-modules/build-builtin-package.nix @@ -10,6 +10,8 @@ build-idris-package { inherit name version; inherit (idris) src; + includePreludeBase = false; + idrisDeps = deps; postUnpack = '' diff --git a/pkgs/development/idris-modules/build-idris-package.nix b/pkgs/development/idris-modules/build-idris-package.nix index 9378acb12a39..47e1e22c5db0 100644 --- a/pkgs/development/idris-modules/build-idris-package.nix +++ b/pkgs/development/idris-modules/build-idris-package.nix @@ -1,23 +1,26 @@ # Build an idris package -{ stdenv, idrisPackages, gmp }: +{ stdenv, lib, idrisPackages, gmp }: { idrisDeps ? [] + , includePreludeBase ? true , name , version - , src - , meta , extraBuildInputs ? [] - , postUnpack ? "" - , doCheck ? true - }: + , ... + }@attrs: let - idris-with-packages = idrisPackages.with-packages idrisDeps; + idrisDeps' = idrisDeps ++ lib.optionals includePreludeBase (with idrisPackages; [ prelude base ]); + idris-with-packages = idrisPackages.with-packages idrisDeps'; + 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 = idrisDeps'; # Some packages use the style # opts = -i ../../path/to/package @@ -27,21 +30,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_DOC_PATH=$out/doc ${idris-with-packages}/bin/idris --installdoc *.ipkg + 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/with-packages.nix b/pkgs/development/idris-modules/with-packages.nix index 8b390d4bf5be..47136839d01a 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 - ''; + ''; }) -- cgit 1.4.1 From b73f540beb28741163768e04e629c611b397acdf Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Mon, 2 Jul 2018 05:18:21 +0200 Subject: idrisPackages: Clean up packages --- pkgs/development/idris-modules/array.nix | 10 +--------- pkgs/development/idris-modules/bi.nix | 5 +---- pkgs/development/idris-modules/bifunctors.nix | 6 ------ pkgs/development/idris-modules/bytes.nix | 8 -------- pkgs/development/idris-modules/canvas.nix | 5 ----- pkgs/development/idris-modules/categories.nix | 6 ------ pkgs/development/idris-modules/coda.nix | 6 ------ pkgs/development/idris-modules/comonad.nix | 6 ------ pkgs/development/idris-modules/composition.nix | 5 +---- pkgs/development/idris-modules/config.nix | 5 +---- pkgs/development/idris-modules/console.nix | 5 +---- pkgs/development/idris-modules/containers.nix | 6 +----- pkgs/development/idris-modules/cube.nix | 7 ------- pkgs/development/idris-modules/curses.nix | 7 ++----- pkgs/development/idris-modules/data.nix | 5 +---- pkgs/development/idris-modules/derive.nix | 5 +---- pkgs/development/idris-modules/descncrunch.nix | 5 +---- pkgs/development/idris-modules/dict.nix | 5 +---- pkgs/development/idris-modules/dom.nix | 5 +---- pkgs/development/idris-modules/electron.nix | 6 +----- pkgs/development/idris-modules/eternal.nix | 5 +---- pkgs/development/idris-modules/farrp.nix | 5 +---- pkgs/development/idris-modules/free.nix | 5 ----- pkgs/development/idris-modules/fsm.nix | 6 ------ pkgs/development/idris-modules/glfw.nix | 6 +----- pkgs/development/idris-modules/graphviz.nix | 5 +---- pkgs/development/idris-modules/hamt.nix | 5 +---- pkgs/development/idris-modules/heyting-algebra.nix | 5 +---- pkgs/development/idris-modules/hezarfen.nix | 6 ------ pkgs/development/idris-modules/hrtime.nix | 5 +---- pkgs/development/idris-modules/html.nix | 5 +---- pkgs/development/idris-modules/http.nix | 5 +---- pkgs/development/idris-modules/http4idris.nix | 6 +----- pkgs/development/idris-modules/iaia.nix | 5 +---- pkgs/development/idris-modules/idrishighlighter.nix | 5 +---- pkgs/development/idris-modules/idrisscript.nix | 6 ------ pkgs/development/idris-modules/ipkgparser.nix | 5 +---- pkgs/development/idris-modules/jheiling-extras.nix | 6 +----- pkgs/development/idris-modules/jheiling-js.nix | 6 +----- pkgs/development/idris-modules/js.nix | 5 +---- pkgs/development/idris-modules/lens.nix | 6 +----- pkgs/development/idris-modules/lightyear.nix | 7 +------ pkgs/development/idris-modules/logic.nix | 5 +---- pkgs/development/idris-modules/mapping.nix | 6 ------ pkgs/development/idris-modules/mhd.nix | 6 +----- pkgs/development/idris-modules/pacman.nix | 5 +---- pkgs/development/idris-modules/patricia.nix | 5 +---- pkgs/development/idris-modules/permutations.nix | 6 ------ pkgs/development/idris-modules/pfds.nix | 5 +---- pkgs/development/idris-modules/pipes.nix | 6 ------ pkgs/development/idris-modules/posix.nix | 6 ------ pkgs/development/idris-modules/protobuf.nix | 5 +---- pkgs/development/idris-modules/rationals.nix | 8 ++------ pkgs/development/idris-modules/recursion_schemes.nix | 5 +---- pkgs/development/idris-modules/refined.nix | 6 ------ pkgs/development/idris-modules/sdl.nix | 8 ++------ pkgs/development/idris-modules/sdl2.nix | 8 ++------ pkgs/development/idris-modules/semidirect.nix | 5 +---- pkgs/development/idris-modules/setoids.nix | 5 ----- pkgs/development/idris-modules/smproc.nix | 6 +----- pkgs/development/idris-modules/snippets.nix | 5 +---- pkgs/development/idris-modules/software_foundations.nix | 5 +---- pkgs/development/idris-modules/specdris.nix | 13 +++++-------- pkgs/development/idris-modules/tap.nix | 5 +---- pkgs/development/idris-modules/test.nix | 7 +------ pkgs/development/idris-modules/tlhydra.nix | 6 +----- pkgs/development/idris-modules/tomladris.nix | 6 +----- pkgs/development/idris-modules/tp.nix | 6 ------ pkgs/development/idris-modules/tparsec.nix | 6 ------ pkgs/development/idris-modules/transducers.nix | 6 ------ pkgs/development/idris-modules/trees.nix | 5 +---- pkgs/development/idris-modules/union_type.nix | 6 ------ pkgs/development/idris-modules/vdom.nix | 6 ------ pkgs/development/idris-modules/vecspace.nix | 5 +---- pkgs/development/idris-modules/webgl.nix | 5 +---- pkgs/development/idris-modules/wl-pprint.nix | 6 ------ pkgs/development/idris-modules/wyvern.nix | 5 +---- pkgs/development/idris-modules/xhr.nix | 5 +---- pkgs/development/idris-modules/yaml.nix | 5 +---- pkgs/development/idris-modules/yampa.nix | 5 +---- 80 files changed, 65 insertions(+), 397 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/idris-modules/array.nix b/pkgs/development/idris-modules/array.nix index cab7ccbcf7a8..38d25827d508 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 47a81a066769..d16d9b2245d6 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 d8212fa3830a..53b4fb0a004f 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/bytes.nix b/pkgs/development/idris-modules/bytes.nix index 2e5518c953c4..ad63cb28399d 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 f29d59e50508..72e5e3f5be7e 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 32be0f6a3795..fe47f7025138 100644 --- a/pkgs/development/idris-modules/categories.nix +++ b/pkgs/development/idris-modules/categories.nix @@ -1,16 +1,11 @@ { build-idris-package , fetchFromGitHub -, prelude -, base , lib -, idris }: build-idris-package { name = "categories"; version = "2017-03-01"; - idrisDeps = [ prelude base ]; - src = fetchFromGitHub { owner = "danilkolikov"; repo = "categories"; @@ -22,6 +17,5 @@ build-idris-package { 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 ed51bcfec6d0..7dbd12110888 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 5ecd6d9c585e..a47739d52b1a 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 17dda31a5d15..de93d39395bc 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 29cb828e0615..5c37961b7cb3 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 27b85c97c68e..71785483ce66 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 fe4e729d0e04..c12ea54f5f9f 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 ce46c4538b5b..7ccda5f21c06 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 71bd9023840c..98b42f827b9c 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 3cb78eabe96c..1c515ec39754 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 6cc2ead71fc6..a0bc4d6b9687 100644 --- a/pkgs/development/idris-modules/derive.nix +++ b/pkgs/development/idris-modules/derive.nix @@ -1,16 +1,14 @@ { build-idris-package , fetchFromGitHub -, prelude , contrib , pruviloj , lib -, idris }: build-idris-package { name = "derive"; version = "2018-02-15"; - idrisDeps = [ prelude contrib pruviloj ]; + idrisDeps = [ contrib pruviloj ]; src = fetchFromGitHub { owner = "davlum"; @@ -24,6 +22,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 736b25c9684d..93211dbdacb1 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,5 @@ build-idris-package { homepage = https://github.com/ahmadsalim/desc-n-crunch; license = lib.licenses.gpl3; maintainers = [ lib.maintainers.brainrape ]; - inherit (idris.meta) platforms; }; } diff --git a/pkgs/development/idris-modules/dict.nix b/pkgs/development/idris-modules/dict.nix index ea1cd5a9fe19..c17ed9eefa29 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 0aee97f92e61..e215e069609a 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 7dabfd8f45c4..3989b8f41135 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 ddbc0d79b84e..cd0c22005854 100644 --- a/pkgs/development/idris-modules/eternal.nix +++ b/pkgs/development/idris-modules/eternal.nix @@ -1,15 +1,13 @@ { build-idris-package , fetchFromGitHub -, prelude , effects , lib -, idris }: build-idris-package { name = "eternal"; version = "2018-01-25"; - idrisDeps = [ prelude effects ]; + idrisDeps = [ effects ]; src = fetchFromGitHub { owner = "Heather"; @@ -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 2c88399eb3c0..bf0e609a6103 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 cc0820d3c646..8e979ea796ec 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 24f57af5257e..c6d8d8cf9133 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 041c18faedcd..535f549a5ebe 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 3ea20d3d906e..955b459289af 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 7a2d0d77c832..17706d1b0969 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 8a283eada8a1..3fa546466c8a 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 712508220a6b..f538cb29850c 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 ba4df28ab26e..09fabb6715db 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 deec5b0eb6dc..a44f0e70252d 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 800a3a2eeb49..beec74a2f657 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 5b79644c3a0b..80e95745f033 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 5b4f450fdf7e..f317b980d529 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 f3d06216976e..d8b469ca7689 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 fd2f9e582180..4365c588769b 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 cdc1d593c011..3a4c0954fe81 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 34981d28d3ea..58f8a13864a4 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 5139631b9d52..2281e4821f7a 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 0792a8c0f5d7..55169caaa101 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 e97c7cfafda1..490fd7bd2ed0 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 6cedda0170f2..fd014db30ef7 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 342a84882cd9..2346c89c48c4 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 84429c88765e..a4ac168dc4fb 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 eae30886cd63..9f4af7cc3b85 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 3650a3990f24..4ebffa3e87c2 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 e3c1cb82f28c..9ba8c6bb2d4d 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 af93f4af5e03..8bcb67fa759a 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 8ab75b9ee509..f9fbd26a0ddb 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 943d8e470f07..0f62d73b9dac 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 c6c44874b064..194b60bd2983 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 4b4c26942022..1c2a58a6b7cb 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 693d580fdd57..7ce290c824ec 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 06e99da36089..78f3674aeabd 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 bd8e37f2b7f9..00252b6a7cd6 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 181959dca063..3c886750a1ed 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,5 @@ build-idris-package { description = "SDL-idris framework for Idris"; homepage = https://github.com/edwinb/SDL-idris; maintainers = [ lib.maintainers.brainrape ]; - inherit (idris.meta) platforms; }; } diff --git a/pkgs/development/idris-modules/sdl2.nix b/pkgs/development/idris-modules/sdl2.nix index 46d4e9fb8ddc..a9a9a22a15fc 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,5 @@ build-idris-package { description = "SDL2 binding for Idris"; homepage = https://github.com/steshaw/idris-sdl2; maintainers = [ lib.maintainers.brainrape ]; - inherit (idris.meta) platforms; }; } diff --git a/pkgs/development/idris-modules/semidirect.nix b/pkgs/development/idris-modules/semidirect.nix index d10a85eb4f4a..ebcf7b83075d 100644 --- a/pkgs/development/idris-modules/semidirect.nix +++ b/pkgs/development/idris-modules/semidirect.nix @@ -1,16 +1,14 @@ { build-idris-package , fetchFromGitHub -, prelude , contrib , patricia , lib -, idris }: build-idris-package { name = "semidirect"; version = "2018-02-06"; - idrisDeps = [ prelude contrib patricia ]; + idrisDeps = [ contrib patricia ]; src = fetchFromGitHub { owner = "clayrat"; @@ -23,6 +21,5 @@ build-idris-package { 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 76bf127818ce..e1fe9a5701f4 100644 --- a/pkgs/development/idris-modules/setoids.nix +++ b/pkgs/development/idris-modules/setoids.nix @@ -1,15 +1,11 @@ { build-idris-package , fetchFromGitHub -, prelude , lib -, idris }: build-idris-package { name = "setoids"; version = "2017-03-13"; - idrisDeps = [ prelude ]; - src = fetchFromGitHub { owner = "danilkolikov"; repo = "setoids"; @@ -21,6 +17,5 @@ build-idris-package { 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 c751f27d1c97..97ed06d307ad 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 9dc2dd3f8e23..c8d993ccb8a2 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 3d16e91e10f3..577482433029 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 b18d4a07d46f..06982a0b2bad 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 5f6eccd98cd5..7f80a1ce3c50 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 d0688c54a659..ccb575e270cc 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 9106e485c5f0..ffe1e46d86e1 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 a5d99d192843..402b5a01b765 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 db45f0408ab9..1823e76c290d 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 a2077fca20d7..ba9e5e586ed7 100644 --- a/pkgs/development/idris-modules/tparsec.nix +++ b/pkgs/development/idris-modules/tparsec.nix @@ -1,16 +1,11 @@ { build-idris-package , fetchFromGitHub -, prelude , lib -, idris }: - build-idris-package { name = "tparsec"; version = "2017-12-12"; - idrisDeps = [ prelude ]; - src = fetchFromGitHub { owner = "gallais"; repo = "idris-tparsec"; @@ -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 d63a11a02346..8f10f9bd247e 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 78ad70690b3a..69042e27d3d5 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 845bec3d84e8..3a6dced48cee 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 034bda583dbc..7f1ecb61c8ec 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 d2fa9e31ae38..bf7e56cf8c09 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 3793a812e57f..ddd0dec03a4a 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/wl-pprint.nix b/pkgs/development/idris-modules/wl-pprint.nix index 55a926d780d6..baceb2214e3c 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 a1724476f6c4..870bf1a6b9b8 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 15573cc94611..9e6f40b963ff 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 ff935753ce93..ec689ce4805a 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 661a55bfd744..0231555b4ad6 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; }; } -- cgit 1.4.1 From 603d989ef4480871f2b4f79acadc95329349382c Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Mon, 2 Jul 2018 05:29:49 +0200 Subject: idrisPackages.descncrunch: Mark as broken --- pkgs/development/idris-modules/descncrunch.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'pkgs') diff --git a/pkgs/development/idris-modules/descncrunch.nix b/pkgs/development/idris-modules/descncrunch.nix index 93211dbdacb1..8c808447f64c 100644 --- a/pkgs/development/idris-modules/descncrunch.nix +++ b/pkgs/development/idris-modules/descncrunch.nix @@ -21,5 +21,6 @@ build-idris-package { homepage = https://github.com/ahmadsalim/desc-n-crunch; license = lib.licenses.gpl3; maintainers = [ lib.maintainers.brainrape ]; + broken = true; }; } -- cgit 1.4.1 From df6974cff2d7746286bc5d9c91674f4d2d9df466 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Mon, 2 Jul 2018 06:08:10 +0200 Subject: idrisPackages.{sdl,sdl2}: Mark as broken --- pkgs/development/idris-modules/sdl.nix | 2 ++ pkgs/development/idris-modules/sdl2.nix | 2 ++ 2 files changed, 4 insertions(+) (limited to 'pkgs') diff --git a/pkgs/development/idris-modules/sdl.nix b/pkgs/development/idris-modules/sdl.nix index 3c886750a1ed..4495e60d6bb6 100644 --- a/pkgs/development/idris-modules/sdl.nix +++ b/pkgs/development/idris-modules/sdl.nix @@ -24,5 +24,7 @@ build-idris-package { description = "SDL-idris framework for Idris"; homepage = https://github.com/edwinb/SDL-idris; maintainers = [ lib.maintainers.brainrape ]; + # 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 a9a9a22a15fc..b0306040d730 100644 --- a/pkgs/development/idris-modules/sdl2.nix +++ b/pkgs/development/idris-modules/sdl2.nix @@ -25,5 +25,7 @@ build-idris-package { description = "SDL2 binding for Idris"; homepage = https://github.com/steshaw/idris-sdl2; maintainers = [ lib.maintainers.brainrape ]; + # Can't find file sdl2.o + broken = true; }; } -- cgit 1.4.1 From 0519b48ab86964c57e692782ad99cffb697a74aa Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Mon, 2 Jul 2018 05:22:31 +0200 Subject: idrisPackages.setoids: 2017-03-13 -> 2018-06-18, fix build --- pkgs/development/idris-modules/setoids.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/idris-modules/setoids.nix b/pkgs/development/idris-modules/setoids.nix index e1fe9a5701f4..6db49c3c3c9f 100644 --- a/pkgs/development/idris-modules/setoids.nix +++ b/pkgs/development/idris-modules/setoids.nix @@ -1,16 +1,19 @@ { build-idris-package , fetchFromGitHub +, contrib , lib }: build-idris-package { name = "setoids"; - version = "2017-03-13"; + version = "2018-06-18"; + + idrisDeps = [ contrib ]; src = fetchFromGitHub { owner = "danilkolikov"; repo = "setoids"; - rev = "a50cfc010cb4321cc9b7988c0a4f387d83d34839"; - sha256 = "0q0h2qj9vylkm16h70l78l2p5xjkx4qmg2a2ixfl8vq8b1zm8gch"; + rev = "41b4af3b1a537d9471107a639ad77c7abee2de18"; + sha256 = "0fl1g59s16vnrdnplps5ncv27j7a93nxp9cmqp2iavjxlzlzin1v"; }; meta = { -- cgit 1.4.1 From 74d2b01db5291ed81ec06c10ea1a3b1829c24018 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Mon, 2 Jul 2018 05:30:06 +0200 Subject: idrisPackages.tparsec: 2017-12-12 -> 2018-06-26, fix build --- pkgs/development/idris-modules/tparsec.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/idris-modules/tparsec.nix b/pkgs/development/idris-modules/tparsec.nix index ba9e5e586ed7..bd895a33bae3 100644 --- a/pkgs/development/idris-modules/tparsec.nix +++ b/pkgs/development/idris-modules/tparsec.nix @@ -4,13 +4,13 @@ }: build-idris-package { name = "tparsec"; - version = "2017-12-12"; + version = "2018-06-26"; src = fetchFromGitHub { owner = "gallais"; repo = "idris-tparsec"; - rev = "fb87d08f8f58c934f37d8324b43b0979abcf2183"; - sha256 = "0362076bfs976gqki4b4pxblhnk4xglgx5v2aycjpxsxlpxh6cfd"; + rev = "ca32d1a83f3de95f8979d48016e79d010f47b3c2"; + sha256 = "1zjzk8xjmyyx1qwrdwwg7yjzcgj5wkbwpx8a3wpbj5sv4b5s2r30"; }; meta = { -- cgit 1.4.1 From c6c726bdfddf67ed87a07d15b9e99083f26e0cf6 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Mon, 2 Jul 2018 05:53:34 +0200 Subject: idrisPackages.categories: 2017-03-01 -> 2018-07-02, fix build --- pkgs/development/idris-modules/categories.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/idris-modules/categories.nix b/pkgs/development/idris-modules/categories.nix index fe47f7025138..1e234b3f6934 100644 --- a/pkgs/development/idris-modules/categories.nix +++ b/pkgs/development/idris-modules/categories.nix @@ -4,13 +4,14 @@ }: build-idris-package { name = "categories"; - version = "2017-03-01"; + 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 = { -- cgit 1.4.1 From cefa098cd8df04a5cf75468c2f9cf8ac82cc3c5c Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Mon, 2 Jul 2018 05:19:51 +0200 Subject: idrisPackages.derive: 2018-02-15 -> 2018-07-02, fix build --- pkgs/development/idris-modules/derive.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/idris-modules/derive.nix b/pkgs/development/idris-modules/derive.nix index a0bc4d6b9687..7b6cb64cfe37 100644 --- a/pkgs/development/idris-modules/derive.nix +++ b/pkgs/development/idris-modules/derive.nix @@ -6,15 +6,16 @@ }: build-idris-package { name = "derive"; - version = "2018-02-15"; + version = "2018-07-02"; 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 = { -- cgit 1.4.1 From 0ca2744df38264759fe2f8de84c53f5e55fda81f Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Mon, 2 Jul 2018 06:00:15 +0200 Subject: idrisPackages.eternal: 2018-01-25 -> 2018-07-02, fix build --- pkgs/development/idris-modules/eternal.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/idris-modules/eternal.nix b/pkgs/development/idris-modules/eternal.nix index cd0c22005854..9e0529628fef 100644 --- a/pkgs/development/idris-modules/eternal.nix +++ b/pkgs/development/idris-modules/eternal.nix @@ -5,15 +5,15 @@ }: build-idris-package { name = "eternal"; - version = "2018-01-25"; + version = "2018-07-02"; idrisDeps = [ effects ]; src = fetchFromGitHub { owner = "Heather"; repo = "Control.Eternal.Idris"; - rev = "7ead56ce6065b55104460ace945adbce38fb13eb"; - sha256 = "0b4zys4mhl6r4rbpdxr7n2n20cdc0nkh4lm8n5v4wxkmjzna5cpd"; + rev = "2f84b0dd49a7a29a2f852ba96cabfe8322e0852b"; + sha256 = "1x8cwngiqi05f3wll0niznm47jj2byivx4mh5xf4sb47kciwkxvs"; }; postUnpack = '' -- cgit 1.4.1 From ef0073410d034ce852785ac5a5e4dc7e2012a34a Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Mon, 2 Jul 2018 05:39:55 +0200 Subject: idrisPackages.semidirect: 2018-02-06 -> 2018-07-02, fix build --- pkgs/development/idris-modules/semidirect.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/idris-modules/semidirect.nix b/pkgs/development/idris-modules/semidirect.nix index ebcf7b83075d..8e7428665cd2 100644 --- a/pkgs/development/idris-modules/semidirect.nix +++ b/pkgs/development/idris-modules/semidirect.nix @@ -6,15 +6,15 @@ }: build-idris-package { name = "semidirect"; - version = "2018-02-06"; + version = "2018-07-02"; idrisDeps = [ contrib patricia ]; src = fetchFromGitHub { owner = "clayrat"; repo = "idris-semidirect"; - rev = "884c26c095784f8fd489c323d6673f2a8710a741"; - sha256 = "0w36xkfxsqm6r91f0vs6qpmallrfwa09ql8i317xwm86nfk7akj9"; + rev = "e19c58f7a25c53bba2ab058821e038bae3c093d2"; + sha256 = "0182r9z34kbv3l78pw4qf48ng3hqj4sqzy53074mb0b2c3pikcrl"; }; meta = { -- cgit 1.4.1 From 5f620d0e221d09e9ea6da6bd46794f91c7db7e2d Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Tue, 3 Jul 2018 21:19:28 +0200 Subject: build-idris-package: includePreludeBase -> noPrelude, noBase Resembles idris --noprelude and --nobasepkgs arguments --- pkgs/development/idris-modules/build-builtin-package.nix | 3 ++- pkgs/development/idris-modules/build-idris-package.nix | 11 +++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/idris-modules/build-builtin-package.nix b/pkgs/development/idris-modules/build-builtin-package.nix index a90bb8c11b63..1cd687058b3a 100644 --- a/pkgs/development/idris-modules/build-builtin-package.nix +++ b/pkgs/development/idris-modules/build-builtin-package.nix @@ -10,7 +10,8 @@ build-idris-package { inherit name version; inherit (idris) src; - includePreludeBase = false; + noPrelude = true; + noBase = true; idrisDeps = deps; diff --git a/pkgs/development/idris-modules/build-idris-package.nix b/pkgs/development/idris-modules/build-idris-package.nix index 47e1e22c5db0..7168eb2c956f 100644 --- a/pkgs/development/idris-modules/build-idris-package.nix +++ b/pkgs/development/idris-modules/build-idris-package.nix @@ -1,15 +1,18 @@ # Build an idris package { stdenv, lib, idrisPackages, gmp }: { idrisDeps ? [] - , includePreludeBase ? true + , noPrelude ? false + , noBase ? false , name , version , extraBuildInputs ? [] , ... }@attrs: let - idrisDeps' = idrisDeps ++ lib.optionals includePreludeBase (with idrisPackages; [ prelude base ]); - 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; @@ -20,7 +23,7 @@ stdenv.mkDerivation ({ name = "${name}-${version}"; buildInputs = [ idris-with-packages gmp ] ++ extraBuildInputs; - propagatedBuildInputs = idrisDeps'; + propagatedBuildInputs = allIdrisDeps; # Some packages use the style # opts = -i ../../path/to/package -- cgit 1.4.1