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: 9ec7625cee53
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: 5f707e8e06fb
Choose a head ref

Commits on Jul 3, 2019

  1. Copy the full SHA
    b4bc984 View commit details

Commits on Jul 4, 2019

  1. Copy the full SHA
    1956582 View commit details
  2. Copy the full SHA
    21ac8a1 View commit details

Commits on Jul 9, 2019

  1. Copy the full SHA
    647761e View commit details
  2. Merge #63928: llvm_7: disable libpfm on aarch64

    (cherry picked from commit 74d2452)
    I've seen no (negative) feedback so far, and we do need something here:
    https://hydra.nixos.org/eval/1529346
    (There's no llvm_8 on this branch so far.)
    vcunat committed Jul 9, 2019
    Copy the full SHA
    ed3895a View commit details
  3. mautrix-appservice: 0.3.10.dev1 -> 0.3.11

    (cherry picked from commit f88bb6c)
    Signed-off-by: Maximilian Bosch <maximilian@mbosch.me>
    nyanloutre authored and Ma27 committed Jul 9, 2019
    Copy the full SHA
    ee942c3 View commit details
  4. telethon: 1.6.2 -> 1.8.0

    (cherry picked from commit 91e311d)
    Signed-off-by: Maximilian Bosch <maximilian@mbosch.me>
    nyanloutre authored and Ma27 committed Jul 9, 2019
    Copy the full SHA
    a2e4386 View commit details
  5. pythonPackages.telethon: 1.8.0 -> 1.9.0

    (cherry picked from commit 99f0083)
    Signed-off-by: Maximilian Bosch <maximilian@mbosch.me>
    nyanloutre authored and Ma27 committed Jul 9, 2019
    Copy the full SHA
    41d303c View commit details
  6. mautrix-telegram: 0.5.2 -> 0.6.0

    (cherry picked from commit baddb2a)
    Signed-off-by: Maximilian Bosch <maximilian@mbosch.me>
    nyanloutre authored and Ma27 committed Jul 9, 2019
    Copy the full SHA
    28e64db View commit details

Commits on Jul 10, 2019

  1. Copy the full SHA
    009d35a View commit details
  2. linux: 4.19.57 -> 4.19.58

    NeQuissimus committed Jul 10, 2019
    Copy the full SHA
    824a5d2 View commit details
  3. linux: 4.4.184 -> 4.4.185

    NeQuissimus committed Jul 10, 2019
    Copy the full SHA
    0f617ca View commit details
  4. linux: 4.9.184 -> 4.9.185

    NeQuissimus committed Jul 10, 2019
    Copy the full SHA
    a9a0f33 View commit details
  5. linux: 5.1.16 -> 5.1.17

    NeQuissimus committed Jul 10, 2019
    Copy the full SHA
    021f943 View commit details
  6. knot-resolver: 3.2.1 -> 4.0.0

    https://lists.nic.cz/pipermail/knot-resolver-users/2019/000136.html
    
    Similar commit worked fine for me, including the nixos service.
    I'd like to still improve the service to support easy passing of sockets
    to http module.
    
    (cherry picked from commit 9efdd2e)
    I'm really sorry to pull a "major" update, but the upcoming security
    fixes are rather hard to backport correctly.  Please contact me in case
    you run into problems when upgrading.
    vcunat committed Jul 10, 2019
    Copy the full SHA
    6c23396 View commit details
  7. Copy the full SHA
    2605385 View commit details
  8. knot-resolver: 4.0.0 -> 4.1.0 (security)

    https://lists.nic.cz/pipermail/knot-resolver-users/2019/000189.html
    Fixes DNS spoofing problems: CVE-2019-10190 CVE-2019-10191
    but also minor things, adds new features, etc.
    In particular aarch64 should work now, at least as long as not using
    some lua library that suffers from the same problem with lightuserdata,
    e.g. cqueues does suffer from this.
    
    (cherry picked from commit f15625a)
    vcunat committed Jul 10, 2019
    Copy the full SHA
    c5d39d8 View commit details
  9. firefoxPackages.tor-browser: 8.5.2 -> 8.5.4

    (cherry picked from commit 279a001)
    SLNOS authored and joachifm committed Jul 10, 2019
    Copy the full SHA
    69e48a1 View commit details
  10. tor-browser-bundle-bin: 8.5.3 -> 8.5.4

    (cherry picked from commit 5f6b008)
    joachifm committed Jul 10, 2019
    Copy the full SHA
    2f8c302 View commit details
  11. electrum: 3.3.6 -> 3.3.7

    (cherry picked from commit fcd6773)
    dtzWill authored and joachifm committed Jul 10, 2019
    Copy the full SHA
    ecc64b3 View commit details

Commits on Jul 11, 2019

  1. Copy the full SHA
    9fde014 View commit details
  2. python37Packages.aiorpcx: 0.17.0 -> 0.18.3

    Semi-automatic update generated by
    https://github.com/ryantm/nixpkgs-update tools. This update was made
    based on information from
    https://repology.org/metapackage/python3.7-aiorpcx/versions
    
    (cherry picked from commit 54fa84b)
    
    Required by electrum 3.3.7
    r-ryantm authored and joachifm committed Jul 11, 2019
    Copy the full SHA
    f0fdbd8 View commit details

Commits on Jul 12, 2019

  1. youtube-dl: 2019.07.02 -> 2019.07.12

    (cherry picked from commit 3458436)
    xrelkd authored and worldofpeace committed Jul 12, 2019
    Copy the full SHA
    88f069e View commit details
  2. gitlab-runner: 11.11.2 -> 12.0.2

    12.0.1 fixes an issue with git submodule fetching
    12.0.2 fixes an issue with concurrent updated
    
    (cherry picked from commit e928aa6)
    bachp authored and flokli committed Jul 12, 2019
    Copy the full SHA
    d10e680 View commit details
  3. Merge knot-resolver: 3.2.1 -> 4.1.0 (security)

    19.03: I'm really sorry to pull a "major" update, but the security
    fixes are rather hard to backport correctly.  Please contact me in case
    you run into problems when upgrading.
    vcunat committed Jul 12, 2019
    Copy the full SHA
    9354bc9 View commit details
  4. mautrix-whatsapp: 2019-02-24 -> 2019-07-04

    Bump to the latest revision of `mautrix-whatsapp` to regain
    compatibility with matrix-synapse 0.99.5.
    
    Please note that it was necessary to alter some of the sources in
    `deps.nix`, please read the comment at the top of the file for further
    information.
    
    (cherry picked from commit b86a3e4)
    Ma27 committed Jul 12, 2019
    Copy the full SHA
    5f707e8 View commit details
7 changes: 5 additions & 2 deletions nixos/modules/services/networking/kresd.nix
Original file line number Diff line number Diff line change
@@ -80,8 +80,11 @@ in
# Syntax depends on being IPv6 or IPv4.
(iface: if elem ":" (stringToCharacters iface) then "[${iface}]:53" else "${iface}:53")
cfg.interfaces;
socketConfig.ListenDatagram = listenStreams;
socketConfig.FreeBind = true;
socketConfig = {
ListenDatagram = listenStreams;
FreeBind = true;
FileDescriptorName = "dns";
};
};

systemd.sockets.kresd-tls = mkIf (cfg.listenTLS != []) rec {
6 changes: 3 additions & 3 deletions pkgs/applications/misc/electrum/default.nix
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, fetchFromGitHub, python3, python3Packages, zbar, secp256k1 }:

let
version = "3.3.6";
version = "3.3.7";

qdarkstyle = python3Packages.buildPythonPackage rec {
pname = "QDarkStyle";
@@ -18,7 +18,7 @@ let
owner = "spesmilo";
repo = "electrum";
rev = version;
sha256 = "0s8i6fn1jwk80d036n4c7csv4qnx2k15f6347kr4mllglcpa9hb3";
sha256 = "1g2kbbsi6k105q6s0la20h12gz8dzka5kdcjbdhs12jqsjfx3lr0";

extraPostFetch = ''
mv $out ./all
@@ -33,7 +33,7 @@ python3Packages.buildPythonApplication rec {

src = fetchurl {
url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz";
sha256 = "0am5ki3z0yvhrz16vp2jjy5fkxxqph0mj9qqpbw3kpql65shykwz";
sha256 = "13ahc4zqpgzmck2r663sqqgz86xsd83r5qqi26mh2vazy1i6pykz";
};

postUnpack = ''
10 changes: 5 additions & 5 deletions pkgs/applications/networking/browsers/firefox/packages.nix
Original file line number Diff line number Diff line change
@@ -237,16 +237,16 @@ in rec {
};

tor-browser-8-5 = tbcommon rec {
ffversion = "60.7.0esr";
tbversion = "8.5.2";
ffversion = "60.8.0esr";
tbversion = "8.5.4";

# FIXME: fetchFromGitHub is not ideal, unpacked source is >900Mb
src = fetchFromGitHub {
owner = "SLNOS";
repo = "tor-browser";
# branch "tor-browser-60.7.0esr-8.5-2-slnos"
rev = "b8216328bf6bf1996fcd794d4531689a7c373a2f";
sha256 = "0zmqam3c91iww33jpfyl6q6wacj20nqkfzyqryalfvnvx3zi0i1q";
# branch "tor-browser-60.8.0esr-8.5-1-slnos"
rev = "9ec7e4832a68ba3a77f5e8e21dc930a25757f55d";
sha256 = "10x9h2nm1p8cs0qnd8yjp7ly5raxagqyfjn4sj2y3i86ya5zygb9";
};
};

Original file line number Diff line number Diff line change
@@ -89,7 +89,7 @@ let
fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ];

# Upstream source
version = "8.5.3";
version = "8.5.4";

lang = "en-US";

@@ -99,15 +99,15 @@ let
"https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
"https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
];
sha256 = "15ml0azc7imlfc2h88yxpxsyrf6pxxcd1si33bfbsjh17zw1282g";
sha256 = "0nnzynk3nlnd847c8jjghs9anmr5a2hv7nk1qxigigxqa5vqy96z";
};

"i686-linux" = fetchurl {
urls = [
"https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
"https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
];
sha256 = "1zvcy44qx353qa5h90g0qigbp9xgaiq8s7a5wmhnfrfd2iw4ph7d";
sha256 = "1b34skl3hwvpy0r4l5ykgnnwhbz7cvly2gi9ib4h7lijjfafiys1";
};
};
in
Original file line number Diff line number Diff line change
@@ -4,13 +4,13 @@

stdenv.mkDerivation rec {
pname = "wingpanel-indicator-session";
version = "2.2.3";
version = "2.2.4";

src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "1y0blff02p3w23sv17yg7fq0yq0g2k8j7vjmk92k664fx72kjjzh";
sha256 = "1x2p2sjal42bspmqcg9lzixv6rnihvgmwk92gfcccrmvk8j4bx6s";
};

passthru = {
4 changes: 3 additions & 1 deletion pkgs/development/compilers/llvm/7/llvm.nix
Original file line number Diff line number Diff line change
@@ -15,7 +15,9 @@
, debugVersion ? false
, enableManpages ? false
, enableSharedLibraries ? true
, enablePFM ? !stdenv.isDarwin
, enablePFM ? !(stdenv.isDarwin
|| stdenv.isAarch64 # broken for Ampere eMAG 8180 (c2.large.arm on Packet) #56245
)
, enablePolly ? false
}:

11 changes: 10 additions & 1 deletion pkgs/development/libraries/expat/default.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchurl }:
{ stdenv, fetchurl, fetchpatch }:

stdenv.mkDerivation rec {
name = "expat-2.2.6";
@@ -8,6 +8,15 @@ stdenv.mkDerivation rec {
sha256 = "1wl1x93b5w457ddsdgj0lh7yjq4q6l7wfbgwhagkc8fm2qkkrd0p";
};

patches = [
(fetchpatch {
name = "CVE-2018-20843.patch";
url = "https://github.com/libexpat/libexpat/commit/11f8838bf99ea0a6f0b76f9760c43704d00c4ff6.patch";
sha256 = "1i7bq9sp2k5348dvbfv26bprzv6ka1abf0j5ixjaff9alndm4f19";
stripLen = 1;
})
];

outputs = [ "out" "dev" ]; # TODO: fix referrers
outputBin = "dev";

4 changes: 2 additions & 2 deletions pkgs/development/python-modules/aiorpcx/default.nix
Original file line number Diff line number Diff line change
@@ -2,12 +2,12 @@

buildPythonPackage rec {
pname = "aiorpcx";
version = "0.17.0";
version = "0.18.3";

src = fetchPypi {
inherit version;
pname = "aiorpcX";
sha256 = "14np5r75rs0v45vsv20vbzmnv3qisvm9mdllj1j9s1633cvcik0k";
sha256 = "0k545hc7wl6sh1svydzbv6x7sx5pig2pqkl3yxs9riwmvzawx9xp";
};

propagatedBuildInputs = [ attrs ];
Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@

buildPythonPackage rec {
pname = "mautrix-appservice";
version = "0.3.10.dev1";
version = "0.3.11";

src = fetchPypi {
inherit pname version;
sha256 = "ed827ff2a50b43f8125268145991d51b4a32ea4fbdd95b589ea15019b72a0bc3";
sha256 = "60192920cff75afdd096eea3a43276e33ec15f4f00bd04d2d1dda616c84f22a5";
};

propagatedBuildInputs = [
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/telethon/default.nix
Original file line number Diff line number Diff line change
@@ -2,12 +2,12 @@

buildPythonPackage rec {
pname = "telethon";
version = "1.6.2";
version = "1.9.0";

src = fetchPypi {
inherit version;
pname = "Telethon";
sha256 = "074h5gj0c330rb1nxzpqm31fp1vw7calh1cdkapbjx90j769iz18";
sha256 = "a8797ad5bfee2b350cfc9b73cbb30fc19c8f73c0db42471e0df1371b1a269edc";
};

propagatedBuildInputs = [
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{ lib, buildGoPackage, fetchFromGitLab, fetchurl }:

let
version = "11.9.2";
version = "12.0.2";
# Gitlab runner embeds some docker images these are prebuilt for arm and x86_64
docker_x86_64 = fetchurl {
url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-x86_64.tar.xz";
sha256 = "10zmaywq1vzch4a6zdvnm9kgil9ankc9napix9s9fw45wc0lw01p";
sha256 = "0b1xkksd4rgqvjahp5bf53sk887z2fxwr7rf8vqs9j9aw54zm5cn";
};

docker_arm = fetchurl {
url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-arm.tar.xz";
sha256 = "0845ylhb3i3jmi5q6aaix4hw9zdb83v5fhvif0xvvi2m7irg06lf";
sha256 = "1cjl64g3ymnrs9c3fl28aydfzf18ik4vnjcvijv28c3gm1i6chs0";
};
in
buildGoPackage rec {
@@ -29,7 +29,7 @@ buildGoPackage rec {
owner = "gitlab-org";
repo = "gitlab-runner";
rev = "v${version}";
sha256 = "00k4myca2djd6h3i83vjndahm5q1rnlkq0p69dhl5jbldwy614ph";
sha256 = "0cbh11libcyfdgrvnl1aa11x90ac7zgn1d9myc4dwmqzfdm4kdlb";
};

patches = [ ./fix-shell-path.patch ];
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.132";
version = "4.14.133";

# 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 = "0c7k5yl2h929kvbzqij0p56myp9v14im4s72wky5d9idfadg71ns";
sha256 = "005pg4f8l2qz8g6hd71pj567z91hwjwdwb37h4dbb3fj6kjl965y";
};
} // (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.57";
version = "4.19.58";

# 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 = "11rz1pfphc4zkn3fbfavn1764g3ymp4b1bfnr7b630w8smcmfz1j";
sha256 = "1waqk2ggnnaqa5pxhdbvxkkchvxxz9pbkqnr5pn5rj6h2v5644az";
};
} // (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.184";
version = "4.4.185";
extraMeta.branch = "4.4";

src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "1jn3mwnfcvhnn0bqiyabkqii3rd6w5b982w3i085qj42q0pj6hv5";
sha256 = "1ll694m5193dmwn8ys4sf2p6a6njd5pm38v862ih1iw7l3vj0l3s";
};
} // (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.184";
version = "4.9.185";
extraMeta.branch = "4.9";

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

buildLinux (args // rec {
version = "5.1.16";
version = "5.1.17";

# 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/v5.x/linux-${version}.tar.xz";
sha256 = "0gms4zkx97njzk1czsnih6jj9f6knismixxndn1h11vq7sz5agla";
sha256 = "0gf4jqmq6b66jrlygmvn2z8xif3n83yq85jldbm3r257crww6dar";
};
} // (args.argsOverride or {}))
Loading