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: eab4103efa2f
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: ad0df8414e35
Choose a head ref

Commits on May 14, 2020

  1. Verified

    This commit was signed with the committer’s verified signature.
    edolstra Eelco Dolstra
    Copy the full SHA
    cd1152f View commit details

Commits on May 26, 2020

  1. powerdevil: add DDC support

    peterhoeg committed May 26, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    edolstra Eelco Dolstra
    Copy the full SHA
    7517ecd View commit details
  2. Copy the full SHA
    a3aec35 View commit details

Commits on May 27, 2020

  1. scrcpy: 1.13 -> 1.14

    dywedir committed May 27, 2020
    Copy the full SHA
    c1418b4 View commit details
  2. Copy the full SHA
    2059f44 View commit details

Commits on May 28, 2020

  1. rclone: 1.51.0 -> 1.52.0

    marsam committed May 28, 2020
    Copy the full SHA
    8eb59d4 View commit details
  2. hyperfine: 1.9.0 -> 1.10.0

    r-ryantm committed May 28, 2020
    Copy the full SHA
    62f0177 View commit details
  3. intermodal: 0.1.7 -> 0.1.8

    r-ryantm committed May 28, 2020
    Copy the full SHA
    314823c View commit details
  4. kubeseal: 0.12.3 -> 0.12.4

    r-ryantm committed May 28, 2020
    Copy the full SHA
    a9881ef View commit details
  5. Merge pull request #89078 from r-ryantm/auto-update/intermodal

    intermodal: 0.1.7 -> 0.1.8
    Br1ght0ne authored May 28, 2020
    Copy the full SHA
    8b2dfcb View commit details
  6. Update spdlog to 1.6.0

    georgthegreat authored May 28, 2020
    Copy the full SHA
    331ce69 View commit details
  7. Merge pull request #87812 from joachimschmidt557/mysql-enable-option

    nixos/mysql: refactor enable option
    rnhmjoj authored May 28, 2020
    Copy the full SHA
    429f976 View commit details
  8. Merge pull request #89044 from joachimschmidt557/rethinkdb-enable-option

    nixos/rethinkdb: refactor enable option
    rnhmjoj authored May 28, 2020
    Copy the full SHA
    c18ee4c View commit details
  9. pspg: 3.1.1 -> 3.1.2

    r-ryantm committed May 28, 2020
    Copy the full SHA
    0872463 View commit details
  10. Copy the full SHA
    c9e9854 View commit details
  11. Copy the full SHA
    8d638a3 View commit details
  12. Copy the full SHA
    d27e075 View commit details
  13. Merge pull request #89080 from r-ryantm/auto-update/kubeseal

    kubeseal: 0.12.3 -> 0.12.4
    marsam authored May 28, 2020
    Copy the full SHA
    32a2a0c View commit details
  14. silicon: 0.3.1 -> 0.3.2

    r-ryantm committed May 28, 2020
    Copy the full SHA
    41af600 View commit details
  15. rabbitmq-server: 3.8.3 -> 3.8.4

    r-ryantm authored and Profpatsch committed May 28, 2020
    Copy the full SHA
    220393d View commit details
  16. Merge pull request #89087 from georgthegreat/patch-1

    Update spdlog to 1.6.0
    obadz authored May 28, 2020
    Copy the full SHA
    3f8a8de View commit details
  17. Merge pull request #89096 from r-ryantm/auto-update/silicon

    silicon: 0.3.1 -> 0.3.2
    marsam authored May 28, 2020
    Copy the full SHA
    0a13e01 View commit details
  18. Merge pull request #89076 from r-ryantm/auto-update/hyperfine

    hyperfine: 1.9.0 -> 1.10.0
    marsam authored May 28, 2020
    Copy the full SHA
    92f9809 View commit details
  19. Merge pull request #89071 from marsam/update-rclone

    rclone: 1.51.0 -> 1.52.0
    marsam authored May 28, 2020
    Copy the full SHA
    eb2a77a View commit details
  20. Merge pull request #88942 from peterhoeg/m/kde_ddc

    powerdevil: add DDC support
    peterhoeg authored May 28, 2020
    Copy the full SHA
    ad0df84 View commit details
8 changes: 1 addition & 7 deletions nixos/modules/services/databases/mysql.nix
Original file line number Diff line number Diff line change
@@ -32,13 +32,7 @@ in

services.mysql = {

enable = mkOption {
type = types.bool;
default = false;
description = "
Whether to enable the MySQL server.
";
};
enable = mkEnableOption "MySQL server";

package = mkOption {
type = types.package;
5 changes: 1 addition & 4 deletions nixos/modules/services/databases/rethinkdb.nix
Original file line number Diff line number Diff line change
@@ -15,10 +15,7 @@ in

services.rethinkdb = {

enable = mkOption {
default = false;
description = "Whether to enable the RethinkDB server.";
};
enable = mkEnableOption "RethinkDB server";

#package = mkOption {
# default = pkgs.rethinkdb;
19 changes: 19 additions & 0 deletions nixos/modules/services/x11/desktop-managers/plasma5.nix
Original file line number Diff line number Diff line change
@@ -158,6 +158,19 @@ in
example = "vlc";
description = "Phonon audio backend to install.";
};

supportDDC = mkOption {
type = types.bool;
default = false;
description = ''
Support setting monitor brightness via DDC.
</para>
<para>
This is not needed for controlling brightness of the internal monitor
of a laptop and as it is considered experimental by upstream, it is
disabled by default.
'';
};
};

};
@@ -184,6 +197,12 @@ in
};
};

# DDC support
boot.kernelModules = lib.optional cfg.supportDDC "i2c_dev";
services.udev.extraRules = lib.optionalString cfg.supportDDC ''
KERNEL=="i2c-[0-9]*", TAG+="uaccess"
'';

environment.systemPackages = with pkgs; with qt5; with libsForQt5; with plasma5; with kdeApplications;
[
frameworkintegration
4 changes: 2 additions & 2 deletions pkgs/applications/networking/cluster/kubeseal/default.nix
Original file line number Diff line number Diff line change
@@ -2,13 +2,13 @@

buildGoModule rec {
pname = "kubeseal";
version = "0.12.3";
version = "0.12.4";

src = fetchFromGitHub {
owner = "bitnami-labs";
repo = "sealed-secrets";
rev = "v${version}";
sha256 = "1h8n2219xh0gl42kz3rkv3aj3wfwivvs9skwbbrvmrkwwrpxkgdj";
sha256 = "1abm63fb40zky5i97wm6h8ifmdf6i71ws9y7217hv2rnja37f4zd";
};

vendorSha256 = null;
6 changes: 3 additions & 3 deletions pkgs/applications/networking/cluster/terraform/default.nix
Original file line number Diff line number Diff line change
@@ -118,13 +118,13 @@ in rec {
terraform_0_11-full = terraform_0_11.full;

terraform_0_12 = pluggable (generic {
version = "0.12.25";
sha256 = "0xq4327386x6isw82d4xyq70pw7xxlh4sgmqas0b2pvyz85jxdch";
version = "0.12.26";
sha256 = "1f0n2zdk1jyqcmchsprqfkiivmsmdlpsf5b7x5f1dmvms9jw3268";
patches = [
./provider-path.patch
(fetchpatch {
name = "fix-mac-mojave-crashes.patch";
url = "https://github.com/hashicorp/terraform/pull/24562.patch";
url = "https://github.com/hashicorp/terraform/commit/cd65b28da051174a13ac76e54b7bb95d3051255c.patch";
sha256 = "1k70kk4hli72x8gza6fy3vpckdm3sf881w61fmssrah3hgmfmbrs";
}) ];
passthru = { inherit plugins; };
6 changes: 3 additions & 3 deletions pkgs/applications/networking/sync/rclone/default.nix
Original file line number Diff line number Diff line change
@@ -2,13 +2,13 @@

buildGoPackage rec {
pname = "rclone";
version = "1.51.0";
version = "1.52.0";

src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "0z4kaq6wnj5dgl52g7f86phxlvnk5pbpda7prgh3hahpyhxj0z7d";
sha256 = "0v0f3pv8qgk8ggrhm4p9brra1ppj53b51jhgh5xi0rhgpxss0d6r";
};

goPackagePath = "github.com/rclone/rclone";
@@ -28,7 +28,7 @@ buildGoPackage rec {
in
''
installManPage $src/rclone.1
for shell in bash zsh; do
for shell in bash zsh fish; do
${rcloneBin}/bin/rclone genautocomplete $shell rclone.$shell
installShellCompletion rclone.$shell
done
6 changes: 5 additions & 1 deletion pkgs/desktops/plasma-5/powerdevil.nix
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
extra-cmake-modules, kdoctools,
bluez-qt, kactivities, kauth, kconfig, kdbusaddons, kdelibs4support,
kglobalaccel, ki18n, kidletime, kio, knotifyconfig, kwayland, libkscreen,
networkmanager-qt, plasma-workspace, qtx11extras, solid, udev
ddcutil, networkmanager-qt, plasma-workspace, qtx11extras, solid, udev
}:

mkDerivation {
@@ -13,5 +13,9 @@ mkDerivation {
kconfig kdbusaddons knotifyconfig solid udev bluez-qt kactivities kauth
kdelibs4support kglobalaccel ki18n kio kidletime kwayland libkscreen
networkmanager-qt plasma-workspace qtx11extras
ddcutil
];
cmakeFlags = [
"-DHAVE_DDCUTIL=On"
];
}
4 changes: 2 additions & 2 deletions pkgs/development/libraries/spdlog/default.nix
Original file line number Diff line number Diff line change
@@ -35,8 +35,8 @@ let
in
{
spdlog_1 = generic {
version = "1.4.2";
sha256 = "1qc3rphvik44136ms0gjq2wmkl6qglri4fqxlhr2l5jwm8zhr8fc";
version = "1.6.0";
sha256 = "15fn8nd9xj7wrxcg9n4fjffid790qg2m366rx2lq2fc9v9walrxs";
};

spdlog_0 = generic {
10 changes: 5 additions & 5 deletions pkgs/misc/scrcpy/default.nix
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, fetchFromGitHub, makeWrapper
, meson
, ninja
, pkgconfig
, pkg-config
, fetchpatch

, platform-tools
@@ -10,10 +10,10 @@
}:

let
version = "1.13";
version = "1.14";
prebuilt_server = fetchurl {
url = "https://github.com/Genymobile/scrcpy/releases/download/v${version}/scrcpy-server-v${version}";
sha256 = "11gqsl2x18hgwdjajag9q8qdxqvdqr9m67zka22z7hnd3k569vjz";
sha256 = "082n57a9lw39lfjxybgim09qf0id9m0rpfb3zmqng58fp2i1h6qx";
};
in
stdenv.mkDerivation rec {
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
owner = "Genymobile";
repo = pname;
rev = "v${version}";
sha256 = "1zc73l5vm4hca8niaa3y76kpk7i9vj89wv4gbxmf1yjmixb71hby";
sha256 = "1w06gsvgjdbpb9lvvhpjwmysxjl0daiigjfh3cxfgz88447bgw7j";
};

# postPatch:
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
--replace "SDL_RENDERER_ACCELERATED" "SDL_RENDERER_ACCELERATED || SDL_RENDERER_SOFTWARE"
'';

nativeBuildInputs = [ makeWrapper meson ninja pkgconfig ];
nativeBuildInputs = [ makeWrapper meson ninja pkg-config ];

buildInputs = [ ffmpeg SDL2 ];

4 changes: 2 additions & 2 deletions pkgs/servers/amqp/rabbitmq-server/default.nix
Original file line number Diff line number Diff line change
@@ -8,12 +8,12 @@
stdenv.mkDerivation rec {
pname = "rabbitmq-server";

version = "3.8.3";
version = "3.8.4";

# when updating, consider bumping elixir version in all-packages.nix
src = fetchurl {
url = "https://github.com/rabbitmq/rabbitmq-server/releases/download/v${version}/${pname}-${version}.tar.xz";
sha256 = "1fhs3g2pgrq2xi4hnlc437hkv3261l4i134m6mxid00sf1c89p5f";
sha256 = "1sa9zfd8hv5mxgnxva9sydqnyzwssxjkbba028pwpml2im97z7j5";
};

buildInputs =
6 changes: 3 additions & 3 deletions pkgs/tools/misc/hyperfine/default.nix
Original file line number Diff line number Diff line change
@@ -4,16 +4,16 @@

rustPlatform.buildRustPackage rec {
pname = "hyperfine";
version = "1.9.0";
version = "1.10.0";

src = fetchFromGitHub {
owner = "sharkdp";
repo = pname;
rev = "refs/tags/v${version}";
sha256 = "0jx2lqhayp14c51dfvgmqrmmadyvxf0p4dsn770ndqpzv66rh6zb";
sha256 = "0389lmyipmm4irrl39zw2748f2sdddfzwms4i4763xdykdvi8b57";
};

cargoSha256 = "0n0hizldhr026mrzzz1wlw4g0b1z6ybxarybq3fzchs722iqpsis";
cargoSha256 = "06scvp7x1yixdadarsm461hbc256spx4aqhmjjn72x7hxn22h9cg";

buildInputs = stdenv.lib.optional stdenv.isDarwin Security;

6 changes: 3 additions & 3 deletions pkgs/tools/misc/intermodal/default.nix
Original file line number Diff line number Diff line change
@@ -2,16 +2,16 @@

rustPlatform.buildRustPackage rec {
pname = "intermodal";
version = "0.1.7";
version = "0.1.8";

src = fetchFromGitHub {
owner = "casey";
repo = pname;
rev = "v${version}";
sha256 = "05wjzx1ibd7cyl5lgmmn5y8dhsk71wz2bnimbmq7z51ds6cbyw5i";
sha256 = "1farcijm5s1836vi7h36yh0i9v48q4l98s4wprmr28z37c3l3n0b";
};

cargoSha256 = "04xqk1mmbrz8bjn36nxabwla3y62wfdly5bckkya6y2dhf1vkdjq";
cargoSha256 = "1kvrra5i1g1inxpmn4shd8kgkljrk3ymfnpnhwrsnfxrqidi0h2z";

# include_hidden test tries to use `chflags` on darwin
checkFlagsArray = stdenv.lib.optionals stdenv.isDarwin [ "--skip=subcommand::torrent::create::tests::include_hidden" ];
4 changes: 2 additions & 2 deletions pkgs/tools/misc/pspg/default.nix
Original file line number Diff line number Diff line change
@@ -2,13 +2,13 @@

stdenv.mkDerivation rec {
pname = "pspg";
version = "3.1.1";
version = "3.1.2";

src = fetchFromGitHub {
owner = "okbob";
repo = pname;
rev = version;
sha256 = "1hs1cixk1jcx8br81c4drm1b56hwcq6jiww0ywrpdna475jv5vvw";
sha256 = "1x4x93c8qqalrhaah1rmrspr4gjcgf1sg6kplf9rg1c42mk672f8";
};

nativeBuildInputs = [ pkgconfig ];
6 changes: 3 additions & 3 deletions pkgs/tools/misc/silicon/default.nix
Original file line number Diff line number Diff line change
@@ -16,16 +16,16 @@

rustPlatform.buildRustPackage rec {
pname = "silicon";
version = "0.3.1";
version = "0.3.2";

src = fetchFromGitHub {
owner = "Aloxaf";
repo = "silicon";
rev = "v${version}";
sha256 = "1avdzs3v6k4jhkadm8i8dlwg0iffqd99xqpi53smd0zgwks744l5";
sha256 = "1ga632c86l30n6wjj8rc3gz43v93mb7kcl9f8vhig16ycgiw8v09";
};

cargoSha256 = "0bdb4nadrms5jq3s8pby2qfky7112ynd7vd6mw720mshqklk5zyb";
cargoSha256 = "0bgm29v9vmd1xcdazg1psrx6hb1z3zfzr1c4iy8j1r28csbmm6kq";

buildInputs = [ llvmPackages.libclang expat freetype ]
++ lib.optionals stdenv.isLinux [ libxcb ]