forked from mirrors/nixpkgs
Merge master into staging-next
This commit is contained in:
commit
5b74f8b399
nixos/modules/services/web-apps
pkgs
applications
data/fonts/julia-mono
development
libraries/libvirt
python-modules/libvirt
tools/rust/racer
tools
top-level
|
@ -372,17 +372,19 @@ in {
|
|||
};
|
||||
|
||||
user = lib.mkOption {
|
||||
type = lib.types.nullOr lib.types.str;
|
||||
default = null;
|
||||
example = "mastodon@example.com";
|
||||
description = lib.mdDoc "SMTP login name.";
|
||||
type = lib.types.str;
|
||||
};
|
||||
|
||||
passwordFile = lib.mkOption {
|
||||
type = lib.types.nullOr lib.types.path;
|
||||
default = null;
|
||||
example = "/var/lib/mastodon/secrets/smtp-password";
|
||||
description = lib.mdDoc ''
|
||||
Path to file containing the SMTP password.
|
||||
'';
|
||||
default = "/var/lib/mastodon/secrets/smtp-password";
|
||||
example = "/run/keys/mastodon-smtp-password";
|
||||
type = lib.types.str;
|
||||
};
|
||||
};
|
||||
|
||||
|
@ -467,6 +469,20 @@ in {
|
|||
assertion = databaseActuallyCreateLocally -> (cfg.user == cfg.database.user);
|
||||
message = ''For local automatic database provisioning (services.mastodon.database.createLocally == true) with peer authentication (services.mastodon.database.host == "/run/postgresql") to work services.mastodon.user and services.mastodon.database.user must be identical.'';
|
||||
}
|
||||
{
|
||||
assertion = cfg.smtp.authenticate -> (cfg.smtp.user != null);
|
||||
message = ''
|
||||
<option>services.mastodon.smtp.user</option> needs to be set if
|
||||
<option>services.mastodon.smtp.authenticate</option> is enabled.
|
||||
'';
|
||||
}
|
||||
{
|
||||
assertion = cfg.smtp.authenticate -> (cfg.smtp.passwordFile != null);
|
||||
message = ''
|
||||
<option>services.mastodon.smtp.passwordFile</option> needs to be set if
|
||||
<option>services.mastodon.smtp.authenticate</option> is enabled.
|
||||
'';
|
||||
}
|
||||
];
|
||||
|
||||
systemd.services.mastodon-init-dirs = {
|
||||
|
|
|
@ -1,11 +1,11 @@
|
|||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
|
||||
# SHA of ${version} for the tool's help output. Unfortunately this is needed in build flags.
|
||||
let rev = "551bf68c694927839c3add25a2512f880902ee9b";
|
||||
let rev = "5b97033257d0276c7b0d1b20412667a69d79261e";
|
||||
in
|
||||
buildGoModule rec {
|
||||
pname = "sonobuoy";
|
||||
version = "0.56.10"; # Do not forget to update `rev` above
|
||||
version = "0.56.12"; # Do not forget to update `rev` above
|
||||
|
||||
ldflags =
|
||||
let t = "github.com/vmware-tanzu/sonobuoy";
|
||||
|
@ -20,10 +20,10 @@ buildGoModule rec {
|
|||
owner = "vmware-tanzu";
|
||||
repo = "sonobuoy";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Hykm8h0kJzTL6XbaBe3vtoghmP4LmvPfBhrTgCmNyRE=";
|
||||
sha256 = "sha256-i+fg5tPkpnNl1Oef1KPmhHC+5t4y9vvfRpw9DHbsf4w=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-jBm3t/kvijAv5KOLhDJ1kGLdzpFJiBs/Vtu2mO2lnPM=";
|
||||
vendorSha256 = "sha256-SRR4TmNHbMOOMv6AXv/Qpn2KUQh+ZsFlzc5DpdyPLEU=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
|
|
@ -21,11 +21,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "e16";
|
||||
version = "1.0.26";
|
||||
version = "1.0.27";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/enlightenment/e16-${version}.tar.xz";
|
||||
hash = "sha256-1FJFE4z8UT5VYv0Ef9pqi5sYq8iIbrDPKaqcUFf9dwE=";
|
||||
hash = "sha256-Lr5OC14N6KTZNU3Ei4O9taYGL+1NZd5JmejYBmmELUE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -1,17 +1,20 @@
|
|||
{ lib, fetchzip }:
|
||||
|
||||
let
|
||||
version = "0.044";
|
||||
version = "0.046";
|
||||
|
||||
in
|
||||
fetchzip {
|
||||
name = "JuliaMono-ttf-${version}";
|
||||
url = "https://github.com/cormullion/juliamono/releases/download/v${version}/JuliaMono-ttf.tar.gz";
|
||||
sha256 = "sha256-KCU1eOSEWjYh6kPda/iCtZUIWIq5lK79uUCLl2w7SEg=";
|
||||
sha256 = "sha256-+Ro517m1unQskQFhsT6oiz19aov87/tT1jlP/XB7kFU=";
|
||||
|
||||
stripRoot = false;
|
||||
|
||||
postFetch = ''
|
||||
mkdir -p $out/share/fonts/truetype
|
||||
tar xf $downloadedFile -C $out/share/fonts/truetype
|
||||
mv $out/*.ttf $out/share/fonts/truetype
|
||||
rm $out/LICENSE
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
@ -230,7 +230,7 @@ diff --git a/src/network/meson.build b/src/network/meson.build
|
|||
index b5eff0c3ab..a0f26d624e 100644
|
||||
--- a/src/network/meson.build
|
||||
+++ b/src/network/meson.build
|
||||
@@ -73,11 +73,11 @@ if conf.has('WITH_NETWORK')
|
||||
@@ -73,11 +73,11 @@ 'in_file': files('virtnetworkd.init.in'),
|
||||
}
|
||||
|
||||
virt_install_dirs += [
|
||||
|
@ -247,7 +247,7 @@ index b5eff0c3ab..a0f26d624e 100644
|
|||
]
|
||||
|
||||
configure_file(
|
||||
@@ -85,12 +85,12 @@ if conf.has('WITH_NETWORK')
|
||||
@@ -85,12 +85,12 @@ input: 'default.xml.in',
|
||||
output: '@BASENAME@',
|
||||
copy: true,
|
||||
install: true,
|
||||
|
@ -256,7 +256,7 @@ index b5eff0c3ab..a0f26d624e 100644
|
|||
)
|
||||
|
||||
meson.add_install_script(
|
||||
meson_python_prog.path(), python3_prog.path(), meson_install_symlink_prog.path(),
|
||||
meson_python_prog.full_path(), python3_prog.full_path(), meson_install_symlink_prog.full_path(),
|
||||
- confdir / 'qemu' / 'networks' / 'autostart',
|
||||
+ install_prefix + confdir / 'qemu' / 'networks' / 'autostart',
|
||||
'../default.xml', 'default.xml',
|
||||
|
|
|
@ -114,13 +114,13 @@ stdenv.mkDerivation rec {
|
|||
# NOTE: You must also bump:
|
||||
# <nixpkgs/pkgs/development/python-modules/libvirt/default.nix>
|
||||
# SysVirt in <nixpkgs/pkgs/top-level/perl-packages.nix>
|
||||
version = "8.8.0";
|
||||
version = "8.9.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-p7z+paiSeIm2cWnc6n9Hrd++BDmccGj+EOhqHNsJiXw=";
|
||||
sha256 = "sha256-79frEYItbf1weOkrcyI/Z/TjTg6kLMQbteaTi9LAt0g=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "libvirt";
|
||||
version = "8.8.0";
|
||||
version = "8.9.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "libvirt";
|
||||
repo = "libvirt-python";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-UguqUsIfrql1UZeBoHLKXvLYuWicbJWamglkvqS++FI=";
|
||||
sha256 = "sha256-vquchyGJlpg0R0R6Wh2MWB5RUZ3jzOQYzUoLwiLxIy8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
|
|
@ -1,50 +0,0 @@
|
|||
{ lib, rustPlatform, fetchCrate, makeWrapper, stdenv, Security }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "racer";
|
||||
version = "2.2.1";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-uAVtJwOyhe1lPz+MUUFCgHJPVGuIk/lNUkQWiNdOZ5Y=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-U2mI1y6t8CwxW/iPcPzxAafu61GNm/XLCKVGuyybV/4=";
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
buildInputs = lib.optional stdenv.isDarwin Security;
|
||||
|
||||
# a nightly compiler is required unless we use this cheat code.
|
||||
RUSTC_BOOTSTRAP = 1;
|
||||
|
||||
RUST_SRC_PATH = rustPlatform.rustLibSrc;
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/racer --set-default RUST_SRC_PATH ${rustPlatform.rustLibSrc}
|
||||
'';
|
||||
|
||||
checkFlags = [
|
||||
"--skip nameres::test_do_file_search_std"
|
||||
"--skip util::test_get_rust_src_path_rustup_ok"
|
||||
"--skip util::test_get_rust_src_path_not_rust_source_tree"
|
||||
"--skip extern --skip completes_pub_fn --skip find_crate_doc"
|
||||
"--skip follows_use_local_package --skip follows_use_for_reexport"
|
||||
"--skip follows_rand_crate --skip get_completion_in_example_dir"
|
||||
"--skip test_resolve_global_path_in_modules"
|
||||
];
|
||||
|
||||
# [2022-04-06] Its test suite contains two function calls with the
|
||||
# wrong number of arguments, breaking its build.
|
||||
doCheck = false;
|
||||
|
||||
doInstallCheck = true;
|
||||
installCheckPhase = ''
|
||||
$out/bin/racer --version
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A utility intended to provide Rust code completion for editors and IDEs";
|
||||
homepage = "https://github.com/racer-rust/racer";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ jagajaga ];
|
||||
};
|
||||
}
|
|
@ -14,16 +14,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "onefetch";
|
||||
version = "2.13.2";
|
||||
version = "2.14.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "o2sh";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-ydRdnzOI9syfF2ox9vHA9Q0j8C7ZNb0b7CJfqUprPA0=";
|
||||
rev = version;
|
||||
sha256 = "sha256-LiX91GMJdmhosCZcL3JlzYRieqeQs+YWMAtKTzSBzZY=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-IprUSNxoojagXUO/I7WDGJMG0U541ioe4qgLT4hqmbY=";
|
||||
cargoSha256 = "sha256-D1GVwNpuqoiwJsWAZfTR9qUC1xuHR+O0bq9rxmgkYXk=";
|
||||
|
||||
cargoPatches = [
|
||||
# enable pkg-config feature of zstd
|
||||
|
|
|
@ -2,14 +2,14 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "b3sum";
|
||||
version = "1.3.1";
|
||||
version = "1.3.3";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit version pname;
|
||||
sha256 = "sha256-Vb4W1TfHppKm2Ib2VHm+917A09JY1oNebymzcQpPm8Q=";
|
||||
sha256 = "sha256-PeH4oMeLxEM1pKqMsZBhsbmZOAVdLEmWKyPjuRNjowA=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-cpY69NsbsHgQITdElsNjrhjaih9rgOVpFEv4Pfp9OPw=";
|
||||
cargoSha256 = "sha256-dvxQY1KgZGOCIeFoxfOewF9gm9xORLelJxJMMtrNWDs=";
|
||||
|
||||
meta = {
|
||||
description = "BLAKE3 cryptographic hash function";
|
||||
|
|
40
pkgs/tools/text/d2/default.nix
Normal file
40
pkgs/tools/text/d2/default.nix
Normal file
|
@ -0,0 +1,40 @@
|
|||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
, installShellFiles
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "d2";
|
||||
version = "0.0.13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "terrastruct";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-2abGQmgwqxWFk7NScdgfEjRYZF2rw8kxTKRwcl2LRg0=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-/BEl4UqOL4Ux7I2eubNH2YGGl4DxntpI5WN9ggvYu80=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X oss.terrastruct.com/d2/lib/version.Version=${version}"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
postInstall = ''
|
||||
installManPage ci/release/template/man/d2.1
|
||||
'';
|
||||
|
||||
subPackages = [ "cmd/d2" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A modern diagram scripting language that turns text to diagrams";
|
||||
homepage = "https://d2lang.com";
|
||||
license = licenses.mpl20;
|
||||
maintainers = with maintainers; [ dit7ya ];
|
||||
};
|
||||
}
|
|
@ -1324,6 +1324,7 @@ mapAliases ({
|
|||
runCommandNoCCLocal = runCommandLocal;
|
||||
runwayml = throw "runwayml is now a webapp"; # Added 2021-04-17
|
||||
rustracerd = throw "rustracerd has been removed because it is broken and unmaintained"; # Added 2021-10-19
|
||||
rustracer = throw "rustracer has been removed as it has been deprecated"; # Added 2022-11-28
|
||||
rxvt_unicode = rxvt-unicode-unwrapped; # Added 2020-02-02
|
||||
rxvt_unicode-with-plugins = rxvt-unicode; # Added 2020-02-02
|
||||
|
||||
|
|
|
@ -6356,6 +6356,8 @@ with pkgs;
|
|||
|
||||
conform = callPackage ../applications/version-management/git-and-tools/conform { };
|
||||
|
||||
d2 = callPackage ../tools/text/d2 { };
|
||||
|
||||
easeprobe = callPackage ../tools/misc/easeprobe { };
|
||||
|
||||
emscripten = callPackage ../development/compilers/emscripten {
|
||||
|
@ -15262,9 +15264,6 @@ with pkgs;
|
|||
rhack = callPackage ../development/tools/rust/rhack { };
|
||||
roogle = callPackage ../development/tools/rust/roogle { };
|
||||
rustfmt = rustPackages.rustfmt;
|
||||
rustracer = callPackage ../development/tools/rust/racer {
|
||||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
};
|
||||
rust-analyzer-unwrapped = callPackage ../development/tools/rust/rust-analyzer {
|
||||
inherit (darwin.apple_sdk.frameworks) CoreServices;
|
||||
};
|
||||
|
|
|
@ -22634,12 +22634,12 @@ let
|
|||
|
||||
SysVirt = buildPerlModule rec {
|
||||
pname = "Sys-Virt";
|
||||
version = "8.8.0";
|
||||
version = "8.9.0";
|
||||
src = fetchFromGitLab {
|
||||
owner = "libvirt";
|
||||
repo = "libvirt-perl";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-8maLIW4hBbMbq+rnwEfaHsUgpppaU5K4aQTwTgUjdcI=";
|
||||
hash = "sha256-s3N4KU0JnIXHKOme+2Vxapd6o8QeT6lUAb+r5i9Ogv0=";
|
||||
};
|
||||
nativeBuildInputs = [ pkgs.pkg-config ];
|
||||
buildInputs = [ pkgs.libvirt CPANChanges TestPod TestPodCoverage XMLXPath ];
|
||||
|
|
Loading…
Reference in a new issue