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: 6803bc688200
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: 2a14d21224f1
Choose a head ref
  • 17 commits
  • 9 files changed
  • 10 contributors

Commits on Sep 16, 2020

  1. eksctl: 0.26.0 -> 0.27.0

    Chili-Man authored Sep 16, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    bagder Daniel Stenberg
    Copy the full SHA
    5a6ec92 View commit details
  2. Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Copy the full SHA
    e77d4ec View commit details

Commits on Sep 17, 2020

  1. ntfy: Switch to python3. Also fixes test failure.

    Fixes test error:
    
        AttributeError: 'module' object has no attribute 'test_prowl'
    nh2 committed Sep 17, 2020

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Copy the full SHA
    3559369 View commit details
  2. Partially verified

    This commit is signed with the committer’s verified signature.
    vcunat’s contribution has been verified via GPG key.
    We cannot verify signatures from co-authors, and some of the co-authors attributed to this commit require their commits to be signed.
    Copy the full SHA
    114ad1a View commit details
  3. react-native-debugger: fix eval

    Ma27 committed Sep 17, 2020
    Copy the full SHA
    501eaab View commit details
  4. signal-desktop: ringrtc depends on libpulseaudio

    voice/video calls should now work, fixing #98082
    collares authored and primeos committed Sep 17, 2020
    Copy the full SHA
    3df04be View commit details
  5. Copy the full SHA
    8263d6e View commit details
  6. Copy the full SHA
    5cd3b2d View commit details
  7. Copy the full SHA
    139143c View commit details
  8. Merge pull request #98129 from demyanrogozhin/react-native-debugger-fix

    react-native-debugger: 0.9.10 -> 0.11.4
    Ma27 authored Sep 17, 2020
    Copy the full SHA
    85ca7f7 View commit details
  9. Merge pull request #98127 from Chili-Man/patch-2

    eksctl: 0.26.0 -> 0.27.0
    marsam authored Sep 17, 2020
    Copy the full SHA
    2ef8a50 View commit details
  10. Copy the full SHA
    cb4b908 View commit details
  11. linux: 5.4.65 -> 5.4.66

    NeQuissimus committed Sep 17, 2020
    Copy the full SHA
    e8121e5 View commit details
  12. linux: 5.8.9 -> 5.8.10

    NeQuissimus committed Sep 17, 2020
    Copy the full SHA
    fa60ed8 View commit details
  13. Merge pull request #98140 from nh2/ntfy-python3

    ntfy: Switch to python3. Also fixes test failure
    nh2 authored Sep 17, 2020
    Copy the full SHA
    3c6ed1a View commit details
  14. Copy the full SHA
    19f2251 View commit details
  15. Merge pull request #97394 from SuperSandro2000/dnscontrol-3.3.0

     dnscontrol: 3.2.0 -> 3.3.0, add me as maintainer
    ehmry authored Sep 17, 2020
    Copy the full SHA
    2a14d21 View commit details
16 changes: 8 additions & 8 deletions pkgs/applications/networking/dnscontrol/default.nix
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
{ stdenv, fetchFromGitHub, buildGoPackage}:
{ lib, fetchFromGitHub, buildGoModule }:

buildGoPackage rec {
buildGoModule rec {
pname = "dnscontrol";
version = "3.2.0";

goPackagePath = "github.com/StackExchange/dnscontrol";
version = "3.3.0";

src = fetchFromGitHub {
owner = "StackExchange";
repo = pname;
rev = "v${version}";
sha256 = "1lrn1whmx9zkyvs505zxrsmnr5s6kpj3kjkr6rblfwdlnadkgfj7";
sha256 = "0lldkx906imwm8mxcfafpanbgaqh0sdm3zdkwkn7j0nmngyncx9p";
};

vendorSha256 = "16cc6hb2iwh1zwrrnb7s4dqxqhaj67gq3gfr5xvh5kqafd685hvx";

subPackages = [ "." ];

meta = with stdenv.lib; {
meta = with lib; {
description = "Synchronize your DNS to multiple providers from a simple DSL";
homepage = "https://stackexchange.github.io/dnscontrol/";
license = licenses.mit;
maintainers = with maintainers; [ mmahut ];
maintainers = with maintainers; [ mmahut SuperSandro2000 ];
};
}
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@
, libXext, libXfixes, libXrender, libXtst, libXScrnSaver, nss, nspr, alsaLib
, cups, expat, libuuid, at-spi2-core, libappindicator-gtk3
# Runtime dependencies:
, systemd, libnotify, libdbusmenu
, systemd, libnotify, libdbusmenu, libpulseaudio
# Unfortunately this also overwrites the UI language (not just the spell
# checking language!):
, hunspellDicts, spellcheckerLanguage ? null # E.g. "de_DE"
@@ -122,6 +122,7 @@ in stdenv.mkDerivation rec {
--replace /opt/Signal/signal-desktop $out/bin/signal-desktop
autoPatchelf --no-recurse -- $out/lib/Signal/
patchelf --add-needed ${libpulseaudio}/lib/libpulse.so $out/lib/Signal/resources/app.asar.unpacked/node_modules/ringrtc/build/linux/libringrtc.node
'';

# Tests if the application launches and waits for "Link your phone to Signal Desktop":
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/grpcio-tools/default.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, buildPythonPackage, fetchPypi, protobuf, grpcio }:
{ stdenv, buildPythonPackage, fetchPypi, protobuf, grpcio, setuptools }:

buildPythonPackage rec {
pname = "grpcio-tools";
@@ -11,7 +11,7 @@ buildPythonPackage rec {

enableParallelBuilding = true;

propagatedBuildInputs = [ protobuf grpcio ];
propagatedBuildInputs = [ protobuf grpcio setuptools ];

# no tests in the package
doCheck = false;
25 changes: 12 additions & 13 deletions pkgs/development/tools/react-native-debugger/default.nix
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, unzip, cairo, xorg, gdk-pixbuf, fontconfig, pango, gnome2, atk, gtk2, glib
, freetype, dbus, nss, nspr, alsaLib, cups, expat, udev, makeDesktopItem
{ stdenv, fetchurl, unzip, cairo, xorg, gdk-pixbuf, fontconfig, pango, gnome3, atk, at-spi2-atk, at-spi2-core
, gtk3, glib, freetype, dbus, nss, nspr, alsaLib, cups, expat, udev, makeDesktopItem
}:

let
@@ -10,7 +10,7 @@ let
fontconfig
pango
atk
gtk2
gtk3
glib
freetype
dbus
@@ -20,8 +20,8 @@ let
cups
expat
udev

gnome2.GConf
at-spi2-atk
at-spi2-core

xorg.libX11
xorg.libXcursor
@@ -38,11 +38,10 @@ let
];
in stdenv.mkDerivation rec {
pname = "react-native-debugger";
version = "0.9.10";

version = "0.11.4";
src = fetchurl {
url = "https://github.com/jhen0409/react-native-debugger/releases/download/v${version}/rn-debugger-linux-x64.zip";
sha256 = "158275sp37smc8lnrcbj56lp7aa6fj9gzb6fzjgz9r980qgzhia6";
sha256 = "1dnlxdqcn90r509ff5003fibkrprdr0ydpnwg5p0xzs6rz3k8698";
};

buildInputs = [ unzip ];
@@ -52,26 +51,26 @@ in stdenv.mkDerivation rec {
unzip $src -d $out
mkdir $out/{lib,bin,share}
mv $out/lib{node,ffmpeg}.so $out/lib
mv $out/{libEGL,libGLESv2,libvk_swiftshader,libffmpeg}.so $out/lib
mv $out/!(lib|share|bin) $out/share
patchelf \
--set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
--set-rpath ${rpath}:$out/lib \
$out/share/React\ Native\ Debugger
$out/share/react-native-debugger
ln -s $out/share/React\ Native\ Debugger $out/bin/React\ Native\ Debugger
ln -s $out/share/react-native-debugger $out/bin/react-native-debugger
install -Dm644 "${desktopItem}/share/applications/"* \
-t $out/share/applications/
'';

desktopItem = makeDesktopItem {
name = "rndebugger";
exec = "React\\ Native\\ Debugger";
exec = "react-native-debugger";
desktopName = "React Native Debugger";
genericName = "React Native Debugger";
categories = "Development;Tools;";
categories = "Development;Debugger;";
};

meta = with stdenv.lib; {
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/kernel/linux-4.19.nix
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
with stdenv.lib;

buildLinux (args // rec {
version = "4.19.145";
version = "4.19.146";

# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {

src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "1dzn7x5lz808r1sxxdrylh8k3c5n8ffqnz6anx2ywnpiz17q7g0p";
sha256 = "0jl17yk3fpz0sx203l9l1fj5bly3jgsyr8hy5qa6py99fbk0qnim";
};
} // (args.argsOverride or {}))
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/kernel/linux-5.4.nix
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
with stdenv.lib;

buildLinux (args // rec {
version = "5.4.65";
version = "5.4.66";

# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {

src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "0sdcdjhzvz7hksv74dgj0ck9adxzhph47r1ng1kf37fh2x28657m";
sha256 = "1cnsrz21kcf0h7krpv9p1a7n59mybr5ii0jdi3yc3x3lcwvk06gz";
};
} // (args.argsOverride or {}))
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/kernel/linux-5.8.nix
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
with stdenv.lib;

buildLinux (args // rec {
version = "5.8.9";
version = "5.8.10";

# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {

src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "0pz1jfgmds5xc63jfvlykqap4dqf9jpr8jmgz5wpszgih8dvrn4r";
sha256 = "1wjsdc93xilag0pk205m2q0ixmpp93ql5qj0fm3qlqddgxm14vlx";
};
} // (args.argsOverride or {}))
8 changes: 4 additions & 4 deletions pkgs/tools/admin/eksctl/default.nix
Original file line number Diff line number Diff line change
@@ -2,16 +2,16 @@

buildGoModule rec {
pname = "eksctl";
version = "0.26.0";
version = "0.27.0";

src = fetchFromGitHub {
owner = "weaveworks";
repo = pname;
rev = version;
sha256 = "1av5w32ia68j2xrw4m16mzm9jn6xlap93kwi8iqw0s6wgihzadds";
sha256 = "1yclffhr76jd5rzqi37bpdj524lmywmgcfr9r0ahacfkp1hxdn3v";
};

vendorSha256 = "13sc4yrzgx2sm98whibfy2kjia3yy9cdvibvhbvg2lz2spprjb9v";
vendorSha256 = "133g2d7l1szmpxjdg28yjm3pw6galwq8948rvalnh932kxngkxys";

doCheck = false;

@@ -36,6 +36,6 @@ buildGoModule rec {
description = "A CLI for Amazon EKS";
homepage = "https://github.com/weaveworks/eksctl";
license = licenses.asl20;
maintainers = with maintainers; [ xrelkd ];
maintainers = with maintainers; [ xrelkd Chili-Man ];
};
}
10 changes: 5 additions & 5 deletions pkgs/tools/misc/ntfy/default.nix
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{ stdenv, pythonPackages, fetchFromGitHub }:
{ stdenv, python3Packages, fetchFromGitHub }:

pythonPackages.buildPythonApplication rec {
python3Packages.buildPythonApplication rec {
pname = "ntfy";
version = "2.7.0";

@@ -11,11 +11,11 @@ pythonPackages.buildPythonApplication rec {
sha256 = "09f02cn4i1l2aksb3azwfb70axqhn7d0d0vl2r6640hqr74nc1cv";
};

checkInputs = with pythonPackages; [
checkInputs = with python3Packages; [
mock
];

propagatedBuildInputs = with pythonPackages; [
propagatedBuildInputs = with python3Packages; [
requests ruamel_yaml appdirs
sleekxmpp dns
emoji
@@ -25,7 +25,7 @@ pythonPackages.buildPythonApplication rec {
];

checkPhase = ''
HOME=$(mktemp -d) ${pythonPackages.python.interpreter} setup.py test
HOME=$(mktemp -d) ${python3Packages.python.interpreter} setup.py test
'';

meta = with stdenv.lib; {