summaryrefslogtreecommitdiffstats
path: root/makefu/5pkgs
diff options
context:
space:
mode:
authorlassulus <lassulus@lassul.us>2021-12-08 08:13:30 +0100
committerlassulus <lassulus@lassul.us>2021-12-08 08:13:30 +0100
commit503c0176c1efca72e62ac3b0fee040d776108495 (patch)
tree78b3e8d2499192ec67343ee0eca13e95398dd3ba /makefu/5pkgs
parent8d2f6fba252d6885c458c55ba45de8cc8a828ee6 (diff)
parent78930db930a3f222feb72d344ff4f9f581bcfad9 (diff)
Merge remote-tracking branch 'gum/21.11' into 21.11
Diffstat (limited to 'makefu/5pkgs')
-rw-r--r--makefu/5pkgs/drozer/default.nix1
-rw-r--r--makefu/5pkgs/uhub/default.nix48
2 files changed, 1 insertions, 48 deletions
diff --git a/makefu/5pkgs/drozer/default.nix b/makefu/5pkgs/drozer/default.nix
index 1f353e477..22d720f33 100644
--- a/makefu/5pkgs/drozer/default.nix
+++ b/makefu/5pkgs/drozer/default.nix
@@ -30,5 +30,6 @@ pythonPackages.buildPythonApplication rec {
homepage = https://github.com/mwrlabs/drozer/;
description = "The Leading Security Assessment Framework for Android";
license = lib.licenses.bsd2;
+ broken = true;
};
}
diff --git a/makefu/5pkgs/uhub/default.nix b/makefu/5pkgs/uhub/default.nix
deleted file mode 100644
index e0ee035e4..000000000
--- a/makefu/5pkgs/uhub/default.nix
+++ /dev/null
@@ -1,48 +0,0 @@
-{ stdenv, lib, 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 ] ++ 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 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;
- };
-}