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, 25 insertions, 10 deletions

diff --git a/nixpkgs/pkgs/servers/unfs3/default.nix b/nixpkgs/pkgs/servers/unfs3/default.nix
index 363856a58423..afd1ac14970b 100644
--- a/nixpkgs/pkgs/servers/unfs3/default.nix
+++ b/nixpkgs/pkgs/servers/unfs3/default.nix
@@ -1,15 +1,27 @@
-{ fetchurl, lib, stdenv, flex, bison }:
+{ fetchFromGitHub
+, lib
+, stdenv
+, flex
+, bison
+, autoreconfHook
+, pkg-config
+, libtirpc
+}:
 
 stdenv.mkDerivation rec {
   pname = "unfs3";
-  version = "0.9.22";
+  version = "0.10.0";
 
-  src = fetchurl {
-    url = "mirror://sourceforge/unfs3/${pname}-${version}.tar.gz";
-    sha256 = "076zkyqkn56q0a8n3h65n1a68fknk4hrrp6mbhajq5s1wp5248j8";
+  src = fetchFromGitHub {
+    owner = "unfs3";
+    repo = pname;
+    rev = "refs/tags/${pname}-${version}";
+    hash = "sha256-5iAriIutBhwyZVS7AG2fnkrHOI7pNAKfYv062Cy0WXw=";
   };
 
-  nativeBuildInputs = [ flex bison ];
+  nativeBuildInputs = [ flex bison autoreconfHook pkg-config ];
+
+  buildInputs = [ libtirpc ];
 
   configureFlags = [ "--disable-shared" ];
 
@@ -25,13 +37,16 @@ stdenv.mkDerivation rec {
          server.
       '';
 
-    homepage = "http://unfs3.sourceforge.net/";
+    # The old http://unfs3.sourceforge.net/ has a <meta>
+    # http-equiv="refresh" pointing here, so we can assume that
+    # whoever controls the old URL approves of the "unfs3" github
+    # account.
+    homepage = "https://unfs3.github.io/";
+    changelog = "https://raw.githubusercontent.com/unfs3/unfs3/unfs3-${version}/NEWS";
+    mainProgram = "unfsd";
 
     license = lib.licenses.bsd3;
     platforms = lib.platforms.unix;
     maintainers = [ ];
-
-    # https://github.com/unfs3/unfs3/issues/13
-    broken = true;
   };
 }