Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 435cd2924afc
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 1a4b5101de55
Choose a head ref
  • 20 commits
  • 25 files changed
  • 3 contributors

Commits on Nov 1, 2018

  1. libhandy: init at 0.0.4

    jtojnar committed Nov 1, 2018
    Copy the full SHA
    b51288a View commit details
  2. Copy the full SHA
    019da75 View commit details
  3. Copy the full SHA
    e8c34d6 View commit details
  4. purple-facebook: Remove unused mercurial dependency

    Having python3 in the PATH and python2's setuptools and enum in PYTHONPATH
    breaks any python3 script. Having mercurial in buildInputs makes this
    condition true, breaking glib's python scripts, which after 2.58 use python3.
    
    Mercurial isn't actually needed in buildInputs, so removing mercurial is a
    simple fix.
    hedning authored and jtojnar committed Nov 1, 2018
    Copy the full SHA
    0225584 View commit details
  5. gnome-recipes: init at 2.0.2

    jtojnar committed Nov 1, 2018
    Copy the full SHA
    18a5c7c View commit details
  6. Copy the full SHA
    21bd1b0 View commit details
  7. Copy the full SHA
    be850d5 View commit details
  8. json-glib: 1.4.2 → 1.4.4

    jtojnar committed Nov 1, 2018
    Copy the full SHA
    4e8c276 View commit details
  9. Copy the full SHA
    22a3f11 View commit details
  10. Copy the full SHA
    26e7db6 View commit details
  11. Copy the full SHA
    7d69fc5 View commit details
  12. Copy the full SHA
    8d2222d View commit details
  13. Copy the full SHA
    7406c0b View commit details
  14. hardinfo: fix build with new libsoup

    hedning authored and jtojnar committed Nov 1, 2018
    Copy the full SHA
    9691a54 View commit details
  15. gitg: 3.26.0 -> 3.30.0

    hedning authored and jtojnar committed Nov 1, 2018
    Copy the full SHA
    c6918ee View commit details
  16. gnome3.zenity: 3.28.1 -> 3.30.0

    hedning authored and jtojnar committed Nov 1, 2018
    Copy the full SHA
    29a41f8 View commit details
  17. gnomeExtensions.icon-hider: 20 -> 21

    jonafato authored and jtojnar committed Nov 1, 2018
    Copy the full SHA
    0d518f5 View commit details
  18. Copy the full SHA
    2b9c8db View commit details
  19. Copy the full SHA
    7f10a6c View commit details
  20. gnomeExtensions.no-title-bar: 8 -> 9

    jonafato authored and jtojnar committed Nov 1, 2018
    Copy the full SHA
    1a4b510 View commit details
Showing with 317 additions and 58 deletions.
  1. +1 −0 nixos/modules/module-list.nix
  2. +18 −0 nixos/modules/services/desktops/gnome3/gnome-remote-desktop.nix
  3. +1 −0 nixos/modules/services/x11/desktop-managers/gnome3.nix
  4. +44 −0 pkgs/applications/audio/gnome-podcasts/default.nix
  5. +79 −0 pkgs/applications/misc/gnome-recipes/default.nix
  6. +2 −0 pkgs/applications/misc/gxneur/default.nix
  7. +2 −2 pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-facebook/default.nix
  8. +4 −0 pkgs/applications/office/gnucash/default.nix
  9. +2 −2 pkgs/desktops/gnome-3/core/eog/default.nix
  10. +41 −0 pkgs/desktops/gnome-3/core/gnome-remote-desktop/default.nix
  11. +6 −9 pkgs/desktops/gnome-3/core/grilo-plugins/default.nix
  12. +1 −1 pkgs/desktops/gnome-3/core/mutter/default.nix
  13. +14 −5 pkgs/desktops/gnome-3/core/tracker/default.nix
  14. +2 −2 pkgs/desktops/gnome-3/core/zenity/default.nix
  15. +2 −0 pkgs/desktops/gnome-3/default.nix
  16. +3 −3 pkgs/desktops/gnome-3/extensions/caffeine/default.nix
  17. +2 −2 pkgs/desktops/gnome-3/extensions/icon-hider/default.nix
  18. +2 −2 pkgs/desktops/gnome-3/extensions/no-title-bar/default.nix
  19. +2 −2 pkgs/desktops/gnome-3/extensions/nohotcorner/default.nix
  20. +11 −7 pkgs/desktops/gnome-3/misc/gitg/default.nix
  21. +2 −10 pkgs/desktops/gnome-3/misc/libgda/default.nix
  22. +3 −11 pkgs/development/libraries/json-glib/default.nix
  23. +62 −0 pkgs/development/libraries/libhandy/default.nix
  24. +3 −0 pkgs/tools/system/hardinfo/default.nix
  25. +8 −0 pkgs/top-level/all-packages.nix
1 change: 1 addition & 0 deletions nixos/modules/module-list.nix
Original file line number Diff line number Diff line change
@@ -241,6 +241,7 @@
./services/desktops/gnome3/gnome-documents.nix
./services/desktops/gnome3/gnome-keyring.nix
./services/desktops/gnome3/gnome-online-accounts.nix
./services/desktops/gnome3/gnome-remote-desktop.nix
./services/desktops/gnome3/gnome-online-miners.nix
./services/desktops/gnome3/gnome-terminal-server.nix
./services/desktops/gnome3/gnome-user-share.nix
18 changes: 18 additions & 0 deletions nixos/modules/services/desktops/gnome3/gnome-remote-desktop.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# Remote desktop daemon using Pipewire.
{ config, lib, pkgs, ... }:

with lib;

{
###### interface
options = {
services.gnome3.gnome-remote-desktop = {
enable = mkEnableOption "Remote Desktop support using Pipewire";
};
};

###### implementation
config = mkIf config.services.gnome3.gnome-remote-desktop.enable {
systemd.packages = [ pkgs.gnome3.gnome-remote-desktop ];
};
}
1 change: 1 addition & 0 deletions nixos/modules/services/x11/desktop-managers/gnome3.nix
Original file line number Diff line number Diff line change
@@ -107,6 +107,7 @@ in {
services.gnome3.gnome-documents.enable = mkDefault true;
services.gnome3.gnome-keyring.enable = true;
services.gnome3.gnome-online-accounts.enable = mkDefault true;
services.gnome3.gnome-remote-desktop.enable = mkDefault true;
services.gnome3.gnome-terminal-server.enable = mkDefault true;
services.gnome3.gnome-user-share.enable = mkDefault true;
services.gnome3.gvfs.enable = true;
44 changes: 44 additions & 0 deletions pkgs/applications/audio/gnome-podcasts/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
{ stdenv, fetchurl, fetchFromGitLab, meson, ninja, gettext, cargo, rustc, python3, rustPlatform, pkgconfig, gnome3
, glib, libhandy, gtk3, dbus, openssl, sqlite, gst_all_1, wrapGAppsHook }:

# TODO: build from git for easier updates
# rustPlatform.buildRustPackage rec {
stdenv.mkDerivation rec {
version = "0.4.5";
name = "gnome-podcasts-${version}";

src = fetchurl {
url = https://gitlab.gnome.org/World/podcasts/uploads/823f7abee51002ed803da87b31b92981/gnome-podcasts-0.4.5.tar.xz;
sha256 = "1fgrn09hk5nfdkg6v31qda05msyzw525spzqxc7y4iw9f7pm80wh";
};

# src = fetchFromGitLab {
# domain = "gitlab.gnome.org";
# owner = "World";
# repo = "podcasts";
# rev = version;
# sha256 = "15xj98dhxvys0cnya9488qsfsm0ys1wy69wkc39z8j6hwdm7byq2";
# };

nativeBuildInputs = [
meson ninja pkgconfig gettext cargo rustc python3 wrapGAppsHook
];
buildInputs = [
glib gtk3 libhandy dbus openssl sqlite gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-bad
];

# cargoSha256 = "0721b5f700vvvzvmdl8nfjaa6j412q1fjssgrjv8n6rmn9z13d2v";

postPatch = ''
chmod +x scripts/compile-gschema.py # patchShebangs requires executable file
patchShebangs scripts/compile-gschema.py
'';

meta = with stdenv.lib; {
description = "Listen to your favorite podcasts";
homepage = https://wiki.gnome.org/Apps/Podcasts;
license = licenses.gpl3;
maintainers = gnome3.maintainers;
platforms = platforms.unix;
};
}
79 changes: 79 additions & 0 deletions pkgs/applications/misc/gnome-recipes/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
{ stdenv
, fetchurl
, meson
, ninja
, pkgconfig
, gnome3
, desktop-file-utils
, gettext
, itstool
, python3
, wrapGAppsHook
, gtk3
, glib
, libsoup
, gnome-online-accounts
, rest
, json-glib
, gnome-autoar
, gspell
, libcanberra }:

let
pname = "gnome-recipes";
version = "2.0.2";
in stdenv.mkDerivation rec {
name = "${pname}-${version}";

src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "1yymii3yf823d9x28fbhqdqm1wa30s40j94x0am9fjj0nzyd5s8v";
};

nativeBuildInputs = [
meson
ninja
pkgconfig
desktop-file-utils
gettext
itstool
python3
wrapGAppsHook
];

buildInputs = [
gtk3
glib
libsoup
gnome-online-accounts
rest
json-glib
gnome-autoar
gspell
libcanberra
];

# https://github.com/NixOS/nixpkgs/issues/36468
# https://gitlab.gnome.org/GNOME/recipes/issues/76
NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";

postPatch = ''
chmod +x src/list_to_c.py
patchShebangs src/list_to_c.py
patchShebangs meson_post_install.py
'';

passthru = {
updateScript = gnome3.updateScript {
packageName = pname;
};
};

meta = with stdenv.lib; {
description = "Recipe management application for GNOME";
homepage = https://wiki.gnome.org/Apps/Recipes;
maintainers = gnome3.maintainers;
license = licenses.gpl3;
platforms = platforms.unix;
};
}
2 changes: 2 additions & 0 deletions pkgs/applications/misc/gxneur/default.nix
Original file line number Diff line number Diff line change
@@ -8,6 +8,8 @@ stdenv.mkDerivation {
sha256 = "0avmhdcj0hpr55fc0iih8fjykmdhn34c8mwdnqvl8jh4nhxxchxr";
};

NIX_CFLAGS_COMPILE = "-Wno-deprecated-declarations";

nativeBuildInputs = [ pkgconfig intltool ];
buildInputs = [
xorg.libX11 glib gtk2 xorg.libXpm xorg.libXt xorg.libXext xneur
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, fetchhg, pidgin, glib, json-glib, mercurial, autoreconfHook } :
{ stdenv, fetchFromGitHub, fetchhg, pidgin, glib, json-glib, autoreconfHook }:


let
@@ -53,7 +53,7 @@ in stdenv.mkDerivation rec {
'';

nativeBuildInputs = [ autoreconfHook ];
buildInputs = [pidgin glib json-glib mercurial];
buildInputs = [ pidgin glib json-glib ];

meta = with stdenv.lib; {
inherit (src.meta) homepage;
4 changes: 4 additions & 0 deletions pkgs/applications/office/gnucash/default.nix
Original file line number Diff line number Diff line change
@@ -43,6 +43,10 @@ stdenv.mkDerivation rec {

propagatedUserEnvPkgs = [ dconf ];

# glib-2.58 deprecrated g_type_class_add_private
# Should probably be removed next version bump
CXXFLAGS = [ "-Wno-deprecated-declarations" ];

postPatch = ''
patchShebangs .
'';
4 changes: 2 additions & 2 deletions pkgs/desktops/gnome-3/core/eog/default.nix
Original file line number Diff line number Diff line change
@@ -4,13 +4,13 @@

let
pname = "eog";
version = "3.28.3";
version = "3.28.4";
in stdenv.mkDerivation rec {
name = "${pname}-${version}";

src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "1lj8v9m8jdxc3d4nzmgrxcccddg3hh8lkbmz4g71yxa0ykxxvbip";
sha256 = "1wrq3l3z0x6q0hnc1vqr2hnyb1b14qw6aqvc5dldfgbs0yys6p55";
};

nativeBuildInputs = [ meson ninja pkgconfig gettext itstool wrapGAppsHook libxml2 gobjectIntrospection python3 ];
41 changes: 41 additions & 0 deletions pkgs/desktops/gnome-3/core/gnome-remote-desktop/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
{ stdenv, fetchFromGitLab, meson, ninja, pkgconfig, python3, wrapGAppsHook
, glib, pipewire, systemd, libvncserver, libsecret, libnotify, gdk_pixbuf, gnome3 }:

stdenv.mkDerivation rec {
name = "gnome-remote-desktop-${version}";
version = "0.1.6";

src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "jadahl";
repo = "gnome-remote-desktop";
rev = version;
sha256 = "1d49kxhi1bn8ssh6nybg7d6zajqwc653czbsms2d59dbhj8mn75f";
};

nativeBuildInputs = [ meson ninja pkgconfig python3 wrapGAppsHook ];

buildInputs = [
glib pipewire systemd libvncserver libsecret libnotify
gdk_pixbuf # For libnotify
];

postPatch = ''
substituteInPlace meson.build --replace pipewire-0.1 pipewire-0.2
chmod +x meson_post_install.py # patchShebangs requires executable file
patchShebangs meson_post_install.py
'';

mesonFlags = [
"-Dsystemd_user_unit_dir=${placeholder "out"}/lib/systemd/user"
];

meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/Projects/Mutter/RemoteDesktop;
description = "GNOME Remote Desktop server";
maintainers = gnome3.maintainers;
license = licenses.gpl2Plus;
platforms = platforms.linux;
};
}
15 changes: 6 additions & 9 deletions pkgs/desktops/gnome-3/core/grilo-plugins/default.nix
Original file line number Diff line number Diff line change
@@ -1,22 +1,19 @@
{ stdenv, fetchurl, pkgconfig, intltool, sqlite
{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, sqlite
, gnome3, libxml2, gupnp, gssdp, lua5, liboauth, gupnp-av
, gmime, json-glib, avahi, tracker, dleyna-server, itstool }:

let
pname = "grilo-plugins";
version = "0.3.7";
major = stdenv.lib.versions.majorMinor version;
version = "0.3.8";
in stdenv.mkDerivation rec {
name = "${pname}-${version}";

src = fetchurl {
url = "mirror://gnome/sources/${pname}/${major}/${name}.tar.xz";
sha256 = "0838mm7sdfwsiw022rjb27dlbbxncpx5jrpv3qzfadli66y3nbzw";
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "0nync07gah3jkpb5ph5d3gwbygmabnih2m3hfz7lkvjl2l5pgpac";
};

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

nativeBuildInputs = [ pkgconfig intltool itstool ];
nativeBuildInputs = [ meson ninja pkgconfig gettext itstool ];
buildInputs = [
gnome3.grilo libxml2 gupnp gssdp gnome3.libgdata
lua5 liboauth gupnp-av sqlite gnome3.gnome-online-accounts
@@ -36,7 +33,7 @@ in stdenv.mkDerivation rec {
homepage = https://wiki.gnome.org/Projects/Grilo;
description = "A collection of plugins for the Grilo framework";
maintainers = gnome3.maintainers;
license = licenses.lgpl2;
license = licenses.lgpl21;
platforms = platforms.linux;
};
}
2 changes: 1 addition & 1 deletion pkgs/desktops/gnome-3/core/mutter/default.nix
Original file line number Diff line number Diff line change
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
configureFlags = [
"--with-x"
"--disable-static"
# "--enable-remote-desktop"
"--enable-remote-desktop"
"--enable-shape"
"--enable-sm"
"--enable-startup-notification"
19 changes: 14 additions & 5 deletions pkgs/desktops/gnome-3/core/tracker/default.nix
Original file line number Diff line number Diff line change
@@ -1,19 +1,28 @@
{ stdenv, fetchurl, intltool, meson, ninja, pkgconfig, gobjectIntrospection, python2
{ stdenv, fetchurl, fetchFromGitLab, intltool, meson, ninja, pkgconfig, gobjectIntrospection, python2
, gtk-doc, docbook_xsl, docbook_xml_dtd_412, docbook_xml_dtd_43, glibcLocales
, libxml2, upower, glib, wrapGAppsHook, vala, sqlite, libxslt, libstemmer
, gnome3, icu, libuuid, networkmanager, libsoup, json-glib }:

let
pname = "tracker";
version = "2.1.4";
version = "2.1.5";
in stdenv.mkDerivation rec {
name = "${pname}-${version}";

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

src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "0xf58zld6pnfa8k7k70rv8ya8g7zqgahz6q4sapwxs6k97d2fgsx";
# tarball does not contain map files
# https://gitlab.gnome.org/GNOME/tracker/merge_requests/30
# src = fetchurl {
# url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
# sha256 = "07l6fb6i4pfna2y87rydcxbh6sz88kngapw87vf09fbk6xbvfd5j";
# };
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "GNOME";
repo = pname;
rev = version;
sha256 = "1wg3pndd0j8qkzn9ikzqlcww8r3bd89ydf6fi4ng5k93879j2bqw";
};

nativeBuildInputs = [
4 changes: 2 additions & 2 deletions pkgs/desktops/gnome-3/core/zenity/default.nix
Original file line number Diff line number Diff line change
@@ -3,11 +3,11 @@

stdenv.mkDerivation rec {
name = "zenity-${version}";
version = "3.28.1";
version = "3.30.0";

src = fetchurl {
url = "mirror://gnome/sources/zenity/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "0swavrkc5ps3fwzy6h6l5mmim0wwy10xrq0qqkay5d0zf9a965yv";
sha256 = "1wipnp46pd238z9ck5rsckbaw7yla6c936fswq5w94k4c6bgcplr";
};

passthru = {
2 changes: 2 additions & 0 deletions pkgs/desktops/gnome-3/default.nix
Original file line number Diff line number Diff line change
@@ -121,6 +121,8 @@ lib.makeScope pkgs.newScope (self: with self; {

gnome-online-miners = callPackage ./core/gnome-online-miners { };

gnome-remote-desktop = callPackage ./core/gnome-remote-desktop { };

gnome-session = callPackage ./core/gnome-session { };

gnome-shell = callPackage ./core/gnome-shell { };
6 changes: 3 additions & 3 deletions pkgs/desktops/gnome-3/extensions/caffeine/default.nix
Original file line number Diff line number Diff line change
@@ -2,13 +2,13 @@

stdenv.mkDerivation rec {
name = "gnome-shell-extension-caffeine-${version}";
version = "unstable-2017-06-21";
version = "unstable-2018-09-25";

src = fetchFromGitHub {
owner = "eonpatapon";
repo = "gnome-shell-extension-caffeine";
rev = "ce0d0d4d3a9fed4b35b82cf59609a00502862271";
sha256 = "01gf9c8nhhm78iakqf30900y6lywxks1pm5h2cs0jvp8d3ygd7sd";
rev = "71b6392c53e063563602c3d919c0ec6a4c5c9733";
sha256 = "170zyxa41hvyi463as650nw3ygr297901inr3xslrhvjq1qacxri";
};

uuid = "caffeine@patapon.info";
4 changes: 2 additions & 2 deletions pkgs/desktops/gnome-3/extensions/icon-hider/default.nix
Original file line number Diff line number Diff line change
@@ -2,13 +2,13 @@

stdenv.mkDerivation rec {
name = "gnome-shell-extension-icon-hider-${version}";
version = "20";
version = "21";

src = fetchFromGitHub {
owner = "ikalnytskyi";
repo = "gnome-shell-extension-icon-hider";
rev = "v${version}";
sha256 = "0z2rfr0nlp5zhlfxd6y0sxrxf7dj8sknimn6skxlbdm1xawl1fin";
sha256 = "0l0jb0ishaq00d4kdfvv5p7pj7b45dz57y3j2ihqr695bzb6b9hr";
};

uuid = "icon-hider@kalnitsky.org";
Loading