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: b896e929f674
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: 0243f4455bb6
Choose a head ref
Loading
Showing with 96 additions and 103 deletions.
  1. +1 −0 nixos/modules/module-list.nix
  2. +23 −0 nixos/modules/services/desktops/neard.nix
  3. +2 −2 pkgs/applications/graphics/xournalpp/default.nix
  4. +0 −34 pkgs/applications/version-management/bugseverywhere/default.nix
  5. +2 −2 pkgs/development/compilers/kotlin/default.nix
  6. +2 −2 pkgs/development/libraries/gjs/default.nix
  7. +2 −2 pkgs/development/libraries/gvfs/default.nix
  8. +15 −10 pkgs/development/libraries/libappindicator/default.nix
  9. +2 −2 pkgs/development/libraries/libfilezilla/default.nix
  10. +6 −2 pkgs/development/libraries/libmypaint/default.nix
  11. +2 −0 pkgs/development/python-modules/hvplot/default.nix
  12. +2 −1 pkgs/development/python-modules/imbalanced-learn/default.nix
  13. +2 −2 pkgs/development/python-modules/klaus/default.nix
  14. +4 −7 pkgs/development/python-modules/send2trash/default.nix
  15. +4 −1 pkgs/development/python-modules/slicedimage/default.nix
  16. +2 −2 pkgs/development/tools/build-managers/bazel/default.nix
  17. +2 −2 pkgs/development/web/cypress/default.nix
  18. +2 −2 pkgs/servers/freeradius/default.nix
  19. +2 −2 pkgs/servers/jellyfin/default.nix
  20. +3 −3 pkgs/servers/monitoring/grafana/default.nix
  21. +4 −4 pkgs/servers/x11/xorg/default.nix
  22. +0 −10 pkgs/servers/x11/xorg/overrides.nix
  23. +1 −1 pkgs/servers/x11/xorg/tarballs.list
  24. +2 −2 pkgs/tools/misc/memtest86-efi/default.nix
  25. +2 −1 pkgs/tools/networking/wireguard-tools/default.nix
  26. +2 −2 pkgs/tools/networking/ytcc/default.nix
  27. +2 −2 pkgs/tools/text/highlight/default.nix
  28. +1 −1 pkgs/top-level/all-packages.nix
  29. +2 −2 pkgs/top-level/python-packages.nix
1 change: 1 addition & 0 deletions nixos/modules/module-list.nix
Original file line number Diff line number Diff line change
@@ -307,6 +307,7 @@
./services/desktops/gnome3/sushi.nix
./services/desktops/gnome3/tracker.nix
./services/desktops/gnome3/tracker-miners.nix
./services/desktops/neard.nix
./services/desktops/profile-sync-daemon.nix
./services/desktops/system-config-printer.nix
./services/desktops/telepathy.nix
23 changes: 23 additions & 0 deletions nixos/modules/services/desktops/neard.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# neard service.
{ config, lib, pkgs, ... }:

with lib;

{
###### interface
options = {
services.neard = {
enable = mkEnableOption "neard, NFC daemon";
};
};


###### implementation
config = mkIf config.services.neard.enable {
environment.systemPackages = [ pkgs.neard ];

services.dbus.packages = [ pkgs.neard ];

systemd.packages = [ pkgs.neard ];
};
}
4 changes: 2 additions & 2 deletions pkgs/applications/graphics/xournalpp/default.nix
Original file line number Diff line number Diff line change
@@ -23,13 +23,13 @@

stdenv.mkDerivation rec {
pname = "xournalpp";
version = "1.0.15";
version = "1.0.16";

src = fetchFromGitHub {
owner = "xournalpp";
repo = pname;
rev = version;
sha256 = "1q716hn2ajkxfba0dxp7vcnqfa31hx36ax09yz4d13sdw43rfjf4";
sha256 = "1bdmxxkcqpjvkckizmrz2839b4yspw4xv69bqkrrgkcyvxsr804w";
};

nativeBuildInputs = [ cmake gettext pkgconfig wrapGAppsHook ];
34 changes: 0 additions & 34 deletions pkgs/applications/version-management/bugseverywhere/default.nix

This file was deleted.

4 changes: 2 additions & 2 deletions pkgs/development/compilers/kotlin/default.nix
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{ stdenv, fetchurl, makeWrapper, jre, unzip }:

let
version = "1.3.50";
version = "1.3.60";
in stdenv.mkDerivation {
inherit version;
pname = "kotlin";

src = fetchurl {
url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip";
sha256 = "1v66pnk810agf26khwdv7l8jpc11x6na5fyqxs9jvxdpls8l0hk9";
sha256 = "1frgnirrl795m8xydngrbn73np5gwgs7wymr9j81d0gz4gzpry8j";
};

propagatedBuildInputs = [ jre ] ;
4 changes: 2 additions & 2 deletions pkgs/development/libraries/gjs/default.nix
Original file line number Diff line number Diff line change
@@ -19,11 +19,11 @@

stdenv.mkDerivation rec {
pname = "gjs";
version = "1.58.1";
version = "1.58.3";

src = fetchurl {
url = "mirror://gnome/sources/gjs/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1xf68rbagkflb9yi3visfw8cbxqlzd717y8jakgw0y6whzm1dpxl";
sha256 = "1bkksx362007zs8c31ydygb29spwa5g5kch1ad2grc2sp53wv7ya";
};

outputs = [ "out" "dev" "installedTests" ];
4 changes: 2 additions & 2 deletions pkgs/development/libraries/gvfs/default.nix
Original file line number Diff line number Diff line change
@@ -41,11 +41,11 @@

stdenv.mkDerivation rec {
pname = "gvfs";
version = "1.42.1";
version = "1.42.2";

src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0c3pqc8qc2pn08by43rkkmk725k3cqmw7qyhfqgng0qx98dhf1lx";
sha256 = "0jgrbid8a61hgh05wl8c4f4638x7dffd5vip02jmladxfdszjymm";
};

postPatch = ''
25 changes: 15 additions & 10 deletions pkgs/development/libraries/libappindicator/default.nix
Original file line number Diff line number Diff line change
@@ -1,19 +1,18 @@
# TODO: Resolve the issues with the Mono bindings.

{ stdenv, fetchurl, lib, file
{ stdenv, fetchurl, fetchpatch, lib, file
, pkgconfig, autoconf
, glib, dbus-glib, gtkVersion ? "3"
, gtk2 ? null, libindicator-gtk2 ? null, libdbusmenu-gtk2 ? null
, gtk3 ? null, libindicator-gtk3 ? null, libdbusmenu-gtk3 ? null
, python2Packages, gobject-introspection, vala
, vala, gobject-introspection
, monoSupport ? false, mono ? null, gtk-sharp-2_0 ? null
}:

with lib;

let
inherit (python2Packages) python pygobject2 pygtk;
in stdenv.mkDerivation rec {

stdenv.mkDerivation rec {
name = let postfix = if gtkVersion == "2" && monoSupport then "sharp" else "gtk${gtkVersion}";
in "libappindicator-${postfix}-${version}";
version = "${versionMajor}.${versionMinor}";
@@ -25,7 +24,7 @@ in stdenv.mkDerivation rec {
sha256 = "17xlqd60v0zllrxp8bgq3k5a1jkj0svkqn8rzllcyjh8k0gpr46m";
};

nativeBuildInputs = [ pkgconfig autoconf ];
nativeBuildInputs = [ pkgconfig autoconf vala gobject-introspection ];

propagatedBuildInputs =
if gtkVersion == "2"
@@ -34,14 +33,20 @@ in stdenv.mkDerivation rec {

buildInputs = [
glib dbus-glib
python pygobject2 pygtk gobject-introspection vala
] ++ (if gtkVersion == "2"
then [ libindicator-gtk2 ] ++ optionals monoSupport [ mono gtk-sharp-2_0 ]
else [ libindicator-gtk3 ]);

patches = [
# Remove python2 from libappindicator.
(fetchpatch {
name = "no-python.patch";
url = "https://src.fedoraproject.org/rpms/libappindicator/raw/8508f7a52437679fd95a79b4630373f08315f189/f/nopython.patch";
sha256 = "18b1xzvwsbhhfpbzf5zragij4g79pa04y1dk6v5ci1wsjvii725s";
})
];

postPatch = ''
substituteInPlace configure.ac \
--replace '=codegendir pygtk-2.0' '=codegendir pygobject-2.0'
autoconf
for f in {configure,ltmain.sh,m4/libtool.m4}; do
substituteInPlace $f \
@@ -64,7 +69,7 @@ in stdenv.mkDerivation rec {
doCheck = false; # generates shebangs in check phase, too lazy to fix

installFlags = [
"sysconfdir=\${out}/etc"
"sysconfdir=${placeholder "out"}/etc"
"localstatedir=\${TMPDIR}"
];

4 changes: 2 additions & 2 deletions pkgs/development/libraries/libfilezilla/default.nix
Original file line number Diff line number Diff line change
@@ -9,11 +9,11 @@

stdenv.mkDerivation rec {
pname = "libfilezilla";
version = "0.18.2";
version = "0.19.1";

src = fetchurl {
url = "https://download.filezilla-project.org/${pname}/${pname}-${version}.tar.bz2";
sha256 = "1j9da9xi2k4nw97m14mpp7h39rh03br0gmjj9ff819l6nhlnkn20";
sha256 = "0cjscv68nnqivzba94xapx1c970j1jbdbm0h3g2ym9i0hgnyyhha";
};

nativeBuildInputs = [ pkgconfig ];
8 changes: 6 additions & 2 deletions pkgs/development/libraries/libmypaint/default.nix
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@
, json_c
, libtool
, pkgconfig
, python2
, python3
}:

stdenv.mkDerivation rec {
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
intltool
libtool
pkgconfig
python2
python3
];

buildInputs = [
@@ -43,6 +43,10 @@ stdenv.mkDerivation rec {

doCheck = true;

postPatch = ''
sed 's|python2|python|' -i autogen.sh
'';

preConfigure = "./autogen.sh";

meta = with stdenv.lib; {
2 changes: 2 additions & 0 deletions pkgs/development/python-modules/hvplot/default.nix
Original file line number Diff line number Diff line change
@@ -12,6 +12,7 @@
, xarray
, networkx
, streamz
, colorcet
}:

buildPythonPackage rec {
@@ -26,6 +27,7 @@ buildPythonPackage rec {
checkInputs = [ pytest parameterized nbsmoke flake8 coveralls xarray networkx streamz ];
propagatedBuildInputs = [
bokeh
colorcet
holoviews
pandas
];
3 changes: 2 additions & 1 deletion pkgs/development/python-modules/imbalanced-learn/default.nix
Original file line number Diff line number Diff line change
@@ -24,7 +24,8 @@ buildPythonPackage rec {
# or very large dependencies (keras + tensorflow)
py.test imblearn -k 'not estimator \
and not classification \
and not _generator'
and not _generator \
and not show_versions'
'';

meta = with stdenv.lib; {
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/klaus/default.nix
Original file line number Diff line number Diff line change
@@ -2,13 +2,13 @@

python.pkgs.buildPythonPackage rec {
pname = "klaus";
version = "1.4.0";
version = "1.5.0";

src = fetchFromGitHub {
owner = "jonashaag";
repo = pname;
rev = version;
sha256 = "041l5dpymi9h0yyr55r6m0skp0m2ags3miay0s1bgfcp469k0l20";
sha256 = "0pagyqfcj47ghd9m7b32hvi17hbl19f0wallkz6ncvmvvy919lfz";
};

prePatch = ''
11 changes: 4 additions & 7 deletions pkgs/development/python-modules/send2trash/default.nix
Original file line number Diff line number Diff line change
@@ -1,15 +1,12 @@
{ stdenv
, lib
, buildPythonPackage
, fetchFromGitHub
, pytest
, configparser
, isPy3k
}:

buildPythonPackage rec {
pname = "Send2Trash";
version = "1.4.2";
version = "1.5.0";

src = fetchFromGitHub {
owner = "hsoft";
@@ -19,10 +16,10 @@ buildPythonPackage rec {
};

doCheck = !stdenv.isDarwin;
checkPhase = "HOME=. py.test";
checkInputs = [ pytest ] ++ lib.optional (!isPy3k) configparser;
checkPhase = "HOME=$TMPDIR pytest";
checkInputs = [ pytest ];

meta = with lib; {
meta = with stdenv.lib; {
description = "Send file to trash natively under macOS, Windows and Linux";
homepage = https://github.com/hsoft/send2trash;
license = licenses.bsd3;
5 changes: 4 additions & 1 deletion pkgs/development/python-modules/slicedimage/default.nix
Original file line number Diff line number Diff line change
@@ -12,6 +12,7 @@
, six
, pytest
, isPy27
, tifffile
}:

buildPythonPackage rec {
@@ -31,14 +32,16 @@ buildPythonPackage rec {
requests
scikitimage
six
tifffile
] ++ lib.optionals isPy27 [ pathlib enum34 ];

checkInputs = [
pytest
];

# ignore tests which require setup
checkPhase = ''
pytest
pytest --ignore tests/io_
'';

meta = with lib; {
4 changes: 2 additions & 2 deletions pkgs/development/tools/build-managers/bazel/default.nix
Original file line number Diff line number Diff line change
@@ -22,11 +22,11 @@
}:

let
version = "1.2.0";
version = "1.2.1";

src = fetchurl {
url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip";
sha256 = "0vpfpm3l3zp6749b23ysqqf1la029jzq43ks60q6f5mr3056pd4w";
sha256 = "1qfk14mgx1m454b4w4ldggljzqkqwpdwrlynq7rc8aq11yfs8p95";
};

# Update with `eval $(nix-build -A bazel.updater)`,
4 changes: 2 additions & 2 deletions pkgs/development/web/cypress/default.nix
Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@

stdenv.mkDerivation rec{
pname = "cypress";
version = "3.5.0";
version = "3.6.1";

src = fetchzip {
url = "https://cdn.cypress.io/desktop/${version}/linux-x64/cypress.zip";
sha256 = "1w1nqa0j3bzjr000d4jlr34d1asdc1fv81pq831s3wl55hyqbij6";
sha256 = "0vlfmhsz7zkp3bjsgqmp9n716d5znicl42hm0m9hl7ndvgm9z9z0";
};

# don't remove runtime deps
4 changes: 2 additions & 2 deletions pkgs/servers/freeradius/default.nix
Original file line number Diff line number Diff line change
@@ -43,11 +43,11 @@ assert withRest -> curl != null && withJson;
with stdenv.lib;
stdenv.mkDerivation rec {
pname = "freeradius";
version = "3.0.19";
version = "3.0.20";

src = fetchurl {
url = "ftp://ftp.freeradius.org/pub/freeradius/freeradius-server-${version}.tar.gz";
sha256 = "0v5b46rq878093ff549ijccy98md1l7l4rvshjxs672il0zvq5i4";
sha256 = "0zrnlpril8lcnyd6zz0wy45wj5i2k2krcf42dwa0rldjsjh6nazp";
};

nativeBuildInputs = [ autoreconfHook ];
4 changes: 2 additions & 2 deletions pkgs/servers/jellyfin/default.nix
Original file line number Diff line number Diff line change
@@ -18,12 +18,12 @@ let

in stdenv.mkDerivation rec {
pname = "jellyfin";
version = "10.4.1";
version = "10.4.2";

# Impossible to build anything offline with dotnet
src = fetchurl {
url = "https://github.com/jellyfin/jellyfin/releases/download/v${version}/jellyfin_${version}_portable.tar.gz";
sha256 = "0lv1xd3bfbf9khiqlahry2im1mvgl3cj5m3zfd7mf61il5rz70f9";
sha256 = "08y3bxyqwpa28hgvvpiksbvss9wahmxprbi2dsm4gks9ba412f2f";
};

buildInputs = [
Loading