Merge master into staging-next

This commit is contained in:
github-actions[bot] 2024-01-15 18:00:54 +00:00 committed by GitHub
commit 0be7610a20
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
62 changed files with 2518 additions and 171 deletions

View file

@ -22,7 +22,7 @@ in
plugins = mkOption {
type = types.listOf types.package;
defaultText = literalExpression "[ pkgs.ccid ]";
example = literalExpression "with pkgs; [ pcsc-cyberjack yubikey-personalization ]";
example = literalExpression "[ pkgs.pcsc-cyberjack ]";
description = lib.mdDoc "Plugin packages to be used for PCSC-Lite.";
};

View file

@ -108,12 +108,12 @@ let
getKeyLocations = pool: if isBool cfgZfs.requestEncryptionCredentials then {
hasKeys = cfgZfs.requestEncryptionCredentials;
command = "${cfgZfs.package}/sbin/zfs list -rHo name,keylocation,keystatus ${pool}";
command = "${cfgZfs.package}/sbin/zfs list -rHo name,keylocation,keystatus -t volume,filesystem ${pool}";
} else let
keys = filter (x: datasetToPool x == pool) cfgZfs.requestEncryptionCredentials;
in {
hasKeys = keys != [];
command = "${cfgZfs.package}/sbin/zfs list -Ho name,keylocation,keystatus ${toString keys}";
command = "${cfgZfs.package}/sbin/zfs list -Ho name,keylocation,keystatus -t volume,filesystem ${toString keys}";
};
createImportService = { pool, systemd, force, prefix ? "" }:

View file

@ -1,5 +1,5 @@
{ lib, stdenv
, fetchurl
, fetchzip
, pkg-config
, autoreconfHook
, gtk2
@ -8,19 +8,21 @@
, jack2
, audiofile
, goocanvas # graphical envelope editing
, libxml2
, libsndfile
}:
stdenv.mkDerivation rec {
pname = "soundtracker";
version = "1.0.3";
version = "1.0.4";
src = fetchurl {
src = fetchzip {
# Past releases get moved to the "old releases" directory.
# Only the latest release is at the top level.
# Nonetheless, only the name of the file seems to affect which file is
# downloaded, so this path should be fine both for old and current releases.
url = "mirror://sourceforge/soundtracker/soundtracker-${version}.tar.xz";
sha256 = "sha256-k+TB1DIauOIeQSCVV5uYu69wwRx7vCRAlSCTAtDguKo=";
hash = "sha256-kNt0BSRaEQY+oa1xbuZ1l6nCqXhcktVugxzcC3ZDaX0=";
};
postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
@ -55,6 +57,8 @@ stdenv.mkDerivation rec {
jack2
audiofile
goocanvas
libxml2
libsndfile
] ++ lib.optional stdenv.isLinux alsa-lib;
meta = with lib; {

View file

@ -14,6 +14,7 @@ mkDerivation {
description = "KDE image viewer";
license = with lib.licenses; [ gpl2Plus fdl12Plus ];
maintainers = [ lib.maintainers.ttuegel ];
mainProgram = "gwenview";
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [

View file

@ -1,15 +1,15 @@
{ lib, stdenv, fetchFromGitHub, python3Packages, wrapQtAppsHook
, secp256k1 }:
, secp256k1, qtwayland }:
python3Packages.buildPythonApplication rec {
pname = "electron-cash";
version = "4.2.10";
version = "4.3.1";
src = fetchFromGitHub {
owner = "Electron-Cash";
repo = "Electron-Cash";
rev = "refs/tags/${version}";
sha256 = "sha256-m13wJlNBG3BxOdKUyd3qmIhFBM7263FzMKr5lfD1tys=";
sha256 = "sha256-xOyj5XerOwgfvI0qj7+7oshDvd18h5IeZvcJTis8nWo=";
};
propagatedBuildInputs = with python3Packages; [
@ -27,6 +27,7 @@ python3Packages.buildPythonApplication rec {
certifi
pathvalidate
dnspython
bitcoinrpc
# requirements-binaries
pyqt5
@ -47,6 +48,8 @@ python3Packages.buildPythonApplication rec {
nativeBuildInputs = [ wrapQtAppsHook ];
buildInputs = [ ] ++ lib.optional stdenv.isLinux qtwayland;
postPatch = ''
substituteInPlace contrib/requirements/requirements.txt \
--replace "qdarkstyle==2.6.8" "qdarkstyle<3"
@ -55,13 +58,6 @@ python3Packages.buildPythonApplication rec {
--replace "(share_dir" "(\"share\""
'';
nativeCheckInputs = with python3Packages; [ pytest ];
checkPhase = ''
unset HOME
pytest electroncash/tests
'';
postInstall = lib.optionalString stdenv.isLinux ''
substituteInPlace $out/share/applications/electron-cash.desktop \
--replace "Exec=electron-cash" "Exec=$out/bin/electron-cash"

View file

@ -11,13 +11,13 @@
perlPackages.buildPerlPackage rec {
pname = "get_iplayer";
version = "3.34";
version = "3.35";
src = fetchFromGitHub {
owner = "get-iplayer";
repo = "get_iplayer";
rev = "v${version}";
hash = "sha256-KuDNngHOoeEHJExEHoLdNO95ZUvLx8TWiAOTmRKHtmQ=";
hash = "sha256-fqzrgmtqy7dlmGEaTXAqpdt9HqZCVooJ0Vf6/JUKihw=";
};
nativeBuildInputs = [ makeWrapper ] ++ lib.optional stdenv.isDarwin shortenPerlShebang;
@ -35,7 +35,7 @@ perlPackages.buildPerlPackage rec {
install -D get_iplayer -t $out/bin
wrapProgram $out/bin/get_iplayer --suffix PATH : ${lib.makeBinPath [ atomicparsley ffmpeg ]} --prefix PERL5LIB : $PERL5LIB
install -D get_iplayer.1 -t $out/share/man/man1
install -Dm444 get_iplayer.1 -t $out/share/man/man1
runHook postInstall
'';

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, dee, gtk3, intltool, libdbusmenu-gtk3, libunity, pkg-config, rsync }:
{ lib, stdenv, fetchurl, dee, gtk3, intltool, libdbusmenu-gtk3, libunity, pkg-config, rsync, wrapGAppsHook }:
stdenv.mkDerivation rec {
version = "1.3.1";
@ -12,6 +12,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
intltool
pkg-config
wrapGAppsHook
];
buildInputs = [
@ -27,6 +28,7 @@ stdenv.mkDerivation rec {
homepage = "http://www.opbyte.it/grsync/";
license = licenses.gpl2Only;
platforms = platforms.linux;
mainProgram = "grsync";
maintainers = [ maintainers.kuznero ];
};
}

View file

@ -1,15 +1,15 @@
{
"packageVersion": "121.0-1",
"packageVersion": "121.0.1-1",
"source": {
"rev": "121.0-1",
"sha256": "1vd4vz4i27p1lwx5ibaxqf7r1ll5zlvf54n6mqmaya3q0lrawb14"
"rev": "121.0.1-1",
"sha256": "15zcrl47w6ib00wai63kks5ykcpfh5wfa0ixxj62v06v50bnd78x"
},
"settings": {
"rev": "41623492f2b6970972014f6ce196015d3d7f1b59",
"sha256": "0ayyyw44q0gh668bzlv6cfl7baa0818bnz83g53l5j2f10xd52by"
},
"firefox": {
"version": "121.0",
"sha512": "52e9e21ce825c4e58f09fd2c7347f1ac4efbca47e119136a712f0d4ee80c769ef80a43bad74a4c88cd377f804f5780b07f7af5b779f3fb5d244fa095e6b3b18a"
"version": "121.0.1",
"sha512": "7810850a922cb4a274ced6556e14256d3ff518a96f10a0f86d1f8e40daa0a8b1a5cfcc9cbf1391029d920944e94a9149951ee107a0e718a294954bb50b6ced2e"
}
}

View file

@ -24,7 +24,7 @@
, libpulseaudio
, libupnp
, yaml-cpp
, msgpack
, msgpack-cxx
, openssl
, restinio
, secp256k1
@ -125,7 +125,7 @@ stdenv.mkDerivation rec {
http-parser
jsoncpp
libupnp
msgpack
msgpack-cxx
opendht-jami
openssl
pjsip-jami
@ -177,7 +177,7 @@ stdenv.mkDerivation rec {
libpulseaudio
libupnp
yaml-cpp
msgpack
msgpack-cxx
opendht-jami
openssl
pjsip-jami

View file

@ -12,6 +12,7 @@
, sassc
, libadwaita
, pcre2
, libsixel
, libxml2
, librsvg
, libgee
@ -20,6 +21,7 @@
, gtk3
, desktop-file-utils
, wrapGAppsHook
, sixelSupport ? false
}:
let
@ -62,7 +64,18 @@ stdenv.mkDerivation rec {
];
buildInputs = [
gtk4
vte-gtk4
(vte-gtk4.overrideAttrs (old: {
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "GNOME";
repo = "vte";
rev = "3c8f66be867aca6656e4109ce880b6ea7431b895";
hash = "sha256-vz9ircmPy2Q4fxNnjurkgJtuTSS49rBq/m61p1B43eU=";
};
} // lib.optionalAttrs sixelSupport {
buildInputs = old.buildInputs ++ [ libsixel ];
mesonFlags = old.mesonFlags ++ [ "-Dsixel=true" ];
}))
json-glib
marble
libadwaita
@ -80,7 +93,7 @@ stdenv.mkDerivation rec {
homepage = "https://gitlab.gnome.org/raggesilver/blackbox";
changelog = "https://gitlab.gnome.org/raggesilver/blackbox/-/raw/v${version}/CHANGELOG.md";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ chuangzhu ];
maintainers = with maintainers; [ chuangzhu linsui ];
platforms = platforms.linux;
};
}

View file

@ -162,6 +162,9 @@ stdenv.mkDerivation (finalAttrs: {
"-DENABLE_JACK=ON"
(lib.cmakeBool "ENABLE_QSV11" stdenv.hostPlatform.isx86_64)
(lib.cmakeBool "ENABLE_LIBFDK" withFdk)
(lib.cmakeBool "ENABLE_ALSA" alsaSupport)
(lib.cmakeBool "ENABLE_PULSEAUDIO" pulseaudioSupport)
(lib.cmakeBool "ENABLE_PIPEWIRE" pipewireSupport)
];
dontWrapGApps = true;
@ -199,7 +202,7 @@ stdenv.mkDerivation (finalAttrs: {
video content, efficiently
'';
homepage = "https://obsproject.com";
maintainers = with maintainers; [ jb55 MP2E materus fpletz ];
maintainers = with maintainers; [ eclairevoyant jb55 MP2E materus fpletz ];
license = with licenses; [ gpl2Plus ] ++ optional withFdk fraunhofer-fdk;
platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" ];
mainProgram = "obs";

View file

@ -1,24 +1,55 @@
{ lib
, fetchFromGitHub
, rustPlatform
, fetchurl
, stdenv
, darwin
}:
let
# svm-rs-builds requires a list of solc versions to build, and would make network calls if not provided.
# The ethereum project does not provide static binaries for aarch64, so we use separate sources, the same as in
# svm-rs's source code.
solc-versions = {
x86_64-linux = fetchurl {
url = "https://raw.githubusercontent.com/ethereum/solc-bin/60de887187e5670c715931a82fdff6677b31f0cb/linux-amd64/list.json";
hash = "sha256-zm1cdqSP4Y9UQcq9OV8sXxnzr3+TWdc7mdg+Do8Y7WY=";
};
x86_64-darwin = fetchurl {
url = "https://raw.githubusercontent.com/ethereum/solc-bin/60de887187e5670c715931a82fdff6677b31f0cb/macosx-amd64/list.json";
hash = "sha256-uUdd5gCG7SHQgAW2DQXemTujb8bUJM27J02WjLkQgek=";
};
aarch64-linux = fetchurl {
url = "https://raw.githubusercontent.com/nikitastupin/solc/923ab4b852fadc00ffe87bb76fff21d0613bd280/linux/aarch64/list.json";
hash = "sha256-mJaEN63mR3XdK2FmEF+VhLR6JaCCtYkIRq00wYH6Xx8=";
};
aarch64-darwin = fetchurl {
url = "https://raw.githubusercontent.com/alloy-rs/solc-builds/260964c1fcae2502c0139070bdc5c83eb7036a68/macosx/aarch64/list.json";
hash = "sha256-xrtb3deMDAuDIjzN1pxm5NyW5NW5OyoOHTFsYyWJCYY=";
};
};
in
rustPlatform.buildRustPackage rec {
pname = "bulloak";
version = "0.5.4";
version = "0.6.1";
src = fetchFromGitHub {
owner = "alexfertel";
repo = "bulloak";
rev = "v${version}";
hash = "sha256-lUTMQMBqCezuUsfvuYSCBFsokoY3bPoJDGWL90EjVqY=";
hash = "sha256-0pzn0gXlhdndCpsrVRNxl1ylIE/S9A0l8VjNn5wDVvw=";
};
cargoHash = "sha256-LH96e/dBbv4J7g7wzh3/vL+PzZn779zUMBgio6w3rJw=";
cargoHash = "sha256-IlDbys5uluLm418UkGf+FIM1AfR2IBAZQ4Atqlybajw=";
buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ];
# tests run in CI on the source repo
doCheck = false;
# provide the list of solc versions to the `svm-rs-builds` dependency
SVM_RELEASES_LIST_JSON = solc-versions.${stdenv.hostPlatform.system};
meta = with lib; {
description = "A Solidity test generator based on the Branching Tree Technique";
homepage = "https://github.com/alexfertel/bulloak";

View file

@ -6,16 +6,16 @@
}:
rustPlatform.buildRustPackage rec {
pname = "emacs-lsp-booster";
version = "0.1.1";
version = "0.2.0";
src = fetchFromGitHub {
owner = "blahgeek";
repo = "emacs-lsp-booster";
rev = "v${version}";
hash = "sha256-0roQxzQrxcmS2RHQPguBRL76xSErf2hVjuJEyFr5MeM=";
hash = "sha256-DmEnuAR/OtTdKApEWCdOPAJplT29kuM6ZSHeOnQVo/c=";
};
cargoHash = "sha256-quqhAMKsZorYKFByy2bojGgYR2Ps959Rg/TP8SnwbqM=";
cargoHash = "sha256-2wXsPkBl4InjbdYUiiQ+5fZFanLA88t5ApGZ4psfDqk=";
nativeCheckInputs = [emacs]; # tests/bytecode_test

1905
pkgs/by-name/fi/fim-rs/Cargo.lock generated Normal file

File diff suppressed because it is too large Load diff

View file

@ -0,0 +1,68 @@
{ lib
, bzip2
, darwin
, fetchFromGitHub
, pkg-config
, rustPlatform
, stdenv
, zstd
}:
rustPlatform.buildRustPackage rec {
pname = "fim-rs";
version = "0.4.10";
src = fetchFromGitHub {
owner = "Achiefs";
repo = "fim";
rev = "refs/tags/v${version}";
hash = "sha256-NrxjiJY+qgPfsNY2Xlm0KRArIDH3+u9uA5gSPem+9uc=";
};
cargoLock = {
lockFile = ./Cargo.lock;
};
postPatch = ''
ln -s ${./Cargo.lock} Cargo.lock
'';
nativeBuildInputs = [
pkg-config
];
buildInputs = [
bzip2
zstd
] ++ lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.CoreFoundation
darwin.apple_sdk.frameworks.CoreServices
darwin.apple_sdk.frameworks.Security
];
env = {
ZSTD_SYS_USE_PKG_CONFIG = true;
};
# There is a failure while the binary is checked
doCheck = false;
meta = with lib; {
description = "Host-based file integrity monitoring tool";
longDescription = ''
FIM is a File Integrity Monitoring tool that tracks any event over your
files. It is capable of keeping historical data of your files. It checks
the filesystem changes in the background.
FIM is the fastest alternative to other software like Ossec, which
performs file integrity monitoring. It could integrate with other
security tools. The produced data can be ingested and analyzed with
tools like ElasticSearch/OpenSearch.
'';
homepage = "https://github.com/Achiefs/fim";
changelog = "https://github.com/Achiefs/fim/releases/tag/v${version}";
license = licenses.gpl3Only;
maintainers = with maintainers; [ fab ];
mainProgram = "fim";
};
}

View file

@ -1,12 +1,12 @@
{ lib, appimageTools, fetchurl }:
let
version = "0.9.9.7";
version = "0.9.9.10";
pname = "hifile";
src = fetchurl {
url = "https://www.hifile.app/files/HiFile-${version}.AppImage";
hash = "sha256-/vFW+jHmtCEioJt0B5TnNDsaIyFlDuVABnHNccm6iEw=";
hash = "sha256-wNS+vaWvJsZDrgiA7RWRfkGv9Mb6BZ2qyn67jwJu61I=";
};
appimageContents = appimageTools.extractType2 {

View file

@ -0,0 +1,41 @@
{ lib
, stdenv
, fetchFromGitHub
, udev
, cmake
, pkg-config
}:
stdenv.mkDerivation(finalAttrs: {
pname = "libusbp";
version = "1.3.0";
src = fetchFromGitHub {
owner = "pololu";
repo = "libusbp";
rev = finalAttrs.version;
hash = "sha256-60xpJ97GlqEcy2+pxGNGPfWDnbIFGoPXJijaErOBXQs=";
};
outputs = [ "out" "dev" ];
nativeBuildInputs = [
cmake
pkg-config
];
propagatedBuildInputs = [
udev
];
meta = with lib; {
homepage = "https://github.com/pololu/libusbp";
description = "Pololu USB Library (also known as libusbp)";
longDescription = ''
libusbp is a cross-platform C library for accessing USB devices
'';
platforms = platforms.all;
license = licenses.cc-by-sa-30;
maintainers = with maintainers; [ bzizou ];
};
})

View file

@ -0,0 +1,28 @@
{ lib, libpcap, rustPlatform, fetchFromGitHub }:
rustPlatform.buildRustPackage rec {
pname = "netop";
version = "0.1.4";
src = fetchFromGitHub {
owner = "ZingerLittleBee";
repo = "netop";
rev = "v${version}";
hash = "sha256-Rnp2VNAi8BNbKqkGFoYUb4C5db5BS1P1cqpWlroTmdQ=";
};
LIBPCAP_LIBDIR = lib.makeLibraryPath [ libpcap ];
LIBPCAP_VER = libpcap.version;
cargoHash = "sha256-5vbv4w17DdaTKuF3vQOfv74I8hp2Zpsp40ZlF08qWlc=";
meta = with lib; {
changelog = "https://github.com/ZingerLittleBee/netop/raw/v${version}/CHANGELOG.md";
description = "A network monitor using bpf";
homepage = "https://github.com/ZingerLittleBee/netop";
license = licenses.mit;
mainProgram = "netop";
maintainers = [ maintainers.marcusramberg ];
platforms = platforms.linux;
};
}

View file

@ -1,7 +1,9 @@
{ lib
{ stdenv
, lib
, rustPlatform
, installShellFiles
, makeBinaryWrapper
, darwin
, fetchFromGitHub
, nix-update-script
, nvd
@ -33,6 +35,8 @@ rustPlatform.buildRustPackage {
makeBinaryWrapper
];
buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ];
preFixup = ''
mkdir completions
$out/bin/nh completions --shell bash > completions/nh.bash

View file

@ -1,23 +1,20 @@
{ lib, stdenv, fetchurl }:
{ lib, stdenv, fetchFromSourcehut }:
let version = "0.5.0";
in stdenv.mkDerivation {
pname = "nix-lib-nmd";
inherit version;
# TODO: Restore when Sourcehut once its back from DDoS attack.
# src = fetchFromSourcehut {
# owner = "~rycee";
# repo = "nmd";
# rev = "v${version}";
# hash = "sha256-1glxIg/b+8qr+ZsSsBqZIqGpsYWzRuMyz74/sy765Uk=";
# };
src = fetchurl {
url = "https://rycee.net/tarballs/nmd-${version}.tar.gz";
hash = "sha256-+65+VYFgnbFGzCyyQytyxVStSZwEP989qi/6EDOdA8A=";
src = fetchFromSourcehut {
owner = "~rycee";
repo = "nmd";
rev = "v${version}";
hash = "sha256-x3zzcdvhJpodsmdjqB4t5mkVW22V3wqHLOun0KRBzUI=";
};
outputHashMode = "recursive";
outputHash = "sha256-7BQmDJBo7rzv0rgfRiUAR3HvKkUHQ6x0umhBRhAAyzM=";
installPhase = ''
mkdir -v "$out"
cp -rv * "$out"

View file

@ -1,23 +1,20 @@
{ lib, stdenv, fetchurl }:
{ lib, stdenv, fetchFromSourcehut }:
let version = "0.5.0";
let version = "0.5.1";
in stdenv.mkDerivation {
pname = "nix-lib-nmt";
inherit version;
# TODO: Restore when Sourcehut once its back from DDoS attack.
# src = fetchFromSourcehut {
# owner = "~rycee";
# repo = "nmt";
# rev = "v${version}";
# hash = "sha256-1glxIg/b+8qr+ZsSsBqZIqGpsYWzRuMyz74/sy765Uk=";
# };
src = fetchurl {
url = "https://rycee.net/tarballs/nmt-${version}.tar.gz";
hash = "sha256-AO1iLsfZSLbR65tRBsAqJ98CewfSl5yNf7C6XaZj0wM=";
src = fetchFromSourcehut {
owner = "~rycee";
repo = "nmt";
rev = "v${version}";
hash = "sha256-krVKx3/u1mDo8qe5qylYgmwAmlAPHa1BSPDzxq09FmI=";
};
outputHashMode = "recursive";
outputHash = "sha256-N7kGGDDXsXtc1S3Nqw7lCIbnVHtGNNLM1oO+Xe64hSE=";
installPhase = ''
mkdir -pv "$out"
cp -rv * "$out"

View file

@ -10,16 +10,16 @@
rustPlatform.buildRustPackage rec {
pname = "nixseparatedebuginfod";
version = "0.3.2";
version = "0.3.3";
src = fetchFromGitHub {
owner = "symphorien";
repo = "nixseparatedebuginfod";
rev = "v${version}";
hash = "sha256-XSEHNoc3h21foVeR28KgfiBTRHyUh+GJ52LMD2xFHfA=";
hash = "sha256-KQzMLAl/2JYy+EVBIhUTouOefOX6OCE3iIZONFMQivk=";
};
cargoHash = "sha256-t6W6siHuga/T9kmanA735zH2i9eCOT7vD6v7E5LIp9k=";
cargoHash = "sha256-UzPWJfkVLqCuMdNcAfQS38lgtWCO9HhCf5ZCqzWQ6jY=";
# tests need a working nix install with access to the internet
doCheck = false;

View file

@ -0,0 +1,26 @@
{ lib
, rustPlatform
, fetchFromGitHub
}:
rustPlatform.buildRustPackage rec {
pname = "obs-do";
version = "0.1.0";
src = fetchFromGitHub {
owner = "jonhoo";
repo = "obs-do";
rev = "refs/tags/v${version}";
hash = "sha256-MlBtnRMovnek4dkfO7ocafSgAwIXB5p1FmhNeqfSspA=";
};
cargoHash = "sha256-5EqiDibeWrN45guneN2bxKDXfSz3wDxBNHdl0Km/lpA=";
meta = with lib; {
description = "CLI for common OBS operations while streaming using WebSocket";
homepage = "https://github.com/jonhoo/obs-do";
license = with licenses; [ asl20 mit ];
maintainers = with maintainers; [ GaetanLepage ];
mainProgram = "obs-do";
};
}

View file

@ -0,0 +1,47 @@
{ lib
, stdenv
, fetchFromGitHub
, libusbp
, cmake
, pkg-config
, qt5
}:
stdenv.mkDerivation (finalAttrs: {
pname = "pololu-tic";
version = "1.8.1";
src = fetchFromGitHub {
owner = "pololu";
repo = "pololu-tic-software";
rev = "refs/tags/${finalAttrs.version}";
sha256 = "sha256-C/v5oaC5zZwm+j9CbFaDW+ebzHxPVb8kZLg9c0HyPbc=";
};
outputs = [
"out"
"dev"
];
nativeBuildInputs = [
cmake
pkg-config
qt5.wrapQtAppsHook
];
propagatedBuildInputs = [
libusbp
];
buildInputs = [
qt5.qtbase
];
meta = with lib; {
homepage = "https://github.com/pololu/pololu-tic-software";
description = "Pololu Tic stepper motor controller software";
platforms = platforms.all;
license = licenses.cc-by-sa-30;
maintainers = with maintainers; [ bzizou ];
};
})

View file

@ -0,0 +1,58 @@
{ lib
, fetchFromGitHub
, makeWrapper
, python3
}:
python3.pkgs.buildPythonApplication rec {
pname = "zircolite";
version = "2.9.9";
format = "other";
src = fetchFromGitHub {
owner = "wagga40";
repo = "Zircolite";
rev = "refs/tags/${version}";
hash = "sha256-De1FLeYZY9eiBW18AVAMtYysC0b8AzO5HtFKxyzK9GY=";
};
nativeBuildInputs = [
makeWrapper
];
propagatedBuildInputs = with python3.pkgs; [
aiohttp
colorama
elastic-transport
elasticsearch
evtx
jinja2
lxml
orjson
requests
tqdm
urllib3
xxhash
] ++ elasticsearch.optional-dependencies.async;
installPhase = ''
runHook preInstall
mkdir -p $out/bin $out/share $out/share/zircolite
cp -R . $out/share/zircolite
makeWrapper ${python3.interpreter} $out/bin/zircolite \
--set PYTHONPATH "$PYTHONPATH:$out/bin/zircolite.py" \
--add-flags "$out/share/zircolite/zircolite.py"
runHook postInstall
'';
meta = with lib; {
description = "SIGMA-based detection tool for EVTX, Auditd, Sysmon and other logs";
homepage = "https://github.com/wagga40/Zircolite";
changelog = "https://github.com/wagga40/Zircolite/releases/tag/${version}";
license = licenses.gpl3Only;
maintainers = with maintainers; [ fab ];
};
}

View file

@ -13,13 +13,13 @@
stdenv.mkDerivation rec {
pname = "${passthru.prettyName}-unwrapped";
# nixpkgs-update: no auto update
version = "unstable-2023-05-17";
version = "unstable-2023-11-24";
src = fetchFromGitHub {
owner = "open-watcom";
repo = "open-watcom-v2";
rev = "4053c858ac1f83a186704434bd16b6a6b8f4cf88";
sha256 = "sha256-o+cA5kqPow+ERCeWdA3UNKawF+EjuL87lPXUjFT/D1w=";
rev = "7976a5c7ca4e856907ccd378c17c71578ad51cb7";
hash = "sha256-u9ljy4dZRoXKyUqdolxZijpc99TuhKPPlL6xlV3xJXA=";
};
postPatch = ''
@ -47,6 +47,9 @@ stdenv.mkDerivation rec {
ghostscript
];
# Work around https://github.com/NixOS/nixpkgs/issues/166205
env.NIX_LDFLAGS = lib.optionalString (stdenv.cc.isClang && stdenv.cc.libcxx != null) "-l${stdenv.cc.libcxx.cxxabi.libName}";
configurePhase = ''
runHook preConfigure

View file

@ -16,6 +16,7 @@ let
libcublas
setupCudaHook
;
inherit (lib) getDev getLib getOutput;
in
backendStdenv.mkDerivation {
pname = "saxpy";
@ -36,9 +37,9 @@ backendStdenv.mkDerivation {
buildInputs =
lib.optionals (lib.versionOlder cudaVersion "11.4") [cudatoolkit]
++ lib.optionals (lib.versionAtLeast cudaVersion "11.4") [
libcublas.dev
libcublas.lib
libcublas.static
(getDev libcublas)
(getLib libcublas)
(getOutput "static" libcublas)
cuda_cudart
]
++ lib.optionals (lib.versionAtLeast cudaVersion "12.0") [cuda_cccl];
@ -50,10 +51,11 @@ backendStdenv.mkDerivation {
))
];
meta = {
meta = rec {
description = "A simple (Single-precision AX Plus Y) FindCUDAToolkit.cmake example for testing cross-compilation";
license = lib.licenses.mit;
maintainers = lib.teams.cuda.members;
platforms = lib.platforms.unix;
badPlatforms = lib.optionals flags.isJetsonBuild platforms;
};
}

View file

@ -53,7 +53,7 @@ final: _: {
autoAddCudaCompatRunpathHook =
final.callPackage
(
{makeSetupHook, cuda_compat ? throw "autoAddCudaCompatRunpathHook: No cuda_compat for CUDA ${final.cudaMajorMinorVersion}" }:
{makeSetupHook, cuda_compat ? null }:
makeSetupHook
{
name = "auto-add-cuda-compat-runpath-hook";
@ -61,7 +61,12 @@ final: _: {
# Hotfix Ofborg evaluation
libcudaPath = if final.flags.isJetsonBuild then "${cuda_compat}/compat" else null;
};
meta.broken = !final.flags.isJetsonBuild;
# Pre-cuda_compat CUDA release:
meta.badPlatforms = final.lib.optionals (cuda_compat == null) final.lib.platforms.all;
meta.platforms = cuda_compat.platforms or [ ];
}
./auto-add-cuda-compat-runpath.sh
)

View file

@ -44,6 +44,12 @@ stdenv.mkDerivation rec {
patches = [
./py_pybind11_no_external_download.patch
./install-presets.patch
# https://github.com/IntelRealSense/librealsense/pull/11917
(fetchpatch {
name = "fix-gcc13-missing-cstdint.patch";
url = "https://github.com/IntelRealSense/librealsense/commit/b59b13671658910fc453a4a6bbd61f13ba6e83cc.patch";
hash = "sha256-zaW8HG8rfsApI5S/3x+x9Fx8xhyTIPNn/fJVFtkmlEA=";
})
];
nativeBuildInputs = [

View file

@ -7,7 +7,7 @@
, asio
, nettle
, gnutls
, msgpack
, msgpack-cxx
, readline
, libargon2
, jsoncpp
@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
fmt
nettle
gnutls
msgpack
msgpack-cxx
readline
libargon2
] ++ lib.optionals enableProxyServerAndClient [

View file

@ -38,6 +38,14 @@ stdenv.mkDerivation {
hash = "sha256-1GjC2mdfP3NpePDWZaT8zvIq3vwWIZs+iQ9o01iQtD4=";
})
# A fix to the above series of patches, to fix a crash in lomiri-terminal-app
# Remove (and update the above fetchpatch) when https://github.com/gber/qmltermwidget/pull/1 merged
(fetchpatch {
name = "0002-qmltermwidget-Mark-ColorSchemeManager-singleton-as-C++-owned.patch";
url = "https://github.com/gber/qmltermwidget/commit/f3050bda066575eebdcff70fc1c3a393799e1d6d.patch";
hash = "sha256-O8fEpVLYMze6q4ps7RDGbNukRmZZBjLwqmvRqpp+H+Y=";
})
# Some files are copied twice to the output which makes the build fails
./do-not-copy-artifacts-twice.patch
];

View file

@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "aiosql";
version = "9.1";
version = "9.2";
pyproject = true;
disabled = pythonOlder "3.8";
@ -27,7 +27,7 @@ buildPythonPackage rec {
owner = "nackjicholson";
repo = "aiosql";
rev = "refs/tags/${version}";
hash = "sha256-xcrNnp3ZfWLbz+/77N3R5x7N2n7nPcw0khqaIeHn0+Y=";
hash = "sha256-x8ndLVIYAmixH4Fc1DIC1CK8ChYIPZc3b5VFdpT7JO8=";
};
sphinxRoot = "docs/source";
@ -48,7 +48,9 @@ buildPythonPackage rec {
pytestCheckHook
];
pythonImportsCheck = [ "aiosql" ];
pythonImportsCheck = [
"aiosql"
];
meta = with lib; {
description = "Simple SQL in Python";

View file

@ -8,14 +8,14 @@
buildPythonPackage rec {
pname = "asyncsleepiq";
version = "1.4.1";
version = "1.4.2";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-FDGNRBa45Q/L8468C3mZLEPduo9EpHWczO5z3Fe7Nwc=";
hash = "sha256-zvIEuPsko2CaImcdY55qwl+rAzrRT8gjLAovlpOR8Gk=";
};
nativeBuildInputs = [

View file

@ -365,14 +365,14 @@
buildPythonPackage rec {
pname = "boto3-stubs";
version = "1.34.18";
version = "1.34.19";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-6U+2eed5mRbhWekT9J3VyCRw3x0eVmx7Uj9wPi7VzsE=";
hash = "sha256-Z/5aL7HRssU0+jHFQ7dz7bwBzpUoAQ2cwO+cUESqIYo=";
};
nativeBuildInputs = [

View file

@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "botocore-stubs";
version = "1.34.18";
version = "1.34.19";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -17,7 +17,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "botocore_stubs";
inherit version;
hash = "sha256-xa+muzfKidf72yEJE5AxSFZqDyxg2a6hJW3adnIPF3E=";
hash = "sha256-3Rv/db/gpk5nBKjXToD5Shl41YyygQ91Sfocg6yORYw=";
};
nativeBuildInputs = [

View file

@ -15,14 +15,14 @@
buildPythonPackage rec {
pname = "google-cloud-datacatalog";
version = "3.17.0";
version = "3.17.2";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-xaKBfkgmhB7MH1qFWu9hjHIIVG1BjBgzjfnyD14V9Z0=";
hash = "sha256-kKRuakMZfmt2HrU7g4Ap1ZxFmYYSiRNKvRB/xHkyp1U=";
};
nativeBuildInputs = [

View file

@ -1,5 +1,6 @@
{ lib
, buildPythonPackage
, deprecated
, fetchPypi
, google-api-core
, google-cloud-core
@ -13,21 +14,27 @@
, pytestCheckHook
, pythonOlder
, sqlparse
, setuptools
}:
buildPythonPackage rec {
pname = "google-cloud-spanner";
version = "3.40.1";
format = "setuptools";
version = "3.41.0";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-YWsHyGza5seLrSe4qznYznonNRHyuR/iYPFw2SZlPC4=";
hash = "sha256-jK2hHdYdxwsEmk/aDp7ArXZwZbhEloqIuLJ2ZwMs9YI=";
};
nativeBuildInputs = [
setuptools
];
propagatedBuildInputs = [
deprecated
google-api-core
google-cloud-core
grpc-google-iam-v1

View file

@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "google-cloud-texttospeech";
version = "2.15.0";
version = "2.15.1";
format = "setuptools";
disabled = pythonOlder "3.8";
src = fetchPypi {
inherit pname version;
hash = "sha256-d4Y+1U94/NLhlMoRPJzF5+QLhzBszsG6MH5G3PgfBzc=";
hash = "sha256-R4ReOtnO/auvNYlHyxlt3eovqkzfyvhkoBHbghpN6vs=";
};
propagatedBuildInputs = [

View file

@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "iterative-telemtry";
version = "0.0.7";
version = "0.0.8";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "iterative";
repo = "telemetry-python";
rev = "refs/tags/${version}";
hash = "sha256-n67nc9a/Qrz2v1EYbHZb+pGhuMDqofUMpgfD/0BwqLM=";
hash = "sha256-jD1AyQTdz/NfTRpvEuTE/gUfgNIhNlnimuCks5ImhwA=";
};
nativeBuildInputs = [

View file

@ -7,12 +7,12 @@
buildPythonPackage rec {
pname = "ledgercomm";
version = "1.2.0";
version = "1.2.1";
format = "pyproject";
src = fetchPypi {
inherit pname version;
hash = "sha256-HunJjIRa3IpSL/3pZPf6CroLxEK/l7ihh737VOAILgU=";
hash = "sha256-AVz8BfFrjFn4zB2fwLiTWSPx/MOAbTPutrDgVbRPWpE=";
};
nativeBuildInputs = [

View file

@ -1,25 +1,30 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, isPy3k
, pytestCheckHook
, pytest-xdist
, pytestCheckHook
, pythonOlder
, setuptools
}:
buildPythonPackage rec {
pname = "librouteros";
version = "3.2.1";
format = "setuptools";
pyproject = true;
disabled = !isPy3k;
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "luqasz";
repo = pname;
rev = version;
repo = "librouteros";
rev = "refs/tags/${version}";
hash = "sha256-VwpZ1RY6Sul7xvWY7ZoOxZ7KgbRmKRwcVdF9e2b3f6Q=";
};
nativeBuildInputs = [
setuptools
];
nativeCheckInputs = [
pytest-xdist
pytestCheckHook
@ -33,6 +38,8 @@ buildPythonPackage rec {
"test_add_then_remove"
"test_add_then_update"
"test_generator_ditch"
# AttributeError: 'called_once_with' is not a valid assertion
"test_rawCmd_calls_writeSentence"
];
pythonImportsCheck = [
@ -42,6 +49,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Python implementation of the MikroTik RouterOS API";
homepage = "https://librouteros.readthedocs.io/";
changelog = "https://github.com/luqasz/librouteros/blob/${version}/CHANGELOG.rst";
license = with licenses; [ gpl2Only ];
maintainers = with maintainers; [ fab ];
};

View file

@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "locationsharinglib";
version = "5.0.2";
version = "5.0.3";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-ydwtcIJ2trQ6xg2r5kU/ogvjdBwUZhYhBdc6nBmSGcg=";
hash = "sha256-ar5/gyDnby0aceqqHe8lTQaHafOub+IPKglmct4xEGM=";
};
propagatedBuildInputs = [

View file

@ -15,11 +15,11 @@
buildPythonPackage rec {
pname = "mkdocs-macros-plugin";
version = "0.7.0";
version = "1.0.5";
src = fetchPypi {
inherit pname version;
sha256 = "sha256:0206cm0153vzp10c8a15bi2znisq5pv59zi9vrcm74pnpk5f2r4y";
sha256 = "sha256-/jSNdfAckR82K22ZjFez2FtQWHbd5p25JPLFEsOVwyg=";
};
propagatedBuildInputs = [

View file

@ -8,14 +8,14 @@
buildPythonPackage rec {
pname = "python-mpd2";
version = "3.1.0";
version = "3.1.1";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
hash = "sha256-8zws2w1rqnSjZyTzjBxKCZp84sjsSiu3GSFQpYVd9HY=";
hash = "sha256-S67DWEzEPtmUjVVZB5+vwmebBrKt4nPpCbNYJlSys/U=";
};
passthru.optional-dependencies = {

View file

@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "pyatmo";
version = "8.0.2";
version = "8.0.3";
pyproject = true;
disabled = pythonOlder "3.10";
@ -25,7 +25,7 @@ buildPythonPackage rec {
owner = "jabesq";
repo = "pyatmo";
rev = "refs/tags/v${version}";
hash = "sha256-AKpDXfNF2t/3F4SmMWIgfkxHgcJobYs225gIeJ31l6k=";
hash = "sha256-FnDXj+bY/TMdengnxgludXUTiZw9wpeFiNbWTIxrlzw=";
};
postPatch = ''

View file

@ -37,6 +37,7 @@ buildPythonPackage rec {
"test_03_usage"
# Test is assuming $CURRENT_YEAR is not a leap year
"test_19_frequency_at_month"
"test_20_frequency_at_year"
];
pythonImportsCheck = [

View file

@ -2,6 +2,7 @@
, buildPythonPackage
, fetchFromGitHub
, pythonOlder
, pythonRelaxDepsHook
, unasync
, poetry-core
, python
@ -33,10 +34,16 @@ buildPythonPackage rec {
};
nativeBuildInputs = [
pythonRelaxDepsHook
unasync
poetry-core
];
# it has not been maintained at all for a half year and some dependencies are outdated
# https://github.com/redis/redis-om-python/pull/554
# https://github.com/redis/redis-om-python/pull/577
pythonRelaxDeps = true;
propagatedBuildInputs = [
click
hiredis

View file

@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "scrap_engine";
version = "1.4.0";
version = "1.4.1";
src = fetchPypi {
inherit pname version;
hash = "sha256-5OlnBRFhjFAcVkuuKM5hpeRxi+uvjpzfdhp1+5Nx1IU=";
hash = "sha256-qxzbVYFcSKcL2HtMlH9epO/sCx9HckWAt/NyVD8QJBQ=";
};
nativeBuildInputs = [ setuptools-scm ];

View file

@ -0,0 +1,24 @@
From 3ae04e8b9be879cf25fb5b51a48c8a1263a4844d Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Mon, 15 Jan 2024 10:05:40 +0100
Subject: [PATCH] remove-illegal-name-from-extra-dependencies
---
setup.py | 1 +
1 file changed, 1 insertion(+)
diff --git a/setup.py b/setup.py
index 968c32d6..c98ee9f8 100755
--- a/setup.py
+++ b/setup.py
@@ -190,6 +190,7 @@ def _prepare_extras(skip_pattern: str = "^_", skip_files: Tuple[str] = ("base.tx
# create an 'all' keyword that install all possible dependencies
extras_req["all"] = list(chain([pkgs for k, pkgs in extras_req.items() if k not in ("_test", "_tests")]))
extras_req["dev"] = extras_req["all"] + extras_req["_tests"]
+ extras_req.pop("_tests")
return extras_req
--
2.42.0

View file

@ -26,6 +26,8 @@ buildPythonPackage {
inherit pname version;
pyproject = true;
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "Lightning-AI";
repo = "torchmetrics";
@ -33,7 +35,12 @@ buildPythonPackage {
hash = "sha256-xDUT9GSOn6ZNDFRsFws3NLxBsILKDHPKeEANwM8NXj8=";
};
disabled = pythonOlder "3.8";
patches = [
# The extra dependencies dictionary contains an illegally named entry '_tests'.
# The build fails because of this.
# Issue has been opened upstream: https://github.com/Lightning-AI/torchmetrics/issues/2305
./0001-remove-illegal-name-from-extra-dependencies.patch
];
propagatedBuildInputs = [
numpy

View file

@ -17,7 +17,7 @@
let
pname = "yabai";
version = "6.0.4";
version = "6.0.6";
test-version = testers.testVersion {
package = yabai;
@ -53,7 +53,7 @@ in
src = fetchzip {
url = "https://github.com/koekeishiya/yabai/releases/download/v${version}/yabai-v${version}.tar.gz";
hash = "sha256-gxQBZ/7I2TVjoG5a8ea2+W4OwI9pJFbGSbZzcL5JY4Q=";
hash = "sha256-G4BbYU4mgV8Jap8a872/YtoXU/hwUhFyLXdcuT1jldI=";
};
nativeBuildInputs = [
@ -89,7 +89,7 @@ in
owner = "koekeishiya";
repo = "yabai";
rev = "v${version}";
hash = "sha256-U2YGgfTfhpmiBiO+S6xpsLrgI+kVUYYGLGjt8KHcBrc=";
hash = "sha256-wqGYVUDEDkrLSr0IoAO17wbtwaDeainnkDeR8O8oFqc=";
};
nativeBuildInputs = [

View file

@ -3,6 +3,7 @@
, bazel-gazelle
, buildBazelPackage
, fetchFromGitHub
, fetchpatch
, stdenv
, cmake
, gn
@ -24,19 +25,25 @@ let
# However, the version string is more useful for end-users.
# These are contained in a attrset of their own to make it obvious that
# people should update both.
version = "1.27.1";
rev = "6b9db09c69965d5bfb37bdd29693f8b7f9e9e9ec";
version = "1.27.2";
rev = "ae07f9a11715245f7d25d2a13699c260c2ae8ebb";
hash = "sha256-VgP3st26Wkx51tTM++tKAZX7+BmPGgy1MIJFGLDu4JU=";
};
# these need to be updated for any changes to fetchAttrs
depsHash = {
x86_64-linux = "sha256-389CaxJ3F66eMID7+KgwzCdlT2QPOTkKPLnqpmM49ig=";
aarch64-linux = "sha256-ui7AUzWouAn2DZ7kUpp1huNxPGBqzKXqtwcuRZUhmqo=";
}.${stdenv.system} or (throw "unsupported system ${stdenv.system}");
in
buildBazelPackage rec {
buildBazelPackage {
pname = "envoy";
inherit (srcVer) version;
bazel = bazel_6;
src = fetchFromGitHub {
owner = "envoyproxy";
repo = "envoy";
inherit (srcVer) rev;
hash = "sha256-eZ3UCVqQbtK2GbawUVef5+BMSQbqe+owtwH+b887mQE=";
inherit (srcVer) hash rev;
postFetch = ''
chmod -R +w $out
@ -62,6 +69,12 @@ buildBazelPackage rec {
# use system C/C++ tools
./0003-nixpkgs-use-system-C-C-toolchains.patch
# bump proxy-wasm-cpp-host until > 1.27.2/1.28.0
(fetchpatch {
url = "https://github.com/envoyproxy/envoy/pull/31451.patch";
hash = "sha256-n8k7bho3B8Gm0dJbgf43kU7ymvo15aGJ2Twi2xR450g=";
})
];
nativeBuildInputs = [
@ -82,10 +95,7 @@ buildBazelPackage rec {
hardeningDisable = [ "format" ];
fetchAttrs = {
sha256 = {
x86_64-linux = "sha256-OQ4vg4S3DpM+Zo+igncx3AXJnL8FkJbwh7KnBhbnCUM=";
aarch64-linux = "sha256-/X8i1vzQ4QvFxi1+5rc1/CGHmRhhu5F3X5A3PgbW+Mc=";
}.${stdenv.system} or (throw "unsupported system ${stdenv.system}");
sha256 = depsHash;
dontUseCmakeConfigure = true;
dontUseGnConfigure = true;
preInstall = ''
@ -111,6 +121,9 @@ buildBazelPackage rec {
# Remove Unix timestamps from go cache.
rm -rf $bazelOut/external/bazel_gazelle_go_repository_cache/{gocache,pkg/mod/cache,pkg/sumdb}
# fix tcmalloc failure https://github.com/envoyproxy/envoy/issues/30838
sed -i '/TCMALLOC_GCC_FLAGS = \[/a"-Wno-changes-meaning",' $bazelOut/external/com_github_google_tcmalloc/tcmalloc/copts.bzl
'';
};
buildAttrs = {

View file

@ -31,10 +31,10 @@
}:
let
version = "2.48.1";
version = "2.49.0";
webUiStatic = fetchurl {
url = "https://github.com/prometheus/prometheus/releases/download/v${version}/prometheus-web-ui-${version}.tar.gz";
hash = "sha256-8by9sz0EtiVuyoXR32h4++Fy01CyO8DfcsqPK3pSWHc=";
hash = "sha256-VchnXJ+WBHDywjwXtsT4q8CZLnGHkMbcU7MpShe5d78=";
};
in
buildGoModule rec {
@ -47,10 +47,10 @@ buildGoModule rec {
owner = "prometheus";
repo = "prometheus";
rev = "v${version}";
hash = "sha256-9vdbjqmIaomg0acWguWELIxmEZ9jVXYvFlAF+Uo3dMw=";
hash = "sha256-l8gjOrDCQbglXc3wVvN4BriW9qw9sPVXmlYr6VVRXas=";
};
vendorHash = "sha256-OHTmAfhN+aPOJAIweW+GuvN2lNn2A+JeVU8chT1hqLU=";
vendorHash = "sha256-fDT7YrnUfS93yseo+1mLrSGPBewm7CpcHPCz1kxM6Uo=";
excludedPackages = [ "documentation/prometheus-mixin" ];

View file

@ -1,32 +1,51 @@
{callPackage}:
{
lib,
recurseIntoAttrs,
rec {
cuda-samplesPackages = callPackage ./cuda-samples/generic.nix {};
inherit (cuda-samplesPackages)
cuda-samples_cudatoolkit_10
cuda-samples_cudatoolkit_10_0
cuda-samples_cudatoolkit_10_1
cuda-samples_cudatoolkit_10_2
cuda-samples_cudatoolkit_11
cuda-samples_cudatoolkit_11_0
cuda-samples_cudatoolkit_11_1
cuda-samples_cudatoolkit_11_2
cuda-samples_cudatoolkit_11_3
cuda-samples_cudatoolkit_11_4
;
cudaPackages,
cudaPackagesGoogle,
cuda-library-samplesPackages = callPackage ./cuda-library-samples/generic.nix {};
inherit (cuda-library-samplesPackages)
cuda-library-samples_cudatoolkit_10
cuda-library-samples_cudatoolkit_10_1
cuda-library-samples_cudatoolkit_10_2
cuda-library-samples_cudatoolkit_11
cuda-library-samples_cudatoolkit_11_0
cuda-library-samples_cudatoolkit_11_1
cuda-library-samples_cudatoolkit_11_2
cuda-library-samples_cudatoolkit_11_3
cuda-library-samples_cudatoolkit_11_4
;
cudaPackages_10_0,
cudaPackages_10_1,
cudaPackages_10_2,
cudaPackages_10,
__attrsFailEvaluation = true;
}
cudaPackages_11_0,
cudaPackages_11_1,
cudaPackages_11_2,
cudaPackages_11_3,
cudaPackages_11_4,
cudaPackages_11_5,
cudaPackages_11_6,
cudaPackages_11_7,
cudaPackages_11_8,
cudaPackages_11,
cudaPackages_12_0,
cudaPackages_12_1,
cudaPackages_12_2,
cudaPackages_12_3,
cudaPackages_12,
}@args:
let
isTest =
name: package:
builtins.elem (package.pname or null) [
"cuda-samples"
"cuda-library-samples"
"saxpy"
];
in
(lib.trivial.pipe args [
(lib.filterAttrs (name: _: lib.hasPrefix "cudaPackages" name))
(lib.mapAttrs (
_: ps:
lib.pipe ps [
(lib.filterAttrs isTest)
(as: as // { __attrsFailEvaluation = true; })
recurseIntoAttrs
]
))
recurseIntoAttrs
])

View file

@ -2,6 +2,7 @@
, callPackage
, python3Packages
, fetchFromGitHub
, installShellFiles
, platformio
, esptool
, git
@ -10,7 +11,7 @@
let
python = python3Packages.python.override {
packageOverrides = self: super: {
esphome-dashboard = self.callPackage ./dashboard.nix {};
esphome-dashboard = self.callPackage ./dashboard.nix { };
};
};
in
@ -28,6 +29,8 @@ python.pkgs.buildPythonApplication rec {
nativeBuildInputs = with python.pkgs; [
setuptools
argcomplete
installShellFiles
];
postPatch = ''
@ -98,9 +101,20 @@ python.pkgs.buildPythonApplication rec {
$out/bin/esphome --help > /dev/null
'';
postInstall =
let
argcomplete = lib.getExe' python3Packages.argcomplete "register-python-argcomplete";
in
''
installShellCompletion --cmd esphome \
--bash <(${argcomplete} --shell bash esphome) \
--zsh <(${argcomplete} --shell zsh esphome) \
--fish <(${argcomplete} --shell fish esphome)
'';
passthru = {
dashboard = python.pkgs.esphome-dashboard;
updateScript = callPackage ./update.nix {};
updateScript = callPackage ./update.nix { };
};
meta = with lib; {

View file

@ -17,16 +17,16 @@
rustPlatform.buildRustPackage rec {
pname = "mise";
version = "2024.1.11";
version = "2024.1.20";
src = fetchFromGitHub {
owner = "jdx";
repo = "mise";
rev = "v${version}";
hash = "sha256-ELC+IpcWMHBDIGPAg8v1LJUUIXEmzJzCeJt2TkqXs7s=";
hash = "sha256-4KyvqxM7QpszTGIzSrd0nrnO1yk/hkjmbRqVzzlMuYI=";
};
cargoHash = "sha256-hZ8B3CVaTpIt3GudN/TWxI/xox724Prk8Uc8wA3Wd6Q=";
cargoHash = "sha256-Mq9uN0pztH5DwVCPNtl58zDPZtyWBsoTTMriUK6w8iI=";
nativeBuildInputs = [ installShellFiles pkg-config ];
buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ];

View file

@ -5,17 +5,17 @@
rustPlatform.buildRustPackage rec {
pname = "pokeget-rs";
version = "1.4.0";
version = "1.4.2";
src = fetchFromGitHub {
owner = "talwat";
repo = "pokeget-rs";
rev = version;
hash = "sha256-C7pEe9nScJ/ORJJrUDo6pADKceKoagHGP/X/asR1PcM=";
hash = "sha256-++MD7XYWJ4Oim/VSYSisu/DwazOEfQ4CJNLfR5sjP3M=";
fetchSubmodules = true;
};
cargoHash = "sha256-gPPtVFSaaSL0QBXxHpslVdon3XVCVx1E5cfEP1Ffa9g=";
cargoHash = "sha256-lWImtmtoo3ujbHvaeijuVjt0NQhdp+mxuu8oxNutr2E=";
meta = with lib; {
description = "A better rust version of pokeget";

View file

@ -106,8 +106,8 @@ let
shimsFn = ../development/cuda-modules/tensorrt/shims.nix;
fixupFn = ../development/cuda-modules/tensorrt/fixup.nix;
})
(callPackage ../test/cuda/cuda-samples/extension.nix {inherit cudaVersion;})
(callPackage ../test/cuda/cuda-library-samples/extension.nix {})
(callPackage ../development/cuda-modules/cuda-samples/extension.nix {inherit cudaVersion;})
(callPackage ../development/cuda-modules/cuda-library-samples/extension.nix {})
];
cudaPackages = customisation.makeScope newScope (