Merge staging-next into staging
This commit is contained in:
commit
687b501234
|
@ -72,6 +72,22 @@
|
|||
|
||||
- The [services.caddy.acmeCA](#opt-services.caddy.acmeCA) option now defaults to `null` instead of `"https://acme-v02.api.letsencrypt.org/directory"`, to use all of Caddy's default ACME CAs and enable Caddy's automatic issuer fallback feature by default, as recommended by upstream.
|
||||
|
||||
- The default priorities of [`services.nextcloud.phpOptions`](#opt-services.nextcloud.phpOptions) have changed. This means that e.g.
|
||||
`services.nextcloud.phpOptions."opcache.interned_strings_buffer" = "23";` doesn't discard all of the other defaults from this option
|
||||
anymore. The attribute values of `phpOptions` are still defaults, these can be overridden as shown here.
|
||||
|
||||
To override all of the options (including including `upload_max_filesize`, `post_max_size`
|
||||
and `memory_limit` which all point to [`services.nextcloud.maxUploadSize`](#opt-services.nextcloud.maxUploadSize)
|
||||
by default) can be done like this:
|
||||
|
||||
```nix
|
||||
{
|
||||
services.nextcloud.phpOptions = lib.mkForce {
|
||||
/* ... */
|
||||
};
|
||||
}
|
||||
```
|
||||
|
||||
- `php80` is no longer supported due to upstream not supporting this version anymore.
|
||||
|
||||
- PHP now defaults to PHP 8.2, updated from 8.1.
|
||||
|
|
|
@ -8,6 +8,21 @@ let
|
|||
|
||||
jsonFormat = pkgs.formats.json {};
|
||||
|
||||
defaultPHPSettings = {
|
||||
short_open_tag = "Off";
|
||||
expose_php = "Off";
|
||||
error_reporting = "E_ALL & ~E_DEPRECATED & ~E_STRICT";
|
||||
display_errors = "stderr";
|
||||
"opcache.enable_cli" = "1";
|
||||
"opcache.interned_strings_buffer" = "8";
|
||||
"opcache.max_accelerated_files" = "10000";
|
||||
"opcache.memory_consumption" = "128";
|
||||
"opcache.revalidate_freq" = "1";
|
||||
"opcache.fast_shutdown" = "1";
|
||||
"openssl.cafile" = "/etc/ssl/certs/ca-certificates.crt";
|
||||
catch_workers_output = "yes";
|
||||
};
|
||||
|
||||
inherit (cfg) datadir;
|
||||
|
||||
phpPackage = cfg.phpPackage.buildEnv {
|
||||
|
@ -26,22 +41,13 @@ let
|
|||
++ optional cfg.caching.memcached memcached
|
||||
)
|
||||
++ cfg.phpExtraExtensions all; # Enabled by user
|
||||
extraConfig = toKeyValue phpOptions;
|
||||
extraConfig = toKeyValue cfg.phpOptions;
|
||||
};
|
||||
|
||||
toKeyValue = generators.toKeyValue {
|
||||
mkKeyValue = generators.mkKeyValueDefault {} " = ";
|
||||
};
|
||||
|
||||
phpOptions = {
|
||||
upload_max_filesize = cfg.maxUploadSize;
|
||||
post_max_size = cfg.maxUploadSize;
|
||||
memory_limit = cfg.maxUploadSize;
|
||||
} // cfg.phpOptions
|
||||
// optionalAttrs cfg.caching.apcu {
|
||||
"apc.enable_cli" = "1";
|
||||
};
|
||||
|
||||
occ = pkgs.writeScriptBin "nextcloud-occ" ''
|
||||
#! ${pkgs.runtimeShell}
|
||||
cd ${cfg.package}
|
||||
|
@ -263,22 +269,33 @@ in {
|
|||
|
||||
phpOptions = mkOption {
|
||||
type = types.attrsOf types.str;
|
||||
default = {
|
||||
short_open_tag = "Off";
|
||||
expose_php = "Off";
|
||||
error_reporting = "E_ALL & ~E_DEPRECATED & ~E_STRICT";
|
||||
display_errors = "stderr";
|
||||
"opcache.enable_cli" = "1";
|
||||
"opcache.interned_strings_buffer" = "8";
|
||||
"opcache.max_accelerated_files" = "10000";
|
||||
"opcache.memory_consumption" = "128";
|
||||
"opcache.revalidate_freq" = "1";
|
||||
"opcache.fast_shutdown" = "1";
|
||||
"openssl.cafile" = "/etc/ssl/certs/ca-certificates.crt";
|
||||
catch_workers_output = "yes";
|
||||
};
|
||||
defaultText = literalExpression (generators.toPretty { } defaultPHPSettings);
|
||||
description = lib.mdDoc ''
|
||||
Options for PHP's php.ini file for nextcloud.
|
||||
|
||||
Please note that this option is _additive_ on purpose while the
|
||||
attribute values inside the default are option defaults: that means that
|
||||
|
||||
```nix
|
||||
{
|
||||
services.nextcloud.phpOptions."opcache.interned_strings_buffer" = "23";
|
||||
}
|
||||
```
|
||||
|
||||
will override the `php.ini` option `opcache.interned_strings_buffer` without
|
||||
discarding the rest of the defaults.
|
||||
|
||||
Overriding all of `phpOptions` (including `upload_max_filesize`, `post_max_size`
|
||||
and `memory_limit` which all point to [](#opt-services.nextcloud.maxUploadSize)
|
||||
by default) can be done like this:
|
||||
|
||||
```nix
|
||||
{
|
||||
services.nextcloud.phpOptions = lib.mkForce {
|
||||
/* ... */
|
||||
};
|
||||
}
|
||||
```
|
||||
'';
|
||||
};
|
||||
|
||||
|
@ -750,6 +767,18 @@ in {
|
|||
services.nextcloud.phpPackage =
|
||||
if versionOlder cfg.package.version "26" then pkgs.php81
|
||||
else pkgs.php82;
|
||||
|
||||
services.nextcloud.phpOptions = mkMerge [
|
||||
(mapAttrs (const mkOptionDefault) defaultPHPSettings)
|
||||
{
|
||||
upload_max_filesize = cfg.maxUploadSize;
|
||||
post_max_size = cfg.maxUploadSize;
|
||||
memory_limit = cfg.maxUploadSize;
|
||||
}
|
||||
(mkIf cfg.caching.apcu {
|
||||
"apc.enable_cli" = "1";
|
||||
})
|
||||
];
|
||||
}
|
||||
|
||||
{ assertions = [
|
||||
|
|
|
@ -11,6 +11,11 @@ buildPythonApplication rec {
|
|||
sha256 = "1miabaxd5pwxn0va4drzj1d4ppxvyqsrrd4xw1j6qr52yci0lms8";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace imgp \
|
||||
--replace "Image.ANTIALIAS" "Image.Resampling.LANCZOS"
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [ pillow ];
|
||||
|
||||
installFlags = [
|
||||
|
|
|
@ -103,15 +103,21 @@ in mkDerivation rec {
|
|||
cp src/hidapi/libusb/.libs/*.so* $out/lib
|
||||
cp src/univalue/.libs/*.so* $out/lib
|
||||
|
||||
# [RPATH][patchelf] Avoid forbidden reference error
|
||||
rm -rf $PWD
|
||||
|
||||
# Provide udev rules as documented in https://digitalbitbox.com/start_linux
|
||||
mkdir -p "$out/etc/udev/rules.d"
|
||||
${copyUdevRuleToOutput "51-hid-digitalbox.rules" udevRule51}
|
||||
${copyUdevRuleToOutput "52-hid-digitalbox.rules" udevRule52}
|
||||
'';
|
||||
|
||||
# remove forbidden references to $TMPDIR
|
||||
preFixup = ''
|
||||
for f in "$out"/{bin,lib}/*; do
|
||||
if [ -f "$f" ] && isELF "$f"; then
|
||||
patchelf --shrink-rpath --allowed-rpath-prefixes "$NIX_STORE" "$f"
|
||||
fi
|
||||
done
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
@ -54,12 +54,12 @@
|
|||
version = "2023-05-19";
|
||||
};
|
||||
ungoogled-patches = {
|
||||
rev = "115.0.5790.110-1";
|
||||
sha256 = "1jahy4jl5bnnzl6433hln0dj3b39v5zqd90n8zf7ss45wqrff91b";
|
||||
rev = "115.0.5790.170-1";
|
||||
sha256 = "0vk82jacadb4id16596s4751j4idq6903w6sl2s7cj4ppxd6pyf1";
|
||||
};
|
||||
};
|
||||
sha256 = "0wgp44qnvmdqf2kk870ndm51rcvar36li2qq632ay4n8gfpbrm79";
|
||||
sha256bin64 = "1w2jl92x78s4vxv4p1imkz7qaq51yvs0wiz2bclbjz0hjlw9akr3";
|
||||
version = "115.0.5790.110";
|
||||
sha256 = "1h3j24ihn76qkvckzg703pm1jsh6nbkc48n2zx06kia8wz96567z";
|
||||
sha256bin64 = "04jklk2zwkyy8i70v9nk7nw35w2g9pyxdw9w3sn9mddgbjjph5z9";
|
||||
version = "115.0.5790.170";
|
||||
};
|
||||
}
|
||||
|
|
|
@ -2,12 +2,12 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "fava";
|
||||
version = "1.25";
|
||||
version = "1.25.1";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-3SxFvvYZupYOsQU/n+zq3hamyWaaN9guoiV8km9mHjM=";
|
||||
hash = "sha256-RJbPqj6hXqf8D5G8zrg0BAYfxSRDfUgRNGwX+LZlPPY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with python3.pkgs; [ setuptools-scm ];
|
||||
|
|
|
@ -13,24 +13,25 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "gitoxide";
|
||||
version = "0.27.0";
|
||||
version = "0.28.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Byron";
|
||||
repo = "gitoxide";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-L5x27rJ9Y3K886OlTvCXV2LY+6L/f6vokCbgrWPCiHY=";
|
||||
hash = "sha256-7iJx7kE606jeaokROmOSoh0egCQUgYwvg8BAA3y1BGs=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-YEHHu9PJ5aJvWUaTXCNKEaV/Rd8lP6Wub/CFJCBykHU=";
|
||||
cargoHash = "sha256-zChqIA/KuS1aBs/g1tlymGvvJeljKMMCODijPhQYy40=";
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
|
||||
buildInputs = [ curl ] ++ (if stdenv.isDarwin
|
||||
then [ libiconv Security SystemConfiguration ]
|
||||
else [ openssl ]);
|
||||
|
||||
# Needed to get openssl-sys to use pkg-config.
|
||||
OPENSSL_NO_VENDOR = 1;
|
||||
env.OPENSSL_NO_VENDOR = 1;
|
||||
|
||||
meta = with lib; {
|
||||
description = "A command-line application for interacting with git repositories";
|
||||
|
|
|
@ -6,12 +6,12 @@
|
|||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "streamlink";
|
||||
version = "6.0.0";
|
||||
version = "6.0.1";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-BeP+YOBtTz1D//LDBMha+07yVXdgBHfM4v4aVNHzwAw=";
|
||||
hash = "sha256-0Qpil/bh2F+WaG0zv4yxEzx6e1fv3t9xed+nhT+NC7U=";
|
||||
};
|
||||
|
||||
nativeCheckInputs = with python3Packages; [
|
||||
|
|
|
@ -421,7 +421,10 @@ stdenv.mkDerivation rec {
|
|||
|
||||
# Our Cabal compiler name
|
||||
haskellCompilerName = "ghc-${version}";
|
||||
} // lib.optionalAttrs (binDistUsed.isHadrian or false) {
|
||||
}
|
||||
# We duplicate binDistUsed here since we have a sensible default even if no bindist is avaible,
|
||||
# this makes sure that getting the `meta` attribute doesn't throw even on unsupported platforms.
|
||||
// lib.optionalAttrs (ghcBinDists.${distSetName}.${stdenv.hostPlatform.system}.isHadrian or false) {
|
||||
# Normal GHC derivations expose the hadrian derivation used to build them
|
||||
# here. In the case of bindists we just make sure that the attribute exists,
|
||||
# as it is used for checking if a GHC derivation has been built with hadrian.
|
||||
|
|
|
@ -417,7 +417,10 @@ stdenv.mkDerivation rec {
|
|||
|
||||
# Our Cabal compiler name
|
||||
haskellCompilerName = "ghc-${version}";
|
||||
} // lib.optionalAttrs (binDistUsed.isHadrian or false) {
|
||||
}
|
||||
# We duplicate binDistUsed here since we have a sensible default even if no bindist is avaible,
|
||||
# this makes sure that getting the `meta` attribute doesn't throw even on unsupported platforms.
|
||||
// lib.optionalAttrs (ghcBinDists.${distSetName}.${stdenv.hostPlatform.system}.isHadrian or false) {
|
||||
# Normal GHC derivations expose the hadrian derivation used to build them
|
||||
# here. In the case of bindists we just make sure that the attribute exists,
|
||||
# as it is used for checking if a GHC derivation has been built with hadrian.
|
||||
|
|
|
@ -403,7 +403,10 @@ stdenv.mkDerivation rec {
|
|||
|
||||
# Our Cabal compiler name
|
||||
haskellCompilerName = "ghc-${version}";
|
||||
} // lib.optionalAttrs (binDistUsed.isHadrian or false) {
|
||||
}
|
||||
# We duplicate binDistUsed here since we have a sensible default even if no bindist is avaible,
|
||||
# this makes sure that getting the `meta` attribute doesn't throw even on unsupported platforms.
|
||||
// lib.optionalAttrs (ghcBinDists.${distSetName}.${stdenv.hostPlatform.system}.isHadrian or false) {
|
||||
# Normal GHC derivations expose the hadrian derivation used to build them
|
||||
# here. In the case of bindists we just make sure that the attribute exists,
|
||||
# as it is used for checking if a GHC derivation has been built with hadrian.
|
||||
|
|
|
@ -24,6 +24,10 @@ stdenv.mkDerivation rec {
|
|||
buildInputs = [ gettext gnutls nettle libxcrypt ]
|
||||
++ lib.optionals stdenv.isDarwin [ libiconv ApplicationServices ];
|
||||
|
||||
preBuild = lib.optionalString (stdenv.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "11") ''
|
||||
export MACOSX_DEPLOYMENT_TARGET=10.13 # for futimens()
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libpg_query";
|
||||
version = "15-4.2.2";
|
||||
version = "15-4.2.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pganalyze";
|
||||
repo = "libpg_query";
|
||||
rev = version;
|
||||
hash = "sha256-DjpfJj7WtQ4bACX8/lFDl+mwQGbeCJX+YN2hjZa0kks=";
|
||||
hash = "sha256-/HUg6x0il5WxENmgR3slu7nmXTKv6YscjpX569Dztko=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ which ];
|
||||
|
|
|
@ -1,25 +1,35 @@
|
|||
{ fetchurl, lib, stdenv, unzip, scheme, texinfo }:
|
||||
{ lib, stdenv, fetchurl, scheme, texinfo, unzip }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "slib";
|
||||
version = "3b5";
|
||||
version = "3b7";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://groups.csail.mit.edu/mac/ftpdir/scm/${pname}-${version}.zip";
|
||||
sha256 = "0q0p2d53p8qw2592yknzgy2y1p5a9k7ppjx0cfrbvk6242c4mdpq";
|
||||
hash = "sha256-9dXNrTNTlaWlqjfv/iiqgHiyFuo5kR9lGSlnjxrCKLY=";
|
||||
};
|
||||
|
||||
patches = [ ./catalog-in-library-vicinity.patch ];
|
||||
patches = [
|
||||
./catalog-in-library-vicinity.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ unzip ];
|
||||
buildInputs = [ scheme texinfo ];
|
||||
# slib:require unsupported feature color-database
|
||||
postPatch = ''
|
||||
substituteInPlace Makefile \
|
||||
--replace " clrnamdb.scm" ""
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ scheme texinfo unzip ];
|
||||
buildInputs = [ scheme ];
|
||||
|
||||
postInstall = ''
|
||||
ln -s mklibcat{.scm,}
|
||||
SCHEME_LIBRARY_PATH="$out/lib/slib" make catalogs
|
||||
|
||||
sed -i "$out/bin/slib" \
|
||||
-e "/^SCHEME_LIBRARY_PATH/i export PATH=\"${scheme}/bin:\$PATH\""
|
||||
sed -i \
|
||||
-e '2i export PATH="${scheme}/bin:$PATH"' \
|
||||
-e '3i export GUILE_AUTO_COMPILE=0' \
|
||||
$out/bin/slib
|
||||
'';
|
||||
|
||||
# There's no test suite (?!).
|
||||
|
|
|
@ -1,9 +1,11 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, pythonOlder
|
||||
, pytestCheckHook
|
||||
, setuptools
|
||||
, wheel
|
||||
, numpy
|
||||
, pandas
|
||||
}:
|
||||
|
@ -11,25 +13,43 @@
|
|||
buildPythonPackage rec {
|
||||
pname = "ancp-bids";
|
||||
version = "0.2.1";
|
||||
disabled = pythonOlder "3.7";
|
||||
format = "pyproject";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
# `tests/data` dir missing from PyPI dist
|
||||
src = fetchFromGitHub {
|
||||
owner = "ANCPLabOldenburg";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-Nu9pulVSZysgm/F7jl+VpoqMCiHeysZjQDQ1dT7AnpE=";
|
||||
owner = "ANCPLabOldenburg";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-Nu9pulVSZysgm/F7jl+VpoqMCiHeysZjQDQ1dT7AnpE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools ] ;
|
||||
patches = [
|
||||
# https://github.com/ANCPLabOldenburg/ancp-bids/pull/78
|
||||
(fetchpatch {
|
||||
name = "unpin-wheel-build-dependency.patch";
|
||||
url = "https://github.com/ANCPLabOldenburg/ancp-bids/commit/6e7a0733002845aacb0152c5aacfb42054a9b65e.patch";
|
||||
hash = "sha256-WbQRwb8Wew46OJu+zo7n4qBtgtH/Lr6x3YHAyN9ko9M=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
wheel
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
numpy
|
||||
pandas
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
checkInputs = [ numpy pandas pytestCheckHook ];
|
||||
pythonImportsCheck = [
|
||||
"ancpbids"
|
||||
];
|
||||
|
||||
pytestFlagsArray = [ "tests/auto" ];
|
||||
|
||||
disabledTests = [ "test_fetch_dataset" ];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
@ -11,7 +11,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "gitpython";
|
||||
version = "3.1.31";
|
||||
version = "3.1.32";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
|||
owner = "gitpython-developers";
|
||||
repo = "GitPython";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-lpx/vptFhz4WOkybJpqq1teMGgX6RQo/f2OTNEm5XJU=";
|
||||
hash = "sha256-Bhgu57w5QYfq5hlTh5gCJhbdwUMU+u0nrova/2V2ed0=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -14,14 +14,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-dataproc";
|
||||
version = "5.4.2";
|
||||
version = "5.4.3";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-YxxOyvPlUfSeIS8aUrULWnD6XgPh+nJuPHIywmgYMQU=";
|
||||
hash = "sha256-2cd8Uqpd31KuZXc22/tTEkApM/crq4SA/C0q/phpdAI=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -1,5 +1,4 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
{ lib
|
||||
, antlr4
|
||||
, antlr4-python3-runtime
|
||||
, buildPythonPackage
|
||||
|
@ -83,7 +82,6 @@ buildPythonPackage rec {
|
|||
];
|
||||
|
||||
meta = with lib; {
|
||||
broken = stdenv.isDarwin;
|
||||
description = "A framework for configuring complex applications";
|
||||
homepage = "https://hydra.cc";
|
||||
license = licenses.mit;
|
||||
|
|
|
@ -33,6 +33,8 @@ buildPythonPackage rec {
|
|||
postPatch = ''
|
||||
substituteInPlace tox.ini \
|
||||
--replace " --cov --cov-report term-missing:skip-covered" ""
|
||||
substituteInPlace pilkit/processors/resize.py \
|
||||
--replace "Image.ANTIALIAS" "Image.Resampling.LANCZOS"
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "prometheus-client";
|
||||
version = "0.17.0";
|
||||
version = "0.17.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
@ -16,7 +16,7 @@ buildPythonPackage rec {
|
|||
owner = "prometheus";
|
||||
repo = "client_python";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-0qh6OorIIs3WfneZavzwTTZFwIRXCJzezks/qihu8xo=";
|
||||
hash = "sha256-ag9gun47Ar0Sw3ZGIXAHjtv4GdhX8x51UVkgwdQ8A+s=";
|
||||
};
|
||||
|
||||
nativeCheckInputs = [
|
||||
|
|
|
@ -20,14 +20,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyro-ppl";
|
||||
version = "1.8.5";
|
||||
version = "1.8.6";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit version pname;
|
||||
hash = "sha256-wqwDWZWHT0rbjQfJKqRZT+eD/94WFKWczl4uDZzxkzQ=";
|
||||
hash = "sha256-ANL03ailPmbZVRJNxuSektz1cM071waCUJHbdk2TzQc=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -49,6 +49,12 @@ buildPythonPackage rec {
|
|||
sha256 = "sha256-VFq3Hv4I8U8ifP/aSjyu0BiW/4jfPlRDKqRcqUGw6UQ=";
|
||||
})
|
||||
|
||||
(fetchpatch {
|
||||
name = "test-new-cryptography.patch";
|
||||
url = "https://github.com/tpm2-software/tpm2-pytss/commit/e4006e6066c015d9ed55befa9b98247fbdcafd7d.diff";
|
||||
sha256 = "sha256-Wxe9u7Cvv2vKMGTcK3X8W1Mq/nCt70zrzWUKA+83Sas=";
|
||||
})
|
||||
|
||||
# Fix hardcoded `fapi-config.json` configuration path
|
||||
./fapi-config.patch
|
||||
];
|
||||
|
|
|
@ -5,12 +5,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "types-psutil";
|
||||
version = "5.9.5.9";
|
||||
version = "5.9.5.16";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-xsfmtBtvfruHr9VlDfNgdR0Ois8NJ2t6xk0A9Bm+uSI=";
|
||||
hash = "sha256-TpshnvtiXT0E9r8QaTT4fKtJqkGpSwo7MIlAP0enkig=";
|
||||
};
|
||||
|
||||
# Module doesn't have tests
|
||||
|
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "types-pyyaml";
|
||||
version = "6.0.12.9";
|
||||
version = "6.0.12.11";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "types-PyYAML";
|
||||
inherit version;
|
||||
hash = "sha256-xRsb1tmd3wqiiEp6MogQ6/cKQmLCkhldP0+aAAX57rY=";
|
||||
hash = "sha256-fTQLGcoozd/bpDjuY4zUCEveIT5QGjl4c4VD4nCUd1s=";
|
||||
};
|
||||
|
||||
# Module doesn't have tests
|
||||
|
|
|
@ -10,21 +10,21 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "weaviate-client";
|
||||
version = "3.21.0";
|
||||
version = "3.22.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-7JSsVUiDx2XpTaiylHxPD6SgN47Tu+nzZT3zpbF0Wm0=";
|
||||
hash = "sha256-r/Yb0/XXTfIKYjKEQ+OqnIYNUzD9+xnE2N3ETLYEAy8=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.cfg \
|
||||
--replace "validators>=0.18.2,<0.20.0" "validators>=0.18.2" \
|
||||
--replace "validators>=0.18.2,<=0.21.0" "validators>=0.18.2" \
|
||||
--replace "requests>=2.28.0,<2.29.0" "requests>=2.28.0"
|
||||
'';
|
||||
|
||||
|
|
|
@ -10,14 +10,14 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-public-api";
|
||||
version = "0.31.2";
|
||||
version = "0.31.3";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
hash = "sha256-LSCFJrZuQoUk8DqfQayfwPVTIU00SxHrelx7NItqqWM=";
|
||||
hash = "sha256-oSjfNbId5jEHeLiJ3FMoNqwLZg6iyr3ZqpcfKvEnpac=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-aFY5FSXquN1h28CBluuP/tNDmjFfi2dNjAdoXR3CH4Y=";
|
||||
cargoHash = "sha256-VHHEQafQfRqmdscuWpN+NdcfEc1sTt+lKLg26aM9QQE=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
|
|
@ -25,7 +25,10 @@ stdenvNoCC.mkDerivation rec {
|
|||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -Dm 755 ./bun $out/bin/bun
|
||||
ln -s $out/bin/bun $out/bin/bunx
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
passthru = {
|
||||
|
|
|
@ -26,7 +26,7 @@ let
|
|||
|
||||
in stdenv.mkDerivation {
|
||||
pname = "domination";
|
||||
version = "1.2.7";
|
||||
version = "1.2.9";
|
||||
|
||||
# The .zip releases do not contain the build.xml file
|
||||
src = fetchsvn {
|
||||
|
@ -34,8 +34,8 @@ in stdenv.mkDerivation {
|
|||
# There are no tags in the repository.
|
||||
# Look for commits like "new version x.y.z info on website"
|
||||
# or "website update for x.y.z".
|
||||
rev = "2261";
|
||||
sha256 = "sha256-xvlPC7M6DaF3g2O3vQDmcdp7914qOaiikY02RTgAVkM=";
|
||||
rev = "2470";
|
||||
hash = "sha256-ghq7EGg++mTOzA3ASzXhk97fzy5/n9vyaRzxp12X3/4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -6,11 +6,11 @@
|
|||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "aldente";
|
||||
version = "1.22";
|
||||
version = "1.22.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/davidwernhart/aldente-charge-limiter/releases/download/${finalAttrs.version}/AlDente.dmg";
|
||||
hash = "sha256-y8S9SCDbvoKGtNqGQvJDSpbLhh7GqXUo7pLcMzuCnjo=";
|
||||
hash = "sha256-bREI0RS4xvEccyw3yed5aD8oG5wmD5hyG82qW2tqlEA=";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
|
|
|
@ -9,13 +9,13 @@
|
|||
|
||||
buildDotnetModule rec {
|
||||
pname = "jackett";
|
||||
version = "0.21.547";
|
||||
version = "0.21.584";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha512-pjtEGLfrBldukGsrYuUF+pO/qE2+WfDnaLkqKGyPJHSYClDJEoT9hEy2LyV1Vk8VqvLAkMSQmmLIwSxr0FjX8g==";
|
||||
hash = "sha512-uv8r39iH1Te7WqmJK/qDbXE46qjUNEFi1YPgSyHRegLZWGjP7QAAn4x5WBTXZ1OLlsbVRg3fJkj/BanHLBuqjg==";
|
||||
};
|
||||
|
||||
projectFile = "src/Jackett.Server/Jackett.Server.csproj";
|
||||
|
|
|
@ -37,20 +37,20 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "389-ds-base";
|
||||
version = "2.4.2";
|
||||
version = "2.4.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "389ds";
|
||||
repo = pname;
|
||||
rev = "${pname}-${version}";
|
||||
hash = "sha256-3wePHYA2z4qwW0KTECTDN8X9yJuUB0n14KjKbWN0Knk=";
|
||||
hash = "sha256-bUjL1fjzyrq9jjpB/xbRCAISiPBwrlXbbDqT0aLOVOc=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
inherit src;
|
||||
sourceRoot = "${src.name}/src";
|
||||
name = "${pname}-${version}";
|
||||
hash = "sha256-972tJ8aKNxC3O8VxbAau7OSej873IBXsP3isMXAXKcU=";
|
||||
hash = "sha256-FlrHaz1whwzDvm3MA+wEaQpq7h2X9ZDnQc3f73vLZ58=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -21,6 +21,7 @@ buildPythonPackage rec {
|
|||
mailman
|
||||
requests
|
||||
zope_interface
|
||||
packaging
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "telegraf";
|
||||
version = "1.27.2";
|
||||
version = "1.27.3";
|
||||
|
||||
excludedPackages = "test";
|
||||
|
||||
|
@ -18,10 +18,10 @@ buildGoModule rec {
|
|||
owner = "influxdata";
|
||||
repo = "telegraf";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-SkStt8PRWWkM01NrO4UTRVq84s3qlRrddl2vTxWsLME=";
|
||||
hash = "sha256-mVkzJ2dFBR8QYGO5rAT3tfA+eFFO01VsPoWp2iadUew=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-gOsVBvjPb2MLe2xOfuDldUy9ZpaBaCPxgxbZae1gyUQ=";
|
||||
vendorHash = "sha256-xtPniKc6aR8JRSsaefqoRCLL8AQH6YVTG67trK58YaU=";
|
||||
proxyVendor = true;
|
||||
|
||||
ldflags = [
|
||||
|
|
|
@ -117,10 +117,13 @@ stdenv.mkDerivation {
|
|||
cp -r doc/doxygen/output/html $devdoc/share/devhelp/openafs/doxygen
|
||||
'';
|
||||
|
||||
# Avoid references to $TMPDIR by removing it and let patchelf cleanup the
|
||||
# binaries.
|
||||
# remove forbidden references to $TMPDIR
|
||||
preFixup = ''
|
||||
rm -rf "$(pwd)" && mkdir "$(pwd)"
|
||||
for f in "$out"/bin/*; do
|
||||
if isELF "$f"; then
|
||||
patchelf --shrink-rpath --allowed-rpath-prefixes "$NIX_STORE" "$f"
|
||||
fi
|
||||
done
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
|
|||
buildInputs = [ jdk11 ];
|
||||
|
||||
installPhase = ''
|
||||
mv ../$sourceRoot $out
|
||||
cp -r ../$sourceRoot $out
|
||||
rm -f $out/bin/*bat
|
||||
rm -rf $out/extensions
|
||||
mkdir -p $out/share/nifi
|
||||
|
|
|
@ -52,6 +52,12 @@ python3Packages.buildPythonApplication {
|
|||
|
||||
patches = extraPatches;
|
||||
|
||||
postPatch = ''
|
||||
# https://github.com/beetbox/beets/pull/4868
|
||||
substituteInPlace beets/util/artresizer.py \
|
||||
--replace "Image.ANTIALIAS" "Image.Resampling.LANCZOS"
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
confuse
|
||||
gst-python
|
||||
|
|
33
pkgs/tools/networking/dq/default.nix
Normal file
33
pkgs/tools/networking/dq/default.nix
Normal file
|
@ -0,0 +1,33 @@
|
|||
{ lib, stdenv, fetchFromGitHub, installShellFiles }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dq";
|
||||
version = "20230101";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "janmojzis";
|
||||
repo = "dq";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-K96yOonOYSsz26Bf/vx9XtWs7xyY0Dpxdd55OMbQz8k=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -Dm755 dq dqcache dqcache-makekey dqcache-start -t $out/bin
|
||||
installManPage man/*
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Recursive DNS/DNSCurve server and comandline tool";
|
||||
homepage = "https://github.com/janmojzis/dq";
|
||||
changelog = "https://github.com/janmojzis/dq/releases/tag/${version}";
|
||||
license = licenses.cc0;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ sikmir ];
|
||||
};
|
||||
}
|
|
@ -1,14 +1,14 @@
|
|||
{ lib, stdenv, fetchFromGitHub, perl, gettext, pkg-config, libidn2, libiconv }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "5.5.17";
|
||||
version = "5.5.18";
|
||||
pname = "whois";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rfc1036";
|
||||
repo = "whois";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Nqnbi2nS95nzyzFNdahSKY/Om30sZXRJhoCSrzRiD9c=";
|
||||
hash = "sha256-KHOKjblyCP1GykQehmxSKf7vP52wRRH6oz9WbE9fbCk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ perl gettext pkg-config ];
|
||||
|
|
|
@ -14,7 +14,7 @@
|
|||
, unstableGitUpdater
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation {
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "home-manager";
|
||||
version = "2023-05-30";
|
||||
|
||||
|
@ -55,7 +55,7 @@ stdenvNoCC.mkDerivation {
|
|||
]
|
||||
}" \
|
||||
--subst-var-by HOME_MANAGER_LIB '${placeholder "out"}/share/bash/home-manager.sh' \
|
||||
--subst-var-by HOME_MANAGER_PATH "" \
|
||||
--subst-var-by HOME_MANAGER_PATH "${finalAttrs.src}" \
|
||||
--subst-var-by OUT '${placeholder "out"}'
|
||||
|
||||
installShellCompletion --bash --name home-manager.bash home-manager/completion.bash
|
||||
|
@ -85,8 +85,8 @@ stdenvNoCC.mkDerivation {
|
|||
found in Nixpkgs. It allows declarative configuration of user specific
|
||||
(non global) packages and dotfiles.
|
||||
'';
|
||||
platforms = lib.platforms.unix;
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ AndersonTorres ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
|
@ -10,13 +10,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "rare";
|
||||
version = "0.3.2";
|
||||
version = "0.3.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zix99";
|
||||
repo = "rare";
|
||||
rev = version;
|
||||
hash = "sha256-v3zczT3PMSm2AMKVnVdDxsCpYA8QhZcmOCuiQiz5hFo=";
|
||||
hash = "sha256-83iHYWMdLOzWDu/WW2TN8D2gUe2Y74aGBUjfHIa9ki8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-wUOtxNjL/4MosACCzPTWKWrnMZhxINfN1ppkRsqDh9M=";
|
||||
|
|
|
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
installPhase = ''
|
||||
mkdir -p "$out"/{share/java,bin}
|
||||
cp ./build/*.jar "$out/share/java/"
|
||||
cp ./build/*.jar ./lib/resolver.jar "$out/share/java/"
|
||||
|
||||
for tool in jing trang; do
|
||||
cat > "$out/bin/$tool" <<EOF
|
||||
|
|
|
@ -108,8 +108,14 @@ stdenv.mkDerivation rec {
|
|||
--replace "ASSERT(ht && ht->table && iter);" "ASSERT(ht && iter);"
|
||||
'';
|
||||
|
||||
# Hack to avoid TMPDIR in RPATHs.
|
||||
preFixup = ''rm -rf "$(pwd)" && mkdir "$(pwd)" '';
|
||||
# remove forbidden references to $TMPDIR
|
||||
preFixup = lib.optionalString stdenv.isLinux ''
|
||||
for f in "$out"/bin/*; do
|
||||
if isELF "$f"; then
|
||||
patchelf --shrink-rpath --allowed-rpath-prefixes "$NIX_STORE" "$f"
|
||||
fi
|
||||
done
|
||||
'';
|
||||
|
||||
outputs = [ "out" "doc" "man" "dev" ];
|
||||
|
||||
|
|
|
@ -7345,6 +7345,8 @@ with pkgs;
|
|||
|
||||
doggo = callPackage ../tools/networking/doggo { };
|
||||
|
||||
dq = callPackage ../tools/networking/dq { };
|
||||
|
||||
dool = callPackage ../tools/system/dool { };
|
||||
|
||||
dosfstools = callPackage ../tools/filesystems/dosfstools { };
|
||||
|
@ -22445,8 +22447,8 @@ with pkgs;
|
|||
udev = systemdMinimal;
|
||||
};
|
||||
|
||||
libfilezilla = callPackage ../development/libraries/libfilezilla {
|
||||
inherit (darwin.apple_sdk.frameworks) ApplicationServices;
|
||||
libfilezilla = darwin.apple_sdk_11_0.callPackage ../development/libraries/libfilezilla {
|
||||
inherit (darwin.apple_sdk_11_0.frameworks) ApplicationServices;
|
||||
};
|
||||
|
||||
libfishsound = callPackage ../development/libraries/libfishsound { };
|
||||
|
@ -24749,8 +24751,7 @@ with pkgs;
|
|||
slang = callPackage ../development/libraries/slang { };
|
||||
|
||||
slibGuile = callPackage ../development/libraries/slib {
|
||||
scheme = guile_1_8;
|
||||
texinfo = texinfo4; # otherwise erros: must be after `@defun' to use `@defunx'
|
||||
scheme = guile;
|
||||
};
|
||||
|
||||
smpeg = callPackage ../development/libraries/smpeg { };
|
||||
|
|
Loading…
Reference in a new issue