Merge pull request #91288 from rnhmjoj/zeromq

Remove old zeromq 3.x packages
This commit is contained in:
Michele Guerini Rocco 2020-07-26 17:37:10 +02:00 committed by GitHub
commit bb395a9a47
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 23 additions and 70 deletions

View file

@ -1,30 +0,0 @@
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, zeromq3, jdk }:
stdenv.mkDerivation rec {
pname = "jzmq";
version = "3.1.0";
src = fetchFromGitHub {
owner = "zeromq";
repo = "jzmq";
rev = "v${version}";
sha256 = "1wlzs604mgmqmrgpk4pljx2nrlxzdfi3r8k59qlm90fx8qkqkc63";
};
nativeBuildInputs = [ autoreconfHook pkgconfig ];
buildInputs = [ zeromq3 jdk ];
preConfigure = ''
${if stdenv.hostPlatform.system == "x86_64-darwin" then
'' sed -i -e 's~/Headers~/include~' -e 's~_JNI_INC_SUBDIRS=\".*\"~_JNI_INC_SUBDIRS=\"darwin\"~' configure
'' else ""}
'';
meta = {
homepage = "http://www.zeromq.org";
description = "Java bindings for ZeroMQ";
platforms = stdenv.lib.platforms.unix;
license = stdenv.lib.licenses.lgpl3;
maintainers = [ stdenv.lib.maintainers.vizanto ];
};
}

View file

@ -1,22 +0,0 @@
{ stdenv, fetchurl, libuuid }:
stdenv.mkDerivation rec {
name = "zeromq-3.2.5";
src = fetchurl {
url = "http://download.zeromq.org/${name}.tar.gz";
sha256 = "0911r7q4i1x9gnfinj39vx08fnz59mf05vl75zdkws36lib3wr89";
};
buildInputs = [ libuuid ];
doCheck = false; # fails all the tests (ctest)
meta = with stdenv.lib; {
branch = "3";
homepage = "http://www.zeromq.org";
description = "The Intelligent Transport Layer";
license = licenses.gpl3;
platforms = platforms.all;
};
}

View file

@ -334,7 +334,7 @@ let
rtiff = [ pkgs.libtiff.dev ];
runjags = [ pkgs.jags ];
RVowpalWabbit = [ pkgs.zlib.dev pkgs.boost ];
rzmq = [ pkgs.zeromq3 ];
rzmq = [ pkgs.zeromq ];
SAVE = [ pkgs.zlib pkgs.bzip2 pkgs.icu pkgs.lzma pkgs.pcre ];
sdcTable = [ pkgs.gmp pkgs.glpk ];
seewave = [ pkgs.fftw.dev pkgs.libsndfile.dev ];

View file

@ -1,24 +1,27 @@
{ stdenv, lib, fetchurl, zip, unzip
, jzmq, jdk, python
, confFile ? "", extraLibraryPaths ? [], extraJars ? [] }:
, jdk, python
, confFile ? ""
, extraLibraryPaths ? []
, extraJars ? []
}:
stdenv.mkDerivation rec {
name = "apache-storm-" + version;
version = "1.2.1";
pname = "apache-storm";
version = "2.1.0";
name = "${pname}-${version}";
src = fetchurl {
url =
"mirror://apache/storm/${name}/${name}.tar.gz";
sha256 = "177dqgbviagrpvalg8h67mwiwwgmiqsg0hh97hcqqcjg71ypnjkv";
url = "mirror://apache/storm/${name}/${name}.tar.gz";
sha256 = "1i3z08rfy7aavshrbrskv9dmlhx1fjgrhhqm0pczfam4vnas8yg2";
};
buildInputs = [ zip unzip jzmq ];
buildInputs = [ zip unzip ];
installPhase = ''
mkdir -p $out/share/${name}
mv public $out/docs
mv examples $out/share/${name}/.
rm -f lib/jzmq* || exit 1
mv external extlib* lib $out/.
mv conf bin $out/.
mv log4j2 $out/conf/.
@ -35,21 +38,22 @@ stdenv.mkDerivation rec {
-e "s|STORM_CONF_DIR = .*|STORM_CONF_DIR = os.getenv('STORM_CONF_DIR','$out/conf')|" \
-e 's|STORM_LOG4J2_CONF_DIR =.*|STORM_LOG4J2_CONF_DIR = os.path.join(STORM_CONF_DIR, "log4j2")|' \
$out/bin/storm.py
# Default jdk location
sed -i -e 's|#.*export JAVA_HOME=.*|export JAVA_HOME="${jdk.home}"|' \
$out/conf/storm-env.sh
unzip $out/lib/storm-core-${version}.jar defaults.yaml;
zip -d $out/lib/storm-core-${version}.jar defaults.yaml;
ls -lh $out/lib
unzip $out/lib/storm-client-${version}.jar defaults.yaml;
zip -d $out/lib/storm-client-${version}.jar defaults.yaml;
sed -i \
-e 's|java.library.path: .*|java.library.path: "${jzmq}/lib:${lib.concatStringsSep ":" extraLibraryPaths}"|' \
-e 's|java.library.path: .*|java.library.path: "${lib.concatStringsSep ":" extraLibraryPaths}"|' \
-e 's|storm.log4j2.conf.dir: .*|storm.log4j2.conf.dir: "conf/log4j2"|' \
defaults.yaml
${if confFile != "" then ''cat ${confFile} >> defaults.yaml'' else ""}
mv defaults.yaml $out/conf;
# Link to jzmq jar and extra jars
# Link to extra jars
cd $out/lib;
ln -s ${jzmq}/share/java/*.jar;
${lib.concatMapStrings (jar: "ln -s ${jar};\n") extraJars}
'';

View file

@ -678,6 +678,10 @@ mapAliases ({
# added 2019-09-06
zeroc_ice = pkgs.zeroc-ice;
# added 2020-06-22
zeromq3 = throw "zeromq3 has been deprecated by zeromq4.";
jzmq = throw "jzmq has been removed from nixpkgs, as it was unmaintained";
} // (with ocaml-ng; { # added 2016-09-14
ocaml_4_00_1 = ocamlPackages_4_00_1.ocaml;
ocaml_4_01_0 = ocamlPackages_4_01_0.ocaml;

View file

@ -15531,7 +15531,6 @@ in
zlog = callPackage ../development/libraries/zlog { };
zeromq3 = callPackage ../development/libraries/zeromq/3.x.nix {};
zeromq4 = callPackage ../development/libraries/zeromq/4.x.nix {};
zeromq = zeromq4;
@ -15611,8 +15610,6 @@ in
junixsocket = callPackage ../development/libraries/java/junixsocket { };
jzmq = callPackage ../development/libraries/java/jzmq { };
lombok = callPackage ../development/libraries/java/lombok { };
lucene = callPackage ../development/libraries/java/lucene { };