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

Commits on Apr 16, 2020

  1. Copy the full SHA
    e4dc205 View commit details
  2. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    f646069 View commit details
  3. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    fbd4290 View commit details
  4. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    c3408ad View commit details
  5. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    8da467e View commit details
  6. Copy the full SHA
    7eb0a87 View commit details
4 changes: 2 additions & 2 deletions pkgs/applications/networking/browsers/ephemeral/default.nix
Original file line number Diff line number Diff line change
@@ -19,13 +19,13 @@

stdenv.mkDerivation rec {
pname = "ephemeral";
version = "6.3.1";
version = "6.3.3";

src = fetchFromGitHub {
owner = "cassidyjames";
repo = "ephemeral";
rev = version;
sha256 = "13rl26lv5xgagiv21yp5pz69bkwh4nnz1lx9wryhsplki45xm1sq";
sha256 = "093bqc40p4s8jc1s5rg49363x24vnwwjayvgzmi4xag28f1x6kn8";
};

nativeBuildInputs = [
22 changes: 17 additions & 5 deletions pkgs/applications/office/agenda/default.nix
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
{ stdenv
, fetchFromGitHub
, pantheon
, cmake
, meson
, ninja
, python3
, pkg-config
, vala
, gettext
@@ -13,20 +15,23 @@

stdenv.mkDerivation rec {
pname = "agenda";
version = "1.0.12";
version = "1.1.0";

src = fetchFromGitHub {
owner = "dahenson";
repo = pname;
rev = version;
sha256 = "128c9p2jkc90imlq25xg5alqlam8q4i3gd5p1kcggf7s4amv8l8w";
sha256 = "0yfapapsanqacaa83iagar88i335yy2jvay8y6z7gkri7avbs4am";
};

nativeBuildInputs = [
cmake
gettext
vala
glib # for glib-compile-schemas
meson
ninja
pkg-config
python3
vala
wrapGAppsHook
];

@@ -37,6 +42,13 @@ stdenv.mkDerivation rec {
pantheon.granite
];

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

doCheck = true;

passthru = {
updateScript = pantheon.updateScript {
attrPath = pname;
10 changes: 8 additions & 2 deletions pkgs/applications/system/monitor/default.nix
Original file line number Diff line number Diff line change
@@ -18,13 +18,14 @@

stdenv.mkDerivation rec {
pname = "monitor";
version = "0.6.2";
version = "0.7.1";

src = fetchFromGitHub {
owner = "stsdc";
repo = "monitor";
rev = version;
sha256 = "0cqzxlzdbij26qgbbngqx6njcpcymkgvm29b7ipldgkssxp1mkkg";
sha256 ="194s9rjh3yd2c3rf3zwxsxr2lwqfswjazj39yiyccy0wcxmxpv34";
fetchSubmodules = true;
};

nativeBuildInputs = [
@@ -61,6 +62,11 @@ stdenv.mkDerivation rec {

meta = with stdenv.lib; {
description = "Manage processes and monitor system resources";
longDescription = ''
Manage processes and monitor system resources.
To use the wingpanel indicator in this application, see the Pantheon
section in the NixOS manual.
'';
homepage = "https://github.com/stsdc/monitor";
maintainers = with maintainers; [ kjuvi ] ++ pantheon.maintainers;
platforms = platforms.linux;
4 changes: 2 additions & 2 deletions pkgs/desktops/pantheon/apps/elementary-videos/default.nix
Original file line number Diff line number Diff line change
@@ -19,15 +19,15 @@

stdenv.mkDerivation rec {
pname = "elementary-videos";
version = "2.7.0";
version = "2.7.1";

repoName = "videos";

src = fetchFromGitHub {
owner = "elementary";
repo = repoName;
rev = version;
sha256 = "1b6dqqmxa83fwlh9r0v918ikxd3mnwk0j5xssw1wk5l7q72s43w7";
sha256 = "00arim4i9bv9mbms1irkp44grkgrfnmqzraswyn1xiz9nvl1bsb9";
};

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

stdenv.mkDerivation rec {
pname = "pantheon-agent-geoclue2";
version = "1.0.3";
version = "1.0.4";

src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "1fhgdcykn0ykn8fp7inn2akygpglhdwfpdkpnih86kqmqj8siahv";
sha256 = "1lky7pw47d5mdza3bhq0ahdhgdv159ixngdsc1ys6j1kszsfxc1f";
};

passthru = {