public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
Frederik Rietdijk
2019-07-19 16:33:38 +02:00
parent 4381eef088 663542ad04
commit 0ce55a10d2
127 changed files with 4167 additions and 1404 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/interpreters/elixir/1.9.nix
View File

@@ -1,7 +1,7 @@
{ mkDerivation }:
mkDerivation rec {
version = "1.9.0";
sha256 = "0yfqh07wjgm10v6acn5pw8l8jndjly5kpzgw4harlj81wcaymlsw";
version = "1.9.1";
sha256 = "106s2a3dykc5iwfrd5icqd737yfzaz1dw4x5v1j5z2fvf46h96dx";
minimumOTPVersion = "20";
}

2
pkgs/development/interpreters/erlang/generic-builder.nix
View File

@@ -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 ? ""

4
pkgs/development/interpreters/janet/default.nix
View File

@@ -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 ];