summaryrefslogtreecommitdiffstats
path: root/makefu/5pkgs
diff options
context:
space:
mode:
authortv <tv@krebsco.de>2017-08-24 17:39:53 +0200
committertv <tv@krebsco.de>2017-08-24 17:39:53 +0200
commitfd69096a27575b9d4d87a10af1492b273dad167c (patch)
treeaa3e7dc121d3188a16a37a6751ec774abcc0df81 /makefu/5pkgs
parentb9a4e834c06bc32fa38389e13c0ec42467c0fc46 (diff)
parentfd6b42355907de5313ea3576e5d1bfa549433099 (diff)
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'makefu/5pkgs')
-rw-r--r--makefu/5pkgs/cmpforopenssl/default.nix82
-rw-r--r--makefu/5pkgs/cmpforopenssl/nix-ssl-cert-file.patch14
-rw-r--r--makefu/5pkgs/custom/alsa-tools/default.nix (renamed from makefu/5pkgs/alsa-tools/default.nix)0
-rw-r--r--makefu/5pkgs/custom/default.nix3
-rw-r--r--makefu/5pkgs/custom/inkscape/dxf_fix.patch13
-rw-r--r--makefu/5pkgs/custom/qcma/default.nix (renamed from makefu/5pkgs/qcma/default.nix)5
-rw-r--r--makefu/5pkgs/default.nix14
-rw-r--r--makefu/5pkgs/dionaea/default.nix50
-rw-r--r--makefu/5pkgs/farpd/default.nix2
-rw-r--r--makefu/5pkgs/libopencm3/default.nix30
-rw-r--r--makefu/5pkgs/logstash-output-exec/default.nix32
-rw-r--r--makefu/5pkgs/mcomix/default.nix20
-rw-r--r--makefu/5pkgs/minibar/default.nix12
-rw-r--r--makefu/5pkgs/nltk/default.nix17
-rw-r--r--makefu/5pkgs/novnc/default.nix1
-rw-r--r--makefu/5pkgs/programs-db/default.nix12
16 files changed, 298 insertions, 9 deletions
diff --git a/makefu/5pkgs/cmpforopenssl/default.nix b/makefu/5pkgs/cmpforopenssl/default.nix
new file mode 100644
index 000000000..3b9a20098
--- /dev/null
+++ b/makefu/5pkgs/cmpforopenssl/default.nix
@@ -0,0 +1,82 @@
+{ stdenv, fetchurl, buildPackages, perl, fetchgit
+, hostPlatform
+}:
+
+with stdenv.lib;
+
+let
+
+ common = args@{ rev, sha256, patches ? [] }: stdenv.mkDerivation rec {
+ name = "cmpforopenssl-${rev}";
+
+ src = fetchgit {
+ url = "https://git.code.sf.net/p/cmpforopenssl/git";
+ inherit sha256 rev;
+ fetchSubmodules = false;
+ deepClone = false;
+ };
+
+ patches =
+ (args.patches or [])
+ ++ [ ./nix-ssl-cert-file.patch ];
+
+ outputs = [ "bin" "dev" "out" "man" ];
+ setOutputFlags = false;
+ separateDebugInfo = stdenv.isLinux;
+
+ nativeBuildInputs = [ perl ];
+
+ configureScript = "./config";
+
+ configureFlags = [
+ "shared"
+ "--libdir=lib"
+ "--openssldir=etc/ssl"
+ ] ;
+
+ makeFlags = [ "MANDIR=$(man)/share/man" ];
+
+ # Parallel building is broken in OpenSSL.
+ enableParallelBuilding = false;
+
+ postInstall = ''
+ # If we're building dynamic libraries, then don't install static
+ # libraries.
+ if [ -n "$(echo $out/lib/*.so $out/lib/*.dylib $out/lib/*.dll)" ]; then
+ rm "$out/lib/"*.a
+ fi
+
+ mkdir -p $bin
+ mv $out/bin $bin/
+
+ mkdir $dev
+ mv $out/include $dev/
+
+ # remove dependency on Perl at runtime
+ rm -r $out/etc/ssl/misc
+
+ rmdir $out/etc/ssl/{certs,private}
+ '';
+
+ postFixup = ''
+ # Check to make sure the main output doesn't depend on perl
+ if grep -r '${buildPackages.perl}' $out; then
+ echo "Found an erroneous dependency on perl ^^^" >&2
+ exit 1
+ fi
+ '';
+
+
+ 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 ];
+ priority = 0; # resolves collision with ‘man-pages’
+ };
+ };
+
+in common {
+ rev = "462b3";
+ sha256 = "1h2k1c4lg27gmsyd72zrlr303jw765x8sscxblq2jwb44jag85na";
+ }
diff --git a/makefu/5pkgs/cmpforopenssl/nix-ssl-cert-file.patch b/makefu/5pkgs/cmpforopenssl/nix-ssl-cert-file.patch
new file mode 100644
index 000000000..b615f1482
--- /dev/null
+++ b/makefu/5pkgs/cmpforopenssl/nix-ssl-cert-file.patch
@@ -0,0 +1,14 @@
+diff -ru -x '*~' openssl-1.0.2j-orig/crypto/x509/by_file.c openssl-1.0.2j/crypto/x509/by_file.c
+--- openssl-1.0.2j-orig/crypto/x509/by_file.c 2016-09-26 11:49:07.000000000 +0200
++++ openssl-1.0.2j/crypto/x509/by_file.c 2016-10-13 16:54:31.400288302 +0200
+@@ -97,7 +97,9 @@
+ switch (cmd) {
+ case X509_L_FILE_LOAD:
+ if (argl == X509_FILETYPE_DEFAULT) {
+- file = (char *)getenv(X509_get_default_cert_file_env());
++ file = (char *)getenv("NIX_SSL_CERT_FILE");
++ if (!file)
++ file = (char *)getenv(X509_get_default_cert_file_env());
+ if (file)
+ ok = (X509_load_cert_crl_file(ctx, file,
+ X509_FILETYPE_PEM) != 0);
diff --git a/makefu/5pkgs/alsa-tools/default.nix b/makefu/5pkgs/custom/alsa-tools/default.nix
index 5134c10ec..5134c10ec 100644
--- a/makefu/5pkgs/alsa-tools/default.nix
+++ b/makefu/5pkgs/custom/alsa-tools/default.nix
diff --git a/makefu/5pkgs/custom/default.nix b/makefu/5pkgs/custom/default.nix
new file mode 100644
index 000000000..626938cdc
--- /dev/null
+++ b/makefu/5pkgs/custom/default.nix
@@ -0,0 +1,3 @@
+{}:
+{
+}
diff --git a/makefu/5pkgs/custom/inkscape/dxf_fix.patch b/makefu/5pkgs/custom/inkscape/dxf_fix.patch
new file mode 100644
index 000000000..5ea0a073e
--- /dev/null
+++ b/makefu/5pkgs/custom/inkscape/dxf_fix.patch
@@ -0,0 +1,13 @@
+--- ./share/extensions/dxf_outlines.py 2017-02-14 00:46:57.000000000 +0100
++++ ./share/extensions/dxf_outlines.py.new 2017-05-10 04:15:03.000000000 +0200
+@@ -340,7 +340,7 @@
+ scale = eval(self.options.units)
+ if not scale:
+ scale = 25.4/96 # if no scale is specified, assume inch as baseunit
+- h = self.unittouu(self.document.getroot().xpath('@height', namespaces=inkex.NSS)[0])
++ h = self.unittouu(self.getDocumentHeight())
+ self.groupmat = [[[scale, 0.0, 0.0], [0.0, -scale, h*scale]]]
+ doc = self.document.getroot()
+ self.process_group(doc)
+
+
diff --git a/makefu/5pkgs/qcma/default.nix b/makefu/5pkgs/custom/qcma/default.nix
index 6eb1a971d..d67cda142 100644
--- a/makefu/5pkgs/qcma/default.nix
+++ b/makefu/5pkgs/custom/qcma/default.nix
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, fetchgit, libusb, libtool, autoconf, pkgconfig, git,
-gettext, automake, libxml2 , qmakeHook, makeQtWrapper,
+gettext, automake, libxml2 , qmake,
qtbase, qttools, qtmultimedia, libnotify, ffmpeg, gdk_pixbuf }:
let
libvitamtp = stdenv.mkDerivation rec {
@@ -52,13 +52,14 @@ in stdenv.mkDerivation rec {
enableParallelBuilding = true;
buildInputs = [ gdk_pixbuf ffmpeg libnotify libvitamtp git qtmultimedia qtbase ];
- nativeBuildInputs = [ qmakeHook qttools pkgconfig makeQtWrapper ];
+ nativeBuildInputs = [ qmake qttools pkgconfig ];
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;
+ broken = true;
maintainers = with stdenv.lib.maintainers; [ makefu ];
};
}
diff --git a/makefu/5pkgs/default.nix b/makefu/5pkgs/default.nix
index bb776ef25..96975e54f 100644
--- a/makefu/5pkgs/default.nix
+++ b/makefu/5pkgs/default.nix
@@ -20,13 +20,17 @@ self: super: let
(filterAttrs (_: eq "directory") (readDir path));
in {
- alsa-hdspconf = callPackage ./alsa-tools { alsaToolTarget="hdspconf";};
- alsa-hdspmixer = callPackage ./alsa-tools { alsaToolTarget="hdspmixer";};
- alsa-hdsploader = callPackage ./alsa-tools { alsaToolTarget="hdsploader";};
+ alsa-hdspconf = callPackage ./custom/alsa-tools { alsaToolTarget="hdspconf";};
+ alsa-hdspmixer = callPackage ./custom/alsa-tools { alsaToolTarget="hdspmixer";};
+ alsa-hdsploader = callPackage ./custom/alsa-tools { alsaToolTarget="hdsploader";};
+ qcma = super.pkgs.libsForQt5.callPackage ./custom/qcma { };
inherit (callPackage ./devpi {}) devpi-web devpi-server devpi-client;
- nodemcu-uploader = callPackage ./nodemcu-uploader {};
+ nodemcu-uploader = super.pkgs.callPackage ./nodemcu-uploader {};
+ inkscape = super.pkgs.stdenv.lib.overrideDerivation super.inkscape (old: {
+ patches = [ ./custom/inkscape/dxf_fix.patch ];
+ });
pwqgen-ger = callPackage <stockholm/krebs/5pkgs/simple/passwdqc-utils> {
- wordset-file = pkgs.fetchurl {
+ wordset-file = super.pkgs.fetchurl {
url = https://gist.githubusercontent.com/makefu/b56f5554c9ef03fe6e09878962e6fd8d/raw/1f147efec51325bc9f80c823bad8381d5b7252f6/wordset_4k.c ;
sha256 = "18ddzyh11bywrhzdkzvrl7nvgp5gdb4k1s0zxbz2bkhd14vi72bb";
};
diff --git a/makefu/5pkgs/dionaea/default.nix b/makefu/5pkgs/dionaea/default.nix
new file mode 100644
index 000000000..fef197c20
--- /dev/null
+++ b/makefu/5pkgs/dionaea/default.nix
@@ -0,0 +1,50 @@
+{ stdenv, lib, pkgs, fetchurl,fetchFromGitHub,
+ libpcap, libdnet, libevent, readline, autoconf, automake, libtool, zlib, pcre,
+ libev,
+ ... }:
+let
+ liblcfg = stdenv.mkDerivation rec {
+ name = "liblcfg-${version}";
+ version = "750bc90";
+ src = fetchFromGitHub {
+ owner = "ThomasAdam";
+ repo = "liblcfg";
+ rev = version;
+ sha256 = "1k3r47p81paw5802jklx9xqbjrxr26pahipxn9nq3177qhxxibkr";
+ };
+ buildInputs = with pkgs;[ autoconf automake ];
+ preConfigure = ''autoreconf -fi'';
+ sourceRoot = "${name}-src/code";
+ };
+in stdenv.mkDerivation rec {
+ name = "liblcfg-${version}";
+
+ #version = "1.5c"; #original, does not compile due to libc errors
+ #src = fetchurl {
+ # url = "http://www.honeyd.org/uploads/honeyd-${version}.tar.gz";
+ # sha256 = "0vcih16fk5pir5ssfil8x79nvi62faw0xvk8s5klnysv111db1ii";
+ #};
+
+ #version = "64d087c"; # honeyd-1.6.7
+ # sha256 = "0zhnn13r24y1q494xcfx64vyp84zqk8qmsl41fq2674230bn0p31";
+
+ version = "6756787f94c4f1ac53d1e5545d052774a0446c04";
+ src = fetchFromGitHub {
+ owner = "rep";
+ repo = "dionaea";
+ rev = version;
+ sha256 = "04zjr9b7x0rqwzgb9gfxq6pclb817gz4qaghdl8xa79bqf9vv2p7";
+ };
+
+ buildInputs = with pkgs;[ libtool automake autoconf ];
+ configureFlags = [
+ "--with-liblcfg=${liblcfg}"
+ "--with-libpcap=${libpcap}"
+ ];
+
+ meta = {
+ homepage = http://www.honeyd.org/;
+ description = "virtual Honeypots";
+ license = lib.licenses.gpl2;
+ };
+}
diff --git a/makefu/5pkgs/farpd/default.nix b/makefu/5pkgs/farpd/default.nix
index d16400016..8dfcee90c 100644
--- a/makefu/5pkgs/farpd/default.nix
+++ b/makefu/5pkgs/farpd/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
zlib
coreutils
python
- pythonPackages.sqlite3
+ pythonPackages.pysqlite
];
patches = [
( fetchurl {
diff --git a/makefu/5pkgs/libopencm3/default.nix b/makefu/5pkgs/libopencm3/default.nix
new file mode 100644
index 000000000..ed35fc639
--- /dev/null
+++ b/makefu/5pkgs/libopencm3/default.nix
@@ -0,0 +1,30 @@
+{ lib, stdenv, fetchFromGitHub, gcc-arm-embedded, python }:
+stdenv.mkDerivation rec {
+ name = "libopencm-${version}";
+ version = "2017-04-01";
+
+ src = fetchFromGitHub {
+ owner = "libopencm3";
+ repo = "libopencm3";
+ rev = "383fafc862c0d47f30965f00409d03a328049278";
+ sha256 = "0ar67icxl39cf7yb5glx3zd5413vcs7zp1jq0gzv1napvmrv3jv9";
+ };
+
+ buildInputs = [ gcc-arm-embedded python ];
+ buildPhase = ''
+ sed -i 's#/usr/bin/env python#${python}/bin/python#' ./scripts/irq2nvic_h
+ make
+ '';
+ installPhase = ''
+ mkdir -p $out
+ cp -r lib $out/
+ '';
+
+ meta = {
+ description = "Open Source ARM cortex m microcontroller library";
+ homepage = https://github.com/libopencm3/libopencm3;
+ license = stdenv.lib.licenses.gpl2;
+ platforms = stdenv.lib.platforms.linux;
+ maintainers = with stdenv.lib.maintainers; [ makefu ];
+ };
+}
diff --git a/makefu/5pkgs/logstash-output-exec/default.nix b/makefu/5pkgs/logstash-output-exec/default.nix
new file mode 100644
index 000000000..d1de851c7
--- /dev/null
+++ b/makefu/5pkgs/logstash-output-exec/default.nix
@@ -0,0 +1,32 @@
+{ pkgs, stdenv, lib, fetchFromGitHub }:
+
+
+# TODO: requires ftw ruby package
+stdenv.mkDerivation rec {
+ name = "logstash-input-github-${version}";
+ version = "3.1.0";
+
+ src = fetchFromGitHub {
+ owner = "logstash-plugins";
+ repo = "logstash-output-exec";
+ rev = "v${version}";
+ sha256 = "0ix5w9l6hrbjaymkh7fzymjvpkiias3hs0l77zdpcwdaa6cz53nf";
+ };
+
+ dontBuild = true;
+ dontPatchELF = true;
+ dontStrip = true;
+ dontPatchShebangs = true;
+ installPhase = ''
+ mkdir -p $out/logstash
+ cp -r lib/* $out
+ '';
+
+ 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;
+ maintainers = with maintainers; [ makefu ];
+ };
+}
diff --git a/makefu/5pkgs/mcomix/default.nix b/makefu/5pkgs/mcomix/default.nix
new file mode 100644
index 000000000..a12e2e821
--- /dev/null
+++ b/makefu/5pkgs/mcomix/default.nix
@@ -0,0 +1,20 @@
+{ pkgs, lib ,python2Packages, fetchurl, gtk3}:
+python2Packages.buildPythonPackage rec {
+ name = "mcomix-${version}";
+ version = "1.2.1";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/mcomix/${name}.tar.bz2";
+ sha256 = "0fzsf9pklhfs1rzwzj64c0v30b74nk94p93h371rpg45qnfiahvy";
+ };
+
+ propagatedBuildInputs = with python2Packages;
+ [ python2Packages.pygtk gtk3 python2Packages.pillow ];
+
+ meta = {
+ homepage = https://github.com/pyload/pyload;
+ description = "Free and Open Source download manager written in Python";
+ license = lib.licenses.gpl3;
+ maintainers = with lib.maintainers; [ makefu ];
+ };
+}
diff --git a/makefu/5pkgs/minibar/default.nix b/makefu/5pkgs/minibar/default.nix
new file mode 100644
index 000000000..384a73261
--- /dev/null
+++ b/makefu/5pkgs/minibar/default.nix
@@ -0,0 +1,12 @@
+{ lib, pkgs, fetchFromGitHub, ... }:
+
+with pkgs.python3Packages;buildPythonPackage rec {
+ name = "minibar-${version}";
+ version = "0.5.0";
+ src = fetchFromGitHub {
+ owner = "canassa";
+ repo = "minibar";
+ rev = "c8ecd61";
+ sha256 = "1k718zrjd11rw93nmz2wxvhvsai6lwqfblnwjpmkpnslcdan7641";
+ };
+}
diff --git a/makefu/5pkgs/nltk/default.nix b/makefu/5pkgs/nltk/default.nix
new file mode 100644
index 000000000..b2d88b3fe
--- /dev/null
+++ b/makefu/5pkgs/nltk/default.nix
@@ -0,0 +1,17 @@
+{ lib, pkgs, fetchFromGitHub, ... }:
+
+with pkgs.pythonPackages;buildPythonPackage rec {
+ name = "nltk-${version}";
+ version = "3.2.1";
+ src = pkgs.fetchurl{
+ #url = "mirror://pypi/n/${name}.tar.gz";
+ url = "https://pypi.python.org/packages/58/85/8fa6f8c488507aab7d6234ce754bbbe61bfeb8382489785e2d764bf8f52a/${name}.tar.gz";
+ sha256 = "0skxbhnymwlspjkzga0f7x1hg3y50fwpfghs8g8k7fh6f4nknlym";
+
+ };
+ meta = {
+ homepage = http://nltk.org;
+ description = "Natural languages Toolkit";
+ license = lib.licenses.asl20;
+ };
+}
diff --git a/makefu/5pkgs/novnc/default.nix b/makefu/5pkgs/novnc/default.nix
index b1d62248d..7da8e9be1 100644
--- a/makefu/5pkgs/novnc/default.nix
+++ b/makefu/5pkgs/novnc/default.nix
@@ -13,7 +13,6 @@ stdenv.mkDerivation rec {
};
p = stdenv.lib.makeBinPath [ pkgs.nettools pkgs.python27Packages.websockify
pkgs.coreutils pkgs.which pkgs.procps ];
- # TODO: propagatedBuildInputs does not seem to work with shell scripts
patchPhase = ''
sed -i '1aset -efu\nexport PATH=${p}\n' utils/launch.sh
'';
diff --git a/makefu/5pkgs/programs-db/default.nix b/makefu/5pkgs/programs-db/default.nix
new file mode 100644
index 000000000..f40b1b96e
--- /dev/null
+++ b/makefu/5pkgs/programs-db/default.nix
@@ -0,0 +1,12 @@
+{ stdenv }:
+
+stdenv.mkDerivation rec {
+ name = "programs-db";
+ src = builtins.fetchTarball https://nixos.org/channels/nixos-unstable/nixexprs.tar.xz ;
+
+ phases = [ "unpackPhase" "installPhase" ];
+ installPhase = ''
+ cp programs.sqlite $out
+ '';
+
+}