mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-22 13:41:26 +00:00
Merge pull request #75310 from c0bw3b/rem/mbed13-alienfx-coprthr-firestr
Remove mbedtls_1_3, alienfx, coprthr, firestr
This commit is contained in:
Franz Pletz
GitHub
commit
8bad6c47c1
|
|
@ -1,36 +0,0 @@
|
|||
{ stdenv, fetchFromGitHub, cmake, boost, botan, snappy, libopus, libuuid
|
||||
, libXScrnSaver, openssl, qtbase, qtmultimedia }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "firestr-0.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mempko";
|
||||
repo = "firestr";
|
||||
rev = "f888890f71d49953d05bccdd27a1c4f6690e165c";
|
||||
sha256 = "0s2kdi8rw3i3f8gbiy0ykyi6xj5n8p80m0d1i86mhh8jpagvbfzb";
|
||||
};
|
||||
|
||||
buildInputs = [ cmake boost botan snappy libopus libuuid qtbase qtmultimedia
|
||||
libXScrnSaver openssl ];
|
||||
|
||||
patches = ./return.patch;
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace "set(Boost_USE_STATIC_LIBS on)" "" \
|
||||
--replace "/usr/include/botan" "${botan}/include/botan" \
|
||||
--replace "libopus.a" "libopus.so" \
|
||||
--replace "libsnappy.a" "libsnappy.so" \
|
||||
--replace "libbotan-1.10.a" "libbotan-1.10.so.0"
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Grass computing platform";
|
||||
homepage = http://firestr.com/;
|
||||
license = licenses.gpl3;
|
||||
maintainers = [ maintainers.ehmry ];
|
||||
platforms = platforms.linux;
|
||||
broken = true;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,13 +0,0 @@
|
|||
diff --git a/src/message/master_post.cpp b/src/message/master_post.cpp
|
||||
index c3a5ea9..7c821b9 100644
|
||||
--- a/src/message/master_post.cpp
|
||||
+++ b/src/message/master_post.cpp
|
||||
@@ -56,7 +56,7 @@ namespace fire
|
||||
|
||||
metadata::encryption_type to_message_encryption_type(sc::encryption_type s)
|
||||
{
|
||||
- metadata::encryption_type r;
|
||||
+ metadata::encryption_type r = metadata::encryption_type::asymmetric;
|
||||
switch(s)
|
||||
{
|
||||
case sc::encryption_type::plaintext: r = metadata::encryption_type::plaintext; break;
|
||||
|
|
@ -1,38 +0,0 @@
|
|||
{ stdenv, fetchurl, libelf, libconfig, libevent, which, unzip, perl, python
|
||||
, bison, flex }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "coprthr";
|
||||
version = "1.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/browndeer/coprthr/archive/stable-${version}.zip";
|
||||
sha256 = "0ilx4v1ydppjnq1i0z5j0x4lmi29z39sappar7c0wqady0b5dpz9";
|
||||
};
|
||||
|
||||
buildInputs =
|
||||
[ libelf libconfig libevent which unzip perl python bison flex ];
|
||||
|
||||
patchPhase = ''
|
||||
for x in src/libocl/gen_oclcall_hook.pl tools/cltrace/gen_interceptor.pl src/libocl/gen_oclcall.pl src/scripts/gen_ocl_call_vector.pl src/libstdcl/gen_clarg_setn.pl; do
|
||||
substituteInPlace $x --replace "/usr/bin/perl" ${perl}/bin/perl
|
||||
done
|
||||
'';
|
||||
|
||||
configureFlags =
|
||||
[ "--with-libelf=${libelf}"
|
||||
"--with-libevent=${libevent.dev}"
|
||||
"--with-libconfig=${libconfig}"
|
||||
"--with-opencl-icd-path=$out/etc/OpenCL/vendors"
|
||||
"--enable-user-install"
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "The CO-PRocessing THReads SDK for OpenCL/STDCL";
|
||||
homepage = "http://www.browndeertechnology.com/coprthr.htm";
|
||||
license = stdenv.lib.licenses.lgpl3;
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
|
||||
broken = true;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,34 +0,0 @@
|
|||
{ stdenv, fetchurl, perl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "mbedtls-1.3.22";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://tls.mbed.org/download/${name}-gpl.tgz";
|
||||
sha256 = "0ms4s41z88mz7b6gsnp7jslms4v0115k7gw51i6kx6ng9am43l6y";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ perl ];
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs .
|
||||
'';
|
||||
|
||||
makeFlags = [
|
||||
"SHARED=1"
|
||||
];
|
||||
|
||||
installFlags = [
|
||||
"DESTDIR=\${out}"
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = https://tls.mbed.org/;
|
||||
description = "Portable cryptographic and SSL/TLS library, aka polarssl";
|
||||
license = licenses.gpl3;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ fpletz ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,39 +0,0 @@
|
|||
{ stdenv, libusb1, fetchgit}:
|
||||
|
||||
|
||||
let
|
||||
rev = "85ee5eeaca59a1c92659c3f49b148b0447d78f16";
|
||||
in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "alienfx-1.0.0";
|
||||
src = fetchgit {
|
||||
inherit rev;
|
||||
url = https://github.com/tibz/alienfx.git;
|
||||
|
||||
sha256 = "47501a3b4e08d39edee4cd829ae24259a7e740b9798db76b846fa872989f8fb1";
|
||||
};
|
||||
|
||||
prePatch = ''
|
||||
substituteInPlace Makefile --replace /usr/ $out/
|
||||
substituteInPlace Makefile --replace "install -o root -g root -m 4755" "install -m 555"
|
||||
'';
|
||||
|
||||
patches = [./unistd.patch];
|
||||
buildInputs = [ libusb1 ];
|
||||
makeFlags = "build";
|
||||
preInstall = ''
|
||||
mkdir -p $out/bin
|
||||
mkdir -p $out/man/man1
|
||||
'';
|
||||
installTargets = "install";
|
||||
postInstall = ''cp alienfx.1 $out/man/man1'';
|
||||
|
||||
meta = {
|
||||
description = "Controls AlienFX lighting";
|
||||
homepage = https://github.com/tibz/alienfx;
|
||||
maintainers = [stdenv.lib.maintainers.tomberek];
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
diff --git a/alienfx.cpp b/alienfx.cpp
|
||||
index 5981039..aea8992 100644
|
||||
--- a/alienfx.cpp
|
||||
+++ b/alienfx.cpp
|
||||
@@ -13,6 +13,7 @@
|
||||
#include <string.h>
|
||||
#include <iostream>
|
||||
#include <libusb-1.0/libusb.h>
|
||||
+#include <unistd.h>
|
||||
|
||||
using namespace std;
|
||||
|
||||
|
|
@ -40,6 +40,7 @@ mapAliases ({
|
|||
adobe_flex_sdk = apache-flex-sdk; # added 2018-06-01
|
||||
ag = silver-searcher; # added 2018-04-25
|
||||
aircrackng = aircrack-ng; # added 2016-01-14
|
||||
alienfx = throw "alienfx has been removed."; # added 2019-12-08
|
||||
ammonite-repl = ammonite; # added 2017-05-02
|
||||
arduino_core = arduino-core; # added 2015-02-04
|
||||
asciidocFull = asciidoc-full; # added 2014-06-22
|
||||
|
|
@ -68,6 +69,7 @@ mapAliases ({
|
|||
compton-git = compton; # added 2019-05-20
|
||||
conntrack_tools = conntrack-tools; # added 2018-05
|
||||
cool-old-term = cool-retro-term; # added 2015-01-31
|
||||
coprthr = throw "coprthr has been removed."; # added 2019-12-08
|
||||
corebird = throw "deprecated 2019-10-02: See https://www.patreon.com/posts/corebirds-future-18921328. Please use Cawbird as replacement.";
|
||||
coredumper = throw "coredumper has been removed: Abandoned by upstream."; # added 2019-11-16
|
||||
cpp-gsl = microsoft_gsl; # added 2019-05-24
|
||||
|
|
@ -106,6 +108,7 @@ mapAliases ({
|
|||
firefox-esr-wrapper = firefox-esr; # 2016-01
|
||||
firefox-wrapper = firefox; # 2016-01
|
||||
firefoxWrapper = firefox; # 2015-09
|
||||
firestr = throw "firestr has been removed."; # added 2019-12-08
|
||||
flameGraph = flamegraph; # added 2018-04-25
|
||||
font-awesome-ttf = font-awesome; # 2018-02-25
|
||||
# 2019-10-31
|
||||
|
|
@ -219,6 +222,7 @@ mapAliases ({
|
|||
man_db = man-db; # added 2016-05
|
||||
manpages = man-pages; # added 2015-12-06
|
||||
mariadb-client = hiPrio mariadb.client; #added 2019.07.28
|
||||
mbedtls_1_3 = throw "End of life, see https://tls.mbed.org/kb/how-to/upgrade-2.0"; # added 2019-12-08
|
||||
mess = mame; # added 2019-10-30
|
||||
mysql-client = hiPrio mariadb.client;
|
||||
memtest86 = memtest86plus; # added 2019-05-08
|
||||
|
|
@ -285,6 +289,7 @@ mapAliases ({
|
|||
pltScheme = racket; # just to be sure
|
||||
plexpy = tautulli; # plexpy got renamed to tautulli, added 2019-02-22
|
||||
pmtools = acpica-tools; # added 2018-11-01
|
||||
polarssl = mbedtls; # added 2018-04-25
|
||||
poppler_qt5 = libsForQt5.poppler; # added 2015-12-19
|
||||
postgresql95 = postgresql_9_5;
|
||||
postgresql96 = postgresql_9_6;
|
||||
|
|
|
|||
|
|
@ -1456,8 +1456,6 @@ in
|
|||
|
||||
contrast = callPackage ../applications/accessibility/contrast { };
|
||||
|
||||
coprthr = callPackage ../development/libraries/coprthr { };
|
||||
|
||||
cplex = callPackage ../applications/science/math/cplex (config.cplex or {});
|
||||
|
||||
cpulimit = callPackage ../tools/misc/cpulimit { };
|
||||
|
|
@ -13126,8 +13124,6 @@ in
|
|||
matio = callPackage ../development/libraries/matio { };
|
||||
|
||||
mbedtls = callPackage ../development/libraries/mbedtls { };
|
||||
mbedtls_1_3 = callPackage ../development/libraries/mbedtls/1.3.nix { };
|
||||
polarssl = mbedtls; # TODO: add to aliases.nix
|
||||
|
||||
mdds = callPackage ../development/libraries/mdds { };
|
||||
|
||||
|
|
@ -15808,8 +15804,6 @@ in
|
|||
|
||||
alfred = callPackage ../os-specific/linux/batman-adv/alfred.nix { };
|
||||
|
||||
alienfx = callPackage ../os-specific/linux/alienfx { };
|
||||
|
||||
alsa-firmware = callPackage ../os-specific/linux/alsa-firmware { };
|
||||
|
||||
alsaLib = callPackage ../os-specific/linux/alsa-lib { };
|
||||
|
|
@ -18973,10 +18967,6 @@ in
|
|||
desktopName = "Firefox DevEdition";
|
||||
};
|
||||
|
||||
firestr = libsForQt5.callPackage ../applications/networking/p2p/firestr
|
||||
{ boost = boost155;
|
||||
};
|
||||
|
||||
flac = callPackage ../applications/audio/flac { };
|
||||
|
||||
redoflacs = callPackage ../applications/audio/redoflacs { };
|
||||
|
|
|
|||
Loading…
Reference in a new issue