Merge pull request #195217 from yorickvP/microhttpd
libmicrohttpd_0_9_70: drop
This commit is contained in:
commit
ab5c2a0459
|
@ -1,7 +1,7 @@
|
|||
{ lib, mkDerivation, fetchFromGitHub, pkg-config
|
||||
, qmake, qttools, kirigami2, qtquickcontrols2, qtlocation
|
||||
, libosmscout, valhalla, libpostal, osrm-backend, protobuf
|
||||
, libmicrohttpd_0_9_70, sqlite, marisa, kyotocabinet, boost
|
||||
, libmicrohttpd, sqlite, marisa, kyotocabinet, boost
|
||||
}:
|
||||
|
||||
let
|
||||
|
@ -27,7 +27,7 @@ mkDerivation rec {
|
|||
nativeBuildInputs = [ qmake pkg-config qttools ];
|
||||
buildInputs = [
|
||||
kirigami2 qtquickcontrols2 qtlocation
|
||||
valhalla libosmscout osrm-backend libmicrohttpd_0_9_70
|
||||
valhalla libosmscout osrm-backend libmicrohttpd
|
||||
libpostal sqlite marisa kyotocabinet boost protobuf date
|
||||
];
|
||||
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{ stdenv, stdenvGcc6, lib
|
||||
, fetchFromGitHub, cmake, libmicrohttpd_0_9_70, openssl
|
||||
{ stdenv, lib, fetchpatch
|
||||
, fetchFromGitHub, cmake, libmicrohttpd, openssl
|
||||
, opencl-headers, ocl-icd, hwloc
|
||||
, devDonationLevel ? "0.0"
|
||||
, openclSupport ? true
|
||||
|
@ -18,11 +18,18 @@ stdenv.mkDerivation rec {
|
|||
|
||||
NIX_CFLAGS_COMPILE = "-O3";
|
||||
|
||||
patches = [ (fetchpatch {
|
||||
name = "fix-libmicrohttpd-0-9-71.patch";
|
||||
url = "https://github.com/fireice-uk/xmr-stak/compare/06e08780eab54dbc025ce3f38c948e4eef2726a0...8adb208987f5881946992ab9cd9a45e4e2a4b870.patch";
|
||||
excludes = [ "CMakeLists.txt.user" ];
|
||||
hash = "sha256-Yv0U5EO1P5eikn1fKvUXEwemoUIjjeTjpP9p5J8pbC0=";
|
||||
}) ];
|
||||
|
||||
cmakeFlags = [ "-DCUDA_ENABLE=OFF" ]
|
||||
++ lib.optional (!openclSupport) "-DOpenCL_ENABLE=OFF";
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [ libmicrohttpd_0_9_70 openssl hwloc ]
|
||||
buildInputs = [ libmicrohttpd openssl hwloc ]
|
||||
++ lib.optionals openclSupport [ opencl-headers ocl-icd ];
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
@ -1,10 +1,10 @@
|
|||
{ callPackage, fetchurl }:
|
||||
|
||||
callPackage ./generic.nix ( rec {
|
||||
version = "0.9.70";
|
||||
version = "0.9.69";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/libmicrohttpd/libmicrohttpd-${version}.tar.gz";
|
||||
sha256 = "01vkjy89b1ylmh22dy5yza2r414nfwcfixxh3v29nvzrjv9s7l4h";
|
||||
sha256 = "sha256-+5trFIt4dJPmN9MINYhxHmXLy3JvoCzuLNVDxd4n434=";
|
||||
};
|
||||
})
|
|
@ -1,4 +1,8 @@
|
|||
{ lib, stdenv, libgcrypt, curl, gnutls, pkg-config, libiconv, libintl, version, src }:
|
||||
{ lib, stdenv, libgcrypt, curl, gnutls, pkg-config, libiconv, libintl, version, src, meta ? {} }:
|
||||
|
||||
let
|
||||
meta_ = meta;
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libmicrohttpd";
|
||||
|
@ -30,5 +34,5 @@ stdenv.mkDerivation rec {
|
|||
|
||||
maintainers = with maintainers; [ eelco vrthra fpletz ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
} // meta_;
|
||||
}
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
{ lib, stdenv, fetchurl, fetchpatch, pkg-config, musl-fts
|
||||
, musl-obstack, m4, zlib, zstd, bzip2, bison, flex, gettext, xz, setupDebugInfoDirs
|
||||
, argp-standalone
|
||||
, enableDebuginfod ? false, sqlite, curl, libmicrohttpd_0_9_70, libarchive
|
||||
, enableDebuginfod ? false, sqlite, curl, libmicrohttpd, libarchive
|
||||
, gitUpdater
|
||||
}:
|
||||
|
||||
|
@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
|
|||
] ++ lib.optionals enableDebuginfod [
|
||||
sqlite
|
||||
curl
|
||||
libmicrohttpd_0_9_70
|
||||
libmicrohttpd
|
||||
libarchive
|
||||
];
|
||||
|
||||
|
|
|
@ -16,7 +16,7 @@
|
|||
, libev
|
||||
, libgcrypt
|
||||
, libinjection
|
||||
, libmicrohttpd_0_9_70
|
||||
, libmicrohttpd_0_9_69
|
||||
, libuuid
|
||||
, lz4
|
||||
, nlohmann_json
|
||||
|
@ -100,7 +100,7 @@ stdenv.mkDerivation rec {
|
|||
{ f = "libdaemon"; p = libdaemon; }
|
||||
{ f = "libev"; p = libev; }
|
||||
{ f = "libinjection"; p = libinjection; }
|
||||
{ f = "libmicrohttpd"; p = libmicrohttpd_0_9_70; }
|
||||
{ f = "libmicrohttpd"; p = libmicrohttpd_0_9_69; }
|
||||
{ f = "libssl"; p = openssl; }
|
||||
{ f = "lz4"; p = lz4; }
|
||||
{ f = "pcre"; p = pcre; }
|
||||
|
|
|
@ -613,6 +613,7 @@ mapAliases ({
|
|||
liblapackWithoutAtlas = throw "'liblapackWithoutAtlas' has been renamed to/replaced by 'lapack-reference'"; # Converted to throw 2022-02-22
|
||||
liblastfm = throw "'liblastfm' has been renamed to/replaced by 'libsForQt5.liblastfm'"; # Converted to throw 2022-09-24
|
||||
liblrdf = throw "'liblrdf' has been renamed to/replaced by 'lrdf'"; # Converted to throw 2022-02-22
|
||||
libmicrohttpd_0_9_70 = throw "'libmicrohttpd_0_9_70' has been removed because it is insecure, and has been replaced by 'libmicrohttpd_0_9_69' and 'libmicrohttpd_0_9_71'"; # Added 2022-10-10
|
||||
libmsgpack = throw "'libmsgpack' has been renamed to/replaced by 'msgpack'"; # Converted to throw 2022-02-22
|
||||
libnih = throw "'libnih' has been removed"; # Converted to throw 2022-05-17
|
||||
libosmpbf = throw "libosmpbf was removed because it is no longer required by osrm-backend";
|
||||
|
|
|
@ -20214,7 +20214,7 @@ with pkgs;
|
|||
|
||||
libmemcached = callPackage ../development/libraries/libmemcached { };
|
||||
|
||||
libmicrohttpd_0_9_70 = callPackage ../development/libraries/libmicrohttpd/0.9.70.nix { };
|
||||
libmicrohttpd_0_9_69 = callPackage ../development/libraries/libmicrohttpd/0.9.69.nix { };
|
||||
libmicrohttpd_0_9_71 = callPackage ../development/libraries/libmicrohttpd/0.9.71.nix { };
|
||||
libmicrohttpd_0_9_72 = callPackage ../development/libraries/libmicrohttpd/0.9.72.nix { };
|
||||
libmicrohttpd = libmicrohttpd_0_9_71;
|
||||
|
|
Loading…
Reference in a new issue