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: f35b2f29d283
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 8d37cca45f92
Choose a head ref
  • 13 commits
  • 15 files changed
  • 1 contributor

Commits on Apr 10, 2020

  1. Verified

    This commit was signed with the committer’s verified signature.
    colemickens Cole Mickens
    Copy the full SHA
    da30881 View commit details
  2. Copy the full SHA
    9db8c33 View commit details
  3. Copy the full SHA
    86822f8 View commit details
  4. pantheon.pantheon-agent-polkit: 1.0.0 -> 1.0.1

    just translations
    
    (cherry picked from commit b810ce5)
    worldofpeace committed Apr 10, 2020
    Copy the full SHA
    f64401a View commit details
  5. pantheon.elementary-capnet-assist: 2.2.4 -> 2.2.5

    just translations
    
    (cherry picked from commit 082d977)
    worldofpeace committed Apr 10, 2020
    Copy the full SHA
    2165cd7 View commit details
  6. pantheon.wingpanel-indicators-bluetooth: 2.1.4 -> 2.1.5

    (cherry picked from commit ac2f83c)
    worldofpeace committed Apr 10, 2020
    Copy the full SHA
    99e05f5 View commit details
  7. pantheon.switchboard-plug-about: 2.6.1 -> 2.6.2

    just translations
    
    (cherry picked from commit 45e3470)
    worldofpeace committed Apr 10, 2020
    Copy the full SHA
    698d280 View commit details
  8. Copy the full SHA
    44821b7 View commit details
  9. Copy the full SHA
    2507c5f View commit details
  10. Copy the full SHA
    e43ec38 View commit details
  11. pantheon.switchboard-plug-pantheon-shell: 2.8.2 -> 2.8.3

    Don't need backgrounds patch anymore because of my patch upstream [0]
    
    https://github.com/elementary/switchboard-plug-pantheon-shell/releases/tag/2.8.3
    
    [0]: elementary/settings-desktop@541b171
    
    (cherry picked from commit 3c4cf5d)
    worldofpeace committed Apr 10, 2020
    Copy the full SHA
    75a32d7 View commit details
  12. Copy the full SHA
    74ae699 View commit details
  13. Copy the full SHA
    8d37cca View commit details
4 changes: 2 additions & 2 deletions pkgs/desktops/pantheon/apps/appcenter/default.nix
Original file line number Diff line number Diff line change
@@ -28,13 +28,13 @@

stdenv.mkDerivation rec {
pname = "appcenter";
version = "3.2.3";
version = "3.2.4";

src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "12gql86vn12zbkw368blxk0cl9fgs22dyj02xnimjc8b6s80yib4";
sha256 = "0nhgf5lgy74liml3kzijldan3qgrxh2721yvjdk4jf83b0g1b7yb";
};

passthru = {
4 changes: 2 additions & 2 deletions pkgs/desktops/pantheon/apps/elementary-photos/default.nix
Original file line number Diff line number Diff line change
@@ -33,15 +33,15 @@

stdenv.mkDerivation rec {
pname = "elementary-photos";
version = "2.6.5";
version = "2.7.0";

repoName = "photos";

src = fetchFromGitHub {
owner = "elementary";
repo = repoName;
rev = version;
sha256 = "0r6d9y936nw4bn0jvixi1p62dy8qsgl2bx8g3889fndnhfnhbjv0";
sha256 = "09jjic165rmprc2cszsgj2m3j3f5p8v9pxx5mj66a0gj3ar3hfbd";
};

passthru = {
Original file line number Diff line number Diff line change
@@ -16,13 +16,13 @@

stdenv.mkDerivation rec {
pname = "switchboard-plug-about";
version = "2.6.1";
version = "2.6.2";

src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "1z58d21xrjghvjx0ng53pcxwdk2f5d00dvngcyjja0kf7sixba71";
sha256 = "1cjhip0abc0y5w6cqnjcgi48bfrackp45gz7955l66hxhnm5wyw6";
};

passthru = {
Original file line number Diff line number Diff line change
@@ -13,13 +13,13 @@

stdenv.mkDerivation rec {
pname = "switchboard-plug-applications";
version = "2.1.6";
version = "2.1.7";

src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "19l979sdn9jzibvn98ag3ys28ka7zqlsbs0gj2gs9jcxhzngrxvg";
sha256 = "0wzm390g8di4ks3w637a0wl4j7g89j321xkz5msd9058gksvaaxs";
};

passthru = {
Original file line number Diff line number Diff line change
@@ -13,13 +13,13 @@

stdenv.mkDerivation rec {
pname = "switchboard-plug-display";
version = "2.2.0";
version = "2.2.1";

src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "0mr89kyq034wffzixqlq6lmhyc4jry3dcgxrk306dhks2myindqh";
sha256 = "1racp0mxiaix9afx25ryskdcyi335fz8yh8nwgdxbqbm6jpyq4zs";
};

passthru = {
Original file line number Diff line number Diff line change
@@ -15,13 +15,13 @@

stdenv.mkDerivation rec {
pname = "switchboard-plug-mouse-touchpad";
version = "2.4.0";
version = "2.4.1";

src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "1ls5jxzmd7cmbv8h67q6mcmfrfksgwjndqd6r9gxivsz2lcji3x7";
sha256 = "19y1n05pc3j0px5pql5338vzrq6hjw209s8l2l70ha4i4r978qir";
};

passthru = {

This file was deleted.

Original file line number Diff line number Diff line change
@@ -4,13 +4,13 @@

stdenv.mkDerivation rec {
pname = "switchboard-plug-pantheon-shell";
version = "2.8.2";
version = "2.8.3";

src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "0l4js2gqvn8lmky5b3jjqw6mzxcv9i2gjqr1vka0z40px6vfzf0z";
sha256 = "0ypyppxx51l3r3fgxrvjdwnz33lpbfh1bf27fww9fx9520wixnx8";
};

passthru = {
@@ -42,10 +42,6 @@ stdenv.mkDerivation rec {
switchboard
];

patches = [
./backgrounds.patch # Having https://github.com/elementary/switchboard-plug-pantheon-shell/issues/166 would make this patch uneeded
];

meta = with stdenv.lib; {
description = "Switchboard Desktop Plug";
homepage = https://github.com/elementary/switchboard-plug-pantheon-shell;
Original file line number Diff line number Diff line change
@@ -18,13 +18,13 @@

stdenv.mkDerivation rec {
pname = "switchboard-plug-security-privacy";
version = "2.2.2";
version = "2.2.3";

src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "1dwq9rqswgnnglhrgcpvrp6shn3pb4x8f8f23x84sqakb430idp7";
sha256 = "1rgbw2kfcq7cdpvl6sy6r6d4iprm1j2n3knbnbxy8sylfc83bwri";
};

passthru = {

This file was deleted.

Original file line number Diff line number Diff line change
@@ -26,15 +26,15 @@

stdenv.mkDerivation rec {
pname = "wingpanel-applications-menu";
version = "2.5.0";
version = "2.6.0";

repoName = "applications-menu";

src = fetchFromGitHub {
owner = "elementary";
repo = repoName;
rev = version;
sha256 = "1zry9xvcljsn5fnl8qs21x7q8rpwv0sxvp2dmnx3ddqnvj4q2m7d";
sha256 = "16ki1x6697jmfqajynx2zvwqrpjpshnd08y7vf6g7xc7zwwh38c5";
};

passthru = {
Original file line number Diff line number Diff line change
@@ -7,6 +7,7 @@
, ninja
, vala
, gtk3
, glib
, granite
, libnotify
, wingpanel
@@ -16,13 +17,13 @@

stdenv.mkDerivation rec {
pname = "wingpanel-indicator-bluetooth";
version = "2.1.4";
version = "2.1.5";

src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "05v3qy4rxi4l3g1ql99vcjylb01hz3galh19c2jc3lqc1mf1z1j1";
sha256 = "0ylbpai05b300h07b94xcmw9xi7qx13l1q38zlg2n95d3c5264dp";
};

passthru = {
@@ -32,6 +33,7 @@ stdenv.mkDerivation rec {
};

nativeBuildInputs = [
glib # for glib-compile-schemas
libxml2
meson
ninja
@@ -41,6 +43,7 @@ stdenv.mkDerivation rec {
];

buildInputs = [
glib
granite
gtk3
libgee
4 changes: 2 additions & 2 deletions pkgs/desktops/pantheon/desktop/wingpanel/default.nix
Original file line number Diff line number Diff line change
@@ -20,13 +20,13 @@

stdenv.mkDerivation rec {
pname = "wingpanel";
version = "2.3.0";
version = "2.3.1";

src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "0m3pd4sf86kk1wv9asq4z2816bcal076vlk820mrdz9b2fm79lh3";
sha256 = "0yvn1crylrdc9gq6gc7v4ynb5ii4n0c3bnswfq72p8cs3vvvvv24";
};

passthru = {
Original file line number Diff line number Diff line change
@@ -17,15 +17,15 @@

stdenv.mkDerivation rec {
pname = "elementary-capnet-assist";
version = "2.2.4";
version = "2.2.5";

repoName = "capnet-assist";

src = fetchFromGitHub {
owner = "elementary";
repo = repoName;
rev = version;
sha256 = "0yz827gs1qv6csgv4v993rjmqzc6dbymbvznsy45ghlh19l4l7j1";
sha256 = "09pl1ynrmqjj844np4ww2i18z7kgx5kmj5ggfp8lqmxgsny7g8m3";
};

passthru = {
Original file line number Diff line number Diff line change
@@ -14,13 +14,13 @@

stdenv.mkDerivation rec {
pname = "pantheon-agent-polkit";
version = "1.0.0";
version = "1.0.1";

src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "1yybblprcn0cgcf9j76yckqcimm4h8l41cczxjvgp789p1pki3bn";
sha256 = "137809mplrsff1isxwbwa2v2y9ixhwzm4khiijm4mmjchi75wpvx";
};

passthru = {