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: ac842446ad9a
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: 1975b8687474
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Jul 22, 2020

  1. pantheon.appcenter: fix build 

    I believe I misunderstood some things greatly 😅️

(cherry picked from commit d74da4f)
    @worldofpeace
    worldofpeace committed Jul 22, 2020
    Copy the full SHA
    297f338 View commit details

  2. mattermost-desktop: 4.5.0 -> 4.5.2 (#93668) 

    (cherry picked from commit 667b4b4)
    @jokogr
    jokogr authored Jul 22, 2020
    Copy the full SHA
    1975b86 View commit details
Showing with 8 additions and 4 deletions.
  1. +3 −3 pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix
  2. +5 −1 pkgs/desktops/pantheon/apps/appcenter/default.nix
6 changes: 3 additions & 3 deletions pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix
View file
Original file line number Diff line number Diff line change
@@ -43,18 +43,18 @@ let
in
stdenv.mkDerivation rec {
pname = "mattermost-desktop";
version = "4.5.0";
version = "4.5.2";

src =
if stdenv.hostPlatform.system == "x86_64-linux" then
fetchurl {
url = "https://releases.mattermost.com/desktop/${version}/${pname}-${version}-linux-x64.tar.gz";
sha256 = "1p44vxs7i9f15h4xjyr99g8x73qygv909a32lfkqip1fh8lk7sf4";
sha256 = "0r9xmhzif1ia1m53yr59q6p3niyq3jv3vgv4703x68jmd46f91n6";
}
else if stdenv.hostPlatform.system == "i686-linux" then
fetchurl {
url = "https://releases.mattermost.com/desktop/${version}/${pname}-${version}-linux-ia32.tar.gz";
sha256 = "03pn853z2famqxcsrwayqb94pzghlpfb0qs2nfi8mc5zzsgcic7z";
sha256 = "1h8lw06p3cqz9dkgbhfmzcrzjsir5cfhx28xm4zrmvkj4yfzbcnv";
}
else
throw "Mattermost-Desktop is not currently supported on ${stdenv.hostPlatform.system}";
6 changes: 5 additions & 1 deletion pkgs/desktops/pantheon/apps/appcenter/default.nix
View file
Original file line number Diff line number Diff line change
@@ -23,6 +23,8 @@
, pkgconfig
, python3
, vala
, polkit
, libhandy
, wrapGAppsHook
}:

@@ -58,17 +60,19 @@ stdenv.mkDerivation rec {

buildInputs = [
appstream
elementary-icon-theme
elementary-gtk-theme
elementary-icon-theme
flatpak
glib
granite
gtk3
json-glib
libgee
libhandy
libsoup
libxml2
packagekit
polkit
];

mesonFlags = [