gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot]
2023-04-02 18:01:03 +00:00
committed by GitHub
parent 91bccecb90 f5c732d453
commit 3d3697fa48
34 changed files with 1006 additions and 728 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nixos/modules/module-list.nix
+1
View File
@@ -1138,6 +1138,7 @@
./services/web-apps/calibre-web.nix
./services/web-apps/coder.nix
./services/web-apps/changedetection-io.nix
./services/web-apps/chatgpt-retrieval-plugin.nix
./services/web-apps/cloudlog.nix
./services/web-apps/code-server.nix
./services/web-apps/convos.nix
nixos/modules/services/web-apps/chatgpt-retrieval-plugin.nix
+106
View File
@@ -0,0 +1,106 @@
{ config, pkgs, lib, ... }:
with lib;
let
cfg = config.services.chatgpt-retrieval-plugin;
in
{
options.services.chatgpt-retrieval-plugin = {
enable = mkEnableOption (lib.mdDoc "chatgpt-retrieval-plugin service");
port = mkOption {
type = types.port;
default = 8080;
description = lib.mdDoc "Port the chatgpt-retrieval-plugin service listens on.";
};
host = mkOption {
type = types.str;
default = "127.0.0.1";
example = "0.0.0.0";
description = lib.mdDoc "The hostname or IP address for chatgpt-retrieval-plugin to bind to.";
};
bearerTokenPath = mkOption {
type = types.path;
description = lib.mdDoc ''
Path to the secret bearer token used for the http api authentication.
'';
default = "";
example = "config.age.secrets.CHATGPT_RETRIEVAL_PLUGIN_BEARER_TOKEN.path";
};
openaiApiKeyPath = mkOption {
type = types.path;
description = lib.mdDoc ''
Path to the secret openai api key used for embeddings.
'';
default = "";
example = "config.age.secrets.CHATGPT_RETRIEVAL_PLUGIN_OPENAI_API_KEY.path";
};
datastore = mkOption {
type = types.enum [ "pinecone" "weaviate" "zilliz" "milvus" "qdrant" "redis" ];
default = "qdrant";
description = lib.mdDoc "This specifies the vector database provider you want to use to store and query embeddings.";
};
qdrantCollection = mkOption {
type = types.str;
description = lib.mdDoc ''
name of the qdrant collection used to store documents.
'';
default = "document_chunks";
};
};
config = mkIf cfg.enable {
assertions = [
{
assertion = cfg.bearerTokenPath != "";
message = "services.chatgpt-retrieval-plugin.bearerTokenPath should not be an empty string.";
}
{
assertion = cfg.openaiApiKeyPath != "";
message = "services.chatgpt-retrieval-plugin.openaiApiKeyPath should not be an empty string.";
}
];
systemd.services.chatgpt-retrieval-plugin = {
description = "ChatGPT Retrieval Plugin";
after = [ "network.target" ];
wantedBy = [ "multi-user.target" ];
serviceConfig = {
DynamicUser = true;
Restart = "always";
LoadCredential = [
"BEARER_TOKEN:${cfg.bearerTokenPath}"
"OPENAI_API_KEY:${cfg.openaiApiKeyPath}"
];
StateDirectory = "chatgpt-retrieval-plugin";
StateDirectoryMode = "0755";
};
# it doesn't make sense to pass secrets as env vars, this is a hack until
# upstream has proper secret management.
script = ''
export BEARER_TOKEN=$(${pkgs.systemd}/bin/systemd-creds cat BEARER_TOKEN)
export OPENAI_API_KEY=$(${pkgs.systemd}/bin/systemd-creds cat OPENAI_API_KEY)
exec ${pkgs.chatgpt-retrieval-plugin}/bin/start --host ${cfg.host} --port ${toString cfg.port}
'';
environment = {
DATASTORE = cfg.datastore;
QDRANT_COLLECTION = mkIf (cfg.datastore == "qdrant") cfg.qdrantCollection;
};
};
systemd.tmpfiles.rules = [
# create the directory for static files for fastapi
"C /var/lib/chatgpt-retrieval-plugin/.well-known - - - - ${pkgs.chatgpt-retrieval-plugin}/${pkgs.python3Packages.python.sitePackages}/.well-known"
];
};
}
pkgs/applications/audio/aeolus/default.nix
+18 -6
View File
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, libclthreads, zita-alsa-pcmi, alsa-lib, libjack2
, libclxclient, libX11, libXft, readline
, libclxclient, libX11, libXft, readline, aeolus-stops
}:
stdenv.mkDerivation rec {
@@ -16,17 +16,29 @@ stdenv.mkDerivation rec {
libX11 libXft readline
];
patchPhase = ''sed "s@ldconfig.*@@" -i source/Makefile'';
postPatch = ''
sed -i source/Makefile -e /ldconfig/d
substituteInPlace source/main.cc --replace /etc/ "$out/etc/"
'';
preBuild = "cd source";
makeFlags = [ "DESTDIR=" "PREFIX=$(out)" ];
meta = {
postInstall = let cfg = ''
# Aeolus system wide default options
# Ignored if ~/.aeolusrc with local options exists
-u -S ${aeolus-stops}/${aeolus-stops.subdir}
''; in ''
mkdir -p $out/etc
echo -n "${cfg}" > $out/etc/aeolus.conf
'';
meta = with lib; {
description = "Synthetized (not sampled) pipe organ emulator";
homepage = "http://kokkinizita.linuxaudio.org/linuxaudio/aeolus/index.html";
license = lib.licenses.lgpl3;
platforms = lib.platforms.linux;
maintainers = [ lib.maintainers.nico202 ];
license = licenses.lgpl3;
platforms = platforms.linux;
maintainers = with maintainers; [ nico202 orivej ];
};
}
pkgs/applications/audio/aeolus/stops.nix
+33
View File
@@ -0,0 +1,33 @@
{ lib, stdenvNoCC, fetchurl }:
stdenvNoCC.mkDerivation rec {
pname = "stops";
version = "0.4.0";
src = fetchurl {
url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pname}-${version}.tar.bz2";
hash = "sha256-DnmguOAGyw9nv88ekJfbC04Qwbsw5tXEAaKeiCQR/LA=";
};
outputHashMode = "recursive";
outputHash = "sha256-gGHowq7g7MZmnhrpqG+3wNLwQCtpiBB88euIKeQIpJ0=";
subdir = "share/Aeolus/stops";
installPhase = ''
runHook preInstall
mkdir -p $out/${subdir}
cp -r * $out/${subdir}
runHook postInstall
'';
meta = with lib; {
description = "aeolus synthesizer instrument definitions";
homepage = "http://kokkinizita.linuxaudio.org/linuxaudio/aeolus/index.html";
license = licenses.lgpl3;
platforms = platforms.linux;
maintainers = with maintainers; [ nico202 orivej ];
};
}
pkgs/applications/audio/lmms/default.nix
+9 -1
View File
@@ -1,4 +1,4 @@
{ lib, fetchFromGitHub, cmake, pkg-config, alsa-lib ? null, fftwFloat, fltk13
{ lib, fetchFromGitHub, fetchpatch, cmake, pkg-config, alsa-lib ? null, carla ? null, fftwFloat, fltk13
, fluidsynth ? null, lame ? null, libgig ? null, libjack2 ? null, libpulseaudio ? null
, libsamplerate, libsoundio ? null, libsndfile, libvorbis ? null, portaudio ? null
, qtbase, qtx11extras, qttools, SDL ? null, mkDerivation }:
@@ -18,6 +18,7 @@ mkDerivation rec {
nativeBuildInputs = [ cmake qttools pkg-config ];
buildInputs = [
carla
alsa-lib
fftwFloat
fltk13
@@ -36,6 +37,13 @@ mkDerivation rec {
SDL # TODO: switch to SDL2 in the next version
];
patches = [
(fetchpatch {
url = "https://raw.githubusercontent.com/archlinux/svntogit-community/cf64acc45e3264c6923885867e2dbf8b7586a36b/trunk/lmms-carla-export.patch";
sha256 = "sha256-wlSewo93DYBN2PvrcV58dC9kpoo9Y587eCeya5OX+j4=";
})
];
cmakeFlags = [ "-DWANT_QT5=ON" ];
meta = with lib; {
pkgs/applications/blockchains/erigon/default.nix
+3 -3
View File
@@ -2,7 +2,7 @@
let
pname = "erigon";
version = "2.40.1";
version = "2.42.0";
in
buildGoModule {
inherit pname version;
@@ -11,11 +11,11 @@ buildGoModule {
owner = "ledgerwatch";
repo = pname;
rev = "v${version}";
sha256 = "sha256-iuJ/iajZiqKBP4hgrwt8KKkWEdYa+idpai/aWpCOjQw=";
sha256 = "sha256-M2u8/WKo1yZu27KjTJhJFqycCxCopJqtVQpIs9inswI=";
fetchSubmodules = true;
};
vendorSha256 = "sha256-0xHu7uvk7kRxyLXGvrT9U8vgfZPrs7Rmg2lFH49YOSI=";
vendorSha256 = "sha256-Vyurf4wSN4zSDjcH8FC+OOiviiSjRVF4RId/eqFDd+c=";
proxyVendor = true;
# Build errors in mdbx when format hardening is enabled:
pkgs/applications/blockchains/polkadot/Cargo.lock
Generated
+712 -660
View File
File diff suppressed because it is too large Load Diff
pkgs/applications/blockchains/polkadot/default.nix
+4 -7
View File
@@ -1,24 +1,21 @@
{ clang
, fetchFromGitHub
{ fetchFromGitHub
, lib
, llvmPackages
, protobuf
, rocksdb
, rustPlatform
, stdenv
, writeShellScriptBin
, Security
, SystemConfiguration
}:
rustPlatform.buildRustPackage rec {
pname = "polkadot";
version = "0.9.39-1";
version = "0.9.40";
src = fetchFromGitHub {
owner = "paritytech";
repo = "polkadot";
rev = "v${version}";
hash = "sha256-Hr3VFqfoBW7VGc7FXLxeCtZDLRMM+jITgR8LGA5uEP8=";
hash = "sha256-gwifWhGsStC8vhMxc+LWSvs/av8c04cdWv7iszIQ/k8=";
# the build process of polkadot requires a .git folder in order to determine
# the git commit hash that is being built and add it to the version string.
@@ -37,7 +34,7 @@ rustPlatform.buildRustPackage rec {
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"beefy-gadget-4.0.0-dev" = "sha256-3zOEG4ER0UQK3GRctZw6TgkX/8Ydk1ynU8N6vlepnHw=";
"binary-merkle-tree-4.0.0-dev" = "sha256-YxCAFrLWTmGjTFzNkyjE+DNs2cl4IjAlB7qz0KPN1vE=";
"sub-tokens-0.1.0" = "sha256-GvhgZhOIX39zF+TbQWtTCgahDec4lQjH+NqamLFLUxM=";
};
};
pkgs/applications/misc/1password-gui/linux.nix
+6 -4
View File
@@ -4,7 +4,7 @@
, version
, src
, meta
, makeWrapper
, makeShellWrapper
, wrapGAppsHook
, alsa-lib
, at-spi2-atk
@@ -49,7 +49,7 @@ let
in stdenv.mkDerivation {
inherit pname version src meta;
nativeBuildInputs = [ makeWrapper wrapGAppsHook ];
nativeBuildInputs = [ makeShellWrapper wrapGAppsHook ];
buildInputs = [ glib ];
dontConfigure = true;
@@ -120,12 +120,14 @@ in stdenv.mkDerivation {
'';
preFixup = ''
# makeWrapper defaults to makeBinaryWrapper due to wrapGAppsHook
# but we need a shell wrapper specifically for `NIXOS_OZONE_WL`.
# Electron is trying to open udev via dlopen()
# and for some reason that doesn't seem to be impacted from the rpath.
# Adding udev to LD_LIBRARY_PATH fixes that.
# Make xdg-open overrideable at runtime.
makeWrapper $out/share/1password/1password $out/bin/1password \
''${gappsWrapperArgs[@]} \
makeShellWrapper $out/share/1password/1password $out/bin/1password \
"''${gappsWrapperArgs[@]}" \
--suffix PATH : ${lib.makeBinPath [ xdg-utils ]} \
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ udev ]} \
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}"
pkgs/applications/video/droidcam/default.nix
+2 -2
View File
@@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
pname = "droidcam";
version = "1.8.2";
version = "1.9.0";
src = fetchFromGitHub {
owner = "aramg";
repo = "droidcam";
rev = "v${version}";
sha256 = "sha256-AxJBpoiBnb+5Pq/h4giOYAeLlvOtAJT5sCwzPEKo7w4=";
sha256 = "sha256-SbgvkAy7UTZKzgNPUQ17YwSo50yigiMLpITcenOODGw=";
};
nativeBuildInputs = [
pkgs/development/ocaml-modules/json-data-encoding/bson.nix
+2
View File
@@ -5,6 +5,8 @@ buildDunePackage {
inherit (json-data-encoding) version src doCheck;
duneVersion = "3";
propagatedBuildInputs = [
json-data-encoding
ocplib-endian
pkgs/development/ocaml-modules/json-data-encoding/default.nix
+3 -2
View File
@@ -2,13 +2,14 @@
buildDunePackage rec {
pname = "json-data-encoding";
version = "0.11";
version = "0.12.1";
minimalOCamlVersion = "4.10";
duneVersion = "3";
src = fetchFromGitLab {
owner = "nomadic-labs";
repo = "json-data-encoding";
rev = "${version}";
sha256 = "sha256-4FNUU82sq3ylgw0lxHlwi1OV58NRRh9zJqE47YyQZSc=";
hash = "sha256-ticulOKiFNQIZNFOQE9UQOw/wqRfygQwLVIc4kkmwg4=";
};
propagatedBuildInputs = [
pkgs/development/ocaml-modules/posix/base.nix
+4 -3
View File
@@ -4,16 +4,17 @@
buildDunePackage rec {
pname = "posix-base";
version = "2.0.0";
version = "2.0.2";
src = fetchFromGitHub {
owner = "savonet";
repo = "ocaml-posix";
rev = "v${version}";
sha256 = "18px8hfqcfy2lk8105ki3hrxxigs44gs046ba0fqda6wzd0hr82b";
hash = "sha256-xxNaPJZdcW+KnT7rYUuC7ZgmHtXTppZG2BOmpKweC/U=";
};
useDune2 = true;
duneVersion = "3";
minimalOCamlVersion = "4.08";
propagatedBuildInputs = [ ctypes integers ];
pkgs/development/ocaml-modules/posix/socket.nix
+3 -1
View File
@@ -3,7 +3,9 @@
buildDunePackage {
pname = "posix-socket";
inherit (posix-base) version src useDune2;
inherit (posix-base) version src;
duneVersion = "3";
propagatedBuildInputs = [ posix-base ];
pkgs/development/ocaml-modules/posix/time2.nix
+2
View File
@@ -5,6 +5,8 @@ buildDunePackage {
inherit (posix-base) version src;
duneVersion = "3";
propagatedBuildInputs = [ posix-base posix-types unix-errno ];
doCheck = true;
pkgs/development/ocaml-modules/posix/types.nix
+3 -2
View File
@@ -3,9 +3,10 @@
buildDunePackage {
pname = "posix-types";
inherit (posix-base) version src useDune2;
inherit (posix-base) version src;
minimumOCamlVersion = "4.03";
minimalOCamlVersion = "4.03";
duneVersion = "3";
propagatedBuildInputs = [ posix-base ];
pkgs/development/python-modules/azure-mgmt-appconfiguration/default.nix
+2 -2
View File
@@ -6,13 +6,13 @@
}:
buildPythonPackage rec {
version = "2.2.0";
version = "3.0.0";
pname = "azure-mgmt-appconfiguration";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
hash = "sha256-R2COS22pCtFp3oV98LLn/X2LkPOVUCasEONhFIhEdBQ=";
hash = "sha256-FJhuVgqNjdRIegP4vUISrAtHvvVle5VQFVITPm4HLEw=";
extension = "zip";
};
pkgs/development/python-modules/hg-evolve/default.nix
+2 -2
View File
@@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "hg-evolve";
version = "11.0.0";
version = "11.0.1";
src = fetchPypi {
inherit pname version;
hash = "sha256-7LCsw6LSFB0r2jJt7/3X18jxRhLGsRjWmjllVLxspbU=";
hash = "sha256-gupC35pLQOJgSmXiBp+KxqWuMX3iKSX9xDUtEaB/wFQ=";
};
nativeCheckInputs = [
pkgs/development/python-modules/python-telegram-bot/default.nix
+2 -2
View File
@@ -19,7 +19,7 @@
buildPythonPackage rec {
pname = "python-telegram-bot";
version = "20.1";
version = "20.2";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -28,7 +28,7 @@ buildPythonPackage rec {
owner = pname;
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-fRvusmf33QFBZc/Sq81Dx/MGBvcK514S5llJO0XbTgc=";
hash = "sha256-OdjTlVUjlw+5K/kvL1Yx+7c/lIE52udUo6Ux18M9xmE=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/sasmodels/default.nix
+3 -3
View File
@@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "sasmodels";
version = "1.0.6";
version = "1.0.7";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -21,8 +21,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "SasView";
repo = "sasmodels";
rev = "v${version}";
hash = "sha256-RVEPu07gp1ScciJQmjizyELcOD2WSjIlxunj5LnmXdw=";
rev = "refs/tags/v${version}";
hash = "sha256-GZQYVvQ4bEBizTmJ+o5fIfGr8gn2/4uD3PxIswEjzSE=";
};
buildInputs = [
pkgs/development/python-modules/transmission-rpc/default.nix
+2 -2
View File
@@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "transmission-rpc";
version = "4.1.3";
version = "4.1.4";
format = "pyproject";
disabled = pythonOlder "3.8";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "Trim21";
repo = "transmission-rpc";
rev = "refs/tags/v${version}";
hash = "sha256-GF2dXvtYgXTjdcellyCPFFTjp4Y6PKb2ihQETfomgU4=";
hash = "sha256-SIeAN/ufSu9qS0bxPI2HgOHS8Dj9BTwKh7XcAFcMEcw=";
};
nativeBuildInputs = [
pkgs/development/python-modules/zodbpickle/default.nix
+2 -2
View File
@@ -6,14 +6,14 @@
buildPythonPackage rec {
pname = "zodbpickle";
version = "2.6";
version = "3.0.1";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-BZePwk/5PzSQRa6hH6OtHvqA6rGcq2JR6sdBfGMRodI=";
hash = "sha256-Dwl1vdSnYVMg50rysLi+R2PHPPi/fEISq3IEQonndJg=";
};
# fails..
pkgs/development/tools/datree/default.nix
+2 -2
View File
@@ -8,13 +8,13 @@
buildGoModule rec {
pname = "datree";
version = "1.8.46";
version = "1.8.47";
src = fetchFromGitHub {
owner = "datreeio";
repo = "datree";
rev = "refs/tags/${version}";
hash = "sha256-sSMJxR8ZizQtWjiDbuc8pH5GltZ7YVzZrwOuz7Ih9iw=";
hash = "sha256-pL8fagVEVrAoIwbKQy1UpHOvFxYaMiw4cmmRgIamyic=";
};
vendorHash = "sha256-MrVIpr2iwddW3yUeBuDfeg+Xo9Iarr/fp4Rc4WGYGeU=";
pkgs/servers/chatgpt-retrieval-plugin/default.nix
+10 -2
View File
@@ -3,6 +3,7 @@
, fetchFromGitHub
, python3
, nix-update-script
, dasel
}:
python3Packages.buildPythonApplication {
@@ -22,14 +23,21 @@ python3Packages.buildPythonApplication {
substituteInPlace pyproject.toml \
--replace 'python-dotenv = "^0.21.1"' 'python-dotenv = "*"' \
--replace 'python-multipart = "^0.0.6"' 'python-multipart = "^0.0.5"' \
--replace 'tiktoken = "^0.2.0"' 'tiktoken = "^0.3.0"'
--replace 'tiktoken = "^0.2.0"' 'tiktoken = "^0.3.0"' \
--replace 'packages = [{include = "server"}]' 'packages = [{include = "server"}, {include = "models"}, {include = "datastore"}, {include = "services"}]'
substituteInPlace server/main.py \
--replace 'directory=".well-known"' 'directory="/var/lib/chatgpt-retrieval-plugin/.well-known"' \
--replace '0.0.0.0' '127.0.0.1' \
--replace '8000' '8080'
${dasel}/bin/dasel put -t string -f pyproject.toml -v '.well-known/*' '.tool.poetry.include.[]'
'';
nativeBuildInputs = with python3Packages; [
poetry-core
];
propagatedBuildInputs = with python3.pkgs; [
fastapi
arrow
pkgs/servers/klipper/default.nix
+3 -3
View File
@@ -7,13 +7,13 @@
stdenv.mkDerivation rec {
pname = "klipper";
version = "unstable-2023-03-15";
version = "unstable-2023-03-30";
src = fetchFromGitHub {
owner = "KevinOConnor";
repo = "klipper";
rev = "c54d83c9f134d47f00da5ecd0d762e01748aaa59";
sha256 = "sha256-zPK1dzUFLQmno4A7jEStininVcYpUh0WAFjlAqnTLS0=";
rev = "fec7ddd8aefd9561fffd7f1ccecd7231002dc884";
sha256 = "sha256-Kwmsy0hKOOT6sbmmYx/LVOM+mO06jZv2zxwy1ClZuy4=";
};
sourceRoot = "source/klippy";
pkgs/servers/misc/oven-media-engine/default.nix
+2 -2
View File
@@ -19,13 +19,13 @@
stdenv.mkDerivation rec {
pname = "oven-media-engine";
version = "0.15.5";
version = "0.15.7";
src = fetchFromGitHub {
owner = "AirenSoft";
repo = "OvenMediaEngine";
rev = "v${version}";
sha256 = "sha256-W4+DZLVXW6HlfuQQhjJDJPDXTe00BQGiR5xoHPb7+4w=";
sha256 = "sha256-Zn2zUR3YvZw6xdebPidD7lKWvvvS2XVo/Vy0yn+bTRY=";
};
sourceRoot = "source/src";
pkgs/servers/monitoring/prometheus/exportarr/default.nix
+3 -3
View File
@@ -6,16 +6,16 @@
buildGoModule rec {
pname = "exportarr";
version = "1.1.0";
version = "1.2.6";
src = fetchFromGitHub {
owner = "onedr0p";
repo = "exportarr";
rev = "v${version}";
sha256 = "sha256-KTuOhyBFS6fgA9N70vq+5fJIGVsgEZ7Uxls8efqLuII=";
sha256 = "sha256-iiMfPqXUdmSAkzeRHZ3ZQHeQGtWxpiYCF0K7gZYly94=";
};
vendorSha256 = "sha256-Yox3LAVbTZqsDmk45uSuKgITRz3zE+HTAKxVf9wdtjE=";
vendorHash = "sha256-c09aWDxD11XEoR3sLlhteZXAK/Bd6DnJXmGEBofUl7s=";
subPackages = [ "cmd/exportarr" ];
pkgs/tools/misc/cyberchef/default.nix
+2 -2
View File
@@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
pname = "cyberchef";
version = "10.2.0";
version = "10.4.0";
src = fetchzip {
url = "https://github.com/gchq/CyberChef/releases/download/v${version}/CyberChef_v${version}.zip";
sha256 = "sha256-Qom8NRy46EoZtXcdA716yO48GVemloEBlXxEFMB3g10=";
sha256 = "sha256-BjdeOTVZUMitmInL/kE6a/aw/lH4YwKNWxdi0B51xzc=";
stripRoot = false;
};
pkgs/tools/misc/ipxe/default.nix
+3 -3
View File
@@ -30,7 +30,7 @@ in
stdenv.mkDerivation rec {
pname = "ipxe";
version = "unstable-2023-03-15";
version = "unstable-2023-03-30";
nativeBuildInputs = [ gnu-efi mtools openssl perl xorriso xz ] ++ lib.optional stdenv.hostPlatform.isx86 syslinux;
depsBuildBuild = [ buildPackages.stdenv.cc ];
@@ -40,8 +40,8 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "ipxe";
repo = "ipxe";
rev = "09e8a154084c57311463408e3f2e412c305a9638";
sha256 = "pAZs3CyFPH1tiMo3Te2DN3lahzmNTX9kqNvfZLDF6BQ=";
rev = "1d1cf74a5e58811822bee4b3da3cff7282fcdfca";
sha256 = "8pwoPrmkpL6jIM+Y/C0xSvyrBM/Uv0D1GuBwNm+0DHU=";
};
postPatch = lib.optionalString stdenv.hostPlatform.isAarch64 ''
pkgs/tools/misc/plantuml/default.nix
+2 -2
View File
@@ -1,12 +1,12 @@
{ lib, stdenv, fetchurl, makeWrapper, jre, graphviz }:
stdenv.mkDerivation rec {
version = "1.2023.4";
version = "1.2023.5";
pname = "plantuml";
src = fetchurl {
url = "https://github.com/plantuml/plantuml/releases/download/v${version}/plantuml-pdf-${version}.jar";
sha256 = "sha256-7upbzDRfAFdUuH4uYPWnMfQk40guJnz4EBFkme1kRA8=";
sha256 = "sha256-C4ui/YdUIeLADugDuTmyY/5L4Nz+0iGcK3JgWPkU8UM=";
};
nativeBuildInputs = [ makeWrapper ];
pkgs/tools/networking/chaos/default.nix
+3 -3
View File
@@ -5,16 +5,16 @@
buildGoModule rec {
pname = "chaos";
version = "0.5.0";
version = "0.5.1";
src = fetchFromGitHub {
owner = "projectdiscovery";
repo = "chaos-client";
rev = "refs/tags/v${version}";
hash = "sha256-3snVQKmtIhyWNBbSLnBQIvz0bEFs8ur5FhTne3gb/h4=";
hash = "sha256-TpzTDNkfwL2CgEZwk2b5Zojhh61hXBm3PgjLkav6B3M=";
};
vendorHash = "sha256-tyH3gqD5HpEvIoki0XnGDKD08iW8tENkCPuLC9GUDQk=";
vendorHash = "sha256-Zu3TxBFTrXkAOmtUELjSdyzlE6CIr4SUBSdvaRnKy+k=";
subPackages = [
"cmd/chaos/"
pkgs/tools/networking/dae/default.nix
+47
View File
@@ -0,0 +1,47 @@
{ lib
, clang
, fetchFromGitHub
, buildGoModule
}:
buildGoModule rec {
pname = "dae";
version = "0.1.5";
src = fetchFromGitHub {
owner = "daeuniverse";
repo = pname;
rev = "v${version}";
sha256 = "sha256-EoStRmyYOtvG5ejtvHWNe9IIeE77hqp1OXBhRdxCYHs=";
fetchSubmodules = true;
};
vendorHash = "sha256-vxHufE3538l6zIcozFcrNhl+2sG1PtzkVxC0NyL3WMU=";
proxyVendor = true;
nativeBuildInputs = [ clang ];
ldflags = [
"-s"
"-w"
"-X github.com/daeuniverse/dae/cmd.Version=${version}"
"-X github.com/daeuniverse/dae/common/consts.MaxMatchSetLen_=64"
];
preBuild = ''
make CFLAGS="-D__REMOVE_BPF_PRINTK -fno-stack-protector" \
NOSTRIP=y \
ebpf
'';
# network required
doCheck = false;
meta = with lib; {
description = "A Linux high-performance transparent proxy solution based on eBPF";
homepage = "https://github.com/daeuniverse/dae";
license = licenses.agpl3Only;
maintainers = with maintainers; [ oluceps ];
platforms = platforms.linux;
};
}
pkgs/tools/security/cloudfox/default.nix
+2 -2
View File
@@ -5,13 +5,13 @@
buildGoModule rec {
pname = "cloudfox";
version = "1.10.1";
version = "1.10.2";
src = fetchFromGitHub {
owner = "BishopFox";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-VhrWDeY2RmEvWQ9rGMde662y8j64YcKyzNdRS0V5FXc=";
hash = "sha256-7xU99BqohfvUT23uW1l5thm20ZgeAPteR9xThuLR1AI=";
};
vendorHash = "sha256-v8rEsp2mDgfjCO2VvWNIxex8F350MDnZ40bR4szv+3o=";
pkgs/top-level/all-packages.nix
+3
View File
@@ -492,6 +492,8 @@ with pkgs;
cryptowatch-desktop = callPackage ../applications/finance/cryptowatch { };
dae = callPackage ../tools/networking/dae { };
databricks-sql-cli = python3Packages.callPackage ../applications/misc/databricks-sql-cli { };
dhallDirectoryToNix = callPackage ../build-support/dhall/directory-to-nix.nix { };
@@ -28647,6 +28649,7 @@ with pkgs;
};
aeolus = callPackage ../applications/audio/aeolus { };
aeolus-stops = callPackage ../applications/audio/aeolus/stops.nix { };
aewan = callPackage ../applications/editors/aewan { };