Merge remote-tracking branch 'origin/master' into staging-next
This commit is contained in:
Martin Weinelt
@@ -8,7 +8,7 @@
|
||||
, gcr
|
||||
, gettext
|
||||
, glib
|
||||
, gnome3
|
||||
, gnome
|
||||
, gpgme
|
||||
, gtk3
|
||||
, gtksourceview3
|
||||
@@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
passthru = {
|
||||
updateScript = gnome3.updateScript {
|
||||
updateScript = gnome.updateScript {
|
||||
packageName = pname;
|
||||
versionPolicy = "none"; # it is quite odd
|
||||
};
|
||||
|
||||
@@ -30,6 +30,6 @@ stdenv.mkDerivation {
|
||||
homepage = "https://github.com/torrinfail/dwmblocks";
|
||||
license = licenses.isc;
|
||||
maintainers = with maintainers; [ sophrosyne ];
|
||||
platforms = platforms.all;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
, vala
|
||||
, gsettings-desktop-schemas
|
||||
, gtk3
|
||||
, gnome3
|
||||
, gnome
|
||||
, desktop-file-utils
|
||||
, wrapGAppsHook
|
||||
, gobject-introspection
|
||||
@@ -77,7 +77,7 @@ stdenv.mkDerivation rec {
|
||||
sqlite
|
||||
gsettings-desktop-schemas # for font settings
|
||||
gtk3
|
||||
gnome3.adwaita-icon-theme
|
||||
gnome.adwaita-icon-theme
|
||||
libsoup
|
||||
glib-networking # for SSL so that Google Fonts can load
|
||||
webkitgtk
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchurl, pkg-config, gtk2, gnome2, gnome3, libgksu,
|
||||
{ lib, stdenv, fetchurl, pkg-config, gtk2, gnome2, gnome, libgksu,
|
||||
intltool, libstartup_notification, gtk-doc, wrapGAppsHook
|
||||
}:
|
||||
|
||||
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
gtk2 gnome2.GConf libstartup_notification gnome3.libgnome-keyring
|
||||
gtk2 gnome2.GConf libstartup_notification gnome.libgnome-keyring
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
, desktop-file-utils
|
||||
, gettext
|
||||
, glib
|
||||
, gnome3
|
||||
, gnome
|
||||
, gtk3
|
||||
, gusb
|
||||
, libcanberra-gtk3
|
||||
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
passthru = {
|
||||
updateScript = gnome3.updateScript {
|
||||
updateScript = gnome.updateScript {
|
||||
packageName = pname;
|
||||
};
|
||||
};
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
, gnome3
|
||||
, gnome
|
||||
, desktop-file-utils
|
||||
, gettext
|
||||
, itstool
|
||||
@@ -64,7 +64,7 @@ in stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = gnome3.updateScript {
|
||||
updateScript = gnome.updateScript {
|
||||
packageName = pname;
|
||||
};
|
||||
};
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
, gtk3
|
||||
, libgtop
|
||||
, libdazzle
|
||||
, gnome3
|
||||
, gnome
|
||||
, tracker
|
||||
, libhandy
|
||||
}:
|
||||
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs = [
|
||||
glib
|
||||
gnome3.adwaita-icon-theme
|
||||
gnome.adwaita-icon-theme
|
||||
gtk3
|
||||
libdazzle
|
||||
libgtop
|
||||
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = gnome3.updateScript {
|
||||
updateScript = gnome.updateScript {
|
||||
packageName = pname;
|
||||
};
|
||||
};
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchurl, intltool, libxml2, pkg-config, gnome3, libchamplain, gdl, shared-mime-info, desktop-file-utils, wrapGAppsHook }:
|
||||
{ lib, stdenv, fetchurl, intltool, libxml2, pkg-config, gnome, libchamplain, gdl, shared-mime-info, desktop-file-utils, wrapGAppsHook }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gpx-viewer";
|
||||
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
|
||||
intltool pkg-config
|
||||
wrapGAppsHook # Fix error: GLib-GIO-ERROR **: No GSettings schemas are installed on the system
|
||||
];
|
||||
buildInputs = [ gdl libchamplain gnome3.adwaita-icon-theme libxml2 ];
|
||||
buildInputs = [ gdl libchamplain gnome.adwaita-icon-theme libxml2 ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://blog.sarine.nl/tag/gpxviewer/";
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
{ lib, stdenv, pkgs
|
||||
, glib, gnome3, gtk3, gtksourceview3, gtkspell3, poppler, texlive
|
||||
, glib, gnome, gtk3, gtksourceview3, gtkspell3, poppler, texlive
|
||||
, pkg-config, intltool, autoreconfHook, wrapGAppsHook
|
||||
}:
|
||||
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
let
|
||||
|
||||
qt5Deps = pkgs: with pkgs.qt5; [ qtbase qtmultimedia ];
|
||||
gnome3Deps = pkgs: with pkgs; [ gnome3.zenity gtksourceview gnome3.gnome-desktop gnome3.libgnome-keyring webkitgtk ];
|
||||
gnomeDeps = pkgs: with pkgs; [ gnome.zenity gtksourceview gnome.gnome-desktop gnome.libgnome-keyring webkitgtk ];
|
||||
xorgDeps = pkgs: with pkgs.xorg; [
|
||||
libX11 libXrender libXrandr libxcb libXmu libpthreadstubs libXext libXdmcp
|
||||
libXxf86vm libXinerama libSM libXv libXaw libXi libXcursor libXcomposite
|
||||
@@ -86,7 +86,7 @@ in buildFHSUserEnv {
|
||||
# ZDOOM
|
||||
soundfont-fluid bzip2 game-music-emu
|
||||
] ++ qt5Deps pkgs
|
||||
++ gnome3Deps pkgs
|
||||
++ gnomeDeps pkgs
|
||||
++ lib.optional steamSupport pkgs.steam;
|
||||
|
||||
multiPkgs = pkgs: with pkgs; [
|
||||
|
||||
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
|
||||
description = "Stupidly-simple sticky notes applet";
|
||||
homepage = "https://github.com/lainsce/notejot";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ worldofpeace ];
|
||||
maintainers = with maintainers; [ ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
, dbus-glib
|
||||
, fetchurl
|
||||
, glib
|
||||
, gnome3
|
||||
, gnome
|
||||
, libnotify
|
||||
, libtool
|
||||
, libwnck3
|
||||
@@ -27,7 +27,7 @@ in stdenv.mkDerivation rec {
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [
|
||||
glib libwnck3 libnotify dbus-glib makeWrapper
|
||||
gsettings-desktop-schemas gnome3.gnome-common
|
||||
gsettings-desktop-schemas gnome.gnome-common
|
||||
libtool
|
||||
];
|
||||
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
, python3
|
||||
, libgee
|
||||
, gsettings-desktop-schemas
|
||||
, gnome3
|
||||
, gnome
|
||||
, pantheon
|
||||
, wrapGAppsHook
|
||||
, gtk3
|
||||
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
|
||||
buildInputs = [
|
||||
glib
|
||||
glib-networking
|
||||
gnome3.libsoup
|
||||
gnome.libsoup
|
||||
gsettings-desktop-schemas
|
||||
gtk3
|
||||
json-glib
|
||||
@@ -64,6 +64,6 @@ stdenv.mkDerivation rec {
|
||||
description = "A simple Mastodon client designed for elementary OS, originally developed by @bleakgrey";
|
||||
homepage = "https://github.com/cleac/olifant";
|
||||
license = licenses.gpl3;
|
||||
maintainers = with maintainers; [ worldofpeace ];
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
, python
|
||||
, pygobject3
|
||||
, gtk3
|
||||
, gnome3
|
||||
, gnome
|
||||
, substituteAll
|
||||
, at-spi2-atk
|
||||
, at-spi2-core
|
||||
@@ -92,7 +92,7 @@ buildPythonApplication rec {
|
||||
];
|
||||
|
||||
passthru = {
|
||||
updateScript = gnome3.updateScript {
|
||||
updateScript = gnome.updateScript {
|
||||
packageName = pname;
|
||||
};
|
||||
};
|
||||
@@ -108,7 +108,7 @@ buildPythonApplication rec {
|
||||
GTK toolkit, the Java platform's Swing toolkit, LibreOffice, Gecko, and
|
||||
WebKitGtk. AT-SPI support for the KDE Qt toolkit is being pursued.
|
||||
|
||||
Needs `services.gnome3.at-spi2-core.enable = true;` in `configuration.nix`.
|
||||
Needs `services.gnome.at-spi2-core.enable = true;` in `configuration.nix`.
|
||||
'';
|
||||
maintainers = with maintainers; [ berce ] ++ teams.gnome.members;
|
||||
license = licenses.lgpl21;
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
{ lib, stdenv, fetchurl, glib, intltool, libfm, libX11, pango, pkg-config
|
||||
, wrapGAppsHook, gnome3, withGtk3 ? true, gtk2, gtk3 }:
|
||||
, wrapGAppsHook, gnome, withGtk3 ? true, gtk2, gtk3 }:
|
||||
|
||||
let
|
||||
libfm' = libfm.override { inherit withGtk3; };
|
||||
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "sha256-FMt7JHSTxMzmX7tZAmEeOtAKeocPvB5QrcUEKMUUDPc=";
|
||||
};
|
||||
|
||||
buildInputs = [ glib gtk libfm' libX11 pango gnome3.adwaita-icon-theme ];
|
||||
buildInputs = [ glib gtk libfm' libX11 pango gnome.adwaita-icon-theme ];
|
||||
nativeBuildInputs = [ pkg-config wrapGAppsHook intltool ];
|
||||
|
||||
configureFlags = optional withGtk3 "--with-gtk=3";
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
, python3
|
||||
, wrapGAppsHook
|
||||
, libinput
|
||||
, gnome3
|
||||
, gnome
|
||||
, glib
|
||||
, gtk3
|
||||
, wayland
|
||||
@@ -60,9 +60,9 @@ in stdenv.mkDerivation rec {
|
||||
libinput
|
||||
glib
|
||||
gtk3
|
||||
gnome3.gnome-desktop
|
||||
gnome.gnome-desktop
|
||||
# For keybindings settings schemas
|
||||
gnome3.mutter
|
||||
gnome.mutter
|
||||
wayland
|
||||
phocWlroots
|
||||
];
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
, cairo
|
||||
, dconf
|
||||
, glib
|
||||
, gnome3
|
||||
, gnome
|
||||
, gtk3
|
||||
, libwnck3
|
||||
, libX11
|
||||
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
gettext
|
||||
gnome3.gnome-common
|
||||
gnome.gnome-common
|
||||
libxml2 # xmllint
|
||||
pkg-config
|
||||
vala
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
, python3
|
||||
, fetchFromGitHub
|
||||
, gdk-pixbuf
|
||||
, gnome3
|
||||
, gnome
|
||||
, gpsbabel
|
||||
, glib-networking
|
||||
, glibcLocales
|
||||
@@ -55,7 +55,7 @@ in python.pkgs.buildPythonApplication rec {
|
||||
gtk3
|
||||
webkitgtk
|
||||
glib-networking
|
||||
gnome3.adwaita-icon-theme
|
||||
gnome.adwaita-icon-theme
|
||||
gdk-pixbuf
|
||||
];
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, python3Packages, gobject-introspection, libappindicator-gtk3, libnotify, gtk3, gnome3, xprintidle-ng, wrapGAppsHook, gdk-pixbuf, shared-mime-info, librsvg
|
||||
{ lib, python3Packages, gobject-introspection, libappindicator-gtk3, libnotify, gtk3, gnome, xprintidle-ng, wrapGAppsHook, gdk-pixbuf, shared-mime-info, librsvg
|
||||
}:
|
||||
|
||||
let inherit (python3Packages) python buildPythonApplication fetchPypi croniter;
|
||||
@@ -16,8 +16,8 @@ in buildPythonApplication rec {
|
||||
buildInputs = [
|
||||
gtk3
|
||||
gobject-introspection
|
||||
gnome3.adwaita-icon-theme
|
||||
gnome3.adwaita-icon-theme
|
||||
gnome.adwaita-icon-theme
|
||||
gnome.adwaita-icon-theme
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
{ lib, fetchFromGitHub, python3, python3Packages
|
||||
, gnome3, gtk3, wrapGAppsHook, gtksourceview3, snapper
|
||||
, gnome, gtk3, wrapGAppsHook, gtksourceview3, snapper
|
||||
, gobject-introspection
|
||||
}:
|
||||
|
||||
@@ -19,7 +19,7 @@ python3Packages.buildPythonApplication rec {
|
||||
buildInputs = [
|
||||
python3
|
||||
gobject-introspection
|
||||
gnome3.adwaita-icon-theme
|
||||
gnome.adwaita-icon-theme
|
||||
];
|
||||
|
||||
doCheck = false; # it doesn't have any tests
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
, python3
|
||||
, libgee
|
||||
, gsettings-desktop-schemas
|
||||
, gnome3
|
||||
, gnome
|
||||
, pantheon
|
||||
, wrapGAppsHook
|
||||
, gtk3
|
||||
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
|
||||
buildInputs = [
|
||||
glib
|
||||
glib-networking
|
||||
gnome3.libsoup
|
||||
gnome.libsoup
|
||||
gsettings-desktop-schemas
|
||||
gtk3
|
||||
json-glib
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
, python3Packages
|
||||
, gdk-pixbuf
|
||||
, glib
|
||||
, gnome3
|
||||
, gnome
|
||||
, gobject-introspection
|
||||
, gtk3
|
||||
, wrapGAppsHook
|
||||
@@ -38,7 +38,7 @@ python3Packages.buildPythonApplication rec {
|
||||
buildInputs = [
|
||||
gdk-pixbuf
|
||||
glib
|
||||
gnome3.adwaita-icon-theme
|
||||
gnome.adwaita-icon-theme
|
||||
gobject-introspection
|
||||
gtk3
|
||||
keybinder3
|
||||
@@ -115,6 +115,6 @@ python3Packages.buildPythonApplication rec {
|
||||
homepage = "https://ulauncher.io/";
|
||||
license = licenses.gpl3;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ aaronjanse worldofpeace ];
|
||||
maintainers = with maintainers; [ aaronjanse ];
|
||||
};
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user