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: 973a27053516
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: 594dfac037a5
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Jul 17, 2019

  1. pantheon.switchboard-plug-pantheon-shell: Fix setting lightdm background 

    backports elementary/settings-desktop@e4f86df

(cherry picked from commit 47dcdfe)
    @worldofpeace
    worldofpeace committed Jul 17, 2019
    Copy the full SHA
    e4a9013 View commit details

  2. nextcloud: 15.0.8 -> 16.0.3 [19.03] (#64841)

    @herrwiese @globin
    herrwiese authored and globin committed Jul 17, 2019
    Copy the full SHA
    594dfac View commit details
Showing with 8 additions and 3 deletions.
  1. +6 −1 pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix
  2. +2 −2 pkgs/servers/nextcloud/default.nix
7 changes: 6 additions & 1 deletion pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, pantheon, meson, ninja, pkgconfig, vala
, libgee, granite, gexiv2, elementary-settings-daemon, gtk3, gnome-desktop
, gala, wingpanel, plank, switchboard, gettext, gobject-introspection, bamf }:
, gala, wingpanel, plank, switchboard, gettext, gobject-introspection, bamf, fetchpatch }:

stdenv.mkDerivation rec {
pname = "switchboard-plug-pantheon-shell";
@@ -43,6 +43,11 @@ stdenv.mkDerivation rec {
patches = [
./backgrounds.patch # Having https://github.com/elementary/switchboard-plug-pantheon-shell/issues/166 would make this patch uneeded
./hardcode-gsettings.patch
# Fixes https://github.com/elementary/switchboard-plug-pantheon-shell/issues/172
(fetchpatch {
url = "https://github.com/elementary/switchboard-plug-pantheon-shell/commit/e4f86df6a6be402db4c979a4b005573618b744d1.patch";
sha256 = "0sa8611k6sqg96mnp2plmxd30w6zq76bfwszl8ankr9kwsgyc66y";
})
];

postPatch = ''
4 changes: 2 additions & 2 deletions pkgs/servers/nextcloud/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@

stdenv.mkDerivation rec {
name = "nextcloud-${version}";
version = "15.0.8";
version = "16.0.3";

src = fetchurl {
url = "https://download.nextcloud.com/server/releases/${name}.tar.bz2";
sha256 = "1w7jwni3iv8ixh92v6iaw9nwshjd9wvvdkwkdpcyq6crlfgmk0mp";
sha256 = "1ww1517i05gaf71szx0qpdc87aczllcb39cvc8c26dm18z76hgx1";
};

installPhase = ''