Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs

Conflicts:
	nixpkgs/nixos/modules/config/console.nix
	nixpkgs/nixos/modules/services/mail/mailman.nix
	nixpkgs/nixos/modules/services/mail/public-inbox.nix
	nixpkgs/nixos/modules/services/mail/rss2email.nix
	nixpkgs/nixos/modules/services/networking/ssh/sshd.nix
	nixpkgs/pkgs/applications/networking/instant-messengers/dino/default.nix
	nixpkgs/pkgs/applications/networking/irc/weechat/default.nix
	nixpkgs/pkgs/applications/window-managers/sway/default.nix
	nixpkgs/pkgs/build-support/go/module.nix
	nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix
	nixpkgs/pkgs/development/interpreters/python/default.nix
	nixpkgs/pkgs/development/node-packages/overrides.nix
	nixpkgs/pkgs/development/tools/b4/default.nix
	nixpkgs/pkgs/servers/dict/dictd-db.nix
	nixpkgs/pkgs/servers/mail/public-inbox/default.nix
	nixpkgs/pkgs/tools/security/pinentry/default.nix
	nixpkgs/pkgs/tools/text/unoconv/default.nix
	nixpkgs/pkgs/top-level/all-packages.nix

1 files changed, 26 insertions, 9 deletions

diff --git a/nixpkgs/pkgs/tools/networking/linux-router/default.nix b/nixpkgs/pkgs/tools/networking/linux-router/default.nix
index 1f274d640dc7..acf02a2cc211 100644
--- a/nixpkgs/pkgs/tools/networking/linux-router/default.nix
+++ b/nixpkgs/pkgs/tools/networking/linux-router/default.nix
@@ -1,8 +1,21 @@
-{ stdenv, lib, fetchFromGitHub, makeWrapper
+{ lib
+, stdenv
+, fetchFromGitHub
+, makeWrapper
 
 # --- Runtime Dependencies ---
-, bash, procps, iproute2, dnsmasq, iptables
-, coreutils, flock, gawk, getopt, gnugrep, gnused, which
+, bash
+, procps
+, iproute2
+, dnsmasq
+, iptables
+, coreutils
+, flock
+, gawk
+, getopt
+, gnugrep
+, gnused
+, which
 # `nmcli` is not required for create_ap.
 # Use NetworkManager by default because it is very likely already present
 , useNetworkManager ? true
@@ -10,7 +23,8 @@
 
 # --- WiFi Hotspot Dependencies ---
 , useWifiDependencies ? true
-, hostapd, iw
+, hostapd
+, iw
 # You only need this if 'iw' can not recognize your adapter.
 , useWirelessTools ? true
 , wirelesstools # for iwconfig
@@ -26,16 +40,18 @@
 
 stdenv.mkDerivation rec {
   pname = "linux-router";
-  version = "0.6.6";
+  version = "0.6.7";
 
   src = fetchFromGitHub {
     owner = "garywill";
     repo = "linux-router";
-    rev = "${version}";
-    sha256 = "sha256-QBxlqKNaCUMVkm8rVTZ5z6tTN9WxgDQxeNkbgCe9KEg=";
+    rev = "refs/tags/${version}";
+    hash = "sha256-Ote/arHCU6qiTXdK2RXv9848aeW6rcBsrb6nfxIzQLs=";
   };
 
-  nativeBuildInputs = [ makeWrapper ];
+  nativeBuildInputs = [
+    makeWrapper
+  ];
 
   dontBuild = true;
 
@@ -74,7 +90,8 @@ stdenv.mkDerivation rec {
       - DNS proxy
       - Compatible with NetworkManager (automatically set interface as unmanaged)
     '';
-    license = licenses.lgpl21;
+    changelog = "https://github.com/garywill/linux-router/releases/tag/${version}";
+    license = licenses.lgpl21Only;
     maintainers = with maintainers; [ x3ro ];
     platforms = platforms.linux;
   };