Merge master into staging-next
This commit is contained in:
github-actions[bot]
@@ -60,6 +60,9 @@ in {
|
||||
resolver.public-suffix = lib.mkDefault [
|
||||
"file://${pkgs.publicsuffix-list}/share/publicsuffix/public_suffix_list.dat"
|
||||
];
|
||||
config.resource = {
|
||||
spam-filter = lib.mkDefault "file://${cfg.package}/etc/stalwart/spamfilter.toml";
|
||||
};
|
||||
};
|
||||
|
||||
# This service stores a potentially large amount of data.
|
||||
|
||||
@@ -51,24 +51,15 @@ in
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "imagemagick";
|
||||
version = "7.1.1-33";
|
||||
version = "7.1.1-34";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ImageMagick";
|
||||
repo = "ImageMagick";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-URGcJDgvRdpYZoECyVeSd0ut1Nkl0Sx2pDhYpi8Yf6o=";
|
||||
hash = "sha256-rECU/dp8HQKFs1PW6QeTZIMxCIzzh1w7CckapnxdzxU=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fixes 7.1.1-32 -> 7.1.1-33 regression that, notably, affects
|
||||
# perlPackages.ImageMagick tests. Should be in the next release.
|
||||
(fetchpatch {
|
||||
url = "https://github.com/ImageMagick/ImageMagick/commit/bdc6c09cec64fd8e1570ee3edf5647acde336272.patch";
|
||||
hash = "sha256-cfmti9DXFhvn0UasmW0vwrNp+Lfepyrnp6ijk+1sJo8=";
|
||||
})
|
||||
];
|
||||
|
||||
outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big
|
||||
outputMan = "out"; # it's tiny
|
||||
|
||||
|
||||
@@ -23,17 +23,22 @@
|
||||
, libspelling
|
||||
, icu
|
||||
, gst_all_1
|
||||
, clapper
|
||||
# clapper support is still experimental and has bugs.
|
||||
# See https://github.com/GeopJr/Tuba/pull/931
|
||||
, clapperSupport? false
|
||||
, nix-update-script
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tuba";
|
||||
version = "0.7.2";
|
||||
version = "0.8.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "GeopJr";
|
||||
repo = "Tuba";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-PRbepitFSvdw/7y5VlnSdsQwnlTQg4ktM4t1/x6SmAY=";
|
||||
hash = "sha256-dN915sPBttnrcOuhUJjEtdojOQi9VRLmc+t1RvWmx64=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -67,7 +72,13 @@ stdenv.mkDerivation rec {
|
||||
gst-plugins-base
|
||||
(gst-plugins-good.override { gtkSupport = true; })
|
||||
gst-plugins-bad
|
||||
]);
|
||||
]) ++ lib.optionals clapperSupport [
|
||||
clapper
|
||||
];
|
||||
|
||||
mesonFlags = [
|
||||
(lib.mesonBool "clapper" clapperSupport)
|
||||
];
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=int-conversion";
|
||||
|
||||
@@ -75,12 +86,12 @@ stdenv.mkDerivation rec {
|
||||
updateScript = nix-update-script { };
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Browse the Fediverse";
|
||||
homepage = "https://tuba.geopjr.dev/";
|
||||
mainProgram = "dev.geopjr.Tuba";
|
||||
license = licenses.gpl3Only;
|
||||
license = lib.licenses.gpl3Only;
|
||||
changelog = "https://github.com/GeopJr/Tuba/releases/tag/v${version}";
|
||||
maintainers = with maintainers; [ chuangzhu aleksana ];
|
||||
maintainers = with lib.maintainers; [ chuangzhu aleksana ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,10 +1,8 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, llvmPackages
|
||||
, callPackage
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, clang
|
||||
, llvm
|
||||
, python3
|
||||
, z3
|
||||
, stp
|
||||
@@ -13,6 +11,7 @@
|
||||
, sqlite
|
||||
, gtest
|
||||
, lit
|
||||
, nix-update-script
|
||||
|
||||
# Build KLEE in debug mode. Defaults to false.
|
||||
, debug ? false
|
||||
@@ -30,19 +29,35 @@
|
||||
# Enable runtime asserts. Default false.
|
||||
, runtimeAsserts ? false
|
||||
|
||||
# Extra klee-uclibc config.
|
||||
# Klee uclibc. Defaults to the bundled version.
|
||||
, kleeuClibc ? null
|
||||
|
||||
# Extra klee-uclibc config for the default klee-uclibc.
|
||||
, extraKleeuClibcConfig ? {}
|
||||
}:
|
||||
|
||||
# Klee supports these LLVM versions.
|
||||
let
|
||||
llvmVersion = llvmPackages.llvm.version;
|
||||
inherit (lib.strings) versionAtLeast versionOlder;
|
||||
in
|
||||
assert versionAtLeast llvmVersion "11" && versionOlder llvmVersion "17";
|
||||
|
||||
let
|
||||
# The chosen version of klee-uclibc.
|
||||
chosenKleeuClibc =
|
||||
if kleeuClibc == null then
|
||||
callPackage ./klee-uclibc.nix {
|
||||
llvmPackages = llvmPackages;
|
||||
inherit extraKleeuClibcConfig debugRuntime runtimeAsserts;
|
||||
}
|
||||
else
|
||||
kleeuClibc;
|
||||
|
||||
# Python used for KLEE tests.
|
||||
kleePython = python3.withPackages (ps: with ps; [ tabulate ]);
|
||||
|
||||
# The klee-uclibc derivation.
|
||||
kleeuClibc = callPackage ./klee-uclibc.nix {
|
||||
inherit stdenv clang llvm extraKleeuClibcConfig debugRuntime runtimeAsserts;
|
||||
};
|
||||
in stdenv.mkDerivation rec {
|
||||
in
|
||||
llvmPackages.stdenv.mkDerivation rec {
|
||||
pname = "klee";
|
||||
version = "3.1";
|
||||
|
||||
@@ -54,14 +69,16 @@ in stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
buildInputs = [
|
||||
llvmPackages.llvm
|
||||
cryptominisat
|
||||
gperftools
|
||||
llvm
|
||||
sqlite
|
||||
stp
|
||||
z3
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
gtest
|
||||
|
||||
@@ -77,10 +94,10 @@ in stdenv.mkDerivation rec {
|
||||
onOff = val: if val then "ON" else "OFF";
|
||||
in [
|
||||
"-DKLEE_RUNTIME_BUILD_TYPE=${if debugRuntime then "Debug" else "Release"}"
|
||||
"-DLLVMCC=${clang}/bin/clang"
|
||||
"-DLLVMCXX=${clang}/bin/clang++"
|
||||
"-DLLVMCC=${llvmPackages.clang}/bin/clang"
|
||||
"-DLLVMCXX=${llvmPackages.clang}/bin/clang++"
|
||||
"-DKLEE_ENABLE_TIMESTAMP=${onOff false}"
|
||||
"-DKLEE_UCLIBC_PATH=${kleeuClibc}"
|
||||
"-DKLEE_UCLIBC_PATH=${chosenKleeuClibc}"
|
||||
"-DENABLE_KLEE_ASSERTS=${onOff asserts}"
|
||||
"-DENABLE_POSIX_RUNTIME=${onOff true}"
|
||||
"-DENABLE_UNIT_TESTS=${onOff true}"
|
||||
@@ -94,20 +111,25 @@ in stdenv.mkDerivation rec {
|
||||
env.NIX_CFLAGS_COMPILE = toString ["-Wno-macro-redefined"];
|
||||
|
||||
prePatch = ''
|
||||
patchShebangs .
|
||||
patchShebangs --build .
|
||||
'';
|
||||
|
||||
# https://github.com/klee/klee/issues/1690
|
||||
hardeningDisable = [ "fortify" ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
doCheck = true;
|
||||
|
||||
passthru = {
|
||||
# Let the user depend on `klee.uclibc` for klee-uclibc
|
||||
uclibc = kleeuClibc;
|
||||
updateScript = nix-update-script {
|
||||
extraArgs = [ "--version-regex" "v(\d\.\d)" ];
|
||||
};
|
||||
# Let the user access the chosen uClibc outside the derivation.
|
||||
uclibc = chosenKleeuClibc;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
mainProgram = "klee";
|
||||
description = "Symbolic virtual machine built on top of LLVM";
|
||||
longDescription = ''
|
||||
KLEE is a symbolic virtual machine built on top of the LLVM compiler
|
||||
@@ -128,7 +150,7 @@ in stdenv.mkDerivation rec {
|
||||
that matches a computed test input, including setting up files, pipes,
|
||||
environment variables, and passing command line arguments.
|
||||
'';
|
||||
homepage = "https://klee.github.io/";
|
||||
homepage = "https://klee.github.io";
|
||||
license = licenses.ncsa;
|
||||
platforms = [ "x86_64-linux" ];
|
||||
maintainers = with maintainers; [ numinit ];
|
||||
|
||||
@@ -1,13 +1,12 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, llvmPackages
|
||||
, fetchurl
|
||||
, fetchFromGitHub
|
||||
, which
|
||||
, linuxHeaders
|
||||
, clang
|
||||
, llvm
|
||||
, python3
|
||||
, curl
|
||||
, which
|
||||
, nix-update-script
|
||||
, debugRuntime ? true
|
||||
, runtimeAsserts ? false
|
||||
, extraKleeuClibcConfig ? {}
|
||||
@@ -24,21 +23,22 @@ let
|
||||
"RUNTIME_PREFIX" = "/";
|
||||
"DEVEL_PREFIX" = "/";
|
||||
});
|
||||
in stdenv.mkDerivation rec {
|
||||
in
|
||||
llvmPackages.stdenv.mkDerivation rec {
|
||||
pname = "klee-uclibc";
|
||||
version = "1.4";
|
||||
src = fetchFromGitHub {
|
||||
owner = "klee";
|
||||
repo = "klee-uclibc";
|
||||
rev = "klee_uclibc_v${version}";
|
||||
sha256 = "sha256-sogQK5Ed0k5tf4rrYwCKT4YRKyEovgT25p0BhGvJ1ok=";
|
||||
hash = "sha256-sogQK5Ed0k5tf4rrYwCKT4YRKyEovgT25p0BhGvJ1ok=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
clang
|
||||
curl
|
||||
llvm
|
||||
llvmPackages.clang
|
||||
llvmPackages.llvm
|
||||
python3
|
||||
curl
|
||||
which
|
||||
];
|
||||
|
||||
@@ -47,11 +47,11 @@ in stdenv.mkDerivation rec {
|
||||
|
||||
# HACK: needed for cross-compile.
|
||||
# See https://www.mail-archive.com/klee-dev@imperial.ac.uk/msg03141.html
|
||||
KLEE_CFLAGS = "-idirafter ${clang}/resource-root/include";
|
||||
KLEE_CFLAGS = "-idirafter ${llvmPackages.clang}/resource-root/include";
|
||||
|
||||
prePatch = ''
|
||||
patchShebangs ./configure
|
||||
patchShebangs ./extra
|
||||
patchShebangs --build ./configure
|
||||
patchShebangs --build ./extra
|
||||
'';
|
||||
|
||||
# klee-uclibc configure does not support --prefix, so we override configurePhase entirely
|
||||
@@ -88,13 +88,19 @@ in stdenv.mkDerivation rec {
|
||||
|
||||
makeFlags = ["HAVE_DOT_CONFIG=y"];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
passthru.updateScript = nix-update-script {
|
||||
extraArgs = [ "--version-regex" "v(\d\.\d)" ];
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Modified version of uClibc for KLEE";
|
||||
longDescription = ''
|
||||
klee-uclibc is a bitcode build of uClibc meant for compatibility with the
|
||||
KLEE symbolic virtual machine.
|
||||
'';
|
||||
homepage = "https://klee.github.io/";
|
||||
homepage = "https://github.com/klee/klee-uclibc";
|
||||
license = licenses.lgpl3;
|
||||
maintainers = with maintainers; [ numinit ];
|
||||
};
|
||||
|
||||
@@ -3,11 +3,11 @@
|
||||
buildKodiAddon rec {
|
||||
pname = "future";
|
||||
namespace = "script.module.future";
|
||||
version = "0.18.3+matrix.1";
|
||||
version = "1.0.0+matrix.1";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://mirrors.kodi.tv/addons/${lib.toLower rel}/${namespace}/${namespace}-${version}.zip";
|
||||
sha256 = "sha256-jKO2Qxi54z6UiCmMkxU+2pog40K2yb8/KYbNPFYuSsQ=";
|
||||
sha256 = "sha256-BsDgCAZuJBRBpe6EmfSynhrXS3ktQRZsEwf9CdF0VCg=";
|
||||
};
|
||||
|
||||
passthru = {
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
|
||||
let
|
||||
pname = "beekeeper-studio";
|
||||
version = "4.4.0";
|
||||
version = "4.6.0";
|
||||
|
||||
plat = {
|
||||
aarch64-linux = "-arm64";
|
||||
@@ -15,8 +15,8 @@ let
|
||||
}.${stdenv.hostPlatform.system};
|
||||
|
||||
hash = {
|
||||
aarch64-linux = "sha256-RzPw+jsHecOYSBn/TrEFew5V0LvYS15dUuscS7+GraM=";
|
||||
x86_64-linux = "sha256-fWr0ezPU5U8G9M3JEjUdBFZksbJL5CUjdNbAyT5dwI8=";
|
||||
aarch64-linux = "sha256-ZxqwxCON21S+RPG0/M2TtcI2Ave7ZT05lKQdyysQFUk=";
|
||||
x86_64-linux = "sha256-y4Muap7X4YyeIftRGC+NrDt3wjqOPi1lt+tsHhKmx4M=";
|
||||
}.${stdenv.hostPlatform.system};
|
||||
|
||||
src = fetchurl {
|
||||
@@ -36,16 +36,17 @@ appimageTools.wrapType2 {
|
||||
install -Dm444 ${appimageContents}/${pname}.desktop -t $out/share/applications/
|
||||
install -Dm444 ${appimageContents}/${pname}.png -t $out/share/pixmaps/
|
||||
substituteInPlace $out/share/applications/${pname}.desktop \
|
||||
--replace 'Exec=AppRun --no-sandbox' 'Exec=${pname}'
|
||||
--replace-fail 'Exec=AppRun --no-sandbox' 'Exec=${pname}'
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Modern and easy to use SQL client for MySQL, Postgres, SQLite, SQL Server, and more. Linux, MacOS, and Windows";
|
||||
homepage = "https://www.beekeeperstudio.io";
|
||||
changelog = "https://github.com/beekeeper-studio/beekeeper-studio/releases/tag/v${version}";
|
||||
license = licenses.gpl3Only;
|
||||
license = lib.licenses.gpl3Only;
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||
mainProgram = "beekeeper-studio";
|
||||
maintainers = with maintainers; [ milogert alexnortung ];
|
||||
maintainers = with lib.maintainers; [ milogert alexnortung ];
|
||||
platforms = [ "aarch64-linux" "x86_64-linux" ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
let
|
||||
argset = {
|
||||
pname = "chezmoi";
|
||||
version = "2.49.0";
|
||||
version = "2.49.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "twpayne";
|
||||
repo = "chezmoi";
|
||||
rev = "v${argset.version}";
|
||||
hash = "sha256-9VMNeWJzbfpHL9u6fYF1HzQGlREU6eQmF9mwqxosTGI=";
|
||||
hash = "sha256-DrilLcV6wyUVPPiDs5KiC8kztNCH4Fug5h35+xerLZU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-0gM2C8vXFOFDNJVnjq0Qbm2urhenWcH8F+ExAtjMVc0=";
|
||||
vendorHash = "sha256-3nufF280WuDNvhKn9xP9dnxNX2VC59nifuJp+ebUSvk=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
||||
@@ -0,0 +1,37 @@
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
python3Packages,
|
||||
pdfminer
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "pdftitle";
|
||||
version = "0.11";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "metebalci";
|
||||
repo = "pdftitle";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-kj1pJpyWRgEaAADF6YqzdD8QnJ6iu0eXFMR4NGM4/+Y=";
|
||||
};
|
||||
|
||||
build-system = with python3Packages; [
|
||||
setuptools
|
||||
];
|
||||
|
||||
dependencies = with python3Packages; [
|
||||
pdfminer
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "pdftitle" ];
|
||||
|
||||
meta = {
|
||||
description = "Utility to extract the title from a PDF file";
|
||||
homepage = "https://github.com/metebalci/pdftitle";
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = with lib.maintainers; [ dansbandit ];
|
||||
mainProgram = "pdftitle";
|
||||
};
|
||||
}
|
||||
@@ -4,14 +4,14 @@
|
||||
}:
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "rclip";
|
||||
version = "1.10.0";
|
||||
version = "1.10.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "yurijmikhalevich";
|
||||
repo = "rclip";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-l3KsOX5IkU4/wQyXXHR+09KPSD6nsnBaiGjSi7fMyqA=";
|
||||
hash = "sha256-02ZbeUw+O7tBQwauklaPPcgNasG+mYrSnw9TGJqtJfk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with python3Packages; [
|
||||
|
||||
@@ -0,0 +1,67 @@
|
||||
{
|
||||
fetchFromGitHub,
|
||||
fetchurl,
|
||||
lib,
|
||||
makeWrapper,
|
||||
rPackages,
|
||||
rWrapper,
|
||||
stdenv
|
||||
}:
|
||||
|
||||
let
|
||||
my-r-packages = rWrapper.override{packages = with rPackages; [
|
||||
foreach
|
||||
doParallel
|
||||
randomForest
|
||||
];};
|
||||
transcriptome-url = "https://kumisystems.dl.sourceforge.net/project/splicing-prediction-pipeline/transcriptome/";
|
||||
|
||||
transcriptome19 = fetchurl {
|
||||
url = transcriptome-url + "/transcriptome_hg19.RData";
|
||||
sha256 = "sha256-E8UmHoNoySSIde+TRE6bxVP0PrccpKDvIHBGCvWnYOw=";
|
||||
};
|
||||
|
||||
transcriptome38 = fetchurl {
|
||||
url = transcriptome-url + "/transcriptome_hg38.RData";
|
||||
sha256 = "sha256-mQMMZVN1byXMYjFoRdezmoZtnhUur2CHOP/j/pmw8as=";
|
||||
};
|
||||
|
||||
in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "spip";
|
||||
version = "unstable-2023-04-19";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "raphaelleman";
|
||||
repo = "SPiP";
|
||||
rev = "cae95fe0ee7a2602630b7a4eacbf7cfa0e1763f0";
|
||||
sha256 = "sha256-/CufUaQYnsdo8Rij/24JmixPgMi7o1CApLxeTneWAVc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
buildInput = [ my-r-packages ];
|
||||
|
||||
installPhase =''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/bin
|
||||
cp SPiPv2.1_main.r $out/
|
||||
cp -r RefFiles $out/
|
||||
ln -s ${transcriptome19} $out/RefFiles/transcriptome_hg19.RData
|
||||
ln -s ${transcriptome38} $out/RefFiles/transcriptome_hg38.RData
|
||||
makeWrapper ${my-r-packages}/bin/Rscript $out/bin/spip \
|
||||
--add-flags "$out/SPiPv2.1_main.r"
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A random forest model for splice prediction in genomics";
|
||||
license = licenses.mit;
|
||||
homepage = "https://github.com/raphaelleman/SPiP";
|
||||
maintainers = with maintainers; [ apraga ];
|
||||
platforms = platforms.unix;
|
||||
mainProgram = "spip";
|
||||
};
|
||||
}
|
||||
@@ -74,6 +74,10 @@ rustPlatform.buildRustPackage {
|
||||
};
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out/etc/stalwart
|
||||
cp resources/config/spamfilter.toml $out/etc/stalwart/spamfilter.toml
|
||||
cp -r resources/config/spamfilter $out/etc/stalwart/
|
||||
|
||||
mkdir -p $out/lib/systemd/system
|
||||
|
||||
substitute resources/systemd/stalwart-mail.service $out/lib/systemd/system/stalwart-mail.service \
|
||||
|
||||
Generated
+4781
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,52 @@
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
rustPlatform,
|
||||
|
||||
ffmpeg,
|
||||
makeWrapper,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "substudy";
|
||||
version = "0.6.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "emk";
|
||||
repo = "subtitles-rs";
|
||||
rev = "${pname}_v${version}";
|
||||
hash = "sha256-ACYbSQKaOJ2hS8NbOAppfKo+Mk3CKg0OAwb56AH42Zs=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"async-openai-0.19.1" = "sha256-UrWSZW3LxMZfinmQAjouhqTrhVhHkjgz9EzrZxR0qG4=";
|
||||
};
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
nativeCheckInputs = [ ffmpeg ];
|
||||
|
||||
cargoBuildFlags = [ "-p substudy" ];
|
||||
|
||||
preCheck = ''
|
||||
# That's to make sure the `test_ai_request_static`
|
||||
# test has access to the cache at `$HOME/.cache`
|
||||
export HOME=$(mktemp -d)
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
wrapProgram "$out/bin/substudy" \
|
||||
--prefix PATH : ${lib.makeBinPath [ ffmpeg ]}
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Learn foreign languages using audio and subtitles extracted from video files";
|
||||
homepage = "http://www.randomhacks.net/substudy";
|
||||
license = licenses.asl20;
|
||||
mainProgram = "substudy";
|
||||
maintainers = with maintainers; [ paveloom ];
|
||||
};
|
||||
}
|
||||
@@ -1,36 +1,55 @@
|
||||
{ lib, buildGoModule, fetchFromGitHub, nixosTests }:
|
||||
{
|
||||
lib,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
nixosTests,
|
||||
withServer ? true, # the actual metrics server
|
||||
withVmAgent ? true, # Agent to collect metrics
|
||||
withVmAlert ? true, # Alert Manager
|
||||
withVmAuth ? true, # HTTP proxy for authentication
|
||||
withBackupTools ? true, # vmbackup, vmrestore
|
||||
withVmctl ? true, # vmctl is used to migrate time series
|
||||
withVictoriaLogs ? true, # logs server
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "VictoriaMetrics";
|
||||
version = "1.101.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
owner = "VictoriaMetrics";
|
||||
repo = "VictoriaMetrics";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Jjz/CbVCvc9NFbvzYTFthG8cov4pYpc6y1A1Kmd3Mjg=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
subPackages = [
|
||||
"app/victoria-logs"
|
||||
"app/victoria-metrics"
|
||||
"app/vlinsert"
|
||||
"app/vlselect"
|
||||
"app/vlstorage"
|
||||
"app/vmagent"
|
||||
"app/vmalert-tool"
|
||||
"app/vmalert"
|
||||
"app/vmauth"
|
||||
"app/vmctl"
|
||||
"app/vminsert"
|
||||
"app/vmselect"
|
||||
"app/vmstorage"
|
||||
"app/vmbackup"
|
||||
"app/vmrestore"
|
||||
"app/vmui"
|
||||
];
|
||||
subPackages =
|
||||
lib.optionals withServer [
|
||||
"app/victoria-metrics"
|
||||
"app/vminsert"
|
||||
"app/vmselect"
|
||||
"app/vmstorage"
|
||||
"app/vmui"
|
||||
]
|
||||
++ lib.optionals withVmAgent [ "app/vmagent" ]
|
||||
++ lib.optionals withVmAlert [
|
||||
"app/vmalert"
|
||||
"app/vmalert-tool"
|
||||
]
|
||||
++ lib.optionals withVmAuth [ "app/vmauth" ]
|
||||
++ lib.optionals withVmctl [ "app/vmctl" ]
|
||||
++ lib.optionals withBackupTools [
|
||||
"app/vmbackup"
|
||||
"app/vmrestore"
|
||||
]
|
||||
++ lib.optionals withVictoriaLogs [
|
||||
"app/victoria-logs"
|
||||
"app/vlinsert"
|
||||
"app/vlselect"
|
||||
"app/vlstorage"
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# main module (github.com/VictoriaMetrics/VictoriaMetrics) does not contain package
|
||||
@@ -46,7 +65,11 @@ buildGoModule rec {
|
||||
--replace "time.NewTimer(time.Second * 10)" "time.NewTimer(time.Second * 120)" \
|
||||
'';
|
||||
|
||||
ldflags = [ "-s" "-w" "-X github.com/VictoriaMetrics/VictoriaMetrics/lib/buildinfo.Version=${version}" ];
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X github.com/VictoriaMetrics/VictoriaMetrics/lib/buildinfo.Version=${version}"
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
# `lib/querytracer/tracer_test.go` expects `buildinfo.Version` to be unset
|
||||
@@ -55,13 +78,21 @@ buildGoModule rec {
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
passthru.tests = { inherit (nixosTests) victoriametrics; };
|
||||
passthru.tests = {
|
||||
inherit (nixosTests) victoriametrics;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://victoriametrics.com/";
|
||||
description = "fast, cost-effective and scalable time series database, long-term remote storage for Prometheus";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ yorickvp ivan ];
|
||||
maintainers = with maintainers; [
|
||||
yorickvp
|
||||
ivan
|
||||
nullx76
|
||||
leona
|
||||
shawn8901
|
||||
];
|
||||
changelog = "https://github.com/VictoriaMetrics/VictoriaMetrics/releases/tag/v${version}";
|
||||
mainProgram = "victoria-metrics";
|
||||
};
|
||||
|
||||
@@ -0,0 +1,12 @@
|
||||
{ lib, victoriametrics }:
|
||||
lib.addMetaAttrs { mainProgram = "vmagent"; } (
|
||||
victoriametrics.override {
|
||||
withServer = false;
|
||||
withVictoriaLogs = false;
|
||||
withVmAlert = false;
|
||||
withVmAuth = false;
|
||||
withBackupTools = false;
|
||||
withVmctl = false;
|
||||
withVmAgent = true;
|
||||
}
|
||||
)
|
||||
@@ -1,6 +1,6 @@
|
||||
{ lib, stdenv, fetchurl, autoreconfHook, ... } @ args:
|
||||
{ lib, stdenv, fetchurl, autoreconfHook, targetPlatform, ... } @ args:
|
||||
|
||||
import ./generic.nix (args // {
|
||||
import ./generic.nix (builtins.removeAttrs args ["targetPlatform"] // {
|
||||
version = "4.8.30";
|
||||
sha256 = "0ampbl2f0hb1nix195kz1syrqqxpmvnvnfvphambj7xjrl3iljg0";
|
||||
extraPatches = [
|
||||
@@ -9,6 +9,8 @@ import ./generic.nix (args // {
|
||||
./darwin-mutexes-4.8.patch
|
||||
];
|
||||
|
||||
drvArgs.configureFlags = lib.optional (targetPlatform.useLLVM or false) "--with-mutex=POSIX/pthreads";
|
||||
|
||||
drvArgs.hardeningDisable = [ "format" ];
|
||||
drvArgs.doCheck = false;
|
||||
})
|
||||
|
||||
@@ -67,7 +67,8 @@ stdenv.mkDerivation (rec {
|
||||
(if compat185 then "--enable-compat185" else "--disable-compat185")
|
||||
]
|
||||
++ lib.optional dbmSupport "--enable-dbm"
|
||||
++ lib.optional stdenv.isFreeBSD "--with-pic";
|
||||
++ lib.optional stdenv.isFreeBSD "--with-pic"
|
||||
++ (drvArgs.configureFlags or []);
|
||||
|
||||
preConfigure = ''
|
||||
cd build_unix
|
||||
@@ -92,4 +93,4 @@ stdenv.mkDerivation (rec {
|
||||
license = license;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
} // drvArgs)
|
||||
} // builtins.removeAttrs drvArgs [ "configureFlags" ])
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pugixml";
|
||||
version = "1.13";
|
||||
version = "1.14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zeux";
|
||||
repo = "pugixml";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-MAXm/9ANj6TjO1Skpg20RYt88bf6w1uPwRwOHXiXsWw=";
|
||||
sha256 = "sha256-xxtJr9VeBPxpxWJaDGO635+Ch7ZS6t6VyuXEio+ogZ8=";
|
||||
};
|
||||
|
||||
outputs = [ "out" ] ++ lib.optionals shared [ "dev" ];
|
||||
|
||||
@@ -0,0 +1,46 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
hatch-regex-commit,
|
||||
hatchling,
|
||||
pythonOlder,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "hatch-regex-commit";
|
||||
version = "0.0.3";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "frankie567";
|
||||
repo = "hatch-regex-commit";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-E0DIBBaDmTCsZQ41NcjcbzgJ16BwhdexlrGWBdf77oA=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace-fail 'dynamic = ["version"]' 'version = "${version}"' \
|
||||
--replace-fail ', "hatch-regex-commit"' "" \
|
||||
--replace-fail " --cov-report=term-missing --cov-config=pyproject.toml --cov=hatch_regex_commit --cov=tests" ""
|
||||
'';
|
||||
|
||||
build-system = [ hatchling ];
|
||||
|
||||
dependencies = [ hatchling ];
|
||||
|
||||
# Module has no tests
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "hatch_regex_commit" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Hatch plugin to create a commit and tag when bumping version";
|
||||
homepage = "https://github.com/frankie567/hatch-regex-commit";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,58 @@
|
||||
{
|
||||
lib,
|
||||
aiohttp,
|
||||
aioresponses,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
hatch-regex-commit,
|
||||
hatchling,
|
||||
pytest-asyncio,
|
||||
pytestCheckHook,
|
||||
python-dotenv,
|
||||
pythonOlder,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyloadapi";
|
||||
version = "1.2.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tr4nt0r";
|
||||
repo = "pyloadapi";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-uOgqc1RqmEk0Lqz/ixlChKTZva7+0v4V8KutLSgPKEE=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace-fail "--cov=src/pyloadapi/ --cov-report=term-missing" ""
|
||||
'';
|
||||
|
||||
build-system = [
|
||||
hatch-regex-commit
|
||||
hatchling
|
||||
];
|
||||
|
||||
dependencies = [ aiohttp ];
|
||||
|
||||
nativeCheckInputs = [
|
||||
aioresponses
|
||||
pytest-asyncio
|
||||
pytestCheckHook
|
||||
python-dotenv
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "pyloadapi" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Simple wrapper for pyLoad's API";
|
||||
homepage = "https://github.com/tr4nt0r/pyloadapi";
|
||||
changelog = "https://github.com/tr4nt0r/pyloadapi/blob/${version}/CHANGELOG.md";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -46,6 +46,7 @@ stdenv.mkDerivation rec {
|
||||
description = "SELinux policy core utilities written in Python";
|
||||
license = licenses.gpl2Plus;
|
||||
homepage = "https://selinuxproject.org";
|
||||
maintainers = with lib.maintainers; [ RossComputerGuy ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -56,5 +56,6 @@ stdenv.mkDerivation rec {
|
||||
license = licenses.gpl2Only;
|
||||
homepage = "https://selinuxproject.org";
|
||||
platforms = platforms.linux;
|
||||
maintainers = with lib.maintainers; [ RossComputerGuy ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gotify-server";
|
||||
version = "2.4.0";
|
||||
version = "2.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gotify";
|
||||
repo = "server";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-TZeQcrJCH9TW039r499fxY4xJ27nZm9GdrilsI33Iqc=";
|
||||
hash = "sha256-Na/bxETIgVm1mxMOXWTgYIFFuB6XG1jGvbW6q/n5LRw=";
|
||||
};
|
||||
|
||||
# With `allowGoReference = true;`, `buildGoModule` adds the `-trimpath`
|
||||
@@ -24,7 +24,7 @@ buildGoModule rec {
|
||||
# server[780]: stat /var/lib/private/ui/build/index.html: no such file or directory
|
||||
allowGoReference = true;
|
||||
|
||||
vendorHash = "sha256-TR6YGNhSMQ/1kvX3p3QGlXovuoJdaRH0LOwIPZwQ/xY=";
|
||||
vendorHash = "sha256-Vnk/c2dzxIXDChobFSP++9uyiFD+SKyxJC9ZwaQ2pVw=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@@ -1,27 +0,0 @@
|
||||
{ lib, fetchFromGitHub, buildGoModule }:
|
||||
buildGoModule rec {
|
||||
pname = "vmagent";
|
||||
version = "1.101.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "VictoriaMetrics";
|
||||
repo = "VictoriaMetrics";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Jjz/CbVCvc9NFbvzYTFthG8cov4pYpc6y1A1Kmd3Mjg=";
|
||||
};
|
||||
|
||||
ldflags = [ "-s" "-w" "-X github.com/VictoriaMetrics/VictoriaMetrics/lib/buildinfo.Version=${version}" ];
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
subPackages = [ "app/vmagent" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/VictoriaMetrics/VictoriaMetrics/tree/master/app/vmagent";
|
||||
description = "VictoriaMetrics metrics scraper";
|
||||
mainProgram = "vmagent";
|
||||
license = licenses.asl20;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ nullx76 leona ];
|
||||
};
|
||||
}
|
||||
@@ -102,6 +102,7 @@ stdenv.mkDerivation rec {
|
||||
description = "Extraction utility for archives compressed in .zip format";
|
||||
license = lib.licenses.info-zip;
|
||||
platforms = lib.platforms.all;
|
||||
maintainers = with lib.maintainers; [ RossComputerGuy ];
|
||||
mainProgram = "unzip";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,31 +1,70 @@
|
||||
{ lib
|
||||
, buildNpmPackage
|
||||
, fetchFromGitHub
|
||||
, testers
|
||||
}:
|
||||
|
||||
buildNpmPackage {
|
||||
pname = "immich-cli";
|
||||
version = "2.0.6";
|
||||
|
||||
let
|
||||
version = "2.2.4";
|
||||
src = fetchFromGitHub {
|
||||
owner = "immich-app";
|
||||
repo = "immich";
|
||||
# Using a fixed commit until upstream has release tags for cli.
|
||||
rev = "014adf175ad50a61f92804666940e267ab329064";
|
||||
hash = "sha256-MK3Watq5/Zp+rymCIfWxAXSgBPDE13g23uDnW7A5x9g=";
|
||||
rev = "8c2195c8205156f6e3168cc52fa34db334568ea9";
|
||||
hash = "sha256-Tseu6aIrYU4Af/jWDi2wDtP77n/aogp7Qkn9mosMaes=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-ssxOXKE1t/bSb972w/cBeK61IrqPLmx9ODMn6D+2Ezw=";
|
||||
|
||||
postPatch = ''
|
||||
cd cli
|
||||
'';
|
||||
|
||||
meta = {
|
||||
meta' = {
|
||||
description = "CLI utilities for Immich to help upload images and videos";
|
||||
homepage = "https://github.com/immich-app/immich";
|
||||
license = lib.licenses.mit;
|
||||
mainProgram = "immich";
|
||||
maintainers = with lib.maintainers; [ felschr pineapplehunter ];
|
||||
mainProgram = "immich";
|
||||
};
|
||||
}
|
||||
|
||||
open-api-typescript-sdk = buildNpmPackage {
|
||||
pname = "immich-cli-openapi-typescript-sdk";
|
||||
inherit src version;
|
||||
|
||||
npmDepsHash = "sha256-WhNdFaFBwb6ehEQgbNJGdzPb3FdJk1Nefi8DcJfY9Wc=";
|
||||
|
||||
postPatch = ''
|
||||
cd open-api/typescript-sdk
|
||||
'';
|
||||
meta = {
|
||||
# using inherit for `builtin.unsafeGetAttrPos` to work correctly
|
||||
inherit (meta')
|
||||
description
|
||||
homepage
|
||||
license
|
||||
maintainers;
|
||||
};
|
||||
};
|
||||
|
||||
immich-cli = buildNpmPackage {
|
||||
pname = "immich-cli";
|
||||
inherit src version;
|
||||
|
||||
npmDepsHash = "sha256-aSTN+I8B/aLT2ItGoyZTlbdn1VCK0ZmOb1QG7ZQuz+Q=";
|
||||
|
||||
postPatch = ''
|
||||
ln -sv ${open-api-typescript-sdk}/lib/node_modules/@immich/sdk/{build,node_modules} open-api/typescript-sdk
|
||||
cd cli
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
inherit open-api-typescript-sdk;
|
||||
tests.version = testers.testVersion { package = immich-cli; };
|
||||
};
|
||||
|
||||
meta = {
|
||||
# using inherit for `builtin.unsafeGetAttrPos` to work correctly
|
||||
inherit (meta')
|
||||
description
|
||||
homepage
|
||||
license
|
||||
maintainers
|
||||
mainProgram;
|
||||
};
|
||||
};
|
||||
in
|
||||
immich-cli
|
||||
|
||||
@@ -15,5 +15,6 @@ stdenv.mkDerivation rec {
|
||||
mainProgram = "netcat";
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with lib.maintainers; [ RossComputerGuy ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -26531,8 +26531,6 @@ with pkgs;
|
||||
|
||||
virtualenv-clone = with python3Packages; toPythonApplication virtualenv-clone;
|
||||
|
||||
vmagent = callPackage ../servers/monitoring/vmagent { };
|
||||
|
||||
vsftpd = callPackage ../servers/ftp/vsftpd { };
|
||||
|
||||
wallabag = callPackage ../servers/web-apps/wallabag { };
|
||||
@@ -31974,11 +31972,9 @@ with pkgs;
|
||||
|
||||
klayout = libsForQt5.callPackage ../applications/misc/klayout { };
|
||||
|
||||
klee = callPackage ../applications/science/logic/klee (with llvmPackages_13; {
|
||||
clang = clang;
|
||||
llvm = llvm;
|
||||
stdenv = stdenv;
|
||||
});
|
||||
klee = callPackage ../applications/science/logic/klee {
|
||||
llvmPackages = llvmPackages_13;
|
||||
};
|
||||
|
||||
kmetronome = qt6Packages.callPackage ../applications/audio/kmetronome { };
|
||||
|
||||
|
||||
@@ -5372,6 +5372,8 @@ self: super: with self; {
|
||||
|
||||
hatch-nodejs-version = callPackage ../development/python-modules/hatch-nodejs-version { };
|
||||
|
||||
hatch-regex-commit = callPackage ../development/python-modules/hatch-regex-commit { };
|
||||
|
||||
hatch-requirements-txt = callPackage ../development/python-modules/hatch-requirements-txt { };
|
||||
|
||||
haversine = callPackage ../development/python-modules/haversine { };
|
||||
@@ -10094,6 +10096,8 @@ self: super: with self; {
|
||||
|
||||
pylddwrap = callPackage ../development/python-modules/pylddwrap { };
|
||||
|
||||
pyloadapi = callPackage ../development/python-modules/pyloadapi { };
|
||||
|
||||
pyngo = callPackage ../development/python-modules/pyngo { };
|
||||
|
||||
pyngrok = callPackage ../development/python-modules/pyngrok { };
|
||||
|
||||
Reference in New Issue
Block a user