git.iko.soy/typeable/nixpkgs
on master help sign in
treewide: no gnome aliases
97eb653Jan Tojnar
pkgs/applications/audio/parlatype/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, pkgconfig, meson, gnome3, at-spi2-core, dbus, gst_all_1, sphinxbase, pocketsphinx, ninja, gettext, appstream-glib, python3, glib, gobject-introspection, gsettings-desktop-schemas, itstool, wrapGAppsHook, makeWrapper, hicolor-icon-theme }:
1+{ stdenv, fetchFromGitHub, pkgconfig, meson, gtk3, at-spi2-core, dbus, gst_all_1, sphinxbase, pocketsphinx, ninja, gettext, appstream-glib, python3, glib, gobject-introspection, gsettings-desktop-schemas, itstool, wrapGAppsHook, makeWrapper, hicolor-icon-theme }:
2
2
3stdenv.mkDerivation rec {
3stdenv.mkDerivation rec {
4 pname = "parlatype";
4 pname = "parlatype";
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
24 ];
24 ];
25
25
26 buildInputs = [
26 buildInputs = [
27− gnome3.gtk
27+ gtk3
28 at-spi2-core
28 at-spi2-core
29 dbus
29 dbus
30 gst_all_1.gstreamer
30 gst_all_1.gstreamer
pkgs/applications/audio/rhythmbox/default.nix+2−1
@@ -4,6 +4,7 @@
4, perlPackages
4, perlPackages
5, gtk3
5, gtk3
6, intltool
6, intltool
7+, libpeas
7, libsoup
8, libsoup
8, gnome3
9, gnome3
9, totem-pl-parser
10, totem-pl-parser
@@ -48,7 +49,7 @@ in stdenv.mkDerivation rec {
48 json-glib
49 json-glib
49
50
50 gtk3
51 gtk3
51− gnome3.libpeas
52+ libpeas
52 totem-pl-parser
53 totem-pl-parser
53 gnome3.adwaita-icon-theme
54 gnome3.adwaita-icon-theme
54
55
pkgs/applications/backup/deja-dup/default.nix+2−2
@@ -1,6 +1,6 @@
1{ stdenv, fetchFromGitLab, substituteAll, meson, ninja, pkgconfig, vala_0_40, gettext
1{ stdenv, fetchFromGitLab, substituteAll, meson, ninja, pkgconfig, vala_0_40, gettext
2, gnome3, libnotify, itstool, glib, gtk3, libxml2
2, gnome3, libnotify, itstool, glib, gtk3, libxml2
3−, coreutils, libsecret, pcre, libxkbcommon, wrapGAppsHook
3+, coreutils, libpeas, libsecret, pcre, libxkbcommon, wrapGAppsHook
4, libpthreadstubs, libXdmcp, epoxy, at-spi2-core, dbus, libgpgerror
4, libpthreadstubs, libXdmcp, epoxy, at-spi2-core, dbus, libgpgerror
5, appstream-glib, desktop-file-utils, duplicity
5, appstream-glib, desktop-file-utils, duplicity
6}:
6}:
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
35 ];
35 ];
36
36
37 buildInputs = [
37 buildInputs = [
38− libnotify gnome3.libpeas glib gtk3 libsecret
38+ libnotify libpeas glib gtk3 libsecret
39 pcre libxkbcommon libpthreadstubs libXdmcp epoxy gnome3.nautilus
39 pcre libxkbcommon libpthreadstubs libXdmcp epoxy gnome3.nautilus
40 at-spi2-core dbus gnome3.gnome-online-accounts libgpgerror
40 at-spi2-core dbus gnome3.gnome-online-accounts libgpgerror
41 ];
41 ];
pkgs/applications/editors/gnome-builder/default.nix+2−1
@@ -17,6 +17,7 @@
17, json-glib
17, json-glib
18, jsonrpc-glib
18, jsonrpc-glib
19, libdazzle
19, libdazzle
20+, libpeas
20, libxml2
21, libxml2
21, meson
22, meson
22, ninja
23, ninja
@@ -64,7 +65,7 @@ in stdenv.mkDerivation {
64 flatpak
65 flatpak
65 gnome3.devhelp
66 gnome3.devhelp
66 libgit2-glib
67 libgit2-glib
67− gnome3.libpeas
68+ libpeas
68 vte
69 vte
69 gspell
70 gspell
70 gtk3
71 gtk3
pkgs/applications/editors/jucipp/default.nix+5−5
@@ -1,6 +1,6 @@
1−{ stdenv, fetchgit, gnome3, at-spi2-core,
1+{ stdenv, fetchgit, gnome3, gtksourceview3, at-spi2-core, gtksourceviewmm,
2 boost, epoxy, cmake, aspell, llvmPackages, libgit2, pkgconfig, pcre,
2 boost, epoxy, cmake, aspell, llvmPackages, libgit2, pkgconfig, pcre,
3− libXdmcp, libxkbcommon, libpthreadstubs, wrapGAppsHook, aspellDicts,
3+ libXdmcp, libxkbcommon, libpthreadstubs, wrapGAppsHook, aspellDicts, gtkmm3,
4 coreutils, glibc, dbus, openssl, libxml2, gnumake, ctags }:
4 coreutils, glibc, dbus, openssl, libxml2, gnumake, ctags }:
5
5
6with stdenv.lib;
6with stdenv.lib;
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
29 dbus
29 dbus
30 openssl
30 openssl
31 libxml2
31 libxml2
32− gnome3.gtksourceview
32+ gtksourceview3
33 at-spi2-core
33 at-spi2-core
34 pcre
34 pcre
35 epoxy
35 epoxy
@@ -39,9 +39,9 @@ stdenv.mkDerivation rec {
39 aspell
39 aspell
40 libgit2
40 libgit2
41 libxkbcommon
41 libxkbcommon
42− gnome3.gtkmm3
42+ gtkmm3
43 libpthreadstubs
43 libpthreadstubs
44− gnome3.gtksourceviewmm
44+ gtksourceviewmm
45 llvmPackages.clang.cc
45 llvmPackages.clang.cc
46 llvmPackages.lldb
46 llvmPackages.lldb
47 gnome3.dconf
47 gnome3.dconf
pkgs/applications/misc/gImageReader/default.nix+4−4
@@ -7,7 +7,7 @@
7# Gtk deps
7# Gtk deps
8# upstream gImagereader supports Qt too
8# upstream gImagereader supports Qt too
9, gtk3, gobject-introspection, wrapGAppsHook
9, gtk3, gobject-introspection, wrapGAppsHook
10−, gnome3, gtkspell3, gtkspellmm, cairomm
10+, gnome3, gtkmm3, gtksourceview3, gtksourceviewmm, gtkspell3, gtkspellmm, cairomm
11}:
11}:
12
12
13let
13let
@@ -48,11 +48,11 @@ stdenv.mkDerivation rec {
48 poppler
48 poppler
49
49
50 # Gtk specific
50 # Gtk specific
51− gnome3.gtkmm
51+ gtkmm3
52 gtkspell3
52 gtkspell3
53 gtkspellmm
53 gtkspellmm
54− gnome3.gtksourceview
54+ gtksourceview3
55− gnome3.gtksourceviewmm
55+ gtksourceviewmm
56 cairomm
56 cairomm
57 json-glib
57 json-glib
58 ];
58 ];
pkgs/applications/office/autokey/default.nix+2−2
@@ -1,5 +1,5 @@
1{ lib, python3Packages, fetchFromGitHub, wrapGAppsHook, gobject-introspection
1{ lib, python3Packages, fetchFromGitHub, wrapGAppsHook, gobject-introspection
2−, gnome3, libappindicator-gtk3, libnotify }:
2+, gtksourceview3, libappindicator-gtk3, libnotify }:
3
3
4python3Packages.buildPythonApplication rec {
4python3Packages.buildPythonApplication rec {
5 name = "autokey-${version}";
5 name = "autokey-${version}";
@@ -22,7 +22,7 @@ python3Packages.buildPythonApplication rec {
22 # Note: no dependencies included for Qt GUI because Qt ui is poorly
22 # Note: no dependencies included for Qt GUI because Qt ui is poorly
23 # maintained—see https://github.com/autokey/autokey/issues/51
23 # maintained—see https://github.com/autokey/autokey/issues/51
24
24
25− buildInputs = [ wrapGAppsHook gobject-introspection gnome3.gtksourceview
25+ buildInputs = [ wrapGAppsHook gobject-introspection gtksourceview3
26 libappindicator-gtk3 libnotify ];
26 libappindicator-gtk3 libnotify ];
27
27
28 propagatedBuildInputs = with python3Packages; [
28 propagatedBuildInputs = with python3Packages; [
pkgs/applications/video/bombono/default.nix+10−10
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, wrapGAppsHook, gtk2, boost, gnome2, scons,
1+{ stdenv, fetchFromGitHub, wrapGAppsHook, gtk2, boost, gnome2, gtkmm2, scons,
2mjpegtools, libdvdread, dvdauthor, gettext, dvdplusrwtools, libxmlxx, ffmpeg,
2mjpegtools, libdvdread, dvdauthor, gettext, dvdplusrwtools, libxmlxx, ffmpeg,
3enca, pkgconfig, fetchpatch }:
3enca, pkgconfig, fetchpatch }:
4
4
@@ -18,20 +18,20 @@ stdenv.mkDerivation rec {
18 };
18 };
19
19
20 patches = map fetchPatchFromAur [
20 patches = map fetchPatchFromAur [
21− {name="fix_ffmpeg_codecid.patch"; sha256="1asfc0lqzk4gjssrvjmsi1xr53ygnsx2sh7c8yzp5r3j2bagxhp7";}
21+ {name="fix_ffmpeg_codecid.patch"; sha256="1asfc0lqzk4gjssrvjmsi1xr53ygnsx2sh7c8yzp5r3j2bagxhp7";}
22− {name="fix_ptr2bool_cast.patch"; sha256="0iqzrmbg38ikh4x9cmx0v0rnm7a9lcq0kd8sh1z9yfmnz71qqahg";}
22+ {name="fix_ptr2bool_cast.patch"; sha256="0iqzrmbg38ikh4x9cmx0v0rnm7a9lcq0kd8sh1z9yfmnz71qqahg";}
23− {name="fix_c++11_literal_warnings.patch"; sha256="1zbf12i77p0j0090pz5lzg4a7kyahahzqssybv7vi0xikwvw57w9";}
23+ {name="fix_c++11_literal_warnings.patch"; sha256="1zbf12i77p0j0090pz5lzg4a7kyahahzqssybv7vi0xikwvw57w9";}
24− {name="autoptr2uniqueptr.patch"; sha256="0a3wvwfplmqvi8fnj929y85z3h1iq7baaz2d4v08h1q2wbmakqdm";}
24+ {name="autoptr2uniqueptr.patch"; sha256="0a3wvwfplmqvi8fnj929y85z3h1iq7baaz2d4v08h1q2wbmakqdm";}
25− {name="fix_deprecated_boost_api.patch"; sha256="184gdz3w95ihhsd8xscpwvq77xd4il47kvmv6wslax77xyw50gm8";}
25+ {name="fix_deprecated_boost_api.patch"; sha256="184gdz3w95ihhsd8xscpwvq77xd4il47kvmv6wslax77xyw50gm8";}
26− {name="fix_throw_specifications.patch"; sha256="1f5gi3qwm843hsxvijq7sjy0s62xm7rnr1vdp7f242fi0ldq6c1n";}
26+ {name="fix_throw_specifications.patch"; sha256="1f5gi3qwm843hsxvijq7sjy0s62xm7rnr1vdp7f242fi0ldq6c1n";}
27− {name="fix_operator_ambiguity.patch"; sha256="0r4scsbsqfg6wgzsbfxxpckamvgyrida0n1ypg1klx24pk5dc7n7";}
27+ {name="fix_operator_ambiguity.patch"; sha256="0r4scsbsqfg6wgzsbfxxpckamvgyrida0n1ypg1klx24pk5dc7n7";}
28− {name="fix_ffmpeg30.patch"; sha256="1irva7a9bpbzs60ga8ypa3la9y84i5rz20jnd721qmfqp2yip8dw";}
28+ {name="fix_ffmpeg30.patch"; sha256="1irva7a9bpbzs60ga8ypa3la9y84i5rz20jnd721qmfqp2yip8dw";}
29 ];
29 ];
30
30
31 nativeBuildInputs = [ wrapGAppsHook scons pkgconfig gettext ];
31 nativeBuildInputs = [ wrapGAppsHook scons pkgconfig gettext ];
32
32
33 buildInputs = [
33 buildInputs = [
34− gtk2 gnome2.gtkmm mjpegtools libdvdread dvdauthor boost dvdplusrwtools
34+ gtk2 gtkmm2 mjpegtools libdvdread dvdauthor boost dvdplusrwtools
35 libxmlxx ffmpeg enca
35 libxmlxx ffmpeg enca
36 ];
36 ];
37
37
pkgs/applications/video/subtitleeditor/default.nix+2−2
@@ -1,5 +1,5 @@
1{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, intltool, file,
1{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, intltool, file,
2− desktop-file-utils, enchant, gnome3, gtk3, gst_all_1, hicolor-icon-theme,
2+ desktop-file-utils, enchant, gnome3, gtk3, gtkmm3, gst_all_1, hicolor-icon-theme,
3 libsigcxx, libxmlxx, xdg_utils, isocodes, wrapGAppsHook
3 libsigcxx, libxmlxx, xdg_utils, isocodes, wrapGAppsHook
4}:
4}:
5
5
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
29 desktop-file-utils
29 desktop-file-utils
30 enchant
30 enchant
31 gtk3
31 gtk3
32− gnome3.gtkmm
32+ gtkmm3
33 gst_all_1.gstreamer
33 gst_all_1.gstreamer
34 gst_all_1.gstreamermm
34 gst_all_1.gstreamermm
35 gst_all_1.gst-plugins-base
35 gst_all_1.gst-plugins-base
pkgs/desktops/deepin/deepin-metacity/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, pkgconfig, intltool, libtool, gnome3, gtk3, bamf,
1+{ stdenv, fetchFromGitHub, pkgconfig, intltool, libtool, gnome3, gtk3, libgtop, bamf,
2 json-glib, libcanberra-gtk3, libxkbcommon, libstartup_notification,
2 json-glib, libcanberra-gtk3, libxkbcommon, libstartup_notification,
3 deepin-wallpapers, deepin-desktop-schemas, deepin }:
3 deepin-wallpapers, deepin-desktop-schemas, deepin }:
4
4
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
25 buildInputs = [
25 buildInputs = [
26 gnome3.dconf
26 gnome3.dconf
27 gtk3
27 gtk3
28− gnome3.libgtop
28+ libgtop
29 gnome3.zenity
29 gnome3.zenity
30 bamf
30 bamf
31 json-glib
31 json-glib
pkgs/desktops/mate/eom/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, intltool, itstool, dbus-glib, exempi, lcms2, libexif, libjpeg, librsvg, libxml2, shared-mime-info, gnome3, gtk3, mate, hicolor-icon-theme, wrapGAppsHook }:
1+{ stdenv, fetchurl, pkgconfig, intltool, itstool, dbus-glib, exempi, lcms2, libexif, libjpeg, librsvg, libxml2, libpeas, shared-mime-info, gnome3, gtk3, mate, hicolor-icon-theme, wrapGAppsHook }:
2
2
3stdenv.mkDerivation rec {
3stdenv.mkDerivation rec {
4 name = "eom-${version}";
4 name = "eom-${version}";
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
26 libxml2
26 libxml2
27 shared-mime-info
27 shared-mime-info
28 gtk3
28 gtk3
29− gnome3.libpeas
29+ libpeas
30 mate.mate-desktop
30 mate.mate-desktop
31 hicolor-icon-theme
31 hicolor-icon-theme
32 ];
32 ];
pkgs/desktops/mate/mate-applets/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, intltool, itstool, gnome3, gtk3, libwnck3, libgtop, libxml2, libnotify, polkit, upower, wirelesstools, mate, hicolor-icon-theme, wrapGAppsHook }:
1+{ stdenv, fetchurl, pkgconfig, intltool, itstool, gnome3, gtk3, gtksourceview3, libwnck3, libgtop, libxml2, libnotify, polkit, upower, wirelesstools, mate, hicolor-icon-theme, wrapGAppsHook }:
2
2
3stdenv.mkDerivation rec {
3stdenv.mkDerivation rec {
4 name = "mate-applets-${version}";
4 name = "mate-applets-${version}";
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
18
18
19 buildInputs = [
19 buildInputs = [
20 gtk3
20 gtk3
21− gnome3.gtksourceview
21+ gtksourceview3
22 gnome3.gucharmap
22 gnome3.gucharmap
23 libwnck3
23 libwnck3
24 libgtop
24 libgtop
pkgs/desktops/mate/pluma/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, intltool, itstool, isocodes, enchant, libxml2, python, gnome3, mate, wrapGAppsHook }:
1+{ stdenv, fetchurl, pkgconfig, intltool, itstool, isocodes, enchant, libxml2, python, gnome3, gtksourceview3, libpeas, mate, wrapGAppsHook }:
2
2
3stdenv.mkDerivation rec {
3stdenv.mkDerivation rec {
4 name = "pluma-${version}";
4 name = "pluma-${version}";
@@ -21,8 +21,8 @@ stdenv.mkDerivation rec {
21 enchant
21 enchant
22 libxml2
22 libxml2
23 python
23 python
24− gnome3.gtksourceview
24+ gtksourceview3
25− gnome3.libpeas
25+ libpeas
26 gnome3.adwaita-icon-theme
26 gnome3.adwaita-icon-theme
27 mate.mate-desktop
27 mate.mate-desktop
28 ];
28 ];
pkgs/development/libraries/aravis/default.nix+3−1
@@ -7,6 +7,7 @@
7, gst-plugins-bad ? null
7, gst-plugins-bad ? null
8, libnotify ? null
8, libnotify ? null
9, gnome3 ? null
9, gnome3 ? null
10+, gtk3 ? null
10, enableUsb ? true
11, enableUsb ? true
11, enablePacketSocket ? true
12, enablePacketSocket ? true
12, enableViewer ? true
13, enableViewer ? true
@@ -26,6 +27,7 @@ in
26 assert enableViewer -> enableGstPlugin;
27 assert enableViewer -> enableGstPlugin;
27 assert enableViewer -> libnotify != null;
28 assert enableViewer -> libnotify != null;
28 assert enableViewer -> gnome3 != null;
29 assert enableViewer -> gnome3 != null;
30+ assert enableViewer -> gtk3 != null;
29 assert enableViewer -> gstreamerAtLeastVersion1;
31 assert enableViewer -> gstreamerAtLeastVersion1;
30
32
31 stdenv.mkDerivation rec {
33 stdenv.mkDerivation rec {
@@ -54,7 +56,7 @@ in
54 ++ stdenv.lib.optional enableUsb libusb
56 ++ stdenv.lib.optional enableUsb libusb
55 ++ stdenv.lib.optional enablePacketSocket audit
57 ++ stdenv.lib.optional enablePacketSocket audit
56 ++ stdenv.lib.optionals (enableViewer || enableGstPlugin) [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad ]
58 ++ stdenv.lib.optionals (enableViewer || enableGstPlugin) [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad ]
57− ++ stdenv.lib.optionals (enableViewer) [ libnotify gnome3.gtk3 gnome3.adwaita-icon-theme ];
59+ ++ stdenv.lib.optionals (enableViewer) [ libnotify gtk3 gnome3.adwaita-icon-theme ];
58
60
59 preAutoreconf = ''./autogen.sh'';
61 preAutoreconf = ''./autogen.sh'';
60
62