commit bc90fe1fbb74070450774cfe1645a02846761557 · pyrox.dev/nixpkgs

+5 -6

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

···

       1
       1
       -
       { stdenv, fetchurl, glib, pkgconfig, gnome3, intltool

     

       2
       2
       -
       , gobjectIntrospection, makeWrapper }:

     

       1
       1
       +
       { stdenv, fetchurl, meson, ninja, glib, pkgconfig, gnome3, appstream-glib, gettext }:

     

       3
       2
        
       

     

       4
       3
        
       stdenv.mkDerivation rec {

     

       5
       4
        
         name = "nautilus-sendto-${version}";

     

       6
       5
        
       

     

       7
       7
       -
         version = "3.8.1";

     

       6
       6
       +
         version = "3.8.6";

     

       8
       7
        
       

     

       9
       8
        
         src = fetchurl {

     

       10
       9
        
           url = "mirror://gnome/sources/nautilus-sendto/3.8/${name}.tar.xz";

     

       11
       11
       -
           sha256 = "03fa46bff271acdbdedab6243b2a84e5ed3daa19c81b69d087b3e852c8fe5dab";

     

       10
       10
       +
           sha256 = "164d7c6e8bae29c4579bcc67a7bf50d783662b1545b62f3008e7ea3c0410e04d";

     

       12
       11
        
         };

     

       13
       12
        
       

     

       14
       14
       -
         nativeBuildInputs = [ pkgconfig ];

     

       15
       15
       -
         buildInputs = [ glib gobjectIntrospection intltool makeWrapper ];

     

       13
       13
       +
         nativeBuildInputs = [ meson ninja pkgconfig appstream-glib gettext ];

     

       14
       14
       +
         buildInputs = [ glib ];

     

       16
       15
        
       

     

       17
       16
        
         meta = with stdenv.lib; {

     

       18
       17
        
           description = "Integrates Evolution and Pidgin into the Nautilus file manager";

+3 -4

pkgs/desktops/gnome-3/core/dconf/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, vala_0_32, libxslt, pkgconfig, glib, dbus_glib, gnome3

     

       1
       1
       +
       { stdenv, fetchurl, vala, libxslt, pkgconfig, glib, dbus_glib, gnome3

     

       2
       2
        
       , libxml2, intltool, docbook_xsl_ns, docbook_xsl, makeWrapper }:

     

       3
       3
        
       

     

       4
       4
        
       let

     
···

       15
       15
        
       

     

       16
       16
        
         outputs = [ "out" "lib" "dev" ];

     

       17
       17
        
       

     

       18
       18
       -
         nativeBuildInputs = [ pkgconfig ];

     

       19
       19
       -
         buildInputs = [ vala_0_32 libxslt glib dbus_glib gnome3.gtk libxml2

     

       20
       20
       -
                         intltool docbook_xsl docbook_xsl_ns makeWrapper ];

     

       18
       18
       +
         nativeBuildInputs = [ vala pkgconfig intltool libxslt libxml2 docbook_xsl docbook_xsl_ns makeWrapper ];

     

       19
       19
       +
         buildInputs = [ glib dbus_glib ];

     

       21
       20
        
       

     

       22
       21
        
         postConfigure = stdenv.lib.optionalString stdenv.isDarwin ''

     

       23
       22
        
           substituteInPlace client/Makefile \

+2 -2

pkgs/desktops/gnome-3/core/folks/default.nix

···

       8
       8
        
         majorVersion = "0.11";

     

       9
       9
        
       in

     

       10
       10
        
       stdenv.mkDerivation rec {

     

       11
       11
       -
         name = "folks-${majorVersion}.3";

     

       11
       11
       +
         name = "folks-${majorVersion}.4";

     

       12
       12
        
       

     

       13
       13
        
         src = fetchurl {

     

       14
       14
        
           url = "mirror://gnome/sources/folks/${majorVersion}/${name}.tar.xz";

     

       15
       15
       -
           sha256 = "2a2828a7c87fd39e5786f8f2cf0ebe47576a74974f1355c478a6dc747d7bcb64";

     

       15
       15
       +
           sha256 = "16hqh2gxlbx0b0hgq216hndr1m72vj54jvryzii9zqkk0g9kxc57";

     

       16
       16
        
         };

     

       17
       17
        
       

     

       18
       18
        
         propagatedBuildInputs = [ glib gnome3.libgee sqlite ];

+2 -2

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

···

       4
       4
        
       

     

       5
       5
        
       stdenv.mkDerivation rec {

     

       6
       6
        
         major = "0.3";

     

       7
       7
       -
         minor = "3";

     

       7
       7
       +
         minor = "5";

     

       8
       8
        
         name = "grilo-plugins-${major}.${minor}";

     

       9
       9
        
       

     

       10
       10
        
         src = fetchurl {

     

       11
       11
        
           url = "mirror://gnome/sources/grilo-plugins/${major}/${name}.tar.xz";

     

       12
       12
       -
           sha256 = "fe66e887847fef9c361bcb7226047c43b2bc22b172aaf22afd5534947cc85b9c";

     

       12
       12
       +
           sha256 = "1yv8a0mfd5qmdbdrnd0is5c51s1mvibhw61na99iagnbirxq4xr9";

     

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
        
         installFlags = [ "GRL_PLUGINS_DIR=$(out)/lib/grilo-${major}" ];

+2 -2

pkgs/desktops/gnome-3/core/grilo/default.nix

···

       3
       3
        
       

     

       4
       4
        
       stdenv.mkDerivation rec {

     

       5
       5
        
         major = "0.3"; # if you change this, also change ./setup-hook.sh

     

       6
       6
       -
         minor = "3";

     

       6
       6
       +
         minor = "4";

     

       7
       7
        
         name = "grilo-${major}.${minor}";

     

       8
       8
        
       

     

       9
       9
        
         src = fetchurl {

     

       10
       10
        
           url = "mirror://gnome/sources/grilo/${major}/${name}.tar.xz";

     

       11
       11
       -
           sha256 = "1qx072m0gl6m3d5g5cbbf13p4h217icmlxjnrn829x5xqwi451sw";

     

       11
       11
       +
           sha256 = "0vh67gja6yn7czh77ssmx6ncp99fl2926pbi2hplqms27c2n8sbw";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         setupHook = ./setup-hook.sh;

+2 -2

pkgs/desktops/gnome-3/core/libgdata/default.nix

···

       5
       5
        
         majorVersion = "0.17";

     

       6
       6
        
       in

     

       7
       7
        
       stdenv.mkDerivation rec {

     

       8
       8
       -
         name = "libgdata-${majorVersion}.6";

     

       8
       8
       +
         name = "libgdata-${majorVersion}.9";

     

       9
       9
        
       

     

       10
       10
        
         src = fetchurl {

     

       11
       11
        
           url = "mirror://gnome/sources/libgdata/${majorVersion}/${name}.tar.xz";

     

       12
       12
       -
           sha256 = "8b6a3ff1db23bd9e5ebbcc958b29b769a898f892eed4798222d562ba69df30b0";

     

       12
       12
       +
           sha256 = "0fj54yqxdapdppisqm1xcyrpgcichdmipq0a0spzz6009ikzgi45";

     

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
        
         NIX_CFLAGS_COMPILE = "-I${gnome3.libsoup.dev}/include/libsoup-gnome-2.4/ -I${gnome3.gcr}/include/gcr-3 -I${gnome3.gcr}/include/gck-1";

+11 -8

pkgs/desktops/gnome-3/core/libgxps/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, pkgconfig, glib, cairo, libarchive, freetype, libjpeg, libtiff

     

       2
       2
       -
       , openssl, bzip2, acl, attr, libxml2

     

       1
       1
       +
       { stdenv, fetchurl, meson, ninja, pkgconfig, glib, gobjectIntrospection, cairo

     

       2
       2
       +
       , libarchive, freetype, libjpeg, libtiff

     

       3
       3
        
       }:

     

       4
       4
        
       

     

       5
       5
        
       stdenv.mkDerivation rec {

     

       6
       6
       -
         name = "libgxps-0.2.2";

     

       6
       6
       +
         name = "libgxps-0.3.0";

     

       7
       7
        
       

     

       8
       8
        
         src = fetchurl {

     

       9
       9
       -
           url = "http://ftp.acc.umu.se/pub/GNOME/core/3.10/3.10.2/sources/${name}.tar.xz";

     

       10
       10
       -
           sha256 = "1gi0b0x0354jyqc48vspk2hg2q1403cf2p9ibj847nzhkdrh9l9r";

     

       9
       9
       +
           url = "mirror://gnome/sources/libgxps/0.3/${name}.tar.xz";

     

       10
       10
       +
           sha256 = "412b1343bd31fee41f7204c47514d34c563ae34dafa4cc710897366bd6cd0fae";

     

       11
       11
        
         };

     

       12
       12
        
       

     

       13
       13
       -
         nativeBuildInputs = [ pkgconfig ];

     

       14
       14
       -
         buildInputs = [ glib cairo freetype libjpeg libtiff acl openssl bzip2 attr libxml2 ];

     

       13
       13
       +
         nativeBuildInputs = [ meson ninja pkgconfig gobjectIntrospection ];

     

       14
       14
       +
         buildInputs = [ glib cairo freetype libjpeg libtiff ];

     

       15
       15
        
         propagatedBuildInputs = [ libarchive ];

     

       16
       16
        
       

     

       17
       17
       -
         configureFlags = "--without-liblcms2";

     

       17
       17
       +
         mesonFlags = [

     

       18
       18
       +
           "-Denable-test=false"

     

       19
       19
       +
           "-Dwith-liblcms2=false"

     

       20
       20
       +
         ];

     

       18
       21
        
       

     

       19
       22
        
         meta = with stdenv.lib; {

     

       20
       23
        
           platforms = platforms.linux;

+2 -2

pkgs/desktops/gnome-3/core/libpeas/src.nix

···

       1
       1
        
       # Autogenerated by maintainers/scripts/gnome.sh update

     

       2
       2
        
       

     

       3
       3
        
       fetchurl: rec {

     

       4
       4
       -
         major = "1.18";

     

       4
       4
       +
         major = "1.22";

     

       5
       5
        
         minor = "0";

     

       6
       6
        
         version = "${major}.${minor}";

     

       7
       7
        
         name = "libpeas-${version}";

     

       8
       8
        
       

     

       9
       9
        
         src = fetchurl {

     

       10
       10
        
           url = "mirror://gnome/sources/libpeas/${major}/${name}.tar.xz";

     

       11
       11
       -
           sha256 = "09jy2rwwgp0xx7cnypxl56m7zzxnj3j4v58xqjxjasf3chn88jdz";

     

       11
       11
       +
           sha256 = "0qm908kisyjzjxvygdl18hjqxvvgkq9w0phs2g55pck277sw0bsv";

     

       12
       12
        
         };

     

       13
       13
        
       }

+1

pkgs/desktops/gnome-3/core/libzapojit/default.nix

···

       12
       12
        
         buildInputs = [ glib intltool json_glib rest libsoup gtk gnome_online_accounts ];

     

       13
       13
        
       

     

       14
       14
        
         meta = with stdenv.lib; {

     

       15
       15
       +
           description = "GObject wrapper for the SkyDrive and Hotmail REST APIs";

     

       15
       16
        
           platforms = platforms.linux;

     

       16
       17
        
         };

     

       17
       18
        
       }

+27 -10

pkgs/desktops/gnome-3/core/mutter/default.nix

···

       1
       1
       -
       { fetchurl, stdenv, pkgconfig, gnome3, intltool, gobjectIntrospection, upower, cairo

     

       1
       1
       +
       { fetchurl, fetchpatch, stdenv, pkgconfig, gnome3, intltool, gobjectIntrospection, upower, cairo

     

       2
       2
        
       , pango, cogl, clutter, libstartup_notification, libcanberra_gtk2, zenity, libcanberra_gtk3

     

       3
       3
        
       , libtool, makeWrapper, xkeyboard_config, libxkbfile, libxkbcommon, libXtst, libudev, libinput

     

       4
       4
       -
       , libgudev, xwayland }:

     

       4
       4
       +
       , libgudev, libwacom, xwayland, autoreconfHook }:

     

       5
       5
        
       

     

       6
       6
        
       stdenv.mkDerivation rec {

     

       7
       7
        
         inherit (import ./src.nix fetchurl) name src;

     
···

       9
       9
        
         # fatal error: gio/gunixfdlist.h: No such file or directory

     

       10
       10
        
         NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0 -Wno-error=format -Wno-error=sign-compare";

     

       11
       11
        
       

     

       12
       12
       -
         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";

     

       12
       12
       +
         configureFlags = [

     

       13
       13
       +
           "--with-x"

     

       14
       14
       +
           "--disable-static"

     

       15
       15
       +
           "--enable-shape"

     

       16
       16
       +
           "--enable-sm"

     

       17
       17
       +
           "--enable-startup-notification"

     

       18
       18
       +
           "--enable-xsync"

     

       19
       19
       +
           "--enable-verbose-mode"

     

       20
       20
       +
           "--with-libcanberra"

     

       21
       21
       +
           "--with-xwayland-path=${xwayland}/bin/Xwayland"

     

       22
       22
       +
         ];

     

       13
       23
        
       

     

       14
       24
        
         propagatedBuildInputs = [

     

       15
       25
        
           # required for pkgconfig to detect mutter-clutter

     

       16
       26
        
           libXtst

     

       17
       27
        
         ];

     

       18
       28
        
       

     

       29
       29
       +
         nativeBuildInputs = [ autoreconfHook pkgconfig intltool libtool makeWrapper ];

     

       30
       30
       +
       

     

       19
       31
        
         buildInputs = with gnome3;

     

       20
       20
       -
           [ pkgconfig intltool glib gobjectIntrospection gtk gsettings_desktop_schemas upower

     

       32
       32
       +
           [ glib gobjectIntrospection gtk gsettings_desktop_schemas upower

     

       21
       33
        
             gnome_desktop cairo pango cogl clutter zenity libstartup_notification libcanberra_gtk2

     

       22
       22
       -
             gnome3.geocode_glib libudev libinput libgudev

     

       23
       23
       -
             libcanberra_gtk3 zenity libtool makeWrapper xkeyboard_config libxkbfile

     

       34
       34
       +
             gnome3.geocode_glib libudev libinput libgudev libwacom

     

       35
       35
       +
             libcanberra_gtk3 zenity xkeyboard_config libxkbfile

     

       24
       36
        
             libxkbcommon ];

     

       25
       37
        
       

     

       38
       38
       +
         patches = [

     

       39
       39
       +
           # https://bugzilla.gnome.org/show_bug.cgi?id=760670

     

       40
       40
       +
           (fetchpatch {

     

       41
       41
       +
             name = "libgudev-232.patch";

     

       42
       42
       +
             url = https://bugzilla.gnome.org/attachment.cgi?id=358904;

     

       43
       43
       +
             sha256 = "0chvd7g9f2zp3a0gdhvinsfvp2h10rwb6a8ja386vsrl93ac8pix";

     

       44
       44
       +
           })

     

       45
       45
       +
         ];

     

       46
       46
       +
       

     

       26
       47
        
         preFixup = ''

     

       27
       48
        
           wrapProgram "$out/bin/mutter" \

     

       28
       49
        
             --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"

     

       29
       50
        
         '';

     

       30
       30
       -
       

     

       31
       31
       -
         patches = [

     

       32
       32
       -
           ./x86.patch # ./math.patch

     

       33
       33
       -
         ];

     

       34
       51
        
       

     

       35
       52
        
         enableParallelBuilding = true;

     

       36
       53

-10

pkgs/desktops/gnome-3/core/mutter/math.patch

···

       1
       1
       -
       --- mutter-3.18.0/src/backends/meta-cursor-renderer.c.orig	2015-09-23 13:54:31.297523343 +0200

     

       2
       2
       -
       +++ mutter-3.18.0/src/backends/meta-cursor-renderer.c	2015-09-23 13:54:43.728271766 +0200

     

       3
       3
       -
       @@ -31,6 +31,7 @@

     

       4
       4
       -
        

     

       5
       5
       -
        #include <cogl/cogl.h>

     

       6
       6
       -
        #include <clutter/clutter.h>

     

       7
       7
       -
       +#include <math.h>

     

       8
       8
       -
        

     

       9
       9
       -
        #include "meta-stage.h"

     

       10
       10
       -

-20

pkgs/desktops/gnome-3/core/mutter/x86.patch

···

       1
       1
       -
       --- a/src/core/window.c	2015-05-26 10:52:41.382834963 +0200

     

       2
       2
       -
       +++ b/src/core/window.c	2015-05-26 10:53:03.039948034 +0200

     

       3
       3
       -
       @@ -3499,7 +3499,7 @@

     

       4
       4
       -
        

     

       5
       5
       -
        static MetaMonitorInfo *

     

       6
       6
       -
        find_monitor_by_winsys_id (MetaWindow *window,

     

       7
       7
       -
       -                           guint       winsys_id)

     

       8
       8
       -
       +                           gint       winsys_id)

     

       9
       9
       -
        {

     

       10
       10
       -
          int i;

     

       11
       11
       -
        

     

       12
       12
       -
       @@ -3618,7 +3618,7 @@

     

       13
       13
       -
           */

     

       14
       14
       -
        

     

       15
       15
       -
          gboolean did_placement;

     

       16
       16
       -
       -  guint old_output_winsys_id;

     

       17
       17
       -
       +  gint old_output_winsys_id;

     

       18
       18
       -
          MetaRectangle unconstrained_rect;

     

       19
       19
       -
          MetaRectangle constrained_rect;

     

       20
       20
       -
          MetaMoveResizeResultFlags result = 0;

+3 -8

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

···

       1
       1
        
       { stdenv, fetchurl, pkgconfig, file, intltool, gmime, libxml2, libsoup, gnome3 }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
       -
         name = "totem-pl-parser-3.10.2";

     

       4
       4
       +
         inherit (import ./src.nix fetchurl) name src;

     

       5
       5
        
       

     

       6
       6
       -
         src = fetchurl {

     

       7
       7
       -
           url = "mirror://gnome/sources/totem-pl-parser/3.10/${name}.tar.xz";

     

       8
       8
       -
           sha256 = "38be09bddc46ddecd2b5ed7c82144ef52aafe879a5ec3d8b192b4b64ba995469";

     

       9
       9
       -
         };

     

       10
       10
       -
       

     

       11
       11
       -
         nativeBuildInputs = [ pkgconfig ];

     

       12
       12
       -
         buildInputs = [ file intltool gmime libxml2 libsoup ];

     

       6
       6
       +
         nativeBuildInputs = [ pkgconfig file intltool ];

     

       7
       7
       +
         buildInputs = [ gmime libxml2 libsoup ];

     

       13
       8
        
       

     

       14
       9
        
         meta = with stdenv.lib; {

     

       15
       10
        
           homepage = https://wiki.gnome.org/Apps/Videos;

+10

pkgs/desktops/gnome-3/core/totem-pl-parser/src.nix

···

       1
       1
       +
       # Autogenerated by maintainers/scripts/gnome.sh update

     

       2
       2
       +
       

     

       3
       3
       +
       fetchurl: {

     

       4
       4
       +
         name = "totem-pl-parser-3.10.2";

     

       5
       5
       +
       

     

       6
       6
       +
         src = fetchurl {

     

       7
       7
       +
           url = mirror://gnome/sources/totem-pl-parser/3.10/totem-pl-parser-3.10.2.tar.xz;

     

       8
       8
       +
           sha256 = "38be09bddc46ddecd2b5ed7c82144ef52aafe879a5ec3d8b192b4b64ba995469";

     

       9
       9
       +
         };

     

       10
       10
       +
       }

+3 -3

pkgs/desktops/gnome-3/core/vte/src.nix

···

       1
       1
        
       # Autogenerated by maintainers/scripts/gnome.sh update

     

       2
       2
        
       

     

       3
       3
        
       fetchurl: {

     

       4
       4
       -
         name = "vte-0.48.3";

     

       4
       4
       +
         name = "vte-0.50.1";

     

       5
       5
        
       

     

       6
       6
        
         src = fetchurl {

     

       7
       7
       -
           url = mirror://gnome/sources/vte/0.48/vte-0.48.3.tar.xz;

     

       8
       8
       -
           sha256 = "a3a9fb182740b392a45cd3f46fa61a985f68bb6b1817b52daec22034c46158c3";

     

       7
       7
       +
           url = mirror://gnome/sources/vte/0.50/vte-0.50.1.tar.xz;

     

       8
       8
       +
           sha256 = "cf1708e3e573160e1db107014b3ef70888fefe6b668373fed70e8d1cac45a8c2";

     

       9
       9
        
         };

     

       10
       10
        
       }

+3 -3

pkgs/development/compilers/orc/default.nix

···

       1
       1
        
       { stdenv, fetchurl }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
       -
         name = "orc-0.4.26";

     

       4
       4
       +
         name = "orc-0.4.27";

     

       5
       5
        
       

     

       6
       6
        
         src = fetchurl {

     

       7
       7
       -
           url = "http://gstreamer.freedesktop.org/src/orc/${name}.tar.xz";

     

       8
       8
       -
           sha256 = "0jd69ynvr3k70mlxxgbsk047l1rd63m1wkj3qdcq7644xy0gllkx";

     

       7
       7
       +
           url = "https://gstreamer.freedesktop.org/src/orc/${name}.tar.xz";

     

       8
       8
       +
           sha256 = "14vbwdydwarcvswzf744jdjb3ibhv6k4j6hzdacfan41zic3xrai";

     

       9
       9
        
         };

     

       10
       10
        
       

     

       11
       11
        
         outputs = [ "out" "dev" ];

+62

pkgs/development/interpreters/spidermonkey/52.nix

···

       1
       1
       +
       { stdenv, fetchurl, autoconf213, pkgconfig, perl, python2, zip, which, readline, icu, zlib, nspr }:

     

       2
       2
       +
       

     

       3
       3
       +
       stdenv.mkDerivation rec {

     

       4
       4
       +
         version = "52.2.1gnome1";

     

       5
       5
       +
         name = "spidermonkey-${version}";

     

       6
       6
       +
       

     

       7
       7
       +
         # the release notes point to some guys home directory, see

     

       8
       8
       +
         # https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey/Releases/38

     

       9
       9
       +
         # probably it would be more ideal to pull a particular tag/revision

     

       10
       10
       +
         # from the mercurial repo

     

       11
       11
       +
         src = fetchurl {

     

       12
       12
       +
           url = "mirror://gnome/teams/releng/tarballs-needing-help/mozjs/mozjs-${version}.tar.gz";

     

       13
       13
       +
           sha256 = "1bxhz724s1ch1c0kdlzlg9ylhg1mk8kbhdgfkax53fyvn51pjs9i";

     

       14
       14
       +
         };

     

       15
       15
       +
       

     

       16
       16
       +
         buildInputs = [ readline icu zlib nspr ];

     

       17
       17
       +
         nativeBuildInputs = [ autoconf213 pkgconfig perl which python2 zip ];

     

       18
       18
       +
       

     

       19
       19
       +
         postUnpack = "sourceRoot=\${sourceRoot}/js/src";

     

       20
       20
       +
       

     

       21
       21
       +
         preConfigure = ''

     

       22
       22
       +
           export CXXFLAGS="-fpermissive"

     

       23
       23
       +
           export LIBXUL_DIST=$out

     

       24
       24
       +
           export PYTHON="${python2.interpreter}"

     

       25
       25
       +
         '';

     

       26
       26
       +
       

     

       27
       27
       +
         configureFlags = [

     

       28
       28
       +
           "--enable-threadsafe"

     

       29
       29
       +
           "--with-system-nspr"

     

       30
       30
       +
           "--with-system-zlib"

     

       31
       31
       +
           "--with-system-icu"

     

       32
       32
       +
           "--with-intl-api"

     

       33
       33
       +
           "--enable-readline"

     

       34
       34
       +
       

     

       35
       35
       +
           # enabling these because they're wanted by 0ad. They may or may

     

       36
       36
       +
           # not be good defaults for other uses.

     

       37
       37
       +
           "--enable-gcgenerational"

     

       38
       38
       +
           "--enable-shared-js"

     

       39
       39
       +
         ];

     

       40
       40
       +
       

     

       41
       41
       +
         # This addresses some build system bug. It's quite likely to be safe

     

       42
       42
       +
         # to re-enable parallel builds if the source revision changes.

     

       43
       43
       +
         enableParallelBuilding = true;

     

       44
       44
       +
       

     

       45
       45
       +
         postFixup = ''

     

       46
       46
       +
           # The headers are symlinks to a directory that doesn't get put

     

       47
       47
       +
           # into $out, so they end up broken. Fix that by just resolving the

     

       48
       48
       +
           # symlinks.

     

       49
       49
       +
           for i in $(find $out -type l); do

     

       50
       50
       +
             cp --remove-destination "$(readlink "$i")" "$i";

     

       51
       51
       +
           done

     

       52
       52
       +
         '';

     

       53
       53
       +
       

     

       54
       54
       +
         meta = with stdenv.lib; {

     

       55
       55
       +
           description = "Mozilla's JavaScript engine written in C/C++";

     

       56
       56
       +
           homepage = https://developer.mozilla.org/en/SpiderMonkey;

     

       57
       57
       +
           # TODO: MPL/GPL/LGPL tri-license.

     

       58
       58
       +
       

     

       59
       59
       +
           maintainers = [ maintainers.abbradar ];

     

       60
       60
       +
           platforms = platforms.linux;

     

       61
       61
       +
         };

     

       62
       62
       +
       }

+4 -4

pkgs/development/libraries/appstream-glib/default.nix

···

       1
       1
       -
       { stdenv, fetchFromGitHub, pkgconfig, gettext, gtk3, intltool, glib

     

       2
       2
       -
       , gtk_doc, autoconf, automake, libtool, libarchive

     

       3
       3
       -
       , gobjectIntrospection, sqlite, libsoup, gcab, attr, acl, docbook_xsl

     

       4
       4
       -
       , libuuid, json_glib, autoconf-archive, meson, gperf, ninja, gdk_pixbuf

     

       1
       1
       +
       { stdenv, fetchFromGitHub, pkgconfig, gettext, gtk3, glib

     

       2
       2
       +
       , gtk_doc, libarchive, gobjectIntrospection

     

       3
       3
       +
       , sqlite, libsoup, gcab, attr, acl, docbook_xsl

     

       4
       4
       +
       , libuuid, json_glib, meson, gperf, ninja

     

       5
       5
        
       }:

     

       6
       6
        
       stdenv.mkDerivation rec {

     

       7
       7
        
         name = "appstream-glib-0.7.2";

+2 -2

pkgs/development/libraries/clutter-gtk/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         major = "1.8";

     

       5
       5
       -
         minor = "2";

     

       5
       5
       +
         minor = "4";

     

       6
       6
        
         name = "clutter-gtk-${major}.${minor}";

     

       7
       7
        
       

     

       8
       8
        
         src = fetchurl {

     

       9
       9
        
           url = "mirror://gnome/sources/clutter-gtk/${major}/${name}.tar.xz";

     

       10
       10
       -
           sha256 = "da27d486325490ad3f65d2abf9413aeb8b4a8f7b559e4b2f73567a5344a26b94";

     

       10
       10
       +
           sha256 = "01ibniy4ich0fgpam53q252idm7f4fn5xg5qvizcfww90gn9652j";

     

       11
       11
        
         };

     

       12
       12
        
       

     

       13
       13
        
         propagatedBuildInputs = [ clutter gtk3 ];

+2 -2

pkgs/development/libraries/glib-networking/default.nix

···

       2
       2
        
       , gsettings_desktop_schemas }:

     

       3
       3
        
       

     

       4
       4
        
       let

     

       5
       5
       -
         ver_maj = "2.50";

     

       5
       5
       +
         ver_maj = "2.54";

     

       6
       6
        
         ver_min = "0";

     

       7
       7
        
       in

     

       8
       8
        
       stdenv.mkDerivation rec {

     
···

       10
       10
        
       

     

       11
       11
        
         src = fetchurl {

     

       12
       12
        
           url = "mirror://gnome/sources/glib-networking/${ver_maj}/${name}.tar.xz";

     

       13
       13
       -
           sha256 = "3f1a442f3c2a734946983532ce59ed49120319fdb10c938447c373d5e5286bee";

     

       13
       13
       +
           sha256 = "5961b3779080b72314b373ff5d4790eb7e41b75ca91816ad7a81ef32922f7096";

     

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
        
         outputs = [ "out" "dev" ]; # to deal with propagatedBuildInputs

+3 -3

pkgs/development/libraries/glibmm/default.nix

···

       1
       1
        
       { stdenv, fetchurl, pkgconfig, gnum4, glib, libsigcxx }:

     

       2
       2
        
       

     

       3
       3
        
       let

     

       4
       4
       -
         ver_maj = "2.50";

     

       5
       5
       -
         ver_min = "0";

     

       4
       4
       +
         ver_maj = "2.54";

     

       5
       5
       +
         ver_min = "1";

     

       6
       6
        
       in

     

       7
       7
        
       stdenv.mkDerivation rec {

     

       8
       8
        
         name = "glibmm-${ver_maj}.${ver_min}";

     

       9
       9
        
       

     

       10
       10
        
         src = fetchurl {

     

       11
       11
        
           url = "mirror://gnome/sources/glibmm/${ver_maj}/${name}.tar.xz";

     

       12
       12
       -
           sha256 = "df726e3c6ef42b7621474b03b644a2e40ec4eef94a1c5a932c1e740a78f95e94";

     

       12
       12
       +
           sha256 = "0jkapw18icz59cmlmsl00nwwz0wh291kb4hc9z9hxmq45drqrhkw";

     

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
        
         outputs = [ "out" "dev" ];

+2 -2

pkgs/development/libraries/gobject-introspection/default.nix

···

       7
       7
        
       # In that case its about 6MB which could be separated

     

       8
       8
        
       

     

       9
       9
        
       let

     

       10
       10
       -
         ver_maj = "1.52";

     

       10
       10
       +
         ver_maj = "1.54";

     

       11
       11
        
         ver_min = "1";

     

       12
       12
        
       in

     

       13
       13
        
       with stdenv.lib;

     
···

       16
       16
        
       

     

       17
       17
        
         src = fetchurl {

     

       18
       18
        
           url = "mirror://gnome/sources/gobject-introspection/${ver_maj}/${name}.tar.xz";

     

       19
       19
       -
           sha256 = "1x5gkyrglv3dn9b4fsgw6asqgjw1wj7qc37g9pyac6pyaa6w7l1f";

     

       19
       19
       +
           sha256 = "0zl7pfkzkm07733391b4f3cwjbnvb1nwvpmajf5bajh6bxgfv3dq";

     

       20
       20
        
         };

     

       21
       21
        
       

     

       22
       22
        
         outputs = [ "out" "dev" ];

+3 -3

pkgs/development/libraries/gstreamer/bad/default.nix

···

       17
       17
        
         inherit (stdenv.lib) optional optionalString;

     

       18
       18
        
       in

     

       19
       19
        
       stdenv.mkDerivation rec {

     

       20
       20
       -
         name = "gst-plugins-bad-1.10.4";

     

       20
       20
       +
         name = "gst-plugins-bad-1.12.2";

     

       21
       21
        
       

     

       22
       22
        
         meta = with stdenv.lib; {

     

       23
       23
        
           description = "Gstreamer Bad Plugins";

     

       24
       24
       -
           homepage    = "http://gstreamer.freedesktop.org";

     

       24
       24
       +
           homepage    = "https://gstreamer.freedesktop.org";

     

       25
       25
        
           longDescription = ''

     

       26
       26
        
             a set of plug-ins that aren't up to par compared to the

     

       27
       27
        
             rest.  They might be close to being good quality, but they're missing

     
···

       34
       34
        
       

     

       35
       35
        
         src = fetchurl {

     

       36
       36
        
           url = "${meta.homepage}/src/gst-plugins-bad/${name}.tar.xz";

     

       37
       37
       -
           sha256 = "0rk9rlzf2b0hjw5hwbadz53yh4ls7vm3w3cshsa3n8isdd8axp93";

     

       37
       37
       +
           sha256 = "0dwyq03g2m0p16dwx8q5qvjn5x9ia72h21sf87mp97gmwkfpwb4w";

     

       38
       38
        
         };

     

       39
       39
        
       

     

       40
       40
        
         outputs = [ "out" "dev" ];

+3 -3

pkgs/development/libraries/gstreamer/base/default.nix

···

       4
       4
        
       }:

     

       5
       5
        
       

     

       6
       6
        
       stdenv.mkDerivation rec {

     

       7
       7
       -
         name = "gst-plugins-base-1.10.4";

     

       7
       7
       +
         name = "gst-plugins-base-1.12.2";

     

       8
       8
        
       

     

       9
       9
        
         meta = {

     

       10
       10
        
           description = "Base plugins and helper libraries";

     

       11
       11
       -
           homepage = http://gstreamer.freedesktop.org;

     

       11
       11
       +
           homepage = https://gstreamer.freedesktop.org;

     

       12
       12
        
           license = stdenv.lib.licenses.lgpl2Plus;

     

       13
       13
        
           platforms = stdenv.lib.platforms.unix;

     

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
        
         src = fetchurl {

     

       17
       17
        
           url = "${meta.homepage}/src/gst-plugins-base/${name}.tar.xz";

     

       18
       18
       -
           sha256 = "1dsyjf6rncsbg4rfj40cvf1wwpjj9h3j3c7bh4zp7jylnfv4blpn";

     

       18
       18
       +
           sha256 = "0x86a7aph0y6gyq178plvwvbbyhkfb3hf0gadx9sk5z1mzixqrsh";

     

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
        
         outputs = [ "out" "dev" ];

+3 -3

pkgs/development/libraries/gstreamer/core/default.nix

···

       3
       3
        
       }:

     

       4
       4
        
       

     

       5
       5
        
       stdenv.mkDerivation rec {

     

       6
       6
       -
         name = "gstreamer-1.10.4";

     

       6
       6
       +
         name = "gstreamer-1.12.2";

     

       7
       7
        
       

     

       8
       8
        
         meta = {

     

       9
       9
        
           description = "Open source multimedia framework";

     

       10
       10
       -
           homepage = http://gstreamer.freedesktop.org;

     

       10
       10
       +
           homepage = https://gstreamer.freedesktop.org;

     

       11
       11
        
           license = stdenv.lib.licenses.lgpl2Plus;

     

       12
       12
        
           platforms = stdenv.lib.platforms.unix;

     

       13
       13
        
           maintainers = [ stdenv.lib.maintainers.ttuegel ];

     
···

       15
       15
        
       

     

       16
       16
        
         src = fetchurl {

     

       17
       17
        
           url = "${meta.homepage}/src/gstreamer/${name}.tar.xz";

     

       18
       18
       -
           sha256 = "062jidnw17hkpva6ddygp80gyasyigfkpm1y7w56rk56a2pzbhjh";

     

       18
       18
       +
           sha256 = "1fllz7n58lavyy4nh64xc7izd4ffhl12a2ff0yg4z67al8wkzplz";

     

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
        
         outputs = [ "out" "dev" ];

+3 -3

pkgs/development/libraries/gstreamer/ges/default.nix

···

       3
       3
        
       }:

     

       4
       4
        
       

     

       5
       5
        
       stdenv.mkDerivation rec {

     

       6
       6
       -
         name = "gstreamer-editing-services-1.10.4";

     

       6
       6
       +
         name = "gstreamer-editing-services-1.12.2";

     

       7
       7
        
       

     

       8
       8
        
         meta = with stdenv.lib; {

     

       9
       9
        
           description = "Library for creation of audio/video non-linear editors";

     

       10
       10
       -
           homepage    = "http://gstreamer.freedesktop.org";

     

       10
       10
       +
           homepage    = "https://gstreamer.freedesktop.org";

     

       11
       11
        
           license     = licenses.lgpl2Plus;

     

       12
       12
        
           platforms   = platforms.unix;

     

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
        
         src = fetchurl {

     

       16
       16
        
           url = "${meta.homepage}/src/gstreamer-editing-services/${name}.tar.xz";

     

       17
       17
       -
           sha256 = "0i11b1rwkjsy9gxrf9vk9lgg8qm60ggfi5lp0ncyh4lxvh16vbgj";

     

       17
       17
       +
           sha256 = "0bi0f487949k9xnl1r6ngysgaibmmswwgdqcrchg0dixnnbm9isr";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
        
         outputs = [ "out" "dev" ];

+1 -1

pkgs/development/libraries/gstreamer/gnonlin/default.nix

···

       7
       7
        
       

     

       8
       8
        
         meta = with stdenv.lib; {

     

       9
       9
        
           description = "Gstreamer Non-Linear Multimedia Editing Plugins";

     

       10
       10
       -
           homepage    = "http://gstreamer.freedesktop.org";

     

       10
       10
       +
           homepage    = "https://gstreamer.freedesktop.org";

     

       11
       11
        
           longDescription = ''

     

       12
       12
        
             Gnonlin is a library built on top of GStreamer which provides 

     

       13
       13
        
             support for writing non-linear audio and video editing

+3 -3

pkgs/development/libraries/gstreamer/good/default.nix

···

       11
       11
        
         inherit (stdenv.lib) optionals optionalString;

     

       12
       12
        
       in

     

       13
       13
        
       stdenv.mkDerivation rec {

     

       14
       14
       -
         name = "gst-plugins-good-1.10.4";

     

       14
       14
       +
         name = "gst-plugins-good-1.12.2";

     

       15
       15
        
       

     

       16
       16
        
         meta = with stdenv.lib; {

     

       17
       17
        
           description = "Gstreamer Good Plugins";

     

       18
       18
       -
           homepage    = "http://gstreamer.freedesktop.org";

     

       18
       18
       +
           homepage    = "https://gstreamer.freedesktop.org";

     

       19
       19
        
           longDescription = ''

     

       20
       20
        
             a set of plug-ins that we consider to have good quality code,

     

       21
       21
        
             correct functionality, our preferred license (LGPL for the plug-in

     
···

       27
       27
        
       

     

       28
       28
        
         src = fetchurl {

     

       29
       29
        
           url = "${meta.homepage}/src/gst-plugins-good/${name}.tar.xz";

     

       30
       30
       -
           sha256 = "0zjdwxn83sp9wjp9rxjbyk8kf284g9av7l2v6rjldi586hacd1la";

     

       30
       30
       +
           sha256 = "15pfw54fsh9s9xwrnbap4z4njwgqdfvq52k562d2hc5b11rfx4am";

     

       31
       31
        
         };

     

       32
       32
        
       

     

       33
       33
        
         outputs = [ "out" "dev" ];

+7

pkgs/development/libraries/gstreamer/gstreamermm/default.nix

···

       12
       12
        
           sha256 = "0i4sk6ns4dyi4szk45bkm4kvl57l52lgm15p2wg2rhx2gr2w3qry";

     

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
       +
         patches = [

     

       16
       16
       +
           (fetchurl {

     

       17
       17
       +
             url = https://bug783628.bugzilla-attachments.gnome.org/attachment.cgi?id=354765;

     

       18
       18
       +
             sha256 = "082510a934bl05mz4cyakp8mfmd97cdj7vdrbvyqc4g58dcskvz0";

     

       19
       19
       +
           })

     

       20
       20
       +
         ];

     

       21
       21
       +
       

     

       15
       22
        
         outputs = [ "out" "dev" ];

     

       16
       23
        
       

     

       17
       24
        
         nativeBuildInputs = [ pkgconfig file ];

+1 -1

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

···

       6
       6
        
       

     

       7
       7
        
         src = fetchurl {

     

       8
       8
        
           urls = [

     

       9
       9
       -
             "http://gstreamer.freedesktop.org/src/gst-ffmpeg/${name}.tar.bz2"

     

       9
       9
       +
             "https://gstreamer.freedesktop.org/src/gst-ffmpeg/${name}.tar.bz2"

     

       10
       10
        
             "mirror://gentoo/distfiles/${name}.tar.bz2"

     

       11
       11
        
             ];

     

       12
       12
        
           sha256 = "0qmvgwcfybci78sd73mhvm4bsb7l0xsk9yljrgik80g011ds1z3n";

+1 -1

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

···

       18
       18
        
         enableParallelBuilding = true;

     

       19
       19
        
       

     

       20
       20
        
         meta = {

     

       21
       21
       -
           homepage = http://gstreamer.freedesktop.org;

     

       21
       21
       +
           homepage = https://gstreamer.freedesktop.org;

     

       22
       22
        
       

     

       23
       23
        
           description = "‘Bad’ (potentially low quality) plug-ins for GStreamer";

     

       24
       24

+1 -1

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

···

       47
       47
        
         postInstall = "rm -rf $out/share/gtk-doc";

     

       48
       48
        
       

     

       49
       49
        
         meta = with stdenv.lib; {

     

       50
       50
       -
           homepage    = http://gstreamer.freedesktop.org;

     

       50
       50
       +
           homepage    = https://gstreamer.freedesktop.org;

     

       51
       51
        
           description = "Base plug-ins for GStreamer";

     

       52
       52
        
           license     = licenses.lgpl2Plus;

     

       53
       53
        
           maintainers = with maintainers; [ lovek323 ];

+1 -1

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

···

       40
       40
        
         '';

     

       41
       41
        
       

     

       42
       42
        
         meta = {

     

       43
       43
       -
           homepage = http://gstreamer.freedesktop.org;

     

       43
       43
       +
           homepage = https://gstreamer.freedesktop.org;

     

       44
       44
        
       

     

       45
       45
        
           description = "`Good' plug-ins for GStreamer";

     

       46
       46

+1 -1

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

···

       20
       20
        
         enableParallelBuilding = true;

     

       21
       21
        
       

     

       22
       22
        
         meta = {

     

       23
       23
       -
           homepage = http://gstreamer.freedesktop.org;

     

       23
       23
       +
           homepage = https://gstreamer.freedesktop.org;

     

       24
       24
        
       

     

       25
       25
        
           description = "‘Ugly’ (potentially patent-encumbered) plug-ins for GStreamer";

     

       26
       26

+1 -1

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

···

       27
       27
        
         propagatedBuildInputs = [ gstreamer python ];

     

       28
       28
        
       

     

       29
       29
        
         meta = {

     

       30
       30
       -
           homepage = http://gstreamer.freedesktop.org;

     

       30
       30
       +
           homepage = https://gstreamer.freedesktop.org;

     

       31
       31
        
       

     

       32
       32
        
           description = "Python bindings for GStreamer";

     

       33
       33

+1 -1

pkgs/development/libraries/gstreamer/legacy/qt-gstreamer/default.nix

···

       6
       6
        
         pname = "qt-gstreamer";

     

       7
       7
        
       

     

       8
       8
        
         src = fetchurl {

     

       9
       9
       -
           url = "http://gstreamer.freedesktop.org/src/${pname}/${name}.tar.bz2";

     

       9
       9
       +
           url = "https://gstreamer.freedesktop.org/src/${pname}/${name}.tar.bz2";

     

       10
       10
        
           sha256 = "1pqg9sxzk8sdrf7pazb5v21hasqai9i4l203gbdqz29w2ll1ybsl";

     

       11
       11
        
         };

     

       12
       12

+3 -3

pkgs/development/libraries/gstreamer/libav/default.nix

···

       9
       9
        
       assert withSystemLibav -> libav != null;

     

       10
       10
        
       

     

       11
       11
        
       stdenv.mkDerivation rec {

     

       12
       12
       -
         name = "gst-libav-1.10.4";

     

       12
       12
       +
         name = "gst-libav-1.12.2";

     

       13
       13
        
       

     

       14
       14
        
         meta = {

     

       15
       15
       -
           homepage = http://gstreamer.freedesktop.org;

     

       15
       15
       +
           homepage = https://gstreamer.freedesktop.org;

     

       16
       16
        
           license = stdenv.lib.licenses.lgpl2Plus;

     

       17
       17
        
           platforms = stdenv.lib.platforms.unix;

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
        
         src = fetchurl {

     

       21
       21
        
           url = "${meta.homepage}/src/gst-libav/${name}.tar.xz";

     

       22
       22
       -
           sha256 = "12r68ri03mgbbwsxyn6yklgfsq32rwvyq83zw0aq7m73fp5gx83c";

     

       22
       22
       +
           sha256 = "1crdahkjm23byg1awcrjkmgfbalfpvvac7h7whm6b2r1pfwkbdsv";

     

       23
       23
        
         };

     

       24
       24
        
       

     

       25
       25
        
         outputs = [ "out" "dev" ];

+1 -1

pkgs/development/libraries/gstreamer/qt-gstreamer/default.nix

···

       6
       6
        
         pname = "qt-gstreamer";

     

       7
       7
        
       

     

       8
       8
        
         src = fetchurl {

     

       9
       9
       -
           url = "http://gstreamer.freedesktop.org/src/${pname}/${name}.tar.xz";

     

       9
       9
       +
           url = "https://gstreamer.freedesktop.org/src/${pname}/${name}.tar.xz";

     

       10
       10
        
           sha256 = "9f3b492b74cad9be918e4c4db96df48dab9c012f2ae5667f438b64a4d92e8fd4";

     

       11
       11
        
         };

     

       12
       12

+3 -3

pkgs/development/libraries/gstreamer/ugly/default.nix

···

       5
       5
        
       }:

     

       6
       6
        
       

     

       7
       7
        
       stdenv.mkDerivation rec {

     

       8
       8
       -
         name = "gst-plugins-ugly-1.10.4";

     

       8
       8
       +
         name = "gst-plugins-ugly-1.12.2";

     

       9
       9
        
       

     

       10
       10
        
         meta = with stdenv.lib; {

     

       11
       11
        
           description = "Gstreamer Ugly Plugins";

     

       12
       12
       -
           homepage    = "http://gstreamer.freedesktop.org";

     

       12
       12
       +
           homepage    = "https://gstreamer.freedesktop.org";

     

       13
       13
        
           longDescription = ''

     

       14
       14
        
             a set of plug-ins that have good quality and correct functionality,

     

       15
       15
        
             but distributing them might pose problems.  The license on either

     
···

       22
       22
        
       

     

       23
       23
        
         src = fetchurl {

     

       24
       24
        
           url = "${meta.homepage}/src/gst-plugins-ugly/${name}.tar.xz";

     

       25
       25
       -
           sha256 = "0ngsiwcsz3jd08id4mc0qiy2q1n7h2kkvdnh3r1vm725m1ycg1k3";

     

       25
       25
       +
           sha256 = "0rplyp1qk359c97ig9i2vc1v34g92khd8dslwfipva1ypwmr9hqw";

     

       26
       26
        
         };

     

       27
       27
        
       

     

       28
       28
        
         outputs = [ "out" "dev" ];

+3 -3

pkgs/development/libraries/gstreamer/vaapi/default.nix

···

       5
       5
        
       

     

       6
       6
        
       stdenv.mkDerivation rec {

     

       7
       7
        
         name = "gst-vaapi-${version}";

     

       8
       8
       -
         version = "1.10.4";

     

       8
       8
       +
         version = "1.12.2";

     

       9
       9
        
       

     

       10
       10
        
         src = fetchurl {

     

       11
       11
        
           url = "${meta.homepage}/src/gstreamer-vaapi/gstreamer-vaapi-${version}.tar.xz";

     

       12
       12
       -
           sha256 = "0xfyf1mgcxnwf380wxv20hakl2srp34dmiw6bm4zkncl2mi91rh3";

     

       12
       12
       +
           sha256 = "0fhncs27hcdcnb9a4prkxlyvr883hnzsx148zzk7lg2b8zh19ir3";

     

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
        
         outputs = [ "out" "dev" ];

     
···

       29
       29
        
         configureFlags = "--disable-builtin-libvpx --with-gstreamer-api=1.0";

     

       30
       30
        
       

     

       31
       31
        
         meta = {

     

       32
       32
       -
           homepage = http://gstreamer.freedesktop.org;

     

       32
       32
       +
           homepage = https://gstreamer.freedesktop.org;

     

       33
       33
        
           license = stdenv.lib.licenses.lgpl21Plus;

     

       34
       34
        
           platforms = stdenv.lib.platforms.linux;

     

       35
       35
        
           maintainers = with stdenv.lib.maintainers; [ tstrobel ];

+3 -3

pkgs/development/libraries/gstreamer/validate/default.nix

···

       3
       3
        
       }:

     

       4
       4
        
       

     

       5
       5
        
       stdenv.mkDerivation rec {

     

       6
       6
       -
         name = "gst-validate-1.10.4";

     

       6
       6
       +
         name = "gst-validate-1.12.2";

     

       7
       7
        
       

     

       8
       8
        
         meta = {

     

       9
       9
        
           description = "Integration testing infrastructure for the GStreamer framework";

     

       10
       10
       -
           homepage = http://gstreamer.freedesktop.org;

     

       10
       10
       +
           homepage = https://gstreamer.freedesktop.org;

     

       11
       11
        
           license = stdenv.lib.licenses.lgpl2Plus;

     

       12
       12
        
           platforms = stdenv.lib.platforms.unix;

     

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
        
         src = fetchurl {

     

       16
       16
        
           url = "${meta.homepage}/src/gst-validate/${name}.tar.xz";

     

       17
       17
       -
           sha256 = "0g6px08x4kq5xqlbyxvxn6cm9b1s1gfvhkmlrmvw9afccjzh1775";

     

       17
       17
       +
           sha256 = "1pgycs35bwmp4aicyxwyzlfy1i5l2rzmh2a8ivhgy21azp8jaykb";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
        
         outputs = [ "out" "dev" ];

+7 -9

pkgs/development/libraries/gusb/default.nix

···

       1
       1
        
       {stdenv, fetchurl

     

       2
       2
        
       , automake, autoconf, libtool, which, gtkdoc, gettext, pkgconfig, gobjectIntrospection, libxslt

     

       3
       3
       -
       , glib, systemd, libusb1, vala_0_23

     

       3
       3
       +
       , glib, systemd, libusb1, vala_0_38

     

       4
       4
        
       }:

     

       5
       5
        
       stdenv.mkDerivation rec {

     

       6
       6
        
         name = "gusb-${version}";

     

       7
       7
       -
         version = "0.2.9";

     

       7
       7
       +
         version = "0.2.11";

     

       8
       8
        
         enableParallelBuilding = true;

     

       9
       9
        
       

     

       10
       10
        
         src = fetchurl {

     

       11
       11
       -
           url = "http://people.freedesktop.org/~hughsient/releases/libgusb-${version}.tar.xz";

     

       12
       12
       -
           sha256 = "056yxlppgycsfw1l8c9j6givk1n15jylhvx89wqhsxdi1b6vs83k";

     

       11
       11
       +
           url = "https://people.freedesktop.org/~hughsient/releases/libgusb-${version}.tar.xz";

     

       12
       12
       +
           sha256 = "1pppz17lw3khyz8by1dddxdqrv6qn4a23fpxs38c67db7x4l7ccw";

     

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
        
         preConfigure = "./autogen.sh";

     

       16
       16
        
       

     

       17
       17
       -
         nativeBuildInputs = [ pkgconfig ];

     

       18
       18
       -
         buildInputs = [

     

       19
       19
       -
           autoconf automake libtool which gtkdoc gettext gobjectIntrospection libxslt

     

       20
       20
       -
           systemd vala_0_23 glib

     

       21
       21
       -
         ];

     

       17
       17
       +
         nativeBuildInputs = [ pkgconfig autoconf automake libtool which gtkdoc gettext

     

       18
       18
       +
                               gobjectIntrospection libxslt vala_0_38 ];

     

       19
       19
       +
         buildInputs = [ systemd  glib ];

     

       22
       20
        
       

     

       23
       21
        
         propagatedBuildInputs = [ libusb1 ];

     

       24
       22

+7 -7

pkgs/development/libraries/gvfs/default.nix

···

       1
       1
        
       { stdenv, fetchurl, pkgconfig, intltool, libtool

     

       2
       2
        
       , glib, dbus, udev, libgudev, udisks2, libgcrypt, libcap, polkit

     

       3
       3
       -
       , libgphoto2, avahi, libarchive, fuse, libcdio

     

       3
       3
       +
       , libgphoto2, avahi, libarchive, fuse, libcdio, file, bzip2, lzma

     

       4
       4
        
       , libxml2, libxslt, docbook_xsl, samba, libmtp

     

       5
       5
        
       , gnomeSupport ? false, gnome, makeWrapper }:

     

       6
       6
        
       

     

       7
       7
        
       let

     

       8
       8
       -
         ver_maj = "1.30";

     

       8
       8
       +
         ver_maj = "1.34";

     

       9
       9
        
         version = "${ver_maj}.1";

     

       10
       10
        
       in

     

       11
       11
        
       stdenv.mkDerivation rec {

     
···

       13
       13
        
       

     

       14
       14
        
         src = fetchurl {

     

       15
       15
        
           url = "mirror://gnome/sources/gvfs/${ver_maj}/${name}.tar.xz";

     

       16
       16
       -
           sha256 = "e752e7bb46e64e4025f63428d4f5247e3e5c0d0b5eeb4f81dbf1cd7b75f59d7b";

     

       16
       16
       +
           sha256 = "1d3j6f252mk316hrspwy63inrhxk6l78l4bmlmql401lqapb5yby";

     

       17
       17
        
         };

     

       18
       18
        
       

     

       19
       19
        
         nativeBuildInputs = [

     

       20
       20
       -
           pkgconfig intltool libtool

     

       20
       20
       +
           pkgconfig intltool libtool file makeWrapper

     

       21
       21
        
           libxml2 libxslt docbook_xsl

     

       22
       22
        
         ];

     

       23
       23
        
       

     

       24
       24
        
         buildInputs =

     

       25
       25
       -
           [ makeWrapper glib dbus udev libgudev udisks2 libgcrypt

     

       26
       26
       -
             libgphoto2 avahi libarchive fuse libcdio

     

       25
       25
       +
           [ glib dbus udev libgudev udisks2 libgcrypt

     

       26
       26
       +
             libgphoto2 avahi libarchive fuse libcdio lzma bzip2

     

       27
       27
        
             samba libmtp libcap polkit

     

       28
       28
        
             # ToDo: a ligther version of libsoup to have FTP/HTTP support?

     

       29
       29
        
           ] ++ stdenv.lib.optionals gnomeSupport (with gnome; [

     

       30
       30
       -
             gtk libsoup libgnome_keyring gconf gcr

     

       30
       30
       +
             libsoup libgnome_keyring gconf gcr

     

       31
       31
        
             # ToDo: not working and probably useless until gnome3 from x-updates

     

       32
       32
        
           ]);

     

       33
       33

+18 -8

pkgs/development/libraries/json-glib/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, glib, pkgconfig, gobjectIntrospection, dbus, libintlOrEmpty }:

     

       1
       1
       +
       { stdenv, fetchurl, fetchpatch, glib, meson, ninja, pkgconfig, gettext, gobjectIntrospection, dbus, libintlOrEmpty }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
       -
         name = "json-glib-${minVer}.0";

     

       5
       5
       -
         minVer = "1.2";

     

       4
       4
       +
         name = "json-glib-${minVer}.2";

     

       5
       5
       +
         minVer = "1.4";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchurl {

     

       8
       8
        
           url = "mirror://gnome/sources/json-glib/${minVer}/${name}.tar.xz";

     

       9
       9
       -
           sha256 = "1lx7p1c7cl21byvfgw92n8dhm09vi6qxrs0zkx9dg3y096zdzmlr";

     

       9
       9
       +
           sha256 = "2d7709a44749c7318599a6829322e081915bdc73f5be5045882ed120bb686dc8";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
       -
         configureflags= "--with-introspection";

     

       13
       13
       -
       

     

       14
       14
       -
         propagatedBuildInputs = [ glib gobjectIntrospection ];

     

       15
       15
       -
         nativeBuildInputs = [ pkgconfig ];

     

       12
       12
       +
         propagatedBuildInputs = [ glib ];

     

       13
       13
       +
         nativeBuildInputs = [ meson ninja pkgconfig gettext gobjectIntrospection ];

     

       16
       14
        
         buildInputs = libintlOrEmpty;

     

       17
       15
        
       

     

       18
       16
        
         NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl";

     

       19
       17
        
       

     

       18
       18
       +
         patches = [

     

       19
       19
       +
           # https://gitlab.gnome.org/GNOME/json-glib/issues/27

     

       20
       20
       +
           (fetchpatch {

     

       21
       21
       +
             url = "https://gitlab.gnome.org/GNOME/json-glib/merge_requests/2.diff";

     

       22
       22
       +
             sha256 = "0pf006jxj1ki7a0w4ykxm6b24m0wafrhpdcmixsw9x83m227156c";

     

       23
       23
       +
           })

     

       24
       24
       +
         ];

     

       25
       25
       +
       

     

       20
       26
        
         outputs = [ "out" "dev" ];

     

       27
       27
       +
       

     

       28
       28
       +
         doCheck = true;

     

       29
       29
       +
       

     

       30
       30
       +
         checkPhase = "meson test";

     

       21
       31
        
       

     

       22
       32
        
         meta = with stdenv.lib; {

     

       23
       33
        
           homepage = http://live.gnome.org/JsonGlib;

+2 -2

pkgs/development/libraries/libchamplain/default.nix

···

       3
       3
        
       

     

       4
       4
        
       stdenv.mkDerivation rec {

     

       5
       5
        
         major = "0.12";

     

       6
       6
       -
         version = "${major}.14";

     

       6
       6
       +
         version = "${major}.16";

     

       7
       7
        
         name = "libchamplain-${version}";

     

       8
       8
        
       

     

       9
       9
        
         src = fetchurl {

     

       10
       10
        
           url = "mirror://gnome/sources/libchamplain/${major}/${name}.tar.xz";

     

       11
       11
       -
           sha256 = "13snnka1jqc5qrgij8bm22xy02pncf3dn5ij3jh4rrpzq7g1sqpi";

     

       11
       11
       +
           sha256 = "13chvc2n074i0jw5jlb8i7cysda4yqx58ca6y3mrlrl9g37k2zja";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         nativeBuildInputs = [ pkgconfig ];

+2 -2

pkgs/development/libraries/libevdev/default.nix

···

       1
       1
        
       { stdenv, fetchurl, python }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
       -
         name = "libevdev-1.5.6";

     

       4
       4
       +
         name = "libevdev-1.5.7";

     

       5
       5
        
       

     

       6
       6
        
         src = fetchurl {

     

       7
       7
        
           url = "https://www.freedesktop.org/software/libevdev/${name}.tar.xz";

     

       8
       8
       -
           sha256 = "1256ypz93039n6km4macg158fpmjgylhmcmk20pnklxicsfpxv7c";

     

       8
       8
       +
           sha256 = "08nl3p6226k51zph52fhilxvi3b31spp6fz8szzrglzhl8vrxrd1";

     

       9
       9
        
         };

     

       10
       10
        
       

     

       11
       11
        
         buildInputs = [ python ];

+3 -3

pkgs/development/libraries/libgtop/default.nix

···

       1
       1
        
       { stdenv, fetchurl, glib, pkgconfig, perl, intltool, gobjectIntrospection, libintlOrEmpty }:

     

       2
       2
        
       stdenv.mkDerivation rec {

     

       3
       3
        
         name = "libgtop-${version}";

     

       4
       4
       -
         major = "2.34";

     

       5
       5
       -
         version = "${major}.1";

     

       4
       4
       +
         major = "2.38";

     

       5
       5
       +
         version = "${major}.0";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchurl {

     

       8
       8
        
           url = "mirror://gnome/sources/libgtop/${major}/${name}.tar.xz";

     

       9
       9
       -
           sha256 = "c89978a76662b18d392edbe0d1b794f5a9a399a5ccf22a02d5b9e28b5ed609e2";

     

       9
       9
       +
           sha256 = "04mnxgzyb26wqk6qij4iw8cxwl82r8pcsna5dg8vz2j3pdi0wv2g";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         propagatedBuildInputs = [ glib ];

+3 -3

pkgs/development/libraries/libgudev/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         name = "libgudev-${version}";

     

       5
       5
       -
         version = "231";

     

       5
       5
       +
         version = "232";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchurl {

     

       8
       8
       -
           url = "https://download.gnome.org/sources/libgudev/${version}/${name}.tar.xz";

     

       9
       9
       -
           sha256 = "15iz0qp57qy5pjrblsn36l0chlncqggqsg8h8i8c71499afzj7iv";

     

       8
       8
       +
           url = "mirror://gnome/sources/libgudev/${version}/${name}.tar.xz";

     

       9
       9
       +
           sha256 = "ee4cb2b9c573cdf354f6ed744f01b111d4b5bed3503ffa956cefff50489c7860";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         nativeBuildInputs = [ pkgconfig ];

+6 -3

pkgs/development/libraries/libical/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         name = "libical-${version}";

     

       5
       5
       -
         version = "1.0.1";

     

       5
       5
       +
         version = "2.0.0";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "libical";

     

       9
       9
        
           repo = "libical";

     

       10
       10
        
           rev = "v${version}";

     

       11
       11
       -
           sha256 = "1y6rbw24m133d984pyqzx2bi7f37dsw6f33l6arwn6yd4zlqdib9";

     

       11
       11
       +
           sha256 = "0xsvqy1hzmwxn783wrb2k8p751544pzv39v9ynr9pj4yzkwjzsvb";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         nativeBuildInputs = [ perl cmake ];

     

       15
       15
        
       

     

       16
       16
       -
         patches = [ ./respect-env-tzdir.patch ];

     

       16
       16
       +
         patches = [

     

       17
       17
       +
           # TODO: upstream this patch

     

       18
       18
       +
           ./respect-env-tzdir.patch

     

       19
       19
       +
         ];

     

       17
       20
        
       

     

       18
       21
        
         meta = with stdenv.lib; {

     

       19
       22
        
           homepage = https://github.com/libical/libical;

+25 -23

pkgs/development/libraries/libical/respect-env-tzdir.patch

···

       1
       1
       -
       --- a/src/libical/icaltz-util.c	2015-06-11 15:40:58.843138630 +0200

     

       2
       2
       -
       +++ b/src/libical/icaltz-util.c	2015-06-11 15:43:12.722046252 +0200

     

       3
       3
       -
       @@ -107,7 +107,7 @@

     

       4
       4
       -
        	char	charcnt[4];			

     

       5
       5
       -
        } tzinfo; 

     

       6
       6
       -
        

     

       7
       7
       -
       -static char *search_paths [] = {"/usr/share/zoneinfo","/usr/lib/zoneinfo","/etc/zoneinfo","/usr/share/lib/zoneinfo"};

     

       8
       8
       -
       +static char *search_paths [] = {"/etc/zoneinfo","/usr/share/zoneinfo","/usr/lib/zoneinfo","/usr/share/lib/zoneinfo"};

     

       1
       1
       +
       --- a/src/libical/icaltz-util.c

     

       2
       2
       +
       +++ b/src/libical/icaltz-util.c

     

       3
       3
       +
       @@ -96,9 +96,9 @@ typedef struct

     

       9
       4
        
        static char *zdir = NULL;

     

       10
       5
        
        

     

       11
       11
       -
        #define NUM_SEARCH_PATHS (sizeof (search_paths)/ sizeof (search_paths [0]))

     

       12
       12
       -
       @@ -194,6 +194,15 @@

     

       13
       13
       -
        	const char *fname = ZONES_TAB_SYSTEM_FILENAME;

     

       14
       14
       -
        	unsigned int i;

     

       6
       6
       +
        static char *search_paths[] = {

     

       7
       7
       +
       +    "/etc/zoneinfo",

     

       8
       8
       +
            "/usr/share/zoneinfo",

     

       9
       9
       +
            "/usr/lib/zoneinfo",

     

       10
       10
       +
       -    "/etc/zoneinfo",

     

       11
       11
       +
            "/usr/share/lib/zoneinfo"

     

       12
       12
       +
        };

     

       15
       13
        
        

     

       16
       16
       -
       +	const char *env_tzdir = getenv ("TZDIR");

     

       17
       17
       -
       +	if (env_tzdir) {

     

       18
       18
       -
       +		sprintf (file_path, "%s/%s", env_tzdir, fname);

     

       19
       19
       -
       +		if (!access (file_path, F_OK|R_OK)) {

     

       20
       20
       -
       +			zdir = env_tzdir;

     

       21
       21
       -
       +			return;

     

       22
       22
       -
       +		}

     

       23
       23
       -
       +	}

     

       14
       14
       +
       @@ -179,6 +179,15 @@ static void set_zonedir(void)

     

       15
       15
       +
            const char *fname = ZONES_TAB_SYSTEM_FILENAME;

     

       16
       16
       +
            size_t i, num_search_paths;

     

       17
       17
       +
        

     

       18
       18
       +
       +   const char *env_tzdir = getenv ("TZDIR");

     

       19
       19
       +
       +   if (env_tzdir) {

     

       20
       20
       +
       +       snprintf(file_path, MAXPATHLEN, "%s/%s", env_tzdir, fname);

     

       21
       21
       +
       +       if (!access (file_path, F_OK|R_OK)) {

     

       22
       22
       +
       +           zdir = env_tzdir;

     

       23
       23
       +
       +           return;

     

       24
       24
       +
       +       }

     

       25
       25
       +
       +   }

     

       24
       26
        
       +

     

       25
       25
       -
        	for (i = 0; i < NUM_SEARCH_PATHS; i++) {

     

       26
       26
       -
        		sprintf (file_path, "%s/%s", search_paths [i], fname);

     

       27
       27
       -
        		if (!access (file_path, F_OK|R_OK)) {

     

       27
       27
       +
            num_search_paths = sizeof(search_paths) / sizeof(search_paths[0]);

     

       28
       28
       +
            for (i = 0; i < num_search_paths; i++) {

     

       29
       29
       +
                snprintf(file_path, MAXPATHLEN, "%s/%s", search_paths[i], fname);

+23 -15

pkgs/development/libraries/libinput/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, pkgconfig

     

       1
       1
       +
       { stdenv, fetchurl, pkgconfig, meson, ninja

     

       2
       2
        
       , libevdev, mtdev, udev, libwacom

     

       3
       3
        
       , documentationSupport ? false, doxygen ? null, graphviz ? null # Documentation

     

       4
       4
        
       , eventGUISupport ? false, cairo ? null, glib ? null, gtk3 ? null # GUI event viewer support

     

       5
       5
       -
       , testsSupport ? false, check ? null, valgrind ? null

     

       6
       6
       -
       , autoconf, automake

     

       5
       5
       +
       , testsSupport ? false, check ? null, valgrind ? null, python3Packages ? null

     

       7
       6
        
       }:

     

       8
       7
        
       

     

       9
       8
        
       assert documentationSupport -> doxygen != null && graphviz != null;

     

       10
       9
        
       assert eventGUISupport -> cairo != null && glib != null && gtk3 != null;

     

       11
       11
       -
       assert testsSupport -> check != null && valgrind != null;

     

       10
       10
       +
       assert testsSupport -> check != null && valgrind != null && python3Packages != null;

     

       12
       11
        
       

     

       13
       12
        
       let

     

       14
       14
       -
         mkFlag = optSet: flag: if optSet then "--enable-${flag}" else "--disable-${flag}";

     

       13
       13
       +
         mkFlag = optSet: flag: "-D${flag}=${stdenv.lib.boolToString optSet}";

     

       15
       14
        
       in

     

       16
       15
        
       

     

       17
       16
        
       with stdenv.lib;

     

       18
       17
        
       stdenv.mkDerivation rec {

     

       19
       18
        
         name = "libinput-${version}";

     

       20
       20
       -
         version = "1.7.3";

     

       19
       19
       +
         version = "1.9.1";

     

       21
       20
        
       

     

       22
       21
        
         src = fetchurl {

     

       23
       22
        
           url = "http://www.freedesktop.org/software/libinput/${name}.tar.xz";

     

       24
       24
       -
           sha256 = "07fbzxddvhjcch43hdxb24sj7ri96zzpcjalvsicmw0i4wnn2v89";

     

       23
       23
       +
           sha256 = "1y3559146zlfizncky1jlly226i66vwikxhpdkw0jg8v47j0sy7h";

     

       25
       24
        
         };

     

       26
       25
        
       

     

       27
       26
        
         outputs = [ "out" "dev" ];

     

       28
       27
        
       

     

       29
       29
       -
         configureFlags = [

     

       28
       28
       +
         mesonFlags = [

     

       30
       29
        
           (mkFlag documentationSupport "documentation")

     

       31
       31
       -
           (mkFlag eventGUISupport "event-gui")

     

       30
       30
       +
           (mkFlag eventGUISupport "debug-gui")

     

       32
       31
        
           (mkFlag testsSupport "tests")

     

       33
       32
        
         ];

     

       34
       33
        
       

     

       35
       35
       -
         nativeBuildInputs = [ pkgconfig ];

     

       36
       36
       -
       

     

       37
       37
       -
         buildInputs = [ libevdev mtdev libwacom autoconf automake ]

     

       38
       38
       -
           ++ optionals eventGUISupport [ cairo glib gtk3 ]

     

       34
       34
       +
         nativeBuildInputs = [ pkgconfig meson ninja ]

     

       39
       35
        
           ++ optionals documentationSupport [ doxygen graphviz ]

     

       40
       40
       -
           ++ optionals testsSupport [ check valgrind ];

     

       36
       36
       +
           ++ optionals testsSupport [ check valgrind python3Packages.pyparsing ];

     

       37
       37
       +
       

     

       38
       38
       +
         buildInputs = [ libevdev mtdev libwacom ]

     

       39
       39
       +
           ++ optionals eventGUISupport [ cairo glib gtk3 ];

     

       41
       40
        
       

     

       42
       41
        
         propagatedBuildInputs = [ udev ];

     

       43
       42
        
       

     

       44
       43
        
         patches = [ ./udev-absolute-path.patch ];

     

       45
       45
       -
         patchFlags = [ "-p0" ];

     

       44
       44
       +
       

     

       45
       45
       +
          preBuild = ''

     

       46
       46
       +
           # meson setup-hook changes the directory so the files are located one level up

     

       47
       47
       +
           patchShebangs ../udev/parse_hwdb.py

     

       48
       48
       +
           patchShebangs ../test/symbols-leak-test.in

     

       49
       49
       +
         '';

     

       50
       50
       +
       

     

       51
       51
       +
         doCheck = testsSupport;

     

       52
       52
       +
       

     

       53
       53
       +
         checkPhase = "meson test";

     

       46
       54
        
       

     

       47
       55
        
         meta = {

     

       48
       56
        
           description = "Handles input devices in Wayland compositors and provides a generic X.Org input driver";

+10 -11

pkgs/development/libraries/libinput/udev-absolute-path.patch

···

       1
       1
       -
       --- configure.ac	2016-05-27 14:00:25.248388226 +0200

     

       2
       2
       -
       +++ configure.ac	2016-05-27 14:01:28.228943416 +0200

     

       3
       3
       -
       @@ -214,7 +214,8 @@ AM_CONDITIONAL(BUILD_DOCS, [test "x$buil

     

       4
       4
       -
        # Used by the udev rules so we can use callouts during testing without

     

       5
       5
       -
        # installing everything first. Default is the empty string so the installed

     

       6
       6
       -
        # rule will use udev's default path. Override is in udev/Makefile.am

     

       7
       7
       -
       -AC_SUBST(UDEV_TEST_PATH, "")

     

       8
       8
       -
       +UDEV_TEST_PATH="${UDEV_DIR}/"

     

       9
       9
       -
       +AC_SUBST(UDEV_TEST_PATH)

     

       10
       10
       -
        AC_PATH_PROG(SED, [sed])

     

       1
       1
       +
       --- a/meson.build

     

       2
       2
       +
       +++ b/meson.build

     

       3
       3
       +
       @@ -100,7 +100,7 @@

     

       4
       4
       +
             args : model_quirks)

     

       11
       5
        
        

     

       12
       12
       -
        AC_CONFIG_FILES([Makefile

     

       6
       6
       +
        udev_rules_config = configuration_data()

     

       7
       7
       +
       -udev_rules_config.set('UDEV_TEST_PATH', '')

     

       8
       8
       +
       +udev_rules_config.set('UDEV_TEST_PATH', udev_dir + '/')

     

       9
       9
       +
        configure_file(input : 'udev/80-libinput-device-groups.rules.in',

     

       10
       10
       +
        	       output : '80-libinput-device-groups.rules',

     

       11
       11
       +
        	       install : true,

+3 -3

pkgs/development/libraries/librsvg/default.nix

···

       6
       6
        
       # no introspection by default, it's too big

     

       7
       7
        
       

     

       8
       8
        
       stdenv.mkDerivation rec {

     

       9
       9
       -
         name = "librsvg-2.40.17";

     

       9
       9
       +
         name = "librsvg-2.40.19";

     

       10
       10
        
       

     

       11
       11
        
         src = fetchurl {

     

       12
       12
       -
           url    = "mirror://gnome/sources/librsvg/2.40/${name}.tar.xz";

     

       13
       13
       -
           sha256 = "1k39gyf7f5m9x0jvpcxvfcqswdb04xhm1lbwbjabn1f4xk5wbxp6";

     

       12
       12
       +
           url    = "mirror://gnome/sources/librsvg/2.40/librsvg-2.40.18.tar.xz";

     

       13
       13
       +
           sha256 = "0k2nbd4g31qinkdfd8r5c5ih2ixl85fbkgkqqh9747lwr24c9j5z";

     

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
        
         NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null;

+2 -2

pkgs/development/libraries/libwacom/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         name = "libwacom-${version}";

     

       5
       5
       -
         version = "0.22";

     

       5
       5
       +
         version = "0.26";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchurl {

     

       8
       8
        
           url = "mirror://sourceforge/linuxwacom/libwacom/${name}.tar.bz2";

     

       9
       9
       -
           sha256 = "1h10awwapj5v8nik220ga0raggv3lgaq0kzwlma2qjmzdhhrrhcp";

     

       9
       9
       +
           sha256 = "0xpvkjvzaj9blcmw8ha46616bzfivj99kwzvr91clxd6iaf11r63";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         nativeBuildInputs = [ pkgconfig ];

+2 -2

pkgs/development/libraries/libxkbcommon/default.nix

···

       1
       1
        
       { stdenv, fetchurl, pkgconfig, yacc, flex, xkeyboard_config, libxcb, libX11 }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
       -
         name = "libxkbcommon-0.7.1";

     

       4
       4
       +
         name = "libxkbcommon-0.7.2";

     

       5
       5
        
       

     

       6
       6
        
         src = fetchurl {

     

       7
       7
        
           url = "http://xkbcommon.org/download/${name}.tar.xz";

     

       8
       8
       -
           sha256 = "ba59305d2e19e47c27ea065c2e0df96ebac6a3c6e97e28ae5620073b6084e68b";

     

       8
       8
       +
           sha256 = "1n5rv5n210kjnkyrvbh04gfwaa7zrmzy1393p8nyqfw66lkxr918";

     

       9
       9
        
         };

     

       10
       10
        
       

     

       11
       11
        
         outputs = [ "out" "dev" ];

+4 -8

pkgs/development/libraries/spice-gtk/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, pkgconfig, spice_protocol, intltool, celt_0_5_1

     

       1
       1
       +
       { stdenv, fetchurl, pkgconfig, spice_protocol, gettext, celt_0_5_1

     

       2
       2
        
       , openssl, libpulseaudio, pixman, gobjectIntrospection, libjpeg_turbo, zlib

     

       3
       3
        
       , cyrus_sasl, python2Packages, autoreconfHook, usbredir, libsoup

     

       4
       4
        
       , gtk3, epoxy }:

     
···

       8
       8
        
       let

     

       9
       9
        
         inherit (python2Packages) python pygtk;

     

       10
       10
        
       in stdenv.mkDerivation rec {

     

       11
       11
       -
         name = "spice-gtk-0.33";

     

       11
       11
       +
         name = "spice-gtk-0.34";

     

       12
       12
        
       

     

       13
       13
        
         src = fetchurl {

     

       14
       14
        
           url = "http://www.spice-space.org/download/gtk/${name}.tar.bz2";

     

       15
       15
       -
           sha256 = "0fdgx9k4vgmasp8i2n0swrkapq8f212igcg7wsgvr3mbhsvk7bvx";

     

       15
       15
       +
           sha256 = "1vknp72pl6v6nf3dphhwp29hk6gv787db2pmyg4m312z2q0hwwp9";

     

       16
       16
        
         };

     

       17
       17
        
       

     

       18
       18
        
         buildInputs = [

     
···

       20
       20
        
           libjpeg_turbo zlib cyrus_sasl python pygtk usbredir gtk3 epoxy

     

       21
       21
        
         ];

     

       22
       22
        
       

     

       23
       23
       -
         nativeBuildInputs = [ pkgconfig intltool libsoup autoreconfHook ];

     

       23
       23
       +
         nativeBuildInputs = [ pkgconfig gettext libsoup autoreconfHook ];

     

       24
       24
        
       

     

       25
       25
        
         NIX_CFLAGS_COMPILE = "-fno-stack-protector";

     

       26
       26
        
       

     

       27
       27
        
         preAutoreconf = ''

     

       28
       28
        
           substituteInPlace src/Makefile.am \

     

       29
       29
        
                 --replace '=codegendir pygtk-2.0' '=codegendir pygobject-2.0'

     

       30
       30
       -
         '';

     

       31
       31
       -
       

     

       32
       32
       -
         preConfigure = ''

     

       33
       33
       -
           intltoolize -f

     

       34
       30
        
         '';

     

       35
       31
        
       

     

       36
       32
        
         configureFlags = [

+2 -2

pkgs/development/libraries/spice-protocol/default.nix

···

       1
       1
        
       { stdenv, fetchurl }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
       -
         name = "spice-protocol-0.12.12";

     

       4
       4
       +
         name = "spice-protocol-0.12.13";

     

       5
       5
        
       

     

       6
       6
        
         src = fetchurl {

     

       7
       7
        
           url = "http://www.spice-space.org/download/releases/${name}.tar.bz2";

     

       8
       8
       -
           sha256 = "00wx81f2ml62g3maw63jq9w217zym921rdi38h7lpm5m8ckxraqp";

     

       8
       8
       +
           sha256 = "0cwrgkp558mblcf4vrhacb3iizz12khsrrl82w38w9nj0ar13vl9";

     

       9
       9
        
         };

     

       10
       10
        
       

     

       11
       11
        
         postInstall = ''

+3 -3

pkgs/development/libraries/telepathy/glib/default.nix

···

       1
       1
        
       { stdenv, fetchurl, dbus_glib, glib, python2, pkgconfig, libxslt

     

       2
       2
       -
       , gobjectIntrospection, valaSupport ? true, vala_0_23, glibcLocales }:

     

       2
       2
       +
       , gobjectIntrospection, valaSupport ? true, vala_0_38, glibcLocales }:

     

       3
       3
        
       

     

       4
       4
        
       stdenv.mkDerivation rec {

     

       5
       5
        
         name = "telepathy-glib-0.24.1";

     
···

       13
       13
        
         LC_ALL = "en_US.UTF-8";

     

       14
       14
        
         propagatedBuildInputs = [dbus_glib glib gobjectIntrospection];

     

       15
       15
        
       

     

       16
       16
       -
         nativeBuildInputs = [ pkgconfig ];

     

       17
       17
       -
         buildInputs = [ libxslt glibcLocales python2 ] ++ stdenv.lib.optional valaSupport vala_0_23;

     

       16
       16
       +
         nativeBuildInputs = [ pkgconfig libxslt ] ++ stdenv.lib.optional valaSupport vala_0_38;

     

       17
       17
       +
         buildInputs = [ glibcLocales python2 ];

     

       18
       18
        
       

     

       19
       19
        
         preConfigure = ''

     

       20
       20
        
           substituteInPlace telepathy-glib/telepathy-glib.pc.in --replace Requires.private Requires

+8 -8

pkgs/development/libraries/zeitgeist/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, pkgconfig, glib, sqlite, gnome3, vala_0_23

     

       1
       1
       +
       { stdenv, fetchgit, pkgconfig, glib, sqlite, gnome3, vala_0_38

     

       2
       2
        
       , intltool, libtool, dbus_libs, telepathy_glib

     

       3
       3
        
       , gtk3, json_glib, librdf_raptor2, dbus_glib

     

       4
       4
        
       , pythonSupport ? true, python2Packages

     

       5
       5
        
       }:

     

       6
       6
        
       

     

       7
       7
        
       stdenv.mkDerivation rec {

     

       8
       8
       -
         version = "0.9.15";

     

       8
       8
       +
         version = "1.0";

     

       9
       9
        
         name = "zeitgeist-${version}";

     

       10
       10
        
       

     

       11
       11
       -
         src = fetchurl {

     

       12
       12
       -
           url = "https://github.com/seiflotfy/zeitgeist/archive/v${version}.tar.gz";

     

       13
       13
       -
           sha256 = "07pnc7kmjpd0ncm32z6s3ny5p4zl52v9lld0n0f8sp6cw87k12p0";

     

       11
       11
       +
         src = fetchgit {

     

       12
       12
       +
           url = "git://anongit.freedesktop.org/git/zeitgeist/zeitgeist";

     

       13
       13
       +
           rev = "v${version}";

     

       14
       14
       +
           sha256 = "0vw6m0azycqabbz8f0fd8xsh5kf6j3ig4wpqlhw6sklvf44ii5b8";

     

       14
       15
        
         };

     

       15
       16
        
       

     

       16
       17
        
         NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";

     
···

       19
       20
        
       

     

       20
       21
        
         configureFlags = [ "--with-session-bus-services-dir=$(out)/share/dbus-1/services" ];

     

       21
       22
        
       

     

       22
       22
       -
         nativeBuildInputs = [ pkgconfig ];

     

       23
       23
       -
         buildInputs = [ glib sqlite gnome3.gnome_common intltool

     

       24
       24
       -
                         libtool dbus_libs telepathy_glib vala_0_23 dbus_glib

     

       23
       23
       +
         nativeBuildInputs = [ pkgconfig gnome3.gnome_common intltool libtool vala_0_38 ];

     

       24
       24
       +
         buildInputs = [ glib sqlite dbus_libs telepathy_glib dbus_glib

     

       25
       25
        
                         gtk3 json_glib librdf_raptor2 python2Packages.rdflib ];

     

       26
       26
        
       

     

       27
       27
        
         prePatch = "patchShebangs .";

+3 -3

pkgs/development/python-modules/gst-python/default.nix

···

       4
       4
        
       

     

       5
       5
        
       stdenv.mkDerivation rec {

     

       6
       6
        
         pname = "gst-python";

     

       7
       7
       -
         version = "1.10.4";

     

       7
       7
       +
         version = "1.12.2";

     

       8
       8
        
         name = "${pname}-${version}";

     

       9
       9
        
       

     

       10
       10
        
         src = fetchurl {

     
···

       12
       12
        
             "${meta.homepage}/src/gst-python/${name}.tar.xz"

     

       13
       13
        
             "mirror://gentoo/distfiles/${name}.tar.xz"

     

       14
       14
        
             ];

     

       15
       15
       -
           sha256 = "04l2hvvz9b0f3nyds1k3yfk5di8a91fpr6maj19c11mwp1s82l2r";

     

       15
       15
       +
           sha256 = "0iwy0v2k27wd3957ich6j5f0f04b0wb2mb175ypf2lx68snk5k7l";

     

       16
       16
        
         };

     

       17
       17
        
       

     

       18
       18
        
         patches = [ ./different-path-with-pygobject.patch ];

     
···

       34
       34
        
         passthru.pythonPath = [];

     

       35
       35
        
       

     

       36
       36
        
         meta = {

     

       37
       37
       -
           homepage = http://gstreamer.freedesktop.org;

     

       37
       37
       +
           homepage = https://gstreamer.freedesktop.org;

     

       38
       38
        
       

     

       39
       39
        
           description = "Python bindings for GStreamer";

     

       40
       40

+2 -2

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

···

       3
       3
        
       , ncurses, pkgconfig, randrproto, xorgserver, xproto, udev, libXinerama, pixman }:

     

       4
       4
        
       

     

       5
       5
        
       stdenv.mkDerivation rec {

     

       6
       6
       -
         name = "xf86-input-wacom-0.34.0";

     

       6
       6
       +
         name = "xf86-input-wacom-0.35.0";

     

       7
       7
        
       

     

       8
       8
        
         src = fetchurl {

     

       9
       9
        
           url = "mirror://sourceforge/linuxwacom/${name}.tar.bz2";

     

       10
       10
       -
           sha256 = "0idhkigl0pnyp08sqm6bqfb4h20v6rjrb71z1gdv59gk7d7qwpgi";

     

       10
       10
       +
           sha256 = "0za44snc0zirq65a4lxsmg7blp1bynj6j835hm459x8yx1qhmxjm";

     

       11
       11
        
         };

     

       12
       12
        
       

     

       13
       13
        
         buildInputs = [ inputproto libX11 libXext libXi libXrandr libXrender

+18 -25

pkgs/tools/misc/colord/default.nix

···

       1
       1
        
       { stdenv, fetchurl, bash-completion

     

       2
       2
       -
       , glib, polkit, pkgconfig, intltool, gusb, libusb1, lcms2, sqlite, systemd, dbus

     

       3
       3
       -
       , gtk_doc, gobjectIntrospection, argyllcms, autoreconfHook

     

       2
       2
       +
       , glib, polkit, pkgconfig, gettext, gusb, lcms2, sqlite, systemd, dbus

     

       3
       3
       +
       , gobjectIntrospection, argyllcms, meson, ninja, libxml2, vala_0_38

     

       4
       4
        
       , libgudev, sane-backends }:

     

       5
       5
        
       

     

       6
       6
        
       stdenv.mkDerivation rec {

     

       7
       7
       -
         name = "colord-1.2.12";

     

       7
       7
       +
         name = "colord-1.4.1";

     

       8
       8
        
       

     

       9
       9
        
         src = fetchurl {

     

       10
       10
        
           url = "http://www.freedesktop.org/software/colord/releases/${name}.tar.xz";

     

       11
       11
       -
           sha256 = "0flcsr148xshjbff030pgyk9ar25an901m9q1pjgjdvaq5j1h96m";

     

       11
       11
       +
           sha256 = "0m854clp8szvq38z16jpazzlqfb3lb3icxcfnsisfrc25748y1ib";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         enableParallelBuilding = true;

     

       15
       15
        
       

     

       16
       16
       -
         # Version mismatch requires intltoolize to overwrite

     

       17
       17
       -
         # with newer version.

     

       18
       18
       -
         preConfigure = ''

     

       19
       19
       -
           intltoolize --force

     

       20
       20
       -
         '';

     

       21
       21
       -
       

     

       22
       22
       -
         configureFlags = [

     

       23
       23
       -
           "--enable-sane"

     

       24
       24
       -
           "--with-udevrulesdir=$(out)/lib/udev/rules.d"

     

       25
       25
       -
           "--with-systemdsystemunitdir=$(out)/etc/systemd/system"

     

       16
       16
       +
         mesonFlags = [

     

       17
       17
       +
           "-Denable-sane=true"

     

       18
       18
       +
           "-Denable-vala=true"

     

       26
       19
        
           "--localstatedir=/var"

     

       27
       27
       -
           "--disable-bash-completion"

     

       20
       20
       +
           "-Denable-bash-completion=true"

     

       21
       21
       +
           # TODO: man page cannot be build with docbook2x

     

       22
       22
       +
           "-Denable-man=false"

     

       23
       23
       +
           "-Denable-docs=false"

     

       28
       24
        
         ];

     

       29
       25
        
       

     

       26
       26
       +
         patches = [

     

       27
       27
       +
           ./fix-build-paths.patch

     

       28
       28
       +
         ];

     

       30
       29
        
       

     

       31
       31
       -
         # don't touch /var at install time, colord creates what it needs at runtime

     

       32
       32
       -
         postPatch = ''

     

       33
       33
       -
           sed -e "s|if test -w .*;|if false;|" -i src/Makefile.{am,in}

     

       34
       34
       -
         '';

     

       30
       30
       +
         nativeBuildInputs = [ meson pkgconfig vala_0_38 ninja gettext libxml2 gobjectIntrospection ];

     

       35
       31
        
       

     

       36
       36
       -
         nativeBuildInputs = [ autoreconfHook intltool pkgconfig ];

     

       37
       37
       -
       

     

       38
       38
       -
         buildInputs = [ glib polkit gusb libusb1 lcms2 sqlite systemd dbus gobjectIntrospection

     

       32
       32
       +
         buildInputs = [ glib polkit gusb lcms2 sqlite systemd dbus

     

       39
       33
        
                         bash-completion argyllcms libgudev sane-backends ];

     

       40
       34
        
       

     

       41
       35
        
         postInstall = ''

     

       42
       42
       -
           mkdir -p $out/etc/bash_completion.d

     

       43
       43
       -
           cp -v data/colormgr $out/etc/bash_completion.d

     

       36
       36
       +
           glib-compile-schemas $out/share/glib-2.0/schemas

     

       44
       37
        
         '';

     

       45
       38
        
       

     

       46
       39
        
         meta = {

     

       47
       40
        
           description = "System service to manage, install and generate color profiles to accurately color manage input and output devices";

     

       48
       48
       -
           homepage = http://www.freedesktop.org/software/colord/intro.html;

     

       41
       41
       +
           homepage = https://www.freedesktop.org/software/colord/;

     

       49
       42
        
           license = stdenv.lib.licenses.lgpl2Plus;

     

       50
       43
        
           maintainers = [stdenv.lib.maintainers.marcweber];

     

       51
       44
        
           platforms = stdenv.lib.platforms.linux;

+56

pkgs/tools/misc/colord/fix-build-paths.patch

···

       1
       1
       +
       --- a/contrib/session-helper/meson.build

     

       2
       2
       +
       +++ b/contrib/session-helper/meson.build

     

       3
       3
       +
       @@ -21,7 +21,7 @@

     

       4
       4
       +
            output : 'colord-session.service',

     

       5
       5
       +
            configuration : con2,

     

       6
       6
       +
            install: true,

     

       7
       7
       +
       -    install_dir: systemd.get_pkgconfig_variable('systemduserunitdir'),

     

       8
       8
       +
       +    install_dir: join_paths(get_option('prefix'), 'etc', 'systemd', 'user'),

     

       9
       9
       +
          )

     

       10
       10
       +
        endif

     

       11
       11
       +
        

     

       12
       12
       +
       --- a/data/meson.build

     

       13
       13
       +
       +++ b/data/meson.build

     

       14
       14
       +
       @@ -8,13 +8,13 @@

     

       15
       15
       +
        

     

       16
       16
       +
        if get_option('enable-systemd')

     

       17
       17
       +
          install_data('colord.conf',

     

       18
       18
       +
       -    install_dir: systemd.get_pkgconfig_variable('tmpfilesdir')

     

       19
       19
       +
       +    install_dir: join_paths(get_option('prefix'), 'lib', 'tmpfiles.d')

     

       20
       20
       +
          )

     

       21
       21
       +
        endif

     

       22
       22
       +
        

     

       23
       23
       +
        if get_option('enable-bash-completion')

     

       24
       24
       +
          install_data('colormgr',

     

       25
       25
       +
       -    install_dir: bash_completion.get_pkgconfig_variable('completionsdir')

     

       26
       26
       +
       +    install_dir: join_paths(get_option('prefix'), 'etc', 'bash_completion.d')

     

       27
       27
       +
          )

     

       28
       28
       +
        endif

     

       29
       29
       +
        

     

       30
       30
       +
       @@ -31,7 +31,7 @@

     

       31
       31
       +
            output : 'colord.service',

     

       32
       32
       +
            configuration : con2,

     

       33
       33
       +
            install: true,

     

       34
       34
       +
       -    install_dir: systemd.get_pkgconfig_variable('systemdsystemunitdir'),

     

       35
       35
       +
       +    install_dir: join_paths(get_option('prefix'), 'etc', 'systemd', 'system'),

     

       36
       36
       +
          )

     

       37
       37
       +
        endif

     

       38
       38
       +
        

     

       39
       39
       +
       --- a/meson.build

     

       40
       40
       +
       +++ b/meson.build

     

       41
       41
       +
       @@ -258,6 +258,3 @@

     

       42
       42
       +
        subdir('policy')

     

       43
       43
       +
        subdir('rules')

     

       44
       44
       +
        subdir('src')

     

       45
       45
       +
       -

     

       46
       46
       +
       -meson.add_install_script('meson_post_install.sh',

     

       47
       47
       +
       -                         localstatedir, get_option('with-daemon-user'))

     

       48
       48
       +
       --- a/rules/meson.build

     

       49
       49
       +
       +++ b/rules/meson.build

     

       50
       50
       +
       @@ -9,5 +9,5 @@

     

       51
       51
       +
            sensor_rules_in,

     

       52
       52
       +
            '95-cd-devices.rules',

     

       53
       53
       +
          ],

     

       54
       54
       +
       -  install_dir : join_paths(udev.get_pkgconfig_variable('udevdir'), 'rules.d')

     

       55
       55
       +
       +  install_dir : join_paths(get_option('prefix'), 'lib', 'udev', 'rules.d')

     

       56
       56
       +
        )

+2 -2

pkgs/tools/misc/fwup/default.nix

···

       4
       4
        
       

     

       5
       5
        
       stdenv.mkDerivation rec {

     

       6
       6
        
         name = "fwup-${version}";

     

       7
       7
       -
         version = "0.14.3";

     

       7
       7
       +
         version = "0.16.1";

     

       8
       8
        
       

     

       9
       9
        
         src = fetchFromGitHub {

     

       10
       10
        
           owner = "fhunleth";

     

       11
       11
        
           repo = "fwup";

     

       12
       12
        
           rev = "v${version}";

     

       13
       13
       -
           sha256 = "15sjpxw1llpipshriivpha6470lkvhcgs5wh5mlaabjbvrgxygqh";

     

       13
       13
       +
           sha256 = "1hphgpwxzdbfswzxbx0jm7lma1xkkwxvm8ll3jp2ljmimqzzb7jf";

     

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
        
         doCheck = true;

+9 -9

pkgs/tools/misc/ostree/default.nix

···

       1
       1
        
       { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gtk_doc, gobjectIntrospection

     

       2
       2
        
       , libgsystem, xz, e2fsprogs, libsoup, gpgme, which, autoconf, automake, libtool, fuse

     

       3
       3
       -
       , libcap, yacc, libxslt, docbook_xsl, docbook_xml_dtd_42

     

       3
       3
       +
       , libarchive, libcap, bzip2, yacc, libxslt, docbook_xsl, docbook_xml_dtd_42

     

       4
       4
        
       }:

     

       5
       5
        
       

     

       6
       6
        
       let

     

       7
       7
        
         libglnx-src = fetchFromGitHub {

     

       8
       8
        
           owner  = "GNOME";

     

       9
       9
        
           repo   = "libglnx";

     

       10
       10
       -
           rev    = "50a0feaba03ffa5a1980d3a14487276b8f49f8a6";

     

       11
       11
       -
           sha256 = "1rn5jdh84y1yfpqmvidx82lkm0jr7scjzdrps57r37ksxvrk3ibs";

     

       10
       10
       +
           rev    = "5362f6bc3ff3e30f379e767b203d15c9e56d6f08";

     

       11
       11
       +
           sha256 = "1l4vm7bx3cf4q44n3a1i2gszyryqyimcxvx54gna72q7dw130mrr";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         bsdiff-src = fetchFromGitHub {

     

       15
       15
        
           owner  = "mendsley";

     

       16
       16
        
           repo   = "bsdiff";

     

       17
       17
       -
           rev    = "7d70d8f4ff48345bc76e314c9d98da91f78873fa";

     

       18
       18
       -
           sha256 = "0ai2kykj8i4bqcy3gry36r3n4ax0fldncfhksl5b293nf2fihnws";

     

       17
       17
       +
           rev    = "1edf9f656850c0c64dae260960fabd8249ea9c60";

     

       18
       18
       +
           sha256 = "1h71d2h2d3anp4msvpaff445rnzdxii3id2yglqk7af9i43kdsn1";

     

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
       -
         version = "2017.9";

     

       21
       21
       +
         version = "2017.12";

     

       22
       22
        
       in stdenv.mkDerivation {

     

       23
       23
        
         name = "ostree-${version}";

     

       24
       24
        
       

     
···

       26
       26
        
           rev    = "v${version}";

     

       27
       27
        
           owner  = "ostreedev";

     

       28
       28
        
           repo   = "ostree";

     

       29
       29
       -
           sha256 = "1040xcw8qcs6xq8x4wg47hha3915qzb6lndb38wjyn6wzl1680q3";

     

       29
       29
       +
           sha256 = "0gxvpzwz7z4zihz5hkn6ajv7f6gas4zi2pznhi5v6wy7cw06if68";

     

       30
       30
        
         };

     

       31
       31
        
       

     

       32
       32
        
         nativeBuildInputs = [

     
···

       34
       34
        
           libxslt docbook_xsl docbook_xml_dtd_42

     

       35
       35
        
         ];

     

       36
       36
        
       

     

       37
       37
       -
         buildInputs = [ libgsystem xz e2fsprogs libsoup gpgme fuse libcap ];

     

       37
       37
       +
         buildInputs = [ libgsystem xz e2fsprogs libsoup gpgme fuse libarchive libcap bzip2 ];

     

       38
       38
        
       

     

       39
       39
        
         prePatch = ''

     

       40
       40
        
           rmdir libglnx bsdiff

     
···

       50
       50
        
       

     

       51
       51
        
         meta = with stdenv.lib; {

     

       52
       52
        
           description = "Git for operating system binaries";

     

       53
       53
       -
           homepage    = "http://live.gnome.org/OSTree/";

     

       53
       53
       +
           homepage    = https://ostree.readthedocs.io/en/latest/;

     

       54
       54
        
           license     = licenses.lgpl2Plus;

     

       55
       55
        
           platforms   = platforms.linux;

     

       56
       56
        
           maintainers = with maintainers; [ copumpkin ];

+5 -5

pkgs/tools/networking/network-manager-applet/default.nix

···

       1
       1
        
       { stdenv, fetchurl, intltool, pkgconfig, libglade, networkmanager, gnome3

     

       2
       2
       -
       , libnotify, libsecret, polkit, isocodes, modemmanager, librsvg

     

       2
       2
       +
       , libnotify, libsecret, polkit, isocodes, modemmanager

     

       3
       3
        
       , mobile_broadband_provider_info, glib_networking, gsettings_desktop_schemas

     

       4
       4
       -
       , makeWrapper, udev, libgudev, hicolor_icon_theme, jansson, wrapGAppsHook, webkitgtk

     

       4
       4
       +
       , udev, libgudev, hicolor_icon_theme, jansson, wrapGAppsHook, webkitgtk

     

       5
       5
        
       , withGnome ? false }:

     

       6
       6
        
       

     

       7
       7
        
       stdenv.mkDerivation rec {

     
···

       24
       24
        
       

     

       25
       25
        
         buildInputs = [

     

       26
       26
        
           gnome3.gtk libglade networkmanager libnotify libsecret gsettings_desktop_schemas

     

       27
       27
       -
           polkit isocodes makeWrapper udev libgudev gnome3.gconf gnome3.libgnome_keyring

     

       28
       28
       -
           modemmanager jansson librsvg glib_networking gnome3.dconf

     

       27
       27
       +
           polkit isocodes udev libgudev gnome3.libgnome_keyring

     

       28
       28
       +
           modemmanager jansson glib_networking

     

       29
       29
        
         ] ++ stdenv.lib.optional withGnome webkitgtk;

     

       30
       30
        
       

     

       31
       31
        
         nativeBuildInputs = [ intltool pkgconfig wrapGAppsHook ];

     

       32
       32
        
       

     

       33
       33
       -
         propagatedUserEnvPkgs = [ gnome3.gconf gnome3.gnome_keyring hicolor_icon_theme ];

     

       33
       33
       +
         propagatedUserEnvPkgs = [ gnome3.gnome_keyring hicolor_icon_theme ];

     

       34
       34
        
       

     

       35
       35
        
         makeFlags = [

     

       36
       36
        
           ''CFLAGS=-DMOBILE_BROADBAND_PROVIDER_INFO=\"${mobile_broadband_provider_info}/share/mobile-broadband-provider-info/serviceproviders.xml\"''

+4 -4

pkgs/tools/package-management/packagekit/default.nix

···

       1
       1
        
       { stdenv, fetchFromGitHub, lib

     

       2
       2
        
       , intltool, glib, pkgconfig, polkit, python, sqlite, systemd

     

       3
       3
       -
       , gobjectIntrospection, vala_0_23, gtk_doc, autoreconfHook, autoconf-archive

     

       3
       3
       +
       , gobjectIntrospection, vala_0_38, gtk_doc, autoreconfHook, autoconf-archive

     

       4
       4
        
       # TODO: set enableNixBackend to true, as soon as it builds

     

       5
       5
        
       , nix, enableNixBackend ? false, boost

     

       6
       6
        
       , enableCommandNotFound ? false

     
···

       8
       8
        
       

     

       9
       9
        
       stdenv.mkDerivation rec {

     

       10
       10
        
         name = "packagekit-${version}";

     

       11
       11
       -
         version = "1.1.3";

     

       11
       11
       +
         version = "1.1.7";

     

       12
       12
        
       

     

       13
       13
        
         src = fetchFromGitHub {

     

       14
       14
        
           owner = "hughsie";

     

       15
       15
        
           repo = "PackageKit";

     

       16
       16
        
           rev = "PACKAGEKIT_${lib.replaceStrings ["."] ["_"] version}";

     

       17
       17
       -
           sha256 = "150mpar7bhlvwfpwsr6zrjn3yggvklzr6nlhk0shaxnrfkfxvvb6";

     

       17
       17
       +
           sha256 = "076rrczmyhapj87pxqldsar5pbz4mid6cm9l1n91zh2q403chdkb";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
       -
         buildInputs = [ glib polkit systemd python gobjectIntrospection vala_0_23 ]

     

       20
       20
       +
         buildInputs = [ glib polkit systemd python gobjectIntrospection vala_0_38 ]

     

       21
       21
        
                         ++ lib.optional enableBashCompletion bash-completion;

     

       22
       22
        
         propagatedBuildInputs = [ sqlite nix boost ];

     

       23
       23
        
         nativeBuildInputs = [ intltool pkgconfig autoreconfHook autoconf-archive gtk_doc ];

+1

pkgs/top-level/all-packages.nix

···

       6733
       6733
        
         spidermonkey_17 = callPackage ../development/interpreters/spidermonkey/17.nix { };

     

       6734
       6734
        
         spidermonkey_31 = callPackage ../development/interpreters/spidermonkey/31.nix { };

     

       6735
       6735
        
         spidermonkey_38 = callPackage ../development/interpreters/spidermonkey/38.nix { };

     

       6736
       6736
       +
         spidermonkey_52 = callPackage ../development/interpreters/spidermonkey/52.nix { };

     

       6736
       6737
        
         spidermonkey = spidermonkey_31;

     

       6737
       6738
        
       

     

       6738
       6739
        
         ssm-agent = callPackage ../applications/networking/cluster/ssm-agent { };