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: 33496aa3a6f3
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: 342eaba9ebbc
Choose a head ref

Commits on Apr 1, 2020

  1. Copy the full SHA
    4be2643 View commit details

Commits on Apr 14, 2020

  1. blugon: 1.12.0 -> 1.12.1

    r-ryantm committed Apr 14, 2020
    Copy the full SHA
    8f59b98 View commit details
  2. Verified

    This commit was signed with the committer’s verified signature.
    etu Elis Hirwing
    Copy the full SHA
    cca2fe9 View commit details

Commits on Apr 15, 2020

  1. system-syzygy: Fix invalid desktopFile arguments

    Fixes this build failure:
    
    Running desktop-file validation
    /nix/store/vadj03624kv6h963c7fjwdz1hg403aa9-system-syzygy.desktop/share/applications/system-syzygy.desktop: error: value "%out%/bin/syzygy" for key "Exec" in group "Desktop Entry" contains an invalid field code "%o"
    /nix/store/vadj03624kv6h963c7fjwdz1hg403aa9-system-syzygy.desktop/share/applications/system-syzygy.desktop: error: value "%out%/bin/syzygy" for key "Exec" in group "Desktop Entry" contains an invalid field code "%/"
    
    Signed-off-by: Anders Kaseorg <andersk@mit.edu>
    andersk committed Apr 15, 2020
    Copy the full SHA
    1844d4a View commit details
  2. Copy the full SHA
    dd14ee8 View commit details
  3. Copy the full SHA
    9693911 View commit details

Commits on Apr 16, 2020

  1. multimc: 0.6.7 -> 0.6.11

    anna328p committed Apr 16, 2020
    Copy the full SHA
    d44b9d3 View commit details
  2. Merge pull request #85196 from r-ryantm/auto-update/blugon

    blugon: 1.12.0 -> 1.12.1
    nh2 authored Apr 16, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    7494653 View commit details
  3. fira-code: 3 -> 3.1

    marsam authored and Jon committed Apr 16, 2020
    Copy the full SHA
    bde9510 View commit details
  4. netdata: 1.21.0 -> 1.21.1

    marsam authored and Jon committed Apr 16, 2020
    Copy the full SHA
    7ff456d View commit details
  5. netdata-go.d.plugin: 0.15.0 -> 0.18.0

    marsam authored and Jon committed Apr 16, 2020
    Copy the full SHA
    95e007d View commit details
  6. python3Packages.ibis: 1.2.0 -> 1.3.0, fix tests

    Jonathan Ringer committed Apr 16, 2020
    Copy the full SHA
    0eec285 View commit details
  7. Merge pull request #83984 from r-ryantm/auto-update/kubernetes

    kubernetes: 1.17.3 -> 1.18.0
    srhb authored Apr 16, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    67413f6 View commit details
  8. Copy the full SHA
    e4dc205 View commit details
  9. Copy the full SHA
    f646069 View commit details
  10. Copy the full SHA
    fbd4290 View commit details
  11. Copy the full SHA
    c3408ad View commit details
  12. Copy the full SHA
    8da467e View commit details
  13. Copy the full SHA
    7eb0a87 View commit details
  14. Merge pull request #83742 from dkudriavtsev/multimc-update

    multimc: 0.6.7 -> 0.6.11
    worldofpeace authored Apr 16, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    34e0372 View commit details
  15. Merge pull request #85228 from etu/update-sequeler

    sequeler: 0.7.4 -> 0.7.9
    worldofpeace authored Apr 16, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    9ec6bcb View commit details
  16. Merge pull request #85284 from andersk/system-syzygy

    system-syzygy: Fix invalid desktopFile arguments
    worldofpeace authored Apr 16, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    7b20f79 View commit details
  17. Merge pull request #85338 from lopsided98/g2o-update

    g2o: unstable-2019-04-07 -> 20200410
    worldofpeace authored Apr 16, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    10d1088 View commit details
  18. cjdns: 20.5 -> 20.6

    r-ryantm authored and ehmry committed Apr 16, 2020
    Copy the full SHA
    342eaba View commit details
4 changes: 2 additions & 2 deletions pkgs/applications/misc/blugon/default.nix
Original file line number Diff line number Diff line change
@@ -2,13 +2,13 @@

stdenv.mkDerivation rec {
pname = "blugon";
version = "1.12.0";
version = "1.12.1";

src = fetchFromGitHub {
owner = "jumper149";
repo = pname;
rev = version;
sha256 = "0vdhq8v011awhpkccbcmigj9c46widyzh0m5knafapanai3kv7ii";
sha256 = "1i67v8jxvavgax3dwvns200iwwdcvgki04liq0x64q52lg0vrh7m";
};

buildInputs = [ python3 libX11 libXrandr ];
4 changes: 2 additions & 2 deletions pkgs/applications/misc/sequeler/default.nix
Original file line number Diff line number Diff line change
@@ -11,13 +11,13 @@ let

in stdenv.mkDerivation rec {
pname = "sequeler";
version = "0.7.4";
version = "0.7.9";

src = fetchFromGitHub {
owner = "Alecaddd";
repo = pname;
rev = "v${version}";
sha256 = "0ki8dganj6hmvg5qwdlc3y0a4pdmx7454np790yf5wnqb6ixb6gv";
sha256 = "117gcc41rd24y5hpm3drqxfcfz52smpcr8w76xnykx8wb1ac50jf";
};

nativeBuildInputs = [ meson ninja pkgconfig vala gettext wrapGAppsHook python3 desktop-file-utils ];
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 = [
4 changes: 2 additions & 2 deletions pkgs/applications/networking/cluster/kubernetes/default.nix
Original file line number Diff line number Diff line change
@@ -15,13 +15,13 @@ with lib;

stdenv.mkDerivation rec {
pname = "kubernetes";
version = "1.17.3";
version = "1.18.0";

src = fetchFromGitHub {
owner = "kubernetes";
repo = "kubernetes";
rev = "v${version}";
sha256 = "0caqczz8hrwqb8j94158hz6919i7c9v1v0zknh9m2zbbng4b1awi";
sha256 = "1jp54aahwpx9w73byfyadgffrig9fy6x8xzw27xv0anj2v9bm1fw";
};

nativeBuildInputs = [ removeReferencesTo makeWrapper which go rsync go-bindata ];
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/data/fonts/fira-code/default.nix
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{ stdenv, fetchzip }:

let
version = "3";
version = "3.1";
in fetchzip {
name = "fira-code-${version}";

@@ -13,7 +13,7 @@ in fetchzip {
unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype
'';

sha256 = "19kcqqd6c61v137q88zsvf2ra154n009sbqh6zs7l8f7r5bbipj2";
sha256 = "1rk5hiix282b1gsxq9kqma2q9fnydj0xl9vbrd88rf7ywvn75817";

meta = with stdenv.lib; {
homepage = "https://github.com/tonsky/FiraCode";
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 = {
32 changes: 15 additions & 17 deletions pkgs/development/libraries/g2o/default.nix
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{ lib, stdenv, fetchFromGitHub, cmake, eigen, suitesparse, libGLU, qt5
, libsForQt5, makeWrapper }:
{ lib, stdenv, mkDerivation, fetchFromGitHub, cmake, eigen, suitesparse, libGLU
, qtbase, libqglviewer, makeWrapper }:

stdenv.mkDerivation rec {
mkDerivation rec {
pname = "g2o";
version = "unstable-2019-04-07";
version = "20200410";

src = fetchFromGitHub {
owner = "RainerKuemmerle";
repo = pname;
rev = "9b41a4ea5ade8e1250b9c1b279f3a9c098811b5a";
sha256 = "1rgrz6zxiinrik3lgwgvsmlww1m2fnpjmvcx1mf62xi1s2ma5w2i";
rev = "${version}_git";
sha256 = "11rgj2g9mmwajlr69pjkjvxjyn88afa0r4bchjyvmxswjccizlg2";
};

# Removes a reference to gcc that is only used in a debug message
@@ -18,11 +18,14 @@ stdenv.mkDerivation rec {
separateDebugInfo = true;

nativeBuildInputs = [ cmake makeWrapper ];
buildInputs = [ eigen suitesparse libGLU qt5.qtbase libsForQt5.libqglviewer ];
buildInputs = [ eigen suitesparse libGLU qtbase libqglviewer ];

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

cmakeFlags = [
# Detection script is broken
"-DQGLVIEWER_INCLUDE_DIR=${libsForQt5.libqglviewer}/include/QGLViewer"
"-DQGLVIEWER_INCLUDE_DIR=${libqglviewer}/include/QGLViewer"
"-DG2O_BUILD_EXAMPLES=OFF"
] ++ lib.optionals stdenv.isx86_64 ([ "-DDO_SSE_AUTODETECT=OFF" ] ++ {
default = [ "-DDISABLE_SSE3=ON" "-DDISABLE_SSE4_1=ON" "-DDISABLE_SSE4_2=ON" "-DDISABLE_SSE4_A=ON" ];
@@ -35,16 +38,11 @@ stdenv.mkDerivation rec {
skylake-avx512 = [ "-DDISABLE_SSE4_A=ON" ];
}.${stdenv.hostPlatform.platform.gcc.arch or "default"});

postInstall = ''
wrapProgram $out/bin/g2o_viewer \
--prefix QT_PLUGIN_PATH : "${qt5.qtbase}/${qt5.qtbase.qtPluginPrefix}"
'';

meta = {
meta = with lib; {
description = "A General Framework for Graph Optimization";
homepage = "https://github.com/RainerKuemmerle/g2o";
license = with lib.licenses; [ bsd3 lgpl3 gpl3 ];
maintainers = with lib.maintainers; [ lopsided98 ];
platforms = lib.platforms.all;
license = with licenses; [ bsd3 lgpl3 gpl3 ];
maintainers = with maintainers; [ lopsided98 ];
platforms = platforms.all;
};
}
26 changes: 13 additions & 13 deletions pkgs/development/python-modules/ibis-framework/default.nix
Original file line number Diff line number Diff line change
@@ -1,29 +1,26 @@
{ lib
, buildPythonPackage
, fetchPypi
{ lib, buildPythonPackage, fetchPypi, isPy27, pythonAtLeast
, graphviz
, multipledispatch
, numpy
, pandas
, pyarrow
, pytest
, pytz
, regex
, toolz
, isPy27
, pytest
, sqlalchemy
, requests
, sqlalchemy
, tables
, pyarrow
, graphviz
, toolz
}:

buildPythonPackage rec {
pname = "ibis-framework";
version = "1.2.0";
disabled = isPy27;
version = "1.3.0";
disabled = isPy27 || pythonAtLeast "3.8";

src = fetchPypi {
inherit pname version;
sha256 = "3a0b79dae6924be0a79669c881a9a1d4817997ad2f81a0f3b1cd03d70aebb071";
sha256 = "1my94a11jzg1hv6ln8wxklbqrg6z5l2l77vr89aq0829yyxacmv7";
};

propagatedBuildInputs = [
@@ -44,8 +41,11 @@ buildPythonPackage rec {
pytest
];

# ignore tests which require test dataset, or frameworks not available
checkPhase = ''
pytest ibis
pytest ibis \
--ignore=ibis/tests/all \
--ignore=ibis/{sql,spark}
'';

meta = with lib; {
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 ];
2 changes: 1 addition & 1 deletion pkgs/games/system-syzygy/default.nix
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
let
desktopFile = makeDesktopItem {
name = "system-syzygy";
exec = "%out%/bin/syzygy";
exec = "@out@/bin/syzygy";
comment = "A puzzle game";
desktopName = "System Syzygy";
categories = "Game;";
4 changes: 2 additions & 2 deletions pkgs/tools/networking/cjdns/default.nix
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, nodejs, which, python27, utillinux }:

let version = "20.5"; in
let version = "20.6"; in
stdenv.mkDerivation {
name = "cjdns-"+version;

src = fetchFromGitHub {
owner = "cjdelisle";
repo = "cjdns";
rev = "cjdns-v${version}";
sha256 = "13f174bmbyqna899naja4fzpma3yaw815ylksk8klcc3glg07v7b";
sha256 = "1d5rrnqb5dcmm5cg2ky1cgxz6ncb23n1j797j9zzw6xxdvkf3kgi";
};

buildInputs = [ which python27 nodejs ] ++
8 changes: 4 additions & 4 deletions pkgs/tools/system/netdata/default.nix
Original file line number Diff line number Diff line change
@@ -14,14 +14,14 @@ with stdenv.lib;
let
go-d-plugin = callPackage ./go.d.plugin.nix {};
in stdenv.mkDerivation rec {
version = "1.21.0";
version = "1.21.1";
pname = "netdata";

src = fetchFromGitHub {
owner = "netdata";
repo = "netdata";
rev = "v${version}";
sha256 = "08gxwxvg816hj7sxsb8s97ny2562xri9nx0w2zx7xsssp22grawk";
sha256 = "0i0k64r8j1g02s2bi2gm0j47y52l3xli63w686ncpgmlhwmdfz65";
};

nativeBuildInputs = [ autoreconfHook pkgconfig ];
@@ -41,8 +41,8 @@ in stdenv.mkDerivation rec {
NIX_CFLAGS_COMPILE = optionalString withDebug "-O1 -ggdb -DNETDATA_INTERNAL_CHECKS=1";

postInstall = ''
ln -s ${go-d-plugin.bin}/lib/netdata/conf.d/* $out/lib/netdata/conf.d
ln -s ${go-d-plugin.bin}/bin/godplugin $out/libexec/netdata/plugins.d/go.d.plugin
ln -s ${go-d-plugin}/lib/netdata/conf.d/* $out/lib/netdata/conf.d
ln -s ${go-d-plugin}/bin/godplugin $out/libexec/netdata/plugins.d/go.d.plugin
'' + optionalString (!stdenv.isDarwin) ''
# rename this plugin so netdata will look for setuid wrapper
mv $out/libexec/netdata/plugins.d/apps.plugin \
534 changes: 0 additions & 534 deletions pkgs/tools/system/netdata/deps.nix

This file was deleted.

19 changes: 9 additions & 10 deletions pkgs/tools/system/netdata/go.d.plugin.nix
Original file line number Diff line number Diff line change
@@ -1,30 +1,29 @@
{ lib, fetchFromGitHub, buildGoPackage }:
{ lib, fetchFromGitHub, buildGoModule }:

buildGoPackage rec {
buildGoModule rec {
pname = "netdata-go.d.plugin";
version = "0.15.0";
version = "0.18.0";

src = fetchFromGitHub {
owner = "netdata";
repo = "go.d.plugin";
rev = "v${version}";
sha256 = "0v732mndhgrbqiwsdndqd08pvgbvl4ffn5rqbyv7iw1dwwr08f67";
sha256 = "15h4075lwqh58ssdgyq34jj8r4dga0sz7h18dzy4nir75p8a0s7b";
};

goPackagePath = "github.com/netdata/go.d.plugin";
modSha256 = "1386qhk1yr47h7qv15k0abc8mfif96pqapw0v4wrf3pl1z9mzl2n";

buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ];

postInstall = ''
mkdir -p $bin/lib/netdata/conf.d
cp -r go/src/${goPackagePath}/config/* $bin/lib/netdata/conf.d
mkdir -p $out/lib/netdata/conf.d
cp -r config/* $out/lib/netdata/conf.d
'';

goDeps = ./deps.nix;

meta = with lib; {
description = "Netdata orchestrator for data collection modules written in go";
homepage = "https://github.com/netdata/go.d.plugin";
license = licenses.gpl3;
platforms = platforms.unix;
maintainers = [ maintainers.lethalman ];
};
}
2 changes: 1 addition & 1 deletion pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
@@ -1809,7 +1809,7 @@ in

fzy = callPackage ../tools/misc/fzy { };

g2o = callPackage ../development/libraries/g2o { };
g2o = libsForQt5.callPackage ../development/libraries/g2o { };

gbsplay = callPackage ../applications/audio/gbsplay { };