diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-07-19 16:33:38 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-07-19 16:33:38 +0200 |
| commit | 0ce55a10d2158fbfd373d1f0ccdc672ebf8cd9c8 (patch) | |
| tree | cce584126eb4226909b2aad8d2c18203e312f5f4 /pkgs/development/interpreters | |
| parent | 4381eef088d50f4fb0ca92b7043ff4200c07f9e5 (diff) | |
| parent | 663542ad0483131e8c36742283191a8f40a7363d (diff) | |
| download | nixlib-0ce55a10d2158fbfd373d1f0ccdc672ebf8cd9c8.tar nixlib-0ce55a10d2158fbfd373d1f0ccdc672ebf8cd9c8.tar.gz nixlib-0ce55a10d2158fbfd373d1f0ccdc672ebf8cd9c8.tar.bz2 nixlib-0ce55a10d2158fbfd373d1f0ccdc672ebf8cd9c8.tar.lz nixlib-0ce55a10d2158fbfd373d1f0ccdc672ebf8cd9c8.tar.xz nixlib-0ce55a10d2158fbfd373d1f0ccdc672ebf8cd9c8.tar.zst nixlib-0ce55a10d2158fbfd373d1f0ccdc672ebf8cd9c8.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/interpreters')
| -rw-r--r-- | pkgs/development/interpreters/elixir/1.9.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/interpreters/erlang/generic-builder.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/interpreters/janet/default.nix | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/development/interpreters/elixir/1.9.nix b/pkgs/development/interpreters/elixir/1.9.nix index 622f2343c6e1..41601eeaa118 100644 --- a/pkgs/development/interpreters/elixir/1.9.nix +++ b/pkgs/development/interpreters/elixir/1.9.nix @@ -1,7 +1,7 @@ { mkDerivation }: mkDerivation rec { - version = "1.9.0"; - sha256 = "0yfqh07wjgm10v6acn5pw8l8jndjly5kpzgw4harlj81wcaymlsw"; + version = "1.9.1"; + sha256 = "106s2a3dykc5iwfrd5icqd737yfzaz1dw4x5v1j5z2fvf46h96dx"; minimumOTPVersion = "20"; } diff --git a/pkgs/development/interpreters/erlang/generic-builder.nix b/pkgs/development/interpreters/erlang/generic-builder.nix index a795741869fc..3f1c21cc8819 100644 --- a/pkgs/development/interpreters/erlang/generic-builder.nix +++ b/pkgs/development/interpreters/erlang/generic-builder.nix @@ -18,7 +18,7 @@ , enableKernelPoll ? true , javacSupport ? false, javacPackages ? [ openjdk ] , odbcSupport ? false, odbcPackages ? [ unixODBC ] -, wxSupport ? !stdenv.isDarwin, wxPackages ? [ libGLU_combined wxGTK xorg.libX11 ] +, wxSupport ? true, wxPackages ? [ libGLU_combined wxGTK xorg.libX11 ] , preUnpack ? "", postUnpack ? "" , patches ? [], patchPhase ? "", prePatch ? "", postPatch ? "" , configureFlags ? [], configurePhase ? "", preConfigure ? "", postConfigure ? "" diff --git a/pkgs/development/interpreters/janet/default.nix b/pkgs/development/interpreters/janet/default.nix index 546b2123826d..219b8e2758aa 100644 --- a/pkgs/development/interpreters/janet/default.nix +++ b/pkgs/development/interpreters/janet/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "janet"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "janet-lang"; repo = pname; rev = "v${version}"; - sha256 = "1n91xsq9c3x99pb3a964873kksavs223hhy62l8yiylbl81b8vix"; + sha256 = "0ncyg594fixvvkgk0k89b40v9hy36lcr2gniks3ac6cyqy2iixx5"; }; nativeBuildInputs = [ meson ninja ]; |