Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: ec49cf3a4169
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2439b3049b11
Choose a head ref

Commits on May 16, 2019

  1. Copy the full SHA
    0c9f0c8 View commit details
  2. Copy the full SHA
    5a12e68 View commit details
  3. Copy the full SHA
    6377960 View commit details
  4. Copy the full SHA
    977c921 View commit details
  5. Copy the full SHA
    5cd9509 View commit details
  6. Copy the full SHA
    f82dd09 View commit details
  7. Copy the full SHA
    9ac96f7 View commit details
  8. Copy the full SHA
    dfdc255 View commit details
  9. Copy the full SHA
    a83155c View commit details
  10. Copy the full SHA
    9dfeb1e View commit details
  11. Copy the full SHA
    5163678 View commit details
  12. Copy the full SHA
    acd125c View commit details
  13. Copy the full SHA
    386fb53 View commit details
  14. Copy the full SHA
    dcaf2ef View commit details
  15. Copy the full SHA
    743df67 View commit details
  16. Copy the full SHA
    166bb80 View commit details
  17. Copy the full SHA
    6ec2634 View commit details

Commits on May 18, 2019

  1. Copy the full SHA
    b0651d5 View commit details
  2. Copy the full SHA
    11d752a View commit details
  3. Copy the full SHA
    6c25927 View commit details
  4. Copy the full SHA
    839b076 View commit details
  5. Copy the full SHA
    b055d80 View commit details
  6. Copy the full SHA
    cd612b7 View commit details
  7. Copy the full SHA
    2be5edb View commit details
  8. gnome3.accerciser: use buildPythonPackage, add xlib

    This application will now actually work.
    worldofpeace committed May 18, 2019
    Copy the full SHA
    ea222ae View commit details
  9. lightdm: 1.28.0 -> 1.30.0

    dtzWill authored and worldofpeace committed May 18, 2019
    Copy the full SHA
    cb3c214 View commit details
  10. nixos/modules: Ensure the colord user is a system user

    Ideally, it should have an assigned uid and gid
    neilmayhew committed May 18, 2019
    Copy the full SHA
    f14cf43 View commit details
  11. ephemeral: init at 5.1.0

    xiorcale authored and worldofpeace committed May 18, 2019
    Copy the full SHA
    9bb25d5 View commit details
  12. ephemeral: add glib-networking

    This is needed for the wrapper.
    worldofpeace committed May 18, 2019
    Copy the full SHA
    a303d9d View commit details
  13. Merge pull request #61689 from neilmayhew/nixos/modules/colord

    nixos/modules: Ensure the colord user is a system user
    worldofpeace authored May 18, 2019
    Copy the full SHA
    1b457e7 View commit details

Commits on May 19, 2019

  1. Copy the full SHA
    2439b30 View commit details
Showing with 161 additions and 80 deletions.
  1. +1 −0 nixos/modules/services/x11/colord.nix
  2. +2 −2 pkgs/applications/display-managers/lightdm/default.nix
  3. +65 −0 pkgs/applications/networking/browsers/ephemeral/default.nix
  4. +44 −11 pkgs/desktops/gnome-3/apps/accerciser/default.nix
  5. +2 −2 pkgs/desktops/gnome-3/apps/evolution/default.nix
  6. +2 −2 pkgs/desktops/gnome-3/apps/gedit/default.nix
  7. +2 −2 pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix
  8. +2 −2 pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix
  9. +2 −2 pkgs/desktops/gnome-3/apps/gnome-maps/default.nix
  10. +2 −2 pkgs/desktops/gnome-3/apps/gnome-music/default.nix
  11. +2 −2 pkgs/desktops/gnome-3/apps/polari/default.nix
  12. +2 −2 pkgs/desktops/gnome-3/apps/seahorse/default.nix
  13. +2 −2 pkgs/desktops/gnome-3/core/gjs/default.nix
  14. +2 −2 pkgs/desktops/gnome-3/core/gnome-shell/default.nix
  15. +2 −2 pkgs/desktops/gnome-3/core/gnome-software/default.nix
  16. +2 −2 pkgs/desktops/gnome-3/core/gnome-terminal/default.nix
  17. +2 −2 pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix
  18. +2 −2 pkgs/desktops/gnome-3/core/mutter/default.nix
  19. +2 −2 pkgs/desktops/gnome-3/core/nautilus/default.nix
  20. +2 −2 pkgs/desktops/gnome-3/core/simple-scan/default.nix
  21. +2 −2 pkgs/desktops/gnome-3/core/yelp-tools/default.nix
  22. +2 −2 pkgs/desktops/gnome-3/core/yelp/default.nix
  23. +2 −2 pkgs/desktops/gnome-3/games/gnome-mines/default.nix
  24. +3 −3 pkgs/desktops/gnome-3/misc/gnome-applets/default.nix
  25. +2 −12 pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix
  26. +2 −12 pkgs/desktops/gnome-3/misc/gnome-panel/default.nix
  27. +2 −2 pkgs/desktops/gnome-3/misc/metacity/default.nix
  28. +2 −0 pkgs/top-level/all-packages.nix
1 change: 1 addition & 0 deletions nixos/modules/services/x11/colord.nix
Original file line number Diff line number Diff line change
@@ -29,6 +29,7 @@ in {
environment.etc."tmpfiles.d/colord.conf".source = "${pkgs.colord}/lib/tmpfiles.d/colord.conf";

users.users.colord = {
isSystemUser = true;
home = "/var/lib/colord";
group = "colord";
};
4 changes: 2 additions & 2 deletions pkgs/applications/display-managers/lightdm/default.nix
Original file line number Diff line number Diff line change
@@ -9,15 +9,15 @@ with stdenv.lib;

stdenv.mkDerivation rec {
pname = "lightdm";
version = "1.28.0";
version = "1.30.0";

outputs = [ "out" "dev" ];

src = fetchFromGitHub {
owner = "CanonicalLtd";
repo = pname;
rev = version;
sha256 = "1mmqy1jdvgc0h0h9gli7n4vdv5p8m5019qjr5ni4h73iz6mjdj2b";
sha256 = "0i1yygmjbkdjnqdl9jn8zsa1mfs2l19qc4k2capd8q1ndhnjm2dx";
};

nativeBuildInputs = [
65 changes: 65 additions & 0 deletions pkgs/applications/networking/browsers/ephemeral/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
{ stdenv
, fetchFromGitHub
, desktop-file-utils
, gettext
, glib
, gtk3
, hicolor-icon-theme
, libgee
, libdazzle
, meson
, ninja
, pantheon
, pkgconfig
, python3
, webkitgtk
, wrapGAppsHook
, glib-networking
}:

stdenv.mkDerivation rec {
pname = "ephemeral";
version = "5.1.0";

src = fetchFromGitHub {
owner = "cassidyjames";
repo = "ephemeral";
rev = version;
sha256 = "1wfrbbdw429q2mkycn87fhci0jidcsflk5f2lbzfzccbcs8msffz";
};

nativeBuildInputs = [
desktop-file-utils
gettext
meson
ninja
pantheon.vala
pkgconfig
python3
wrapGAppsHook
];

buildInputs = [
glib
glib-networking
gtk3
hicolor-icon-theme
libdazzle
libgee
pantheon.granite
webkitgtk
];

postPatch = ''
chmod +x meson/post_install.py
patchShebangs meson/post_install.py
'';

meta = with stdenv.lib; {
description = "The always-incognito web browser";
homepage = https://github.com/cassidyjames/ephemeral;
maintainers = with maintainers; [ kjuvi ] ++ pantheon.maintainers;
platforms = platforms.linux;
license = licenses.gpl3;
};
}
55 changes: 44 additions & 11 deletions pkgs/desktops/gnome-3/apps/accerciser/default.nix
Original file line number Diff line number Diff line change
@@ -1,27 +1,60 @@
{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook, gobject-introspection
, itstool, libxml2, python3Packages, at-spi2-core
, dbus, gettext, libwnck3 }:
{ stdenv
, fetchurl
, pkgconfig
, gnome3
, gtk3
, glib
, wrapGAppsHook
, gobject-introspection
, itstool
, libxml2
, python3
, at-spi2-core
, dbus
, gettext
, libwnck3
, adwaita-icon-theme
}:

stdenv.mkDerivation rec {
python3.pkgs.buildPythonApplication rec {
name = "accerciser-${version}";
version = "3.32.1";
version = "3.32.2";

format = "other";

src = fetchurl {
url = "mirror://gnome/sources/accerciser/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "0afzhbig5yw87zyfmid61368jj8l6i7k8gs29x0hv65fz4yiv4h4";
sha256 = "05ssj8whzhf98lpcaca7m45h03g0wx0i8jlsrh3yn943mshzidy8";
};

nativeBuildInputs = [
pkgconfig wrapGAppsHook itstool gettext
gettext
gobject-introspection # For setup hook
itstool
libxml2
pkgconfig
dbus
wrapGAppsHook
];

buildInputs = [
gtk3 libxml2 python3Packages.python python3Packages.pyatspi
python3Packages.pygobject3 python3Packages.ipython
at-spi2-core dbus libwnck3 gnome3.adwaita-icon-theme
adwaita-icon-theme
at-spi2-core
gtk3
libwnck3
];

propagatedBuildInputs = with python3.pkgs; [
ipython
pyatspi
pycairo
pygobject3
xlib
];

wrapPrefixVariables = [ "PYTHONPATH" ];
# Strict deps breaks accerciser
# and https://github.com/NixOS/nixpkgs/issues/56943
strictDeps = false;

passthru = {
updateScript = gnome3.updateScript {
4 changes: 2 additions & 2 deletions pkgs/desktops/gnome-3/apps/evolution/default.nix
Original file line number Diff line number Diff line change
@@ -7,13 +7,13 @@
, libcanberra-gtk3, bogofilter, gst_all_1, procps, p11-kit, openldap }:

let
version = "3.32.1";
version = "3.32.2";
in stdenv.mkDerivation rec {
name = "evolution-${version}";

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

propagatedUserEnvPkgs = [ evolution-data-server ];
4 changes: 2 additions & 2 deletions pkgs/desktops/gnome-3/apps/gedit/default.nix
Original file line number Diff line number Diff line change
@@ -6,11 +6,11 @@

stdenv.mkDerivation rec {
name = "gedit-${version}";
version = "3.32.0";
version = "3.32.2";

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

nativeBuildInputs = [
4 changes: 2 additions & 2 deletions pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix
Original file line number Diff line number Diff line change
@@ -9,13 +9,13 @@
# TODO: ovirt (optional)

let
version = "3.32.0.2";
version = "3.32.1";
in stdenv.mkDerivation rec {
name = "gnome-boxes-${version}";

src = fetchurl {
url = "mirror://gnome/sources/gnome-boxes/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "1239x1bbkn0gxxq82zpvjjr7srla2d5ghi5rqwxnhsab0c2ypswk";
sha256 = "159sxii3g4s5pjb4s4i3kc4q162w5vicp4g6wvk1y2yv68bgmcl4";
};

doCheck = true;
4 changes: 2 additions & 2 deletions pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix
Original file line number Diff line number Diff line change
@@ -4,13 +4,13 @@

let
pname = "gnome-calendar";
version = "3.32.1";
version = "3.32.2";
in stdenv.mkDerivation rec {
name = "${pname}-${version}";

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

passthru = {
4 changes: 2 additions & 2 deletions pkgs/desktops/gnome-3/apps/gnome-maps/default.nix
Original file line number Diff line number Diff line change
@@ -5,13 +5,13 @@

let
pname = "gnome-maps";
version = "3.32.1";
version = "3.32.2";
in stdenv.mkDerivation rec {
name = "${pname}-${version}";

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

doCheck = true;
4 changes: 2 additions & 2 deletions pkgs/desktops/gnome-3/apps/gnome-music/default.nix
Original file line number Diff line number Diff line change
@@ -6,13 +6,13 @@

python3.pkgs.buildPythonApplication rec {
pname = "gnome-music";
version = "3.32.1";
version = "3.32.2";

format = "other";

src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "11fdij1jznjsph1q5rkkvdhikzdh2lls921lv2m2di9x7i2xn3h4";
sha256 = "0cn7l1d3ayima1w3bxpshijabd7ibhnvqxv2mpvffzizk04ln6hk";
};

nativeBuildInputs = [ meson ninja gettext itstool pkgconfig libxml2 wrapGAppsHook desktop-file-utils appstream-glib gobject-introspection ];
4 changes: 2 additions & 2 deletions pkgs/desktops/gnome-3/apps/polari/default.nix
Original file line number Diff line number Diff line change
@@ -5,13 +5,13 @@

let
pname = "polari";
version = "3.32.1";
version = "3.32.2";
in stdenv.mkDerivation rec {
name = "${pname}-${version}";

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

propagatedUserEnvPkgs = [ telepathy-idle telepathy-logger ];
4 changes: 2 additions & 2 deletions pkgs/desktops/gnome-3/apps/seahorse/default.nix
Original file line number Diff line number Diff line change
@@ -6,11 +6,11 @@

stdenv.mkDerivation rec {
pname = "seahorse";
version = "3.32.1";
version = "3.32.2";

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

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

stdenv.mkDerivation rec {
name = "gjs-${version}";
version = "1.56.1";
version = "1.56.2";

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

passthru = {
4 changes: 2 additions & 2 deletions pkgs/desktops/gnome-3/core/gnome-shell/default.nix
Original file line number Diff line number Diff line change
@@ -14,11 +14,11 @@ let

in stdenv.mkDerivation rec {
name = "gnome-shell-${version}";
version = "3.32.1";
version = "3.32.2";

src = fetchurl {
url = "mirror://gnome/sources/gnome-shell/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "1pb00af3w4wivdhcvdy59z2xlxasg90bcm5a9ck0p5lf97adwx08";
sha256 = "0anlkdnqsp5fqvmg95rqjpp1ifcx5xzsvwcrdsvb1cqzbh6inmp5";
};

LANG = "en_US.UTF-8";
4 changes: 2 additions & 2 deletions pkgs/desktops/gnome-3/core/gnome-software/default.nix
Original file line number Diff line number Diff line change
@@ -5,11 +5,11 @@

stdenv.mkDerivation rec {
name = "gnome-software-${version}";
version = "3.32.1";
version = "3.32.2";

src = fetchurl {
url = "mirror://gnome/sources/gnome-software/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "0xxhvyqfwlcyvlqc36rpcili00dpwy8b5c5klaqccn5qrc87rl38";
sha256 = "12kw5vyg8jy0xiq1shfh4ksar2dpyzcdxbyx8lrp9494d606nrlx";
};

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

stdenv.mkDerivation rec {
name = "gnome-terminal-${version}";
version = "3.32.1";
version = "3.32.2";

src = fetchurl {
url = "mirror://gnome/sources/gnome-terminal/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "0i613844gf5dmzpvwiy68lg8walhj4zr88scacp2qwpqs870si8x";
sha256 = "0shhpnagasyp1kxgjczfrivcxbgrrl3y8lzvp1z101m67h4jp6km";
};

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

stdenv.mkDerivation rec {
name = "gnome-user-docs-${version}";
version = "3.32.1";
version = "3.32.2";

src = fetchurl {
url = "mirror://gnome/sources/gnome-user-docs/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "09g6fi9b1xpk0fnp6wgh350v1x318mrf20j4bfarww25vrj6irrw";
sha256 = "1ny7cwkyskrykzsrabjnlc9jsdl4kdk73smwxas6ddmca02hpm7c";
};

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

stdenv.mkDerivation rec {
pname = "mutter";
version = "3.32.1";
version = "3.32.2";

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

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

let
pname = "nautilus";
version = "3.32.0";
version = "3.32.1";
in stdenv.mkDerivation rec {
name = "${pname}-${version}";

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

nativeBuildInputs = [
Loading