summaryrefslogtreecommitdiffstats
path: root/makefu/5pkgs
diff options
context:
space:
mode:
authortv <tv@krebsco.de>2018-11-10 19:52:37 +0100
committertv <tv@krebsco.de>2018-11-10 19:52:37 +0100
commit5ea1c2fcbb5756ef99d5fade8a7cd9e33b04a0c6 (patch)
treef6edbd9d1ff68773f413065a1f1c5dd71150be1a /makefu/5pkgs
parent9a801fa642a60a2c46240670b4e3ad66ea77d995 (diff)
parent05b288604e7e653efb6035b9953aa849e6e6bc19 (diff)
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'makefu/5pkgs')
-rw-r--r--makefu/5pkgs/_4nxci/default.nix (renamed from makefu/5pkgs/4nxci/default.nix)44
-rw-r--r--makefu/5pkgs/awesomecfg/full.cfg6
-rw-r--r--makefu/5pkgs/cozy-audiobooks/default.nix95
-rw-r--r--makefu/5pkgs/custom/inkscape/dxf_fix.patch12
-rw-r--r--makefu/5pkgs/default.nix3
-rw-r--r--makefu/5pkgs/esniper/default.nix32
-rw-r--r--makefu/5pkgs/esniper/find-ca-bundle.patch26
-rw-r--r--makefu/5pkgs/ifdnfc/default.nix45
-rw-r--r--makefu/5pkgs/jd-gui/default.nix36
-rw-r--r--makefu/5pkgs/mcomix/default.nix24
-rw-r--r--makefu/5pkgs/ns-atmosphere-programmer/default.nix36
-rw-r--r--makefu/5pkgs/switch-launcher/default.nix24
-rw-r--r--makefu/5pkgs/targetcli/default.nix64
-rw-r--r--makefu/5pkgs/zj-58/default.nix30
14 files changed, 148 insertions, 329 deletions
diff --git a/makefu/5pkgs/4nxci/default.nix b/makefu/5pkgs/_4nxci/default.nix
index 3aba3be45..dafa37ff6 100644
--- a/makefu/5pkgs/4nxci/default.nix
+++ b/makefu/5pkgs/_4nxci/default.nix
@@ -1,33 +1,31 @@
-{ stdenv, lib, fetchFromGitHub, mbedtls, python2 }:
+{ stdenv, lib, fetchFromGitHub, mbedtls, python2, perl }:
let
-
- mymbedtls = lib.overrideDerivation mbedtls (old: rec {
- name = "mbedtls-${version}";
- version = "2.13.0";
- src = fetchFromGitHub {
- owner = "ARMmbed";
- repo = "mbedtls";
- rev = name;
- sha256 = "1257kp7yxkwwbx5v14kmrmgk1f9zagiddg5alm4wbj0pmgbrm14j";
- };
- buildInputs = old.buildInputs ++ [ python2 ];
- postConfigure = ''
- perl scripts/config.pl set MBEDTLS_CMAC_C
- '';
- doCheck = false;
-
- });
-in stdenv.mkDerivation rec {
- name = "4nxci-${version}";
- version = "1.30";
-
+ version = "1.35";
src = fetchFromGitHub {
owner = "The-4n";
repo = "4NXCI";
rev = "v${version}";
- sha256 = "0nrd19z88iahxcdx468lzgxlvkl65smwx8f9s19431cszyhvpxyh";
+ sha256 = "0yq0irxzi4wi71ajw8ld01zfpkrgknpq7g3m76pbnwmdzkm7dra6";
};
+ mymbedtls = stdenv.mkDerivation {
+ name = "mbedtls-${version}";
+ version = "2.6.1";
+ doCheck = false;
+ inherit src;
+ buildInputs = [ perl ];
+ phases = [ "unpackPhase" "buildPhase" "installPhase" ];
+ makeFlags = [ "DESTDIR=$(out)" ];
+ buildPhase = ''
+ cp config.mk.template config.mk
+ cd mbedtls
+ make
+ '';
+ };
+in stdenv.mkDerivation rec {
+ name = "4nxci-${version}";
+
+ inherit src version;
buildPhase = ''
cp config.mk.template config.mk
sed -i 's#\(INCLUDE =\).*#\1${mymbedtls}/include#' Makefile
diff --git a/makefu/5pkgs/awesomecfg/full.cfg b/makefu/5pkgs/awesomecfg/full.cfg
index 12d357913..11f9f59b8 100644
--- a/makefu/5pkgs/awesomecfg/full.cfg
+++ b/makefu/5pkgs/awesomecfg/full.cfg
@@ -572,9 +572,9 @@ local os = {
do
local cmds =
{
- "@networkmanagerapplet@/bin/nm-applet",
- "@blueman@/bin/blueman-applet",
- "@clipit@/bin/clipit"
+ -- "@networkmanagerapplet@/bin/nm-applet",
+ -- "@blueman@/bin/blueman-applet",
+ -- "@clipit@/bin/clipit"
}
for _,i in pairs(cmds) do
diff --git a/makefu/5pkgs/cozy-audiobooks/default.nix b/makefu/5pkgs/cozy-audiobooks/default.nix
deleted file mode 100644
index 870fa8ce2..000000000
--- a/makefu/5pkgs/cozy-audiobooks/default.nix
+++ /dev/null
@@ -1,95 +0,0 @@
-{ stdenv, fetchFromGitHub
-, ninja
-, boost
-, meson
-, pkgconfig
-, wrapGAppsHook
-, appstream-glib
-, desktop-file-utils
-, gtk3
-, glib
-, gst_all_1
-, gobjectIntrospection
-, python3Packages
-, file
-, cairo , sqlite , gettext
-, gnome3
-}:
-
-let
- peewee = with python3Packages; buildPythonPackage rec {
- # https://git.archlinux.org/svntogit/community.git/tree/trunk/PKGBUILD?h=packages/python-peewee
- pname = "peewee";
- version = "3.6.4";
- src = fetchPypi {
- inherit pname version;
- sha256 = "1fi4z9n86ri79gllwav0gv3hmwipzmkvivzfyszfqn9fi5zpp3ak";
- };
- doCheck = false;
-
- checkPhase = ''
- python runtests.py
- '';
-
- buildInputs = [
- cython
- sqlite
- # psycopg2
- # mysql-connector
- ];
- meta.license = stdenv.lib.licenses.mit;
- };
-in
-stdenv.mkDerivation rec {
- name = "cozy-${version}";
- version = "0.6.0";
-
- src = fetchFromGitHub {
- owner = "geigi";
- repo = "cozy";
- rev = version;
- sha256 = "1afl3qsn9h4k8fgp63z0ab9p5ashrg3g936a9rh3i9qydv6s3srd";
- };
-
- postPatch = ''
- chmod +x data/meson_post_install.py
- patchShebangs data/meson_post_install.py
- substituteInPlace cozy/magic/magic.py --replace "ctypes.util.find_library('magic')" "'${file}/lib/libmagic${stdenv.hostPlatform.extensions.sharedLibrary}'"
- '';
- postInstall = ''
- wrapProgram $out/bin/com.github.geigi.cozy \
- --prefix PYTHONPATH : "$PYTHONPATH:$(toPythonPath $out)"
-
- '';
- wrapPrefixVariables = [ "PYTHONPATH" ];
-
-
- nativeBuildInputs = [
- meson ninja pkgconfig
- wrapGAppsHook
- appstream-glib
- desktop-file-utils
- gobjectIntrospection
-
- ];
- buildInputs = with gst_all_1; [ gtk3 glib
- gstreamer gst-plugins-good gst-plugins-ugly gst-plugins-base cairo gettext
- gnome3.defaultIconTheme gnome3.gsettings-desktop-schemas
- ]
- ++ (with python3Packages; [
- python gst-python pygobject3 dbus-python mutagen peewee magic
-
- ]);
-
- checkPhase = ''
- ninja test
- '';
-
- meta = with stdenv.lib; {
- description = ''
- A modern audio book player for Linux using GTK+ 3
- '';
- maintainers = [ maintainers.makefu ];
- license = licenses.mit;
- };
-}
diff --git a/makefu/5pkgs/custom/inkscape/dxf_fix.patch b/makefu/5pkgs/custom/inkscape/dxf_fix.patch
deleted file mode 100644
index b7b491d4e..000000000
--- a/makefu/5pkgs/custom/inkscape/dxf_fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- ./share/extensions/dxf_outlines.py 2017-10-08 17:28:45.553368917 +0200
-+++ ./share/extensions/dxf_outlines.py.new 2017-10-08 17:29:20.172554152 +0200
-@@ -341,7 +341,7 @@
- if not scale:
- scale = 25.4/96 # if no scale is specified, assume inch as baseunit
- scale /= self.unittouu('1px')
-- h = self.unittouu(self.document.getroot().xpath('@height', namespaces=inkex.NSS)[0])
-+ h = self.unittouu(self.documentHeight())
- 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/default.nix b/makefu/5pkgs/default.nix
index 390aabd73..6e86f4264 100644
--- a/makefu/5pkgs/default.nix
+++ b/makefu/5pkgs/default.nix
@@ -30,9 +30,6 @@ in {
qcma = super.pkgs.libsForQt5.callPackage ./custom/qcma { };
inherit (callPackage ./devpi {}) devpi-web ;
nodemcu-uploader = super.pkgs.callPackage ./nodemcu-uploader {};
- inkscape = super.pkgs.stdenv.lib.overrideDerivation super.inkscape (old: {
- patches = [ ./custom/inkscape/dxf_fix.patch ];
- });
}
// (mapAttrs (_: flip callPackage {})
diff --git a/makefu/5pkgs/esniper/default.nix b/makefu/5pkgs/esniper/default.nix
deleted file mode 100644
index a6aac5748..000000000
--- a/makefu/5pkgs/esniper/default.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ stdenv, fetchurl , openssl, curl, coreutils, gawk, bash, which }:
-
-stdenv.mkDerivation rec {
- name = "${pname}-2-35-0";
- pname = "esniper";
- version = "2.35.0";
- src = fetchurl {
- url = "mirror://sourceforge/${pname}/${name}.tgz";
- sha256 = "04iwjb42lw90c03125bjdpnm0fp78dmwf2j35r7mah0nwcrlagd9";
- };
-
-
- buildInputs = [ openssl curl ];
-
- # Add support for CURL_CA_BUNDLE variable.
- # Fix <http://sourceforge.net/p/esniper/bugs/648/>.
- patches = [ ./find-ca-bundle.patch ];
-
- postInstall = ''
- sed <"frontends/snipe" >"$out/bin/snipe" \
- -e "2i export PATH=\"$out/bin:${stdenv.lib.makeBinPath [ coreutils gawk bash which ]}:\$PATH\""
- chmod 555 "$out/bin/snipe"
- '';
-
- meta = with stdenv.lib; {
- description = "Simple, lightweight tool for sniping eBay auctions";
- homepage = http://esniper.sourceforge.net;
- license = licenses.gpl2;
- maintainers = with maintainers; [ lovek323 peti ];
- platforms = platforms.all;
- };
-}
diff --git a/makefu/5pkgs/esniper/find-ca-bundle.patch b/makefu/5pkgs/esniper/find-ca-bundle.patch
deleted file mode 100644
index e4df272a0..000000000
--- a/makefu/5pkgs/esniper/find-ca-bundle.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -ubr '--exclude=*.o' esniper-2-27-0-orig/http.c esniper-2-27-0-patched/http.c
---- esniper-2-27-0-orig/http.c 2012-02-06 22:04:06.000000000 +0100
-+++ esniper-2-27-0-patched/http.c 2012-07-27 10:54:20.893054646 +0200
-@@ -200,6 +200,9 @@
- int
- initCurlStuff(void)
- {
-+ /* Path to OpenSSL bundle file. */
-+ const char *ssl_capath=NULL;
-+
- /* list for custom headers */
- struct curl_slist *slist=NULL;
-
-@@ -241,6 +244,12 @@
- if ((curlrc = curl_easy_setopt(easyhandle, CURLOPT_COOKIEFILE, "")))
- return initCurlStuffFailed();
-
-+ /* If the environment variable CURL_CA_BUNDLE is set, pass through its
-+ * contents to curl. */
-+ if ((ssl_capath = getenv("CURL_CA_BUNDLE")))
-+ if ((curlrc = curl_easy_setopt(easyhandle, CURLOPT_CAINFO, ssl_capath)))
-+ return initCurlStuffFailed();
-+
- slist = curl_slist_append(slist, "Accept: text/*");
- slist = curl_slist_append(slist, "Accept-Language: en");
- slist = curl_slist_append(slist, "Accept-Charset: iso-8859-1,*,utf-8");
diff --git a/makefu/5pkgs/ifdnfc/default.nix b/makefu/5pkgs/ifdnfc/default.nix
deleted file mode 100644
index cc7956c8c..000000000
--- a/makefu/5pkgs/ifdnfc/default.nix
+++ /dev/null
@@ -1,45 +0,0 @@
-{ stdenv, fetchFromGitHub , pkgconfig
-, pcsclite
-, autoreconfHook
-, libnfc
-}:
-
-stdenv.mkDerivation rec {
- name = "ifdnfc-${version}";
- version = "2016-03-01";
-
- src = fetchFromGitHub {
- owner = "nfc-tools";
- repo = "ifdnfc";
- rev = "0e48e8e";
- sha256 = "1cxnvhhlcbm8h49rlw5racspb85fmwqqhd3gzzpzy68vrs0b37vg";
- };
- nativeBuildInputs = [ pkgconfig autoreconfHook ];
- buildInputs = [ pcsclite libnfc ];
-
- configureFlags = [ "--prefix=$(out)" ];
- makeFlags = [ "DESTDIR=/" "usbdropdir=$(out)/pcsc/drivers" ];
-
- meta = with stdenv.lib; {
- description = "PC/SC IFD Handler based on libnfc";
- long_description =
- '' libnfc Interface Plugin to be used in <code>services.pcscd.plugins</code>.
- It provides support for all readers which are not supported by ccid but by libnfc.
-
- For activating your reader you need to run
- <code>ifdnfc-activate yes<code> with this package in your
- <code>environment.systemPackages</code>
-
- To use your reader you may need to blacklist your reader kernel modules:
- <code>boot.blacklistedKernelModules = [ "pn533" "pn533_usb" "nfc" ];</code>
-
- Supports the pn533 smart-card reader chip which is for example used in
- the SCM SCL3711.
- '';
- homepage = https://github.com/nfc-tools/ifdnfc;
- license = licenses.gpl3;
- platforms = platforms.linux;
- maintainers = with maintainers; [ makefu ];
- };
-}
-
diff --git a/makefu/5pkgs/jd-gui/default.nix b/makefu/5pkgs/jd-gui/default.nix
deleted file mode 100644
index adefd80dd..000000000
--- a/makefu/5pkgs/jd-gui/default.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{ stdenv, lib, pkgs, fetchurl, jre, makeWrapper, unzip }:
-stdenv.mkDerivation rec {
- name = "${packageName}-${version}";
- packageName = "jd-gui";
- version = "1.4.0";
-
- src = fetchurl {
- url = "https://github.com/java-decompiler/jd-gui/releases/download/v${version}/${name}.jar";
- sha256 = "0rvbplkhafb6s9aiwgcq4ffz4bvzyp7q511pd46hx4ahhzfg7lmx";
- };
-
- nativeBuildInputs = [ makeWrapper unzip ];
-
- phases = [ "installPhase" ];
-
- installPhase = ''
- f=$out/lib/jd-gui/
- bin=$out/bin
- name=$(basename $src)
- mkdir -p $f $bin
-
- # fixup path to java
- cp $src $f
- cat > $bin/jd-gui <<EOF
- #!/bin/sh
- exec ${pkgs.jre}/bin/java -jar $f/$name \$@
- EOF
- chmod +x $bin/jd-gui
- '';
-
- meta = {
- homepage = https://github.com/java-decompiler/jd-gui;
- description = "A standalone Java Decompiler GUI";
- license = lib.licenses.gpl3;
- };
-}
diff --git a/makefu/5pkgs/mcomix/default.nix b/makefu/5pkgs/mcomix/default.nix
deleted file mode 100644
index 7fb9cd375..000000000
--- a/makefu/5pkgs/mcomix/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ 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 ];
-
- # for module in sys.modules.itervalues():
- # RuntimeError: dictionary changed size during iteration
- doCheck = false;
-
- 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/ns-atmosphere-programmer/default.nix b/makefu/5pkgs/ns-atmosphere-programmer/default.nix
new file mode 100644
index 000000000..1e1cb1d86
--- /dev/null
+++ b/makefu/5pkgs/ns-atmosphere-programmer/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchzip
+, makeWrapper
+, autoPatchelfHook
+, xlibs
+, gnome3
+, libpng12
+}:
+stdenv.mkDerivation rec {
+ name = "ns-atmosphere-programmer-${version}";
+ version = "0.1";
+
+ src = fetchzip {
+ url = "http://www.ns-atmosphere.com/media/content/ns-atmosphere-programmer-linux-v01.zip";
+ sha256 = "0g2fxbirgi0lm0mi69cmknqj7626fxjkwn98bqx5pcalxplww8k0";
+ };
+
+ buildInputs = with xlibs; [ libX11 libXxf86vm libSM gnome3.gtk libpng12 ];
+ nativeBuildInputs = [ autoPatchelfHook makeWrapper ];
+
+ installPhase = ''
+ install -D -m755 NS-Atmosphere-Programmer-Linux-v0.1/NS-Atmosphere $out/bin/NS-Atmosphere
+ wrapProgram $out/bin/NS-Atmosphere --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \
+--suffix XDG_DATA_DIRS : '${gnome3.defaultIconTheme}/share'
+ '';
+
+ dontStrip = true;
+
+ meta = with stdenv.lib; {
+ description = "Payload programmer for ns-atmosphere injector";
+ homepage = http://www.ns-atmosphere.com;
+ maintainers = [ maintainers.makefu ];
+ platforms = platforms.linux;
+ license = with licenses; [ unfree ];
+ };
+
+}
diff --git a/makefu/5pkgs/switch-launcher/default.nix b/makefu/5pkgs/switch-launcher/default.nix
new file mode 100644
index 000000000..cc7905a31
--- /dev/null
+++ b/makefu/5pkgs/switch-launcher/default.nix
@@ -0,0 +1,24 @@
+{ lib, pkgs, python3Packages, ... }:
+
+with python3Packages; buildPythonPackage rec {
+ name = "nodemcu-uploader-${version}";
+ version = "0.1.0";
+
+ src = pkgs.fetchFromGitHub {
+ owner = "ksmit799";
+ repo = "switch-launcher";
+ rev = version;
+ sha256 = "0j24dwiqqjiks59s8gilnplsls130mp1jssg2rpjrvj0jg0w52zz";
+ };
+
+
+ propagatedBuildInputs = [
+ pyusb
+ ];
+
+ meta = {
+ homepage = https://github.com/ksmit799/switch-launcher;
+ description = "Desktop switch payload launcher based on a modified reswitched injector";
+ license = lib.licenses.bsd3;
+ };
+}
diff --git a/makefu/5pkgs/targetcli/default.nix b/makefu/5pkgs/targetcli/default.nix
new file mode 100644
index 000000000..927c34c5a
--- /dev/null
+++ b/makefu/5pkgs/targetcli/default.nix
@@ -0,0 +1,64 @@
+{ pkgs, fetchFromGitHub, ... }:
+with pkgs.python2Packages;
+let
+ version = "2.1";
+ rtslib = buildPythonPackage rec {
+ pname = "rtslib";
+ inherit version;
+ src = fetchFromGitHub {
+ owner = "datera";
+ repo = "rtslib";
+ rev = version;
+ sha256 = "1d58k9i4xigfqgycyismsqzkz65ssjdri2v9fg0wpica1klyyv22";
+ };
+ propagatedBuildInputs = [ ipaddr netifaces configobj ];
+ };
+ configshell = buildPythonPackage rec {
+ pname = "configshell";
+ version = "1.6";
+ src = fetchFromGitHub {
+ owner = "datera";
+ repo = "configshell";
+ rev = version;
+ sha256 = "14n7xbcaicsvwajv1aihz727dlkn6zfaqjbnn7mcpns83c2hms7y";
+ };
+ propagatedBuildInputs = [ pyparsing ];
+ };
+
+ tcm-py = buildPythonPackage rec {
+ pname = "tcm-py";
+ version = "0ac9091c1ff7a52d5435a4f4449e82637142e06e";
+ src = fetchFromGitHub {
+ owner = "datera";
+ repo = "lio-utils";
+ rev = "0ac9091c1ff7a52d5435a4f4449e82637142e06e";
+ sha256 = "0fc922kxvgr7rwg1y875vqvkipcrixmlafsp5g8mipmq90i8zcq0";
+ } + "/tcm-py";
+ propagatedBuildInputs = [ ];
+ };
+
+ lio-py = buildPythonPackage rec {
+ pname = "lio-py";
+ version = "0ac9091c1ff7a52d5435a4f4449e82637142e06e";
+ src = fetchFromGitHub {
+ owner = "datera";
+ repo = "lio-utils";
+ rev = "0ac9091c1ff7a52d5435a4f4449e82637142e06e";
+ sha256 = "0fc922kxvgr7rwg1y875vqvkipcrixmlafsp5g8mipmq90i8zcq0";
+ } + "/lio-py";
+ propagatedBuildInputs = [ ];
+ };
+
+in buildPythonApplication rec {
+ pname = "targetcli";
+ inherit version;
+
+ propagatedBuildInputs = [ rtslib configshell lio-py tcm-py ];
+
+ src = fetchFromGitHub {
+ owner = "datera";
+ repo = "targetcli";
+ rev = version;
+ sha256 = "10nax7761g93qzky01y3hra8i4s11cgyy9w5w6l8781lj21lgi3d";
+ };
+}
diff --git a/makefu/5pkgs/zj-58/default.nix b/makefu/5pkgs/zj-58/default.nix
deleted file mode 100644
index 6eda84959..000000000
--- a/makefu/5pkgs/zj-58/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{stdenv, fetchFromGitHub, cups}:
-
-stdenv.mkDerivation rec {
- name = "cups-zj58-2018-02-22";
-
- src = fetchFromGitHub {
- owner = "klirichek";
- repo = "zj-58";
- rev = "e4212cd";
- sha256 = "1w2qkspm4qqg5h8n6gmakzhiww7gag64chvy9kf89xsl3wsyp6pi";
- };
-
- buildInputs = [cups];
-
- installPhase = ''
- mkdir -p $out/lib/cups/filter
-
- cp rastertozj $out/lib/cups/filter
-
-
- mkdir -p $out/share/cups/model/zjiang
- cp ZJ-58.ppd $out/share/cups/model/zjiang/
- '';
-
- meta = {
- description = "CUPS filter for thermal printer Zjiang ZJ-58";
- homepage = https://github.com/klirichek/zj-58;
- platforms = stdenv.lib.platforms.linux;
- };
-}