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: 03dc6471c12a
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: 21517c60d948
Choose a head ref
  • 9 commits
  • 8 files changed
  • 5 contributors

Commits on Nov 21, 2018

  1. nixos/fontconfig: fix enable option of penultimate 

    (cherry picked from commit eea86c9)
    @jfrankenau @ttuegel
    jfrankenau authored and ttuegel committed Nov 21, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    ttuegel Thomas Tuegel
    GPG key ID: 22CBF5249D4B4D59
    Verified
    Learn about vigilant mode
    Copy the full SHA
    bfb89a3 View commit details

  2. movit: 1.5.1 -> 1.6.2, fix build after #49310 

    Fixes #49883

(cherry picked from commit 6daa193)
    @orivej @edolstra
    orivej authored and edolstra committed Nov 21, 2018
    Copy the full SHA
    29842ed View commit details

  3. linux: 4.4.163 -> 4.4.164 

    (cherry picked from commit e822b96)
    @NeQuissimus
    NeQuissimus committed Nov 21, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    NeQuissimus Tim Steinbach
    GPG key ID: 472BFCCA96BD0EDA
    Verified
    Learn about vigilant mode
    Copy the full SHA
    bb10644 View commit details

  4. linux: 4.9.137 -> 4.9.138 

    (cherry picked from commit 0e7dafe)
    @NeQuissimus
    NeQuissimus committed Nov 21, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    NeQuissimus Tim Steinbach
    GPG key ID: 472BFCCA96BD0EDA
    Verified
    Learn about vigilant mode
    Copy the full SHA
    c90a18b View commit details

  5. linux: 4.14.81 -> 4.14.82 

    (cherry picked from commit 3667a91)
    @NeQuissimus
    NeQuissimus committed Nov 21, 2018

    Unverified

    The signature in this commit could not be verified. Someone may be trying to trick you.
    GPG key ID: 472BFCCA96BD0EDA
    Learn about vigilant mode
    Copy the full SHA
    4215171 View commit details

  6. linux: 4.18.19 -> 4.18.20 

    (cherry picked from commit ff82d7c)
    @NeQuissimus
    NeQuissimus committed Nov 21, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    NeQuissimus Tim Steinbach
    GPG key ID: 472BFCCA96BD0EDA
    Verified
    Learn about vigilant mode
    Copy the full SHA
    d0193db View commit details

  7. linux: 4.19.2 -> 4.19.3 

    (cherry picked from commit 8f11b37)
    @NeQuissimus
    NeQuissimus committed Nov 21, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    NeQuissimus Tim Steinbach
    GPG key ID: 472BFCCA96BD0EDA
    Verified
    Learn about vigilant mode
    Copy the full SHA
    dfd23be View commit details

  8. Merge pull request #50877 from ttuegel/backport/50472 

    nixos/fontconfig: fix enable option of penultimate
    @ttuegel
    ttuegel authored Nov 21, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    012b9e6 View commit details

  9. netdata: create missing /etc/netdata 

    Since netdata 1.11.0 updated in NixOS/nixpkgs#50459
it needs to have a /etc/netdata directory, which we did not create by default.
fixes #50893
    @Mic92
    Mic92 committed Nov 21, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    Mic92 Jörg Thalheim
    GPG key ID: CA4106B8D7CC79FA
    Verified
    Learn about vigilant mode
    Copy the full SHA
    21517c6 View commit details
2 changes: 1 addition & 1 deletion nixos/modules/config/fonts/fontconfig-penultimate.nix
View file
Original file line number Diff line number Diff line change
@@ -269,7 +269,7 @@ in

};

config = mkIf (config.fonts.fontconfig.enable && cfg.enable) {
config = mkIf (config.fonts.fontconfig.enable && config.fonts.fontconfig.penultimate.enable) {

fonts.fontconfig.confPackages = [ penultimateConf ];

18 changes: 11 additions & 7 deletions nixos/modules/services/monitoring/netdata.nix
View file
Original file line number Diff line number Diff line change
@@ -99,19 +99,23 @@ in {
message = "Cannot specify both config and configText";
}
];

systemd.tmpfiles.rules = [
"d /var/cache/netdata 0755 ${cfg.user} ${cfg.group} -"
"Z /var/cache/netdata - ${cfg.user} ${cfg.group} -"
"d /var/log/netdata 0755 ${cfg.user} ${cfg.group} -"
"Z /var/log/netdata - ${cfg.user} ${cfg.group} -"
"d /var/lib/netdata 0755 ${cfg.user} ${cfg.group} -"
"Z /var/lib/netdata - ${cfg.user} ${cfg.group} -"
"d /etc/netdata 0755 ${cfg.user} ${cfg.group} -"
"Z /etc/netdata - ${cfg.user} ${cfg.group} -"
];
systemd.services.netdata = {
description = "Real time performance monitoring";
after = [ "network.target" ];
wantedBy = [ "multi-user.target" ];
path = (with pkgs; [ gawk curl ]) ++ lib.optional cfg.python.enable
(pkgs.python3.withPackages cfg.python.extraPackages);
preStart = concatStringsSep "\n" (map (dir: ''
mkdir -vp ${dir}
chmod 750 ${dir}
chown -R ${cfg.user}:${cfg.group} ${dir}
'') [ "/var/cache/netdata"
"/var/log/netdata"
"/var/lib/netdata" ]);
serviceConfig = {
User = cfg.user;
Group = cfg.group;
12 changes: 7 additions & 5 deletions pkgs/development/libraries/movit/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,22 +1,24 @@
{ stdenv, fetchurl, SDL, eigen, epoxy, fftw, gtest, pkgconfig }:
{ stdenv, fetchurl, SDL2, eigen, epoxy, fftw, gtest, pkgconfig }:

stdenv.mkDerivation rec {
name = "movit-${version}";
version = "1.5.1";
version = "1.6.2";

src = fetchurl {
url = "https://movit.sesse.net/${name}.tar.gz";
sha256 = "1259iq2ixiprk4mn7ypapinbg2w1sjq1aivzzbbch9i23kcfsd44";
sha256 = "1q9h086v6h3da4b9qyflcjx73cgnqjhb92rv6g4j90m34dndaa3l";
};

outputs = [ "out" "dev" ];

GTEST_DIR = "${gtest}";
GTEST_DIR = "${gtest.src}/googletest";

propagatedBuildInputs = [ eigen epoxy ];

nativeBuildInputs = [ pkgconfig ];
buildInputs = [ SDL fftw gtest ];
buildInputs = [ SDL2 fftw gtest ];

enableParallelBuilding = true;

meta = with stdenv.lib; {
description = "High-performance, high-quality video filters for the GPU";
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/kernel/linux-4.14.nix
View file
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
with stdenv.lib;

buildLinux (args // rec {
version = "4.14.81";
version = "4.14.82";

# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${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 = "1pjvwyhag2i8i5kns8836ifpk93ssvp35m4rfxhz0kl4ag8dydjb";
sha256 = "1b8x77kf3q7nf2h3s9vnn0hzi45srxxin7f9rvg70vd7yvka5457";
};
} // (args.argsOverride or {}))
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/kernel/linux-4.18.nix
View file
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
with stdenv.lib;

buildLinux (args // rec {
version = "4.18.19";
version = "4.18.20";

# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${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 = "1g9iasj17i6z5494azsbr4pji7qj27f1fasrx36fbxy4rp1w8rkw";
sha256 = "0lzn2w8zagqk3sp6jsp155xggm1c277xjh8m0nvddvdp1yg33b38";
};
} // (args.argsOverride or {}))
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/kernel/linux-4.19.nix
View file
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
with stdenv.lib;

buildLinux (args // rec {
version = "4.19.2";
version = "4.19.3";

# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${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 = "0wyzy8i2lfhz2rf9ilygl2jgz6iyspv2amx2fzm85mwv060py361";
sha256 = "0834k2lsflp6mgxv1vs1gr4fykg5z0hd4sbbrw3z7zfhsh95fg0y";
};
} // (args.argsOverride or {}))
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/kernel/linux-4.4.nix
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{ stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args:

buildLinux (args // rec {
version = "4.4.163";
version = "4.4.164";
extraMeta.branch = "4.4";

src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "1x1fixnz41q6pq1cms9z48mrac984r675m94fdm08m8ajqxddcv1";
sha256 = "041w65dxsdcdpf7isis2r4xabfm9pbhfgxxx7n9d1nv7grss3d4v";
};
} // (args.argsOverride or {}))
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/kernel/linux-4.9.nix
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{ stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args:

buildLinux (args // rec {
version = "4.9.137";
version = "4.9.138";
extraMeta.branch = "4.9";

src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "1295x8a8k8bdanrpsalnaaq00mk3fl91sr14061lrgwlj0m53ckd";
sha256 = "1dr1mf7i1mwy780048gkhvy283j8331xwgrs2x5qal0xc1114c4j";
};
} // (args.argsOverride or {}))