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

Merge staging-next into master

Browse Source
This commit is contained in:
Frederik Rietdijk
2018-07-22 11:04:28 +02:00
parent b21994d4ac 452017032a
commit 6c72782d36
60 changed files with 339 additions and 455 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
name = "accountsservice-${version}";
version = "0.6.49";
version = "0.6.50";
src = fetchurl {
url = "https://www.freedesktop.org/software/accountsservice/accountsservice-${version}.tar.xz";
sha256 = "032ndvs18gla49dvc9vg35cwczg0wpv2wscp1m3yjfdqdpams7i5";
sha256 = "0jn7vg1z4vxnna0hl33hbcb4bb3zpilxc2vyclh24vx4vvsjhn83";
};
nativeBuildInputs = [ pkgconfig makeWrapper ];

8
pkgs/development/libraries/gdk-pixbuf/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, fetchgit, fetchpatch, fixDarwinDylibNames, meson, ninja, pkgconfig, gettext, python3, libxml2, libxslt, docbook_xsl
{ stdenv, fetchurl, fetchFromGitLab, fetchpatch, fixDarwinDylibNames, meson, ninja, pkgconfig, gettext, python3, libxml2, libxslt, docbook_xsl
, docbook_xml_dtd_43, gtk-doc, glib, libtiff, libjpeg, libpng, libX11, gnome3
, jasper, gobjectIntrospection, doCheck ? false, makeWrapper }:
@@ -14,8 +14,10 @@ stdenv.mkDerivation rec {
# url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
# sha256 = "0d534ysa6n9prd17wwzisq7mj6qkhwh8wcf8qgin1ar3hbs5ry7z";
# };
src = fetchgit {
url = https://gitlab.gnome.org/GNOME/gdk-pixbuf.git;
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "GNOME";
repo = "gdk-pixbuf";
rev = version;
sha256 = "18lwqg63vyap2m1mw049rnb8fm869429xbf7636a2n21gs3d3jwv";
};

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

@@ -5,7 +5,7 @@
}:
let
version = "1.8.1";
version = "1.8.2";
inherit (stdenv.lib) optional optionals optionalString;
in
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "https://www.freedesktop.org/software/harfbuzz/release/harfbuzz-${version}.tar.bz2";
sha256 = "0ifzhqbg4p6ka7ps5c7lapix09i9yy4z7achc1gf91dhvn967vgv";
sha256 = "0my6m9aqv4a8fc2pjwqx9pfdfh3a9mqvas4si4psi1b1867zi8y8";
};
outputs = [ "out" "dev" ];

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

@@ -32,7 +32,6 @@ stdenv.mkDerivation rec {
"--enable-pc-files"
"--enable-symlinks"
] ++ lib.optional unicode "--enable-widec"
++ lib.optional enableStatic "--enable-static"
++ lib.optional (!withCxx) "--without-cxx"
++ lib.optional (abiVersion == "5") "--with-abi-version=5"
++ lib.optionals hostPlatform.isWindows [
@@ -113,6 +112,11 @@ stdenv.mkDerivation rec {
for statictype in a dll.a la; do
if [ -e "$out/lib/lib''${library}$suffix.$statictype" ]; then
ln -svf lib''${library}$suffix.$statictype $out/lib/lib$library$newsuffix.$statictype
if [ "ncurses" = "$library" ]
then
# make libtinfo symlinks
ln -svf lib''${library}$suffix.$statictype $out/lib/libtinfo$newsuffix.$statictype
fi
fi
done
ln -svf ''${library}$suffix.pc $dev/lib/pkgconfig/$library$newsuffix.pc
@@ -131,7 +135,7 @@ stdenv.mkDerivation rec {
moveToOutput "bin/infotocap" "$out"
'';
preFixup = lib.optionalString (!hostPlatform.isCygwin) ''
preFixup = lib.optionalString (!hostPlatform.isCygwin && !enableStatic) ''
rm "$out"/lib/*.a
'';

17
pkgs/development/libraries/pango/default.nix
View File

@@ -1,19 +1,19 @@
{ stdenv, fetchurl, pkgconfig, libXft, cairo, harfbuzz
, libintl, gobjectIntrospection, darwin
, libintl, gobjectIntrospection, darwin, fribidi
}:
with stdenv.lib;
let
ver_maj = "1.40";
ver_min = "14";
ver_maj = "1.42";
ver_min = "1";
in
stdenv.mkDerivation rec {
name = "pango-${ver_maj}.${ver_min}";
src = fetchurl {
url = "mirror://gnome/sources/pango/${ver_maj}/${name}.tar.xz";
sha256 = "90af1beaa7bf9e4c52db29ec251ec4fd0a8f2cc185d521ad1f88d01b3a6a17e3";
sha256 = "0cnfgcya3wbs9m8g44cl5ww6wbp6qbw96qvsgkr8ymwqn9b6fnli";
};
outputs = [ "bin" "dev" "out" "devdoc" ];
@@ -25,17 +25,10 @@ stdenv.mkDerivation rec {
CoreGraphics
CoreText
]);
propagatedBuildInputs = [ cairo harfbuzz libXft libintl ];
propagatedBuildInputs = [ cairo harfbuzz libXft libintl fribidi ];
enableParallelBuilding = true;
doCheck = false; # test-layout fails on 1.40.3 (fails to find font config)
# jww (2014-05-05): The tests currently fail on Darwin:
#
# ERROR:testiter.c:139:iter_char_test: assertion failed: (extents.width == x1 - x0)
# .../bin/sh: line 5: 14823 Abort trap: 6 srcdir=. PANGO_RC_FILE=./pangorc ${dir}$tst
# FAIL: testiter
configureFlags = optional stdenv.isDarwin "--without-x";
meta = with stdenv.lib; {

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

@@ -9,7 +9,7 @@ with stdenv.lib;
assert elem variant [ null "cpp" "pcre16" "pcre32" ];
let
version = "8.41";
version = "8.42";
pname = if (variant == null) then "pcre"
else if (variant == "cpp") then "pcre-cpp"
else variant;
@@ -19,7 +19,7 @@ in stdenv.mkDerivation rec {
src = fetchurl {
url = "ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-${version}.tar.bz2";
sha256 = "0c5m469p5pd7jip621ipq6hbgh7128lzh7xndllfgh77ban7wb76";
sha256 = "00ckpzlgyr16bnqx8fawa3afjgqxw5yxgs2l081vw23qi1y4pl1c";
};
outputs = [ "bin" "dev" "out" "doc" "man" ];

26
pkgs/development/libraries/science/math/openblas/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, gfortran, perl, which, coreutils
{ stdenv, fetchFromGitHub, fetchpatch, gfortran, perl, which, config, coreutils
# Most packages depending on openblas expect integer width to match
# pointer width, but some expect to use 32-bit integers always
# (for compatibility with reference BLAS).
@@ -80,10 +80,11 @@ in
stdenv.mkDerivation rec {
name = "openblas-${version}";
version = "0.3.1";
src = fetchurl {
url = "https://github.com/xianyi/OpenBLAS/archive/v${version}.tar.gz";
sha256 = "0czbs2afmcxxij1ivqrm04p0qcksg5fravjifhydvb7k6mpraphz";
name = "openblas-${version}.tar.gz";
src = fetchFromGitHub {
owner = "xianyi";
repo = "OpenBLAS";
rev = "v${version}";
sha256 = "1dkwp4gz1hzpmhzks9y9ipb4c5h0r6c7yff62x3s8x9z6f8knaqc";
};
inherit blas64;
@@ -117,7 +118,20 @@ stdenv.mkDerivation rec {
] ++ stdenv.lib.optional (stdenv.hostPlatform.libc == "musl") "NO_AFFINITY=1"
++ mapAttrsToList (var: val: var + "=" + val) config;
patches = []; # TODO: Remove on next mass-rebuild
patches = [
# Backport of https://github.com/xianyi/OpenBLAS/pull/1667, which
# is causing problems and was already accepted upstream.
(fetchpatch {
url = "https://github.com/xianyi/OpenBLAS/commit/5f2a3c05cd0e3872be3c5686b9da6b627658eeb7.patch";
sha256 = "1qvxhk92likrshw6z6hjqxvkblwzgsbzis2b2f71bsvx9174qfk1";
})
# Double "MAX_ALLOCATING_THREADS", fix with Go and Octave
# https://github.com/xianyi/OpenBLAS/pull/1663 (see also linked issue)
(fetchpatch {
url = "https://github.com/xianyi/OpenBLAS/commit/a49203b48c4a3d6f86413fc8c4b1fbfaa1946463.patch";
sha256 = "0v6kjkbgbw7hli6xkism48wqpkypxmcqvxpx564snll049l2xzq2";
})
];
doCheck = true;
checkTarget = "tests";

4
pkgs/development/libraries/wayland/protocols.nix
View File

@@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
name = "wayland-protocols-${version}";
version = "1.14";
version = "1.15";
src = fetchurl {
url = "https://wayland.freedesktop.org/releases/${name}.tar.xz";
sha256 = "1xknjcfhqvdi1s4iq4kk1q61fg2rar3g8q4vlqarpd324imqjj4n";
sha256 = "1qlyf9cllr2p339xxplznh023qcwj5iisp02ikx7ps349dx75fys";
};
nativeBuildInputs = [ pkgconfig ];