Merge remote-tracking branch 'gum/19.09'

2 files changed, 56 insertions, 8 deletions

diff --git a/makefu/5pkgs/default.nix b/makefu/5pkgs/default.nix
index 0f87265a9..bbd99ffe7 100644
--- a/makefu/5pkgs/default.nix
+++ b/makefu/5pkgs/default.nix
@@ -25,15 +25,15 @@ in {
       patches = [ ./custom/quodlibet/single-digit-discnumber.patch
                   ./custom/quodlibet/remove-override-warning.patch ];
     });
-    rclone = super.pkgs.stdenv.lib.overrideDerivation super.rclone (old: {
-      postInstall = old.postInstall + ''
+    #rclone = super.pkgs.stdenv.lib.overrideDerivation super.rclone (old: {
+    #  postInstall = old.postInstall + ''
 
-            $out/bin/rclone genautocomplete zsh _rclone
-            install -D -m644 _rclone $out/share/zsh/vendor-completions/_rclone
-            $out/bin/rclone genautocomplete bash _rclone
-            install -D -m644 _rclone $out/etc/bash_completion.d/rclone
-        '';
-    });
+    #        $out/bin/rclone genautocomplete zsh _rclone
+    #        install -D -m644 _rclone $out/share/zsh/vendor-completions/_rclone
+    #        $out/bin/rclone genautocomplete bash _rclone
+    #        install -D -m644 _rclone $out/etc/bash_completion.d/rclone
+    #    '';
+    #});
     alsa-hdspconf = callPackage ./custom/alsa-tools { alsaToolTarget="hdspconf";};
     alsa-hdspmixer = callPackage ./custom/alsa-tools { alsaToolTarget="hdspmixer";};
     alsa-hdsploader = callPackage ./custom/alsa-tools { alsaToolTarget="hdsploader";};
diff --git a/makefu/5pkgs/uhub/default.nix b/makefu/5pkgs/uhub/default.nix
new file mode 100644
index 000000000..66dfebc3b
--- /dev/null
+++ b/makefu/5pkgs/uhub/default.nix
@@ -0,0 +1,48 @@
+{ stdenv, fetchpatch, fetchFromGitHub, cmake, openssl, sqlite, pkgconfig, systemd
+, tlsSupport ? false }:
+
+assert tlsSupport -> openssl != null;
+
+stdenv.mkDerivation rec {
+  pname = "uhub";
+  version = "2019-06-18";
+
+  src = fetchFromGitHub {
+    owner = "janvidar";
+    repo = "uhub";
+    rev = "78a703924064a92cedeb0a5aab5a80d8f77db73e";
+    sha256 = "1dqmj08salhbcdlkglbi03hn9jzgmhjqlb0iysafpzrrwi0mca1z";
+  };
+
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ cmake sqlite systemd ] ++ stdenv.lib.optional tlsSupport openssl;
+
+  outputs = [ "out"
+    "mod_example"
+    "mod_welcome"
+    "mod_logging"
+    "mod_auth_simple"
+    "mod_auth_sqlite"
+    "mod_chat_history"
+    "mod_chat_only"
+    "mod_topic"
+    "mod_no_guest_downloads"
+  ];
+
+  patches = [
+    <nixpkgs/pkgs/servers/uhub/plugin-dir.patch>
+  ];
+
+  cmakeFlags = ''
+    -DSYSTEMD_SUPPORT=ON
+    ${if tlsSupport then "-DSSL_SUPPORT=ON" else "-DSSL_SUPPORT=OFF"}
+  '';
+
+  meta = with stdenv.lib; {
+    description = "High performance peer-to-peer hub for the ADC network";
+    homepage = https://www.uhub.org/;
+    license = licenses.gpl3;
+    maintainers = [ maintainers.ehmry ];
+    platforms = platforms.unix;
+  };
+}