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

Merge #30371: update misc. gnome3-related libraries

Browse Source
This commit is contained in:
Vladimír Čunát 2017-11-06 13:00:15 +01:00
commit bc90fe1fbb
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
68 changed files with 424 additions and 295 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/desktops/gnome-3/apps/nautilus-sendto/default.nix
View File

@ -1,18 +1,17 @@
{ stdenv, fetchurl, glib, pkgconfig, gnome3, intltool
, gobjectIntrospection, makeWrapper }:
{ stdenv, fetchurl, meson, ninja, glib, pkgconfig, gnome3, appstream-glib, gettext }:
stdenv.mkDerivation rec {
name = "nautilus-sendto-${version}";
version = "3.8.1";
version = "3.8.6";
src = fetchurl {
url = "mirror://gnome/sources/nautilus-sendto/3.8/${name}.tar.xz";
sha256 = "03fa46bff271acdbdedab6243b2a84e5ed3daa19c81b69d087b3e852c8fe5dab";
sha256 = "164d7c6e8bae29c4579bcc67a7bf50d783662b1545b62f3008e7ea3c0410e04d";
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ glib gobjectIntrospection intltool makeWrapper ];
nativeBuildInputs = [ meson ninja pkgconfig appstream-glib gettext ];
buildInputs = [ glib ];
meta = with stdenv.lib; {
description = "Integrates Evolution and Pidgin into the Nautilus file manager";

7
pkgs/desktops/gnome-3/core/dconf/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, vala_0_32, libxslt, pkgconfig, glib, dbus_glib, gnome3
{ stdenv, fetchurl, vala, libxslt, pkgconfig, glib, dbus_glib, gnome3
, libxml2, intltool, docbook_xsl_ns, docbook_xsl, makeWrapper }:
let
@ -15,9 +15,8 @@ stdenv.mkDerivation rec {
outputs = [ "out" "lib" "dev" ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ vala_0_32 libxslt glib dbus_glib gnome3.gtk libxml2
intltool docbook_xsl docbook_xsl_ns makeWrapper ];
nativeBuildInputs = [ vala pkgconfig intltool libxslt libxml2 docbook_xsl docbook_xsl_ns makeWrapper ];
buildInputs = [ glib dbus_glib ];
postConfigure = stdenv.lib.optionalString stdenv.isDarwin ''
substituteInPlace client/Makefile \

4
pkgs/desktops/gnome-3/core/folks/default.nix
View File

@ -8,11 +8,11 @@ let
majorVersion = "0.11";
in
stdenv.mkDerivation rec {
name = "folks-${majorVersion}.3";
name = "folks-${majorVersion}.4";
src = fetchurl {
url = "mirror://gnome/sources/folks/${majorVersion}/${name}.tar.xz";
sha256 = "2a2828a7c87fd39e5786f8f2cf0ebe47576a74974f1355c478a6dc747d7bcb64";
sha256 = "16hqh2gxlbx0b0hgq216hndr1m72vj54jvryzii9zqkk0g9kxc57";
};
propagatedBuildInputs = [ glib gnome3.libgee sqlite ];

4
pkgs/desktops/gnome-3/core/grilo-plugins/default.nix
View File

@ -4,12 +4,12 @@
stdenv.mkDerivation rec {
major = "0.3";
minor = "3";
minor = "5";
name = "grilo-plugins-${major}.${minor}";
src = fetchurl {
url = "mirror://gnome/sources/grilo-plugins/${major}/${name}.tar.xz";
sha256 = "fe66e887847fef9c361bcb7226047c43b2bc22b172aaf22afd5534947cc85b9c";
sha256 = "1yv8a0mfd5qmdbdrnd0is5c51s1mvibhw61na99iagnbirxq4xr9";
};
installFlags = [ "GRL_PLUGINS_DIR=$(out)/lib/grilo-${major}" ];

4
pkgs/desktops/gnome-3/core/grilo/default.nix
View File

@ -3,12 +3,12 @@
stdenv.mkDerivation rec {
major = "0.3"; # if you change this, also change ./setup-hook.sh
minor = "3";
minor = "4";
name = "grilo-${major}.${minor}";
src = fetchurl {
url = "mirror://gnome/sources/grilo/${major}/${name}.tar.xz";
sha256 = "1qx072m0gl6m3d5g5cbbf13p4h217icmlxjnrn829x5xqwi451sw";
sha256 = "0vh67gja6yn7czh77ssmx6ncp99fl2926pbi2hplqms27c2n8sbw";
};
setupHook = ./setup-hook.sh;

4
pkgs/desktops/gnome-3/core/libgdata/default.nix
View File

@ -5,11 +5,11 @@ let
majorVersion = "0.17";
in
stdenv.mkDerivation rec {
name = "libgdata-${majorVersion}.6";
name = "libgdata-${majorVersion}.9";
src = fetchurl {
url = "mirror://gnome/sources/libgdata/${majorVersion}/${name}.tar.xz";
sha256 = "8b6a3ff1db23bd9e5ebbcc958b29b769a898f892eed4798222d562ba69df30b0";
sha256 = "0fj54yqxdapdppisqm1xcyrpgcichdmipq0a0spzz6009ikzgi45";
};
NIX_CFLAGS_COMPILE = "-I${gnome3.libsoup.dev}/include/libsoup-gnome-2.4/ -I${gnome3.gcr}/include/gcr-3 -I${gnome3.gcr}/include/gck-1";

19
pkgs/desktops/gnome-3/core/libgxps/default.nix
View File

@ -1,20 +1,23 @@
{ stdenv, fetchurl, pkgconfig, glib, cairo, libarchive, freetype, libjpeg, libtiff
, openssl, bzip2, acl, attr, libxml2
{ stdenv, fetchurl, meson, ninja, pkgconfig, glib, gobjectIntrospection, cairo
, libarchive, freetype, libjpeg, libtiff
}:
stdenv.mkDerivation rec {
name = "libgxps-0.2.2";
name = "libgxps-0.3.0";
src = fetchurl {
url = "http://ftp.acc.umu.se/pub/GNOME/core/3.10/3.10.2/sources/${name}.tar.xz";
sha256 = "1gi0b0x0354jyqc48vspk2hg2q1403cf2p9ibj847nzhkdrh9l9r";
url = "mirror://gnome/sources/libgxps/0.3/${name}.tar.xz";
sha256 = "412b1343bd31fee41f7204c47514d34c563ae34dafa4cc710897366bd6cd0fae";
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ glib cairo freetype libjpeg libtiff acl openssl bzip2 attr libxml2 ];
nativeBuildInputs = [ meson ninja pkgconfig gobjectIntrospection ];
buildInputs = [ glib cairo freetype libjpeg libtiff ];
propagatedBuildInputs = [ libarchive ];
configureFlags = "--without-liblcms2";
mesonFlags = [
"-Denable-test=false"
"-Dwith-liblcms2=false"
];
meta = with stdenv.lib; {
platforms = platforms.linux;

4
pkgs/desktops/gnome-3/core/libpeas/src.nix
View File

@ -1,13 +1,13 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: rec {
major = "1.18";
major = "1.22";
minor = "0";
version = "${major}.${minor}";
name = "libpeas-${version}";
src = fetchurl {
url = "mirror://gnome/sources/libpeas/${major}/${name}.tar.xz";
sha256 = "09jy2rwwgp0xx7cnypxl56m7zzxnj3j4v58xqjxjasf3chn88jdz";
sha256 = "0qm908kisyjzjxvygdl18hjqxvvgkq9w0phs2g55pck277sw0bsv";
};
}

1
pkgs/desktops/gnome-3/core/libzapojit/default.nix
View File

@ -12,6 +12,7 @@ stdenv.mkDerivation rec {
buildInputs = [ glib intltool json_glib rest libsoup gtk gnome_online_accounts ];
meta = with stdenv.lib; {
description = "GObject wrapper for the SkyDrive and Hotmail REST APIs";
platforms = platforms.linux;
};
}

37
pkgs/desktops/gnome-3/core/mutter/default.nix
View File

@ -1,7 +1,7 @@
{ fetchurl, stdenv, pkgconfig, gnome3, intltool, gobjectIntrospection, upower, cairo
{ fetchurl, fetchpatch, stdenv, pkgconfig, gnome3, intltool, gobjectIntrospection, upower, cairo
, pango, cogl, clutter, libstartup_notification, libcanberra_gtk2, zenity, libcanberra_gtk3
, libtool, makeWrapper, xkeyboard_config, libxkbfile, libxkbcommon, libXtst, libudev, libinput
, libgudev, xwayland }:
, libgudev, libwacom, xwayland, autoreconfHook }:
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
@ -9,29 +9,46 @@ stdenv.mkDerivation rec {
# fatal error: gio/gunixfdlist.h: No such file or directory
NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0 -Wno-error=format -Wno-error=sign-compare";
configureFlags = "--with-x --disable-static --enable-shape --enable-sm --enable-startup-notification --enable-xsync --enable-verbose-mode --with-libcanberra --with-xwayland-path=${xwayland}/bin/Xwayland";
configureFlags = [
"--with-x"
"--disable-static"
"--enable-shape"
"--enable-sm"
"--enable-startup-notification"
"--enable-xsync"
"--enable-verbose-mode"
"--with-libcanberra"
"--with-xwayland-path=${xwayland}/bin/Xwayland"
];
propagatedBuildInputs = [
# required for pkgconfig to detect mutter-clutter
libXtst
];
nativeBuildInputs = [ autoreconfHook pkgconfig intltool libtool makeWrapper ];
buildInputs = with gnome3;
[ pkgconfig intltool glib gobjectIntrospection gtk gsettings_desktop_schemas upower
[ glib gobjectIntrospection gtk gsettings_desktop_schemas upower
gnome_desktop cairo pango cogl clutter zenity libstartup_notification libcanberra_gtk2
gnome3.geocode_glib libudev libinput libgudev
libcanberra_gtk3 zenity libtool makeWrapper xkeyboard_config libxkbfile
gnome3.geocode_glib libudev libinput libgudev libwacom
libcanberra_gtk3 zenity xkeyboard_config libxkbfile
libxkbcommon ];
patches = [
# https://bugzilla.gnome.org/show_bug.cgi?id=760670
(fetchpatch {
name = "libgudev-232.patch";
url = https://bugzilla.gnome.org/attachment.cgi?id=358904;
sha256 = "0chvd7g9f2zp3a0gdhvinsfvp2h10rwb6a8ja386vsrl93ac8pix";
})
];
preFixup = ''
wrapProgram "$out/bin/mutter" \
--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
'';
patches = [
./x86.patch # ./math.patch
];
enableParallelBuilding = true;
meta = with stdenv.lib; {

10
pkgs/desktops/gnome-3/core/mutter/math.patch
View File

@ -1,10 +0,0 @@
--- mutter-3.18.0/src/backends/meta-cursor-renderer.c.orig 2015-09-23 13:54:31.297523343 +0200
+++ mutter-3.18.0/src/backends/meta-cursor-renderer.c 2015-09-23 13:54:43.728271766 +0200
@@ -31,6 +31,7 @@
#include <cogl/cogl.h>
#include <clutter/clutter.h>
+#include <math.h>
#include "meta-stage.h"

20
pkgs/desktops/gnome-3/core/mutter/x86.patch
View File

@ -1,20 +0,0 @@
--- a/src/core/window.c 2015-05-26 10:52:41.382834963 +0200
+++ b/src/core/window.c 2015-05-26 10:53:03.039948034 +0200
@@ -3499,7 +3499,7 @@
static MetaMonitorInfo *
find_monitor_by_winsys_id (MetaWindow *window,
- guint winsys_id)
+ gint winsys_id)
{
int i;
@@ -3618,7 +3618,7 @@
*/
gboolean did_placement;
- guint old_output_winsys_id;
+ gint old_output_winsys_id;
MetaRectangle unconstrained_rect;
MetaRectangle constrained_rect;
MetaMoveResizeResultFlags result = 0;

11
pkgs/desktops/gnome-3/core/totem-pl-parser/default.nix
View File

@ -1,15 +1,10 @@
{ stdenv, fetchurl, pkgconfig, file, intltool, gmime, libxml2, libsoup, gnome3 }:
stdenv.mkDerivation rec {
name = "totem-pl-parser-3.10.2";
inherit (import ./src.nix fetchurl) name src;
src = fetchurl {
url = "mirror://gnome/sources/totem-pl-parser/3.10/${name}.tar.xz";
sha256 = "38be09bddc46ddecd2b5ed7c82144ef52aafe879a5ec3d8b192b4b64ba995469";
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ file intltool gmime libxml2 libsoup ];
nativeBuildInputs = [ pkgconfig file intltool ];
buildInputs = [ gmime libxml2 libsoup ];
meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/Apps/Videos;

10
pkgs/desktops/gnome-3/core/totem-pl-parser/src.nix Normal file
View File

@ -0,0 +1,10 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "totem-pl-parser-3.10.2";
src = fetchurl {
url = mirror://gnome/sources/totem-pl-parser/3.10/totem-pl-parser-3.10.2.tar.xz;
sha256 = "38be09bddc46ddecd2b5ed7c82144ef52aafe879a5ec3d8b192b4b64ba995469";
};
}

6
pkgs/desktops/gnome-3/core/vte/src.nix
View File

@ -1,10 +1,10 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "vte-0.48.3";
name = "vte-0.50.1";
src = fetchurl {
url = mirror://gnome/sources/vte/0.48/vte-0.48.3.tar.xz;
sha256 = "a3a9fb182740b392a45cd3f46fa61a985f68bb6b1817b52daec22034c46158c3";
url = mirror://gnome/sources/vte/0.50/vte-0.50.1.tar.xz;
sha256 = "cf1708e3e573160e1db107014b3ef70888fefe6b668373fed70e8d1cac45a8c2";
};
}

6
pkgs/development/compilers/orc/default.nix
View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "orc-0.4.26";
name = "orc-0.4.27";
src = fetchurl {
url = "http://gstreamer.freedesktop.org/src/orc/${name}.tar.xz";
sha256 = "0jd69ynvr3k70mlxxgbsk047l1rd63m1wkj3qdcq7644xy0gllkx";
url = "https://gstreamer.freedesktop.org/src/orc/${name}.tar.xz";
sha256 = "14vbwdydwarcvswzf744jdjb3ibhv6k4j6hzdacfan41zic3xrai";
};
outputs = [ "out" "dev" ];

62
pkgs/development/interpreters/spidermonkey/52.nix Normal file
View File

@ -0,0 +1,62 @@
{ stdenv, fetchurl, autoconf213, pkgconfig, perl, python2, zip, which, readline, icu, zlib, nspr }:
stdenv.mkDerivation rec {
version = "52.2.1gnome1";
name = "spidermonkey-${version}";
# the release notes point to some guys home directory, see
# https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey/Releases/38
# probably it would be more ideal to pull a particular tag/revision
# from the mercurial repo
src = fetchurl {
url = "mirror://gnome/teams/releng/tarballs-needing-help/mozjs/mozjs-${version}.tar.gz";
sha256 = "1bxhz724s1ch1c0kdlzlg9ylhg1mk8kbhdgfkax53fyvn51pjs9i";
};
buildInputs = [ readline icu zlib nspr ];
nativeBuildInputs = [ autoconf213 pkgconfig perl which python2 zip ];
postUnpack = "sourceRoot=\${sourceRoot}/js/src";
preConfigure = ''
export CXXFLAGS="-fpermissive"
export LIBXUL_DIST=$out
export PYTHON="${python2.interpreter}"
'';
configureFlags = [
"--enable-threadsafe"
"--with-system-nspr"
"--with-system-zlib"
"--with-system-icu"
"--with-intl-api"
"--enable-readline"
# enabling these because they're wanted by 0ad. They may or may
# not be good defaults for other uses.
"--enable-gcgenerational"
"--enable-shared-js"
];
# This addresses some build system bug. It's quite likely to be safe
# to re-enable parallel builds if the source revision changes.
enableParallelBuilding = true;
postFixup = ''
# The headers are symlinks to a directory that doesn't get put
# into $out, so they end up broken. Fix that by just resolving the
# symlinks.
for i in $(find $out -type l); do
cp --remove-destination "$(readlink "$i")" "$i";
done
'';
meta = with stdenv.lib; {
description = "Mozilla's JavaScript engine written in C/C++";
homepage = https://developer.mozilla.org/en/SpiderMonkey;
# TODO: MPL/GPL/LGPL tri-license.
maintainers = [ maintainers.abbradar ];
platforms = platforms.linux;
};
}

8
pkgs/development/libraries/appstream-glib/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, pkgconfig, gettext, gtk3, intltool, glib
, gtk_doc, autoconf, automake, libtool, libarchive
, gobjectIntrospection, sqlite, libsoup, gcab, attr, acl, docbook_xsl
, libuuid, json_glib, autoconf-archive, meson, gperf, ninja, gdk_pixbuf
{ stdenv, fetchFromGitHub, pkgconfig, gettext, gtk3, glib
, gtk_doc, libarchive, gobjectIntrospection
, sqlite, libsoup, gcab, attr, acl, docbook_xsl
, libuuid, json_glib, meson, gperf, ninja
}:
stdenv.mkDerivation rec {
name = "appstream-glib-0.7.2";

4
pkgs/development/libraries/clutter-gtk/default.nix
View File

@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
major = "1.8";
minor = "2";
minor = "4";
name = "clutter-gtk-${major}.${minor}";
src = fetchurl {
url = "mirror://gnome/sources/clutter-gtk/${major}/${name}.tar.xz";
sha256 = "da27d486325490ad3f65d2abf9413aeb8b4a8f7b559e4b2f73567a5344a26b94";
sha256 = "01ibniy4ich0fgpam53q252idm7f4fn5xg5qvizcfww90gn9652j";
};
propagatedBuildInputs = [ clutter gtk3 ];

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

@ -2,7 +2,7 @@
, gsettings_desktop_schemas }:
let
ver_maj = "2.50";
ver_maj = "2.54";
ver_min = "0";
in
stdenv.mkDerivation rec {
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://gnome/sources/glib-networking/${ver_maj}/${name}.tar.xz";
sha256 = "3f1a442f3c2a734946983532ce59ed49120319fdb10c938447c373d5e5286bee";
sha256 = "5961b3779080b72314b373ff5d4790eb7e41b75ca91816ad7a81ef32922f7096";
};
outputs = [ "out" "dev" ]; # to deal with propagatedBuildInputs

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

@ -1,15 +1,15 @@
{ stdenv, fetchurl, pkgconfig, gnum4, glib, libsigcxx }:
let
ver_maj = "2.50";
ver_min = "0";
ver_maj = "2.54";
ver_min = "1";
in
stdenv.mkDerivation rec {
name = "glibmm-${ver_maj}.${ver_min}";
src = fetchurl {
url = "mirror://gnome/sources/glibmm/${ver_maj}/${name}.tar.xz";
sha256 = "df726e3c6ef42b7621474b03b644a2e40ec4eef94a1c5a932c1e740a78f95e94";
sha256 = "0jkapw18icz59cmlmsl00nwwz0wh291kb4hc9z9hxmq45drqrhkw";
};
outputs = [ "out" "dev" ];

4
pkgs/development/libraries/gobject-introspection/default.nix
View File

@ -7,7 +7,7 @@
# In that case its about 6MB which could be separated
let
ver_maj = "1.52";
ver_maj = "1.54";
ver_min = "1";
in
with stdenv.lib;
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://gnome/sources/gobject-introspection/${ver_maj}/${name}.tar.xz";
sha256 = "1x5gkyrglv3dn9b4fsgw6asqgjw1wj7qc37g9pyac6pyaa6w7l1f";
sha256 = "0zl7pfkzkm07733391b4f3cwjbnvb1nwvpmajf5bajh6bxgfv3dq";
};
outputs = [ "out" "dev" ];

6
pkgs/development/libraries/gstreamer/bad/default.nix
View File

@ -17,11 +17,11 @@ let
inherit (stdenv.lib) optional optionalString;
in
stdenv.mkDerivation rec {
name = "gst-plugins-bad-1.10.4";
name = "gst-plugins-bad-1.12.2";
meta = with stdenv.lib; {
description = "Gstreamer Bad Plugins";
homepage = "http://gstreamer.freedesktop.org";
homepage = "https://gstreamer.freedesktop.org";
longDescription = ''
a set of plug-ins that aren't up to par compared to the
rest. They might be close to being good quality, but they're missing
@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "${meta.homepage}/src/gst-plugins-bad/${name}.tar.xz";
sha256 = "0rk9rlzf2b0hjw5hwbadz53yh4ls7vm3w3cshsa3n8isdd8axp93";
sha256 = "0dwyq03g2m0p16dwx8q5qvjn5x9ia72h21sf87mp97gmwkfpwb4w";
};
outputs = [ "out" "dev" ];

6
pkgs/development/libraries/gstreamer/base/default.nix
View File

@ -4,18 +4,18 @@
}:
stdenv.mkDerivation rec {
name = "gst-plugins-base-1.10.4";
name = "gst-plugins-base-1.12.2";
meta = {
description = "Base plugins and helper libraries";
homepage = http://gstreamer.freedesktop.org;
homepage = https://gstreamer.freedesktop.org;
license = stdenv.lib.licenses.lgpl2Plus;
platforms = stdenv.lib.platforms.unix;
};
src = fetchurl {
url = "${meta.homepage}/src/gst-plugins-base/${name}.tar.xz";
sha256 = "1dsyjf6rncsbg4rfj40cvf1wwpjj9h3j3c7bh4zp7jylnfv4blpn";
sha256 = "0x86a7aph0y6gyq178plvwvbbyhkfb3hf0gadx9sk5z1mzixqrsh";
};
outputs = [ "out" "dev" ];

6
pkgs/development/libraries/gstreamer/core/default.nix
View File

@ -3,11 +3,11 @@
}:
stdenv.mkDerivation rec {
name = "gstreamer-1.10.4";
name = "gstreamer-1.12.2";
meta = {
description = "Open source multimedia framework";
homepage = http://gstreamer.freedesktop.org;
homepage = https://gstreamer.freedesktop.org;
license = stdenv.lib.licenses.lgpl2Plus;
platforms = stdenv.lib.platforms.unix;
maintainers = [ stdenv.lib.maintainers.ttuegel ];
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "${meta.homepage}/src/gstreamer/${name}.tar.xz";
sha256 = "062jidnw17hkpva6ddygp80gyasyigfkpm1y7w56rk56a2pzbhjh";
sha256 = "1fllz7n58lavyy4nh64xc7izd4ffhl12a2ff0yg4z67al8wkzplz";
};
outputs = [ "out" "dev" ];

6
pkgs/development/libraries/gstreamer/ges/default.nix
View File

@ -3,18 +3,18 @@
}:
stdenv.mkDerivation rec {
name = "gstreamer-editing-services-1.10.4";
name = "gstreamer-editing-services-1.12.2";
meta = with stdenv.lib; {
description = "Library for creation of audio/video non-linear editors";
homepage = "http://gstreamer.freedesktop.org";
homepage = "https://gstreamer.freedesktop.org";
license = licenses.lgpl2Plus;
platforms = platforms.unix;
};
src = fetchurl {
url = "${meta.homepage}/src/gstreamer-editing-services/${name}.tar.xz";
sha256 = "0i11b1rwkjsy9gxrf9vk9lgg8qm60ggfi5lp0ncyh4lxvh16vbgj";
sha256 = "0bi0f487949k9xnl1r6ngysgaibmmswwgdqcrchg0dixnnbm9isr";
};
outputs = [ "out" "dev" ];

2
pkgs/development/libraries/gstreamer/gnonlin/default.nix
View File

@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Gstreamer Non-Linear Multimedia Editing Plugins";
homepage = "http://gstreamer.freedesktop.org";
homepage = "https://gstreamer.freedesktop.org";
longDescription = ''
Gnonlin is a library built on top of GStreamer which provides
support for writing non-linear audio and video editing

6
pkgs/development/libraries/gstreamer/good/default.nix
View File

@ -11,11 +11,11 @@ let
inherit (stdenv.lib) optionals optionalString;
in
stdenv.mkDerivation rec {
name = "gst-plugins-good-1.10.4";
name = "gst-plugins-good-1.12.2";
meta = with stdenv.lib; {
description = "Gstreamer Good Plugins";
homepage = "http://gstreamer.freedesktop.org";
homepage = "https://gstreamer.freedesktop.org";
longDescription = ''
a set of plug-ins that we consider to have good quality code,
correct functionality, our preferred license (LGPL for the plug-in
@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "${meta.homepage}/src/gst-plugins-good/${name}.tar.xz";
sha256 = "0zjdwxn83sp9wjp9rxjbyk8kf284g9av7l2v6rjldi586hacd1la";
sha256 = "15pfw54fsh9s9xwrnbap4z4njwgqdfvq52k562d2hc5b11rfx4am";
};
outputs = [ "out" "dev" ];

7
pkgs/development/libraries/gstreamer/gstreamermm/default.nix
View File

@ -12,6 +12,13 @@ stdenv.mkDerivation rec {
sha256 = "0i4sk6ns4dyi4szk45bkm4kvl57l52lgm15p2wg2rhx2gr2w3qry";
};
patches = [
(fetchurl {
url = https://bug783628.bugzilla-attachments.gnome.org/attachment.cgi?id=354765;
sha256 = "082510a934bl05mz4cyakp8mfmd97cdj7vdrbvyqc4g58dcskvz0";
})
];
outputs = [ "out" "dev" ];
nativeBuildInputs = [ pkgconfig file ];

2
pkgs/development/libraries/gstreamer/legacy/gst-ffmpeg/default.nix
View File

@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
urls = [
"http://gstreamer.freedesktop.org/src/gst-ffmpeg/${name}.tar.bz2"
"https://gstreamer.freedesktop.org/src/gst-ffmpeg/${name}.tar.bz2"
"mirror://gentoo/distfiles/${name}.tar.bz2"
];
sha256 = "0qmvgwcfybci78sd73mhvm4bsb7l0xsk9yljrgik80g011ds1z3n";

2
pkgs/development/libraries/gstreamer/legacy/gst-plugins-bad/default.nix
View File

@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
meta = {
homepage = http://gstreamer.freedesktop.org;
homepage = https://gstreamer.freedesktop.org;
description = "‘Bad’ (potentially low quality) plug-ins for GStreamer";

2
pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix
View File

@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
postInstall = "rm -rf $out/share/gtk-doc";
meta = with stdenv.lib; {
homepage = http://gstreamer.freedesktop.org;
homepage = https://gstreamer.freedesktop.org;
description = "Base plug-ins for GStreamer";
license = licenses.lgpl2Plus;
maintainers = with maintainers; [ lovek323 ];

2
pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix
View File

@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
'';
meta = {
homepage = http://gstreamer.freedesktop.org;
homepage = https://gstreamer.freedesktop.org;
description = "`Good' plug-ins for GStreamer";

2
pkgs/development/libraries/gstreamer/legacy/gst-plugins-ugly/default.nix
View File

@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
meta = {
homepage = http://gstreamer.freedesktop.org;
homepage = https://gstreamer.freedesktop.org;
description = "‘Ugly’ (potentially patent-encumbered) plug-ins for GStreamer";

2
pkgs/development/libraries/gstreamer/legacy/gst-python/default.nix
View File

@ -27,7 +27,7 @@ in stdenv.mkDerivation rec {
propagatedBuildInputs = [ gstreamer python ];
meta = {
homepage = http://gstreamer.freedesktop.org;
homepage = https://gstreamer.freedesktop.org;
description = "Python bindings for GStreamer";

2
pkgs/development/libraries/gstreamer/legacy/qt-gstreamer/default.nix
View File

@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
pname = "qt-gstreamer";
src = fetchurl {
url = "http://gstreamer.freedesktop.org/src/${pname}/${name}.tar.bz2";
url = "https://gstreamer.freedesktop.org/src/${pname}/${name}.tar.bz2";
sha256 = "1pqg9sxzk8sdrf7pazb5v21hasqai9i4l203gbdqz29w2ll1ybsl";
};

6
pkgs/development/libraries/gstreamer/libav/default.nix
View File

@ -9,17 +9,17 @@
assert withSystemLibav -> libav != null;
stdenv.mkDerivation rec {
name = "gst-libav-1.10.4";
name = "gst-libav-1.12.2";
meta = {
homepage = http://gstreamer.freedesktop.org;
homepage = https://gstreamer.freedesktop.org;
license = stdenv.lib.licenses.lgpl2Plus;
platforms = stdenv.lib.platforms.unix;
};
src = fetchurl {
url = "${meta.homepage}/src/gst-libav/${name}.tar.xz";
sha256 = "12r68ri03mgbbwsxyn6yklgfsq32rwvyq83zw0aq7m73fp5gx83c";
sha256 = "1crdahkjm23byg1awcrjkmgfbalfpvvac7h7whm6b2r1pfwkbdsv";
};
outputs = [ "out" "dev" ];

2
pkgs/development/libraries/gstreamer/qt-gstreamer/default.nix
View File

@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
pname = "qt-gstreamer";
src = fetchurl {
url = "http://gstreamer.freedesktop.org/src/${pname}/${name}.tar.xz";
url = "https://gstreamer.freedesktop.org/src/${pname}/${name}.tar.xz";
sha256 = "9f3b492b74cad9be918e4c4db96df48dab9c012f2ae5667f438b64a4d92e8fd4";
};

6
pkgs/development/libraries/gstreamer/ugly/default.nix
View File

@ -5,11 +5,11 @@
}:
stdenv.mkDerivation rec {
name = "gst-plugins-ugly-1.10.4";
name = "gst-plugins-ugly-1.12.2";
meta = with stdenv.lib; {
description = "Gstreamer Ugly Plugins";
homepage = "http://gstreamer.freedesktop.org";
homepage = "https://gstreamer.freedesktop.org";
longDescription = ''
a set of plug-ins that have good quality and correct functionality,
but distributing them might pose problems. The license on either
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "${meta.homepage}/src/gst-plugins-ugly/${name}.tar.xz";
sha256 = "0ngsiwcsz3jd08id4mc0qiy2q1n7h2kkvdnh3r1vm725m1ycg1k3";
sha256 = "0rplyp1qk359c97ig9i2vc1v34g92khd8dslwfipva1ypwmr9hqw";
};
outputs = [ "out" "dev" ];

6
pkgs/development/libraries/gstreamer/vaapi/default.nix
View File

@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
name = "gst-vaapi-${version}";
version = "1.10.4";
version = "1.12.2";
src = fetchurl {
url = "${meta.homepage}/src/gstreamer-vaapi/gstreamer-vaapi-${version}.tar.xz";
sha256 = "0xfyf1mgcxnwf380wxv20hakl2srp34dmiw6bm4zkncl2mi91rh3";
sha256 = "0fhncs27hcdcnb9a4prkxlyvr883hnzsx148zzk7lg2b8zh19ir3";
};
outputs = [ "out" "dev" ];
@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
configureFlags = "--disable-builtin-libvpx --with-gstreamer-api=1.0";
meta = {
homepage = http://gstreamer.freedesktop.org;
homepage = https://gstreamer.freedesktop.org;
license = stdenv.lib.licenses.lgpl21Plus;
platforms = stdenv.lib.platforms.linux;
maintainers = with stdenv.lib.maintainers; [ tstrobel ];

6
pkgs/development/libraries/gstreamer/validate/default.nix
View File

@ -3,18 +3,18 @@
}:
stdenv.mkDerivation rec {
name = "gst-validate-1.10.4";
name = "gst-validate-1.12.2";
meta = {
description = "Integration testing infrastructure for the GStreamer framework";
homepage = http://gstreamer.freedesktop.org;
homepage = https://gstreamer.freedesktop.org;
license = stdenv.lib.licenses.lgpl2Plus;
platforms = stdenv.lib.platforms.unix;
};
src = fetchurl {
url = "${meta.homepage}/src/gst-validate/${name}.tar.xz";
sha256 = "0g6px08x4kq5xqlbyxvxn6cm9b1s1gfvhkmlrmvw9afccjzh1775";
sha256 = "1pgycs35bwmp4aicyxwyzlfy1i5l2rzmh2a8ivhgy21azp8jaykb";
};
outputs = [ "out" "dev" ];

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

@ -1,24 +1,22 @@
{stdenv, fetchurl
, automake, autoconf, libtool, which, gtkdoc, gettext, pkgconfig, gobjectIntrospection, libxslt
, glib, systemd, libusb1, vala_0_23
, glib, systemd, libusb1, vala_0_38
}:
stdenv.mkDerivation rec {
name = "gusb-${version}";
version = "0.2.9";
version = "0.2.11";
enableParallelBuilding = true;
src = fetchurl {
url = "http://people.freedesktop.org/~hughsient/releases/libgusb-${version}.tar.xz";
sha256 = "056yxlppgycsfw1l8c9j6givk1n15jylhvx89wqhsxdi1b6vs83k";
url = "https://people.freedesktop.org/~hughsient/releases/libgusb-${version}.tar.xz";
sha256 = "1pppz17lw3khyz8by1dddxdqrv6qn4a23fpxs38c67db7x4l7ccw";
};
preConfigure = "./autogen.sh";
nativeBuildInputs = [ pkgconfig ];
buildInputs = [
autoconf automake libtool which gtkdoc gettext gobjectIntrospection libxslt
systemd vala_0_23 glib
];
nativeBuildInputs = [ pkgconfig autoconf automake libtool which gtkdoc gettext
gobjectIntrospection libxslt vala_0_38 ];
buildInputs = [ systemd glib ];
propagatedBuildInputs = [ libusb1 ];

14
pkgs/development/libraries/gvfs/default.nix
View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, intltool, libtool
, glib, dbus, udev, libgudev, udisks2, libgcrypt, libcap, polkit
, libgphoto2, avahi, libarchive, fuse, libcdio
, libgphoto2, avahi, libarchive, fuse, libcdio, file, bzip2, lzma
, libxml2, libxslt, docbook_xsl, samba, libmtp
, gnomeSupport ? false, gnome, makeWrapper }:
let
ver_maj = "1.30";
ver_maj = "1.34";
version = "${ver_maj}.1";
in
stdenv.mkDerivation rec {
@ -13,21 +13,21 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://gnome/sources/gvfs/${ver_maj}/${name}.tar.xz";
sha256 = "e752e7bb46e64e4025f63428d4f5247e3e5c0d0b5eeb4f81dbf1cd7b75f59d7b";
sha256 = "1d3j6f252mk316hrspwy63inrhxk6l78l4bmlmql401lqapb5yby";
};
nativeBuildInputs = [
pkgconfig intltool libtool
pkgconfig intltool libtool file makeWrapper
libxml2 libxslt docbook_xsl
];
buildInputs =
[ makeWrapper glib dbus udev libgudev udisks2 libgcrypt
libgphoto2 avahi libarchive fuse libcdio
[ glib dbus udev libgudev udisks2 libgcrypt
libgphoto2 avahi libarchive fuse libcdio lzma bzip2
samba libmtp libcap polkit
# ToDo: a ligther version of libsoup to have FTP/HTTP support?
] ++ stdenv.lib.optionals gnomeSupport (with gnome; [
gtk libsoup libgnome_keyring gconf gcr
libsoup libgnome_keyring gconf gcr
# ToDo: not working and probably useless until gnome3 from x-updates
]);

26
pkgs/development/libraries/json-glib/default.nix
View File

@ -1,24 +1,34 @@
{ stdenv, fetchurl, glib, pkgconfig, gobjectIntrospection, dbus, libintlOrEmpty }:
{ stdenv, fetchurl, fetchpatch, glib, meson, ninja, pkgconfig, gettext, gobjectIntrospection, dbus, libintlOrEmpty }:
stdenv.mkDerivation rec {
name = "json-glib-${minVer}.0";
minVer = "1.2";
name = "json-glib-${minVer}.2";
minVer = "1.4";
src = fetchurl {
url = "mirror://gnome/sources/json-glib/${minVer}/${name}.tar.xz";
sha256 = "1lx7p1c7cl21byvfgw92n8dhm09vi6qxrs0zkx9dg3y096zdzmlr";
sha256 = "2d7709a44749c7318599a6829322e081915bdc73f5be5045882ed120bb686dc8";
};
configureflags= "--with-introspection";
propagatedBuildInputs = [ glib gobjectIntrospection ];
nativeBuildInputs = [ pkgconfig ];
propagatedBuildInputs = [ glib ];
nativeBuildInputs = [ meson ninja pkgconfig gettext gobjectIntrospection ];
buildInputs = libintlOrEmpty;
NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl";
patches = [
# https://gitlab.gnome.org/GNOME/json-glib/issues/27
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/json-glib/merge_requests/2.diff";
sha256 = "0pf006jxj1ki7a0w4ykxm6b24m0wafrhpdcmixsw9x83m227156c";
})
];
outputs = [ "out" "dev" ];
doCheck = true;
checkPhase = "meson test";
meta = with stdenv.lib; {
homepage = http://live.gnome.org/JsonGlib;
description = "A library providing (de)serialization support for the JavaScript Object Notation (JSON) format";

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

@ -3,12 +3,12 @@
stdenv.mkDerivation rec {
major = "0.12";
version = "${major}.14";
version = "${major}.16";
name = "libchamplain-${version}";
src = fetchurl {
url = "mirror://gnome/sources/libchamplain/${major}/${name}.tar.xz";
sha256 = "13snnka1jqc5qrgij8bm22xy02pncf3dn5ij3jh4rrpzq7g1sqpi";
sha256 = "13chvc2n074i0jw5jlb8i7cysda4yqx58ca6y3mrlrl9g37k2zja";
};
nativeBuildInputs = [ pkgconfig ];

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

@ -1,11 +1,11 @@
{ stdenv, fetchurl, python }:
stdenv.mkDerivation rec {
name = "libevdev-1.5.6";
name = "libevdev-1.5.7";
src = fetchurl {
url = "https://www.freedesktop.org/software/libevdev/${name}.tar.xz";
sha256 = "1256ypz93039n6km4macg158fpmjgylhmcmk20pnklxicsfpxv7c";
sha256 = "08nl3p6226k51zph52fhilxvi3b31spp6fz8szzrglzhl8vrxrd1";
};
buildInputs = [ python ];

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

@ -1,12 +1,12 @@
{ stdenv, fetchurl, glib, pkgconfig, perl, intltool, gobjectIntrospection, libintlOrEmpty }:
stdenv.mkDerivation rec {
name = "libgtop-${version}";
major = "2.34";
version = "${major}.1";
major = "2.38";
version = "${major}.0";
src = fetchurl {
url = "mirror://gnome/sources/libgtop/${major}/${name}.tar.xz";
sha256 = "c89978a76662b18d392edbe0d1b794f5a9a399a5ccf22a02d5b9e28b5ed609e2";
sha256 = "04mnxgzyb26wqk6qij4iw8cxwl82r8pcsna5dg8vz2j3pdi0wv2g";
};
propagatedBuildInputs = [ glib ];

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

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "libgudev-${version}";
version = "231";
version = "232";
src = fetchurl {
url = "https://download.gnome.org/sources/libgudev/${version}/${name}.tar.xz";
sha256 = "15iz0qp57qy5pjrblsn36l0chlncqggqsg8h8i8c71499afzj7iv";
url = "mirror://gnome/sources/libgudev/${version}/${name}.tar.xz";
sha256 = "ee4cb2b9c573cdf354f6ed744f01b111d4b5bed3503ffa956cefff50489c7860";
};
nativeBuildInputs = [ pkgconfig ];

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

@ -2,18 +2,21 @@
stdenv.mkDerivation rec {
name = "libical-${version}";
version = "1.0.1";
version = "2.0.0";
src = fetchFromGitHub {
owner = "libical";
repo = "libical";
rev = "v${version}";
sha256 = "1y6rbw24m133d984pyqzx2bi7f37dsw6f33l6arwn6yd4zlqdib9";
sha256 = "0xsvqy1hzmwxn783wrb2k8p751544pzv39v9ynr9pj4yzkwjzsvb";
};
nativeBuildInputs = [ perl cmake ];
patches = [ ./respect-env-tzdir.patch ];
patches = [
# TODO: upstream this patch
./respect-env-tzdir.patch
];
meta = with stdenv.lib; {
homepage = https://github.com/libical/libical;

48
pkgs/development/libraries/libical/respect-env-tzdir.patch
View File

@ -1,27 +1,29 @@
--- a/src/libical/icaltz-util.c 2015-06-11 15:40:58.843138630 +0200
+++ b/src/libical/icaltz-util.c 2015-06-11 15:43:12.722046252 +0200
@@ -107,7 +107,7 @@
char charcnt[4];
} tzinfo;
-static char *search_paths [] = {"/usr/share/zoneinfo","/usr/lib/zoneinfo","/etc/zoneinfo","/usr/share/lib/zoneinfo"};
+static char *search_paths [] = {"/etc/zoneinfo","/usr/share/zoneinfo","/usr/lib/zoneinfo","/usr/share/lib/zoneinfo"};
--- a/src/libical/icaltz-util.c
+++ b/src/libical/icaltz-util.c
@@ -96,9 +96,9 @@ typedef struct
static char *zdir = NULL;
#define NUM_SEARCH_PATHS (sizeof (search_paths)/ sizeof (search_paths [0]))
@@ -194,6 +194,15 @@
const char *fname = ZONES_TAB_SYSTEM_FILENAME;
unsigned int i;
static char *search_paths[] = {
+ "/etc/zoneinfo",
"/usr/share/zoneinfo",
"/usr/lib/zoneinfo",
- "/etc/zoneinfo",
"/usr/share/lib/zoneinfo"
};
+ const char *env_tzdir = getenv ("TZDIR");
+ if (env_tzdir) {
+ sprintf (file_path, "%s/%s", env_tzdir, fname);
+ if (!access (file_path, F_OK|R_OK)) {
+ zdir = env_tzdir;
+ return;
+ }
+ }
@@ -179,6 +179,15 @@ static void set_zonedir(void)
const char *fname = ZONES_TAB_SYSTEM_FILENAME;
size_t i, num_search_paths;
+ const char *env_tzdir = getenv ("TZDIR");
+ if (env_tzdir) {
+ snprintf(file_path, MAXPATHLEN, "%s/%s", env_tzdir, fname);
+ if (!access (file_path, F_OK|R_OK)) {
+ zdir = env_tzdir;
+ return;
+ }
+ }
+
for (i = 0; i < NUM_SEARCH_PATHS; i++) {
sprintf (file_path, "%s/%s", search_paths [i], fname);
if (!access (file_path, F_OK|R_OK)) {
num_search_paths = sizeof(search_paths) / sizeof(search_paths[0]);
for (i = 0; i < num_search_paths; i++) {
snprintf(file_path, MAXPATHLEN, "%s/%s", search_paths[i], fname);

38
pkgs/development/libraries/libinput/default.nix
View File

@ -1,48 +1,56 @@
{ stdenv, fetchurl, pkgconfig
{ stdenv, fetchurl, pkgconfig, meson, ninja
, libevdev, mtdev, udev, libwacom
, documentationSupport ? false, doxygen ? null, graphviz ? null # Documentation
, eventGUISupport ? false, cairo ? null, glib ? null, gtk3 ? null # GUI event viewer support
, testsSupport ? false, check ? null, valgrind ? null
, autoconf, automake
, testsSupport ? false, check ? null, valgrind ? null, python3Packages ? null
}:
assert documentationSupport -> doxygen != null && graphviz != null;
assert eventGUISupport -> cairo != null && glib != null && gtk3 != null;
assert testsSupport -> check != null && valgrind != null;
assert testsSupport -> check != null && valgrind != null && python3Packages != null;
let
mkFlag = optSet: flag: if optSet then "--enable-${flag}" else "--disable-${flag}";
mkFlag = optSet: flag: "-D${flag}=${stdenv.lib.boolToString optSet}";
in
with stdenv.lib;
stdenv.mkDerivation rec {
name = "libinput-${version}";
version = "1.7.3";
version = "1.9.1";
src = fetchurl {
url = "http://www.freedesktop.org/software/libinput/${name}.tar.xz";
sha256 = "07fbzxddvhjcch43hdxb24sj7ri96zzpcjalvsicmw0i4wnn2v89";
sha256 = "1y3559146zlfizncky1jlly226i66vwikxhpdkw0jg8v47j0sy7h";
};
outputs = [ "out" "dev" ];
configureFlags = [
mesonFlags = [
(mkFlag documentationSupport "documentation")
(mkFlag eventGUISupport "event-gui")
(mkFlag eventGUISupport "debug-gui")
(mkFlag testsSupport "tests")
];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ libevdev mtdev libwacom autoconf automake ]
++ optionals eventGUISupport [ cairo glib gtk3 ]
nativeBuildInputs = [ pkgconfig meson ninja ]
++ optionals documentationSupport [ doxygen graphviz ]
++ optionals testsSupport [ check valgrind ];
++ optionals testsSupport [ check valgrind python3Packages.pyparsing ];
buildInputs = [ libevdev mtdev libwacom ]
++ optionals eventGUISupport [ cairo glib gtk3 ];
propagatedBuildInputs = [ udev ];
patches = [ ./udev-absolute-path.patch ];
patchFlags = [ "-p0" ];
preBuild = ''
# meson setup-hook changes the directory so the files are located one level up
patchShebangs ../udev/parse_hwdb.py
patchShebangs ../test/symbols-leak-test.in
'';
doCheck = testsSupport;
checkPhase = "meson test";
meta = {
description = "Handles input devices in Wayland compositors and provides a generic X.Org input driver";

21
pkgs/development/libraries/libinput/udev-absolute-path.patch
View File

@ -1,12 +1,11 @@
--- configure.ac 2016-05-27 14:00:25.248388226 +0200
+++ configure.ac 2016-05-27 14:01:28.228943416 +0200
@@ -214,7 +214,8 @@ AM_CONDITIONAL(BUILD_DOCS, [test "x$buil
# Used by the udev rules so we can use callouts during testing without
# installing everything first. Default is the empty string so the installed
# rule will use udev's default path. Override is in udev/Makefile.am
-AC_SUBST(UDEV_TEST_PATH, "")
+UDEV_TEST_PATH="${UDEV_DIR}/"
+AC_SUBST(UDEV_TEST_PATH)
AC_PATH_PROG(SED, [sed])
--- a/meson.build
+++ b/meson.build
@@ -100,7 +100,7 @@
args : model_quirks)
AC_CONFIG_FILES([Makefile
udev_rules_config = configuration_data()
-udev_rules_config.set('UDEV_TEST_PATH', '')
+udev_rules_config.set('UDEV_TEST_PATH', udev_dir + '/')
configure_file(input : 'udev/80-libinput-device-groups.rules.in',
output : '80-libinput-device-groups.rules',
install : true,

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

@ -6,11 +6,11 @@
# no introspection by default, it's too big
stdenv.mkDerivation rec {
name = "librsvg-2.40.17";
name = "librsvg-2.40.19";
src = fetchurl {
url = "mirror://gnome/sources/librsvg/2.40/${name}.tar.xz";
sha256 = "1k39gyf7f5m9x0jvpcxvfcqswdb04xhm1lbwbjabn1f4xk5wbxp6";
url = "mirror://gnome/sources/librsvg/2.40/librsvg-2.40.18.tar.xz";
sha256 = "0k2nbd4g31qinkdfd8r5c5ih2ixl85fbkgkqqh9747lwr24c9j5z";
};
NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null;

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

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "libwacom-${version}";
version = "0.22";
version = "0.26";
src = fetchurl {
url = "mirror://sourceforge/linuxwacom/libwacom/${name}.tar.bz2";
sha256 = "1h10awwapj5v8nik220ga0raggv3lgaq0kzwlma2qjmzdhhrrhcp";
sha256 = "0xpvkjvzaj9blcmw8ha46616bzfivj99kwzvr91clxd6iaf11r63";
};
nativeBuildInputs = [ pkgconfig ];

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

@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, yacc, flex, xkeyboard_config, libxcb, libX11 }:
stdenv.mkDerivation rec {
name = "libxkbcommon-0.7.1";
name = "libxkbcommon-0.7.2";
src = fetchurl {
url = "http://xkbcommon.org/download/${name}.tar.xz";
sha256 = "ba59305d2e19e47c27ea065c2e0df96ebac6a3c6e97e28ae5620073b6084e68b";
sha256 = "1n5rv5n210kjnkyrvbh04gfwaa7zrmzy1393p8nyqfw66lkxr918";
};
outputs = [ "out" "dev" ];

12
pkgs/development/libraries/spice-gtk/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, spice_protocol, intltool, celt_0_5_1
{ stdenv, fetchurl, pkgconfig, spice_protocol, gettext, celt_0_5_1
, openssl, libpulseaudio, pixman, gobjectIntrospection, libjpeg_turbo, zlib
, cyrus_sasl, python2Packages, autoreconfHook, usbredir, libsoup
, gtk3, epoxy }:
@ -8,11 +8,11 @@ with stdenv.lib;
let
inherit (python2Packages) python pygtk;
in stdenv.mkDerivation rec {
name = "spice-gtk-0.33";
name = "spice-gtk-0.34";
src = fetchurl {
url = "http://www.spice-space.org/download/gtk/${name}.tar.bz2";
sha256 = "0fdgx9k4vgmasp8i2n0swrkapq8f212igcg7wsgvr3mbhsvk7bvx";
sha256 = "1vknp72pl6v6nf3dphhwp29hk6gv787db2pmyg4m312z2q0hwwp9";
};
buildInputs = [
@ -20,7 +20,7 @@ in stdenv.mkDerivation rec {
libjpeg_turbo zlib cyrus_sasl python pygtk usbredir gtk3 epoxy
];
nativeBuildInputs = [ pkgconfig intltool libsoup autoreconfHook ];
nativeBuildInputs = [ pkgconfig gettext libsoup autoreconfHook ];
NIX_CFLAGS_COMPILE = "-fno-stack-protector";
@ -29,10 +29,6 @@ in stdenv.mkDerivation rec {
--replace '=codegendir pygtk-2.0' '=codegendir pygobject-2.0'
'';
preConfigure = ''
intltoolize -f
'';
configureFlags = [
"--disable-maintainer-mode"
"--with-gtk3"

4
pkgs/development/libraries/spice-protocol/default.nix
View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "spice-protocol-0.12.12";
name = "spice-protocol-0.12.13";
src = fetchurl {
url = "http://www.spice-space.org/download/releases/${name}.tar.bz2";
sha256 = "00wx81f2ml62g3maw63jq9w217zym921rdi38h7lpm5m8ckxraqp";
sha256 = "0cwrgkp558mblcf4vrhacb3iizz12khsrrl82w38w9nj0ar13vl9";
};
postInstall = ''

6
pkgs/development/libraries/telepathy/glib/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, dbus_glib, glib, python2, pkgconfig, libxslt
, gobjectIntrospection, valaSupport ? true, vala_0_23, glibcLocales }:
, gobjectIntrospection, valaSupport ? true, vala_0_38, glibcLocales }:
stdenv.mkDerivation rec {
name = "telepathy-glib-0.24.1";
@ -13,8 +13,8 @@ stdenv.mkDerivation rec {
LC_ALL = "en_US.UTF-8";
propagatedBuildInputs = [dbus_glib glib gobjectIntrospection];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ libxslt glibcLocales python2 ] ++ stdenv.lib.optional valaSupport vala_0_23;
nativeBuildInputs = [ pkgconfig libxslt ] ++ stdenv.lib.optional valaSupport vala_0_38;
buildInputs = [ glibcLocales python2 ];
preConfigure = ''
substituteInPlace telepathy-glib/telepathy-glib.pc.in --replace Requires.private Requires

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

@ -1,16 +1,17 @@
{ stdenv, fetchurl, pkgconfig, glib, sqlite, gnome3, vala_0_23
{ stdenv, fetchgit, pkgconfig, glib, sqlite, gnome3, vala_0_38
, intltool, libtool, dbus_libs, telepathy_glib
, gtk3, json_glib, librdf_raptor2, dbus_glib
, pythonSupport ? true, python2Packages
}:
stdenv.mkDerivation rec {
version = "0.9.15";
version = "1.0";
name = "zeitgeist-${version}";
src = fetchurl {
url = "https://github.com/seiflotfy/zeitgeist/archive/v${version}.tar.gz";
sha256 = "07pnc7kmjpd0ncm32z6s3ny5p4zl52v9lld0n0f8sp6cw87k12p0";
src = fetchgit {
url = "git://anongit.freedesktop.org/git/zeitgeist/zeitgeist";
rev = "v${version}";
sha256 = "0vw6m0azycqabbz8f0fd8xsh5kf6j3ig4wpqlhw6sklvf44ii5b8";
};
NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
@ -19,9 +20,8 @@ stdenv.mkDerivation rec {
configureFlags = [ "--with-session-bus-services-dir=$(out)/share/dbus-1/services" ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ glib sqlite gnome3.gnome_common intltool
libtool dbus_libs telepathy_glib vala_0_23 dbus_glib
nativeBuildInputs = [ pkgconfig gnome3.gnome_common intltool libtool vala_0_38 ];
buildInputs = [ glib sqlite dbus_libs telepathy_glib dbus_glib
gtk3 json_glib librdf_raptor2 python2Packages.rdflib ];
prePatch = "patchShebangs .";

6
pkgs/development/python-modules/gst-python/default.nix
View File

@ -4,7 +4,7 @@
stdenv.mkDerivation rec {
pname = "gst-python";
version = "1.10.4";
version = "1.12.2";
name = "${pname}-${version}";
src = fetchurl {
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
"${meta.homepage}/src/gst-python/${name}.tar.xz"
"mirror://gentoo/distfiles/${name}.tar.xz"
];
sha256 = "04l2hvvz9b0f3nyds1k3yfk5di8a91fpr6maj19c11mwp1s82l2r";
sha256 = "0iwy0v2k27wd3957ich6j5f0f04b0wb2mb175ypf2lx68snk5k7l";
};
patches = [ ./different-path-with-pygobject.patch ];
@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
passthru.pythonPath = [];
meta = {
homepage = http://gstreamer.freedesktop.org;
homepage = https://gstreamer.freedesktop.org;
description = "Python bindings for GStreamer";

4
pkgs/os-specific/linux/xf86-input-wacom/default.nix
View File

@ -3,11 +3,11 @@
, ncurses, pkgconfig, randrproto, xorgserver, xproto, udev, libXinerama, pixman }:
stdenv.mkDerivation rec {
name = "xf86-input-wacom-0.34.0";
name = "xf86-input-wacom-0.35.0";
src = fetchurl {
url = "mirror://sourceforge/linuxwacom/${name}.tar.bz2";
sha256 = "0idhkigl0pnyp08sqm6bqfb4h20v6rjrb71z1gdv59gk7d7qwpgi";
sha256 = "0za44snc0zirq65a4lxsmg7blp1bynj6j835hm459x8yx1qhmxjm";
};
buildInputs = [ inputproto libX11 libXext libXi libXrandr libXrender

43
pkgs/tools/misc/colord/default.nix
View File

@ -1,51 +1,44 @@
{ stdenv, fetchurl, bash-completion
, glib, polkit, pkgconfig, intltool, gusb, libusb1, lcms2, sqlite, systemd, dbus
, gtk_doc, gobjectIntrospection, argyllcms, autoreconfHook
, glib, polkit, pkgconfig, gettext, gusb, lcms2, sqlite, systemd, dbus
, gobjectIntrospection, argyllcms, meson, ninja, libxml2, vala_0_38
, libgudev, sane-backends }:
stdenv.mkDerivation rec {
name = "colord-1.2.12";
name = "colord-1.4.1";
src = fetchurl {
url = "http://www.freedesktop.org/software/colord/releases/${name}.tar.xz";
sha256 = "0flcsr148xshjbff030pgyk9ar25an901m9q1pjgjdvaq5j1h96m";
sha256 = "0m854clp8szvq38z16jpazzlqfb3lb3icxcfnsisfrc25748y1ib";
};
enableParallelBuilding = true;
# Version mismatch requires intltoolize to overwrite
# with newer version.
preConfigure = ''
intltoolize --force
'';
configureFlags = [
"--enable-sane"
"--with-udevrulesdir=$(out)/lib/udev/rules.d"
"--with-systemdsystemunitdir=$(out)/etc/systemd/system"
mesonFlags = [
"-Denable-sane=true"
"-Denable-vala=true"
"--localstatedir=/var"
"--disable-bash-completion"
"-Denable-bash-completion=true"
# TODO: man page cannot be build with docbook2x
"-Denable-man=false"
"-Denable-docs=false"
];
patches = [
./fix-build-paths.patch
];
# don't touch /var at install time, colord creates what it needs at runtime
postPatch = ''
sed -e "s|if test -w .*;|if false;|" -i src/Makefile.{am,in}
'';
nativeBuildInputs = [ meson pkgconfig vala_0_38 ninja gettext libxml2 gobjectIntrospection ];
nativeBuildInputs = [ autoreconfHook intltool pkgconfig ];
buildInputs = [ glib polkit gusb libusb1 lcms2 sqlite systemd dbus gobjectIntrospection
buildInputs = [ glib polkit gusb lcms2 sqlite systemd dbus
bash-completion argyllcms libgudev sane-backends ];
postInstall = ''
mkdir -p $out/etc/bash_completion.d
cp -v data/colormgr $out/etc/bash_completion.d
glib-compile-schemas $out/share/glib-2.0/schemas
'';
meta = {
description = "System service to manage, install and generate color profiles to accurately color manage input and output devices";
homepage = http://www.freedesktop.org/software/colord/intro.html;
homepage = https://www.freedesktop.org/software/colord/;
license = stdenv.lib.licenses.lgpl2Plus;
maintainers = [stdenv.lib.maintainers.marcweber];
platforms = stdenv.lib.platforms.linux;

56
pkgs/tools/misc/colord/fix-build-paths.patch Normal file
View File

@ -0,0 +1,56 @@
--- a/contrib/session-helper/meson.build
+++ b/contrib/session-helper/meson.build
@@ -21,7 +21,7 @@
output : 'colord-session.service',
configuration : con2,
install: true,
- install_dir: systemd.get_pkgconfig_variable('systemduserunitdir'),
+ install_dir: join_paths(get_option('prefix'), 'etc', 'systemd', 'user'),
)
endif
--- a/data/meson.build
+++ b/data/meson.build
@@ -8,13 +8,13 @@
if get_option('enable-systemd')
install_data('colord.conf',
- install_dir: systemd.get_pkgconfig_variable('tmpfilesdir')
+ install_dir: join_paths(get_option('prefix'), 'lib', 'tmpfiles.d')
)
endif
if get_option('enable-bash-completion')
install_data('colormgr',
- install_dir: bash_completion.get_pkgconfig_variable('completionsdir')
+ install_dir: join_paths(get_option('prefix'), 'etc', 'bash_completion.d')
)
endif
@@ -31,7 +31,7 @@
output : 'colord.service',
configuration : con2,
install: true,
- install_dir: systemd.get_pkgconfig_variable('systemdsystemunitdir'),
+ install_dir: join_paths(get_option('prefix'), 'etc', 'systemd', 'system'),
)
endif
--- a/meson.build
+++ b/meson.build
@@ -258,6 +258,3 @@
subdir('policy')
subdir('rules')
subdir('src')
-
-meson.add_install_script('meson_post_install.sh',
- localstatedir, get_option('with-daemon-user'))
--- a/rules/meson.build
+++ b/rules/meson.build
@@ -9,5 +9,5 @@
sensor_rules_in,
'95-cd-devices.rules',
],
- install_dir : join_paths(udev.get_pkgconfig_variable('udevdir'), 'rules.d')
+ install_dir : join_paths(get_option('prefix'), 'lib', 'udev', 'rules.d')
)

4
pkgs/tools/misc/fwup/default.nix
View File

@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
name = "fwup-${version}";
version = "0.14.3";
version = "0.16.1";
src = fetchFromGitHub {
owner = "fhunleth";
repo = "fwup";
rev = "v${version}";
sha256 = "15sjpxw1llpipshriivpha6470lkvhcgs5wh5mlaabjbvrgxygqh";
sha256 = "1hphgpwxzdbfswzxbx0jm7lma1xkkwxvm8ll3jp2ljmimqzzb7jf";
};
doCheck = true;

18
pkgs/tools/misc/ostree/default.nix
View File

@ -1,24 +1,24 @@
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gtk_doc, gobjectIntrospection
, libgsystem, xz, e2fsprogs, libsoup, gpgme, which, autoconf, automake, libtool, fuse
, libcap, yacc, libxslt, docbook_xsl, docbook_xml_dtd_42
, libarchive, libcap, bzip2, yacc, libxslt, docbook_xsl, docbook_xml_dtd_42
}:
let
libglnx-src = fetchFromGitHub {
owner = "GNOME";
repo = "libglnx";
rev = "50a0feaba03ffa5a1980d3a14487276b8f49f8a6";
sha256 = "1rn5jdh84y1yfpqmvidx82lkm0jr7scjzdrps57r37ksxvrk3ibs";
rev = "5362f6bc3ff3e30f379e767b203d15c9e56d6f08";
sha256 = "1l4vm7bx3cf4q44n3a1i2gszyryqyimcxvx54gna72q7dw130mrr";
};
bsdiff-src = fetchFromGitHub {
owner = "mendsley";
repo = "bsdiff";
rev = "7d70d8f4ff48345bc76e314c9d98da91f78873fa";
sha256 = "0ai2kykj8i4bqcy3gry36r3n4ax0fldncfhksl5b293nf2fihnws";
rev = "1edf9f656850c0c64dae260960fabd8249ea9c60";
sha256 = "1h71d2h2d3anp4msvpaff445rnzdxii3id2yglqk7af9i43kdsn1";
};
version = "2017.9";
version = "2017.12";
in stdenv.mkDerivation {
name = "ostree-${version}";
@ -26,7 +26,7 @@ in stdenv.mkDerivation {
rev = "v${version}";
owner = "ostreedev";
repo = "ostree";
sha256 = "1040xcw8qcs6xq8x4wg47hha3915qzb6lndb38wjyn6wzl1680q3";
sha256 = "0gxvpzwz7z4zihz5hkn6ajv7f6gas4zi2pznhi5v6wy7cw06if68";
};
nativeBuildInputs = [
@ -34,7 +34,7 @@ in stdenv.mkDerivation {
libxslt docbook_xsl docbook_xml_dtd_42
];
buildInputs = [ libgsystem xz e2fsprogs libsoup gpgme fuse libcap ];
buildInputs = [ libgsystem xz e2fsprogs libsoup gpgme fuse libarchive libcap bzip2 ];
prePatch = ''
rmdir libglnx bsdiff
@ -50,7 +50,7 @@ in stdenv.mkDerivation {
meta = with stdenv.lib; {
description = "Git for operating system binaries";
homepage = "http://live.gnome.org/OSTree/";
homepage = https://ostree.readthedocs.io/en/latest/;
license = licenses.lgpl2Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ copumpkin ];

10
pkgs/tools/networking/network-manager-applet/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchurl, intltool, pkgconfig, libglade, networkmanager, gnome3
, libnotify, libsecret, polkit, isocodes, modemmanager, librsvg
, libnotify, libsecret, polkit, isocodes, modemmanager
, mobile_broadband_provider_info, glib_networking, gsettings_desktop_schemas
, makeWrapper, udev, libgudev, hicolor_icon_theme, jansson, wrapGAppsHook, webkitgtk
, udev, libgudev, hicolor_icon_theme, jansson, wrapGAppsHook, webkitgtk
, withGnome ? false }:
stdenv.mkDerivation rec {
@ -24,13 +24,13 @@ stdenv.mkDerivation rec {
buildInputs = [
gnome3.gtk libglade networkmanager libnotify libsecret gsettings_desktop_schemas
polkit isocodes makeWrapper udev libgudev gnome3.gconf gnome3.libgnome_keyring
modemmanager jansson librsvg glib_networking gnome3.dconf
polkit isocodes udev libgudev gnome3.libgnome_keyring
modemmanager jansson glib_networking
] ++ stdenv.lib.optional withGnome webkitgtk;
nativeBuildInputs = [ intltool pkgconfig wrapGAppsHook ];
propagatedUserEnvPkgs = [ gnome3.gconf gnome3.gnome_keyring hicolor_icon_theme ];
propagatedUserEnvPkgs = [ gnome3.gnome_keyring hicolor_icon_theme ];
makeFlags = [
''CFLAGS=-DMOBILE_BROADBAND_PROVIDER_INFO=\"${mobile_broadband_provider_info}/share/mobile-broadband-provider-info/serviceproviders.xml\"''

8
pkgs/tools/package-management/packagekit/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, lib
, intltool, glib, pkgconfig, polkit, python, sqlite, systemd
, gobjectIntrospection, vala_0_23, gtk_doc, autoreconfHook, autoconf-archive
, gobjectIntrospection, vala_0_38, gtk_doc, autoreconfHook, autoconf-archive
# TODO: set enableNixBackend to true, as soon as it builds
, nix, enableNixBackend ? false, boost
, enableCommandNotFound ? false
@ -8,16 +8,16 @@
stdenv.mkDerivation rec {
name = "packagekit-${version}";
version = "1.1.3";
version = "1.1.7";
src = fetchFromGitHub {
owner = "hughsie";
repo = "PackageKit";
rev = "PACKAGEKIT_${lib.replaceStrings ["."] ["_"] version}";
sha256 = "150mpar7bhlvwfpwsr6zrjn3yggvklzr6nlhk0shaxnrfkfxvvb6";
sha256 = "076rrczmyhapj87pxqldsar5pbz4mid6cm9l1n91zh2q403chdkb";
};
buildInputs = [ glib polkit systemd python gobjectIntrospection vala_0_23 ]
buildInputs = [ glib polkit systemd python gobjectIntrospection vala_0_38 ]
++ lib.optional enableBashCompletion bash-completion;
propagatedBuildInputs = [ sqlite nix boost ];
nativeBuildInputs = [ intltool pkgconfig autoreconfHook autoconf-archive gtk_doc ];

1
pkgs/top-level/all-packages.nix
View File

@ -6733,6 +6733,7 @@ with pkgs;
spidermonkey_17 = callPackage ../development/interpreters/spidermonkey/17.nix { };
spidermonkey_31 = callPackage ../development/interpreters/spidermonkey/31.nix { };
spidermonkey_38 = callPackage ../development/interpreters/spidermonkey/38.nix { };
spidermonkey_52 = callPackage ../development/interpreters/spidermonkey/52.nix { };
spidermonkey = spidermonkey_31;
ssm-agent = callPackage ../applications/networking/cluster/ssm-agent { };