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: a7fd4310c0cc
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: db561c90ef34
Choose a head ref
  • 10 commits
  • 10 files changed
  • 7 contributors

Commits on Nov 27, 2018

  1. nixopsUnstable: 1.6.1pre2622_f10999a -> 1.6.1pre2706_d5ad09c

    This fixes evaluation with the latest master.
    
    (cherry picked from commit cbea220)
    Mic92 committed Nov 27, 2018
    Copy the full SHA
    f3fbb85 View commit details
  2. sssd: fix build with updated curl-7.62

    Fixes #51106.
    
    (cherry picked from commit 439bf86)
    The patch seems very safe to pick.
    vcunat committed Nov 27, 2018

    Unverified

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

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Copy the full SHA
    86d1ba3 View commit details
  4. linux: 4.4.164 -> 4.4.165

    (cherry picked from commit 2c3325ecf9af6f1d5a237190028d28a44ba210b3)
    NeQuissimus committed Nov 27, 2018

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Copy the full SHA
    1e1faec View commit details
  5. linux: 4.9.140 -> 4.9.141

    (cherry picked from commit 94906bfefed6cb7c1fe53fceb81038ddc8ee8ebc)
    NeQuissimus committed Nov 27, 2018

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Copy the full SHA
    9aff7df View commit details
  6. linux: 4.14.83 -> 4.14.84

    (cherry picked from commit d435ad65664ea762b58df28fd6bda4a08bebe86b)
    NeQuissimus committed Nov 27, 2018

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Copy the full SHA
    0375fe7 View commit details
  7. linux: 4.19.4 -> 4.19.5

    (cherry picked from commit 08292ab3da0f4df2d1560403e0e48b289f740457)
    NeQuissimus committed Nov 27, 2018

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Copy the full SHA
    0551730 View commit details
  8. gitea: include "options" directory in "data" output

    This directory contains template files needed for initializing new repositories.
    
    Fixes #49404.
    
    (cherry picked from commit 5f3054e)
    pvgoran authored and markuskowa committed Nov 27, 2018
    Copy the full SHA
    5c1cf68 View commit details
  9. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    6a0c135 View commit details
  10. Merge pull request #51148 from c0bw3b/sec/1809/pdnsrec

    pdns-recursor: 4.1.7 -> 4.1.8 (security)
    c0bw3b authored Nov 27, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    vcunat Vladimír Čunát
    Copy the full SHA
    db561c9 View commit details
2 changes: 1 addition & 1 deletion pkgs/applications/version-management/gitea/default.nix
Original file line number Diff line number Diff line change
@@ -39,7 +39,7 @@ buildGoPackage rec {

postInstall = ''
mkdir $data
cp -R $src/{public,templates} $data
cp -R $src/{public,templates,options} $data
mkdir -p $out
cp -R $src/options/locale $out/locale
2 changes: 1 addition & 1 deletion pkgs/desktops/gnome-3/core/gnome-keyring/default.nix
Original file line number Diff line number Diff line change
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
patchShebangs build
'';

doCheck = true;
doCheck = !stdenv.isi686; # https://github.com/NixOS/nixpkgs/issues/51121
# In 3.20.1, tests do not support Python 3
checkInputs = [ dbus python2 ];

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

buildLinux (args // rec {
version = "4.14.83";
version = "4.14.84";

# 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 = "081zxc7ikcn1hy22pw5af0dql9pq24h2anfgnykc83jfjbg2h5vh";
sha256 = "0653fg6p0wg81i4mj8n4lghn8h8jx3pkbyp6sm22p2b1rwpgj893";
};
} // (args.argsOverride or {}))
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.4";
version = "4.19.5";

# 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 = "1aj7zwrjwrjb3m3nfccykmcvhrrjsk1zchc5g4f63xd1pc35d3x3";
sha256 = "0xggarlff54l9zxm5qr14nzd514xxg8i1akyxzlb0znfkk19x0wc";
};
} // (args.argsOverride or {}))
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/kernel/linux-4.4.nix
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.164";
version = "4.4.165";
extraMeta.branch = "4.4";

src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "041w65dxsdcdpf7isis2r4xabfm9pbhfgxxx7n9d1nv7grss3d4v";
sha256 = "19zmigb1avq63n0cbvsqaw9ygddwx13mrvl80p92abw7ns26b2va";
};
} // (args.argsOverride or {}))
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/kernel/linux-4.9.nix
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.140";
version = "4.9.141";
extraMeta.branch = "4.9";

src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "0hzrha3rh90jwxjmrh4npd0q56pf512nmb8i2p484k9cikssx27q";
sha256 = "09mc5sxzzxmks20vslimaaaw0aamjcc3lvpyjydmr78s25q5zfsp";
};
} // (args.argsOverride or {}))
10 changes: 9 additions & 1 deletion pkgs/os-specific/linux/sssd/default.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgs, glibc, augeas, dnsutils, c-ares, curl,
{ stdenv, fetchurl, fetchpatch, pkgs, glibc, augeas, dnsutils, c-ares, curl,
cyrus_sasl, ding-libs, libnl, libunistring, nss, samba, nfs-utils, doxygen,
python, python3, pam, popt, talloc, tdb, tevent, pkgconfig, ldb, openldap,
pcre, kerberos, cifs-utils, glib, keyutils, dbus, fakeroot, libxslt, libxml2,
@@ -18,6 +18,14 @@ stdenv.mkDerivation rec {
sha256 = "032ppk57qs1lnvz7pb7lw9ldwm9i1yagh9fzgqgn6na3bg61ynzy";
};

patches = [
(fetchpatch {
name = "duplicate-case-value.diff";
url = "https://github.com/SSSD/sssd/commit/1ee12b05570fcfb8.diff";
sha256 = "01y8i8cfs2gydn84097cl5fynx0db8b0vr345gh57ypp84in3ixw";
})
];

# Something is looking for <libxml/foo.h> instead of <libxml2/libxml/foo.h>
NIX_CFLAGS_COMPILE = "-I${libxml2.dev}/include/libxml2";

4 changes: 2 additions & 2 deletions pkgs/servers/dns/pdns-recursor/default.nix
Original file line number Diff line number Diff line change
@@ -8,11 +8,11 @@ with stdenv.lib;

stdenv.mkDerivation rec {
name = "pdns-recursor-${version}";
version = "4.1.7";
version = "4.1.8";

src = fetchurl {
url = "https://downloads.powerdns.com/releases/pdns-recursor-${version}.tar.bz2";
sha256 = "0syvxlfxy3h2x1kvqkj7qqk8k85y42qjq30pcqqmy69v3pymq14s";
sha256 = "1xg5swappik8v5mjyl7magw7picf5cqp6rbhckd6ijssz16qzy38";
};

nativeBuildInputs = [ pkgconfig ];
1 change: 1 addition & 0 deletions pkgs/tools/package-management/nixops/generic.nix
Original file line number Diff line number Diff line change
@@ -26,6 +26,7 @@ python2Packages.buildPythonApplication {
datadog
digital-ocean
libvirt
typing
];

doCheck = false;
6 changes: 3 additions & 3 deletions pkgs/tools/package-management/nixops/unstable.nix
Original file line number Diff line number Diff line change
@@ -5,9 +5,9 @@
# Then copy the URL to the tarball.

callPackage ./generic.nix (rec {
version = "1.6.1pre2622_f10999a";
version = "1.6.1pre2706_d5ad09c";
src = fetchurl {
url = "https://hydra.nixos.org/build/73716350/download/2/nixops-${version}.tar.bz2";
sha256 = "08886b6vxhjc3cp0ikxp920zap7wp6r92763fp785rvxrmb00rbd";
url = "https://hydra.nixos.org/build/84098258/download/2/nixops-${version}.tar.bz2";
sha256 = "0lr963a0bjrblv0d1nfl4d0p76jkq6l9xj3vxgzg38q0ld5qw345";
};
})