lol

Merge staging-next into staging

authored by

github-actions[bot] and committed by
GitHub
e2839320 586c2d4f

+169 -71
-1
nixos/modules/services/monitoring/parsedmarc.md
··· 17 host = "imap.example.com"; 18 user = "alice@example.com"; 19 password = "/path/to/imap_password_file"; 20 - watch = true; 21 }; 22 provision.geoIp = false; # Not recommended! 23 };
··· 17 host = "imap.example.com"; 18 user = "alice@example.com"; 19 password = "/path/to/imap_password_file"; 20 }; 21 provision.geoIp = false; # Not recommended! 22 };
+30 -16
nixos/modules/services/monitoring/parsedmarc.nix
··· 123 host = "imap.example.com"; 124 user = "alice@example.com"; 125 password = { _secret = "/run/keys/imap_password" }; 126 watch = true; 127 }; 128 splunk_hec = { 129 url = "https://splunkhec.example.com"; ··· 170 }; 171 }; 172 173 imap = { 174 host = lib.mkOption { 175 type = lib.types.str; ··· 216 ''; 217 apply = x: if isAttrs x || x == null then x else { _secret = x; }; 218 }; 219 - 220 - watch = lib.mkOption { 221 - type = lib.types.bool; 222 - default = true; 223 - description = lib.mdDoc '' 224 - Use the IMAP IDLE command to process messages as they arrive. 225 - ''; 226 - }; 227 - 228 - delete = lib.mkOption { 229 - type = lib.types.bool; 230 - default = false; 231 - description = lib.mdDoc '' 232 - Delete messages after processing them, instead of archiving them. 233 - ''; 234 - }; 235 }; 236 237 smtp = { ··· 360 361 config = lib.mkIf cfg.enable { 362 363 services.elasticsearch.enable = lib.mkDefault cfg.provision.elasticsearch; 364 365 services.geoipupdate = lib.mkIf cfg.provision.geoIp { ··· 444 ssl = false; 445 user = cfg.provision.localMail.recipientName; 446 password = "${pkgs.writeText "imap-password" "@imap-password@"}"; 447 watch = true; 448 }; 449 })
··· 123 host = "imap.example.com"; 124 user = "alice@example.com"; 125 password = { _secret = "/run/keys/imap_password" }; 126 + }; 127 + mailbox = { 128 watch = true; 129 + batch_size = 30; 130 }; 131 splunk_hec = { 132 url = "https://splunkhec.example.com"; ··· 173 }; 174 }; 175 176 + mailbox = { 177 + watch = lib.mkOption { 178 + type = lib.types.bool; 179 + default = true; 180 + description = lib.mdDoc '' 181 + Use the IMAP IDLE command to process messages as they arrive. 182 + ''; 183 + }; 184 + 185 + delete = lib.mkOption { 186 + type = lib.types.bool; 187 + default = false; 188 + description = lib.mdDoc '' 189 + Delete messages after processing them, instead of archiving them. 190 + ''; 191 + }; 192 + }; 193 + 194 imap = { 195 host = lib.mkOption { 196 type = lib.types.str; ··· 237 ''; 238 apply = x: if isAttrs x || x == null then x else { _secret = x; }; 239 }; 240 }; 241 242 smtp = { ··· 365 366 config = lib.mkIf cfg.enable { 367 368 + warnings = let 369 + deprecationWarning = optname: "Starting in 8.0.0, the `${optname}` option has been moved from the `services.parsedmarc.settings.imap`" 370 + + "configuration section to the `services.parsedmarc.settings.mailbox` configuration section."; 371 + hasImapOpt = lib.flip builtins.hasAttr cfg.settings.imap; 372 + movedOptions = [ "reports_folder" "archive_folder" "watch" "delete" "test" "batch_size" ]; 373 + in builtins.map deprecationWarning (builtins.filter hasImapOpt movedOptions); 374 + 375 services.elasticsearch.enable = lib.mkDefault cfg.provision.elasticsearch; 376 377 services.geoipupdate = lib.mkIf cfg.provision.geoIp { ··· 456 ssl = false; 457 user = cfg.provision.localMail.recipientName; 458 password = "${pkgs.writeText "imap-password" "@imap-password@"}"; 459 + }; 460 + mailbox = { 461 watch = true; 462 }; 463 })
+3 -4
nixos/modules/services/monitoring/parsedmarc.xml
··· 15 email address and saves them to a local Elasticsearch instance 16 looks like this: 17 </para> 18 - <programlisting language="bash"> 19 services.parsedmarc = { 20 enable = true; 21 settings.imap = { 22 host = &quot;imap.example.com&quot;; 23 user = &quot;alice@example.com&quot;; 24 password = &quot;/path/to/imap_password_file&quot;; 25 - watch = true; 26 }; 27 provision.geoIp = false; # Not recommended! 28 }; ··· 45 email address that should be configured in the domain’s dmarc 46 policy is <literal>dmarc@monitoring.example.com</literal>. 47 </para> 48 - <programlisting language="bash"> 49 services.parsedmarc = { 50 enable = true; 51 provision = { ··· 68 Elasticsearch instance is automatically added as a Grafana 69 datasource, and the dashboard is added to Grafana as well. 70 </para> 71 - <programlisting language="bash"> 72 services.parsedmarc = { 73 enable = true; 74 provision = {
··· 15 email address and saves them to a local Elasticsearch instance 16 looks like this: 17 </para> 18 + <programlisting> 19 services.parsedmarc = { 20 enable = true; 21 settings.imap = { 22 host = &quot;imap.example.com&quot;; 23 user = &quot;alice@example.com&quot;; 24 password = &quot;/path/to/imap_password_file&quot;; 25 }; 26 provision.geoIp = false; # Not recommended! 27 }; ··· 44 email address that should be configured in the domain’s dmarc 45 policy is <literal>dmarc@monitoring.example.com</literal>. 46 </para> 47 + <programlisting> 48 services.parsedmarc = { 49 enable = true; 50 provision = { ··· 67 Elasticsearch instance is automatically added as a Grafana 68 datasource, and the dashboard is added to Grafana as well. 69 </para> 70 + <programlisting> 71 services.parsedmarc = { 72 enable = true; 73 provision = {
-1
nixos/tests/parsedmarc/default.nix
··· 155 ssl = true; 156 user = "alice"; 157 password = "${pkgs.writeText "imap-password" "foobar"}"; 158 - watch = true; 159 }; 160 }; 161
··· 155 ssl = true; 156 user = "alice"; 157 password = "${pkgs.writeText "imap-password" "foobar"}"; 158 }; 159 }; 160
+2 -2
pkgs/applications/audio/ocenaudio/default.nix
··· 11 12 stdenv.mkDerivation rec { 13 pname = "ocenaudio"; 14 - version = "3.11.20"; 15 16 src = fetchurl { 17 url = "https://www.ocenaudio.com/downloads/index.php/ocenaudio_debian9_64.deb?version=${version}"; 18 - sha256 = "sha256-ifzth9qd2YX9WeF6QeXSWkMqRyTGBxPyTm5tkanPiFQ="; 19 }; 20 21 nativeBuildInputs = [
··· 11 12 stdenv.mkDerivation rec { 13 pname = "ocenaudio"; 14 + version = "3.11.21"; 15 16 src = fetchurl { 17 url = "https://www.ocenaudio.com/downloads/index.php/ocenaudio_debian9_64.deb?version=${version}"; 18 + sha256 = "sha256-nItqx3g4W3s1phHe6F8EtOL4nwJQ0XnKB8Ujg71/Q3Q="; 19 }; 20 21 nativeBuildInputs = [
+2 -2
pkgs/applications/audio/rosegarden/default.nix
··· 23 24 stdenv.mkDerivation rec { 25 pname = "rosegarden"; 26 - version = "20.12"; 27 28 src = fetchurl { 29 url = "mirror://sourceforge/rosegarden/${pname}-${version}.tar.bz2"; 30 - sha256 = "sha256-iGaEr8WFipV4I00fhFGI2xMBFPf784IIxNXs2hUTHFs="; 31 }; 32 33 postPhase = ''
··· 23 24 stdenv.mkDerivation rec { 25 pname = "rosegarden"; 26 + version = "22.12.1"; 27 28 src = fetchurl { 29 url = "mirror://sourceforge/rosegarden/${pname}-${version}.tar.bz2"; 30 + sha256 = "sha256-fqeif37lxJeBcI+cYVpRkZuJImSlmeZO3yzSNzPZkgY="; 31 }; 32 33 postPhase = ''
+5 -8
pkgs/applications/audio/spek/default.nix
··· 1 - { lib, stdenv, fetchFromGitHub, autoreconfHook, intltool, pkg-config, ffmpeg, wxGTK30, gtk3, wrapGAppsHook }: 2 3 stdenv.mkDerivation rec { 4 pname = "spek"; 5 - version = "unstable-2018-12-29"; 6 7 src = fetchFromGitHub { 8 owner = "alexkay"; 9 repo = "spek"; 10 - rev = "f071c2956176ad53c7c8059e5c00e694ded31ded"; 11 - sha256 = "1l9gj9c1n92zlcjnyjyk211h83dk0idk644xnm5rs7q40p2zliy5"; 12 }; 13 14 - # needed for autoreconfHook 15 - AUTOPOINT="intltoolize --automake --copy"; 16 - 17 nativeBuildInputs = [ autoreconfHook intltool pkg-config wrapGAppsHook ]; 18 19 - buildInputs = [ ffmpeg wxGTK30 gtk3 ]; 20 21 meta = with lib; { 22 description = "Analyse your audio files by showing their spectrogram";
··· 1 + { lib, stdenv, fetchFromGitHub, autoreconfHook, intltool, pkg-config, ffmpeg, wxGTK32, gtk3, wrapGAppsHook }: 2 3 stdenv.mkDerivation rec { 4 pname = "spek"; 5 + version = "0.8.4"; 6 7 src = fetchFromGitHub { 8 owner = "alexkay"; 9 repo = "spek"; 10 + rev = "v${version}"; 11 + sha256 = "sha256-JLQx5LlnVe1TT1KVO3/QSVRqYL+pAMCxoDWrnkUNmRU="; 12 }; 13 14 nativeBuildInputs = [ autoreconfHook intltool pkg-config wrapGAppsHook ]; 15 16 + buildInputs = [ ffmpeg wxGTK32 gtk3 ]; 17 18 meta = with lib; { 19 description = "Analyse your audio files by showing their spectrogram";
+2 -2
pkgs/applications/misc/grip/default.nix
··· 11 12 stdenv.mkDerivation rec { 13 pname = "grip"; 14 - version = "4.2.3"; 15 16 src = fetchurl { 17 url = "mirror://sourceforge/grip/grip-${version}.tar.gz"; 18 - sha256 = "sha256-5Qgsf4+xs0ckhYJk2csKulXC3nWaLRAsQ15qaTkKkjw="; 19 }; 20 21 nativeBuildInputs = [ pkg-config libtool ];
··· 11 12 stdenv.mkDerivation rec { 13 pname = "grip"; 14 + version = "4.2.4"; 15 16 src = fetchurl { 17 url = "mirror://sourceforge/grip/grip-${version}.tar.gz"; 18 + sha256 = "sha256-lXu0mLLfcX8K1EmoFH0vp2cHluyRwhTL0/bW5Ax36mI="; 19 }; 20 21 nativeBuildInputs = [ pkg-config libtool ];
+2 -2
pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix
··· 2 3 stdenv.mkDerivation rec { 4 pname = "signalbackup-tools"; 5 - version = "20221208"; 6 7 src = fetchFromGitHub { 8 owner = "bepaald"; 9 repo = pname; 10 rev = version; 11 - sha256 = "sha256-GSZy2zW9Ek9nP9zoBfvq3wLghEsaGqmC1f4cs+OVaFE="; 12 }; 13 14 postPatch = ''
··· 2 3 stdenv.mkDerivation rec { 4 pname = "signalbackup-tools"; 5 + version = "20221227-1"; 6 7 src = fetchFromGitHub { 8 owner = "bepaald"; 9 repo = pname; 10 rev = version; 11 + sha256 = "sha256-yOOKgB7MO9LW6qkr/JZOYtteQTW/Yms4CMAg4EIJGc8="; 12 }; 13 14 postPatch = ''
+2 -2
pkgs/applications/networking/libcoap/default.nix
··· 4 }: 5 stdenv.mkDerivation rec { 6 pname = "libcoap"; 7 - version = "4.3.0"; 8 src = fetchFromGitHub { 9 repo = "libcoap"; 10 owner = "obgm"; 11 rev = "v${version}"; 12 fetchSubmodules = true; 13 - sha256 = "1l031ys833gch600g9g3lvbsr4nysx6glbbj4lwvx3ywl0jr6l9k"; 14 }; 15 nativeBuildInputs = [ 16 automake
··· 4 }: 5 stdenv.mkDerivation rec { 6 pname = "libcoap"; 7 + version = "4.3.1"; 8 src = fetchFromGitHub { 9 repo = "libcoap"; 10 owner = "obgm"; 11 rev = "v${version}"; 12 fetchSubmodules = true; 13 + sha256 = "sha256-4XcAo5StyYIfe9wD0cPHKFZalMcBAuiVV2qFZ126KT8="; 14 }; 15 nativeBuildInputs = [ 16 automake
+3 -3
pkgs/applications/networking/protonmail-bridge/default.nix
··· 2 3 buildGoModule rec { 4 pname = "protonmail-bridge"; 5 - version = "2.1.3"; 6 7 src = fetchFromGitHub { 8 owner = "ProtonMail"; 9 repo = "proton-bridge"; 10 rev = "br-${version}"; 11 - sha256 = "sha256-+XeNhjwtH1T5p8iydMQk22nXztyamSn6yY56/qqvkmk="; 12 }; 13 14 - vendorSha256 = "sha256-YTGjiteYfuRkDC4M9c/JKqURq4WiC5n9pFRqRVYhyxU="; 15 16 nativeBuildInputs = [ pkg-config ]; 17
··· 2 3 buildGoModule rec { 4 pname = "protonmail-bridge"; 5 + version = "2.3.0"; 6 7 src = fetchFromGitHub { 8 owner = "ProtonMail"; 9 repo = "proton-bridge"; 10 rev = "br-${version}"; 11 + sha256 = "sha256-7p+Q6/BphE/dxNQe+gfcIty6TAWHUcPpvSJWfmf4OQg="; 12 }; 13 14 + vendorSha256 = "sha256-dhrn6xQ0IJzBYeO6ko2PUCO+idopC2An0ylqCnx5jKg="; 15 16 nativeBuildInputs = [ pkg-config ]; 17
+2 -2
pkgs/applications/science/biology/igv/default.nix
··· 2 3 stdenv.mkDerivation rec { 4 pname = "igv"; 5 - version = "2.15.1"; 6 src = fetchzip { 7 url = "https://data.broadinstitute.org/igv/projects/downloads/${lib.versions.majorMinor version}/IGV_${version}.zip"; 8 - sha256 = "sha256-hwZ6Pl6BxoVbJI5e3b0s7jhQ/AADhVJVqM9Q8ppERuk="; 9 }; 10 11 installPhase = ''
··· 2 3 stdenv.mkDerivation rec { 4 pname = "igv"; 5 + version = "2.15.4"; 6 src = fetchzip { 7 url = "https://data.broadinstitute.org/igv/projects/downloads/${lib.versions.majorMinor version}/IGV_${version}.zip"; 8 + sha256 = "sha256-nDD0QTtLDe//VFMsIPKIykZ6dY85p3aomrCaF1p9HQM="; 9 }; 10 11 installPhase = ''
+3 -3
pkgs/applications/virtualization/nixpacks/default.nix
··· 2 3 rustPlatform.buildRustPackage rec { 4 pname = "nixpacks"; 5 - version = "0.16.0"; 6 7 src = fetchFromGitHub { 8 owner = "railwayapp"; 9 repo = pname; 10 rev = "v${version}"; 11 - sha256 = "sha256-p9kKTNtZoWl2rZyL1cD7fK9+IwDtBCfdRzWjKQmje5M="; 12 }; 13 14 - cargoSha256 = "sha256-UWefCe5DLaxUFNbQV0XNyqNI1dx9HPHfwj+aJaEasFc="; 15 16 # skip test due FHS dependency 17 doCheck = false;
··· 2 3 rustPlatform.buildRustPackage rec { 4 pname = "nixpacks"; 5 + version = "1.0.3"; 6 7 src = fetchFromGitHub { 8 owner = "railwayapp"; 9 repo = pname; 10 rev = "v${version}"; 11 + sha256 = "sha256-0Q0G2vUIkKRTSbQQrXoInzaPfFNWwT/NQ1/NKQeVpHU="; 12 }; 13 14 + cargoSha256 = "sha256-vLUR8Rs33GukkRihoB9jD3G4ailJc8oakm7NSjoZdok="; 15 16 # skip test due FHS dependency 17 doCheck = false;
+15 -2
pkgs/development/compilers/llvm/8/lldb/default.nix
··· 23 24 patches = [ 25 ./gnu-install-dirs.patch 26 ]; 27 28 postPatch = '' ··· 33 cmake/modules/LLDBStandalone.cmake 34 sed -i 's,"$.LLVM_LIBRARY_DIR.",${libllvm.lib}/lib ${libclang.lib}/lib,' \ 35 cmake/modules/LLDBStandalone.cmake 36 ''; 37 38 outputs = [ "out" "lib" "dev" ]; ··· 46 ] ++ lib.optionals stdenv.isDarwin [ 47 darwin.libobjc 48 darwin.apple_sdk.libs.xpc 49 - darwin.apple_sdk.frameworks.Foundation darwin.bootstrap_cmds darwin.apple_sdk.frameworks.Carbon darwin.apple_sdk.frameworks.Cocoa 50 ]; 51 52 CXXFLAGS = "-fno-rtti"; ··· 55 cmakeFlags = [ 56 "-DLLDB_INCLUDE_TESTS=${if doCheck then "YES" else "NO"}" 57 "-DLLDB_CODESIGN_IDENTITY=" # codesigning makes nondeterministic 58 ] ++ lib.optionals doCheck [ 59 "-DLLDB_TEST_C_COMPILER=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc" 60 "-DLLDB_TEST_CXX_COMPILER=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}c++" ··· 80 ''; 81 82 meta = llvm_meta // { 83 - broken = stdenv.isDarwin; 84 homepage = "https://lldb.llvm.org/"; 85 description = "A next-generation high-performance debugger"; 86 longDescription = ''
··· 23 24 patches = [ 25 ./gnu-install-dirs.patch 26 + 27 + # Fix darwin build 28 + ./lldb-gdb-remote-no-libcompress.patch 29 ]; 30 31 postPatch = '' ··· 36 cmake/modules/LLDBStandalone.cmake 37 sed -i 's,"$.LLVM_LIBRARY_DIR.",${libllvm.lib}/lib ${libclang.lib}/lib,' \ 38 cmake/modules/LLDBStandalone.cmake 39 + 40 + substituteInPlace tools/CMakeLists.txt \ 41 + --replace "add_subdirectory(debugserver)" "" 42 ''; 43 44 outputs = [ "out" "lib" "dev" ]; ··· 52 ] ++ lib.optionals stdenv.isDarwin [ 53 darwin.libobjc 54 darwin.apple_sdk.libs.xpc 55 + darwin.apple_sdk.frameworks.Foundation 56 + darwin.bootstrap_cmds 57 + darwin.apple_sdk.frameworks.Carbon 58 + darwin.apple_sdk.frameworks.Cocoa 59 + darwin.apple_sdk.frameworks.DebugSymbols 60 ]; 61 62 CXXFLAGS = "-fno-rtti"; ··· 65 cmakeFlags = [ 66 "-DLLDB_INCLUDE_TESTS=${if doCheck then "YES" else "NO"}" 67 "-DLLDB_CODESIGN_IDENTITY=" # codesigning makes nondeterministic 68 + ] ++ lib.optionals stdenv.isDarwin [ 69 + # Building debugserver requires the proprietary libcompression 70 + "-DLLDB_NO_DEBUGSERVER=ON" 71 ] ++ lib.optionals doCheck [ 72 "-DLLDB_TEST_C_COMPILER=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc" 73 "-DLLDB_TEST_CXX_COMPILER=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}c++" ··· 93 ''; 94 95 meta = llvm_meta // { 96 + broken = stdenv.isDarwin && stdenv.isAarch64; 97 homepage = "https://lldb.llvm.org/"; 98 description = "A next-generation high-performance debugger"; 99 longDescription = ''
+30
pkgs/development/compilers/llvm/8/lldb/lldb-gdb-remote-no-libcompress.patch
···
··· 1 + diff -ru a/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp b/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp 2 + --- a/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp 2019-01-09 19:46:09.000000000 -0500 3 + +++ b/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp 2021-11-27 00:23:08.000000000 -0500 4 + @@ -42,11 +42,6 @@ 5 + #define DEBUGSERVER_BASENAME "lldb-server" 6 + #endif 7 + 8 + -#if defined(__APPLE__) 9 + -#define HAVE_LIBCOMPRESSION 10 + -#include <compression.h> 11 + -#endif 12 + - 13 + #if defined(HAVE_LIBZ) 14 + #include <zlib.h> 15 + #endif 16 + diff -ru a/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp b/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp 17 + --- a/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp 2018-12-18 18:02:50.000000000 -0500 18 + +++ b/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp 2021-11-27 00:09:07.000000000 -0500 19 + @@ -37,11 +37,6 @@ 20 + 21 + #include "llvm/ADT/StringSwitch.h" 22 + 23 + -#if defined(__APPLE__) 24 + -#define HAVE_LIBCOMPRESSION 25 + -#include <compression.h> 26 + -#endif 27 + - 28 + using namespace lldb; 29 + using namespace lldb_private; 30 + using namespace lldb_private::process_gdb_remote;
+22 -1
pkgs/development/compilers/llvm/9/lldb/default.nix
··· 1 { lib, stdenv, llvm_meta 2 , fetch 3 , cmake 4 , zlib 5 , ncurses ··· 13 , version 14 , darwin 15 , makeWrapper 16 , lit 17 }: 18 ··· 25 patches = [ 26 ./procfs.patch 27 ./gnu-install-dirs.patch 28 ]; 29 30 outputs = [ "out" "lib" "dev" ]; 31 32 nativeBuildInputs = [ 33 cmake python3 which swig lit makeWrapper 34 ]; 35 36 buildInputs = [ ··· 42 darwin.bootstrap_cmds 43 darwin.apple_sdk.frameworks.Carbon 44 darwin.apple_sdk.frameworks.Cocoa 45 ]; 46 47 CXXFLAGS = "-fno-rtti"; ··· 52 "-DClang_DIR=${libclang.dev}/lib/cmake" 53 "-DLLVM_EXTERNAL_LIT=${lit}/bin/lit" 54 "-DLLDB_CODESIGN_IDENTITY=" # codesigning makes nondeterministic 55 ] ++ lib.optionals doCheck [ 56 "-DLLDB_TEST_C_COMPILER=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc" 57 "-DLLDB_TEST_CXX_COMPILER=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}c++" ··· 80 ''; 81 82 meta = llvm_meta // { 83 - broken = stdenv.isDarwin; 84 homepage = "https://lldb.llvm.org/"; 85 description = "A next-generation high-performance debugger"; 86 longDescription = ''
··· 1 { lib, stdenv, llvm_meta 2 , fetch 3 + , fetchpatch 4 , cmake 5 , zlib 6 , ncurses ··· 14 , version 15 , darwin 16 , makeWrapper 17 + , perl 18 , lit 19 }: 20 ··· 27 patches = [ 28 ./procfs.patch 29 ./gnu-install-dirs.patch 30 + 31 + # Fix darwin build 32 + (fetchpatch { 33 + name = "lldb-use-system-debugserver-fix.patch"; 34 + url = "https://github.com/llvm-mirror/lldb/commit/be770754cc43da22eacdb70c6203f4582eeb011f.diff"; 35 + sha256 = "sha256-tKkk6sn//0Hu0nlzoKWs5fXMWc+O2JAWOEJ1ZnaLuVU="; 36 + excludes = [ "packages/*" ]; 37 + postFetch = '' 38 + substituteInPlace "$out" --replace add_lldb_tool_subdirectory add_subdirectory 39 + ''; 40 + }) 41 + ./lldb-gdb-remote-no-libcompress.patch 42 ]; 43 44 outputs = [ "out" "lib" "dev" ]; 45 46 nativeBuildInputs = [ 47 cmake python3 which swig lit makeWrapper 48 + ] ++ lib.optionals stdenv.isDarwin [ 49 + # for scripts/generate-vers.pl 50 + perl 51 ]; 52 53 buildInputs = [ ··· 59 darwin.bootstrap_cmds 60 darwin.apple_sdk.frameworks.Carbon 61 darwin.apple_sdk.frameworks.Cocoa 62 + darwin.apple_sdk.frameworks.DebugSymbols 63 ]; 64 65 CXXFLAGS = "-fno-rtti"; ··· 70 "-DClang_DIR=${libclang.dev}/lib/cmake" 71 "-DLLVM_EXTERNAL_LIT=${lit}/bin/lit" 72 "-DLLDB_CODESIGN_IDENTITY=" # codesigning makes nondeterministic 73 + ] ++ lib.optionals stdenv.isDarwin [ 74 + # Building debugserver requires the proprietary libcompression 75 + "-DLLDB_USE_SYSTEM_DEBUGSERVER=ON" 76 ] ++ lib.optionals doCheck [ 77 "-DLLDB_TEST_C_COMPILER=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc" 78 "-DLLDB_TEST_CXX_COMPILER=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}c++" ··· 101 ''; 102 103 meta = llvm_meta // { 104 + broken = stdenv.isDarwin && stdenv.isAarch64; 105 homepage = "https://lldb.llvm.org/"; 106 description = "A next-generation high-performance debugger"; 107 longDescription = ''
+17
pkgs/development/compilers/llvm/9/lldb/lldb-gdb-remote-no-libcompress.patch
···
··· 1 + diff -ru a/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp b/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp 2 + --- a/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp 2019-12-11 14:15:30.000000000 -0500 3 + +++ b/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp 2021-11-26 23:44:28.000000000 -0500 4 + @@ -36,13 +36,6 @@ 5 + 6 + #include "llvm/ADT/StringSwitch.h" 7 + 8 + -#if defined(__APPLE__) 9 + -#ifndef HAVE_LIBCOMPRESSION 10 + -#define HAVE_LIBCOMPRESSION 11 + -#endif 12 + -#include <compression.h> 13 + -#endif 14 + - 15 + using namespace lldb; 16 + using namespace lldb_private; 17 + using namespace lldb_private::process_gdb_remote;
+2 -2
pkgs/development/libraries/nv-codec-headers/11_x.nix
··· 5 6 stdenv.mkDerivation rec { 7 pname = "nv-codec-headers"; 8 - version = "11.1.5.1"; 9 10 src = fetchgit { 11 url = "https://git.videolan.org/git/ffmpeg/nv-codec-headers.git"; 12 rev = "n${version}"; 13 - sha256 = "sha256-yTOKLjyYLxT/nI1FBOMwHpkDhfuua3+6Z5Mpb7ZrRhU="; 14 }; 15 16 makeFlags = [
··· 5 6 stdenv.mkDerivation rec { 7 pname = "nv-codec-headers"; 8 + version = "11.1.5.2"; 9 10 src = fetchgit { 11 url = "https://git.videolan.org/git/ffmpeg/nv-codec-headers.git"; 12 rev = "n${version}"; 13 + sha256 = "sha256-KzaqwpzISHB7tSTruynEOJmSlJnAFK2h7/cRI/zkNPk="; 14 }; 15 16 makeFlags = [
+4 -4
pkgs/development/ocaml-modules/base64/default.nix
··· 1 - { lib, fetchurl, buildDunePackage, ocaml, alcotest, bos, rresult }: 2 3 buildDunePackage rec { 4 pname = "base64"; 5 version = "3.5.0"; 6 7 - minimumOCamlVersion = "4.03"; 8 - 9 - useDune2 = true; 10 11 src = fetchurl { 12 url = "https://github.com/mirage/ocaml-base64/releases/download/v${version}/base64-v${version}.tbz"; 13 sha256 = "sha256-WJ3pwAV46/54QZismBjTWGxHSyMWts0+HEbMsfYq46Q="; 14 }; 15 16 # otherwise fmt breaks evaluation 17 doCheck = lib.versionAtLeast ocaml.version "4.08";
··· 1 + { lib, fetchurl, buildDunePackage, ocaml, findlib, alcotest, bos, rresult }: 2 3 buildDunePackage rec { 4 pname = "base64"; 5 version = "3.5.0"; 6 7 + minimalOCamlVersion = "4.03"; 8 9 src = fetchurl { 10 url = "https://github.com/mirage/ocaml-base64/releases/download/v${version}/base64-v${version}.tbz"; 11 sha256 = "sha256-WJ3pwAV46/54QZismBjTWGxHSyMWts0+HEbMsfYq46Q="; 12 }; 13 + 14 + propagatedBuildInputs = [ findlib ]; 15 16 # otherwise fmt breaks evaluation 17 doCheck = lib.versionAtLeast ocaml.version "4.08";
+6 -3
pkgs/development/ocaml-modules/mrmime/default.nix
··· 6 , bigarray-overlap 7 , bigstringaf 8 , buildDunePackage 9 , emile 10 , fetchzip 11 , fmt ··· 16 , ke 17 , lib 18 , mirage-crypto-rng 19 , pecu 20 , prettym 21 , ptime ··· 34 sha256 = "14k67v0b39b8jq3ny2ymi8g8sqx2gd81mlzsjphdzdqnlx6fk716"; 35 }; 36 37 - useDune2 = true; 38 39 propagatedBuildInputs = [ 40 angstrom ··· 60 61 checkInputs = [ 62 alcotest 63 - hxd 64 jsonm 65 ]; 66 - doCheck = true; 67 68 meta = { 69 description = "Parser and generator of mail in OCaml";
··· 6 , bigarray-overlap 7 , bigstringaf 8 , buildDunePackage 9 + , cmdliner 10 , emile 11 , fetchzip 12 , fmt ··· 17 , ke 18 , lib 19 , mirage-crypto-rng 20 + , ocaml 21 , pecu 22 , prettym 23 , ptime ··· 36 sha256 = "14k67v0b39b8jq3ny2ymi8g8sqx2gd81mlzsjphdzdqnlx6fk716"; 37 }; 38 39 + duneVersion = "3"; 40 + 41 + buildInputs = [ cmdliner hxd ]; 42 43 propagatedBuildInputs = [ 44 angstrom ··· 64 65 checkInputs = [ 66 alcotest 67 jsonm 68 ]; 69 + doCheck = lib.versionOlder ocaml.version "5.0"; 70 71 meta = { 72 description = "Parser and generator of mail in OCaml";
+4
pkgs/development/ocaml-modules/piaf/default.nix
··· 1 { alcotest-lwt 2 , buildDunePackage 3 , dune-site 4 , fetchzip 5 , gluten-lwt-unix ··· 13 , ssl 14 , uri 15 }: 16 17 buildDunePackage rec { 18 pname = "piaf";
··· 1 { alcotest-lwt 2 , buildDunePackage 3 + , ocaml 4 , dune-site 5 , fetchzip 6 , gluten-lwt-unix ··· 14 , ssl 15 , uri 16 }: 17 + 18 + lib.throwIf (lib.versionAtLeast ocaml.version "5.0") 19 + "piaf is not available for OCaml ${ocaml.version}" 20 21 buildDunePackage rec { 22 pname = "piaf";
+2 -1
pkgs/development/ocaml-modules/ppx_deriving/default.nix
··· 1 { lib 2 , fetchurl 3 , buildDunePackage 4 , cppo 5 , ppxlib 6 , ppx_derivers ··· 51 result 52 ]; 53 54 - doCheck = true; 55 checkInputs = [ 56 (if lib.versionAtLeast version "5.2" then ounit2 else ounit) 57 ];
··· 1 { lib 2 , fetchurl 3 , buildDunePackage 4 + , ocaml 5 , cppo 6 , ppxlib 7 , ppx_derivers ··· 52 result 53 ]; 54 55 + doCheck = lib.versionOlder ocaml.version "5.0"; 56 checkInputs = [ 57 (if lib.versionAtLeast version "5.2" then ounit2 else ounit) 58 ];
+2 -2
pkgs/development/python-modules/whois/default.nix
··· 7 8 buildPythonPackage rec { 9 pname = "whois"; 10 - version = "0.9.19"; 11 format = "setuptools"; 12 13 disabled = pythonOlder "3.7"; ··· 16 owner = "DannyCork"; 17 repo = "python-whois"; 18 rev = "refs/tags/${version}"; 19 - hash = "sha256-b8OZppynDT0MCwH4ic+wMJzWqyUzsigzxD0yYGfgJmI="; 20 }; 21 22 propagatedBuildInputs = [
··· 7 8 buildPythonPackage rec { 9 pname = "whois"; 10 + version = "0.9.20"; 11 format = "setuptools"; 12 13 disabled = pythonOlder "3.7"; ··· 16 owner = "DannyCork"; 17 repo = "python-whois"; 18 rev = "refs/tags/${version}"; 19 + hash = "sha256-J2v2TKTrzhi1XLW2e/N3jAGCy3W8cQEFV5cJAf8gT4g="; 20 }; 21 22 propagatedBuildInputs = [
+3 -3
pkgs/development/tools/database/timescaledb-tune/default.nix
··· 2 3 buildGoModule rec { 4 pname = "timescaledb-tune"; 5 - version = "0.14.2"; 6 7 src = fetchFromGitHub { 8 owner = "timescale"; 9 repo = pname; 10 rev = "v${version}"; 11 - sha256 = "sha256-vbFfqGWYpw0ppon/0oQMRixQStk+YSi/QFMi0AQoUpQ="; 12 }; 13 14 - vendorSha256 = "sha256-n2jrg9FiR/gSrbds/QVV8Duf7BTEs36yYi4F3Ve+d0E="; 15 16 ldflags = [ "-s" "-w" ]; 17
··· 2 3 buildGoModule rec { 4 pname = "timescaledb-tune"; 5 + version = "0.14.3"; 6 7 src = fetchFromGitHub { 8 owner = "timescale"; 9 repo = pname; 10 rev = "v${version}"; 11 + sha256 = "sha256-MQi8A7eWOShP/VhxuX4Uhz1ueLtKvOi1x4E7aFXEsQo="; 12 }; 13 14 + vendorSha256 = "sha256-yXWeINubvfZ2S+3gVFsrzeVO3XXIiZ14qfK+9Bj3SV4="; 15 16 ldflags = [ "-s" "-w" ]; 17
+3
pkgs/os-specific/darwin/apple-sdk-11.0/private-frameworks.nix
··· 18 19 # Also expose CoreSymbolication; used by `root` package. 20 CoreSymbolication = {}; 21 }
··· 18 19 # Also expose CoreSymbolication; used by `root` package. 20 CoreSymbolication = {}; 21 + 22 + # Also expose DebugSymbols; used by `llvmPackages_8.lldb` package. 23 + DebugSymbols = {}; 24 }
+1 -1
pkgs/os-specific/darwin/apple-sdk/default.nix
··· 326 "Versions/A/Frameworks/WebKitLegacy.framework/Versions/A/WebKitLegacy.tbd" 327 ]; 328 }); 329 - } // lib.genAttrs [ "ContactsPersistence" "CoreSymbolication" "GameCenter" "SkyLight" "UIFoundation" ] (x: tbdOnlyFramework x {}); 330 331 bareFrameworks = lib.mapAttrs framework (import ./frameworks.nix { 332 inherit frameworks libs;
··· 326 "Versions/A/Frameworks/WebKitLegacy.framework/Versions/A/WebKitLegacy.tbd" 327 ]; 328 }); 329 + } // lib.genAttrs [ "ContactsPersistence" "CoreSymbolication" "DebugSymbols" "GameCenter" "SkyLight" "UIFoundation" ] (x: tbdOnlyFramework x {}); 330 331 bareFrameworks = lib.mapAttrs framework (import ./frameworks.nix { 332 inherit frameworks libs;
-2
pkgs/os-specific/linux/eudev/default.nix
··· 2 , stdenv 3 , fetchFromGitHub 4 , autoreconfHook 5 - , glib 6 , gperf 7 , kmod 8 , pkg-config ··· 27 ]; 28 29 buildInputs = [ 30 - glib 31 kmod 32 util-linux 33 ];
··· 2 , stdenv 3 , fetchFromGitHub 4 , autoreconfHook 5 , gperf 6 , kmod 7 , pkg-config ··· 26 ]; 27 28 buildInputs = [ 29 kmod 30 util-linux 31 ];
+2 -2
pkgs/servers/monitoring/vmagent/default.nix
··· 1 { lib, fetchFromGitHub, buildGoModule }: 2 buildGoModule rec { 3 pname = "vmagent"; 4 - version = "1.85.0"; 5 6 src = fetchFromGitHub { 7 owner = "VictoriaMetrics"; 8 repo = "VictoriaMetrics"; 9 rev = "v${version}"; 10 - sha256 = "sha256-ez/gq+QBDy2xGqUBoUWQFDDUpd4i0zpj9mUDZUWKbIw="; 11 }; 12 13 ldflags = [ "-s" "-w" "-X github.com/VictoriaMetrics/VictoriaMetrics/lib/buildinfo.Version=${version}" ];
··· 1 { lib, fetchFromGitHub, buildGoModule }: 2 buildGoModule rec { 3 pname = "vmagent"; 4 + version = "1.85.3"; 5 6 src = fetchFromGitHub { 7 owner = "VictoriaMetrics"; 8 repo = "VictoriaMetrics"; 9 rev = "v${version}"; 10 + sha256 = "sha256-/p5oHxp1fVyUMjZ3vim9YKNhFqIACGa3KTYIv/k4MXg="; 11 }; 12 13 ldflags = [ "-s" "-w" "-X github.com/VictoriaMetrics/VictoriaMetrics/lib/buildinfo.Version=${version}" ];