Merge staging-next into staging
commit
37c77840b8
|
@ -0,0 +1,11 @@
|
||||||
|
# Elm {#sec-elm}
|
||||||
|
|
||||||
|
To start a development environment do
|
||||||
|
|
||||||
|
```ShellSession
|
||||||
|
nix-shell -p elmPackages.elm elmPackages.elm-format
|
||||||
|
```
|
||||||
|
|
||||||
|
To update the Elm compiler, see <filename>nixpkgs/pkgs/development/compilers/elm/README.md</filename>.
|
||||||
|
|
||||||
|
To package Elm applications, [read about elm2nix](https://github.com/hercules-ci/elm2nix#elm2nix).
|
|
@ -1,17 +0,0 @@
|
||||||
<section xmlns="http://docbook.org/ns/docbook"
|
|
||||||
xmlns:xlink="http://www.w3.org/1999/xlink"
|
|
||||||
xml:id="sec-elm">
|
|
||||||
<title>Elm</title>
|
|
||||||
|
|
||||||
<para>
|
|
||||||
To start a development environment do <command>nix-shell -p elmPackages.elm elmPackages.elm-format</command>
|
|
||||||
</para>
|
|
||||||
|
|
||||||
<para>
|
|
||||||
To update Elm compiler, see <filename>nixpkgs/pkgs/development/compilers/elm/README.md</filename>.
|
|
||||||
</para>
|
|
||||||
|
|
||||||
<para>
|
|
||||||
To package Elm applications, <link xlink:href="https://github.com/hercules-ci/elm2nix#elm2nix">read about elm2nix</link>.
|
|
||||||
</para>
|
|
||||||
</section>
|
|
|
@ -8,7 +8,7 @@
|
||||||
<xi:include href="citrix.xml" />
|
<xi:include href="citrix.xml" />
|
||||||
<xi:include href="dlib.xml" />
|
<xi:include href="dlib.xml" />
|
||||||
<xi:include href="eclipse.xml" />
|
<xi:include href="eclipse.xml" />
|
||||||
<xi:include href="elm.xml" />
|
<xi:include href="elm.section.xml" />
|
||||||
<xi:include href="emacs.section.xml" />
|
<xi:include href="emacs.section.xml" />
|
||||||
<xi:include href="firefox.section.xml" />
|
<xi:include href="firefox.section.xml" />
|
||||||
<xi:include href="fish.section.xml" />
|
<xi:include href="fish.section.xml" />
|
||||||
|
|
|
@ -29,6 +29,7 @@ with lib;
|
||||||
nixpkgs.overlays = singleton (const (super: {
|
nixpkgs.overlays = singleton (const (super: {
|
||||||
cairo = super.cairo.override { x11Support = false; };
|
cairo = super.cairo.override { x11Support = false; };
|
||||||
dbus = super.dbus.override { x11Support = false; };
|
dbus = super.dbus.override { x11Support = false; };
|
||||||
|
beam = super.beam_nox;
|
||||||
networkmanager-fortisslvpn = super.networkmanager-fortisslvpn.override { withGnome = false; };
|
networkmanager-fortisslvpn = super.networkmanager-fortisslvpn.override { withGnome = false; };
|
||||||
networkmanager-iodine = super.networkmanager-iodine.override { withGnome = false; };
|
networkmanager-iodine = super.networkmanager-iodine.override { withGnome = false; };
|
||||||
networkmanager-l2tp = super.networkmanager-l2tp.override { withGnome = false; };
|
networkmanager-l2tp = super.networkmanager-l2tp.override { withGnome = false; };
|
||||||
|
|
|
@ -3,11 +3,10 @@
|
||||||
# TODO: use jdk https://github.com/NixOS/nixpkgs/pull/89731
|
# TODO: use jdk https://github.com/NixOS/nixpkgs/pull/89731
|
||||||
, openjdk8 ? null # javacSupport
|
, openjdk8 ? null # javacSupport
|
||||||
, unixODBC ? null # odbcSupport
|
, unixODBC ? null # odbcSupport
|
||||||
, libGL ? null, libGLU ? null, wxGTK ? null, wxmac ? null, xorg ? null # wxSupport
|
, libGL ? null, libGLU ? null, wxGTK ? null, wxmac ? null, xorg ? null
|
||||||
, parallelBuild ? false
|
, parallelBuild ? false
|
||||||
, systemd
|
, systemd, wxSupport ? true
|
||||||
}:
|
}:
|
||||||
|
|
||||||
{ baseName ? "erlang"
|
{ baseName ? "erlang"
|
||||||
, version
|
, version
|
||||||
, sha256 ? null
|
, sha256 ? null
|
||||||
|
@ -21,7 +20,7 @@
|
||||||
, javacSupport ? false, javacPackages ? [ openjdk8 ]
|
, javacSupport ? false, javacPackages ? [ openjdk8 ]
|
||||||
, odbcSupport ? false, odbcPackages ? [ unixODBC ]
|
, odbcSupport ? false, odbcPackages ? [ unixODBC ]
|
||||||
, withSystemd ? stdenv.isLinux # systemd support in epmd
|
, withSystemd ? stdenv.isLinux # systemd support in epmd
|
||||||
, wxSupport ? true, wxPackages ? [ libGL libGLU wxGTK xorg.libX11 ]
|
, wxPackages ? [ libGL libGLU wxGTK xorg.libX11 ]
|
||||||
, preUnpack ? "", postUnpack ? ""
|
, preUnpack ? "", postUnpack ? ""
|
||||||
, patches ? [], patchPhase ? "", prePatch ? "", postPatch ? ""
|
, patches ? [], patchPhase ? "", prePatch ? "", postPatch ? ""
|
||||||
, configureFlags ? [], configurePhase ? "", preConfigure ? "", postConfigure ? ""
|
, configureFlags ? [], configurePhase ? "", preConfigure ? "", postConfigure ? ""
|
||||||
|
|
|
@ -1,3 +1,10 @@
|
||||||
|
# Tests for the Python interpreters, package sets and environments.
|
||||||
|
#
|
||||||
|
# Each Python interpreter has a `passthru.tests` which is the attribute set
|
||||||
|
# returned by this function. For example, for Python 3 the tests are run with
|
||||||
|
#
|
||||||
|
# $ nix-build -A python3.tests
|
||||||
|
#
|
||||||
{ stdenv
|
{ stdenv
|
||||||
, python
|
, python
|
||||||
, runCommand
|
, runCommand
|
||||||
|
@ -7,6 +14,8 @@
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
|
# Test whether the interpreter behaves in the different types of environments
|
||||||
|
# we aim to support.
|
||||||
environmentTests = let
|
environmentTests = let
|
||||||
envs = let
|
envs = let
|
||||||
inherit python;
|
inherit python;
|
||||||
|
@ -83,6 +92,7 @@ let
|
||||||
|
|
||||||
in lib.mapAttrs testfun envs;
|
in lib.mapAttrs testfun envs;
|
||||||
|
|
||||||
|
# Integration tests involving the package set.
|
||||||
# All PyPy package builds are broken at the moment
|
# All PyPy package builds are broken at the moment
|
||||||
integrationTests = lib.optionalAttrs (python.pythonAtLeast "3.7" && (!python.isPyPy)) rec {
|
integrationTests = lib.optionalAttrs (python.pythonAtLeast "3.7" && (!python.isPyPy)) rec {
|
||||||
# Before the addition of NIX_PYTHONPREFIX mypy was broken with typed packages
|
# Before the addition of NIX_PYTHONPREFIX mypy was broken with typed packages
|
||||||
|
|
|
@ -4,6 +4,8 @@ buildDunePackage rec {
|
||||||
pname = "diet";
|
pname = "diet";
|
||||||
version = "0.4";
|
version = "0.4";
|
||||||
|
|
||||||
|
useDune2 = true;
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url =
|
url =
|
||||||
"https://github.com/mirage/ocaml-diet/releases/download/v${version}/diet-v${version}.tbz";
|
"https://github.com/mirage/ocaml-diet/releases/download/v${version}/diet-v${version}.tbz";
|
||||||
|
|
|
@ -6,6 +6,8 @@ buildDunePackage rec {
|
||||||
|
|
||||||
inherit (opam) src version;
|
inherit (opam) src version;
|
||||||
|
|
||||||
|
useDune2 = true;
|
||||||
|
|
||||||
nativeBuildInputs = [ unzip cppo ];
|
nativeBuildInputs = [ unzip cppo ];
|
||||||
propagatedBuildInputs = [ ocamlgraph re ];
|
propagatedBuildInputs = [ ocamlgraph re ];
|
||||||
|
|
||||||
|
|
|
@ -7,6 +7,8 @@ buildDunePackage rec {
|
||||||
pname = "parse-argv";
|
pname = "parse-argv";
|
||||||
version = "0.2.0";
|
version = "0.2.0";
|
||||||
|
|
||||||
|
useDune2 = true;
|
||||||
|
|
||||||
minimumOCamlVersion = "4.03";
|
minimumOCamlVersion = "4.03";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
|
|
|
@ -4,6 +4,8 @@ buildDunePackage rec {
|
||||||
pname = "tyxml";
|
pname = "tyxml";
|
||||||
version = "4.4.0";
|
version = "4.4.0";
|
||||||
|
|
||||||
|
useDune2 = true;
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://github.com/ocsigen/tyxml/releases/download/${version}/tyxml-${version}.tbz";
|
url = "https://github.com/ocsigen/tyxml/releases/download/${version}/tyxml-${version}.tbz";
|
||||||
sha256 = "0c150h2f4c4id73ickkdqkir3jya66m6c7f5jxlp4caw9bfr8qsi";
|
sha256 = "0c150h2f4c4id73ickkdqkir3jya66m6c7f5jxlp4caw9bfr8qsi";
|
||||||
|
|
|
@ -3,10 +3,10 @@
|
||||||
|
|
||||||
buildPerlPackage rec {
|
buildPerlPackage rec {
|
||||||
pname = "po4a";
|
pname = "po4a";
|
||||||
version = "0.55";
|
version = "0.62";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://github.com/mquinson/po4a/releases/download/v${version}/po4a-${version}.tar.gz";
|
url = "https://github.com/mquinson/po4a/releases/download/v${version}/po4a-${version}.tar.gz";
|
||||||
sha256 = "1qss4q5df3nsydsbggb7gg50bn0kdxq5wn8riqm9zwkiq6a4bifg";
|
sha256 = "0eb510a66f59de68cf7a205342036cc9fc08b39334b91f1456421a5f3359e68b";
|
||||||
};
|
};
|
||||||
nativeBuildInputs = [ docbook_xsl docbook_xsl_ns ModuleBuild ];
|
nativeBuildInputs = [ docbook_xsl docbook_xsl_ns ModuleBuild ];
|
||||||
propagatedBuildInputs = [ TextWrapI18N LocaleGettext SGMLSpm UnicodeLineBreak PodParser YAMLTiny ];
|
propagatedBuildInputs = [ TextWrapI18N LocaleGettext SGMLSpm UnicodeLineBreak PodParser YAMLTiny ];
|
||||||
|
|
|
@ -4,6 +4,8 @@ with ocamlPackages; buildDunePackage rec {
|
||||||
pname = "ocaml-top";
|
pname = "ocaml-top";
|
||||||
version = "1.2.0-rc";
|
version = "1.2.0-rc";
|
||||||
|
|
||||||
|
useDune2 = true;
|
||||||
|
|
||||||
src = fetchzip {
|
src = fetchzip {
|
||||||
url = "https://github.com/OCamlPro/ocaml-top/archive/${version}.tar.gz";
|
url = "https://github.com/OCamlPro/ocaml-top/archive/${version}.tar.gz";
|
||||||
sha256 = "1r290m9vvr25lgaanivz05h0kf4fd3h5j61wj4hpp669zffcyyb5";
|
sha256 = "1r290m9vvr25lgaanivz05h0kf4fd3h5j61wj4hpp669zffcyyb5";
|
||||||
|
|
|
@ -4,6 +4,8 @@ buildDunePackage rec {
|
||||||
pname = "ocp-index";
|
pname = "ocp-index";
|
||||||
version = "1.2.1";
|
version = "1.2.1";
|
||||||
|
|
||||||
|
useDune2 = true;
|
||||||
|
|
||||||
src = fetchzip {
|
src = fetchzip {
|
||||||
url = "https://github.com/OCamlPro/ocp-index/archive/${version}.tar.gz";
|
url = "https://github.com/OCamlPro/ocp-index/archive/${version}.tar.gz";
|
||||||
sha256 = "08r7mxdnxmhff37fw4hmrpjgckgi5kaiiiirwp4rmdl594z0h9c8";
|
sha256 = "08r7mxdnxmhff37fw4hmrpjgckgi5kaiiiirwp4rmdl594z0h9c8";
|
||||||
|
|
|
@ -11125,12 +11125,15 @@ in
|
||||||
};
|
};
|
||||||
|
|
||||||
beam = callPackage ./beam-packages.nix { };
|
beam = callPackage ./beam-packages.nix { };
|
||||||
|
beam_nox = callPackage ./beam-packages.nix { wxSupport = false; };
|
||||||
|
|
||||||
inherit (beam.interpreters)
|
inherit (beam.interpreters)
|
||||||
erlang erlangR23 erlangR22 erlangR21 erlangR20 erlangR19 erlangR18
|
erlang erlangR23 erlangR22 erlangR21 erlangR20 erlangR19 erlangR18
|
||||||
erlang_odbc erlang_javac erlang_odbc_javac erlang_nox erlang_basho_R16B02
|
erlang_odbc erlang_javac erlang_odbc_javac erlang_basho_R16B02
|
||||||
elixir elixir_1_11 elixir_1_10 elixir_1_9 elixir_1_8 elixir_1_7;
|
elixir elixir_1_11 elixir_1_10 elixir_1_9 elixir_1_8 elixir_1_7;
|
||||||
|
|
||||||
|
erlang_nox = beam_nox.interpreters.erlang;
|
||||||
|
|
||||||
inherit (beam.packages.erlang)
|
inherit (beam.packages.erlang)
|
||||||
rebar rebar3
|
rebar rebar3
|
||||||
fetchHex beamPackages
|
fetchHex beamPackages
|
||||||
|
@ -18375,7 +18378,7 @@ in
|
||||||
|
|
||||||
rabbitmq-server = callPackage ../servers/amqp/rabbitmq-server {
|
rabbitmq-server = callPackage ../servers/amqp/rabbitmq-server {
|
||||||
inherit (darwin.apple_sdk.frameworks) AppKit Carbon Cocoa;
|
inherit (darwin.apple_sdk.frameworks) AppKit Carbon Cocoa;
|
||||||
elixir = elixir_1_8;
|
elixir = beam_nox.interpreters.elixir_1_8;
|
||||||
erlang = erlang_nox;
|
erlang = erlang_nox;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{ callPackage, wxGTK30, openssl_1_0_2, buildPackages }:
|
{ callPackage, wxGTK30, openssl_1_0_2, buildPackages, wxSupport ? true }:
|
||||||
|
|
||||||
rec {
|
rec {
|
||||||
lib = callPackage ../development/beam-modules/lib.nix { };
|
lib = callPackage ../development/beam-modules/lib.nix { };
|
||||||
|
@ -11,7 +11,6 @@ rec {
|
||||||
erlang_odbc = erlangR23_odbc;
|
erlang_odbc = erlangR23_odbc;
|
||||||
erlang_javac = erlangR23_javac;
|
erlang_javac = erlangR23_javac;
|
||||||
erlang_odbc_javac = erlangR23_odbc_javac;
|
erlang_odbc_javac = erlangR23_odbc_javac;
|
||||||
erlang_nox = erlangR23_nox;
|
|
||||||
|
|
||||||
# Standard Erlang versions, using the generic builder.
|
# Standard Erlang versions, using the generic builder.
|
||||||
|
|
||||||
|
@ -21,6 +20,7 @@ rec {
|
||||||
# Can be enabled since the bug has been fixed in https://github.com/erlang/otp/pull/2508
|
# Can be enabled since the bug has been fixed in https://github.com/erlang/otp/pull/2508
|
||||||
parallelBuild = true;
|
parallelBuild = true;
|
||||||
autoconf = buildPackages.autoconf269;
|
autoconf = buildPackages.autoconf269;
|
||||||
|
inherit wxSupport;
|
||||||
};
|
};
|
||||||
erlangR23_odbc = erlangR23.override { odbcSupport = true; };
|
erlangR23_odbc = erlangR23.override { odbcSupport = true; };
|
||||||
erlangR23_javac = erlangR23.override { javacSupport = true; };
|
erlangR23_javac = erlangR23.override { javacSupport = true; };
|
||||||
|
@ -28,7 +28,6 @@ rec {
|
||||||
javacSupport = true;
|
javacSupport = true;
|
||||||
odbcSupport = true;
|
odbcSupport = true;
|
||||||
};
|
};
|
||||||
erlangR23_nox = erlangR23.override { wxSupport = false; };
|
|
||||||
|
|
||||||
# R22
|
# R22
|
||||||
erlangR22 = lib.callErlang ../development/interpreters/erlang/R22.nix {
|
erlangR22 = lib.callErlang ../development/interpreters/erlang/R22.nix {
|
||||||
|
@ -36,6 +35,7 @@ rec {
|
||||||
# Can be enabled since the bug has been fixed in https://github.com/erlang/otp/pull/2508
|
# Can be enabled since the bug has been fixed in https://github.com/erlang/otp/pull/2508
|
||||||
parallelBuild = true;
|
parallelBuild = true;
|
||||||
autoconf = buildPackages.autoconf269;
|
autoconf = buildPackages.autoconf269;
|
||||||
|
inherit wxSupport;
|
||||||
};
|
};
|
||||||
erlangR22_odbc = erlangR22.override { odbcSupport = true; };
|
erlangR22_odbc = erlangR22.override { odbcSupport = true; };
|
||||||
erlangR22_javac = erlangR22.override { javacSupport = true; };
|
erlangR22_javac = erlangR22.override { javacSupport = true; };
|
||||||
|
@ -43,12 +43,12 @@ rec {
|
||||||
javacSupport = true;
|
javacSupport = true;
|
||||||
odbcSupport = true;
|
odbcSupport = true;
|
||||||
};
|
};
|
||||||
erlangR22_nox = erlangR22.override { wxSupport = false; };
|
|
||||||
|
|
||||||
# R21
|
# R21
|
||||||
erlangR21 = lib.callErlang ../development/interpreters/erlang/R21.nix {
|
erlangR21 = lib.callErlang ../development/interpreters/erlang/R21.nix {
|
||||||
wxGTK = wxGTK30;
|
wxGTK = wxGTK30;
|
||||||
autoconf = buildPackages.autoconf269;
|
autoconf = buildPackages.autoconf269;
|
||||||
|
inherit wxSupport;
|
||||||
};
|
};
|
||||||
erlangR21_odbc = erlangR21.override { odbcSupport = true; };
|
erlangR21_odbc = erlangR21.override { odbcSupport = true; };
|
||||||
erlangR21_javac = erlangR21.override { javacSupport = true; };
|
erlangR21_javac = erlangR21.override { javacSupport = true; };
|
||||||
|
@ -56,12 +56,12 @@ rec {
|
||||||
javacSupport = true;
|
javacSupport = true;
|
||||||
odbcSupport = true;
|
odbcSupport = true;
|
||||||
};
|
};
|
||||||
erlangR21_nox = erlangR21.override { wxSupport = false; };
|
|
||||||
|
|
||||||
# R20
|
# R20
|
||||||
erlangR20 = lib.callErlang ../development/interpreters/erlang/R20.nix {
|
erlangR20 = lib.callErlang ../development/interpreters/erlang/R20.nix {
|
||||||
wxGTK = wxGTK30;
|
wxGTK = wxGTK30;
|
||||||
autoconf = buildPackages.autoconf269;
|
autoconf = buildPackages.autoconf269;
|
||||||
|
inherit wxSupport;
|
||||||
};
|
};
|
||||||
erlangR20_odbc = erlangR20.override { odbcSupport = true; };
|
erlangR20_odbc = erlangR20.override { odbcSupport = true; };
|
||||||
erlangR20_javac = erlangR20.override { javacSupport = true; };
|
erlangR20_javac = erlangR20.override { javacSupport = true; };
|
||||||
|
@ -69,13 +69,13 @@ rec {
|
||||||
javacSupport = true;
|
javacSupport = true;
|
||||||
odbcSupport = true;
|
odbcSupport = true;
|
||||||
};
|
};
|
||||||
erlangR20_nox = erlangR20.override { wxSupport = false; };
|
|
||||||
|
|
||||||
# R19
|
# R19
|
||||||
erlangR19 = lib.callErlang ../development/interpreters/erlang/R19.nix {
|
erlangR19 = lib.callErlang ../development/interpreters/erlang/R19.nix {
|
||||||
wxGTK = wxGTK30;
|
wxGTK = wxGTK30;
|
||||||
openssl = openssl_1_0_2;
|
openssl = openssl_1_0_2;
|
||||||
autoconf = buildPackages.autoconf269;
|
autoconf = buildPackages.autoconf269;
|
||||||
|
inherit wxSupport;
|
||||||
};
|
};
|
||||||
erlangR19_odbc = erlangR19.override { odbcSupport = true; };
|
erlangR19_odbc = erlangR19.override { odbcSupport = true; };
|
||||||
erlangR19_javac = erlangR19.override { javacSupport = true; };
|
erlangR19_javac = erlangR19.override { javacSupport = true; };
|
||||||
|
@ -83,13 +83,13 @@ rec {
|
||||||
javacSupport = true;
|
javacSupport = true;
|
||||||
odbcSupport = true;
|
odbcSupport = true;
|
||||||
};
|
};
|
||||||
erlangR19_nox = erlangR19.override { wxSupport = false; };
|
|
||||||
|
|
||||||
# R18
|
# R18
|
||||||
erlangR18 = lib.callErlang ../development/interpreters/erlang/R18.nix {
|
erlangR18 = lib.callErlang ../development/interpreters/erlang/R18.nix {
|
||||||
wxGTK = wxGTK30;
|
wxGTK = wxGTK30;
|
||||||
openssl = openssl_1_0_2;
|
openssl = openssl_1_0_2;
|
||||||
autoconf = buildPackages.autoconf269;
|
autoconf = buildPackages.autoconf269;
|
||||||
|
inherit wxSupport;
|
||||||
};
|
};
|
||||||
erlangR18_odbc = erlangR18.override { odbcSupport = true; };
|
erlangR18_odbc = erlangR18.override { odbcSupport = true; };
|
||||||
erlangR18_javac = erlangR18.override { javacSupport = true; };
|
erlangR18_javac = erlangR18.override { javacSupport = true; };
|
||||||
|
@ -97,12 +97,12 @@ rec {
|
||||||
javacSupport = true;
|
javacSupport = true;
|
||||||
odbcSupport = true;
|
odbcSupport = true;
|
||||||
};
|
};
|
||||||
erlangR18_nox = erlangR18.override { wxSupport = false; };
|
|
||||||
|
|
||||||
# Basho fork, using custom builder.
|
# Basho fork, using custom builder.
|
||||||
erlang_basho_R16B02 =
|
erlang_basho_R16B02 =
|
||||||
lib.callErlang ../development/interpreters/erlang/R16B02-basho.nix {
|
lib.callErlang ../development/interpreters/erlang/R16B02-basho.nix {
|
||||||
autoconf = buildPackages.autoconf269;
|
autoconf = buildPackages.autoconf269;
|
||||||
|
inherit wxSupport;
|
||||||
};
|
};
|
||||||
erlang_basho_R16B02_odbc =
|
erlang_basho_R16B02_odbc =
|
||||||
erlang_basho_R16B02.override { odbcSupport = true; };
|
erlang_basho_R16B02.override { odbcSupport = true; };
|
||||||
|
|
Loading…
Reference in New Issue