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

Merge branch 'master' into staging

Browse Source
This commit is contained in:
Vladimír Čunát
2017-01-04 23:20:27 +01:00
parent a3018650a3 000fb9be33
commit ea7b252c9a
29 changed files with 1375 additions and 1156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/compilers/glslang/default.nix
View File

@@ -21,5 +21,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
inherit (src.meta) homepage;
description = "Khronos reference front-end for GLSL and ESSL";
license = licenses.asl20;
platforms = platforms.linux;
};
}

3
pkgs/development/haskell-modules/configuration-common.nix
View File

@@ -42,7 +42,8 @@ self: super: {
Lazy-Pbkdf2 = if pkgs.stdenv.isi686 then dontCheck super.Lazy-Pbkdf2 else super.Lazy-Pbkdf2;
# Use the default version of mysql to build this package (which is actually mariadb).
mysql = super.mysql.override { mysql = pkgs.mysql.lib; };
# test phase requires networking
mysql = dontCheck (super.mysql.override { mysql = pkgs.mysql.lib; });
# Link the proper version.
zeromq4-haskell = super.zeromq4-haskell.override { zeromq = pkgs.zeromq4; };

1
pkgs/development/haskell-modules/configuration-hackage2nix.yaml
View File

@@ -5741,7 +5741,6 @@ dont-distribute-packages:
mysql-simple-quasi: [ i686-linux, x86_64-linux, x86_64-darwin ]
mysql-simple-typed: [ i686-linux, x86_64-linux, x86_64-darwin ]
mysql-simple: [ i686-linux, x86_64-linux, x86_64-darwin ]
mysql: [ i686-linux, x86_64-linux, x86_64-darwin ]
mystem: [ i686-linux, x86_64-linux, x86_64-darwin ]
myTestlll: [ i686-linux, x86_64-linux, x86_64-darwin ]
mywatch: [ i686-linux, x86_64-linux, x86_64-darwin ]

13
pkgs/development/libraries/libbrotli/default.nix
View File

@@ -1,17 +1,18 @@
{stdenv, fetchFromGitHub, autoconf, automake, libtool, brotliUnstable}:
{ stdenv, fetchFromGitHub, autoconf, automake, libtool, brotliUnstable }:
stdenv.mkDerivation rec {
name = "libbrotli-20160120";
version = "53d53e8";
name = "libbrotli-${version}";
version = "1.0";
src = fetchFromGitHub {
owner = "bagder";
repo = "libbrotli";
rev = "53d53e8d9c0d37398d37bac2e7a7aa20b0025e9e";
sha256 = "10r4nx6n1r54f5cjck5mmmsj7bkasnmmz7m84imhil45q73kzd4m";
rev = name;
sha256 = "0apd3hpy3vaa7brkv8v0xwz05zbd5xv86rcbkwns4x39klba3m3y";
};
buildInputs = [autoconf automake libtool];
nativeBuildInputs = [ autoconf automake libtool ];
preConfigure = ''
cp -r ${brotliUnstable.src}/* brotli/
chmod -R +700 brotli

4
pkgs/development/libraries/libvncserver/default.nix
View File

@@ -1,7 +1,7 @@
{stdenv, fetchurl,
libtool, libjpeg, openssl, libX11, libXdamage, xproto, damageproto,
xextproto, libXext, fixesproto, libXfixes, xineramaproto, libXinerama,
libXrandr, randrproto, libXtst, zlib
libXrandr, randrproto, libXtst, zlib, libgcrypt
}:
assert stdenv.isLinux;
@@ -19,7 +19,7 @@ let
buildInputs = [
libtool libjpeg openssl libX11 libXdamage xproto damageproto
xextproto libXext fixesproto libXfixes xineramaproto libXinerama
libXrandr randrproto libXtst zlib
libXrandr randrproto libXtst zlib libgcrypt
];
in
stdenv.mkDerivation {

3
pkgs/development/libraries/vulkan-loader/default.nix
View File

@@ -63,7 +63,8 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "LunarG Vulkan loader";
homepage = http://www.lunarg.com;
homepage = "http://www.lunarg.com";
platforms = platforms.linux;
license = licenses.asl20;
};
}

4
pkgs/development/tools/spirv-tools/default.nix
View File

@@ -37,6 +37,8 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
inherit (src.meta) homepage;
description = "The SPIR-V Tools project provides an API and commands for processing SPIR-V modules.";
description = "The SPIR-V Tools project provides an API and commands for processing SPIR-V modules";
license = licenses.asl20;
platforms = platforms.linux;
};
}