Merge master into staging-next
This commit is contained in:
commit
e5105e6cec
@ -16620,6 +16620,12 @@
|
||||
github = "rubyowo";
|
||||
githubId = 105302757;
|
||||
};
|
||||
rucadi = {
|
||||
email = "ruben.canodiaz@gmail.com";
|
||||
github = "rucadi";
|
||||
githubId = 6445619;
|
||||
name = "Ruben Cano Diaz";
|
||||
};
|
||||
rudolfvesely = {
|
||||
name = "Rudolf Vesely";
|
||||
email = "i@rudolfvesely.com";
|
||||
|
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "x42-gmsynth";
|
||||
version = "0.4.1";
|
||||
version = "0.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "x42";
|
||||
repo = "gmsynth.lv2";
|
||||
rev = "v${version}";
|
||||
sha256 = "08dvdj8r17sfl6l18g2b8abgls2irkbrq5vhrfai01hp2m0rlm34";
|
||||
hash = "sha256-onZoaQVAGH/1d7jBRlN3ucx/3mTGUCxjvvt19GyprsY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
@ -1,81 +0,0 @@
|
||||
{ rustPlatform
|
||||
, fetchFromGitHub
|
||||
, lib
|
||||
|
||||
, makeWrapper
|
||||
, installShellFiles
|
||||
, stdenv
|
||||
, Foundation
|
||||
|
||||
, withFile ? true
|
||||
, file
|
||||
, withJq ? true
|
||||
, jq
|
||||
, withPoppler ? true
|
||||
, poppler_utils
|
||||
, withUnar ? true
|
||||
, unar
|
||||
, withFfmpegthumbnailer ? true
|
||||
, ffmpegthumbnailer
|
||||
, withFd ? true
|
||||
, fd
|
||||
, withRipgrep ? true
|
||||
, ripgrep
|
||||
, withFzf ? true
|
||||
, fzf
|
||||
, withZoxide ? true
|
||||
, zoxide
|
||||
|
||||
, nix-update-script
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "yazi";
|
||||
version = "0.2.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sxyazi";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-2AiaJs6xY8hsB1DBxpPwdZtc8IZvsoCGWBOFVMf4dvk=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-fRUmXv27sHYz8z0cc795JCPLHDQGgTV4wAWAtQ/pbg4=";
|
||||
|
||||
env.YAZI_GEN_COMPLETIONS = true;
|
||||
|
||||
nativeBuildInputs = [ makeWrapper installShellFiles ];
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ Foundation ];
|
||||
|
||||
postInstall = with lib;
|
||||
let
|
||||
runtimePaths = [ ]
|
||||
++ optional withFile file
|
||||
++ optional withJq jq
|
||||
++ optional withPoppler poppler_utils
|
||||
++ optional withUnar unar
|
||||
++ optional withFfmpegthumbnailer ffmpegthumbnailer
|
||||
++ optional withFd fd
|
||||
++ optional withRipgrep ripgrep
|
||||
++ optional withFzf fzf
|
||||
++ optional withZoxide zoxide;
|
||||
in
|
||||
''
|
||||
wrapProgram $out/bin/yazi \
|
||||
--prefix PATH : "${makeBinPath runtimePaths}"
|
||||
installShellCompletion --cmd yazi \
|
||||
--bash ./yazi-config/completions/yazi.bash \
|
||||
--fish ./yazi-config/completions/yazi.fish \
|
||||
--zsh ./yazi-config/completions/_yazi
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = with lib; {
|
||||
description = "Blazing fast terminal file manager written in Rust, based on async I/O";
|
||||
homepage = "https://github.com/sxyazi/yazi";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ xyenon matthiasbeyer ];
|
||||
mainProgram = "yazi";
|
||||
};
|
||||
}
|
@ -8,18 +8,18 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "cmctl";
|
||||
version = "1.14.1";
|
||||
version = "1.14.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cert-manager";
|
||||
repo = "cert-manager";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-tS/s8zrOomuUBIoIh81RMdwmPM9pcz4cNSKVQfNxlrI=";
|
||||
hash = "sha256-pq7v7j/w+gDlyjYyrOk86YW76rwxLQQUFwhaPrblCSw=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/cmd/ctl";
|
||||
|
||||
vendorHash = "sha256-9Y8u6DVS08liliMNEalX6XQU50qRFy5qZq/9EvRSBRQ=";
|
||||
vendorHash = "sha256-HHlZkxXEJIP3u2rB4+B8Z9vcGwzRT5dtjf5Hu1WVroI=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
@ -44,6 +44,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
description = "A free, open-source tool for programming your amateur radio";
|
||||
homepage = "https://chirp.danplanet.com/";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = [ maintainers.emantor ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
@ -1,30 +1,21 @@
|
||||
{ lib
|
||||
, python3
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, wrapQtAppsHook
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "sasview";
|
||||
version = "5.0.4";
|
||||
version = "5.0.6";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SasView";
|
||||
repo = "sasview";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-TjcchqA6GCvkr59ZgDuGglan2RxLp+aMjJk28XhvoiY=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-cwP9VuvO4GPlbAxCqw31xISTi9NoF5RoBQmjWusrnzc=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix `asscalar` numpy API removal.
|
||||
# See https://github.com/SasView/sasview/pull/2178
|
||||
(fetchpatch {
|
||||
url = "https://github.com/SasView/sasview/commit/b1ab08c2a4e8fdade7f3e4cfecf3dfec38b8f3c5.patch";
|
||||
hash = "sha256-IH8g4XPziVAnkmBdzLH1ii8vN6kyCmOgrQlH2HEbm5o=";
|
||||
})
|
||||
];
|
||||
|
||||
# AttributeError: module 'numpy' has no attribute 'float'.
|
||||
postPatch = ''
|
||||
substituteInPlace src/sas/sascalc/pr/p_invertor.py \
|
||||
@ -33,6 +24,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
|
||||
nativeBuildInputs = [
|
||||
python3.pkgs.pyqt5
|
||||
python3.pkgs.setuptools
|
||||
wrapQtAppsHook
|
||||
];
|
||||
|
||||
@ -66,12 +58,21 @@ python3.pkgs.buildPythonApplication rec {
|
||||
unittest-xml-reporting
|
||||
];
|
||||
|
||||
pytestFlagsArray = [ "test" ];
|
||||
pytestFlagsArray = [
|
||||
"test"
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# NoKnownLoaderException
|
||||
"test_invalid_cansas"
|
||||
"test_data_reader_exception"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://www.sasview.org";
|
||||
description = "Fitting and data analysis for small angle scattering data";
|
||||
maintainers = with maintainers; [ rprospero ];
|
||||
homepage = "https://www.sasview.org";
|
||||
changelog = "https://github.com/SasView/sasview/releases/tag/v${version}";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ rprospero ];
|
||||
};
|
||||
}
|
||||
|
@ -18,13 +18,13 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "meld";
|
||||
version = "3.22.0";
|
||||
version = "3.22.1";
|
||||
|
||||
format = "other";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-P8EHyY7251NY/9Kw0UyF3bSP4UoR6TmpQyL6qo6QxA0=";
|
||||
sha256 = "sha256-bdO9MtvUNBq6djD7lTd393x3aB7qIjazZB1iKo+QaDY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
40
pkgs/applications/video/qctools/default.nix
Normal file
40
pkgs/applications/video/qctools/default.nix
Normal file
@ -0,0 +1,40 @@
|
||||
{ lib, stdenv, fetchurl, qmake, wrapQtAppsHook, ffmpeg, qtmultimedia, qwt }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "qctools";
|
||||
version = "1.3.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://mediaarea.net/download/source/${pname}/${version}/${pname}_${version}.tar.xz";
|
||||
hash = "sha256-ClF8KiVjV2JTCjz/ueioojhiHZf8UW9WONaJrIx4Npo=";
|
||||
};
|
||||
|
||||
sourceRoot = "${pname}/Project/QtCreator";
|
||||
|
||||
nativeBuildInputs = [ qmake wrapQtAppsHook ];
|
||||
|
||||
buildInputs = [ ffmpeg qtmultimedia qwt ];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -Dt $out/bin qctools-cli/qcli qctools-gui/QCTools
|
||||
cd ../GNU/GUI
|
||||
install -Dm644 qctools.desktop $out/share/applications/qctools.desktop
|
||||
install -Dm644 qctools.metainfo.xml $out/share/metainfo/qctools.metainfo.xml
|
||||
cd ../../../Source/Resource
|
||||
install -Dm 0644 Logo.png $out/share/icons/hicolor/256x256/apps/qctools.png
|
||||
install -Dm 0644 Logo.png $out/share/pixmaps/qctools.png
|
||||
cd ../../Project/QtCreator
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Audiovisual analytics and filtering of video files";
|
||||
homepage = "https://mediaarea.net/QCTools";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ orivej ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
@ -39,13 +39,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "crun";
|
||||
version = "1.14.1";
|
||||
version = "1.14.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "containers";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-IEfHww+kAPKcTe5bWM+YuDe6PHlSdZQVEunlBMQ29Ic=";
|
||||
hash = "sha256-D2OuTbWAISEtrKy7LFVJz8FZWdXSn1ZiKYak9cJVceU=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
39
pkgs/by-name/co/construct/package.nix
Normal file
39
pkgs/by-name/co/construct/package.nix
Normal file
@ -0,0 +1,39 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "construct";
|
||||
version = "0.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Thomas-de-Bock";
|
||||
repo = "construct";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-ENso0y7yEaXzGXzZOnlZ1L7+j/qayJL+f55/NYLz2ew=";
|
||||
};
|
||||
|
||||
postPatch = lib.optionalString stdenv.isDarwin ''
|
||||
substituteInPlace Makefile \
|
||||
--replace g++ c++
|
||||
'';
|
||||
|
||||
makeTarget = "main";
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
install -Dm755 bin/construct -t $out/bin
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Construct is an abstraction over x86 NASM Assembly";
|
||||
longDescription = "Construct adds features such as while loops, if statements, scoped macros and function-call syntax to NASM Assembly.";
|
||||
homepage = "https://github.com/Thomas-de-Bock/construct";
|
||||
maintainers = with maintainers; [ rucadi ];
|
||||
platforms = platforms.all;
|
||||
license = licenses.mit;
|
||||
mainProgram = "construct";
|
||||
};
|
||||
})
|
@ -8,16 +8,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "crossplane-cli";
|
||||
version = "1.14.5";
|
||||
version = "1.15.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "crossplane";
|
||||
repo = "crossplane";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-P7zfkrE+r/pQEEu0GK7v+bJ4ONeejZLXq2sYmU/V110=";
|
||||
hash = "sha256-VwnKTeCfCgKlgh+6QO2J4r1ImAq0zlxFFdhTtC95bs0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-vkXvnEstD/czBDxmI96TIQB/L4jxhMwIS1XpHqVtxqY=";
|
||||
vendorHash = "sha256-+e3NuSCvUgZANDB9LsvlQn3h9+L1NeQeURKDZd21reo=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
31
pkgs/by-name/do/dotslash/package.nix
Normal file
31
pkgs/by-name/do/dotslash/package.nix
Normal file
@ -0,0 +1,31 @@
|
||||
{ lib, rustPlatform, fetchCrate }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "dotslash";
|
||||
version = "0.2.0";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
hash = "sha256-4y4GH+YR6QpZj7gYycJcm7K5tE7dCvYm3UQuCKF3cfQ=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-L/ahRDLVOWsg7mHWlLYqP/+6zS9JwXGQXn66UsIIARk=";
|
||||
doCheck = false; # http tests
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://dotslash-cli.com";
|
||||
description = "Simplified multi-platform executable deployment";
|
||||
longDescription = ''
|
||||
DotSlash is a command-line tool that is designed to facilitate fetching an
|
||||
executable, verifying it, and then running it. It maintains a local cache
|
||||
of fetched executables so that subsequent invocations are fast.
|
||||
|
||||
DotSlash helps keeps heavyweight binaries out of your repo while ensuring
|
||||
your developers seamlessly get the tools they need, ensuring consistent
|
||||
builds across platforms.
|
||||
'';
|
||||
license = with licenses; [ asl20 /* or */ mit ];
|
||||
mainProgram = "dotslash";
|
||||
maintainers = with maintainers; [ thoughtpolice ];
|
||||
};
|
||||
}
|
@ -7,13 +7,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "jasper";
|
||||
version = "4.1.2";
|
||||
version = "4.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jasper-software";
|
||||
repo = "jasper";
|
||||
rev = "version-${finalAttrs.version}";
|
||||
hash = "sha256-tTgoRLthNLqRO8fDrmGHVCB9QXpmPmTr9uqSFwkIK+s=";
|
||||
hash = "sha256-aDeexQ+JmxRIjYAUH+x/J/Z847JasKWQNYYEpu78sHw=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "doc" "man" ];
|
||||
|
44
pkgs/by-name/ki/killerbee/package.nix
Normal file
44
pkgs/by-name/ki/killerbee/package.nix
Normal file
@ -0,0 +1,44 @@
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, libgcrypt
|
||||
, python3
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "killerbee";
|
||||
version = "3.0.0-beta.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "riverloopsec";
|
||||
repo = "killerbee";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-WM0Z6sd8S71F8FfhhoUq3MSD/2uvRTY/FsBP7VGGtb0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with python3.pkgs; [
|
||||
setuptools
|
||||
];
|
||||
|
||||
buildInputs = with python3.pkgs; [
|
||||
libgcrypt
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
pyserial
|
||||
pyusb
|
||||
rangeparser
|
||||
scapy
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"killerbee"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "IEEE 802.15.4/ZigBee Security Research Toolkit";
|
||||
homepage = "https://github.com/riverloopsec/killerbee";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
13
pkgs/by-name/op/opensoundmeter/build.patch
Normal file
13
pkgs/by-name/op/opensoundmeter/build.patch
Normal file
@ -0,0 +1,13 @@
|
||||
--- a/OpenSoundMeter.desktop
|
||||
+++ b/OpenSoundMeter.desktop
|
||||
@@ -6 +6 @@
|
||||
-Icon=white
|
||||
+Icon=OpenSoundMeter
|
||||
--- a/OpenSoundMeter.pro
|
||||
+++ b/OpenSoundMeter.pro
|
||||
@@ -261 +261 @@
|
||||
-APP_GIT_VERSION = $$system(git --git-dir $$_PRO_FILE_PWD_/.git --work-tree $$_PRO_FILE_PWD_ describe --tags $$system(git --git-dir $$_PRO_FILE_PWD_/.git --work-tree $$_PRO_FILE_PWD_ rev-list --tags --max-count=1))
|
||||
+APP_GIT_VERSION = ?
|
||||
@@ -486 +486 @@
|
||||
-unix:!macx:!ios:CONFIG(release, debug|release) {
|
||||
+unix:!linux:!macx:!ios:CONFIG(release, debug|release) {
|
45
pkgs/by-name/op/opensoundmeter/package.nix
Normal file
45
pkgs/by-name/op/opensoundmeter/package.nix
Normal file
@ -0,0 +1,45 @@
|
||||
{ lib, stdenv, fetchFromGitHub, alsa-lib, qt5 }:
|
||||
|
||||
let
|
||||
inherit (qt5) qmake wrapQtAppsHook qtgraphicaleffects qtquickcontrols2;
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "opensoundmeter";
|
||||
version = "1.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "psmokotnin";
|
||||
repo = "osm";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-nRibcEtG6UUTgn7PhSg4IyahMYi5aSPvaEOrAdx6u3o=";
|
||||
};
|
||||
|
||||
patches = [ ./build.patch ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace OpenSoundMeter.pro \
|
||||
--replace 'APP_GIT_VERSION = ?' 'APP_GIT_VERSION = ${src.rev}'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ qmake wrapQtAppsHook ];
|
||||
|
||||
buildInputs = [ alsa-lib qtgraphicaleffects qtquickcontrols2 ];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install OpenSoundMeter -Dt $out/bin
|
||||
install OpenSoundMeter.desktop -m444 -Dt $out/share/applications
|
||||
install icons/white.png -m444 -D $out/share/icons/OpenSoundMeter.png
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Sound measurement application for tuning audio systems in real-time";
|
||||
homepage = "https://opensoundmeter.com/";
|
||||
license = licenses.gpl3Plus;
|
||||
mainProgram = "OpenSoundMeter";
|
||||
maintainers = with maintainers; [ orivej ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
@ -1,13 +1,13 @@
|
||||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
buildGoModule rec {
|
||||
pname = "pmtiles";
|
||||
version = "1.14.1";
|
||||
version = "1.17.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "protomaps";
|
||||
repo = "go-pmtiles";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-CnREcPXNehxOMZm/cuedkDeWtloc7TGWNmmoFZhSTZE=";
|
||||
hash = "sha256-BHzQMSIE94LW6SGcpaMdX/ztzVLlmWquwWMbruLAt00=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-tSQjCdgEXIGlSWcIB6lLQulAiEAebgW3pXL9Z2ujgIs=";
|
||||
|
28
pkgs/by-name/sh/shittier/package.nix
Normal file
28
pkgs/by-name/sh/shittier/package.nix
Normal file
@ -0,0 +1,28 @@
|
||||
{ lib
|
||||
, buildNpmPackage
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "shittier";
|
||||
# No tagged release on GitHub yet
|
||||
# Commit corresponds to release tagged as 0.1.1 on [npm](https://www.npmjs.com/package/shittier)
|
||||
# See issue https://github.com/rohitdhas/shittier/issues/7
|
||||
version = "0-unstable-2023-12-22";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rohitdhas";
|
||||
repo = "shittier";
|
||||
rev = "c61b443c06dbaa8085a88b16360941cc4ba6baa2";
|
||||
hash = "sha256-qdG1PdIZGWoJI7KgJqM/fayubPbPk+od/SgKfZQADz8=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-oC9eOpoMZLZbyx9XnC4m5zzqORQWP62uRDNVZjyVnBs=";
|
||||
|
||||
meta = {
|
||||
description = "Unconventional code formatting tool for JavaScript";
|
||||
homepage = "https://github.com/rohitdhas/shittier";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ totoroot ];
|
||||
};
|
||||
}
|
@ -8,16 +8,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "updatecli";
|
||||
version = "0.70.0";
|
||||
version = "0.72.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "updatecli";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-MQoi/HvJqGCYzQLNsJul/7N3MXkV1X5d48InUSIWT8o=";
|
||||
hash = "sha256-t+HR/MrhwMQ0tDLoXU+mzI99PUtTLMpvBpGpqZed4q8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-RjyVlj66CbkQlzXkdP6ZWf+cNVjOgoPdskQefv9bNoo=";
|
||||
vendorHash = "sha256-jHH4JHz1z1eW10A3bN0DbvgIXgVICPxUWld9EtjQX/8=";
|
||||
|
||||
# tests require network access
|
||||
doCheck = false;
|
||||
|
46
pkgs/by-name/ya/yazi-unwrapped/package.nix
Normal file
46
pkgs/by-name/ya/yazi-unwrapped/package.nix
Normal file
@ -0,0 +1,46 @@
|
||||
{ rustPlatform
|
||||
, fetchFromGitHub
|
||||
, lib
|
||||
|
||||
, installShellFiles
|
||||
, stdenv
|
||||
, Foundation
|
||||
|
||||
, nix-update-script
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "yazi";
|
||||
version = "0.2.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sxyazi";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-2AiaJs6xY8hsB1DBxpPwdZtc8IZvsoCGWBOFVMf4dvk=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-fRUmXv27sHYz8z0cc795JCPLHDQGgTV4wAWAtQ/pbg4=";
|
||||
|
||||
env.YAZI_GEN_COMPLETIONS = true;
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ Foundation ];
|
||||
|
||||
postInstall = ''
|
||||
installShellCompletion --cmd yazi \
|
||||
--bash ./yazi-config/completions/yazi.bash \
|
||||
--fish ./yazi-config/completions/yazi.fish \
|
||||
--zsh ./yazi-config/completions/_yazi
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = with lib; {
|
||||
description = "Blazing fast terminal file manager written in Rust, based on async I/O";
|
||||
homepage = "https://github.com/sxyazi/yazi";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ xyenon matthiasbeyer ];
|
||||
mainProgram = "yazi";
|
||||
};
|
||||
}
|
48
pkgs/by-name/ya/yazi/package.nix
Normal file
48
pkgs/by-name/ya/yazi/package.nix
Normal file
@ -0,0 +1,48 @@
|
||||
{ lib
|
||||
, runCommand
|
||||
, makeWrapper
|
||||
, yazi-unwrapped
|
||||
|
||||
, withFile ? true
|
||||
, file
|
||||
, withJq ? true
|
||||
, jq
|
||||
, withPoppler ? true
|
||||
, poppler_utils
|
||||
, withUnar ? true
|
||||
, unar
|
||||
, withFfmpegthumbnailer ? true
|
||||
, ffmpegthumbnailer
|
||||
, withFd ? true
|
||||
, fd
|
||||
, withRipgrep ? true
|
||||
, ripgrep
|
||||
, withFzf ? true
|
||||
, fzf
|
||||
, withZoxide ? true
|
||||
, zoxide
|
||||
}:
|
||||
|
||||
let
|
||||
runtimePaths = with lib; [ ]
|
||||
++ optional withFile file
|
||||
++ optional withJq jq
|
||||
++ optional withPoppler poppler_utils
|
||||
++ optional withUnar unar
|
||||
++ optional withFfmpegthumbnailer ffmpegthumbnailer
|
||||
++ optional withFd fd
|
||||
++ optional withRipgrep ripgrep
|
||||
++ optional withFzf fzf
|
||||
++ optional withZoxide zoxide;
|
||||
in
|
||||
runCommand yazi-unwrapped.name
|
||||
{
|
||||
inherit (yazi-unwrapped) pname version meta;
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
} ''
|
||||
mkdir -p $out/bin
|
||||
ln -s ${yazi-unwrapped}/share $out/share
|
||||
makeWrapper ${yazi-unwrapped}/bin/yazi $out/bin/yazi \
|
||||
--prefix PATH : "${lib.makeBinPath runtimePaths}"
|
||||
''
|
63
pkgs/by-name/ys/ysfx/package.nix
Normal file
63
pkgs/by-name/ys/ysfx/package.nix
Normal file
@ -0,0 +1,63 @@
|
||||
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config
|
||||
, freetype, juce, libX11, libXcursor, libXext, libXinerama, libXrandr, libglvnd
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ysfx";
|
||||
version = "0-unstable-2022-07-31";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jpcima";
|
||||
repo = "ysfx";
|
||||
rev = "8077347ccf4115567aed81400281dca57acbb0cc";
|
||||
hash = "sha256-pObuOb/PA9WkKB2FdMDCOd9TKmML+Sj2MybLP0YwT+8=";
|
||||
};
|
||||
|
||||
# Provide latest dr_libs.
|
||||
dr_libs = fetchFromGitHub {
|
||||
owner = "mackron";
|
||||
repo = "dr_libs";
|
||||
rev = "e4a7765e598e9e54dc0f520b7e4416359bee80cc";
|
||||
hash = "sha256-rWabyCP47vd+EfibBWy6iQY/nFN/OXPNhkuOTSboJaU=";
|
||||
};
|
||||
|
||||
prePatch = ''
|
||||
rmdir thirdparty/dr_libs
|
||||
ln -s ${dr_libs} thirdparty/dr_libs
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
|
||||
buildInputs = [
|
||||
freetype
|
||||
juce
|
||||
libX11
|
||||
libXcursor
|
||||
libXext
|
||||
libXinerama
|
||||
libXrandr
|
||||
libglvnd
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DYSFX_PLUGIN_COPY=OFF"
|
||||
"-DYSFX_PLUGIN_USE_SYSTEM_JUCE=ON"
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/lib
|
||||
cp -r ysfx_plugin_artefacts/Release/VST3 $out/lib/vst3
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Hosting library for JSFX";
|
||||
homepage = "https://github.com/jpcima/ysfx";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ orivej ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
@ -79,13 +79,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gdal";
|
||||
version = "3.8.3";
|
||||
version = "3.8.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "OSGeo";
|
||||
repo = "gdal";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-GYBGGZ2bobVYElO0WJrsQzLMdNR5AfQwgdjBtPeGH1g=";
|
||||
hash = "sha256-R9VLof13OXPbWGHOG1Q4WZWSPoF739C6WuNWxoIwKTw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -22,8 +22,8 @@ stdenv.mkDerivation {
|
||||
src = fetchFromGitHub {
|
||||
owner = "libfive";
|
||||
repo = "libfive";
|
||||
rev = "c85ffe1ba1570c2551434c5bad731884aaf80598";
|
||||
hash = "sha256-OITy3fJx+Z6856V3D/KpSQRJztvOdJdqUv1c65wNgCc=";
|
||||
rev = "7af5f43684a8a497ac8610d39f7fca935364a9b9";
|
||||
hash = "sha256-GQzsHKeKsCWKOVfBrTuUFq2XasPxhsN+19stWY0WtVc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ wrapQtAppsHook cmake ninja pkg-config python.pkgs.pythonImportsCheckHook ];
|
||||
|
@ -1,4 +1,12 @@
|
||||
{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, fftw, speexdsp }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, autoreconfHook
|
||||
, pkg-config
|
||||
, fftw
|
||||
, speexdsp
|
||||
, withFft ? !stdenv.hostPlatform.isMinGW
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "speex";
|
||||
@ -16,12 +24,13 @@ stdenv.mkDerivation rec {
|
||||
outputs = [ "out" "dev" "doc" ];
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config ];
|
||||
buildInputs = [ fftw speexdsp ];
|
||||
buildInputs = lib.optionals withFft [ fftw ]
|
||||
++ [ speexdsp ];
|
||||
|
||||
# TODO: Remove this will help with immediate backward compatibility
|
||||
propagatedBuildInputs = [ speexdsp ];
|
||||
|
||||
configureFlags = [
|
||||
configureFlags = lib.optionals withFft [
|
||||
"--with-fft=gpl-fftw3"
|
||||
];
|
||||
|
||||
@ -29,6 +38,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://www.speex.org/";
|
||||
description = "An Open Source/Free Software patent-free audio compression format designed for speech";
|
||||
license = licenses.bsd3;
|
||||
platforms = platforms.unix;
|
||||
platforms = platforms.unix ++ platforms.windows;
|
||||
};
|
||||
}
|
||||
|
@ -13,14 +13,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-compute";
|
||||
version = "1.15.0";
|
||||
version = "1.16.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-+mda6vBMYnpELNMDIZbW82rWhEO6MnyXZ6a/vECkKyE=";
|
||||
hash = "sha256-P/A08nd3ZP4GsySd3Q6TM+kuXRabcnnI1aFd+svMz5E=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -18,14 +18,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-storage";
|
||||
version = "2.13.0";
|
||||
version = "2.14.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-9i3Ex7bNQ2DQcuPesoA1+9rUkaw9mwsYFaEtrqEPN8c=";
|
||||
hash = "sha256-LSP89ZtV57RTNnKcFIuxxGRGjGnV77ruMPcgHdkOuX4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -1,16 +1,17 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pythonOlder
|
||||
, requests
|
||||
, setuptools
|
||||
, tqdm
|
||||
, websocket-client
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "plexapi";
|
||||
version = "4.15.9";
|
||||
format = "setuptools";
|
||||
version = "4.15.10";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
@ -18,9 +19,13 @@ buildPythonPackage rec {
|
||||
owner = "pkkid";
|
||||
repo = "python-plexapi";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-mKn2SLECtJwUdBS7u8NAyIq6wlk+0WNWnDv27AVcysY=";
|
||||
hash = "sha256-3qvAf3oray3Fm3No6ixv/D1mY4lipt5pixgpyXNCRoc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
requests
|
||||
tqdm
|
||||
|
40
pkgs/development/python-modules/rangeparser/default.nix
Normal file
40
pkgs/development/python-modules/rangeparser/default.nix
Normal file
@ -0,0 +1,40 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, setuptools
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "rangeparser";
|
||||
version = "0.1.3";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "RangeParser";
|
||||
inherit version;
|
||||
hash = "sha256-gjA7Iytg802Lv7/rLfhGE0yjz4e6FfOXbEoWNPjhCOY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"rangeparser"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Parses ranges";
|
||||
homepage = "https://pypi.org/project/RangeParser/";
|
||||
license = licenses.bsd2;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
@ -11,14 +11,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "snakemake-interface-storage-plugins";
|
||||
version = "3.0.0";
|
||||
version = "3.1.0";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "snakemake";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-MinqSMpBlp3pCgQxorkMdrJuO0GExJsO02kg2/mGsFw=";
|
||||
hash = "sha256-S3+8u3U2o5FzUVSocR96zGbNL4Hof7yBqqSJIPdh3nQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -9,16 +9,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "moon";
|
||||
version = "1.20.1";
|
||||
version = "1.21.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "moonrepo";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-wAY5jifyjK5jp5nlrwt/Krp96in06SnayTKx8inrf0A=";
|
||||
hash = "sha256-E+B5HBMmYZodZuVNkrwgvN6yeko1Qx4BeAeP6b9vu/0=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-qfDw+zmhk0M3gItiB7qfgiQCBRvOYBOirJFMyNRr714=";
|
||||
cargoHash = "sha256-X7R0Tgn3Ekc3QkJiiLfQqUPf3tmf9oYoakUfoONEGZs=";
|
||||
|
||||
env = {
|
||||
RUSTFLAGS = "-C strip=symbols";
|
||||
|
@ -1,24 +1,24 @@
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, llvmPackages_11
|
||||
, llvmPackages_16
|
||||
, unstableGitUpdater
|
||||
}:
|
||||
|
||||
let
|
||||
c2ffiBranch = "llvm-11.0.0";
|
||||
llvmPackages = llvmPackages_11;
|
||||
c2ffiBranch = "llvm-16.0.0";
|
||||
llvmPackages = llvmPackages_16;
|
||||
in
|
||||
|
||||
llvmPackages.stdenv.mkDerivation {
|
||||
pname = "c2ffi-${c2ffiBranch}";
|
||||
version = "unstable-2021-06-15";
|
||||
version = "0-unstable-2023-11-18";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rpav";
|
||||
repo = "c2ffi";
|
||||
rev = "f50243926a0afb589de1078a073ac08910599582";
|
||||
sha256 = "UstGicFzFY0/Jge5HGYTPwYSnh9OUBY5346ObZYfR54=";
|
||||
rev = "097cbe61ca02dc79ea60859aa056975131a9d985";
|
||||
hash = "sha256-pflolW5OoEkVDozy4cjCdUIVxgE/SfVKIhQyNBDhENc=";
|
||||
};
|
||||
|
||||
passthru.updateScript = unstableGitUpdater {
|
||||
@ -45,7 +45,7 @@ llvmPackages.stdenv.mkDerivation {
|
||||
# LLVM may be compiled with -fno-rtti, so let's just turn it off.
|
||||
# A mismatch between lib{clang,LLVM}* and us can lead to the link time error:
|
||||
# undefined reference to `typeinfo for clang::ASTConsumer'
|
||||
CXXFLAGS="-fno-rtti";
|
||||
env.CXXFLAGS="-fno-rtti";
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/rpav/c2ffi";
|
||||
|
@ -93,7 +93,7 @@ stdenv.mkDerivation rec {
|
||||
description = "A set of utilities to handle ELF objects";
|
||||
platforms = platforms.linux;
|
||||
# https://lists.fedorahosted.org/pipermail/elfutils-devel/2014-November/004223.html
|
||||
broken = stdenv.hostPlatform.isStatic;
|
||||
badPlatforms = [ lib.systems.inspect.platformPatterns.isStatic ];
|
||||
# licenses are GPL2 or LGPL3+ for libraries, GPL3+ for bins,
|
||||
# but since this package isn't split that way, all three are listed.
|
||||
license = with licenses; [ gpl2Only lgpl3Plus gpl3Plus ];
|
||||
|
@ -12,9 +12,12 @@ stdenv.mkDerivation rec {
|
||||
depsBuildBuild = [ buildPackages.stdenv.cc ];
|
||||
nativeBuildInputs = [ perl ];
|
||||
|
||||
# libunwind for -k.
|
||||
# On RISC-V platforms, LLVM's libunwind implementation is unsupported by strace.
|
||||
# The build will silently fall back and -k will not work on RISC-V.
|
||||
buildInputs = [ libunwind elfutils ]; # support -k and -kk
|
||||
buildInputs = [ libunwind ]
|
||||
# -kk
|
||||
++ lib.optional (lib.meta.availableOn stdenv.hostPlatform elfutils) elfutils;
|
||||
|
||||
configureFlags = [ "--enable-mpers=check" ];
|
||||
|
||||
|
45
pkgs/os-specific/linux/kernel/linux-rt-6.6.nix
Normal file
45
pkgs/os-specific/linux/kernel/linux-rt-6.6.nix
Normal file
@ -0,0 +1,45 @@
|
||||
{ lib, buildLinux, fetchurl
|
||||
, kernelPatches ? [ ]
|
||||
, structuredExtraConfig ? {}
|
||||
, extraMeta ? {}
|
||||
, argsOverride ? {}
|
||||
, ... } @ args:
|
||||
|
||||
let
|
||||
version = "6.6.15-rt22"; # updated by ./update-rt.sh
|
||||
branch = lib.versions.majorMinor version;
|
||||
kversion = builtins.elemAt (lib.splitString "-" version) 0;
|
||||
in buildLinux (args // {
|
||||
inherit version;
|
||||
|
||||
# modDirVersion needs a patch number, change X.Y-rtZ to X.Y.0-rtZ.
|
||||
modDirVersion = if (builtins.match "[^.]*[.][^.]*-.*" version) == null then version
|
||||
else lib.replaceStrings ["-"] [".0-"] version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v6.x/linux-${kversion}.tar.xz";
|
||||
sha256 = "1ajzby6isqji1xlp660m4qj2i2xs003vsjp1jspziwl7hrzhqadb";
|
||||
};
|
||||
|
||||
kernelPatches = let rt-patch = {
|
||||
name = "rt";
|
||||
patch = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
|
||||
sha256 = "0dr4lb6f95vj8vzhlvy353dk6k694f1s6qfxr10m48hzyyqyaxdy";
|
||||
};
|
||||
}; in [ rt-patch ] ++ kernelPatches;
|
||||
|
||||
structuredExtraConfig = with lib.kernel; {
|
||||
PREEMPT_RT = yes;
|
||||
# Fix error: unused option: PREEMPT_RT.
|
||||
EXPERT = yes; # PREEMPT_RT depends on it (in kernel/Kconfig.preempt)
|
||||
# Fix error: option not set correctly: PREEMPT_VOLUNTARY (wanted 'y', got 'n').
|
||||
PREEMPT_VOLUNTARY = lib.mkForce no; # PREEMPT_RT deselects it.
|
||||
# Fix error: unused option: RT_GROUP_SCHED.
|
||||
RT_GROUP_SCHED = lib.mkForce (option no); # Removed by sched-disable-rt-group-sched-on-rt.patch.
|
||||
} // structuredExtraConfig;
|
||||
|
||||
extraMeta = extraMeta // {
|
||||
inherit branch;
|
||||
};
|
||||
} // argsOverride)
|
@ -5,14 +5,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "shot-scraper";
|
||||
version = "1.3";
|
||||
version = "1.4";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = python3.pkgs.pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-IC6S6LnavwxTcGEDX7lSHF1GZKBH1QcHQy17LGx4Ago=";
|
||||
hash = "sha256-hPzOwvTQAFs9IQRkq/uw+pHv5ZP5XU3Zn605SL8udPA=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
|
@ -2,16 +2,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "pfetch-rs";
|
||||
version = "2.8.1";
|
||||
version = "2.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Gobidev";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-/eVtI+Uvb0r1af20MlQU8sDSNf6YyIBvFKSVp47JMfQ=";
|
||||
hash = "sha256-7Udop3542L2l9EYQZntk/qW0GUQeYfoDHQQJ8j39krQ=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-eEBtrMF6dl5TzOZHnqjX4Yz2SfknGM2bzJcQWQIctPc=";
|
||||
cargoHash = "sha256-gT5JjBsrGngfg77od566z+EOiH8KdARGYhTLOnOhWj4=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [
|
||||
darwin.apple_sdk.frameworks.AppKit
|
||||
|
1750
pkgs/tools/misc/vector/Cargo.lock
generated
1750
pkgs/tools/misc/vector/Cargo.lock
generated
File diff suppressed because it is too large
Load Diff
@ -36,7 +36,7 @@
|
||||
|
||||
let
|
||||
pname = "vector";
|
||||
version = "0.35.0";
|
||||
version = "0.36.0";
|
||||
in
|
||||
rustPlatform.buildRustPackage {
|
||||
inherit pname version;
|
||||
@ -45,16 +45,15 @@ rustPlatform.buildRustPackage {
|
||||
owner = "vectordotdev";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-hScmHDkKkR6g1rrVRzBjtkrq59w1efIjeRJdDxmb+nY=";
|
||||
hash = "sha256-fbBKmhouY021osFVqNhEC+16cO7z3bS+DBhg1ByDeWw=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"aws-config-0.54.1" = "sha256-AVumLhybVbMnEah9/JqiQOQ4R0e2OsbB8WAJ422R6uk=";
|
||||
"greptime-proto-0.1.0" = "sha256-kSOy/0s8ZJ1RfqOb469oaVlreABtHxesNaMzFH6H+aE=";
|
||||
"greptimedb-client-0.1.0" = "sha256-mGgbxp/h55snowS2BV+QRwrhnE5vywfRF9Gc+8MoAdY=";
|
||||
"heim-0.1.0-rc.1" = "sha256-ODKEQ1udt7FlxI5fvoFMG7C2zmM45eeEYDUEaLTsdYo=";
|
||||
"greptime-proto-0.1.0" = "sha256-Q8xr6qN6SAGGK0W96WuNRdQ5/8iNlruqzhXD6xq3Ua8=";
|
||||
"greptimedb-client-0.1.0" = "sha256-l4r/2DGllXiFgOwpa83ZRiK9o0L4bokVltCGD1cp3NM=";
|
||||
"heim-0.1.0-rc.1" = "sha256-TFgLR5zb/oqceVOH4mIOvFFY/HMOLSo8VI5Eh9KP60E=";
|
||||
"nix-0.26.2" = "sha256-uquYvRT56lhupkrESpxwKEimRFhmYvri10n3dj0f2yg=";
|
||||
"ntapi-0.3.7" = "sha256-G6ZCsa3GWiI/FeGKiK9TWkmTxen7nwpXvm5FtjNtjWU=";
|
||||
"tokio-util-0.7.8" = "sha256-HCvtfohOoa1ZjD4s7QLDbIV4fe/MVBKtgM1QQX7gGKQ=";
|
||||
@ -99,8 +98,6 @@ rustPlatform.buildRustPackage {
|
||||
"--skip=sources::aws_kinesis_firehose::tests::handles_acknowledgement_failure"
|
||||
];
|
||||
|
||||
patches = [ ./vector-pr19518.patch ];
|
||||
|
||||
# recent overhauls of DNS support in 0.9 mean that we try to resolve
|
||||
# vector.dev during the checkPhase, which obviously isn't going to work.
|
||||
# these tests in the DNS module are trivial though, so stubbing them out is
|
||||
|
@ -1,25 +0,0 @@
|
||||
diff --git a/src/config/loading/mod.rs b/src/config/loading/mod.rs
|
||||
index 58c464a58..40656fd29 100644
|
||||
--- a/src/config/loading/mod.rs
|
||||
+++ b/src/config/loading/mod.rs
|
||||
@@ -13,7 +13,6 @@ use std::{
|
||||
};
|
||||
|
||||
use config_builder::ConfigBuilderLoader;
|
||||
-pub use config_builder::*;
|
||||
use glob::glob;
|
||||
use loader::process::Process;
|
||||
pub use loader::*;
|
||||
diff --git a/src/sinks/prometheus/remote_write/mod.rs b/src/sinks/prometheus/remote_write/mod.rs
|
||||
index 3ebda7df8..cf5b37a70 100644
|
||||
--- a/src/sinks/prometheus/remote_write/mod.rs
|
||||
+++ b/src/sinks/prometheus/remote_write/mod.rs
|
||||
@@ -24,8 +24,6 @@ mod tests;
|
||||
#[cfg(all(test, feature = "prometheus-integration-tests"))]
|
||||
mod integration_tests;
|
||||
|
||||
-pub use config::RemoteWriteConfig;
|
||||
-
|
||||
#[derive(Debug, Snafu)]
|
||||
enum Errors {
|
||||
#[cfg(feature = "aws-core")]
|
@ -5,16 +5,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "ldapnomnom";
|
||||
version = "1.2.0";
|
||||
version = "1.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lkarlslund";
|
||||
repo = "ldapnomnom";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-3s2mLNqnJ+wZ17gy8Yr2Ze0S62A1bmE91E2ciLNO14E=";
|
||||
hash = "sha256-enFTv8RqZpyS6LEqGIi55VMhArJy7Nhv0YhuWAOWyN0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-3ucnLD+qhBSWY2wLtBcsOcuEf1woqHP17qQg7LlERA8=";
|
||||
vendorHash = "sha256-Iry9GoKOiXf83YudpmgHQRaP8GV4zokpX2mRAXoxSDQ=";
|
||||
|
||||
ldflags = [
|
||||
"-w"
|
||||
|
@ -8,11 +8,11 @@ let
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "oath-toolkit";
|
||||
version = "2.6.10";
|
||||
version = "2.6.11";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://savannah/${pname}/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-hsJyJPfW19rUek9r7mX2uIS/W70VxemM8sxpYl2/I5E=";
|
||||
sha256 = "sha256-/FEqSltG9MQ6sFhsMYn+zk1U9+ZJOX1voeI0KEMeLLQ=";
|
||||
};
|
||||
|
||||
buildInputs = [ securityDependency ];
|
||||
|
@ -1,16 +1,18 @@
|
||||
{ lib, stdenv, fetchFromGitHub, ffmpeg_4, libui }:
|
||||
{ lib, stdenv, fetchFromGitHub, ffmpeg_4, libui, unstableGitUpdater, wrapGAppsHook }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "untrunc-anthwlock";
|
||||
version = "2020.07.18";
|
||||
version = "unstable-2021-11-21";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "anthwlock";
|
||||
repo = "untrunc";
|
||||
rev = "a0bf2e8642ecdb7af5897ed9b0dd30a7d03520ae";
|
||||
sha256 = "14i2lq68q990hnm2kkfamlsi67bcml85zl8yjsyxc5h8ncc2f3dp";
|
||||
rev = "d72ec324fbc29eb00b53c7dafeef09f92308962b";
|
||||
hash = "sha256-h+aFPhlbEM6EfCKbsJPelBY5ys7kv5K4rbK/HTHeEcw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ wrapGAppsHook ];
|
||||
|
||||
buildInputs = [ ffmpeg_4 libui ];
|
||||
|
||||
buildPhase = ''
|
||||
@ -28,6 +30,8 @@ stdenv.mkDerivation {
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
passthru.updateScript = unstableGitUpdater { };
|
||||
|
||||
meta = with lib; {
|
||||
description = "Restore a truncated mp4/mov (improved version of ponchio/untrunc)";
|
||||
homepage = "https://github.com/anthwlock/untrunc";
|
||||
|
@ -34647,6 +34647,8 @@ with pkgs;
|
||||
|
||||
qcomicbook = libsForQt5.callPackage ../applications/graphics/qcomicbook { };
|
||||
|
||||
qctools = libsForQt5.callPackage ../applications/video/qctools { };
|
||||
|
||||
qelectrotech = libsForQt5.callPackage ../applications/misc/qelectrotech { };
|
||||
|
||||
eiskaltdcpp = libsForQt5.callPackage ../applications/networking/p2p/eiskaltdcpp { };
|
||||
@ -41891,7 +41893,7 @@ with pkgs;
|
||||
|
||||
weggli = callPackage ../tools/security/weggli { };
|
||||
|
||||
yazi = callPackage ../applications/file-managers/yazi { inherit (darwin.apple_sdk.frameworks) Foundation; };
|
||||
yazi-unwrapped = callPackage ../by-name/ya/yazi-unwrapped/package.nix { inherit (darwin.apple_sdk.frameworks) Foundation; };
|
||||
|
||||
ssl-proxy = callPackage ../tools/networking/ssl-proxy { };
|
||||
|
||||
|
@ -185,6 +185,14 @@ in {
|
||||
];
|
||||
};
|
||||
|
||||
linux_rt_6_6 = callPackage ../os-specific/linux/kernel/linux-rt-6.6.nix {
|
||||
kernelPatches = [
|
||||
kernelPatches.bridge_stp_helper
|
||||
kernelPatches.request_key_helper
|
||||
kernelPatches.export-rt-sched-migrate
|
||||
];
|
||||
};
|
||||
|
||||
linux_6_7 = callPackage ../os-specific/linux/kernel/mainline.nix {
|
||||
branch = "6.7";
|
||||
kernelPatches = [
|
||||
@ -613,6 +621,7 @@ in {
|
||||
linux_rt_5_10 = packagesFor kernels.linux_rt_5_10;
|
||||
linux_rt_5_15 = packagesFor kernels.linux_rt_5_15;
|
||||
linux_rt_6_1 = packagesFor kernels.linux_rt_6_1;
|
||||
linux_rt_6_6 = packagesFor kernels.linux_rt_6_6;
|
||||
__attrsFailEvaluation = true;
|
||||
};
|
||||
|
||||
@ -663,7 +672,7 @@ in {
|
||||
linux_latest = packages.linux_6_7;
|
||||
linux_mptcp = throw "'linux_mptcp' has been moved to https://github.com/teto/mptcp-flake";
|
||||
linux_rt_default = packages.linux_rt_5_4;
|
||||
linux_rt_latest = packages.linux_rt_6_1;
|
||||
linux_rt_latest = packages.linux_rt_6_6;
|
||||
} // { __attrsFailEvaluation = true; };
|
||||
|
||||
manualConfig = callPackage ../os-specific/linux/kernel/manual-config.nix {};
|
||||
|
@ -12489,6 +12489,8 @@ self: super: with self; {
|
||||
|
||||
rangehttpserver = callPackage ../development/python-modules/rangehttpserver { };
|
||||
|
||||
rangeparser = callPackage ../development/python-modules/rangeparser { };
|
||||
|
||||
rank-bm25 = callPackage ../development/python-modules/rank-bm25 { };
|
||||
|
||||
rapidfuzz = callPackage ../development/python-modules/rapidfuzz { };
|
||||
|
Loading…
Reference in New Issue
Block a user