Merge staging-next into staging

This commit is contained in:
github-actions[bot]
2023-01-03 12:01:44 +00:00
committed by GitHub
28 changed files with 169 additions and 71 deletions

View File

@@ -17,7 +17,6 @@ services.parsedmarc = {
host = "imap.example.com"; host = "imap.example.com";
user = "alice@example.com"; user = "alice@example.com";
password = "/path/to/imap_password_file"; password = "/path/to/imap_password_file";
watch = true;
}; };
provision.geoIp = false; # Not recommended! provision.geoIp = false; # Not recommended!
}; };

View File

@@ -123,7 +123,10 @@ in
host = "imap.example.com"; host = "imap.example.com";
user = "alice@example.com"; user = "alice@example.com";
password = { _secret = "/run/keys/imap_password" }; password = { _secret = "/run/keys/imap_password" };
};
mailbox = {
watch = true; watch = true;
batch_size = 30;
}; };
splunk_hec = { splunk_hec = {
url = "https://splunkhec.example.com"; url = "https://splunkhec.example.com";
@@ -170,6 +173,24 @@ in
}; };
}; };
mailbox = {
watch = lib.mkOption {
type = lib.types.bool;
default = true;
description = lib.mdDoc ''
Use the IMAP IDLE command to process messages as they arrive.
'';
};
delete = lib.mkOption {
type = lib.types.bool;
default = false;
description = lib.mdDoc ''
Delete messages after processing them, instead of archiving them.
'';
};
};
imap = { imap = {
host = lib.mkOption { host = lib.mkOption {
type = lib.types.str; type = lib.types.str;
@@ -216,22 +237,6 @@ in
''; '';
apply = x: if isAttrs x || x == null then x else { _secret = x; }; apply = x: if isAttrs x || x == null then x else { _secret = x; };
}; };
watch = lib.mkOption {
type = lib.types.bool;
default = true;
description = lib.mdDoc ''
Use the IMAP IDLE command to process messages as they arrive.
'';
};
delete = lib.mkOption {
type = lib.types.bool;
default = false;
description = lib.mdDoc ''
Delete messages after processing them, instead of archiving them.
'';
};
}; };
smtp = { smtp = {
@@ -360,6 +365,13 @@ in
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
warnings = let
deprecationWarning = optname: "Starting in 8.0.0, the `${optname}` option has been moved from the `services.parsedmarc.settings.imap`"
+ "configuration section to the `services.parsedmarc.settings.mailbox` configuration section.";
hasImapOpt = lib.flip builtins.hasAttr cfg.settings.imap;
movedOptions = [ "reports_folder" "archive_folder" "watch" "delete" "test" "batch_size" ];
in builtins.map deprecationWarning (builtins.filter hasImapOpt movedOptions);
services.elasticsearch.enable = lib.mkDefault cfg.provision.elasticsearch; services.elasticsearch.enable = lib.mkDefault cfg.provision.elasticsearch;
services.geoipupdate = lib.mkIf cfg.provision.geoIp { services.geoipupdate = lib.mkIf cfg.provision.geoIp {
@@ -444,6 +456,8 @@ in
ssl = false; ssl = false;
user = cfg.provision.localMail.recipientName; user = cfg.provision.localMail.recipientName;
password = "${pkgs.writeText "imap-password" "@imap-password@"}"; password = "${pkgs.writeText "imap-password" "@imap-password@"}";
};
mailbox = {
watch = true; watch = true;
}; };
}) })

View File

@@ -15,14 +15,13 @@
email address and saves them to a local Elasticsearch instance email address and saves them to a local Elasticsearch instance
looks like this: looks like this:
</para> </para>
<programlisting language="bash"> <programlisting>
services.parsedmarc = { services.parsedmarc = {
enable = true; enable = true;
settings.imap = { settings.imap = {
host = &quot;imap.example.com&quot;; host = &quot;imap.example.com&quot;;
user = &quot;alice@example.com&quot;; user = &quot;alice@example.com&quot;;
password = &quot;/path/to/imap_password_file&quot;; password = &quot;/path/to/imap_password_file&quot;;
watch = true;
}; };
provision.geoIp = false; # Not recommended! provision.geoIp = false; # Not recommended!
}; };
@@ -45,7 +44,7 @@ services.parsedmarc = {
email address that should be configured in the domains dmarc email address that should be configured in the domains dmarc
policy is <literal>dmarc@monitoring.example.com</literal>. policy is <literal>dmarc@monitoring.example.com</literal>.
</para> </para>
<programlisting language="bash"> <programlisting>
services.parsedmarc = { services.parsedmarc = {
enable = true; enable = true;
provision = { provision = {
@@ -68,7 +67,7 @@ services.parsedmarc = {
Elasticsearch instance is automatically added as a Grafana Elasticsearch instance is automatically added as a Grafana
datasource, and the dashboard is added to Grafana as well. datasource, and the dashboard is added to Grafana as well.
</para> </para>
<programlisting language="bash"> <programlisting>
services.parsedmarc = { services.parsedmarc = {
enable = true; enable = true;
provision = { provision = {

View File

@@ -155,7 +155,6 @@ in
ssl = true; ssl = true;
user = "alice"; user = "alice";
password = "${pkgs.writeText "imap-password" "foobar"}"; password = "${pkgs.writeText "imap-password" "foobar"}";
watch = true;
}; };
}; };

View File

@@ -11,11 +11,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "ocenaudio"; pname = "ocenaudio";
version = "3.11.20"; version = "3.11.21";
src = fetchurl { src = fetchurl {
url = "https://www.ocenaudio.com/downloads/index.php/ocenaudio_debian9_64.deb?version=${version}"; url = "https://www.ocenaudio.com/downloads/index.php/ocenaudio_debian9_64.deb?version=${version}";
sha256 = "sha256-ifzth9qd2YX9WeF6QeXSWkMqRyTGBxPyTm5tkanPiFQ="; sha256 = "sha256-nItqx3g4W3s1phHe6F8EtOL4nwJQ0XnKB8Ujg71/Q3Q=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@@ -23,11 +23,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "rosegarden"; pname = "rosegarden";
version = "20.12"; version = "22.12.1";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/rosegarden/${pname}-${version}.tar.bz2"; url = "mirror://sourceforge/rosegarden/${pname}-${version}.tar.bz2";
sha256 = "sha256-iGaEr8WFipV4I00fhFGI2xMBFPf784IIxNXs2hUTHFs="; sha256 = "sha256-fqeif37lxJeBcI+cYVpRkZuJImSlmeZO3yzSNzPZkgY=";
}; };
postPhase = '' postPhase = ''

View File

@@ -1,22 +1,19 @@
{ lib, stdenv, fetchFromGitHub, autoreconfHook, intltool, pkg-config, ffmpeg, wxGTK30, gtk3, wrapGAppsHook }: { lib, stdenv, fetchFromGitHub, autoreconfHook, intltool, pkg-config, ffmpeg, wxGTK32, gtk3, wrapGAppsHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "spek"; pname = "spek";
version = "unstable-2018-12-29"; version = "0.8.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "alexkay"; owner = "alexkay";
repo = "spek"; repo = "spek";
rev = "f071c2956176ad53c7c8059e5c00e694ded31ded"; rev = "v${version}";
sha256 = "1l9gj9c1n92zlcjnyjyk211h83dk0idk644xnm5rs7q40p2zliy5"; sha256 = "sha256-JLQx5LlnVe1TT1KVO3/QSVRqYL+pAMCxoDWrnkUNmRU=";
}; };
# needed for autoreconfHook
AUTOPOINT="intltoolize --automake --copy";
nativeBuildInputs = [ autoreconfHook intltool pkg-config wrapGAppsHook ]; nativeBuildInputs = [ autoreconfHook intltool pkg-config wrapGAppsHook ];
buildInputs = [ ffmpeg wxGTK30 gtk3 ]; buildInputs = [ ffmpeg wxGTK32 gtk3 ];
meta = with lib; { meta = with lib; {
description = "Analyse your audio files by showing their spectrogram"; description = "Analyse your audio files by showing their spectrogram";

View File

@@ -11,11 +11,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "grip"; pname = "grip";
version = "4.2.3"; version = "4.2.4";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/grip/grip-${version}.tar.gz"; url = "mirror://sourceforge/grip/grip-${version}.tar.gz";
sha256 = "sha256-5Qgsf4+xs0ckhYJk2csKulXC3nWaLRAsQ15qaTkKkjw="; sha256 = "sha256-lXu0mLLfcX8K1EmoFH0vp2cHluyRwhTL0/bW5Ax36mI=";
}; };
nativeBuildInputs = [ pkg-config libtool ]; nativeBuildInputs = [ pkg-config libtool ];

View File

@@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "signalbackup-tools"; pname = "signalbackup-tools";
version = "20221208"; version = "20221227-1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "bepaald"; owner = "bepaald";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "sha256-GSZy2zW9Ek9nP9zoBfvq3wLghEsaGqmC1f4cs+OVaFE="; sha256 = "sha256-yOOKgB7MO9LW6qkr/JZOYtteQTW/Yms4CMAg4EIJGc8=";
}; };
postPatch = '' postPatch = ''

View File

@@ -4,13 +4,13 @@
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libcoap"; pname = "libcoap";
version = "4.3.0"; version = "4.3.1";
src = fetchFromGitHub { src = fetchFromGitHub {
repo = "libcoap"; repo = "libcoap";
owner = "obgm"; owner = "obgm";
rev = "v${version}"; rev = "v${version}";
fetchSubmodules = true; fetchSubmodules = true;
sha256 = "1l031ys833gch600g9g3lvbsr4nysx6glbbj4lwvx3ywl0jr6l9k"; sha256 = "sha256-4XcAo5StyYIfe9wD0cPHKFZalMcBAuiVV2qFZ126KT8=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
automake automake

View File

@@ -2,16 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "protonmail-bridge"; pname = "protonmail-bridge";
version = "2.1.3"; version = "2.3.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ProtonMail"; owner = "ProtonMail";
repo = "proton-bridge"; repo = "proton-bridge";
rev = "br-${version}"; rev = "br-${version}";
sha256 = "sha256-+XeNhjwtH1T5p8iydMQk22nXztyamSn6yY56/qqvkmk="; sha256 = "sha256-7p+Q6/BphE/dxNQe+gfcIty6TAWHUcPpvSJWfmf4OQg=";
}; };
vendorSha256 = "sha256-YTGjiteYfuRkDC4M9c/JKqURq4WiC5n9pFRqRVYhyxU="; vendorSha256 = "sha256-dhrn6xQ0IJzBYeO6ko2PUCO+idopC2An0ylqCnx5jKg=";
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];

View File

@@ -2,10 +2,10 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "igv"; pname = "igv";
version = "2.15.1"; version = "2.15.4";
src = fetchzip { src = fetchzip {
url = "https://data.broadinstitute.org/igv/projects/downloads/${lib.versions.majorMinor version}/IGV_${version}.zip"; url = "https://data.broadinstitute.org/igv/projects/downloads/${lib.versions.majorMinor version}/IGV_${version}.zip";
sha256 = "sha256-hwZ6Pl6BxoVbJI5e3b0s7jhQ/AADhVJVqM9Q8ppERuk="; sha256 = "sha256-nDD0QTtLDe//VFMsIPKIykZ6dY85p3aomrCaF1p9HQM=";
}; };
installPhase = '' installPhase = ''

View File

@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "nixpacks"; pname = "nixpacks";
version = "0.16.0"; version = "1.0.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "railwayapp"; owner = "railwayapp";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-p9kKTNtZoWl2rZyL1cD7fK9+IwDtBCfdRzWjKQmje5M="; sha256 = "sha256-0Q0G2vUIkKRTSbQQrXoInzaPfFNWwT/NQ1/NKQeVpHU=";
}; };
cargoSha256 = "sha256-UWefCe5DLaxUFNbQV0XNyqNI1dx9HPHfwj+aJaEasFc="; cargoSha256 = "sha256-vLUR8Rs33GukkRihoB9jD3G4ailJc8oakm7NSjoZdok=";
# skip test due FHS dependency # skip test due FHS dependency
doCheck = false; doCheck = false;

View File

@@ -23,6 +23,9 @@ stdenv.mkDerivation rec {
patches = [ patches = [
./gnu-install-dirs.patch ./gnu-install-dirs.patch
# Fix darwin build
./lldb-gdb-remote-no-libcompress.patch
]; ];
postPatch = '' postPatch = ''
@@ -33,6 +36,9 @@ stdenv.mkDerivation rec {
cmake/modules/LLDBStandalone.cmake cmake/modules/LLDBStandalone.cmake
sed -i 's,"$.LLVM_LIBRARY_DIR.",${libllvm.lib}/lib ${libclang.lib}/lib,' \ sed -i 's,"$.LLVM_LIBRARY_DIR.",${libllvm.lib}/lib ${libclang.lib}/lib,' \
cmake/modules/LLDBStandalone.cmake cmake/modules/LLDBStandalone.cmake
substituteInPlace tools/CMakeLists.txt \
--replace "add_subdirectory(debugserver)" ""
''; '';
outputs = [ "out" "lib" "dev" ]; outputs = [ "out" "lib" "dev" ];
@@ -46,7 +52,11 @@ stdenv.mkDerivation rec {
] ++ lib.optionals stdenv.isDarwin [ ] ++ lib.optionals stdenv.isDarwin [
darwin.libobjc darwin.libobjc
darwin.apple_sdk.libs.xpc darwin.apple_sdk.libs.xpc
darwin.apple_sdk.frameworks.Foundation darwin.bootstrap_cmds darwin.apple_sdk.frameworks.Carbon darwin.apple_sdk.frameworks.Cocoa darwin.apple_sdk.frameworks.Foundation
darwin.bootstrap_cmds
darwin.apple_sdk.frameworks.Carbon
darwin.apple_sdk.frameworks.Cocoa
darwin.apple_sdk.frameworks.DebugSymbols
]; ];
CXXFLAGS = "-fno-rtti"; CXXFLAGS = "-fno-rtti";
@@ -55,6 +65,9 @@ stdenv.mkDerivation rec {
cmakeFlags = [ cmakeFlags = [
"-DLLDB_INCLUDE_TESTS=${if doCheck then "YES" else "NO"}" "-DLLDB_INCLUDE_TESTS=${if doCheck then "YES" else "NO"}"
"-DLLDB_CODESIGN_IDENTITY=" # codesigning makes nondeterministic "-DLLDB_CODESIGN_IDENTITY=" # codesigning makes nondeterministic
] ++ lib.optionals stdenv.isDarwin [
# Building debugserver requires the proprietary libcompression
"-DLLDB_NO_DEBUGSERVER=ON"
] ++ lib.optionals doCheck [ ] ++ lib.optionals doCheck [
"-DLLDB_TEST_C_COMPILER=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc" "-DLLDB_TEST_C_COMPILER=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc"
"-DLLDB_TEST_CXX_COMPILER=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}c++" "-DLLDB_TEST_CXX_COMPILER=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}c++"
@@ -80,7 +93,7 @@ stdenv.mkDerivation rec {
''; '';
meta = llvm_meta // { meta = llvm_meta // {
broken = stdenv.isDarwin; broken = stdenv.isDarwin && stdenv.isAarch64;
homepage = "https://lldb.llvm.org/"; homepage = "https://lldb.llvm.org/";
description = "A next-generation high-performance debugger"; description = "A next-generation high-performance debugger";
longDescription = '' longDescription = ''

View File

@@ -0,0 +1,30 @@
diff -ru a/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp b/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp
--- a/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp 2019-01-09 19:46:09.000000000 -0500
+++ b/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp 2021-11-27 00:23:08.000000000 -0500
@@ -42,11 +42,6 @@
#define DEBUGSERVER_BASENAME "lldb-server"
#endif
-#if defined(__APPLE__)
-#define HAVE_LIBCOMPRESSION
-#include <compression.h>
-#endif
-
#if defined(HAVE_LIBZ)
#include <zlib.h>
#endif
diff -ru a/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp b/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp
--- a/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp 2018-12-18 18:02:50.000000000 -0500
+++ b/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp 2021-11-27 00:09:07.000000000 -0500
@@ -37,11 +37,6 @@
#include "llvm/ADT/StringSwitch.h"
-#if defined(__APPLE__)
-#define HAVE_LIBCOMPRESSION
-#include <compression.h>
-#endif
-
using namespace lldb;
using namespace lldb_private;
using namespace lldb_private::process_gdb_remote;

View File

@@ -1,5 +1,6 @@
{ lib, stdenv, llvm_meta { lib, stdenv, llvm_meta
, fetch , fetch
, fetchpatch
, cmake , cmake
, zlib , zlib
, ncurses , ncurses
@@ -13,6 +14,7 @@
, version , version
, darwin , darwin
, makeWrapper , makeWrapper
, perl
, lit , lit
}: }:
@@ -25,12 +27,27 @@ stdenv.mkDerivation rec {
patches = [ patches = [
./procfs.patch ./procfs.patch
./gnu-install-dirs.patch ./gnu-install-dirs.patch
# Fix darwin build
(fetchpatch {
name = "lldb-use-system-debugserver-fix.patch";
url = "https://github.com/llvm-mirror/lldb/commit/be770754cc43da22eacdb70c6203f4582eeb011f.diff";
sha256 = "sha256-tKkk6sn//0Hu0nlzoKWs5fXMWc+O2JAWOEJ1ZnaLuVU=";
excludes = [ "packages/*" ];
postFetch = ''
substituteInPlace "$out" --replace add_lldb_tool_subdirectory add_subdirectory
'';
})
./lldb-gdb-remote-no-libcompress.patch
]; ];
outputs = [ "out" "lib" "dev" ]; outputs = [ "out" "lib" "dev" ];
nativeBuildInputs = [ nativeBuildInputs = [
cmake python3 which swig lit makeWrapper cmake python3 which swig lit makeWrapper
] ++ lib.optionals stdenv.isDarwin [
# for scripts/generate-vers.pl
perl
]; ];
buildInputs = [ buildInputs = [
@@ -42,6 +59,7 @@ stdenv.mkDerivation rec {
darwin.bootstrap_cmds darwin.bootstrap_cmds
darwin.apple_sdk.frameworks.Carbon darwin.apple_sdk.frameworks.Carbon
darwin.apple_sdk.frameworks.Cocoa darwin.apple_sdk.frameworks.Cocoa
darwin.apple_sdk.frameworks.DebugSymbols
]; ];
CXXFLAGS = "-fno-rtti"; CXXFLAGS = "-fno-rtti";
@@ -52,6 +70,9 @@ stdenv.mkDerivation rec {
"-DClang_DIR=${libclang.dev}/lib/cmake" "-DClang_DIR=${libclang.dev}/lib/cmake"
"-DLLVM_EXTERNAL_LIT=${lit}/bin/lit" "-DLLVM_EXTERNAL_LIT=${lit}/bin/lit"
"-DLLDB_CODESIGN_IDENTITY=" # codesigning makes nondeterministic "-DLLDB_CODESIGN_IDENTITY=" # codesigning makes nondeterministic
] ++ lib.optionals stdenv.isDarwin [
# Building debugserver requires the proprietary libcompression
"-DLLDB_USE_SYSTEM_DEBUGSERVER=ON"
] ++ lib.optionals doCheck [ ] ++ lib.optionals doCheck [
"-DLLDB_TEST_C_COMPILER=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc" "-DLLDB_TEST_C_COMPILER=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc"
"-DLLDB_TEST_CXX_COMPILER=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}c++" "-DLLDB_TEST_CXX_COMPILER=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}c++"
@@ -80,7 +101,7 @@ stdenv.mkDerivation rec {
''; '';
meta = llvm_meta // { meta = llvm_meta // {
broken = stdenv.isDarwin; broken = stdenv.isDarwin && stdenv.isAarch64;
homepage = "https://lldb.llvm.org/"; homepage = "https://lldb.llvm.org/";
description = "A next-generation high-performance debugger"; description = "A next-generation high-performance debugger";
longDescription = '' longDescription = ''

View File

@@ -0,0 +1,17 @@
diff -ru a/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp b/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp
--- a/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp 2019-12-11 14:15:30.000000000 -0500
+++ b/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp 2021-11-26 23:44:28.000000000 -0500
@@ -36,13 +36,6 @@
#include "llvm/ADT/StringSwitch.h"
-#if defined(__APPLE__)
-#ifndef HAVE_LIBCOMPRESSION
-#define HAVE_LIBCOMPRESSION
-#endif
-#include <compression.h>
-#endif
-
using namespace lldb;
using namespace lldb_private;
using namespace lldb_private::process_gdb_remote;

View File

@@ -5,12 +5,12 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "nv-codec-headers"; pname = "nv-codec-headers";
version = "11.1.5.1"; version = "11.1.5.2";
src = fetchgit { src = fetchgit {
url = "https://git.videolan.org/git/ffmpeg/nv-codec-headers.git"; url = "https://git.videolan.org/git/ffmpeg/nv-codec-headers.git";
rev = "n${version}"; rev = "n${version}";
sha256 = "sha256-yTOKLjyYLxT/nI1FBOMwHpkDhfuua3+6Z5Mpb7ZrRhU="; sha256 = "sha256-KzaqwpzISHB7tSTruynEOJmSlJnAFK2h7/cRI/zkNPk=";
}; };
makeFlags = [ makeFlags = [

View File

@@ -1,18 +1,18 @@
{ lib, fetchurl, buildDunePackage, ocaml, alcotest, bos, rresult }: { lib, fetchurl, buildDunePackage, ocaml, findlib, alcotest, bos, rresult }:
buildDunePackage rec { buildDunePackage rec {
pname = "base64"; pname = "base64";
version = "3.5.0"; version = "3.5.0";
minimumOCamlVersion = "4.03"; minimalOCamlVersion = "4.03";
useDune2 = true;
src = fetchurl { src = fetchurl {
url = "https://github.com/mirage/ocaml-base64/releases/download/v${version}/base64-v${version}.tbz"; url = "https://github.com/mirage/ocaml-base64/releases/download/v${version}/base64-v${version}.tbz";
sha256 = "sha256-WJ3pwAV46/54QZismBjTWGxHSyMWts0+HEbMsfYq46Q="; sha256 = "sha256-WJ3pwAV46/54QZismBjTWGxHSyMWts0+HEbMsfYq46Q=";
}; };
propagatedBuildInputs = [ findlib ];
# otherwise fmt breaks evaluation # otherwise fmt breaks evaluation
doCheck = lib.versionAtLeast ocaml.version "4.08"; doCheck = lib.versionAtLeast ocaml.version "4.08";
checkInputs = [ alcotest bos rresult ]; checkInputs = [ alcotest bos rresult ];

View File

@@ -6,6 +6,7 @@
, bigarray-overlap , bigarray-overlap
, bigstringaf , bigstringaf
, buildDunePackage , buildDunePackage
, cmdliner
, emile , emile
, fetchzip , fetchzip
, fmt , fmt
@@ -16,6 +17,7 @@
, ke , ke
, lib , lib
, mirage-crypto-rng , mirage-crypto-rng
, ocaml
, pecu , pecu
, prettym , prettym
, ptime , ptime
@@ -34,7 +36,9 @@ buildDunePackage rec {
sha256 = "14k67v0b39b8jq3ny2ymi8g8sqx2gd81mlzsjphdzdqnlx6fk716"; sha256 = "14k67v0b39b8jq3ny2ymi8g8sqx2gd81mlzsjphdzdqnlx6fk716";
}; };
useDune2 = true; duneVersion = "3";
buildInputs = [ cmdliner hxd ];
propagatedBuildInputs = [ propagatedBuildInputs = [
angstrom angstrom
@@ -60,10 +64,9 @@ buildDunePackage rec {
checkInputs = [ checkInputs = [
alcotest alcotest
hxd
jsonm jsonm
]; ];
doCheck = true; doCheck = lib.versionOlder ocaml.version "5.0";
meta = { meta = {
description = "Parser and generator of mail in OCaml"; description = "Parser and generator of mail in OCaml";

View File

@@ -1,5 +1,6 @@
{ alcotest-lwt { alcotest-lwt
, buildDunePackage , buildDunePackage
, ocaml
, dune-site , dune-site
, fetchzip , fetchzip
, gluten-lwt-unix , gluten-lwt-unix
@@ -14,6 +15,9 @@
, uri , uri
}: }:
lib.throwIf (lib.versionAtLeast ocaml.version "5.0")
"piaf is not available for OCaml ${ocaml.version}"
buildDunePackage rec { buildDunePackage rec {
pname = "piaf"; pname = "piaf";
version = "0.1.0"; version = "0.1.0";

View File

@@ -1,6 +1,7 @@
{ lib { lib
, fetchurl , fetchurl
, buildDunePackage , buildDunePackage
, ocaml
, cppo , cppo
, ppxlib , ppxlib
, ppx_derivers , ppx_derivers
@@ -51,7 +52,7 @@ buildDunePackage rec {
result result
]; ];
doCheck = true; doCheck = lib.versionOlder ocaml.version "5.0";
checkInputs = [ checkInputs = [
(if lib.versionAtLeast version "5.2" then ounit2 else ounit) (if lib.versionAtLeast version "5.2" then ounit2 else ounit)
]; ];

View File

@@ -7,7 +7,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "whois"; pname = "whois";
version = "0.9.19"; version = "0.9.20";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
@@ -16,7 +16,7 @@ buildPythonPackage rec {
owner = "DannyCork"; owner = "DannyCork";
repo = "python-whois"; repo = "python-whois";
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-b8OZppynDT0MCwH4ic+wMJzWqyUzsigzxD0yYGfgJmI="; hash = "sha256-J2v2TKTrzhi1XLW2e/N3jAGCy3W8cQEFV5cJAf8gT4g=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

View File

@@ -2,16 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "timescaledb-tune"; pname = "timescaledb-tune";
version = "0.14.2"; version = "0.14.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "timescale"; owner = "timescale";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-vbFfqGWYpw0ppon/0oQMRixQStk+YSi/QFMi0AQoUpQ="; sha256 = "sha256-MQi8A7eWOShP/VhxuX4Uhz1ueLtKvOi1x4E7aFXEsQo=";
}; };
vendorSha256 = "sha256-n2jrg9FiR/gSrbds/QVV8Duf7BTEs36yYi4F3Ve+d0E="; vendorSha256 = "sha256-yXWeINubvfZ2S+3gVFsrzeVO3XXIiZ14qfK+9Bj3SV4=";
ldflags = [ "-s" "-w" ]; ldflags = [ "-s" "-w" ];

View File

@@ -18,4 +18,7 @@
# Also expose CoreSymbolication; used by `root` package. # Also expose CoreSymbolication; used by `root` package.
CoreSymbolication = {}; CoreSymbolication = {};
# Also expose DebugSymbols; used by `llvmPackages_8.lldb` package.
DebugSymbols = {};
} }

View File

@@ -326,7 +326,7 @@ in rec {
"Versions/A/Frameworks/WebKitLegacy.framework/Versions/A/WebKitLegacy.tbd" "Versions/A/Frameworks/WebKitLegacy.framework/Versions/A/WebKitLegacy.tbd"
]; ];
}); });
} // lib.genAttrs [ "ContactsPersistence" "CoreSymbolication" "GameCenter" "SkyLight" "UIFoundation" ] (x: tbdOnlyFramework x {}); } // lib.genAttrs [ "ContactsPersistence" "CoreSymbolication" "DebugSymbols" "GameCenter" "SkyLight" "UIFoundation" ] (x: tbdOnlyFramework x {});
bareFrameworks = lib.mapAttrs framework (import ./frameworks.nix { bareFrameworks = lib.mapAttrs framework (import ./frameworks.nix {
inherit frameworks libs; inherit frameworks libs;

View File

@@ -2,7 +2,6 @@
, stdenv , stdenv
, fetchFromGitHub , fetchFromGitHub
, autoreconfHook , autoreconfHook
, glib
, gperf , gperf
, kmod , kmod
, pkg-config , pkg-config
@@ -27,7 +26,6 @@ stdenv.mkDerivation rec {
]; ];
buildInputs = [ buildInputs = [
glib
kmod kmod
util-linux util-linux
]; ];

View File

@@ -1,13 +1,13 @@
{ lib, fetchFromGitHub, buildGoModule }: { lib, fetchFromGitHub, buildGoModule }:
buildGoModule rec { buildGoModule rec {
pname = "vmagent"; pname = "vmagent";
version = "1.85.0"; version = "1.85.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "VictoriaMetrics"; owner = "VictoriaMetrics";
repo = "VictoriaMetrics"; repo = "VictoriaMetrics";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-ez/gq+QBDy2xGqUBoUWQFDDUpd4i0zpj9mUDZUWKbIw="; sha256 = "sha256-/p5oHxp1fVyUMjZ3vim9YKNhFqIACGa3KTYIv/k4MXg=";
}; };
ldflags = [ "-s" "-w" "-X github.com/VictoriaMetrics/VictoriaMetrics/lib/buildinfo.Version=${version}" ]; ldflags = [ "-s" "-w" "-X github.com/VictoriaMetrics/VictoriaMetrics/lib/buildinfo.Version=${version}" ];