diff options
Diffstat (limited to 'pkgs/development')
65 files changed, 549 insertions, 167 deletions
diff --git a/pkgs/development/compilers/scala/dotty-bare.nix b/pkgs/development/compilers/scala/bare.nix index b954fdbe1edc..40a70ef2baa4 100644 --- a/pkgs/development/compilers/scala/dotty-bare.nix +++ b/pkgs/development/compilers/scala/bare.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "3.1.0"; - pname = "dotty-bare"; + pname = "scala-bare"; src = fetchurl { url = "https://github.com/lampepfl/dotty/releases/download/${version}/scala3-${version}.tar.gz"; diff --git a/pkgs/development/compilers/scala/default.nix b/pkgs/development/compilers/scala/default.nix new file mode 100644 index 000000000000..11787f1aa690 --- /dev/null +++ b/pkgs/development/compilers/scala/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, makeWrapper, jre, callPackage }: + +let + bare = callPackage ./bare.nix { + inherit stdenv fetchurl makeWrapper jre; + }; +in + +stdenv.mkDerivation { + pname = "scala"; + inherit (bare) version; + + dontUnpack = true; + + installPhase = '' + mkdir -p $out/bin + ln -s ${bare}/bin/scalac $out/bin/scalac + ln -s ${bare}/bin/scaladoc $out/bin/scaladoc + ln -s ${bare}/bin/scala $out/bin/scala + ln -s ${bare}/bin/common $out/bin/common + ''; + + inherit (bare) meta; +} diff --git a/pkgs/development/compilers/scala/dotty.nix b/pkgs/development/compilers/scala/dotty.nix deleted file mode 100644 index 1cd187f2e540..000000000000 --- a/pkgs/development/compilers/scala/dotty.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, fetchurl, makeWrapper, jre, callPackage }: - -let - dotty-bare = callPackage ./dotty-bare.nix { - inherit stdenv fetchurl makeWrapper jre; - }; -in - -stdenv.mkDerivation { - pname = "dotty"; - inherit (dotty-bare) version; - - dontUnpack = true; - - installPhase = '' - mkdir -p $out/bin - ln -s ${dotty-bare}/bin/scalac $out/bin/scalac - ln -s ${dotty-bare}/bin/scaladoc $out/bin/scaladoc - ln -s ${dotty-bare}/bin/scala $out/bin/scala - ln -s ${dotty-bare}/bin/common $out/bin/common - ''; - - inherit (dotty-bare) meta; -} diff --git a/pkgs/development/coq-modules/CoLoR/default.nix b/pkgs/development/coq-modules/CoLoR/default.nix index 9270609c6b2f..0fdcb49d7300 100644 --- a/pkgs/development/coq-modules/CoLoR/default.nix +++ b/pkgs/development/coq-modules/CoLoR/default.nix @@ -20,7 +20,7 @@ with lib; mkCoqDerivation { release."1.4.0".rev = "168c6b86c7d3f87ee51791f795a8828b1521589a"; release."1.4.0".sha256 = "1d2whsgs3kcg5wgampd6yaqagcpmzhgb6a0hp6qn4lbimck5dfmm"; - extraBuildInputs = [ bignums ]; + propagatedBuildInputs = [ bignums ]; enableParallelBuilding = false; meta = { diff --git a/pkgs/development/coq-modules/HoTT/default.nix b/pkgs/development/coq-modules/HoTT/default.nix index 706943cf8d02..f6e9b3daca2d 100644 --- a/pkgs/development/coq-modules/HoTT/default.nix +++ b/pkgs/development/coq-modules/HoTT/default.nix @@ -8,7 +8,7 @@ with lib; mkCoqDerivation { release."20170921".rev = "e3557740a699167e6adb1a65855509d55a392fa1"; release."20170921".sha256 = "0zwfp8g62b50vmmbb2kmskj3v6w7qx1pbf43yw0hr7asdz2zbx5v"; - extraBuildInputs = [ autoconf automake ]; + nativeBuildInputs = [ autoconf automake ]; preConfigure = '' patchShebangs ./autogen.sh diff --git a/pkgs/development/coq-modules/QuickChick/default.nix b/pkgs/development/coq-modules/QuickChick/default.nix index db3227c1770e..c2e6a5431c91 100644 --- a/pkgs/development/coq-modules/QuickChick/default.nix +++ b/pkgs/development/coq-modules/QuickChick/default.nix @@ -36,8 +36,7 @@ let recent = lib.versions.isGe "8.7" coq.coq-version; in "substituteInPlace Makefile --replace quickChickTool.byte quickChickTool.native"; mlPlugin = true; - extraNativeBuildInputs = lib.optional recent coq.ocamlPackages.ocamlbuild; - extraBuildInputs = lib.optional recent coq.ocamlPackages.num; + nativeBuildInputs = lib.optional recent coq.ocamlPackages.ocamlbuild; propagatedBuildInputs = [ ssreflect ] ++ lib.optionals recent [ coq-ext-lib simple-io ]; extraInstallFlags = [ "-f Makefile.coq" ]; diff --git a/pkgs/development/coq-modules/VST/default.nix b/pkgs/development/coq-modules/VST/default.nix index a5dee94d045d..8bf8a8680237 100644 --- a/pkgs/development/coq-modules/VST/default.nix +++ b/pkgs/development/coq-modules/VST/default.nix @@ -31,7 +31,7 @@ mkCoqDerivation { release."2.9".sha256 = "sha256:1adwzbl1pprrrwrm7cm493098fizxanxpv7nyfbvwdhgbhcnv6qf"; release."2.8".sha256 = "sha256-cyK88uzorRfjapNQ6XgQEmlbWnDsiyLve5po1VG52q0="; releaseRev = v: "v${v}"; - extraBuildInputs = [ ITree ]; + buildInputs = [ ITree ]; propagatedBuildInputs = [ compcert ]; preConfigure = '' diff --git a/pkgs/development/coq-modules/bignums/default.nix b/pkgs/development/coq-modules/bignums/default.nix index 0001ae1ded4d..a53b8199fe96 100644 --- a/pkgs/development/coq-modules/bignums/default.nix +++ b/pkgs/development/coq-modules/bignums/default.nix @@ -5,7 +5,7 @@ with lib; mkCoqDerivation { owner = "coq"; displayVersion = { bignums = ""; }; inherit version; - defaultVersion = if versions.isGe "8.5" coq.coq-version + defaultVersion = if versions.isGe "8.6" coq.coq-version then "${coq.coq-version}.0" else null; release."8.15.0".sha256 = "093klwlhclgyrba1iv18dyz1qp5f0lwiaa7y0qwvgmai8rll5fns"; diff --git a/pkgs/development/coq-modules/compcert/default.nix b/pkgs/development/coq-modules/compcert/default.nix index 092bb58d174f..847ef8af23fe 100644 --- a/pkgs/development/coq-modules/compcert/default.nix +++ b/pkgs/development/coq-modules/compcert/default.nix @@ -1,4 +1,5 @@ -{ lib, fetchzip, mkCoqDerivation, coq, flocq, compcert +{ lib, fetchzip, mkCoqDerivation +, coq, flocq, compcert , ocamlPackages, fetchpatch, makeWrapper, coq2html , stdenv, tools ? stdenv.cc , version ? null @@ -15,9 +16,9 @@ let compcert = mkCoqDerivation rec { releaseRev = v: "v${v}"; defaultVersion = with versions; switch coq.version [ - { case = range "8.8" "8.11"; out = "3.8"; } + { case = range "8.13" "8.15"; out = "3.10"; } { case = isEq "8.12" ; out = "3.9"; } - { case = range "8.12" "8.15"; out = "3.10"; } + { case = range "8.8" "8.11"; out = "3.8"; } ] null; release = { @@ -48,9 +49,13 @@ let compcert = mkCoqDerivation rec { ''; installTargets = "documentation install"; + installFlags = []; # trust ./configure + preInstall = '' + mkdir -p $out/share/man + mkdir -p $man/share + ''; postInstall = '' # move man into place - mkdir -p $man/share mv $out/share/man/ $man/share/ # move docs into place diff --git a/pkgs/development/coq-modules/coq-bits/default.nix b/pkgs/development/coq-modules/coq-bits/default.nix index 6cb6bb3c813e..f604db4ecdf7 100644 --- a/pkgs/development/coq-modules/coq-bits/default.nix +++ b/pkgs/development/coq-modules/coq-bits/default.nix @@ -1,34 +1,18 @@ -{ lib, mkCoqDerivation, coq, mathcomp, version ? null }: +{ lib, mkCoqDerivation, coq, mathcomp-algebra, version ? null }: with lib; mkCoqDerivation { pname = "coq-bits"; repo = "bits"; inherit version; - defaultVersion = - if versions.isGe "8.10" coq.version - then "1.1.0" - else if versions.isGe "8.7" coq.version - then "1.0.0" - else null; + defaultVersion = with versions; switch coq.coq-version [ + { case = isGe "8.10"; out = "1.1.0"; } + { case = isGe "8.7"; out = "1.0.0"; } + ] null; - release = { - "1.0.0" = { - rev = "1.0.0"; - sha256 = "0nv5mdgrd075dpd8bc7h0xc5i95v0pkm0bfyq5rj6ii1s54dwcjl"; - }; - "1.1.0" = { - rev = "1.1.0"; - sha256 = "sha256-TCw1kSXeW0ysIdLeNr+EGmpGumEE9i8tinEMp57UXaE="; - }; - }; - - extraBuildInputs = [ mathcomp.ssreflect mathcomp.fingroup ]; - propagatedBuildInputs = [ mathcomp.algebra ]; + release."1.1.0".sha256 = "sha256-TCw1kSXeW0ysIdLeNr+EGmpGumEE9i8tinEMp57UXaE="; + release."1.0.0".sha256 = "0nv5mdgrd075dpd8bc7h0xc5i95v0pkm0bfyq5rj6ii1s54dwcjl"; - installPhase = '' - make -f Makefile CoqMakefile - make -f CoqMakefile COQLIB=$out/lib/coq/${coq.coq-version}/ install - ''; + propagatedBuildInputs = [ mathcomp-algebra ]; meta = { description = "A formalization of bitset operations in Coq"; diff --git a/pkgs/development/coq-modules/coq-elpi/default.nix b/pkgs/development/coq-modules/coq-elpi/default.nix index 55423047caa7..03fe8c32d5c3 100644 --- a/pkgs/development/coq-modules/coq-elpi/default.nix +++ b/pkgs/development/coq-modules/coq-elpi/default.nix @@ -7,7 +7,7 @@ with builtins; with lib; let { case = "8.13"; out = { version = "1.13.7"; };} { case = "8.14"; out = { version = "1.13.7"; };} { case = "8.15"; out = { version = "1.14.1"; };} - ] {}); + ] { version = "1.14.1"; } ); in mkCoqDerivation { pname = "elpi"; repo = "coq-elpi"; @@ -48,8 +48,8 @@ in mkCoqDerivation { release."1.6.0".sha256 = "0kf99i43mlf750fr7fric764mm495a53mg5kahnbp6zcjcxxrm0b"; releaseRev = v: "v${v}"; - extraNativeBuildInputs = [ which elpi ]; mlPlugin = true; + propagatedBuildInputs = [ elpi ]; meta = { description = "Coq plugin embedding ELPI."; diff --git a/pkgs/development/coq-modules/coqeal/default.nix b/pkgs/development/coq-modules/coqeal/default.nix index 3b8b23618d23..563e2dc22d6d 100644 --- a/pkgs/development/coq-modules/coqeal/default.nix +++ b/pkgs/development/coq-modules/coqeal/default.nix @@ -1,6 +1,6 @@ { coq, mkCoqDerivation, mathcomp, bignums, paramcoq, multinomials, mathcomp-real-closed, - lib, which, version ? null }: + lib, version ? null }: with lib; @@ -22,7 +22,6 @@ with lib; release."1.0.4".sha256 = "1g5m26lr2lwxh6ld2gykailhay4d0ayql4bfh0aiwqpmmczmxipk"; release."1.0.3".sha256 = "0hc63ny7phzbihy8l7wxjvn3haxx8jfnhi91iw8hkq8n29i23v24"; - extraBuildInputs = [ which ]; propagatedBuildInputs = [ mathcomp.algebra bignums paramcoq multinomials ]; meta = { diff --git a/pkgs/development/coq-modules/coqhammer/default.nix b/pkgs/development/coq-modules/coqhammer/default.nix index 66a3dd222dd5..853e77990b6e 100644 --- a/pkgs/development/coq-modules/coqhammer/default.nix +++ b/pkgs/development/coq-modules/coqhammer/default.nix @@ -28,8 +28,10 @@ with lib; mkCoqDerivation { release."1.3-coq8.12".sha256 = "1q1y3cwhd98pkm98g71fsdjz85bfwgcz2xn7s7wwmiraifv5l6z8"; release."1.3-coq8.11".sha256 = "08zf8qfna7b9p2myfaz4g7bas3a1q1156x78n5isqivlnqfrjc1b"; release."1.3-coq8.10".sha256 = "1fj8497ir4m79hyrmmmmrag01001wrby0h24wv6525vz0w5py3cd"; - release."1.1.1-coq8.9".sha256 = "1knjmz4hr8vlp103j8n4fyb2lfxysnm512gh3m2kp85n6as6fvb9"; - release."1.1-coq8.8".sha256 = "0ms086wp4jmrzyglb8wymchzyflflk01nsfsk4r6qv8rrx81nx9h"; + release."1.1.1-coq8.9" = { sha256 = "1knjmz4hr8vlp103j8n4fyb2lfxysnm512gh3m2kp85n6as6fvb9"; + rev = "f8b4d81a213aa1f25afbe53c7c9ca1b15e3d42bc"; }; + release."1.1-coq8.8" = { sha256 = "0ms086wp4jmrzyglb8wymchzyflflk01nsfsk4r6qv8rrx81nx9h"; + rev = "c3cb54b4d5f33fab372d33c7189861368a08fa22"; }; release."1.3.1-coq8.13".version = "1.3.1"; release."1.3.1-coq8.12".version = "1.3.1"; diff --git a/pkgs/development/coq-modules/coqprime/default.nix b/pkgs/development/coq-modules/coqprime/default.nix index 46ede02a57e6..26988b81e1a6 100644 --- a/pkgs/development/coq-modules/coqprime/default.nix +++ b/pkgs/development/coq-modules/coqprime/default.nix @@ -20,7 +20,6 @@ with lib; mkCoqDerivation { release."8.7.2".sha256 = "15zlcrx06qqxjy3nhh22wzy0rb4npc8l4nx2bbsfsvrisbq1qb7k"; releaseRev = v: "v${v}"; - extraBuildInputs = [ which ]; propagatedBuildInputs = [ bignums ]; meta = with lib; { diff --git a/pkgs/development/coq-modules/coqtail-math/default.nix b/pkgs/development/coq-modules/coqtail-math/default.nix index 3491e6b21f2f..a4f7ca405f71 100644 --- a/pkgs/development/coq-modules/coqtail-math/default.nix +++ b/pkgs/development/coq-modules/coqtail-math/default.nix @@ -14,9 +14,7 @@ mkCoqDerivation { release."8.14".sha256 = "sha256:1k8f8idjnx0mf4z479vcx55iz42rjxrbplbznv80m2famxakq03c"; release."20201124".rev = "5c22c3d7dcd8cf4c47cf84a281780f5915488e9e"; release."20201124".sha256 = "sha256-wd+Lh7dpAD4zfpyKuztDmSFEZo5ZiFrR8ti2jUCVvoQ="; - - extraNativeBuildInputs = with coq.ocamlPackages; [ ocaml findlib ]; - + mlPlugin = true; meta = { license = licenses.lgpl3Only; maintainers = [ maintainers.siraben ]; diff --git a/pkgs/development/coq-modules/coquelicot/default.nix b/pkgs/development/coq-modules/coquelicot/default.nix index 1a6dba9b0c08..09dd65df41d2 100644 --- a/pkgs/development/coq-modules/coquelicot/default.nix +++ b/pkgs/development/coq-modules/coquelicot/default.nix @@ -1,4 +1,4 @@ -{ lib, mkCoqDerivation, which, autoconf, +{ lib, mkCoqDerivation, autoconf, coq, ssreflect, version ? null }: with lib; mkCoqDerivation { @@ -16,7 +16,7 @@ with lib; mkCoqDerivation { release."3.0.2".sha256 = "1rqfbbskgz7b1bcpva8wh3v3456sq2364y804f94sc8y5sij23nl"; releaseRev = v: "coquelicot-${v}"; - extraNativeBuildInputs = [ which autoconf ]; + nativeBuildInputs = [ autoconf ]; propagatedBuildInputs = [ ssreflect ]; useMelquiondRemake.logpath = "Coquelicot"; diff --git a/pkgs/development/coq-modules/dpdgraph/default.nix b/pkgs/development/coq-modules/dpdgraph/default.nix index 7cf6132bf6a9..fcc1303e8276 100644 --- a/pkgs/development/coq-modules/dpdgraph/default.nix +++ b/pkgs/development/coq-modules/dpdgraph/default.nix @@ -39,9 +39,9 @@ mkCoqDerivation { release."0.6".sha256 = "0qvar8gfbrcs9fmvkph5asqz4l5fi63caykx3bsn8zf0xllkwv0n"; releaseRev = v: "v${v}"; - extraNativeBuildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook ]; mlPlugin = true; - extraBuildInputs = [ coq.ocamlPackages.ocamlgraph ]; + buildInputs = [ coq.ocamlPackages.ocamlgraph ]; # dpd_compute.ml uses deprecated Pervasives.compare # Versions prior to 0.6.5 do not have the WARN_ERR build fl |