Merge remote-tracking branch 'upstream/master' into HEAD

pkgs/tools/misc/ckb/default.nix

@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, substituteAll, libudev, pkgconfig, qtbase, qmake, zlib, kmod }:
 
 stdenv.mkDerivation rec {
-  version = "0.2.8";
+  version = "0.2.9";
   name = "ckb-next-${version}";
 
   src = fetchFromGitHub {
-    owner = "mattanger";
+    owner = "ckb-next";
     repo = "ckb-next";
     rev = "v${version}";
-    sha256 = "0b3h1d54mdyfcx46zvsd7dfqf2656h4jjkiw044170gnfdzxjb3w";
+    sha256 = "0hl41znyhp3k5l9rcgz0gig36gsg95ivrs1dyngv45q9jkr6fchm";
   };
 
   buildInputs = [
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Driver and configuration tool for Corsair keyboards and mice";
-    homepage = https://github.com/mattanger/ckb-next;
+    homepage = https://github.com/ckb-next/ckb-next;
     license = licenses.gpl2;
     platforms = platforms.linux;
     maintainers = with maintainers; [ kierdavis ];

pkgs/tools/misc/youtube-dl/default.nix

@@ -16,11 +16,11 @@ with stdenv.lib;
 buildPythonApplication rec {
 
   name = "youtube-dl-${version}";
-  version = "2018.01.14";
+  version = "2018.01.21";
 
   src = fetchurl {
     url = "https://yt-dl.org/downloads/${version}/${name}.tar.gz";
-    sha256 = "0pl7ja7xg47mns96s65d534hq4y9n6d5xmhj3n2b9nylfshdpzbb";
+    sha256 = "14ggjxnhc2sxc93h7d5k3z4n35n5q3ffsif97np0ar93x5z3zgn5";
   };
 
   nativeBuildInputs = [ makeWrapper ];