git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #43735 from tg-x/build-idris-package

build-idris-package: add ipkgName

commit5176389f1d931e2862a87205d478eff2586f1df2 authorSilvan Mosberger <infinisil@icloud.com> dateTue 9 Oct 2018, 13:29 (8 years ago) parent6c7a5c37e0f7a0
23 files changed+40−41
pkgs/development/idris-modules/bi.nix+1 pkgs/development/idris-modules/bifunctors.nix−4 pkgs/development/idris-modules/build-idris-package.nix+18−7 pkgs/development/idris-modules/canvas.nix+2 pkgs/development/idris-modules/coda.nix+2 pkgs/development/idris-modules/containers.nix−4 pkgs/development/idris-modules/electron.nix−5 pkgs/development/idris-modules/free.nix+2 pkgs/development/idris-modules/hamt.nix+1−1 pkgs/development/idris-modules/hrtime.nix+1 pkgs/development/idris-modules/idrishighlighter.nix+1 pkgs/development/idris-modules/jheiling-js.nix+1 pkgs/development/idris-modules/mhd.nix+1 pkgs/development/idris-modules/patricia.nix−4 pkgs/development/idris-modules/permutations.nix−4 pkgs/development/idris-modules/recursion_schemes.nix−4 pkgs/development/idris-modules/refined.nix+2−4 pkgs/development/idris-modules/snippets.nix+1 pkgs/development/idris-modules/tap.nix+1−4 pkgs/development/idris-modules/tparsec.nix+2 pkgs/development/idris-modules/vdom.nix+2 pkgs/development/idris-modules/yaml.nix+1 pkgs/development/idris-modules/yampa.nix+1
pkgs/development/idris-modules/bi.nix+1
@@ -8,6 +8,7 @@ build-idris-package {
88 name = "bi";
99 version = "2018-06-25";
1010
11+ ipkgName = "Bi";
1112 idrisDeps = [ contrib pruviloj ];
1213
1314 src = fetchFromGitHub {
pkgs/development/idris-modules/bifunctors.nix−4
@@ -13,10 +13,6 @@ build-idris-package {
1313 sha256 = "0cfp58lhm2g0g1vrpb0mh71qb44n2yvg5sil9ndyf2sqd5ria6yq";
1414 };
1515
16− postUnpack = ''
17− rm source/test.ipkg
18− '';
19−
2016 meta = {
2117 description = "A small bifunctor library for idris";
2218 homepage = https://github.com/japesinator/Idris-Bifunctors;
pkgs/development/idris-modules/build-idris-package.nix+18−7
@@ -5,6 +5,7 @@
55 , noBase ? false
66 , name
77 , version
8+ , ipkgName ? name
89 , extraBuildInputs ? []
910 , ...
1011 }@attrs:
@@ -13,7 +14,10 @@ let
1314 ++ lib.optional (!noPrelude) idrisPackages.prelude
1415 ++ lib.optional (!noBase) idrisPackages.base;
1516 idris-with-packages = idrisPackages.with-packages allIdrisDeps;
16− newAttrs = builtins.removeAttrs attrs [ "idrisDeps" "extraBuildInputs" "name" "version" ] // {
17+ newAttrs = builtins.removeAttrs attrs [
18+ "idrisDeps" "noPrelude" "noBase"
19+ "name" "version" "ipkgName" "extraBuildInputs"
20+ ] // {
1721 meta = attrs.meta // {
1822 platforms = attrs.meta.platforms or idrisPackages.idris.meta.platforms;
1923 };
@@ -29,22 +33,29 @@ stdenv.mkDerivation ({
2933 # opts = -i ../../path/to/package
3034 # rather than the declarative pkgs attribute so we have to rewrite the path.
3135 postPatch = ''
32− sed -i *.ipkg -e "/^opts/ s|-i \\.\\./|-i ${idris-with-packages}/libs/|g"
36+ runHook prePatch
37+ sed -i ${ipkgName}.ipkg -e "/^opts/ s|-i \\.\\./|-i ${idris-with-packages}/libs/|g"
3338 '';
3439
3540 buildPhase = ''
36− idris --build *.ipkg
41+ runHook preBuild
42+ idris --build ${ipkgName}.ipkg
43+ runHook postBuild
3744 '';
3845
3946 checkPhase = ''
40− if grep -q test *.ipkg; then
41− idris --testpkg *.ipkg
47+ runHook preCheck
48+ if grep -q tests ${ipkgName}.ipkg; then
49+ idris --testpkg ${ipkgName}.ipkg
4250 fi
51+ runHook postCheck
4352 '';
4453
4554 installPhase = ''
46− idris --install *.ipkg --ibcsubdir $out/libs
47− IDRIS_DOC_PATH=$out/doc idris --installdoc *.ipkg || true
55+ runHook preInstall
56+ idris --install ${ipkgName}.ipkg --ibcsubdir $out/libs
57+ IDRIS_DOC_PATH=$out/doc idris --installdoc ${ipkgName}.ipkg || true
58+ runHook postInstall
4859 '';
4960
5061} // newAttrs)
pkgs/development/idris-modules/canvas.nix+2
@@ -6,6 +6,8 @@ build-idris-package {
66 name = "canvas";
77 version = "2017-11-09";
88
9+ ipkgName = "idriscanvas";
10+
911 src = fetchFromGitHub {
1012 owner = "JinWuZhao";
1113 repo = "idriscanvas";
pkgs/development/idris-modules/coda.nix+2
@@ -6,6 +6,8 @@ build-idris-package {
66 name = "coda";
77 version = "2018-01-25";
88
9+ ipkgName = "Coda";
10+
911 src = fetchFromGitHub {
1012 owner = "ostera";
1113 repo = "idris-coda";
pkgs/development/idris-modules/containers.nix−4
@@ -17,10 +17,6 @@ build-idris-package {
1717 sha256 = "0vyjadd9sb8qcbzvzhnqwc8wa7ma770c10xhn96jsqsnzr81k52d";
1818 };
1919
20− postUnpack = ''
21− rm source/containers-travis.ipkg
22− '';
23−
2420 meta = {
2521 description = "Various data structures for use in the Idris Language.";
2622 homepage = https://github.com/jfdm/idris-containers;
pkgs/development/idris-modules/electron.nix−5
@@ -18,11 +18,6 @@ build-idris-package {
1818 sha256 = "1rpa7yjvfpzl06h0qbk54jd2n52nmgpf7nq5aamcinqh7h5gbiwn";
1919 };
2020
21− postUnpack = ''
22− rm source/example_main.ipkg
23− rm source/example_view.ipkg
24− '';
25−
2621 meta = {
2722 description = "Electron bindings for Idris";
2823 homepage = https://github.com/jheiling/idris-electron;
pkgs/development/idris-modules/free.nix+2
@@ -6,6 +6,8 @@ build-idris-package {
66 name = "free";
77 version = "2017-07-03";
88
9+ ipkgName = "idris-free";
10+
911 src = fetchFromGitHub {
1012 owner = "idris-hackers";
1113 repo = "idris-free";
pkgs/development/idris-modules/hamt.nix+1−1
@@ -5,7 +5,7 @@
55, lib
66}:
77build-idris-package {
8− name = "idris-hamt";
8+ name = "hamt";
99 version = "2016-11-15";
1010
1111 idrisDeps = [ contrib effects ];
pkgs/development/idris-modules/hrtime.nix+1
@@ -7,6 +7,7 @@ build-idris-package {
77 name = "hrtime";
88 version = "2017-04-16";
99
10+ ipkgName = "hrTime";
1011 idrisDeps = [ idrisscript ];
1112
1213 src = fetchFromGitHub {
pkgs/development/idris-modules/idrishighlighter.nix+1
@@ -8,6 +8,7 @@ build-idris-package {
88 name = "idrishighlighter";
99 version = "2018-02-22";
1010
11+ ipkgName = "idris-code-highlighter";
1112 idrisDeps = [ effects lightyear ];
1213
1314 src = fetchFromGitHub {
pkgs/development/idris-modules/jheiling-js.nix+1
@@ -8,6 +8,7 @@ build-idris-package {
88 name = "jheiling-js";
99 version = "2016-03-09";
1010
11+ ipkgName = "js";
1112 idrisDeps = [ contrib jheiling-extras ];
1213
1314 src = fetchFromGitHub {
pkgs/development/idris-modules/mhd.nix+1
@@ -9,6 +9,7 @@ build-idris-package {
99 name = "mhd";
1010 version = "2016-04-22";
1111
12+ ipkgName = "MHD";
1213 idrisDeps = [ contrib effects ];
1314
1415 extraBuildInputs = [ libmicrohttpd ];
pkgs/development/idris-modules/patricia.nix−4
@@ -16,10 +16,6 @@ build-idris-package {
1616 sha256 = "093q3qjmr93wv8pqwk0zfm3hzf14c235k9c9ip53rhg6yzcm0yqz";
1717 };
1818
19− postUnpack = ''
20− rm source/patricia-nix.ipkg
21− '';
22−
2319 meta = {
2420 description = "Immutable map from integer keys to values based on patricia tree. Basically persistent array.";
2521 homepage = https://github.com/ChShersh/idris-patricia;
pkgs/development/idris-modules/permutations.nix−4
@@ -13,10 +13,6 @@ build-idris-package {
1313 sha256 = "1dirzqy40fczbw7gp2jr51lzqsnq5vcx9z5l6194lcrq2vxgzv1s";
1414 };
1515
16− postUnpack = ''
17− rm source/test.ipkg
18− '';
19−
2016 meta = {
2117 description = "Type-safe way of working with permutations in Idris";
2218 homepage = https://github.com/vmchale/permutations;
pkgs/development/idris-modules/recursion_schemes.nix−4
@@ -20,10 +20,6 @@ build-idris-package {
2020 sha256 = "0rbx0yqa0fb7h7qfsvqvirc5q85z51rcwbivn6351jgn3a0inmhf";
2121 };
2222
23− postUnpack = ''
24− rm source/test.ipkg
25− '';
26−
2723 meta = {
2824 description = "Recursion schemes for Idris";
2925 homepage = https://github.com/vmchale/recursion_schemes;
pkgs/development/idris-modules/refined.nix+2−4
@@ -6,6 +6,8 @@ build-idris-package {
66 name = "refined";
77 version = "2017-12-28";
88
9+ ipkgName = "idris-refined";
10+
911 src = fetchFromGitHub {
1012 owner = "janschultecom";
1113 repo = "idris-refined";
@@ -13,10 +15,6 @@ build-idris-package {
1315 sha256 = "1am7kfc51p2zlml954v8cl9xvx0g0f1caq7ni3z36xvsd7fh47yh";
1416 };
1517
16− postUnpack = ''
17− rm source/idris-refined-test.ipkg
18− '';
19−
2018 meta = {
2119 description = "Port of Scala/Haskell Refined library to Idris";
2220 homepage = https://github.com/janschultecom/idris-refined;
pkgs/development/idris-modules/snippets.nix+1
@@ -7,6 +7,7 @@ build-idris-package {
77 name = "snippets";
88 version = "2018-03-17";
99
10+ ipkgName = "idris-snippets";
1011 idrisDeps = [ contrib ];
1112
1213 src = fetchFromGitHub {
pkgs/development/idris-modules/tap.nix+1−4
@@ -7,6 +7,7 @@ build-idris-package {
77 name = "tap";
88 version = "2017-04-08";
99
10+ ipkgName = "TAP";
1011 idrisDeps = [ contrib ];
1112
1213 src = fetchFromGitHub {
@@ -16,10 +17,6 @@ build-idris-package {
1617 sha256 = "0fhlmmivq9xv89r7plrnhmvay1j7bapz3wh7y8lygwvcrllh9zxs";
1718 };
1819
19− postUnpack = ''
20− rm source/Draft.ipkg
21− '';
22−
2320 meta = {
2421 description = "A simple TAP producer and consumer/reporter for Idris";
2522 homepage = https://github.com/ostera/tap-idris;
pkgs/development/idris-modules/tparsec.nix+2
@@ -6,6 +6,8 @@ build-idris-package {
66 name = "tparsec";
77 version = "2018-06-26";
88
9+ ipkgName = "TParsec";
10+
911 src = fetchFromGitHub {
1012 owner = "gallais";
1113 repo = "idris-tparsec";
pkgs/development/idris-modules/vdom.nix+2
@@ -6,6 +6,8 @@ build-idris-package {
66 name = "vdom";
77 version = "0.6.0";
88
9+ ipkgName = "idris-vdom";
10+
911 src = fetchFromGitHub {
1012 owner = "brandondyck";
1113 repo = "idris-vdom";
pkgs/development/idris-modules/yaml.nix+1
@@ -8,6 +8,7 @@ build-idris-package {
88 name = "yaml";
99 version = "2018-01-25";
1010
11+ ipkgName = "Yaml";
1112 idrisDeps = [ contrib lightyear ];
1213
1314 src = fetchFromGitHub {
pkgs/development/idris-modules/yampa.nix+1
@@ -7,6 +7,7 @@ build-idris-package {
77 name = "yampa";
88 version = "2016-07-05";
99
10+ ipkgName = "idris-yampa";
1011 idrisDeps = [ bifunctors ];
1112
1213 src = fetchFromGitHub {