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: a438aed5a6ce
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: 0f920b05cbcd
Choose a head ref
  • 14 commits
  • 12 files changed
  • 7 contributors

Commits on Apr 15, 2020

  1. Copy the full SHA
    8c3b765 View commit details
  2. ping: use vala_0_40

    fails to build otherwise.
    
    (cherry picked from commit 10c0352)
    worldofpeace committed Apr 15, 2020
    Copy the full SHA
    6ca86a0 View commit details
  3. nasc: fix build

    (cherry picked from commit 433ea74)
    worldofpeace committed Apr 15, 2020
    Copy the full SHA
    142afb8 View commit details

Commits on Apr 16, 2020

  1. Copy the full SHA
    d219b7b View commit details
  2. Merge pull request #85353 from das-g/release-20.03_chromedriver-81.0.…

    …4044
    
    chromedriver: 78.0.3904.70 -> 81.0.4044.69
    marsam authored Apr 16, 2020
    Copy the full SHA
    3abf820 View commit details
  3. ephemeral: 6.3.0 -> 6.3.1

    (cherry picked from commit e38859d)
    r-ryantm authored and worldofpeace committed Apr 16, 2020
    Copy the full SHA
    9c11bd9 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
    a5ad726 View commit details
  5. Copy the full SHA
    2c0f6ef View commit details
  6. monitor: add note how to use indicator.

    (cherry picked from commit fbd4290)
    worldofpeace committed Apr 16, 2020
    Copy the full SHA
    a37adb3 View commit details
  7. Copy the full SHA
    17f9299 View commit details
  8. Copy the full SHA
    e6b82df View commit details
  9. Copy the full SHA
    931c4db View commit details
  10. multimc: 0.6.7 -> 0.6.11

    (cherry picked from commit d44b9d3)
    anna328p authored and worldofpeace committed Apr 16, 2020
    Copy the full SHA
    92d43c9 View commit details
  11. g2o: fix log limit exceeded error in Hydra

    (cherry picked from commit dd14ee8)
    lopsided98 authored and worldofpeace committed Apr 16, 2020
    Copy the full SHA
    0f920b0 View commit details
6 changes: 3 additions & 3 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.0";
version = "6.3.3";

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

nativeBuildInputs = [
@@ -62,7 +62,7 @@ stdenv.mkDerivation rec {

meta = with stdenv.lib; {
description = "The always-incognito web browser";
homepage = https://github.com/cassidyjames/ephemeral;
homepage = "https://github.com/cassidyjames/ephemeral";
maintainers = with maintainers; [ kjuvi ] ++ pantheon.maintainers;
platforms = platforms.linux;
license = licenses.gpl3;
6 changes: 4 additions & 2 deletions pkgs/applications/networking/ping/default.nix
Original file line number Diff line number Diff line change
@@ -12,7 +12,9 @@
, json-glib
, libsoup
, libgee
, wrapGAppsHook }:
, wrapGAppsHook
, vala_0_40
}:

stdenv.mkDerivation rec {
pname = "ping";
@@ -28,7 +30,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
meson
ninja
vala
vala_0_40
pkgconfig
python3
wrapGAppsHook
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;
9 changes: 9 additions & 0 deletions pkgs/applications/science/math/nasc/default.nix
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{ stdenv
, fetchFromGitHub
, fetchpatch
, pkgconfig
, vala
, gtk3
@@ -25,6 +26,14 @@ stdenv.mkDerivation rec {
sha256 = "036v3dx8yasp19j88lflibqnpfi5d0nk7qkcnr80zn1lvawf4wgn";
};

patches = [
# fix build with gcc9
(fetchpatch {
url = "https://github.com/parnold-x/nasc/commit/46b9b80e228b6b86001bded45d85e073a9411549.patch";
sha256 = "1sm2aw0xhw2chk036r231nmp2f2ypxcmzggwljkn7wfzgg3h1mx3";
})
];

nativeBuildInputs = [
cmake
vala
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 = {
3 changes: 3 additions & 0 deletions pkgs/development/libraries/g2o/default.nix
Original file line number Diff line number Diff line change
@@ -20,6 +20,9 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake makeWrapper ];
buildInputs = [ eigen suitesparse libGLU qt5.qtbase libsForQt5.libqglviewer ];

# Silence noisy warning
CXXFLAGS = "-Wno-deprecated-copy";

cmakeFlags = [
# Detection script is broken
"-DQGLVIEWER_INCLUDE_DIR=${libsForQt5.libqglviewer}/include/QGLViewer"
74 changes: 62 additions & 12 deletions pkgs/development/tools/rust/cargo-make/Cargo.lock
6 changes: 3 additions & 3 deletions pkgs/development/tools/rust/cargo-make/default.nix
Original file line number Diff line number Diff line change
@@ -2,15 +2,15 @@

rustPlatform.buildRustPackage rec {
pname = "cargo-make";
version = "0.30.4";
version = "0.30.5";

src =
let
source = fetchFromGitHub {
owner = "sagiegurari";
repo = pname;
rev = version;
sha256 = "14sl7kcr1n3xb912vd3445pwf3v1kp74lgxlwqybnwiyh1dxihvg";
sha256 = "0p6rzkrwyfcrg4qrlb67rf0wb12kqldl1xg0rfnwc23y17fbwx49";
};
in
runCommand "source" {} ''
@@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec {
buildInputs = [ openssl ]
++ stdenv.lib.optionals stdenv.isDarwin [ Security ];

cargoSha256 = "0adilcl76mh520zk40vhzi3y6riai73282wzhvjcfaasbcwlr738";
cargoSha256 = "0l3k4k63zx4gbdp5bnamrnhib2pw6z0d1ff06n8v2z7rcrawhlyx";

# Some tests fail because they need network access.
# However, Travis ensures a proper build.
6 changes: 3 additions & 3 deletions pkgs/development/tools/selenium/chromedriver/default.nix
Original file line number Diff line number Diff line change
@@ -6,12 +6,12 @@ let
allSpecs = {
x86_64-linux = {
system = "linux64";
sha256 = "155yilj9w8a6jbkx1axhhkizwdc12krl4xixn10j7n94bvny4w2y";
sha256 = "1mqsangjindfqgvjxgmpgfrcd8a2lqmwl587l0ip0p5wwz8yq5wi";
};

x86_64-darwin = {
system = "mac64";
sha256 = "0dzy9ihhbhx4byr2kalwfbn6jbk1hinacdqi25lvhaprdbrh2igh";
sha256 = "18ydf2bk5aiin3yffb9z8215idz65nkhgxq0mmlvwb8gwsdvnwi1";
};
};

@@ -28,7 +28,7 @@ let
in
stdenv.mkDerivation rec {
pname = "chromedriver";
version = "78.0.3904.70";
version = "81.0.4044.69";

src = fetchurl {
url = "https://chromedriver.storage.googleapis.com/${version}/chromedriver_${spec.system}.zip";
4 changes: 2 additions & 2 deletions pkgs/games/multimc/default.nix
Original file line number Diff line number Diff line change
@@ -4,12 +4,12 @@ let
libpath = with xorg; stdenv.lib.makeLibraryPath [ libX11 libXext libXcursor libXrandr libXxf86vm libpulseaudio ];
in mkDerivation rec {
pname = "multimc";
version = "0.6.7";
version = "0.6.11";
src = fetchFromGitHub {
owner = "MultiMC";
repo = "MultiMC5";
rev = version;
sha256 = "1i160rmsdvrcnvlr6m2qjwkfx0lqnzrcifjkaklw96ina6z6cg2n";
sha256 = "1jkbmb4sgfk8d93f5l1vd9pkpvhq9sxacc61w0rvf5xmz0wnszmz";
fetchSubmodules = true;
};
nativeBuildInputs = [ cmake file makeWrapper ];