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

Merge staging into staging-next

Browse Source
This commit is contained in:
Frederik Rietdijk
2019-06-09 12:26:34 +02:00
parent 326148ec9b d41c43e4a9
commit 480cd436fc
55 changed files with 475 additions and 214 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6,8 +6,8 @@ assert x11Support -> libX11 != null
&& libSM != null;
let
version = "1.12.12";
sha256 = "1y7mxhkw2shd9mi9s62k81lz8npjkrafapr4fyfms7hs04kg4ilm";
version = "1.12.14";
sha256 = "13aca7gzgl7z1dfdipfs23773w8n6z01d4rj5kmssv4gms8c5ya4";
self = stdenv.mkDerivation {
name = "dbus-${version}";

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

@@ -46,7 +46,7 @@ let
'';
binPrograms = optional (!stdenv.isDarwin) "gapplication" ++ [ "gdbus" "gio" "gsettings" ];
version = "2.60.2";
version = "2.60.3";
in
stdenv.mkDerivation rec {
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://gnome/sources/glib/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "1nc0iyday7866hq0hb78h7lxa44an998lzis8jhgvp8a0rsm9w9f";
sha256 = "1fb0nx9fcmic8rsh0fbp79lqpasfjxljvnshbw2hsya51mb0vaq4";
};
patches = optional stdenv.isDarwin ./darwin-compilation.patch

6
pkgs/development/libraries/harfbuzz/default.nix
View File

@@ -8,7 +8,7 @@
}:
let
version = "2.3.1";
version = "2.5.1";
inherit (stdenv.lib) optional optionals optionalString;
in
@@ -16,8 +16,8 @@ stdenv.mkDerivation {
name = "harfbuzz${optionalString withIcu "-icu"}-${version}";
src = fetchurl {
url = "https://www.freedesktop.org/software/harfbuzz/release/harfbuzz-${version}.tar.bz2";
sha256 = "0s74ramsbfa183rxkidqgfd2vbhrwicnrqzqsq440dwibffnj1gj";
url = "https://www.freedesktop.org/software/harfbuzz/release/harfbuzz-${version}.tar.xz";
sha256 = "17kiyq23g7bnjvyn2yg4gyr7i7qjam65n20whsrplpxxk9bk8j3d";
};
postPatch = ''

16
pkgs/development/libraries/libevent/default.nix
View File

@@ -6,25 +6,13 @@ assert sslSupport -> openssl != null;
stdenv.mkDerivation rec {
name = "libevent-${version}";
version = "2.1.8";
version = "2.1.10";
src = fetchurl {
url = "https://github.com/libevent/libevent/releases/download/release-${version}-stable/libevent-${version}-stable.tar.gz";
sha256 = "1hhxnxlr0fsdv7bdmzsnhdz16fxf3jg2r6vyljcl3kj6pflcap4n";
sha256 = "1c25928gdv495clxk2v1d4gkr5py7ack4gx2n7d13frnld0syr78";
};
#NOTE: Patches to support libressl-2.7. These are taken from libevent upstream, and can both be dropped with the next release.
patches = [
(fetchpatch {
url = "https://github.com/libevent/libevent/commit/22dd14945c25600de3cf8b91000c66703b551e4f.patch";
sha256 = "0fzcb241cp9mm7j6baw22blcglbc083ryigzyjaij8r530av10kd";
})
(fetchpatch {
url = "https://github.com/libevent/libevent/commit/28b8075400c70b2d2da2ce07e590c2ec6d11783d.patch";
sha256 = "0dkzlk44033xksg2iq5w90r3lnziwl1mgz291nzqq906zrya0sdb";
})
];
# libevent_openssl is moved into its own output, so that openssl isn't present
# in the default closure.
outputs = [ "out" "dev" ]

5
pkgs/development/libraries/libical/default.nix
View File

@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
name = "libical-${version}";
version = "3.0.4";
outputs = [ "out" "dev" "devdoc" ];
outputs = [ "out" "dev" ]; #"devdoc" ];
src = fetchFromGitHub {
owner = "libical";
@@ -17,7 +17,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
perl pkgconfig cmake ninja vala gobject-introspection
(python3.withPackages (pkgs: with pkgs; [ pygobject3 ])) # running libical-glib tests
gtk-doc docbook_xsl docbook_xml_dtd_43 # docs
# Docs building fails: https://github.com/NixOS/nixpkgs/pull/61657#issuecomment-495579489
# gtk-doc docbook_xsl docbook_xml_dtd_43 # docs
];
buildInputs = [ glib libxml2 icu ];

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

@@ -4,11 +4,11 @@ with stdenv.lib;
stdenv.mkDerivation rec {
name = "libidn2-${version}";
version = "2.1.1a";
version = "2.2.0";
src = fetchurl {
url = "mirror://gnu/gnu/libidn/${name}.tar.gz";
sha256 = "0wlb0jrkccsdxlx90wx6ax5raqcm6y9c75dcgc6j6m6gdv7nnrjp";
sha256 = "1zl1cc2xgxw31pdhvhr5ij36x4vvpy16jq667rspin06nlr4fwzw";
};
outputs = [ "bin" "dev" "out" "info" "devdoc" ];

8
pkgs/development/libraries/libnftnl/default.nix
View File

@@ -1,12 +1,12 @@
{ stdenv, fetchurl, pkgconfig, libmnl }:
stdenv.mkDerivation rec {
version = "1.1.2";
name = "libnftnl-${version}";
version = "1.1.3";
pname = "libnftnl";
src = fetchurl {
url = "https://netfilter.org/projects/libnftnl/files/${name}.tar.bz2";
sha256 = "0pffmsv41alsn5ac7mwnb9fh3qpwzqk13jrzn6c5i71wq6kbgix5";
url = "https://netfilter.org/projects/${pname}/files/${pname}-${version}.tar.bz2";
sha256 = "03xszkcpqk3s1rqc6vh7g5j13kh3d3yjnvjhk5scds3an39rgp92";
};
nativeBuildInputs = [ pkgconfig ];

2
pkgs/development/libraries/libpsl/default.nix
View File

@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
configureFlags = [
"--disable-static"
"--enable-gtk-doc"
# "--enable-gtk-doc"
"--enable-man"
"--enable-valgrind-tests"
"--with-psl-distfile=${publicsuffix-list}/share/publicsuffix/public_suffix_list.dat"

6
pkgs/development/libraries/librime/default.nix
View File

@@ -2,14 +2,14 @@
libyamlcpp, gmock }:
stdenv.mkDerivation rec {
name = "librime-${version}";
version = "1.4.0";
pname = "librime";
version = "1.5.0";
src = fetchFromGitHub {
owner = "rime";
repo = "librime";
rev = "${version}";
sha256 = "1zkx1wfbd94v55gfycyd2b94jxclfyk2zl7yw35pyjx63qdlb6sd";
sha256 = "10wvh1l4317yzcys4rzlkw42i6cj5p8g62r1xzyjw32ky2d0ndxl";
};
nativeBuildInputs = [ cmake ];

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

@@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "libsodium-1.0.17";
name = "libsodium-1.0.18";
src = fetchurl {
url = "https://download.libsodium.org/libsodium/releases/${name}.tar.gz";
sha256 = "1cf2d9v1gylz1qcy2zappbf526qfmph6gd6fnn3w2b347vixmhqc";
sha256 = "1h9ncvj23qbbni958knzsli8dvybcswcjbx0qjjgi922nf848l3g";
};
outputs = [ "out" "dev" ];

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

@@ -1,14 +1,14 @@
{ stdenv, lib, fetchpatch, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, ApplicationServices, CoreServices }:
stdenv.mkDerivation rec {
version = "1.28.0";
version = "1.29.1";
pname = "libuv";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "0l0gx69sdy3sv3pirjbca2ws54n9d83mj0j96h77k0ncywimvi64";
sha256 = "0scnircr6khgh7l3bw9zyfzdgx2c11mpfhd9d8qlw47arrvqg7l8";
};
postPatch = let

12
pkgs/development/libraries/mesa/default.nix
View File

@@ -2,7 +2,7 @@
, pkgconfig, intltool, autoreconfHook
, file, expat, libdrm, xorg, wayland, wayland-protocols, openssl
, llvmPackages, libffi, libomxil-bellagio, libva-minimal
, libelf, libvdpau, valgrind-light, python2, python2Packages
, libelf, libvdpau, python2, python2Packages
, libglvnd
, enableRadv ? true
, galliumDrivers ? null
@@ -10,6 +10,7 @@
, vulkanDrivers ? null
, eglPlatforms ? [ "x11" ] ++ lib.optionals stdenv.isLinux [ "wayland" "drm" ]
, OpenGL, Xplugin
, withValgrind ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAarch32, valgrind-light
}:
/** Packaging design:
@@ -25,10 +26,6 @@
with stdenv.lib;
if ! elem stdenv.hostPlatform.system platforms.mesaPlatforms then
throw "${stdenv.system}: unsupported platform for Mesa"
else
let
# platforms that have PCIe slots and thus can use most non-integrated GPUs
pciePlatform = !stdenv.hostPlatform.isAarch32 && !stdenv.hostPlatform.isAarch64;
@@ -150,7 +147,8 @@ let self = stdenv.mkDerivation {
libffi libvdpau libelf libXvMC
libpthreadstubs openssl /*or another sha1 provider*/
] ++ lib.optionals (elem "wayland" eglPlatforms) [ wayland wayland-protocols ]
++ lib.optionals stdenv.isLinux [ valgrind-light libomxil-bellagio libva-minimal ];
++ lib.optionals stdenv.isLinux [ libomxil-bellagio libva-minimal ]
++ lib.optional withValgrind valgrind-light;
enableParallelBuilding = true;
doCheck = false;
@@ -273,7 +271,7 @@ let self = stdenv.mkDerivation {
description = "An open source implementation of OpenGL";
homepage = https://www.mesa3d.org/;
license = licenses.mit; # X11 variant, in most files
platforms = platforms.linux ++ platforms.darwin;
platforms = platforms.mesaPlatforms;
maintainers = with maintainers; [ vcunat ];
};
};

7
pkgs/development/libraries/newt/default.nix
View File

@@ -1,11 +1,12 @@
{ fetchurl, stdenv, slang, popt }:
stdenv.mkDerivation rec {
name = "newt-0.52.20";
pname = "newt";
version = "0.52.21";
src = fetchurl {
url = "https://fedorahosted.org/releases/n/e/newt/${name}.tar.gz";
sha256 = "1g3dpfnvaw7vljbr7nzq1rl88d6r8cmrvvng9inphgzwxxmvlrld";
url = "https://fedorahosted.org/releases/n/e/${pname}/${pname}-${version}.tar.gz";
sha256 = "0cdvbancr7y4nrj8257y5n45hmhizr8isynagy4fpsnpammv8pi6";
};
patchPhase = ''

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

@@ -120,8 +120,8 @@ let
in {
openssl_1_0_2 = common {
version = "1.0.2r";
sha256 = "1mnh27zf6r1bhm5d9fxqq9slv2gz0d9z2ij9i679b0wapa5x0ldf";
version = "1.0.2s";
sha256 = "15mbmg8hf7s12vr3v2bdc0pi9y4pdbnsxhzk4fyyap42jaa5rgfa";
patches = [
./1.0.2/nix-ssl-cert-file.patch
@@ -132,15 +132,10 @@ in {
};
openssl_1_1 = common {
version = "1.1.1b";
sha256 = "0jza8cmznnyiia43056dij1jdmz62dx17wsn0zxksh9h6817nmaw";
version = "1.1.1c";
sha256 = "142c7zdlz06hjrrvinb9f276czc78bnkyhd9xma621qmmmwk1yzn";
patches = [
./1.1/nix-ssl-cert-file.patch
(fetchurl {
name = "long-chacha-nonce.patch";
url = "https://git.openssl.org/gitweb/?p=openssl.git;a=commitdiff_plain;h=f426625b6ae9a7831010750490a5f0ad689c5ba3";
sha256= "02ghqg3vzmzx3s1dwwwbm1p1l4asaiampyg4k9vfrjwficvgpdgp";
})
(if stdenv.hostPlatform.isDarwin
then ./1.1/use-etc-ssl-certs-darwin.patch