···7980 buildInputs = [ libg15 libg15render ];
8182+ # Workaround build failure on -fno-common toolchains like upstream gcc-10:
83+ # ld: g15_plugins.o:/build/g15daemon-1.9.5.3/g15daemon/./g15daemon.h:218:
84+ # multiple definition of `lcdlist_mutex'; utility_funcs.o:g15daemon.h:218: first defined here
85+ NIX_CFLAGS_COMPILE = "-fcommon";
86+87 enableParallelBuilding = true;
8889 meta = {
+37-42
pkgs/servers/amqp/qpid-cpp/default.nix
···1-{ lib, stdenv, fetchurl, cmake, python2, boost, libuuid, ruby, buildEnv, buildPythonPackage, qpid-python }:
0000000023-let
4 pname = "qpid-cpp";
5- name = "${pname}-${version}";
6 version = "1.39.0";
78 src = fetchurl {
9- url = "mirror://apache/qpid/cpp/${version}/${name}.tar.gz";
10- sha256 = "088dx1l6myrksbhpr15bs09j6qm8vdliqwjp2ja5amym47md103r";
11 };
12000000000000000000000000013 meta = with lib; {
14 homepage = "https://qpid.apache.org";
15 description = "An AMQP message broker and a C++ messaging API";
···17 platforms = platforms.linux;
18 maintainers = with maintainers; [ cpages ];
19 };
20-21- qpid-cpp = stdenv.mkDerivation {
22- inherit src meta pname version;
23-24- nativeBuildInputs = [ cmake ];
25- buildInputs = [ boost libuuid ruby python2 ];
26-27- # the subdir managementgen wants to install python stuff in ${python} and
28- # the installation tries to create some folders in /var
29- postPatch = ''
30- sed -i '/managementgen/d' CMakeLists.txt
31- sed -i '/ENV/d' src/CMakeLists.txt
32- sed -i '/management/d' CMakeLists.txt
33- '';
34-35- NIX_CFLAGS_COMPILE = toString ([
36- "-Wno-error=deprecated-declarations"
37- "-Wno-error=int-in-bool-context"
38- "-Wno-error=maybe-uninitialized"
39- "-Wno-error=unused-function"
40- "-Wno-error=ignored-qualifiers"
41- "-Wno-error=catch-value"
42- ] ++ lib.optionals stdenv.cc.isGNU [
43- "-Wno-error=deprecated-copy"
44- ]);
45- };
46-47- python-frontend = buildPythonPackage {
48- inherit pname version meta src;
49-50- sourceRoot = "${name}/management/python";
51-52- propagatedBuildInputs = [ qpid-python ];
53- };
54-in buildEnv {
55- name = "${name}-env";
56- paths = [ qpid-cpp python-frontend ];
57}
···1+{ lib, stdenv
2+, fetchpatch
3+, fetchurl
4+, boost
5+, cmake
6+, libuuid
7+, python3
8+, ruby
9+}:
1011+stdenv.mkDerivation rec {
12 pname = "qpid-cpp";
013 version = "1.39.0";
1415 src = fetchurl {
16+ url = "mirror://apache/qpid/cpp/${version}/${pname}-${version}.tar.gz";
17+ hash = "sha256-eYDQ6iHVV1WUFFdyHGnbqGIjE9CrhHzh0jP7amjoDSE=";
18 };
1920+ nativeBuildInputs = [ cmake python3 ];
21+ buildInputs = [ boost libuuid ruby ];
22+23+ patches = [
24+ (fetchpatch {
25+ name = "python3-managementgen";
26+ url = "https://github.com/apache/qpid-cpp/commit/0e558866e90ef3d5becbd2f6d5630a6a6dc43a5d.patch";
27+ hash = "sha256-pV6xx8Nrys/ZxIO0Z/fARH0ELqcSdTXLPsVXYUd3f70=";
28+ })
29+ ];
30+31+ # the subdir managementgen wants to install python stuff in ${python} and
32+ # the installation tries to create some folders in /var
33+ postPatch = ''
34+ sed -i '/managementgen/d' CMakeLists.txt
35+ sed -i '/ENV/d' src/CMakeLists.txt
36+ sed -i '/management/d' CMakeLists.txt
37+ '';
38+39+ NIX_CFLAGS_COMPILE = toString ([
40+ "-Wno-error=maybe-uninitialized"
41+ ] ++ lib.optionals stdenv.cc.isGNU [
42+ "-Wno-error=deprecated-copy"
43+ ]);
44+45 meta = with lib; {
46 homepage = "https://qpid.apache.org";
47 description = "An AMQP message broker and a C++ messaging API";
···49 platforms = platforms.linux;
50 maintainers = with maintainers; [ cpages ];
51 };
000000000000000000000000000000000000052}
+4
pkgs/servers/dante/default.nix
···25 sha256 = "sha256-e+qF8lB5tkiA7RlJ+tX5O6KxQrQp33RSPdP1TxU961Y=";
26 }) ];
27000028 meta = with lib; {
29 description = "A circuit-level SOCKS client/server that can be used to provide convenient and secure network connectivity";
30 homepage = "https://www.inet.no/dante/";
···25 sha256 = "sha256-e+qF8lB5tkiA7RlJ+tX5O6KxQrQp33RSPdP1TxU961Y=";
26 }) ];
2728+ postPatch = ''
29+ substituteInPlace include/redefgen.sh --replace 'PATH=/bin:/usr/bin:/sbin:/usr/sbin' ""
30+ '';
31+32 meta = with lib; {
33 description = "A circuit-level SOCKS client/server that can be used to provide convenient and secure network connectivity";
34 homepage = "https://www.inet.no/dante/";
+15
pkgs/servers/http/envoy/bump-brotli.patch
···000000000000000
···1+diff --git a/bazel/repository_locations.bzl b/bazel/repository_locations.bzl
2+index 454c54b0ef..2ac0623cf0 100644
3+--- a/bazel/repository_locations.bzl
4++++ b/bazel/repository_locations.bzl
5+@@ -510,8 +510,8 @@ REPOSITORY_LOCATIONS_SPEC = dict(
6+ project_url = "https://brotli.org",
7+ # Use the dev branch of brotli to resolve compilation issues.
8+ # TODO(rojkov): Remove when brotli > 1.0.9 is released.
9+- version = "0cd2e3926e95e7e2930f57ae3f4885508d462a25",
10+- sha256 = "93810780e60304b51f2c9645fe313a6e4640711063ed0b860cfa60999dd256c5",
11++ version = "27dd7265403d8e8fed99a854b9c3e1db7d79525f",
12++ sha256 = "e71238b12e30233bdf25997132b29ae49639a69f33fdef3ae18a47abfc0d5e4c",
13+ strip_prefix = "brotli-{version}",
14+ urls = ["https://github.com/google/brotli/archive/{version}.tar.gz"],
15+ use_category = ["dataplane_ext"],
···1{ lib, fetchurl, fetchpatch, buildPythonPackage
2-, zip, ffmpeg, rtmpdump, phantomjs2, atomicparsley, pycryptodome, pandoc
3# Pandoc is required to build the package's man page. Release tarballs contain a
4# formatted man page already, though, it will still be installed. We keep the
5# manpage argument in place in case someone wants to use this derivation to
···8, generateManPage ? false
9, ffmpegSupport ? true
10, rtmpSupport ? true
11-, phantomjsSupport ? false
12, hlsEncryptedSupport ? true
13, installShellFiles, makeWrapper }:
14···52 packagesToBinPath =
53 [ atomicparsley ]
54 ++ lib.optional ffmpegSupport ffmpeg
55- ++ lib.optional rtmpSupport rtmpdump
56- ++ lib.optional phantomjsSupport phantomjs2;
57 in [ ''--prefix PATH : "${lib.makeBinPath packagesToBinPath}"'' ];
5859 setupPyBuildFlags = [
···1{ lib, fetchurl, fetchpatch, buildPythonPackage
2+, zip, ffmpeg, rtmpdump, atomicparsley, pycryptodome, pandoc
3# Pandoc is required to build the package's man page. Release tarballs contain a
4# formatted man page already, though, it will still be installed. We keep the
5# manpage argument in place in case someone wants to use this derivation to
···8, generateManPage ? false
9, ffmpegSupport ? true
10, rtmpSupport ? true
011, hlsEncryptedSupport ? true
12, installShellFiles, makeWrapper }:
13···51 packagesToBinPath =
52 [ atomicparsley ]
53 ++ lib.optional ffmpegSupport ffmpeg
54+ ++ lib.optional rtmpSupport rtmpdump;
055 in [ ''--prefix PATH : "${lib.makeBinPath packagesToBinPath}"'' ];
5657 setupPyBuildFlags = [
···106 bashburn = throw "bashburn has been removed: deleted by upstream"; # Added 2022-01-07
107 bazaar = throw "bazaar has been deprecated by breezy"; # Added 2020-04-19
108 bazaarTools = throw "bazaar has been deprecated by breezy"; # Added 2020-04-19
0000109 bcat = throw "bcat has been removed because upstream is dead"; # Added 2021-08-22
110 beret = throw "beret has been removed"; # Added 2021-11-16
111 bin_replace_string = throw "bin_replace_string has been removed: deleted by upstream"; # Added 2022-01-07
···941 pgp-tools = throw "'pgp-tools' has been renamed to/replaced by 'signing-party'"; # Converted to throw 2022-02-22
942 pg_tmp = throw "'pg_tmp' has been renamed to/replaced by 'ephemeralpg'"; # Converted to throw 2022-02-22
943 phantomjs = throw "phantomjs 1.9.8 has been dropped due to lack of maintenance and security issues"; # Added 2022-02-20
0944 philter = throw "philter has been removed: abandoned by upstream"; # Added 2022-04-26
945-946 # Obsolete PHP version aliases
947 php73 = throw "php73 has been dropped due to the lack of maintanence from upstream for future releases"; # Added 2021-06-03
948 php73Packages = php73; # Added 2021-06-03
···1061 pulseaudioLight = throw "'pulseaudioLight' has been renamed to/replaced by 'pulseaudio'"; # Converted to throw 2022-02-22
1062 pulseeffects = throw "Use pulseeffects-legacy if you use PulseAudio and easyeffects if you use PipeWire"; # Added 2021-02-13
1063 pulseeffects-pw = easyeffects; # Added 2021-07-07
01064 pydb = throw "pydb has been removed: abandoned by upstream"; # Added 2022-04-22
1065 pyIRCt = throw "pyIRCt has been removed from nixpkgs as it is unmaintained and python2-only";
1066 pyMAILt = throw "pyMAILt has been removed from nixpkgs as it is unmaintained and python2-only";
···106 bashburn = throw "bashburn has been removed: deleted by upstream"; # Added 2022-01-07
107 bazaar = throw "bazaar has been deprecated by breezy"; # Added 2020-04-19
108 bazaarTools = throw "bazaar has been deprecated by breezy"; # Added 2020-04-19
109+ bazel_0 = throw "bazel 0 is past end of life as it is not an lts version"; # Added 2022-05-09
110+ bazel_0_27 = throw "bazel 0.27 is past end of life as it is not an lts version"; # Added 2022-05-09
111+ bazel_0_29 = throw "bazel 0.29 is past end of life as it is not an lts version"; # Added 2022-05-09
112+ bazel_1 = throw "bazel 1 is past end of life as it is not an lts version"; # Added 2022-05-09
113 bcat = throw "bcat has been removed because upstream is dead"; # Added 2021-08-22
114 beret = throw "beret has been removed"; # Added 2021-11-16
115 bin_replace_string = throw "bin_replace_string has been removed: deleted by upstream"; # Added 2022-01-07
···945 pgp-tools = throw "'pgp-tools' has been renamed to/replaced by 'signing-party'"; # Converted to throw 2022-02-22
946 pg_tmp = throw "'pg_tmp' has been renamed to/replaced by 'ephemeralpg'"; # Converted to throw 2022-02-22
947 phantomjs = throw "phantomjs 1.9.8 has been dropped due to lack of maintenance and security issues"; # Added 2022-02-20
948+ phantomjs2 = throw "phantomjs2 has been dropped due to lack of maintenance"; # Added 2022-04-22
949 philter = throw "philter has been removed: abandoned by upstream"; # Added 2022-04-26
0950 # Obsolete PHP version aliases
951 php73 = throw "php73 has been dropped due to the lack of maintanence from upstream for future releases"; # Added 2021-06-03
952 php73Packages = php73; # Added 2021-06-03
···1065 pulseaudioLight = throw "'pulseaudioLight' has been renamed to/replaced by 'pulseaudio'"; # Converted to throw 2022-02-22
1066 pulseeffects = throw "Use pulseeffects-legacy if you use PulseAudio and easyeffects if you use PipeWire"; # Added 2021-02-13
1067 pulseeffects-pw = easyeffects; # Added 2021-07-07
1068+ py-wmi-client = throw "py-wmi-client has been removed: abandoned by upstream"; # Added 2022-04-26
1069 pydb = throw "pydb has been removed: abandoned by upstream"; # Added 2022-04-22
1070 pyIRCt = throw "pyIRCt has been removed from nixpkgs as it is unmaintained and python2-only";
1071 pyMAILt = throw "pyMAILt has been removed from nixpkgs as it is unmaintained and python2-only";