mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-11-13 09:17:07 +03:00
Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
135430eb60
2
.github/workflows/backport.yml
vendored
2
.github/workflows/backport.yml
vendored
@ -24,7 +24,7 @@ jobs:
|
||||
with:
|
||||
ref: ${{ github.event.pull_request.head.sha }}
|
||||
- name: Create backport PRs
|
||||
uses: korthout/backport-action@v1.3.1
|
||||
uses: korthout/backport-action@v2.0.0
|
||||
with:
|
||||
# Config README: https://github.com/korthout/backport-action#backport-action
|
||||
copy_labels_pattern: 'severity:\ssecurity'
|
||||
|
||||
@ -138,6 +138,7 @@ in
|
||||
--data-dir $STATE_DIRECTORY \
|
||||
--download-dir $STATE_DIRECTORY \
|
||||
--uri ${options.uri} \
|
||||
--device ${options.device} \
|
||||
--model ${options.model} \
|
||||
--language ${options.language} \
|
||||
--beam-size ${options.beamSize} ${options.extraArgs}
|
||||
|
||||
@ -8,6 +8,7 @@ let
|
||||
cfg = config.services.wyoming.openwakeword;
|
||||
|
||||
inherit (lib)
|
||||
concatStringsSep
|
||||
concatMapStringsSep
|
||||
escapeShellArgs
|
||||
mkOption
|
||||
@ -15,6 +16,7 @@ let
|
||||
mkEnableOption
|
||||
mkIf
|
||||
mkPackageOptionMD
|
||||
mkRemovedOptionModule
|
||||
types
|
||||
;
|
||||
|
||||
@ -25,6 +27,10 @@ let
|
||||
in
|
||||
|
||||
{
|
||||
imports = [
|
||||
(mkRemovedOptionModule [ "services" "wyoming" "openwakeword" "models" ] "Configuring models has been removed, they are now dynamically discovered and loaded at runtime")
|
||||
];
|
||||
|
||||
meta.buildDocsInSandbox = false;
|
||||
|
||||
options.services.wyoming.openwakeword = with types; {
|
||||
@ -41,18 +47,11 @@ in
|
||||
'';
|
||||
};
|
||||
|
||||
models = mkOption {
|
||||
type = listOf str;
|
||||
default = [
|
||||
# wyoming_openwakeword/models/*.tflite
|
||||
"alexa"
|
||||
"hey_jarvis"
|
||||
"hey_mycroft"
|
||||
"hey_rhasspy"
|
||||
"ok_nabu"
|
||||
];
|
||||
description = mdDoc ''
|
||||
List of wake word models that should be made available.
|
||||
customModelsDirectories = mkOption {
|
||||
type = listOf types.path;
|
||||
default = [];
|
||||
description = lib.mdDoc ''
|
||||
Paths to directories with custom wake word models (*.tflite model files).
|
||||
'';
|
||||
};
|
||||
|
||||
@ -61,6 +60,14 @@ in
|
||||
default = [
|
||||
"ok_nabu"
|
||||
];
|
||||
example = [
|
||||
# wyoming_openwakeword/models/*.tflite
|
||||
"alexa"
|
||||
"hey_jarvis"
|
||||
"hey_mycroft"
|
||||
"hey_rhasspy"
|
||||
"ok_nabu"
|
||||
];
|
||||
description = mdDoc ''
|
||||
List of wake word models to preload after startup.
|
||||
'';
|
||||
@ -112,14 +119,15 @@ in
|
||||
DynamicUser = true;
|
||||
User = "wyoming-openwakeword";
|
||||
# https://github.com/home-assistant/addons/blob/master/openwakeword/rootfs/etc/s6-overlay/s6-rc.d/openwakeword/run
|
||||
ExecStart = ''
|
||||
${cfg.package}/bin/wyoming-openwakeword \
|
||||
--uri ${cfg.uri} \
|
||||
${concatMapStringsSep " " (model: "--model ${model}") cfg.models} \
|
||||
${concatMapStringsSep " " (model: "--preload-model ${model}") cfg.preloadModels} \
|
||||
--threshold ${cfg.threshold} \
|
||||
--trigger-level ${cfg.triggerLevel} ${cfg.extraArgs}
|
||||
'';
|
||||
ExecStart = concatStringsSep " " [
|
||||
"${cfg.package}/bin/wyoming-openwakeword"
|
||||
"--uri ${cfg.uri}"
|
||||
(concatMapStringsSep " " (model: "--preload-model ${model}") cfg.preloadModels)
|
||||
(concatMapStringsSep " " (dir: "--custom-model-dir ${toString dir}") cfg.customModelsDirectories)
|
||||
"--threshold ${cfg.threshold}"
|
||||
"--trigger-level ${cfg.triggerLevel}"
|
||||
"${cfg.extraArgs}"
|
||||
];
|
||||
CapabilityBoundingSet = "";
|
||||
DeviceAllow = "";
|
||||
DevicePolicy = "closed";
|
||||
|
||||
@ -54,7 +54,7 @@ if [ ! -e /proc/1 ]; then
|
||||
fi
|
||||
|
||||
|
||||
if [ "${IN_NIXOS_SYSTEMD_STAGE1:-}" = true ]; then
|
||||
if [ "${IN_NIXOS_SYSTEMD_STAGE1:-}" = true ] || [ ! -c /dev/kmsg ] ; then
|
||||
echo "booting system configuration ${systemConfig}"
|
||||
else
|
||||
echo "booting system configuration $systemConfig" > /dev/kmsg
|
||||
|
||||
@ -92,11 +92,11 @@ in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "brave";
|
||||
version = "1.59.120";
|
||||
version = "1.59.124";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
|
||||
sha256 = "sha256-fkIU6XuydF6Bo8V0uS4NObh2fRuKxOWMqVft81uUs9Q=";
|
||||
sha256 = "sha256-uY9i0TxTsSvOfMA98amxwWpQh1nsRVEgxeSZ2sv8NEU=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
@ -1,20 +1,20 @@
|
||||
{
|
||||
stable = import ./browser.nix {
|
||||
channel = "stable";
|
||||
version = "118.0.2088.46";
|
||||
version = "118.0.2088.76";
|
||||
revision = "1";
|
||||
sha256 = "sha256-/3lo/y/LhAmGqiOhZgDoJVS+c2631NB/Z/lBNFunU30=";
|
||||
sha256 = "sha256-cd8W/0UZi+NhPSILR8e8aOLxy6ra+0DVwRowo2jG8DA=";
|
||||
};
|
||||
beta = import ./browser.nix {
|
||||
channel = "beta";
|
||||
version = "118.0.2088.46";
|
||||
version = "119.0.2151.32";
|
||||
revision = "1";
|
||||
sha256 = "sha256-u0w7COYoAgcpqVEsB0t27iMD2AGVYFCJyE72uWKIY70=";
|
||||
sha256 = "sha256-tsDFUKZDiusr/fGO5NMRqzTDIF+MTgC/1gJu95wXwAw=";
|
||||
};
|
||||
dev = import ./browser.nix {
|
||||
channel = "dev";
|
||||
version = "119.0.2151.2";
|
||||
version = "120.0.2172.1";
|
||||
revision = "1";
|
||||
sha256 = "sha256-42wbnA9i1FdBq14Y+xxstAe9ciWDzEBVMULCSURQzj0=";
|
||||
sha256 = "sha256-EvTS0AO3/A8Ut9H36mMOnS9PRR062WAoas9/Pd90NBM=";
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,13 +1,13 @@
|
||||
{ lib, stdenv, fetchFromGitHub, pkg-config, coin-utils, zlib, osi }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.17.8";
|
||||
version = "1.17.9";
|
||||
pname = "clp";
|
||||
src = fetchFromGitHub {
|
||||
owner = "coin-or";
|
||||
repo = "Clp";
|
||||
rev = "releases/${version}";
|
||||
hash = "sha256-3Z6ysoCcDVB8UePiwbZNqvO/o/jgPcv6XFkpJZBK+Os=";
|
||||
hash = "sha256-kHCDji+yIf5mCoxKB2b/HaATGmwwIAPEV74tthIMeMY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
@ -8,13 +8,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "smplayer";
|
||||
version = "23.6.0";
|
||||
version = "23.6.0.10170";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "smplayer-dev";
|
||||
repo = "smplayer";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-xGy6/9aUftBTSo9HJ3zyuRSagqimP9XvXKP/4oBQTo4=";
|
||||
hash = "sha256-ByheWIXvCw9jL3lY63oRzRZhl0jZz4jr+rw5Wi7Mm8w=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -5,15 +5,15 @@
|
||||
, pkg-config
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "jasper";
|
||||
version = "2.0.32";
|
||||
version = "4.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jasper-software";
|
||||
repo = pname;
|
||||
rev = "version-${version}";
|
||||
hash = "sha256-Uwgtex0MWC/pOmEr8itHMIa4wxd97c/tsTzcLgV8D0I=";
|
||||
repo = "jasper";
|
||||
rev = "version-${finalAttrs.version}";
|
||||
hash = "sha256-v/AFx40JWdbTCa008tDz/n9cXgpAkKv4rSiGJ8yx1YQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -21,7 +21,11 @@ stdenv.mkDerivation rec {
|
||||
pkg-config
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
cmakeBuildDir = "build-directory";
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
meta = {
|
||||
homepage = "https://jasper-software.github.io/jasper/";
|
||||
description = "Image processing/coding toolkit";
|
||||
longDescription = ''
|
||||
@ -41,8 +45,8 @@ stdenv.mkDerivation rec {
|
||||
was chosen primarily due to the availability of C development environments
|
||||
for most computing platforms when JasPer was first developed, circa 1999.
|
||||
'';
|
||||
license = licenses.free; # MIT-like
|
||||
maintainers = with maintainers; [ AndersonTorres ];
|
||||
platforms = platforms.unix;
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ AndersonTorres ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
})
|
||||
@ -2,19 +2,24 @@
|
||||
, python3
|
||||
, fetchPypi
|
||||
, copyDesktopItems
|
||||
, wrapQtAppsHook
|
||||
, qtsvg
|
||||
, libsForQt5
|
||||
, makeDesktopItem
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
let
|
||||
# get rid of rec
|
||||
pname = "pyspread";
|
||||
version = "2.0.2";
|
||||
|
||||
version = "2.2.2";
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-rg2T9Y9FU2a+aWg0XM8jyQB9t8zDVlpad3TjUcx4//8=";
|
||||
hash = "sha256-vbBu/dMXQf14F7qWvyHX5T8/AkjeZhaQt1eQ6Nidpsc=";
|
||||
};
|
||||
inherit (libsForQt5)
|
||||
qtsvg
|
||||
wrapQtAppsHook;
|
||||
in
|
||||
python3.pkgs.buildPythonApplication {
|
||||
inherit pname version src;
|
||||
|
||||
nativeBuildInputs = [
|
||||
copyDesktopItems
|
||||
@ -35,18 +40,20 @@ python3.pkgs.buildPythonApplication rec {
|
||||
setuptools
|
||||
];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
doCheck = false; # it fails miserably with a core dump
|
||||
|
||||
pythonImportsCheck = [ "pyspread" ];
|
||||
|
||||
desktopItems = [
|
||||
(makeDesktopItem rec {
|
||||
name = pname;
|
||||
exec = name;
|
||||
icon = name;
|
||||
(makeDesktopItem {
|
||||
name = "pyspread";
|
||||
exec = "pyspread";
|
||||
icon = "pyspread";
|
||||
desktopName = "Pyspread";
|
||||
genericName = "Spreadsheet";
|
||||
comment = meta.description;
|
||||
comment = "A Python-oriented spreadsheet application";
|
||||
categories = [ "Office" "Development" "Spreadsheet" ];
|
||||
})
|
||||
];
|
||||
@ -55,7 +62,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
makeWrapperArgs+=("''${qtWrapperArgs[@]}")
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
homepage = "https://pyspread.gitlab.io/";
|
||||
description = "A Python-oriented spreadsheet application";
|
||||
longDescription = ''
|
||||
@ -68,8 +75,8 @@ python3.pkgs.buildPythonApplication rec {
|
||||
that can be accessed from other cells. These objects can represent
|
||||
anything including lists or matrices.
|
||||
'';
|
||||
license = with licenses; gpl3Plus;
|
||||
maintainers = with maintainers; [ AndersonTorres ];
|
||||
platforms = with platforms; all;
|
||||
license = with lib.licenses; [ gpl3Plus ];
|
||||
mainProgram = "pyspread";
|
||||
maintainers = with lib.maintainers; [ AndersonTorres ];
|
||||
};
|
||||
}
|
||||
@ -0,0 +1,17 @@
|
||||
diff --git a/bin/backlight_helper/ddcci/ddcci.go b/bin/backlight_helper/ddcci/ddcci.go
|
||||
index 679beea3..ccbfc508 100644
|
||||
--- a/bin/backlight_helper/ddcci/ddcci.go
|
||||
+++ b/bin/backlight_helper/ddcci/ddcci.go
|
||||
@@ -103,11 +103,6 @@ func newDDCCI() (*ddcci, error) {
|
||||
displayHandleMap: make(map[string]*displayHandle),
|
||||
}
|
||||
|
||||
- status := C.ddca_set_max_tries(C.DDCA_MULTI_PART_TRIES, 5)
|
||||
- if status < C.int(0) {
|
||||
- return nil, fmt.Errorf("brightness: Error setting retries: %d", status)
|
||||
- }
|
||||
-
|
||||
err := ddc.RefreshDisplays()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
|
||||
@ -62,6 +62,7 @@ buildGoPackage rec {
|
||||
src = ./0005-fix-custom-wallpapers-path.diff;
|
||||
inherit coreutils;
|
||||
})
|
||||
./0006-fix-build-with-ddcutil-2.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -5,6 +5,9 @@
|
||||
, darwin # Accelerate
|
||||
, llvmPackages # openmp
|
||||
, withMkl ? false, mkl
|
||||
, withCUDA ? false
|
||||
, withCuDNN ? false
|
||||
, cudaPackages
|
||||
# Enabling both withOneDNN and withOpenblas is broken
|
||||
# https://github.com/OpenNMT/CTranslate2/issues/1294
|
||||
, withOneDNN ? false, oneDNN
|
||||
@ -33,6 +36,8 @@ stdenv.mkDerivation rec {
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
] ++ lib.optionals withCUDA [
|
||||
cudaPackages.cuda_nvcc
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
@ -40,6 +45,8 @@ stdenv.mkDerivation rec {
|
||||
# https://github.com/OpenNMT/CTranslate2/blob/54810350e662ebdb01ecbf8e4a746f02aeff1dd7/python/tools/prepare_build_environment_linux.sh#L53
|
||||
# https://github.com/OpenNMT/CTranslate2/blob/59d223abcc7e636c1c2956e62482bc3299cc7766/python/tools/prepare_build_environment_macos.sh#L12
|
||||
"-DOPENMP_RUNTIME=COMP"
|
||||
"-DWITH_CUDA=${cmakeBool withCUDA}"
|
||||
"-DWITH_CUDNN=${cmakeBool withCuDNN}"
|
||||
"-DWITH_DNNL=${cmakeBool withOneDNN}"
|
||||
"-DWITH_OPENBLAS=${cmakeBool withOpenblas}"
|
||||
"-DWITH_RUY=${cmakeBool withRuy}"
|
||||
@ -49,6 +56,12 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs = lib.optionals withMkl [
|
||||
mkl
|
||||
] ++ lib.optionals withCUDA [
|
||||
cudaPackages.cuda_cudart
|
||||
cudaPackages.libcublas
|
||||
cudaPackages.libcurand
|
||||
] ++ lib.optionals withCuDNN [
|
||||
cudaPackages.cudnn
|
||||
] ++ lib.optionals withOneDNN [
|
||||
oneDNN
|
||||
] ++ lib.optionals withOpenblas [
|
||||
|
||||
@ -153,6 +153,7 @@
|
||||
, "katex"
|
||||
, "keyoxide"
|
||||
, "lcov-result-merger"
|
||||
, "lean-language-server"
|
||||
, "lerna"
|
||||
, "less"
|
||||
, "less-plugin-clean-css"
|
||||
|
||||
11519
pkgs/development/node-packages/node-packages.nix
generated
11519
pkgs/development/node-packages/node-packages.nix
generated
File diff suppressed because it is too large
Load Diff
@ -37,7 +37,7 @@ buildPythonPackage rec {
|
||||
system = {
|
||||
"aarch64-linux" = {
|
||||
name = "aarch64";
|
||||
hash = "sha256-fR+ea25SqOMksBJXgSjuVvv2xSBoadZmPWP0IwxpiMA=";
|
||||
hash = "sha256-wmavXr7WL9q7u8lnOaEWbRs3rlagBd9ovhxzRbjnrwY=";
|
||||
};
|
||||
"x86_64-linux" = {
|
||||
name = "x86_64";
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "libusb1";
|
||||
version = "3.0.0";
|
||||
version = "3.1.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "5792a9defee40f15d330a40d9b1800545c32e47ba7fc66b6f28f133c9fcc8538";
|
||||
sha256 = "4ee9b0a55f8bd0b3ea7017ae919a6c1f439af742c4a4b04543c5fd7af89b828c";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -51,6 +51,7 @@ let
|
||||
py_binary(
|
||||
name = "bin",
|
||||
srcs = [ "bin.py" ],
|
||||
imports = [ "." ],
|
||||
deps = [ ":lib" ],
|
||||
)
|
||||
'';
|
||||
|
||||
@ -10,16 +10,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-semver-checks";
|
||||
version = "0.24.1";
|
||||
version = "0.24.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "obi1kenobi";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-RElxCmffF1PKSgg9ATI7zY/lqD+vUaW/rnKtk7VEa+c=";
|
||||
hash = "sha256-bfkRuFVlKfzyTomFhgnxbDj76Mfq/Q/Y3ZQUuMpkYQ0=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-ozd8bjsVCmUunFLXb/bdeMQZ1VjNPLnccO1fxp0N3m4=";
|
||||
cargoHash = "sha256-poPTFF+XCAHhHftxOOPaN+dixX2uqtZVfn20DB+cZ5o=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
# This file is autogenerated! Run ./update.sh to regenerate.
|
||||
{
|
||||
version = "20230919";
|
||||
revision = "20230919";
|
||||
sourceHash = "sha256-xcGEaWCcCAhN4gnnaj03u7LekP4+cRtcioTYhvAOQtg=";
|
||||
outputHash = "sha256-6W9QTShp/UzlcILwyyn56wppQORUGPff2TodEt4qhwQ=";
|
||||
version = "20231030";
|
||||
revision = "20231030";
|
||||
sourceHash = "sha256-ocqikHJfvs4gWqnBeLgSnXHzUTPi8l8cSfNarhD8G3w=";
|
||||
outputHash = "sha256-vaMYuAqkkuyY+bAxAe0uAokWZ7HlaR62UTu4L8yOofs=";
|
||||
}
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "hd-idle";
|
||||
version = "1.20";
|
||||
version = "1.21";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "adelolmo";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-7EXfI3E83ltpjq2M/qZX2P/bNtQQBWZRBCD7i5uit0I=";
|
||||
sha256 = "sha256-WHJcysTN9LHI1WnDuFGTyTirxXirpLpJIeNDj4sZGY0=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@ -54,14 +54,14 @@ in {
|
||||
'';
|
||||
|
||||
nextcloud26 = generic {
|
||||
version = "26.0.7";
|
||||
hash = "sha256-vtJEqLlNE7YWqSdAUhZwwdZ9Q8SAR3I/sTGAv/bUjpI=";
|
||||
version = "26.0.8";
|
||||
hash = "sha256-ydCay0RuM2AZYIKRM/jzdutvJ5pN73CCF/xxWBiSiH8=";
|
||||
packages = nextcloud26Packages;
|
||||
};
|
||||
|
||||
nextcloud27 = generic {
|
||||
version = "27.1.2";
|
||||
hash = "sha256-B0KyR6ruC3BE2wBi8KkUqnczjHp9j+faCRcUfXZolyE=";
|
||||
version = "27.1.3";
|
||||
hash = "sha256-HWFJNSReSjdbSsmRwC8yNZK3U5cvhviHY/2A7X0nV5M=";
|
||||
packages = nextcloud27Packages;
|
||||
};
|
||||
|
||||
|
||||
@ -110,18 +110,18 @@
|
||||
]
|
||||
},
|
||||
"mail": {
|
||||
"sha256": "0p9iv172ivypyr6ccsmkfnb7b77nyghqbva24g8ymphw95pirwag",
|
||||
"url": "https://github.com/nextcloud-releases/mail/releases/download/v3.4.1/mail-v3.4.1.tar.gz",
|
||||
"version": "3.4.1",
|
||||
"description": "**💌 A mail app for Nextcloud**\n\n- **🚀 Integration with other Nextcloud apps!** Currently Contacts, Calendar & Files – more to come.\n- **📥 Multiple mail accounts!** Personal and company account? No problem, and a nice unified inbox. Connect any IMAP account.\n- **🔒 Send & receive encrypted mails!** Using the great [Mailvelope](https://mailvelope.com) browser extension.\n- **🙈 We’re not reinventing the wheel!** Based on the great [Horde](https://horde.org) libraries.\n- **📬 Want to host your own mail server?** We do not have to reimplement this as you could set up [Mail-in-a-Box](https://mailinabox.email)!\n\n## Ethical AI Rating\n\n### Priority Inbox\n\nPositive:\n* The software for training and inferencing of this model is open source.\n* The model is created and trained on-premises based on the user's own data.\n* The training data is accessible to the user, making it possible to check or correct for bias or optimise the performance and CO2 usage.\n\n### Thread Summaries (opt-in)\n\n**Rating:** 🟢/🟡/🟠/🔴\n\nThe rating depends on the installed text processing backend. See [the rating overview](https://docs.nextcloud.com/server/latest/admin_manual/ai/index.html) for details.\n\nLearn more about the Nextcloud Ethical AI Rating [in our blog](https://nextcloud.com/blog/nextcloud-ethical-ai-rating/).",
|
||||
"sha256": "0mr3npd48j444lalkph1z8rsz5jllpgdrcqsjdrqgmf70y0g55mh",
|
||||
"url": "https://github.com/nextcloud-releases/mail/releases/download/v3.4.3/mail-v3.4.3.tar.gz",
|
||||
"version": "3.4.3",
|
||||
"description": "**💌 A mail app for Nextcloud**\n\n- **🚀 Integration with other Nextcloud apps!** Currently Contacts, Calendar & Files – more to come.\n- **📥 Multiple mail accounts!** Personal and company account? No problem, and a nice unified inbox. Connect any IMAP account.\n- **🔒 Send & receive encrypted mails!** Using the great [Mailvelope](https://mailvelope.com) browser extension.\n- **🙈 We’re not reinventing the wheel!** Based on the great [Horde](https://horde.org) libraries.\n- **📬 Want to host your own mail server?** We do not have to reimplement this as you could set up [Mail-in-a-Box](https://mailinabox.email)!",
|
||||
"homepage": "https://github.com/nextcloud/mail#readme",
|
||||
"licenses": [
|
||||
"agpl"
|
||||
]
|
||||
},
|
||||
"maps": {
|
||||
"sha256": "19zx3fhv8dil7vm84lhnhlxzd2zyab7h8j20hiwsd4rrj0gzhjdf",
|
||||
"url": "https://github.com/nextcloud/maps/releases/download/v1.2.0-1-nightly/maps-1.2.0-1-nightly.tar.gz",
|
||||
"sha256": "049hrp79fj1bp9nk9isjrk427k238974x7gsj68jplxfrgq3sdkz",
|
||||
"url": "https://github.com/nextcloud/maps/releases/download/v1.2.0-2-nightly/maps-1.2.0-2-nightly.tar.gz",
|
||||
"version": "1.2.0",
|
||||
"description": "**The whole world fits inside your cloud!**\n\n- **🗺 Beautiful map:** Using [OpenStreetMap](https://www.openstreetmap.org) and [Leaflet](https://leafletjs.com), you can choose between standard map, satellite, topographical, dark mode or even watercolor! 🎨\n- **⭐ Favorites:** Save your favorite places, privately! Sync with [GNOME Maps](https://github.com/nextcloud/maps/issues/30) and mobile apps is planned.\n- **🧭 Routing:** Possible using either [OSRM](http://project-osrm.org), [GraphHopper](https://www.graphhopper.com) or [Mapbox](https://www.mapbox.com).\n- **🖼 Photos on the map:** No more boring slideshows, just show directly where you were!\n- **🙋 Contacts on the map:** See where your friends live and plan your next visit.\n- **📱 Devices:** Lost your phone? Check the map!\n- **〰 Tracks:** Load GPS tracks or past trips. Recording with [PhoneTrack](https://f-droid.org/en/packages/net.eneiluj.nextcloud.phonetrack/) or [OwnTracks](https://owntracks.org) is planned.",
|
||||
"homepage": "https://github.com/nextcloud/maps",
|
||||
@ -130,9 +130,9 @@
|
||||
]
|
||||
},
|
||||
"memories": {
|
||||
"sha256": "10qd41lkvmgv5bw15gfzivjwf9asn22gv43f1k9l9158rrpzsgph",
|
||||
"url": "https://github.com/pulsejet/memories/releases/download/v5.5.1/memories.tar.gz",
|
||||
"version": "5.5.1",
|
||||
"sha256": "0i146mlg27phs407clclksn1wjkyl0c5fb2zw0npbx5dvqnpglcd",
|
||||
"url": "https://github.com/pulsejet/memories/releases/download/v6.0.1/memories.tar.gz",
|
||||
"version": "6.0.1",
|
||||
"description": "# Memories: Photo Management for Nextcloud\n\nMemories is a *batteries-included* photo management solution for Nextcloud with advanced features including:\n\n- **📸 Timeline**: Sort photos and videos by date taken, parsed from Exif data.\n- **⏪ Rewind**: Jump to any time in the past instantly and relive your memories.\n- **🤖 AI Tagging**: Group photos by people and objects, powered by [recognize](https://github.com/nextcloud/recognize) and [facerecognition](https://github.com/matiasdelellis/facerecognition).\n- **🖼️ Albums**: Create albums to group photos and videos together. Then share these albums with others.\n- **🫱🏻🫲🏻 External Sharing**: Share photos and videos with people outside of your Nextcloud instance.\n- **📱 Mobile Support**: Work from any device, of any shape and size through the web app.\n- **✏️ Edit Metadata**: Edit dates and other metadata on photos quickly and in bulk.\n- **📦 Archive**: Store photos you don't want to see in your timeline in a separate folder.\n- **📹 Video Transcoding**: Transcode videos and use HLS for maximal performance.\n- **🗺️ Map**: View your photos on a map, tagged with accurate reverse geocoding.\n- **📦 Migration**: Migrate easily from Nextcloud Photos and Google Takeout.\n- **⚡️ Performance**: Do all this very fast.\n\n## 🚀 Installation\n\n1. Install the app from the Nextcloud app store (try a demo [here](https://demo.memories.gallery/apps/memories/)).\n1. Perform the recommended [configuration steps](https://memories.gallery/config/).\n1. Run `php occ memories:index` to generate metadata indices for existing photos.\n1. Open the 📷 Memories app in Nextcloud and set the directory containing your photos.",
|
||||
"homepage": "https://memories.gallery",
|
||||
"licenses": [
|
||||
@ -170,9 +170,9 @@
|
||||
]
|
||||
},
|
||||
"onlyoffice": {
|
||||
"sha256": "12hzmngps86ha4lcfwaf62svfz41aywykq0z419r644g5i4v7raq",
|
||||
"url": "https://github.com/ONLYOFFICE/onlyoffice-nextcloud/releases/download/v7.9.0/onlyoffice.tar.gz",
|
||||
"version": "7.9.0",
|
||||
"sha256": "0hf015rvramksh7v06n7pn5kmyhgqzg17vmrgfqjbndg1r6rghpc",
|
||||
"url": "https://github.com/ONLYOFFICE/onlyoffice-nextcloud/releases/download/v7.9.4/onlyoffice.tar.gz",
|
||||
"version": "7.9.4",
|
||||
"description": "ONLYOFFICE connector allows you to view, edit and collaborate on text documents, spreadsheets and presentations within Nextcloud using ONLYOFFICE Docs. This will create a new Edit in ONLYOFFICE action within the document library for Office documents. This allows multiple users to co-author documents in real time from the familiar web interface and save the changes back to your file storage.",
|
||||
"homepage": "https://www.onlyoffice.com",
|
||||
"licenses": [
|
||||
@ -220,9 +220,9 @@
|
||||
]
|
||||
},
|
||||
"spreed": {
|
||||
"sha256": "1fnlilb9l4vfqdkyk0f3djzdkv0pw3yy30f7psfj6hh6y82pvfky",
|
||||
"url": "https://github.com/nextcloud-releases/spreed/releases/download/v16.0.6/spreed-v16.0.6.tar.gz",
|
||||
"version": "16.0.6",
|
||||
"sha256": "06cixw0bbmz20fybdqq192bk11xraaaplqybbxa0xjs3x6pcw1na",
|
||||
"url": "https://github.com/nextcloud-releases/spreed/releases/download/v16.0.7/spreed-v16.0.7.tar.gz",
|
||||
"version": "16.0.7",
|
||||
"description": "Chat, video & audio-conferencing using WebRTC\n\n* 💬 **Chat integration!** Nextcloud Talk comes with a simple text chat. Allowing you to share files from your Nextcloud and mentioning other participants.\n* 👥 **Private, group, public and password protected calls!** Just invite somebody, a whole group or send a public link to invite to a call.\n* 💻 **Screen sharing!** Share your screen with participants of your call. You just need to use Firefox version 66 (or newer), latest Edge or Chrome 72 (or newer, also possible using Chrome 49 with this [Chrome extension](https://chrome.google.com/webstore/detail/screensharing-for-nextclo/kepnpjhambipllfmgmbapncekcmabkol)).\n* 🚀 **Integration with other Nextcloud apps** like Files, Contacts and Deck. More to come.\n\nAnd in the works for the [coming versions](https://github.com/nextcloud/spreed/milestones/):\n* ✋ [Federated calls](https://github.com/nextcloud/spreed/issues/21), to call people on other Nextclouds",
|
||||
"homepage": "https://github.com/nextcloud/spreed",
|
||||
"licenses": [
|
||||
|
||||
@ -110,18 +110,18 @@
|
||||
]
|
||||
},
|
||||
"mail": {
|
||||
"sha256": "0p9iv172ivypyr6ccsmkfnb7b77nyghqbva24g8ymphw95pirwag",
|
||||
"url": "https://github.com/nextcloud-releases/mail/releases/download/v3.4.1/mail-v3.4.1.tar.gz",
|
||||
"version": "3.4.1",
|
||||
"description": "**💌 A mail app for Nextcloud**\n\n- **🚀 Integration with other Nextcloud apps!** Currently Contacts, Calendar & Files – more to come.\n- **📥 Multiple mail accounts!** Personal and company account? No problem, and a nice unified inbox. Connect any IMAP account.\n- **🔒 Send & receive encrypted mails!** Using the great [Mailvelope](https://mailvelope.com) browser extension.\n- **🙈 We’re not reinventing the wheel!** Based on the great [Horde](https://horde.org) libraries.\n- **📬 Want to host your own mail server?** We do not have to reimplement this as you could set up [Mail-in-a-Box](https://mailinabox.email)!\n\n## Ethical AI Rating\n\n### Priority Inbox\n\nPositive:\n* The software for training and inferencing of this model is open source.\n* The model is created and trained on-premises based on the user's own data.\n* The training data is accessible to the user, making it possible to check or correct for bias or optimise the performance and CO2 usage.\n\n### Thread Summaries (opt-in)\n\n**Rating:** 🟢/🟡/🟠/🔴\n\nThe rating depends on the installed text processing backend. See [the rating overview](https://docs.nextcloud.com/server/latest/admin_manual/ai/index.html) for details.\n\nLearn more about the Nextcloud Ethical AI Rating [in our blog](https://nextcloud.com/blog/nextcloud-ethical-ai-rating/).",
|
||||
"sha256": "0mr3npd48j444lalkph1z8rsz5jllpgdrcqsjdrqgmf70y0g55mh",
|
||||
"url": "https://github.com/nextcloud-releases/mail/releases/download/v3.4.3/mail-v3.4.3.tar.gz",
|
||||
"version": "3.4.3",
|
||||
"description": "**💌 A mail app for Nextcloud**\n\n- **🚀 Integration with other Nextcloud apps!** Currently Contacts, Calendar & Files – more to come.\n- **📥 Multiple mail accounts!** Personal and company account? No problem, and a nice unified inbox. Connect any IMAP account.\n- **🔒 Send & receive encrypted mails!** Using the great [Mailvelope](https://mailvelope.com) browser extension.\n- **🙈 We’re not reinventing the wheel!** Based on the great [Horde](https://horde.org) libraries.\n- **📬 Want to host your own mail server?** We do not have to reimplement this as you could set up [Mail-in-a-Box](https://mailinabox.email)!",
|
||||
"homepage": "https://github.com/nextcloud/mail#readme",
|
||||
"licenses": [
|
||||
"agpl"
|
||||
]
|
||||
},
|
||||
"maps": {
|
||||
"sha256": "19zx3fhv8dil7vm84lhnhlxzd2zyab7h8j20hiwsd4rrj0gzhjdf",
|
||||
"url": "https://github.com/nextcloud/maps/releases/download/v1.2.0-1-nightly/maps-1.2.0-1-nightly.tar.gz",
|
||||
"sha256": "049hrp79fj1bp9nk9isjrk427k238974x7gsj68jplxfrgq3sdkz",
|
||||
"url": "https://github.com/nextcloud/maps/releases/download/v1.2.0-2-nightly/maps-1.2.0-2-nightly.tar.gz",
|
||||
"version": "1.2.0",
|
||||
"description": "**The whole world fits inside your cloud!**\n\n- **🗺 Beautiful map:** Using [OpenStreetMap](https://www.openstreetmap.org) and [Leaflet](https://leafletjs.com), you can choose between standard map, satellite, topographical, dark mode or even watercolor! 🎨\n- **⭐ Favorites:** Save your favorite places, privately! Sync with [GNOME Maps](https://github.com/nextcloud/maps/issues/30) and mobile apps is planned.\n- **🧭 Routing:** Possible using either [OSRM](http://project-osrm.org), [GraphHopper](https://www.graphhopper.com) or [Mapbox](https://www.mapbox.com).\n- **🖼 Photos on the map:** No more boring slideshows, just show directly where you were!\n- **🙋 Contacts on the map:** See where your friends live and plan your next visit.\n- **📱 Devices:** Lost your phone? Check the map!\n- **〰 Tracks:** Load GPS tracks or past trips. Recording with [PhoneTrack](https://f-droid.org/en/packages/net.eneiluj.nextcloud.phonetrack/) or [OwnTracks](https://owntracks.org) is planned.",
|
||||
"homepage": "https://github.com/nextcloud/maps",
|
||||
@ -130,9 +130,9 @@
|
||||
]
|
||||
},
|
||||
"memories": {
|
||||
"sha256": "10qd41lkvmgv5bw15gfzivjwf9asn22gv43f1k9l9158rrpzsgph",
|
||||
"url": "https://github.com/pulsejet/memories/releases/download/v5.5.1/memories.tar.gz",
|
||||
"version": "5.5.1",
|
||||
"sha256": "0i146mlg27phs407clclksn1wjkyl0c5fb2zw0npbx5dvqnpglcd",
|
||||
"url": "https://github.com/pulsejet/memories/releases/download/v6.0.1/memories.tar.gz",
|
||||
"version": "6.0.1",
|
||||
"description": "# Memories: Photo Management for Nextcloud\n\nMemories is a *batteries-included* photo management solution for Nextcloud with advanced features including:\n\n- **📸 Timeline**: Sort photos and videos by date taken, parsed from Exif data.\n- **⏪ Rewind**: Jump to any time in the past instantly and relive your memories.\n- **🤖 AI Tagging**: Group photos by people and objects, powered by [recognize](https://github.com/nextcloud/recognize) and [facerecognition](https://github.com/matiasdelellis/facerecognition).\n- **🖼️ Albums**: Create albums to group photos and videos together. Then share these albums with others.\n- **🫱🏻🫲🏻 External Sharing**: Share photos and videos with people outside of your Nextcloud instance.\n- **📱 Mobile Support**: Work from any device, of any shape and size through the web app.\n- **✏️ Edit Metadata**: Edit dates and other metadata on photos quickly and in bulk.\n- **📦 Archive**: Store photos you don't want to see in your timeline in a separate folder.\n- **📹 Video Transcoding**: Transcode videos and use HLS for maximal performance.\n- **🗺️ Map**: View your photos on a map, tagged with accurate reverse geocoding.\n- **📦 Migration**: Migrate easily from Nextcloud Photos and Google Takeout.\n- **⚡️ Performance**: Do all this very fast.\n\n## 🚀 Installation\n\n1. Install the app from the Nextcloud app store (try a demo [here](https://demo.memories.gallery/apps/memories/)).\n1. Perform the recommended [configuration steps](https://memories.gallery/config/).\n1. Run `php occ memories:index` to generate metadata indices for existing photos.\n1. Open the 📷 Memories app in Nextcloud and set the directory containing your photos.",
|
||||
"homepage": "https://memories.gallery",
|
||||
"licenses": [
|
||||
@ -170,9 +170,9 @@
|
||||
]
|
||||
},
|
||||
"onlyoffice": {
|
||||
"sha256": "1872y2fpz3hrmafhcc6n84d63j5wgzx2plpirr91z3a8650frf3m",
|
||||
"url": "https://github.com/ONLYOFFICE/onlyoffice-nextcloud/releases/download/v8.2.0/onlyoffice.tar.gz",
|
||||
"version": "8.2.0",
|
||||
"sha256": "0wnlm12wy7vsjmgh49ag7mm51mr2h8m05vdiwzkrfm7zazgdwadh",
|
||||
"url": "https://github.com/ONLYOFFICE/onlyoffice-nextcloud/releases/download/v8.2.4/onlyoffice.tar.gz",
|
||||
"version": "8.2.4",
|
||||
"description": "ONLYOFFICE connector allows you to view, edit and collaborate on text documents, spreadsheets and presentations within Nextcloud using ONLYOFFICE Docs. This will create a new Edit in ONLYOFFICE action within the document library for Office documents. This allows multiple users to co-author documents in real time from the familiar web interface and save the changes back to your file storage.",
|
||||
"homepage": "https://www.onlyoffice.com",
|
||||
"licenses": [
|
||||
@ -220,9 +220,9 @@
|
||||
]
|
||||
},
|
||||
"spreed": {
|
||||
"sha256": "07q6kxbvrg652px8a4wi1msxm2z7r7z7s8v4nnccvdcscv90d99d",
|
||||
"url": "https://github.com/nextcloud-releases/spreed/releases/download/v17.1.1/spreed-v17.1.1.tar.gz",
|
||||
"version": "17.1.1",
|
||||
"sha256": "1hbgnz0zbhka82csh4rkr1p7zrgbc8wiznqmzh4w1q3d9pz47xis",
|
||||
"url": "https://github.com/nextcloud-releases/spreed/releases/download/v17.1.2/spreed-v17.1.2.tar.gz",
|
||||
"version": "17.1.2",
|
||||
"description": "Chat, video & audio-conferencing using WebRTC\n\n* 💬 **Chat integration!** Nextcloud Talk comes with a simple text chat. Allowing you to share files from your Nextcloud and mentioning other participants.\n* 👥 **Private, group, public and password protected calls!** Just invite somebody, a whole group or send a public link to invite to a call.\n* 💻 **Screen sharing!** Share your screen with participants of your call. You just need to use Firefox version 66 (or newer), latest Edge or Chrome 72 (or newer, also possible using Chrome 49 with this [Chrome extension](https://chrome.google.com/webstore/detail/screensharing-for-nextclo/kepnpjhambipllfmgmbapncekcmabkol)).\n* 🚀 **Integration with other Nextcloud apps** like Files, Contacts and Deck. More to come.\n\nAnd in the works for the [coming versions](https://github.com/nextcloud/spreed/milestones/):\n* ✋ [Federated calls](https://github.com/nextcloud/spreed/issues/21), to call people on other Nextclouds",
|
||||
"homepage": "https://github.com/nextcloud/spreed",
|
||||
"licenses": [
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "jitsi-meet";
|
||||
version = "1.0.7322";
|
||||
version = "1.0.7531";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.jitsi.org/jitsi-meet/src/jitsi-meet-${version}.tar.bz2";
|
||||
sha256 = "BjoNu1cQOw9JjX6i2R/K8Txx6m6ndVRnWPjze9y14pQ=";
|
||||
sha256 = "lSntX5MRnp0GuimiqYGiBwi5wI62omvAN1ioyIz+Upc=";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
@ -11,12 +11,12 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "salt";
|
||||
version = "3006.3";
|
||||
version = "3006.4";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-flP7zETEn41uZ8sZytoGOADKKe1/Fa+XJSdTGqhW5Cs=";
|
||||
hash = "sha256-0JeIXDPCz6oMzcYnylcNZ2kMjQN9x4Ab6IeIvMoQNq4=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -1,61 +1,51 @@
|
||||
{ lib
|
||||
, python3
|
||||
, python3Packages
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication {
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "wyoming-openwakeword";
|
||||
version = "1.5.1";
|
||||
version = "1.8.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rhasspy";
|
||||
repo = "rhasspy3";
|
||||
rev = "e16d7d374a64f671db48142c7b635b327660ebcf";
|
||||
hash = "sha256-SbWsRmR1hfuU3yJbuu+r7M43ugHeNwLgu5S8MqkbCQA=";
|
||||
repo = "wyoming-openwakeword";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-N/EjdNQLsYLpJ4kOxY/z+/dMMmF1PPAIEEzSHfnZWaM=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
# import tflite entrypoint from tensorflow
|
||||
url = "https://github.com/rhasspy/rhasspy3/commit/23b1bc9cf1e9aa78453feb11e27d5dafe26de068.patch";
|
||||
hash = "sha256-fjLJ+VI4c8ABBWx1IjZ6nS8MGqdry4rgcThKiaAvz+Q=";
|
||||
url = "https://github.com/rhasspy/wyoming-openwakeword/commit/8f4ba2750d8c545e77549a7230cdee1301dac09a.patch";
|
||||
hash = "sha256-WPvywpGv0sYYVGc7he4bt7APIsa3ziKaWqpFlx3v+V8=";
|
||||
})
|
||||
(fetchpatch {
|
||||
# add commandline entrypoint
|
||||
url = "https://github.com/rhasspy/rhasspy3/commit/7662b82cd85e16817a3c6f4153e855bf57436ac3.patch";
|
||||
hash = "sha256-41CLkVDSAJJpZ5irwIf/Z4wHoCuKDrqFBAjKCx7ta50=";
|
||||
url = "https://github.com/rhasspy/wyoming-openwakeword/commit/f40e5635543b2315217538dd89a9fe40fe817cfe.patch";
|
||||
hash = "sha256-HNlGqt7bMzwyvhx5Hw7mkTHeQmBpgDCU3pUbZzss1bY=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
cd programs/wake/openwakeword-lite/server
|
||||
'';
|
||||
|
||||
nativeBuildInputs = with python3Packages; [
|
||||
setuptools
|
||||
wheel
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
tensorflow-bin
|
||||
webrtc-noise-gain
|
||||
tensorflow
|
||||
wyoming
|
||||
];
|
||||
|
||||
passthru.optional-dependencies.webrtc = with python3Packages; [
|
||||
webrtc-noise-gain
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"wyoming_openwakeword"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
changelog = "https://github.com/rhasspy/wyoming-openwakeword/blob/v${version}/CHANGELOG.md";
|
||||
description = "An open source voice assistant toolkit for many human languages";
|
||||
homepage = "https://github.com/rhasspy/rhasspy3/commit/fe44635132079db74d0c76c6b3553b842aa1e318";
|
||||
homepage = "https://github.com/rhasspy/wyoming-openwakeword";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ hexa ];
|
||||
mainProgram = "wyoming-openwakeword";
|
||||
|
||||
@ -17,13 +17,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gfxreconstruct";
|
||||
version = "1.0.0";
|
||||
version = "1.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "LunarG";
|
||||
repo = "gfxreconstruct";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-dOmkNKURYgphbDHOmzcWf9PsIKMkPyN7ve579BE7fR0=";
|
||||
hash = "sha256-+h7r6uLRw08c1CHRHxGCdkPYqI10i2Q/Oep617rLhx0=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@ -4,6 +4,7 @@
|
||||
, installShellFiles
|
||||
, rustPlatform
|
||||
, libiconv
|
||||
, AppKit
|
||||
, Security
|
||||
, SystemConfiguration
|
||||
, nixosTests
|
||||
@ -11,24 +12,24 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "atuin";
|
||||
version = "16.0.0";
|
||||
version = "17.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "atuinsh";
|
||||
repo = "atuin";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Kh6aaWYV+ZG7Asvw5JdGsV+nxD+xvvQab5wLIedcQcQ=";
|
||||
hash = "sha256-HJRlZwvBra2D7TzVKvMWJ0Hf17QgIEcBDQEHhxdVLIM=";
|
||||
};
|
||||
|
||||
# TODO: unify this to one hash because updater do not support this
|
||||
cargoHash =
|
||||
if stdenv.isLinux
|
||||
then "sha256-Ami88ScGj58jCCat4MMDvjZtV5WglmrlggpQfo+LPjs="
|
||||
else "sha256-HQMZ9w1C6go16XGrPNniQZliIQ/5yAp2w/uUwAOQTM0=";
|
||||
then "sha256-AhoXmEjXsi/OgFX3htOA6A/lWegUFlsywdotX3PDwcs="
|
||||
else "sha256-/nCnZ64pM8oWVX9a4JCeCZRyuo7aVc8YaBVEMbiRsqE=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security SystemConfiguration ];
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ libiconv AppKit Security SystemConfiguration ];
|
||||
|
||||
postInstall = ''
|
||||
installShellCompletion --cmd atuin \
|
||||
@ -44,6 +45,8 @@ rustPlatform.buildRustPackage rec {
|
||||
checkFlags = [
|
||||
# tries to make a network access
|
||||
"--skip=registration"
|
||||
# No such file or directory (os error 2)
|
||||
"--skip=sync"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "nomino";
|
||||
version = "1.3.2";
|
||||
version = "1.3.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "yaa110";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-pzAL7e72sO94qLEwsH/5RuiuzvnsSelIq47jdU8INDw=";
|
||||
hash = "sha256-XT8+mwfDFsBVEcpttus1KeIS+4sKqJMJTwqYI3LfW5k=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-gDOZ3nD7pTIRNXG3S+qTkl+HInBcAErvwPqa0NZWxY4=";
|
||||
cargoHash = "sha256-KpjGwqjVORyxXJbMi2Ok7s6gRmM/aJRTsPtu/0PgGr8=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Batch rename utility for developers";
|
||||
|
||||
@ -1,4 +1,8 @@
|
||||
{ lib, stdenv, fetchFromGitea, autoreconfHook, pkg-config, file , protobufc }:
|
||||
{ lib, stdenv, fetchFromGitea, autoreconfHook, check, pkg-config, file, protobufc
|
||||
,withWolfSSL ? false, wolfssl
|
||||
,withGnuTLS ? false, gnutls
|
||||
,withJSON ? true, json_c
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "riemann-c-client";
|
||||
@ -9,20 +13,30 @@ stdenv.mkDerivation rec {
|
||||
owner = "algernon";
|
||||
repo = "riemann-c-client";
|
||||
rev = "riemann-c-client-${version}";
|
||||
sha256 = "sha256-FIhTT57g2uZBaH3EPNxNUNJn9n+0ZOhI6WMyF+xIr/Q=";
|
||||
hash = "sha256-FIhTT57g2uZBaH3EPNxNUNJn9n+0ZOhI6WMyF+xIr/Q=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config ];
|
||||
buildInputs = [ file protobufc ];
|
||||
outputs = [ "bin" "dev" "out" ];
|
||||
|
||||
preBuild = ''
|
||||
make lib/riemann/proto/riemann.pb-c.h
|
||||
'';
|
||||
nativeBuildInputs = [ autoreconfHook check pkg-config ];
|
||||
buildInputs = [ file protobufc ]
|
||||
++ lib.optional withWolfSSL wolfssl
|
||||
++ lib.optional withGnuTLS gnutls
|
||||
++ lib.optional withJSON json_c
|
||||
;
|
||||
|
||||
configureFlags = []
|
||||
++ lib.optional withWolfSSL "--with-tls=wolfssl"
|
||||
++ lib.optional withGnuTLS "--with-tls=gnutls"
|
||||
;
|
||||
|
||||
doCheck = true;
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://git.madhouse-project.org/algernon/riemann-c-client";
|
||||
description = "A C client library for the Riemann monitoring system";
|
||||
license = licenses.gpl3;
|
||||
license = licenses.lgpl3Plus;
|
||||
maintainers = with maintainers; [ pradeepchhetri ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
|
||||
@ -5,8 +5,11 @@
|
||||
# build time
|
||||
, autoreconfHook
|
||||
, pkg-config
|
||||
, python3Packages
|
||||
|
||||
# runtime
|
||||
, withMysql ? stdenv.buildPlatform.system == stdenv.hostPlatform.system
|
||||
, withPostgres ? stdenv.buildPlatform.system == stdenv.hostPlatform.system
|
||||
, boost
|
||||
, libmysqlclient
|
||||
, log4cplus
|
||||
@ -48,9 +51,10 @@ stdenv.mkDerivation rec {
|
||||
"--enable-shell"
|
||||
"--localstatedir=/var"
|
||||
"--with-openssl=${lib.getDev openssl}"
|
||||
"--with-mysql=${lib.getDev libmysqlclient}/bin/mysql_config"
|
||||
"--with-pgsql=${postgresql}/bin/pg_config"
|
||||
];
|
||||
]
|
||||
++ lib.optional withPostgres "--with-pgsql=${postgresql}/bin/pg_config"
|
||||
++ lib.optional withMysql "--with-mysql=${lib.getDev libmysqlclient}/bin/mysql_config";
|
||||
|
||||
postConfigure = ''
|
||||
# Mangle embedded paths to dev-only inputs.
|
||||
sed -e "s|$NIX_STORE/[a-z0-9]\{32\}-|$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-|g" -i config.report
|
||||
@ -59,7 +63,7 @@ stdenv.mkDerivation rec {
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
pkg-config
|
||||
] ++ (with python3.pkgs; [
|
||||
] ++ (with python3Packages; [
|
||||
sphinxHook
|
||||
sphinx-rtd-theme
|
||||
]);
|
||||
|
||||
@ -285,7 +285,7 @@ with pkgs;
|
||||
_0x = callPackage ../tools/misc/0x { };
|
||||
|
||||
atuin = callPackage ../tools/misc/atuin {
|
||||
inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration;
|
||||
inherit (darwin.apple_sdk.frameworks) AppKit Security SystemConfiguration;
|
||||
};
|
||||
|
||||
automatic-timezoned = callPackage ../tools/system/automatic-timezoned { };
|
||||
@ -12393,8 +12393,6 @@ with pkgs;
|
||||
|
||||
pypass = with python3Packages; toPythonApplication pypass;
|
||||
|
||||
pyspread = libsForQt5.callPackage ../applications/office/pyspread { };
|
||||
|
||||
teapot = callPackage ../applications/office/teapot { };
|
||||
|
||||
ticktick = callPackage ../applications/office/ticktick { };
|
||||
@ -20956,7 +20954,11 @@ with pkgs;
|
||||
|
||||
cpp-jwt = callPackage ../development/libraries/cpp-jwt { };
|
||||
|
||||
ctranslate2 = callPackage ../development/libraries/ctranslate2 { };
|
||||
ctranslate2 = callPackage ../development/libraries/ctranslate2 {
|
||||
stdenv = if pkgs.config.cudaSupport then gcc11Stdenv else stdenv;
|
||||
withCUDA = pkgs.config.cudaSupport;
|
||||
withCuDNN = pkgs.config.cudaSupport;
|
||||
};
|
||||
|
||||
ubus = callPackage ../development/libraries/ubus { };
|
||||
|
||||
@ -22272,8 +22274,6 @@ with pkgs;
|
||||
|
||||
jarowinkler-cpp = callPackage ../development/libraries/jarowinkler-cpp { };
|
||||
|
||||
jasper = callPackage ../development/libraries/jasper { };
|
||||
|
||||
jbig2dec = callPackage ../development/libraries/jbig2dec { };
|
||||
|
||||
jbig2enc = callPackage ../development/libraries/jbig2enc { };
|
||||
|
||||
Loading…
Reference in New Issue
Block a user