mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-22 15:03:28 +00:00
Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
8c2e73a4ed
1
.github/CODEOWNERS
vendored
1
.github/CODEOWNERS
vendored
@ -19,7 +19,6 @@
|
||||
# Develompent support
|
||||
/.editorconfig @Mic92 @zowoq
|
||||
/shell.nix @infinisil @NixOS/Security
|
||||
/.envrc @infinisil @NixOS/Security
|
||||
|
||||
# Libraries
|
||||
/lib @infinisil
|
||||
|
||||
1
.gitignore
vendored
1
.gitignore
vendored
@ -21,6 +21,7 @@ tags
|
||||
/source/
|
||||
.version-suffix
|
||||
.direnv
|
||||
.envrc
|
||||
|
||||
.DS_Store
|
||||
.mypy_cache
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, ... }:
|
||||
{ ... }:
|
||||
|
||||
{
|
||||
config = {
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, custom, ... }:
|
||||
{ custom, ... }:
|
||||
|
||||
{
|
||||
config = {
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, ... }:
|
||||
{ ... }:
|
||||
|
||||
{
|
||||
disabledModules = [ ./declare-enable.nix ];
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, ... }:
|
||||
{ ... }:
|
||||
|
||||
{
|
||||
disabledModules = [ (toString ./define-enable.nix) ];
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, ... }:
|
||||
{ ... }:
|
||||
|
||||
{
|
||||
disabledModules = [ ./define-enable.nix ];
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, ... }:
|
||||
{ ... }:
|
||||
|
||||
{
|
||||
disabledModules = [ "define-enable.nix" "declare-enable.nix" ];
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ config, lib, ... }:
|
||||
{ config, ... }:
|
||||
{
|
||||
config = {
|
||||
services.foo.enable = true;
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ config, lib, ... }:
|
||||
{ config, ... }:
|
||||
{
|
||||
config = {
|
||||
services.foos."".bar = "baz";
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ config, lib, options, ... }:
|
||||
{ config, options, ... }:
|
||||
{
|
||||
config = {
|
||||
result =
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, ... }:
|
||||
{ ... }:
|
||||
{
|
||||
|
||||
imports = [
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, ... }:
|
||||
{ ... }:
|
||||
|
||||
let
|
||||
typeless =
|
||||
|
||||
@ -5447,6 +5447,13 @@
|
||||
githubId = 1931963;
|
||||
name = "David Sferruzza";
|
||||
};
|
||||
dstengele = {
|
||||
name = "Dennis Stengele";
|
||||
email = "dennis@stengele.me";
|
||||
matrix = "@dstengele:pango.place";
|
||||
github = "dstengele";
|
||||
githubId = 1706418;
|
||||
};
|
||||
dsuetin = {
|
||||
name = "Danil Suetin";
|
||||
email = "suetin085+nixpkgs@protonmail.com";
|
||||
|
||||
@ -42,6 +42,8 @@
|
||||
|
||||
- [Music Assistant](https://music-assistant.io/), a music library manager for your offline and online music sources which can easily stream your favourite music to a wide range of supported players. Available as [services.music-assistant](#opt-services.music-assistant.enable).
|
||||
|
||||
- [zeronsd](https://github.com/zerotier/zeronsd), a DNS server for ZeroTier users. Available with [services.zeronsd.servedNetworks](#opt-services.zeronsd.servedNetworks).
|
||||
|
||||
- [wg-access-server](https://github.com/freifunkMUC/wg-access-server/), an all-in-one WireGuard VPN solution with a web ui for connecting devices. Available at [services.wg-access-server](#opt-services.wg-access-server.enable).
|
||||
|
||||
- [Envision](https://gitlab.com/gabmus/envision), a UI for building, configuring and running Monado, the open source OpenXR runtime. Available as [programs.envision](#opt-programs.envision.enable).
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
# your system. Help is available in the configuration.nix(5) man page
|
||||
# and in the NixOS manual (accessible by running ‘nixos-help’).
|
||||
|
||||
{ config, pkgs, lib, modulesPath, ... }:
|
||||
{ modulesPath, ... }:
|
||||
|
||||
{
|
||||
imports =
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
# your system. Help is available in the configuration.nix(5) man page
|
||||
# and in the NixOS manual (accessible by running ‘nixos-help’).
|
||||
|
||||
{ config, pkgs, lib, modulesPath, ... }:
|
||||
{ modulesPath, ... }:
|
||||
|
||||
{
|
||||
imports =
|
||||
|
||||
@ -356,6 +356,7 @@
|
||||
./security/systemd-confinement.nix
|
||||
./security/tpm2.nix
|
||||
./security/wrappers/default.nix
|
||||
./services/accessibility/speechd.nix
|
||||
./services/admin/docuum.nix
|
||||
./services/admin/meshcentral.nix
|
||||
./services/admin/oxidized.nix
|
||||
@ -1258,6 +1259,7 @@
|
||||
./services/networking/zerobin.nix
|
||||
./services/networking/zeronet.nix
|
||||
./services/networking/zerotierone.nix
|
||||
./services/networking/zeronsd.nix
|
||||
./services/networking/znc/default.nix
|
||||
./services/printing/cupsd.nix
|
||||
./services/printing/ipp-usb.nix
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
{ config, pkgs, ... }:
|
||||
|
||||
let
|
||||
inherit (pkgs) writeScript;
|
||||
|
||||
@ -126,5 +126,15 @@ with lib;
|
||||
|
||||
# allow nix-copy to live system
|
||||
nix.settings.trusted-users = [ "root" "nixos" ];
|
||||
|
||||
# Install less voices for speechd to save some space
|
||||
services.speechd.package = pkgs.speechd.override {
|
||||
mbrola = pkgs.mbrola.override {
|
||||
mbrola-voices = pkgs.mbrola-voices.override {
|
||||
# only ship with one voice per language
|
||||
languages = [ "*1" ];
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
# Common configuration for virtual machines running under QEMU (using
|
||||
# virtio).
|
||||
|
||||
{ config, lib, ... }:
|
||||
{ ... }:
|
||||
|
||||
{
|
||||
boot.initrd.availableKernelModules = [ "virtio_net" "virtio_pci" "virtio_mmio" "virtio_blk" "virtio_scsi" "9p" "9pnet_virtio" ];
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
{ config, pkgs, ... }:
|
||||
let apparmor = config.security.apparmor; in
|
||||
{
|
||||
config.security.apparmor.packages = [ pkgs.apparmor-profiles ];
|
||||
|
||||
33
nixos/modules/services/accessibility/speechd.nix
Normal file
33
nixos/modules/services/accessibility/speechd.nix
Normal file
@ -0,0 +1,33 @@
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
let
|
||||
cfg = config.services.speechd;
|
||||
inherit (lib)
|
||||
getExe
|
||||
mkEnableOption
|
||||
mkIf
|
||||
mkPackageOption
|
||||
;
|
||||
in
|
||||
{
|
||||
options.services.speechd = {
|
||||
# FIXME: figure out how to deprecate this EXTREMELY CAREFULLY
|
||||
enable = mkEnableOption "speech-dispatcher speech synthesizer daemon" // {
|
||||
default = true;
|
||||
};
|
||||
package = mkPackageOption pkgs "speechd" { };
|
||||
};
|
||||
|
||||
# FIXME: speechd 0.12 (or whatever the next version is)
|
||||
# will support socket activation, so switch to that once it's out.
|
||||
config = mkIf cfg.enable {
|
||||
environment = {
|
||||
systemPackages = [ cfg.package ];
|
||||
sessionVariables.SPEECHD_CMD = getExe cfg.package;
|
||||
};
|
||||
};
|
||||
}
|
||||
@ -58,7 +58,7 @@ in {
|
||||
environment.systemPackages = [ cfg.package ] ;
|
||||
|
||||
systemd.services.surrealdb = {
|
||||
description = "A scalable, distributed, collaborative, document-graph database, for the realtime web ";
|
||||
description = "A scalable, distributed, collaborative, document-graph database, for the realtime web";
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
after = [ "network.target" ];
|
||||
|
||||
|
||||
@ -254,6 +254,7 @@ in {
|
||||
extraPackages = with kdePackages; [
|
||||
breeze-icons
|
||||
kirigami
|
||||
libplasma
|
||||
plasma5support
|
||||
qtsvg
|
||||
qtvirtualkeyboard
|
||||
|
||||
@ -192,7 +192,12 @@ in {
|
||||
};
|
||||
|
||||
customComponents = mkOption {
|
||||
type = types.listOf types.package;
|
||||
type = types.listOf (
|
||||
types.addCheck types.package (p: p.isHomeAssistantComponent or false) // {
|
||||
name = "home-assistant-component";
|
||||
description = "package that is a Home Assistant component";
|
||||
}
|
||||
);
|
||||
default = [];
|
||||
example = literalExpression ''
|
||||
with pkgs.home-assistant-custom-components; [
|
||||
|
||||
@ -175,7 +175,7 @@ in
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
users.users.nagios = {
|
||||
description = "Nagios user ";
|
||||
description = "Nagios user";
|
||||
uid = config.ids.uids.nagios;
|
||||
home = nagiosState;
|
||||
group = "nagios";
|
||||
|
||||
@ -38,7 +38,7 @@ in
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
systemd.services.antennas = {
|
||||
description = "Antennas HDHomeRun emulator for Tvheadend. ";
|
||||
description = "Antennas HDHomeRun emulator for Tvheadend.";
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
|
||||
# Config
|
||||
|
||||
117
nixos/modules/services/networking/zeronsd.nix
Normal file
117
nixos/modules/services/networking/zeronsd.nix
Normal file
@ -0,0 +1,117 @@
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
|
||||
let
|
||||
cfg = config.services.zeronsd;
|
||||
settingsFormat = pkgs.formats.json { };
|
||||
in
|
||||
{
|
||||
options.services.zeronsd.servedNetworks = lib.mkOption {
|
||||
default = { };
|
||||
example = {
|
||||
"a8a2c3c10c1a68de".settings.token = "/var/lib/zeronsd/apitoken";
|
||||
};
|
||||
description = "ZeroTier Networks to start zeronsd instances for.";
|
||||
type = lib.types.attrsOf (
|
||||
lib.types.submodule {
|
||||
options = {
|
||||
package = lib.mkPackageOption pkgs "zeronsd" { };
|
||||
|
||||
settings = lib.mkOption {
|
||||
description = "Settings for zeronsd";
|
||||
default = { };
|
||||
type = lib.types.submodule {
|
||||
freeformType = settingsFormat.type;
|
||||
|
||||
options = {
|
||||
domain = lib.mkOption {
|
||||
default = "home.arpa";
|
||||
type = lib.types.singleLineStr;
|
||||
description = "Domain under which ZeroTier records will be available.";
|
||||
};
|
||||
|
||||
token = lib.mkOption {
|
||||
type = lib.types.path;
|
||||
description = "Path to a file containing the API Token for ZeroTier Central.";
|
||||
};
|
||||
|
||||
log_level = lib.mkOption {
|
||||
default = "warn";
|
||||
type = lib.types.enum [
|
||||
"off"
|
||||
"error"
|
||||
"warn"
|
||||
"info"
|
||||
"debug"
|
||||
"trace"
|
||||
];
|
||||
description = "Log Level.";
|
||||
};
|
||||
|
||||
wildcard = lib.mkOption {
|
||||
default = false;
|
||||
type = lib.types.bool;
|
||||
description = "Whether to serve a wildcard record for ZeroTier Nodes.";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
);
|
||||
};
|
||||
|
||||
config = lib.mkIf (cfg.servedNetworks != { }) {
|
||||
assertions = [
|
||||
{
|
||||
assertion = config.services.zerotierone.enable;
|
||||
message = "zeronsd needs a configured zerotier-one";
|
||||
}
|
||||
];
|
||||
|
||||
systemd.services = lib.mapAttrs' (netname: netcfg: {
|
||||
name = "zeronsd-${netname}";
|
||||
value = {
|
||||
description = "ZeroTier DNS server for Network ${netname}";
|
||||
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
after = [
|
||||
"network.target"
|
||||
"zerotierone.service"
|
||||
];
|
||||
wants = [ "network-online.target" ];
|
||||
|
||||
serviceConfig =
|
||||
let
|
||||
configFile = pkgs.writeText "zeronsd.json" (builtins.toJSON netcfg.settings);
|
||||
in
|
||||
{
|
||||
ExecStart = "${netcfg.package}/bin/zeronsd start --config ${configFile} --config-type json ${netname}";
|
||||
Restart = "on-failure";
|
||||
RestartSec = 2;
|
||||
TimeoutStopSec = 5;
|
||||
User = "zeronsd";
|
||||
Group = "zeronsd";
|
||||
AmbientCapabilities = "CAP_NET_BIND_SERVICE";
|
||||
};
|
||||
};
|
||||
}) cfg.servedNetworks;
|
||||
|
||||
systemd.tmpfiles.rules = [
|
||||
"a+ /var/lib/zerotier-one - - - - u:zeronsd:x"
|
||||
"a+ /var/lib/zerotier-one/authtoken.secret - - - - mask::r,u:zeronsd:r"
|
||||
];
|
||||
|
||||
users.users.zeronsd = {
|
||||
group = "zeronsd";
|
||||
description = "Service user for running zeronsd";
|
||||
isSystemUser = true;
|
||||
};
|
||||
|
||||
users.groups.zeronsd = { };
|
||||
};
|
||||
}
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, nodes, pkgs, ... }:
|
||||
{ nodes, ... }:
|
||||
let
|
||||
caCert = nodes.acme.test-support.acme.caCert;
|
||||
caDomain = nodes.acme.test-support.acme.caDomain;
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ pkgs, lib, makeInstalledTest, ... }:
|
||||
{ pkgs, makeInstalledTest, ... }:
|
||||
|
||||
makeInstalledTest {
|
||||
tested = pkgs.ostree;
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
, libxslt
|
||||
, libxml2
|
||||
, speechSupport ? true
|
||||
, speechd
|
||||
, speechd-minimal
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
@ -56,7 +56,7 @@ stdenv.mkDerivation {
|
||||
# at-spi2 needs dbus to be recognized by pkg-config
|
||||
at-spi2-core
|
||||
dbus
|
||||
] ++ lib.optional speechSupport speechd;
|
||||
] ++ lib.optional speechSupport speechd-minimal;
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
|
||||
@ -5,7 +5,6 @@
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
, gnome
|
||||
, gnome-desktop
|
||||
, glib
|
||||
, gtk3
|
||||
|
||||
@ -9,7 +9,6 @@
|
||||
, libglvnd
|
||||
, libogg
|
||||
, libvorbis
|
||||
, makeWrapper
|
||||
, openal
|
||||
, portaudio
|
||||
, rtmidi
|
||||
|
||||
@ -2,7 +2,6 @@
|
||||
, faust
|
||||
, lv2
|
||||
, qtbase
|
||||
, which
|
||||
}:
|
||||
|
||||
faust.wrapWithBuildEnv {
|
||||
|
||||
@ -13,7 +13,6 @@
|
||||
, pkg-config
|
||||
, autoPatchelfHook
|
||||
, soxr
|
||||
, freetype
|
||||
, libsamplerate
|
||||
, armadillo
|
||||
, tomlplusplus
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, lib, fetchFromGitHub, runCommandLocal }:
|
||||
{ stdenv, lib, fetchFromGitHub, runCommandLocal, mbrola-voices }:
|
||||
|
||||
let
|
||||
pname = "mbrola";
|
||||
@ -12,20 +12,6 @@ let
|
||||
homepage = "https://github.com/numediart/MBROLA";
|
||||
};
|
||||
|
||||
# Very big (0.65 G) so kept as a fixed-output derivation to limit "duplicates".
|
||||
voices = fetchFromGitHub {
|
||||
owner = "numediart";
|
||||
repo = "MBROLA-voices";
|
||||
rev = "fe05a0ccef6a941207fd6aaad0b31294a1f93a51"; # using latest commit
|
||||
sha256 = "1w0y2xjp9rndwdjagp2wxh656mdm3d6w9cs411g27rjyfy1205a0";
|
||||
|
||||
name = "${pname}-voices-${version}";
|
||||
meta = meta // {
|
||||
description = "Speech synthesizer based on the concatenation of diphones (voice files)";
|
||||
homepage = "https://github.com/numediart/MBROLA-voices";
|
||||
};
|
||||
};
|
||||
|
||||
bin = stdenv.mkDerivation {
|
||||
pname = "${pname}-bin";
|
||||
inherit version;
|
||||
@ -60,7 +46,7 @@ in
|
||||
}
|
||||
''
|
||||
mkdir -p "$out/share/mbrola"
|
||||
ln -s '${voices}/data' "$out/share/mbrola/voices"
|
||||
ln -s '${mbrola-voices}/data' "$out/share/mbrola/voices"
|
||||
ln -s '${bin}/bin' "$out/"
|
||||
''
|
||||
|
||||
|
||||
51
pkgs/applications/audio/mbrola/voices.nix
Normal file
51
pkgs/applications/audio/mbrola/voices.nix
Normal file
@ -0,0 +1,51 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
unstableGitUpdater,
|
||||
mbrola,
|
||||
languages ? [ ],
|
||||
}:
|
||||
|
||||
let
|
||||
src = fetchFromGitHub {
|
||||
owner = "numediart";
|
||||
repo = "MBROLA-voices";
|
||||
rev = "fe05a0ccef6a941207fd6aaad0b31294a1f93a51";
|
||||
hash = "sha256-QBUggnde5iNeCESzxE0btVVTDOxc3Kdk483mdGUXHvA=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Speech synthesizer based on the concatenation of diphones (voice files)";
|
||||
homepage = "https://github.com/numediart/MBROLA-voices";
|
||||
license = mbrola.meta.license;
|
||||
};
|
||||
in
|
||||
|
||||
if (languages == [ ]) then
|
||||
src // { inherit meta; }
|
||||
else
|
||||
stdenv.mkDerivation {
|
||||
pname = "mbrola-voices";
|
||||
version = "0-unstable-2020-03-30";
|
||||
|
||||
inherit src;
|
||||
|
||||
postPatch = ''
|
||||
shopt -s extglob
|
||||
pushd data
|
||||
rm -rfv !(${lib.concatStringsSep "|" languages})
|
||||
popd
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir $out
|
||||
cp -R data $out/
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
inherit meta;
|
||||
}
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, lib, fetchurl, pkg-config, meson, ninja, libGLU, lv2, serd, sord, libX11, libXext, glew, lv2lint
|
||||
{ stdenv, lib, fetchurl, pkg-config, meson, ninja, lv2, sord, libX11, libXext, glew, lv2lint
|
||||
, pname, version, sha256, description
|
||||
, url ? "https://git.open-music-kontrollers.ch/lv2/${pname}.lv2/snapshot/${pname}.lv2-${version}.tar.xz"
|
||||
, additionalBuildInputs ? []
|
||||
|
||||
@ -4,7 +4,6 @@
|
||||
, pipewire
|
||||
, cmake
|
||||
, extra-cmake-modules
|
||||
, gnumake
|
||||
, wrapQtAppsHook
|
||||
, qtbase
|
||||
, qttools
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
, glibmm
|
||||
, libpulseaudio
|
||||
, libao
|
||||
, speechd
|
||||
, speechd-minimal
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
|
||||
glibmm
|
||||
libpulseaudio
|
||||
libao
|
||||
speechd
|
||||
speechd-minimal
|
||||
];
|
||||
|
||||
meta = {
|
||||
|
||||
@ -1,7 +1,6 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, pkg-config
|
||||
, gst_all_1
|
||||
, libviperfx
|
||||
, makeWrapper
|
||||
|
||||
@ -1,6 +1,5 @@
|
||||
{ callPackage
|
||||
, timeshift-unwrapped
|
||||
, lib
|
||||
, rsync
|
||||
, coreutils
|
||||
, mount
|
||||
|
||||
@ -19,7 +19,6 @@
|
||||
, qtbase ? null
|
||||
, qttools ? null
|
||||
, python3
|
||||
, nixosTests
|
||||
, withGui
|
||||
, withWallet ? true
|
||||
}:
|
||||
|
||||
@ -2,7 +2,6 @@
|
||||
, stdenv
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, llvmPackages
|
||||
, rocksdb_7_10
|
||||
, Security
|
||||
}:
|
||||
|
||||
@ -1,6 +1,5 @@
|
||||
{ fetchFromGitHub
|
||||
, stdenv
|
||||
, makeDesktopItem
|
||||
, lib
|
||||
, openssl
|
||||
, boost
|
||||
|
||||
@ -1,5 +1,4 @@
|
||||
{ clang
|
||||
, cmake
|
||||
{ cmake
|
||||
, CoreFoundation
|
||||
, fetchFromGitHub
|
||||
, fetchurl
|
||||
@ -18,7 +17,6 @@
|
||||
, stdenv
|
||||
, SystemConfiguration
|
||||
, testers
|
||||
, unzip
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
|
||||
@ -1,7 +1,6 @@
|
||||
{ buildGoModule
|
||||
, fetchFromGitHub
|
||||
, lib
|
||||
, go
|
||||
, tags ? [ "autopilotrpc" "signrpc" "walletrpc" "chainrpc" "invoicesrpc" "watchtowerrpc" "routerrpc" "monitoring" "kvdb_postgres" "kvdb_etcd" ]
|
||||
}:
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{ rustPlatform, lib, fetchFromGitHub
|
||||
, zlib, openssl
|
||||
, pkg-config, protobuf, llvmPackages
|
||||
, pkg-config, protobuf
|
||||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "nearcore";
|
||||
|
||||
@ -6,7 +6,6 @@
|
||||
, curl
|
||||
, pkg-config
|
||||
, openssl
|
||||
, llvmPackages
|
||||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "snarkos";
|
||||
|
||||
@ -96,7 +96,7 @@ rustPlatform.buildRustPackage rec {
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Web-Scale Blockchain for fast, secure, scalable, decentralized apps and marketplaces. ";
|
||||
description = "Web-Scale Blockchain for fast, secure, scalable, decentralized apps and marketplaces.";
|
||||
homepage = "https://solana.com";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ adjacentresearch ];
|
||||
|
||||
@ -1,5 +1,4 @@
|
||||
{ lib
|
||||
, buildFHSEnv
|
||||
{ buildFHSEnv
|
||||
, sparrow-unwrapped
|
||||
}:
|
||||
|
||||
|
||||
@ -1,8 +1,6 @@
|
||||
{ lib, stdenv
|
||||
, fetchurl
|
||||
, dpkg
|
||||
, util-linux
|
||||
, bash
|
||||
, makeWrapper
|
||||
, electron
|
||||
, asar
|
||||
|
||||
@ -8,7 +8,6 @@
|
||||
markdown-mode,
|
||||
melpaBuild,
|
||||
unstableGitUpdater,
|
||||
writeText,
|
||||
}:
|
||||
|
||||
melpaBuild {
|
||||
|
||||
@ -1,6 +1,5 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, writeText
|
||||
, melpaStablePackages
|
||||
, runCommand
|
||||
, tree-sitter-grammars
|
||||
|
||||
@ -1,10 +1,7 @@
|
||||
{ lib
|
||||
, callPackage
|
||||
, clangStdenv
|
||||
, cmake
|
||||
, fetchFromGitHub
|
||||
, gcc
|
||||
, git
|
||||
, llvmPackages_13
|
||||
# Libraries
|
||||
, argparse
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ micro, expect, runCommand, writeScript, runtimeShell }:
|
||||
{ micro, expect, runCommand, writeScript }:
|
||||
|
||||
let expect-script = writeScript "expect-script" ''
|
||||
#!${expect}/bin/expect -f
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ nano, expect, runCommand, writeScriptBin, runtimeShell }:
|
||||
{ nano, expect, runCommand, writeScriptBin }:
|
||||
|
||||
let expect-script = writeScriptBin "expect-script" ''
|
||||
#!${expect}/bin/expect -f
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
# run tests by building `neovim.tests`
|
||||
{ vimUtils, writeText, neovim, vimPlugins
|
||||
, lib, neovimUtils, wrapNeovimUnstable
|
||||
, neovimUtils, wrapNeovimUnstable
|
||||
, neovim-unwrapped
|
||||
, fetchFromGitLab
|
||||
, runCommandLocal
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, buildFHSEnv, callPackage, makeDesktopItem, writeScript, runtimeShell
|
||||
{ lib, buildFHSEnv, callPackage, makeDesktopItem, runtimeShell
|
||||
, runCommand, unstick, quartus-prime-lite
|
||||
, withQuesta ? true
|
||||
, supportedDevices ? [ "Arria II" "Cyclone V" "Cyclone IV" "Cyclone 10 LP" "MAX II/V" "MAX 10 FPGA" ]
|
||||
|
||||
@ -2,7 +2,6 @@
|
||||
, stdenv
|
||||
, mkDerivation
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, fetchFromGitHub
|
||||
, makeDesktopItem
|
||||
, copyDesktopItems
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, fetchFromGitHub, python3, tk, makeDesktopItem, copyDesktopItems }:
|
||||
{ lib, fetchFromGitHub, python3, makeDesktopItem, copyDesktopItems }:
|
||||
|
||||
with python3.pkgs;
|
||||
|
||||
|
||||
@ -5,14 +5,12 @@
|
||||
, glib
|
||||
, nss
|
||||
, nspr
|
||||
, at-spi2-atk
|
||||
, cups
|
||||
, dbus
|
||||
, libdrm
|
||||
, gtk3
|
||||
, pango
|
||||
, cairo
|
||||
, xorg
|
||||
, libxkbcommon
|
||||
, mesa
|
||||
, expat
|
||||
|
||||
@ -5,7 +5,6 @@
|
||||
, vimPlugins
|
||||
, makeWrapper
|
||||
, wrapGAppsHook3
|
||||
, runtimeShell
|
||||
|
||||
# apple frameworks
|
||||
, CoreServices, CoreData, Cocoa, Foundation, libobjc
|
||||
|
||||
@ -9833,18 +9833,6 @@ final: prev:
|
||||
meta.homepage = "https://github.com/rust-lang/rust.vim/";
|
||||
};
|
||||
|
||||
rustaceanvim = buildNeovimPlugin {
|
||||
pname = "rustaceanvim";
|
||||
version = "2024-07-10";
|
||||
src = fetchFromGitHub {
|
||||
owner = "mrcjkb";
|
||||
repo = "rustaceanvim";
|
||||
rev = "047f9c9d8cd2861745eb9de6c1570ee0875aa795";
|
||||
sha256 = "0q06rkg8dfzxvlwp7svp8sjkk0f2x5vvjkv6grdmm302s43jj7rk";
|
||||
};
|
||||
meta.homepage = "https://github.com/mrcjkb/rustaceanvim/";
|
||||
};
|
||||
|
||||
sad-vim = buildVimPlugin {
|
||||
pname = "sad.vim";
|
||||
version = "2019-02-18";
|
||||
|
||||
@ -1380,6 +1380,8 @@
|
||||
dependencies = with self; [ nvim-lspconfig ];
|
||||
};
|
||||
|
||||
rustaceanvim = neovimUtils.buildNeovimPlugin { luaAttr = "rustaceanvim"; };
|
||||
|
||||
sg-nvim = super.sg-nvim.overrideAttrs (old:
|
||||
let
|
||||
sg-nvim-rust = rustPlatform.buildRustPackage {
|
||||
|
||||
@ -827,7 +827,6 @@ https://github.com/keith/rspec.vim/,,
|
||||
https://github.com/ccarpita/rtorrent-syntax-file/,,
|
||||
https://github.com/simrat39/rust-tools.nvim/,,
|
||||
https://github.com/rust-lang/rust.vim/,,
|
||||
https://github.com/mrcjkb/rustaceanvim/,HEAD,
|
||||
https://github.com/hauleth/sad.vim/,,
|
||||
https://github.com/vmware-archive/salt-vim/,,
|
||||
https://github.com/lewis6991/satellite.nvim/,HEAD,
|
||||
|
||||
@ -2,7 +2,6 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
bash,
|
||||
ocaml,
|
||||
ocamlPackages,
|
||||
dune_3,
|
||||
|
||||
@ -1,8 +1,6 @@
|
||||
{
|
||||
lib,
|
||||
vscode-utils,
|
||||
writeScript,
|
||||
runtimeShell,
|
||||
jq,
|
||||
clang-tools,
|
||||
gdbUseFixed ? true,
|
||||
|
||||
@ -1,5 +1,4 @@
|
||||
{
|
||||
pkgs,
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
|
||||
@ -4,7 +4,6 @@
|
||||
, appstream-glib
|
||||
, desktop-file-utils
|
||||
, gettext
|
||||
, glib
|
||||
, gobject-introspection
|
||||
, gtk3
|
||||
, gtk4
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, fetchFromGitHub, python3Packages, file, less, highlight, w3m, ranger, imagemagick, testers
|
||||
{ lib, fetchFromGitHub, python3Packages, file, less, highlight, w3m, imagemagick
|
||||
, imagePreviewSupport ? true
|
||||
, sixelPreviewSupport ? true
|
||||
, neoVimSupport ? true
|
||||
|
||||
@ -1,5 +1,4 @@
|
||||
{ lib
|
||||
, makeWrapper
|
||||
{ makeWrapper
|
||||
, nixosTests
|
||||
, symlinkJoin
|
||||
|
||||
|
||||
@ -1,5 +1,4 @@
|
||||
{ lib
|
||||
, makeWrapper
|
||||
{ makeWrapper
|
||||
, nixosTests
|
||||
, symlinkJoin
|
||||
|
||||
|
||||
@ -8,7 +8,6 @@
|
||||
, freetype
|
||||
, libGL
|
||||
, xorg
|
||||
, darwin
|
||||
, AppKit
|
||||
}:
|
||||
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
# If you just want a subset of plug-ins, you can specify them explicitly:
|
||||
# `gimp-with-plugins.override { plugins = with gimpPlugins; [ gap ]; }`.
|
||||
|
||||
{ config, lib, pkgs }:
|
||||
{ lib, pkgs }:
|
||||
|
||||
let
|
||||
inherit (pkgs) stdenv fetchurl fetchpatch fetchpatch2 pkg-config intltool glib fetchFromGitHub fetchFromGitLab;
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{ lib, stdenv, fetchFromGitHub, lazarus, fpc, pango, cairo, glib
|
||||
, atk, gtk2, libX11, gdk-pixbuf, busybox, python3
|
||||
, atk, gtk2, libX11, gdk-pixbuf, python3
|
||||
, makeWrapper
|
||||
}:
|
||||
|
||||
|
||||
@ -10,7 +10,6 @@
|
||||
, goocanvas2
|
||||
, gtkspell3
|
||||
, isocodes
|
||||
, gnome
|
||||
, python3
|
||||
, tesseract4
|
||||
, extraOcrEngines ? [] # other supported engines are: ocrad gocr cuneiform
|
||||
|
||||
@ -7,7 +7,6 @@
|
||||
, gtk3
|
||||
, gobject-introspection
|
||||
, wrapGAppsHook3
|
||||
, python
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
|
||||
@ -3,7 +3,6 @@
|
||||
, requireFile
|
||||
, wrapQtAppsHook
|
||||
, autoPatchelfHook
|
||||
, makeWrapper
|
||||
, unixtools
|
||||
, fakeroot
|
||||
, mailcap
|
||||
|
||||
@ -1,9 +1,7 @@
|
||||
{ lib
|
||||
, fetchFromGitLab
|
||||
, rustPlatform
|
||||
, cargo
|
||||
, pkg-config
|
||||
, binutils-unwrapped
|
||||
, gtk3-x11
|
||||
, atk
|
||||
, glib
|
||||
|
||||
@ -1,7 +1,6 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchgit
|
||||
, dos2unix
|
||||
, qtbase
|
||||
, qttools
|
||||
, qtx11extras
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, lib, fetchurl, callPackage, patchelf, makeWrapper, libusb1, avahi-compat, glib, libredirect, nixosTests }:
|
||||
{ stdenv, lib, fetchurl, patchelf, makeWrapper, libusb1, avahi-compat, glib, libredirect, nixosTests }:
|
||||
let
|
||||
myPatchElf = file: with lib; ''
|
||||
patchelf --set-interpreter \
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{ stdenv, lib, qtbase, wrapQtAppsHook, fetchFromGitHub,
|
||||
addDriverRunpath, poppler_utils, qtxmlpatterns, qtsvg, mesa, gcc, xvfb-run,
|
||||
fontconfig, freetype, xorg, ccache, qmake, python3, qttools, git
|
||||
addDriverRunpath, poppler_utils, qtxmlpatterns, qtsvg, mesa, xvfb-run,
|
||||
fontconfig, freetype, xorg, qmake, python3, qttools, git
|
||||
}:
|
||||
let
|
||||
qtPython = python3.withPackages (pkgs: with pkgs; [ pyqt5 ]);
|
||||
|
||||
@ -1,7 +1,6 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, substituteAll
|
||||
|
||||
, python3
|
||||
, installShellFiles
|
||||
|
||||
@ -1,7 +1,6 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, writeText
|
||||
|
||||
, cmake
|
||||
, pkg-config
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{ mkDerivation, lib, cmake, gettext, pkg-config, extra-cmake-modules
|
||||
, qtquickcontrols, qttools, kde-cli-tools, qtbase
|
||||
, qtquickcontrols, qttools, kde-cli-tools
|
||||
, kconfig, kdeclarative, kdoctools, kiconthemes, ki18n, kitemmodels, kitemviews
|
||||
, kjobwidgets, kcmutils, kio, knewstuff, knotifyconfig, kparts, ktexteditor
|
||||
, threadweaver, kxmlgui, kwindowsystem, grantlee, kcrash, karchive, kguiaddons
|
||||
|
||||
@ -2,7 +2,6 @@
|
||||
, mkDerivation
|
||||
, extra-cmake-modules
|
||||
, shared-mime-info
|
||||
, kconfig
|
||||
, kdoctools
|
||||
, kio
|
||||
, ktextwidgets
|
||||
|
||||
@ -7,7 +7,6 @@
|
||||
, ki18n
|
||||
, knotifications
|
||||
, mauiman
|
||||
, qtbase
|
||||
, qtquickcontrols2
|
||||
, qtx11extras
|
||||
}:
|
||||
|
||||
@ -21,7 +21,6 @@
|
||||
, perl
|
||||
, pkg-config
|
||||
, poppler
|
||||
, auto-multiple-choice
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: rec {
|
||||
pname = "auto-multiple-choice";
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{ stdenv, lib, fetchFromGitHub, cairo, libxkbcommon
|
||||
, pango, fribidi, harfbuzz, pcre, pkg-config, scdoc
|
||||
, pango, fribidi, harfbuzz, pkg-config, scdoc
|
||||
, ncursesSupport ? true, ncurses
|
||||
, waylandSupport ? true, wayland, wayland-protocols, wayland-scanner
|
||||
, x11Support ? true, xorg
|
||||
|
||||
@ -1,5 +1,4 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, blender
|
||||
, makeWrapper
|
||||
, extraModules ? []
|
||||
|
||||
@ -21,7 +21,7 @@
|
||||
, qmake
|
||||
, qtbase
|
||||
, qtwayland
|
||||
, speechd
|
||||
, speechd-minimal
|
||||
, sqlite
|
||||
, wrapQtAppsHook
|
||||
, xdg-utils
|
||||
@ -132,7 +132,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
] ++ lib.optional (unrarSupport) unrardll)
|
||||
)
|
||||
xdg-utils
|
||||
] ++ lib.optional (speechSupport) speechd;
|
||||
] ++ lib.optional (speechSupport) speechd-minimal;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
@ -10,7 +10,6 @@
|
||||
, curl
|
||||
, readline
|
||||
, PCSC
|
||||
, xcbuild
|
||||
}:
|
||||
let
|
||||
version = "0.8.4";
|
||||
|
||||
@ -1,5 +1,4 @@
|
||||
{ lib
|
||||
, pkgs
|
||||
, mkDerivation
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
|
||||
@ -4,7 +4,6 @@
|
||||
, makeWrapper
|
||||
, clipnotify
|
||||
, coreutils
|
||||
, dmenu
|
||||
, gawk
|
||||
, util-linux
|
||||
, xdotool
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, lib, fetchurl, fetchzip, jdk11, unzip, makeWrapper, makeDesktopItem, copyDesktopItems }:
|
||||
{ stdenv, lib, fetchurl, fetchzip, jdk11, makeWrapper, makeDesktopItem, copyDesktopItems }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "conduktor";
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, bundlerApp, bundlerUpdateScript, ruby, makeWrapper, git, docutils, nixosTests }:
|
||||
{ lib, bundlerApp, bundlerUpdateScript, ruby, makeWrapper, nixosTests }:
|
||||
|
||||
bundlerApp rec {
|
||||
pname = "gollum";
|
||||
|
||||
@ -19,13 +19,6 @@
|
||||
, findutils
|
||||
, ccze
|
||||
, ncurses
|
||||
, python3
|
||||
, wget
|
||||
, libcaca
|
||||
, newsboat
|
||||
, rsstail
|
||||
, w3m
|
||||
, ticker
|
||||
, tmux
|
||||
}:
|
||||
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user