diff options
Diffstat (limited to 'makefu/5pkgs')
22 files changed, 60 insertions, 106 deletions
diff --git a/makefu/5pkgs/beef/default.nix b/makefu/5pkgs/beef/default.nix index d444dbded..c99577caf 100644 --- a/makefu/5pkgs/beef/default.nix +++ b/makefu/5pkgs/beef/default.nix @@ -1,4 +1,4 @@ -{ stdenv, bundlerEnv, ruby, fetchFromGitHub, nodejs }: +{ stdenv, lib, bundlerEnv, ruby, fetchFromGitHub, nodejs }: # nix-shell --command "bundler install && bundix" in the clone, copy gemset.nix, Gemfile and Gemfile.lock let gems = bundlerEnv { @@ -35,7 +35,7 @@ EOF chmod +x $bin ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = https://beefproject.com/; description = "The Browser Exploitation Framework"; platforms = platforms.linux; diff --git a/makefu/5pkgs/bintray-upload/default.nix b/makefu/5pkgs/bintray-upload/default.nix index 099b8ca88..725ced12d 100644 --- a/makefu/5pkgs/bintray-upload/default.nix +++ b/makefu/5pkgs/bintray-upload/default.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: +{ pkgs, lib, ... }: pkgs.python3Packages.buildPythonPackage rec { name = "bintray-upload-${version}"; @@ -14,6 +14,6 @@ pkgs.python3Packages.buildPythonPackage rec { meta = { description = "Simple BinTray utility for uploading packages"; - license = pkgs.stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }; } diff --git a/makefu/5pkgs/cmpforopenssl/default.nix b/makefu/5pkgs/cmpforopenssl/default.nix index 3b9a20098..b8934357a 100644 --- a/makefu/5pkgs/cmpforopenssl/default.nix +++ b/makefu/5pkgs/cmpforopenssl/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchurl, buildPackages, perl, fetchgit +{ stdenv, lib, fetchurl, buildPackages, perl, fetchgit , hostPlatform }: -with stdenv.lib; +with lib; let @@ -70,8 +70,8 @@ let meta = { homepage = https://sourceforge.net/p/cmpforopenssl ; description = "A cryptographic library that implements the SSL and TLS protocols"; - platforms = stdenv.lib.platforms.all; - maintainers = [ stdenv.lib.maintainers.makefu ]; + platforms = lib.platforms.all; + maintainers = [ lib.maintainers.makefu ]; priority = 0; # resolves collision with ‘man-pages’ }; }; diff --git a/makefu/5pkgs/custom/alsa-tools/default.nix b/makefu/5pkgs/custom/alsa-tools/default.nix index 5134c10ec..386b08704 100644 --- a/makefu/5pkgs/custom/alsa-tools/default.nix +++ b/makefu/5pkgs/custom/alsa-tools/default.nix @@ -1,4 +1,4 @@ -{stdenv,alsaToolTarget,fetchurl, alsaLib, ncurses, fltk13, gtk3}: +{stdenv, lib, alsaToolTarget,fetchurl, alsaLib, ncurses, fltk13, gtk3}: stdenv.mkDerivation rec { name = "alsa-${alsaToolTarget}-${version}"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { homepage = http://www.alsa-project.org/; description = "ALSA tools - ${name}"; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.makefu ]; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.makefu ]; }; } diff --git a/makefu/5pkgs/custom/qcma/default.nix b/makefu/5pkgs/custom/qcma/default.nix index dfb57c880..670822f33 100644 --- a/makefu/5pkgs/custom/qcma/default.nix +++ b/makefu/5pkgs/custom/qcma/default.nix @@ -22,9 +22,9 @@ let meta = { description = "Content Manager Assistant for the PS Vita"; homepage = https://github.com/codestation/qcma; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ makefu ]; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ makefu ]; }; }; in stdenv.mkDerivation rec { @@ -50,8 +50,8 @@ in stdenv.mkDerivation rec { meta = { description = "Content Manager Assistant for the PS Vita"; homepage = https://github.com/codestation/qcma; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ makefu ]; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ makefu ]; }; } diff --git a/makefu/5pkgs/debmirror/default.nix b/makefu/5pkgs/debmirror/default.nix index d1f007de6..69c29481d 100644 --- a/makefu/5pkgs/debmirror/default.nix +++ b/makefu/5pkgs/debmirror/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgs, fetchgit }: +{ stdenv, lib, pkgs, fetchgit }: pkgs.perlPackages.buildPerlPackage rec { pname = "debmirror"; @@ -34,8 +34,8 @@ pkgs.perlPackages.buildPerlPackage rec { meta = { description = "mirror apt repos"; homepage = https://tracker.debian.org/pkg/debmirror; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ makefu ]; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ makefu ]; }; } diff --git a/makefu/5pkgs/default.nix b/makefu/5pkgs/default.nix index 2d54455e6..0040b2786 100644 --- a/makefu/5pkgs/default.nix +++ b/makefu/5pkgs/default.nix @@ -20,12 +20,12 @@ with super.lib; with builtins; let (filterAttrs (_: eq "directory") (readDir path)); in { - quodlibet = super.pkgs.stdenv.lib.overrideDerivation super.quodlibet (old: { + quodlibet = super.pkgs.lib.overrideDerivation super.quodlibet (old: { doCheck = false; # 1 error because of warnings (possibly upstream) patches = [ ./custom/quodlibet/single-digit-discnumber.patch ./custom/quodlibet/remove-override-warning.patch ]; }); - #rclone = super.pkgs.stdenv.lib.overrideDerivation super.rclone (old: { + #rclone = super.pkgs.lib.overrideDerivation super.rclone (old: { # postInstall = old.postInstall + '' # $out/bin/rclone genautocomplete zsh _rclone diff --git a/makefu/5pkgs/devpi/default.nix b/makefu/5pkgs/devpi/default.nix index 6515ea3d1..ac79482f4 100644 --- a/makefu/5pkgs/devpi/default.nix +++ b/makefu/5pkgs/devpi/default.nix @@ -1,5 +1,5 @@ { pkgs ? import <nixpkgs> {} }: -with pkgs.stdenv.lib; +with pkgs.lib; let readme-renderer = pkgs.python3Packages.buildPythonPackage rec { 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/gen-oath-safe/default.nix b/makefu/5pkgs/gen-oath-safe/default.nix index bad4b08a8..bdd48f407 100644 --- a/makefu/5pkgs/gen-oath-safe/default.nix +++ b/makefu/5pkgs/gen-oath-safe/default.nix @@ -1,4 +1,4 @@ -{ coreutils, makeWrapper, openssl, libcaca, qrencode, fetchFromGitHub, yubikey-manager, python, stdenv, ... }: +{ coreutils, makeWrapper, openssl, libcaca, qrencode, fetchFromGitHub, yubikey-manager, python, stdenv, lib, ... }: stdenv.mkDerivation { name = "gen-oath-safe-2017-06-30"; @@ -19,7 +19,7 @@ stdenv.mkDerivation { installPhase = let - path = stdenv.lib.makeBinPath [ + path = lib.makeBinPath [ coreutils openssl qrencode diff --git a/makefu/5pkgs/kalauerbot/default.nix b/makefu/5pkgs/kalauerbot/default.nix index f8ad7c12d..42de86d50 100644 --- a/makefu/5pkgs/kalauerbot/default.nix +++ b/makefu/5pkgs/kalauerbot/default.nix @@ -1,4 +1,4 @@ -{ stdenv, python3, fetchgit }: +{ stdenv, lib, python3, fetchgit }: python3.pkgs.buildPythonPackage rec { name = "kalauerbot"; rev = "f244b35"; @@ -9,12 +9,12 @@ rev = "f244b35"; }; propagatedBuildInputs = with python3.pkgs;[ (callPackage ./python-matrixbot.nix { - matrix-client = (stdenv.lib.overrideDerivation matrix-client (self: { + matrix-client = (lib.overrideDerivation matrix-client (self: { patches = [ ./badsync.patch ]; })); }) - (stdenv.lib.overrideDerivation googletrans (self: { + (lib.overrideDerivation googletrans (self: { patches = [ ./translate.patch ]; })) ]; diff --git a/makefu/5pkgs/logstash-input-rss/default.nix b/makefu/5pkgs/logstash-input-rss/default.nix index af66359ef..ca9be15ce 100644 --- a/makefu/5pkgs/logstash-input-rss/default.nix +++ b/makefu/5pkgs/logstash-input-rss/default.nix @@ -24,8 +24,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "logstash output plugin"; homepage = https://github.com/logstash-plugins/logstash-input-rss; - license = stdenv.lib.licenses.asl20; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.asl20; + platforms = lib.platforms.unix; maintainers = with maintainers; [ makefu ]; }; } diff --git a/makefu/5pkgs/logstash-output-exec/default.nix b/makefu/5pkgs/logstash-output-exec/default.nix index d1de851c7..de85545a7 100644 --- a/makefu/5pkgs/logstash-output-exec/default.nix +++ b/makefu/5pkgs/logstash-output-exec/default.nix @@ -25,8 +25,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "logstash output plugin"; homepage = https://github.com/logstash-plugins/logstash-output-exec; - license = stdenv.lib.licenses.asl20; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.asl20; + platforms = lib.platforms.unix; maintainers = with maintainers; [ makefu ]; }; } diff --git a/makefu/5pkgs/novnc/default.nix b/makefu/5pkgs/novnc/default.nix index 7da8e9be1..b3b5ed0d4 100644 --- a/makefu/5pkgs/novnc/default.nix +++ b/makefu/5pkgs/novnc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgs }: +{ stdenv, lib, fetchurl, pkgs }: # source: https://github.com/hyphon81/Nixtack/blob/master/noVNC/noVNC.nix let in @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { url = "https://github.com/novnc/noVNC/archive/v${version}.tar.gz"; sha256 = "16ygbdzdmnfg9a26d9il4a6fr16qmq0ix9imfbpzl0drfbj7z8kh"; }; - p = stdenv.lib.makeBinPath [ pkgs.nettools pkgs.python27Packages.websockify + p = lib.makeBinPath [ pkgs.nettools pkgs.python27Packages.websockify pkgs.coreutils pkgs.which pkgs.procps ]; patchPhase = '' sed -i '1aset -efu\nexport PATH=${p}\n' utils/launch.sh @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { cp vnc_auto.html $out ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = http://novnc.com/info.html; repositories.git = git://github.com/novnc/noVNC.git; description = '' diff --git a/makefu/5pkgs/ns-atmosphere-programmer/default.nix b/makefu/5pkgs/ns-atmosphere-programmer/default.nix index 88a408578..c17e0ac76 100644 --- a/makefu/5pkgs/ns-atmosphere-programmer/default.nix +++ b/makefu/5pkgs/ns-atmosphere-programmer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip +{ stdenv, fetchzip, lib , makeWrapper , autoPatchelfHook , xlibs @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { dontStrip = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Payload programmer for ns-atmosphere injector for nintendo switch"; homepage = http://www.ns-atmosphere.com; maintainers = [ maintainers.makefu ]; diff --git a/makefu/5pkgs/nx_game_info/default.nix b/makefu/5pkgs/nx_game_info/default.nix index 89880d59c..bf64dc90e 100644 --- a/makefu/5pkgs/nx_game_info/default.nix +++ b/makefu/5pkgs/nx_game_info/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl , mono , unzip +{ lib, stdenv, fetchurl , mono , unzip, }: stdenv.mkDerivation rec { pname = "NX_Game_Info"; @@ -25,8 +25,8 @@ stdenv.mkDerivation rec { meta = { description = "Tool to read information from Nintendo Switch game files"; homepage = https://github.com/garoxas/NX_Game_Info; - license = stdenv.lib.licenses.gpl3; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ makefu ]; + license = lib.licenses.gpl3; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ makefu ]; }; } diff --git a/makefu/5pkgs/pavumeter/default.nix b/makefu/5pkgs/pavumeter/default.nix index b1822530a..03f179cc1 100644 --- a/makefu/5pkgs/pavumeter/default.nix +++ b/makefu/5pkgs/pavumeter/default.nix @@ -23,8 +23,8 @@ stdenv.mkDerivation rec { meta = { description = "PulseAudio volumene meter"; homepage = http://0pointer.de/lennart/projects/pavumeter; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ makefu ]; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ makefu ]; }; } diff --git a/makefu/5pkgs/studio-link/default.nix b/makefu/5pkgs/studio-link/default.nix index 3a02e365c..4189846d5 100644 --- a/makefu/5pkgs/studio-link/default.nix +++ b/makefu/5pkgs/studio-link/default.nix @@ -1,4 +1,5 @@ { stdenv +, lib , fetchurl , alsaLib , unzip @@ -34,7 +35,7 @@ stdenv.mkDerivation rec { install -m755 -D studio-link-standalone-v${version} $out/bin/studio-link ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = https://studio-link.com; description = "Voip transfer"; platforms = platforms.linux; diff --git a/makefu/5pkgs/uhub/default.nix b/makefu/5pkgs/uhub/default.nix deleted file mode 100644 index 66dfebc3b..000000000 --- a/makefu/5pkgs/uhub/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ 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; - }; -} diff --git a/makefu/5pkgs/v4l2loopback-dc/default.nix b/makefu/5pkgs/v4l2loopback-dc/default.nix index 2bb9d3d0b..416831e5e 100644 --- a/makefu/5pkgs/v4l2loopback-dc/default.nix +++ b/makefu/5pkgs/v4l2loopback-dc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, kernel, kmod }: +{ stdenv, lib, fetchFromGitHub, kernel, kmod }: stdenv.mkDerivation rec { name = "v4l2loopback-dc-${version}-${kernel.version}"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { "INSTALL_MOD_PATH=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A kernel module to create V4L2 loopback devices"; homepage = "https://github.com/aramg/droidcam"; license = licenses.gpl2; diff --git a/makefu/5pkgs/xdcc-dl/default.nix b/makefu/5pkgs/xdcc-dl/default.nix index d9fdc3d2b..26264beb1 100644 --- a/makefu/5pkgs/xdcc-dl/default.nix +++ b/makefu/5pkgs/xdcc-dl/default.nix @@ -11,7 +11,7 @@ let inherit (pkgs) makeWrapper; - inherit (pkgs.stdenv.lib) fix' extends inNixShell; + inherit (pkgs.lib) fix' extends inNixShell; pythonPackages = import "${toString pkgs.path}/pkgs/top-level/python-packages.nix" { @@ -73,7 +73,7 @@ let propagatedBuildInputs = [ self."six" ]; - meta = with pkgs.stdenv.lib; { + meta = with pkgs.lib; { homepage = ""; license = licenses.mit; description = "Run JavaScript code from Python"; @@ -91,7 +91,7 @@ let propagatedBuildInputs = [ self."beautifulsoup4" ]; - meta = with pkgs.stdenv.lib; { + meta = with pkgs.lib; { homepage = ""; license = licenses.mit; description = "Screen-scraping library"; @@ -106,7 +106,7 @@ let doCheck = commonDoCheck; buildInputs = commonBuildInputs; propagatedBuildInputs = [ ]; - meta = with pkgs.stdenv.lib; { + meta = with pkgs.lib; { homepage = ""; license = "MPL-2.0"; description = "Python package for providing Mozilla's CA Bundle."; @@ -124,7 +124,7 @@ let self."PyExecJS" self."requests" ]; - meta = with pkgs.stdenv.lib; { + meta = with pkgs.lib; { homepage = ""; license = ""; description = "A simple Python module to bypass Cloudflare's anti-bot page. See https://github.com/Anorov/cloudflare-scrape for more information."; @@ -139,7 +139,7 @@ let doCheck = commonDoCheck; buildInputs = commonBuildInputs; propagatedBuildInputs = [ ]; - meta = with pkgs.stdenv.lib; { + meta = with pkgs.lib; { homepage = ""; license = licenses.psfl; description = "Type Hints for Python"; @@ -155,7 +155,7 @@ let doCheck = commonDoCheck; buildInputs = commonBuildInputs; propagatedBuildInputs = [ ]; - meta = with pkgs.stdenv.lib; { + meta = with pkgs.lib; { homepage = ""; license = licenses.lgpl2; description = "A full-featured console (xterm et al.) user interface library"; @@ -177,7 +177,7 @@ let self."typing" self."urwid" ]; - meta = with pkgs.stdenv.lib; { + meta = with pkgs.lib; { homepage = ""; license = licenses.gpl3; description = "An XDCC File Downloader based on the irclib framework"; diff --git a/makefu/5pkgs/xmm7360/default.nix b/makefu/5pkgs/xmm7360/default.nix index 76cdc2cbf..3c4eab345 100644 --- a/makefu/5pkgs/xmm7360/default.nix +++ b/makefu/5pkgs/xmm7360/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python3, kernel, kmod }: +{ stdenv, lib, fetchFromGitHub, python3, kernel, kmod }: let py = python3.withPackages (p: [ p.ConfigArgParse p.pyroute2 p.dbus-python ]); in @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { install -D open_xdatachannel $out/bin/open_xdatachannel ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A kernel module to create V4L2 loopback devices"; homepage = "https://github.com/aramg/droidcam"; license = licenses.gpl2; |