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: 2a7c3484fd22
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: 8e21b831f645
Choose a head ref
  • 4 commits
  • 4 files changed
  • 1 contributor

Commits on Mar 19, 2019

  1. pantheon.elementary-code: 3.1.0 -> 3.1.1 

    https://github.com/elementary/code/releases/tag/3.1.1
(cherry picked from commit 5b2d2ab)
    @worldofpeace
    worldofpeace committed Mar 19, 2019
    Copy the full SHA
    953f309 View commit details

  2. pantheon.switchboard-plug-security-privacy: 2.2.0 -> 2.2.1 

    https://github.com/elementary/switchboard-plug-security-privacy/releases/tag/2.2.1
(cherry picked from commit 735b047)
    @worldofpeace
    worldofpeace committed Mar 19, 2019
    Copy the full SHA
    acb0b4b View commit details

  3. pantheon.wingpanel: 2.2.2 -> 2.2.3 

    (cherry picked from commit 201de89)
    @worldofpeace
    worldofpeace committed Mar 19, 2019
    Copy the full SHA
    dafdf38 View commit details

  4. pantheon.contractor: add wrapGAppsHook 

    Probably got tossed out somehow.

(cherry picked from commit d04c4ff)
    @worldofpeace
    worldofpeace committed Mar 19, 2019
    Copy the full SHA
    8e21b83 View commit details
4 changes: 2 additions & 2 deletions pkgs/desktops/pantheon/apps/elementary-code/default.nix
View file
Original file line number Diff line number Diff line change
@@ -5,15 +5,15 @@

stdenv.mkDerivation rec {
pname = "code";
version = "3.1.0";
version = "3.1.1";

name = "elementary-${pname}-${version}";

src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "04clzms1gw7dr611kr8bhca2dww0x65186al4sjqmln4g12ry1gx";
sha256 = "0l469fi5vbcazwfhy320nr8wrzz96jbrqn4hag0kdm16wvf5x1yc";
};

passthru = {
4 changes: 2 additions & 2 deletions pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix
View file
Original file line number Diff line number Diff line change
@@ -4,13 +4,13 @@

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

src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "0f1idh36hlgmdva5jn0xnj2b6gbic0asnj3b7j283gyziibm3pxa";
sha256 = "0k2bq7l0m7qfpy1mkb3qvsinqd8n4lp0vwz3x64wlgfn2qipm1fn";
};

passthru = {
9 changes: 2 additions & 7 deletions pkgs/desktops/pantheon/desktop/wingpanel/default.nix
View file
Original file line number Diff line number Diff line change
@@ -4,13 +4,13 @@

stdenv.mkDerivation rec {
pname = "wingpanel";
version = "2.2.2";
version = "2.2.3";

src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "1knkqh9q6yp7qf27zi6ki20fq4w0ia2hklvv84ivfmfa0irz0j6r";
sha256 = "1kd1w3mxysg33niryrz5yp6fdayzjpg73ihvq7dlasj8ls5d0qyj";
};

passthru = {
@@ -42,11 +42,6 @@ stdenv.mkDerivation rec {

patches = [
./indicators.patch
# Fix wingpanel potentially overlapping windows: https://github.com/elementary/wingpanel/pull/198
(fetchpatch {
url = "https://github.com/elementary/wingpanel/commit/fc1b8ea3d6cfc5d6e4034af177eecd4542a59833.patch";
sha256 = "0w5z56di5lxwg9vb96f9y4r2q05znwpn814m2w12l3impf5xsdqs";
})
];

postPatch = ''
4 changes: 2 additions & 2 deletions pkgs/desktops/pantheon/services/contractor/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, pantheon, meson, python3, ninja, pkgconfig, vala, glib, libgee, dbus, glib-networking, gobject-introspection }:
{ stdenv, fetchFromGitHub, pantheon, meson, python3, ninja, pkgconfig, vala, glib, libgee, dbus, glib-networking, wrapGAppsHook }:

stdenv.mkDerivation rec {
pname = "contractor";
@@ -19,12 +19,12 @@ stdenv.mkDerivation rec {

nativeBuildInputs = [
dbus
gobject-introspection
meson
ninja
pkgconfig
python3
vala
wrapGAppsHook
];

buildInputs = [