BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge staging-next into staging

Browse source
This commit is contained in:
github-actions[bot] 2023-04-04 06:01:40 +00:00 committed by GitHub
commit 0c95c3ea6b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
37 changed files with 181 additions and 145 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
nixos/modules/services/databases/neo4j.nix
View file

@ -636,6 +636,6 @@ in {
};
meta = {
maintainers = with lib.maintainers; [ patternspandemic jonringer erictapen ];
maintainers = with lib.maintainers; [ patternspandemic jonringer ];
};
}

2
nixos/modules/services/networking/unifi.nix
View file

@ -194,5 +194,5 @@ in
(mkRenamedOptionModule [ "services" "unifi" "openPorts" ] [ "services" "unifi" "openFirewall" ])
];
meta.maintainers = with lib.maintainers; [ erictapen pennae ];
meta.maintainers = with lib.maintainers; [ pennae ];
}

52
pkgs/applications/audio/proteus/default.nix Normal file
View file

@ -0,0 +1,52 @@
{ lib, stdenv, fetchFromGitHub, autoPatchelfHook, cmake, pkg-config
, alsa-lib, freetype, libjack2
, libX11, libXext, libXcursor, libXinerama, libXrandr, libXrender
}:
stdenv.mkDerivation rec {
pname = "proteus";
version = "1.2";
src = fetchFromGitHub {
owner = "GuitarML";
repo = "Proteus";
rev = "v${version}";
fetchSubmodules = true;
hash = "sha256-WhJh+Sx64JYxQQ1LXpDUwXeodFU1EZ0TmMhn+6w0hQg=";
};
nativeBuildInputs = [ autoPatchelfHook cmake pkg-config ];
buildInputs = [
alsa-lib freetype libjack2
libX11 libXext libXcursor libXinerama libXrandr libXrender
];
# JUCE loads most dependencies at runtime:
runtimeDependencies = map lib.getLib buildInputs;
env.NIX_CFLAGS_COMPILE = toString [
# Support JACK output in the standalone application:
"-DJUCE_JACK"
# Accomodate -flto:
"-ffat-lto-objects"
];
# The default "make install" only installs JUCE, which should not be installed, and does not install proteus.
installPhase = ''
runHook preInstall
mkdir -p $out/lib
cp -rT Proteus_artefacts/*/Standalone $out/bin
cp -rT Proteus_artefacts/*/LV2 $out/lib/lv2
cp -rT Proteus_artefacts/*/VST3 $out/lib/vst3
runHook postInstall
'';
meta = with lib; {
description = "Guitar amp and pedal capture plugin using neural networks";
homepage = "https://github.com/GuitarML/Proteus";
license = licenses.gpl3;
platforms = platforms.linux;
maintainers = with maintainers; [ orivej ];
};
}

2
pkgs/applications/gis/qgis/unwrapped-ltr.nix
View file

@ -157,6 +157,6 @@ in mkDerivation rec {
homepage = "https://www.qgis.org";
license = lib.licenses.gpl2Plus;
platforms = with lib.platforms; linux;
maintainers = with lib.maintainers; [ lsix sikmir erictapen willcohen ];
maintainers = with lib.maintainers; [ lsix sikmir willcohen ];
};
}

2
pkgs/applications/gis/qgis/unwrapped.nix
View file

@ -157,6 +157,6 @@ in mkDerivation rec {
homepage = "https://www.qgis.org";
license = lib.licenses.gpl2Plus;
platforms = with lib.platforms; linux;
maintainers = with lib.maintainers; [ lsix sikmir erictapen willcohen ];
maintainers = with lib.maintainers; [ lsix sikmir willcohen ];
};
}

2
pkgs/applications/networking/instant-messengers/discord/default.nix
View file

@ -49,7 +49,7 @@ let
downloadPage = "https://discordapp.com/download";
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
license = licenses.unfree;
maintainers = with maintainers; [ MP2E devins2518 artturin infinidoge ];
maintainers = with maintainers; [ MP2E artturin infinidoge ];
platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ];
};
package =

2
pkgs/applications/networking/instant-messengers/signal-cli/default.nix
View file

@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/AsamK/signal-cli";
description = "Command-line and dbus interface for communicating with the Signal messaging service";
license = licenses.gpl3;
maintainers = with maintainers; [ ivan erictapen ];
maintainers = with maintainers; [ ivan ];
platforms = platforms.all;
};
}

2
pkgs/applications/networking/mailreaders/meli/default.nix
View file

@ -53,7 +53,7 @@ rustPlatform.buildRustPackage rec {
description = "Experimental terminal mail client aiming for configurability and extensibility with sane defaults";
homepage = "https://meli.delivery";
license = licenses.gpl3;
maintainers = with maintainers; [ _0x4A6F matthiasbeyer erictapen ];
maintainers = with maintainers; [ _0x4A6F matthiasbeyer ];
platforms = platforms.linux;
};
}

1
pkgs/applications/office/wpsoffice/default.nix
View file

@ -101,6 +101,7 @@ stdenv.mkDerivation rec {
description = "Office suite, formerly Kingsoft Office";
homepage = "https://www.wps.com";
platforms = [ "x86_64-linux" ];
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
hydraPlatforms = [ ];
license = licenses.unfreeRedistributable;
maintainers = with maintainers; [ mlatus th0rgal rewine ];

71
pkgs/applications/virtualization/nvidia-container-runtime/default.nix
View file

@ -1,71 +0,0 @@
{ lib
, glibc
, fetchFromGitHub
, makeWrapper
, buildGoPackage
, linkFarm
, writeShellScript
, containerRuntimePath
, configTemplate
}:
let
isolatedContainerRuntimePath = linkFarm "isolated_container_runtime_path" [
{
name = "runc";
path = containerRuntimePath;
}
];
warnIfXdgConfigHomeIsSet = writeShellScript "warn_if_xdg_config_home_is_set" ''
set -eo pipefail
if [ -n "$XDG_CONFIG_HOME" ]; then
echo >&2 "$(tput setaf 3)warning: \$XDG_CONFIG_HOME=$XDG_CONFIG_HOME$(tput sgr 0)"
fi
'';
in
buildGoPackage rec {
pname = "nvidia-container-runtime";
version = "3.5.0";
src = fetchFromGitHub {
owner = "NVIDIA";
repo = pname;
rev = "v${version}";
sha256 = "sha256-+LZjsN/tKqsPJamoI8xo9LFv14c3e9vVlSP4NJhElcs=";
};
goPackagePath = "github.com/nvidia/nvidia-container-runtime";
ldflags = [ "-s" "-w" ];
nativeBuildInputs = [ makeWrapper ];
postInstall = ''
mkdir -p $out/etc/nvidia-container-runtime
# nvidia-container-runtime invokes docker-runc or runc if that isn't
# available on PATH.
#
# Also set XDG_CONFIG_HOME if it isn't already to allow overriding
# configuration. This in turn allows users to have the nvidia container
# runtime enabled for any number of higher level runtimes like docker and
# podman, i.e., there's no need to have mutually exclusivity on what high
# level runtime can enable the nvidia runtime because each high level
# runtime has its own config.toml file.
wrapProgram $out/bin/nvidia-container-runtime \
--run "${warnIfXdgConfigHomeIsSet}" \
--prefix PATH : ${isolatedContainerRuntimePath} \
--set-default XDG_CONFIG_HOME $out/etc
cp ${configTemplate} $out/etc/nvidia-container-runtime/config.toml
substituteInPlace $out/etc/nvidia-container-runtime/config.toml \
--subst-var-by glibcbin ${lib.getBin glibc}
'';
meta = with lib; {
homepage = "https://github.com/NVIDIA/nvidia-container-runtime";
description = "NVIDIA container runtime";
license = licenses.asl20;
platforms = platforms.linux;
maintainers = with maintainers; [ cpcloud ];
};
}

76
pkgs/applications/virtualization/nvidia-container-toolkit/default.nix
View file

@ -1,35 +1,83 @@
{ lib
, fetchFromGitHub
, buildGoModule
, glibc
, fetchFromGitLab
, makeWrapper
, nvidia-container-runtime
, buildGoPackage
, linkFarm
, writeShellScript
, containerRuntimePath
, configTemplate
, libnvidia-container
}:
buildGoModule rec {
pname = "nvidia-container-toolkit";
version = "1.5.0";
let
isolatedContainerRuntimePath = linkFarm "isolated_container_runtime_path" [
{
name = "runc";
path = containerRuntimePath;
}
];
warnIfXdgConfigHomeIsSet = writeShellScript "warn_if_xdg_config_home_is_set" ''
set -eo pipefail
src = fetchFromGitHub {
owner = "NVIDIA";
if [ -n "$XDG_CONFIG_HOME" ]; then
echo >&2 "$(tput setaf 3)warning: \$XDG_CONFIG_HOME=$XDG_CONFIG_HOME$(tput sgr 0)"
fi
'';
in
buildGoPackage rec {
pname = "container-toolkit/container-toolkit";
version = "1.9.0";
src = fetchFromGitLab {
owner = "nvidia";
repo = pname;
rev = "v${version}";
sha256 = "sha256-YvwqnwYOrlSE6PmNNZ5xjEaEcXdHKcakIwua+tOvIJ0=";
sha256 = "sha256-b4mybNB5FqizFTraByHk5SCsNO66JaISj18nLgLN7IA=";
};
vendorSha256 = "17zpiyvf22skfcisflsp6pn56y6a793jcx89kw976fq2x5br1bz7";
goPackagePath = "github.com/NVIDIA/nvidia-container-toolkit";
ldflags = [ "-s" "-w" ];
nativeBuildInputs = [ makeWrapper ];
preBuild = ''
# replace the default hookDefaultFilePath to the $out path
substituteInPlace go/src/github.com/NVIDIA/nvidia-container-toolkit/cmd/nvidia-container-runtime/main.go \
--replace '/usr/bin/nvidia-container-runtime-hook' '${placeholder "out"}/bin/nvidia-container-runtime-hook'
'';
postInstall = ''
mv $out/bin/{pkg,${pname}}
mkdir -p $out/etc/nvidia-container-runtime
# nvidia-container-runtime invokes docker-runc or runc if that isn't
# available on PATH.
#
# Also set XDG_CONFIG_HOME if it isn't already to allow overriding
# configuration. This in turn allows users to have the nvidia container
# runtime enabled for any number of higher level runtimes like docker and
# podman, i.e., there's no need to have mutually exclusivity on what high
# level runtime can enable the nvidia runtime because each high level
# runtime has its own config.toml file.
wrapProgram $out/bin/nvidia-container-runtime \
--run "${warnIfXdgConfigHomeIsSet}" \
--prefix PATH : ${isolatedContainerRuntimePath}:${libnvidia-container}/bin \
--set-default XDG_CONFIG_HOME $out/etc
cp ${configTemplate} $out/etc/nvidia-container-runtime/config.toml
substituteInPlace $out/etc/nvidia-container-runtime/config.toml \
--subst-var-by glibcbin ${lib.getBin glibc}
ln -s $out/bin/nvidia-container-{toolkit,runtime-hook}
wrapProgram $out/bin/nvidia-container-toolkit \
--add-flags "-config ${nvidia-container-runtime}/etc/nvidia-container-runtime/config.toml"
--add-flags "-config ${placeholder "out"}/etc/nvidia-container-runtime/config.toml"
'';
meta = with lib; {
homepage = "https://github.com/NVIDIA/nvidia-container-toolkit";
description = "NVIDIA container runtime hook";
homepage = "https://gitlab.com/nvidia/container-toolkit/container-toolkit";
description = "NVIDIA Container Toolkit";
license = licenses.asl20;
platforms = platforms.linux;
maintainers = with maintainers; [ cpcloud ];

3
pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
View file

@ -192,9 +192,6 @@ package-maintainers:
- vulkan-utils
erictapen:
- hakyll
- hakyll-contrib-hyphenation
- webify
- squeal-postgresql
Gabriel439:
- annah
- bench

2
pkgs/development/libraries/libassuan/default.nix
View file

@ -38,6 +38,6 @@ stdenv.mkDerivation rec {
homepage = "http://gnupg.org";
license = licenses.lgpl2Plus;
platforms = platforms.all;
maintainers = [ maintainers.erictapen ];
maintainers = [ ];
};
}

2
pkgs/development/libraries/libepoxy/default.nix
View file

@ -73,7 +73,7 @@ stdenv.mkDerivation rec {
description = "A library for handling OpenGL function pointer management";
homepage = "https://github.com/anholt/libepoxy";
license = licenses.mit;
maintainers = with maintainers; [ goibhniu erictapen ];
maintainers = with maintainers; [ goibhniu ];
platforms = platforms.unix;
};
}

1
pkgs/development/libraries/libviperfx/default.nix
View file

@ -26,5 +26,6 @@ stdenv.mkDerivation rec {
license = licenses.unfreeRedistributable;
maintainers = with maintainers; [ rewine ];
platforms = [ "x86_64-linux" ];
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
};
}

2
pkgs/development/libraries/mapnik/default.nix
View file

@ -103,7 +103,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "An open source toolkit for developing mapping applications";
homepage = "https://mapnik.org";
maintainers = with maintainers; [ hrdinka erictapen ];
maintainers = with maintainers; [ hrdinka ];
license = licenses.lgpl21Plus;
platforms = platforms.all;
};

4
pkgs/development/python-modules/adafruit-platformdetect/default.nix
View file

@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "adafruit-platformdetect";
version = "3.42.0";
version = "3.43.0";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -15,7 +15,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "Adafruit-PlatformDetect";
inherit version;
hash = "sha256-nFpPJKQv7UNsza1PAcTsZNVp9nFVa/pHlvNRVM4UIUY=";
hash = "sha256-7JsdHeYjPSXGdnvs67haOYqX+le+RmivfXPtxDT6BJ8=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;

4
pkgs/development/python-modules/django-auth-ldap/default.nix
View file

@ -17,14 +17,14 @@
buildPythonPackage rec {
pname = "django-auth-ldap";
version = "4.1.0";
version = "4.2.0";
format = "pyproject";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
hash = "sha256-d/dJ07F4B86OtWqcnI5XRv8xZWf4HVumE0ldnHSVqUk=";
hash = "sha256-qsceZbCovc/FzQi3CZfuPNw3eG/9XZdbfiz6R1ldQn8=";
};
nativeBuildInputs = [

4
pkgs/development/python-modules/easyenergy/default.nix
View file

@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "easyenergy";
version = "0.2.3";
version = "0.3.0";
format = "pyproject";
disabled = pythonOlder "3.9";
@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "klaasnicolaas";
repo = "python-easyenergy";
rev = "refs/tags/v${version}";
hash = "sha256-xDrfOiAAH6qD7qv0ERlQDJ2+CXJiHgvNhxbSlbhpdtw=";
hash = "sha256-J+iWmbuaEErrMxF62rf/L8Rkqo7/7RDXv0CmIuywbjI=";
};
postPatch = ''

4
pkgs/development/python-modules/faraday-plugins/default.nix
View file

@ -17,7 +17,7 @@
buildPythonPackage rec {
pname = "faraday-plugins";
version = "1.10.0";
version = "1.11.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -26,7 +26,7 @@ buildPythonPackage rec {
owner = "infobyte";
repo = "faraday_plugins";
rev = "refs/tags/${version}";
hash = "sha256-bVuysEr8VVFgA4OZ7N7UlL2FigbyLVyPr1HHwkshSMU=";
hash = "sha256-rbmD+UeMzsccYq7AzANziUZCgKtShRe/fJersODMrF8=";
};
postPatch = ''

4
pkgs/development/python-modules/fastapi-mail/default.nix
View file

@ -19,7 +19,7 @@
buildPythonPackage rec {
pname = "fastapi-mail";
version = "1.2.6";
version = "1.2.7";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -28,7 +28,7 @@ buildPythonPackage rec {
owner = "sabuhish";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-PL/0swFiAG8HlvxnsEqwEEec1CIsA3qFer3LKyS2y/Y=";
hash = "sha256-zZjC8tNM6rjpgbMw4MHPVr1UOEhjlgCFcZMvSDmKfzs=";
};
postPatch = ''

2
pkgs/development/python-modules/jupyterhub-systemdspawner/default.nix
View file

@ -45,6 +45,6 @@ buildPythonPackage rec {
description = "JupyterHub Spawner using systemd for resource isolation";
homepage = "https://github.com/jupyterhub/systemdspawner";
license = licenses.bsd3;
maintainers = with maintainers; [ costrouc erictapen ];
maintainers = with maintainers; [ costrouc ];
};
}

2
pkgs/development/python-modules/nbclient/default.nix
View file

@ -68,7 +68,7 @@ let nbclient = buildPythonPackage rec {
homepage = "https://github.com/jupyter/nbclient";
description = "A client library for executing notebooks";
license = licenses.bsd3;
maintainers = [ maintainers.erictapen ];
maintainers = [ ];
};
};
in nbclient

2
pkgs/development/python-modules/osmpythontools/default.nix
View file

@ -55,6 +55,6 @@ buildPythonPackage rec {
homepage = "https://github.com/mocnik-science/osm-python-tools";
license = licenses.gpl3Only;
changelog = "https://raw.githubusercontent.com/mocnik-science/osm-python-tools/v${version}/version-history.md";
maintainers = with maintainers; [ das-g erictapen ];
maintainers = with maintainers; [ das-g ];
};
}

1
pkgs/development/python-modules/psycopg/default.nix
View file

@ -148,7 +148,6 @@ buildPythonPackage rec {
propagatedBuildInputs = [
psycopg-c
] ++ lib.optionals (pythonOlder "3.11") [
typing-extensions
] ++ lib.optionals (pythonOlder "3.9") [
backports-zoneinfo

2
pkgs/development/python-modules/python-louvain/default.nix
View file

@ -35,6 +35,6 @@ buildPythonPackage rec {
homepage = "https://github.com/taynaud/python-louvain";
description = "Louvain Community Detection";
license = licenses.bsd3;
maintainers = with maintainers; [ erictapen ];
maintainers = with maintainers; [ ];
};
}

2
pkgs/development/python-modules/python-mapnik/default.nix
View file

@ -134,7 +134,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Python bindings for Mapnik";
maintainers = with maintainers; [ erictapen ];
maintainers = with maintainers; [ ];
homepage = "https://mapnik.org";
license = licenses.lgpl21Plus;
};

2
pkgs/development/python-modules/pyvis/default.nix
View file

@ -38,6 +38,6 @@ buildPythonPackage rec {
homepage = "https://github.com/WestHealth/pyvis";
description = "Python package for creating and visualizing interactive network graphs";
license = licenses.bsd3;
maintainers = with maintainers; [ erictapen ];
maintainers = with maintainers; [ ];
};
}

2
pkgs/development/python-modules/tlslite-ng/default.nix
View file

@ -19,7 +19,7 @@ buildPythonPackage rec {
description = "Pure python implementation of SSL and TLS.";
homepage = "https://pypi.python.org/pypi/tlslite-ng";
license = licenses.lgpl2;
maintainers = [ maintainers.erictapen ];
maintainers = [ ];
};
}

4
pkgs/development/python-modules/xiaomi-ble/default.nix
View file

@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "xiaomi-ble";
version = "0.16.4";
version = "0.17.0";
format = "pyproject";
disabled = pythonOlder "3.9";
@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "Bluetooth-Devices";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-ye/BuVKLNSC0zJzDyuairbrmZgQ+sX0y9bHWEfb/MJE=";
hash = "sha256-sXmwLXbFNckw9lCZ4V5hyZyDnStTp2x4InmoBz3c++w=";
};
nativeBuildInputs = [

4
pkgs/development/tools/database/dbmate/default.nix
View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "dbmate";
version = "2.1.0";
version = "2.2.0";
src = fetchFromGitHub {
owner = "amacneil";
repo = "dbmate";
rev = "v${version}";
sha256 = "sha256-yqxFty6nguYpl/7HYuLLUAkKrxD4ICg5bh+StEocL7s=";
sha256 = "sha256-K81AyhQfM1hBoA1gpU1MdcdkUnn2YKyig+fExVsMwMI=";
};
vendorHash = "sha256-NZ2HVFViU8Vzwyo33cueNJwdCT4exZlB7g4WgoWKZBE=";

7
pkgs/development/tools/language-servers/beancount-language-server/default.nix
View file

@ -5,16 +5,16 @@
rustPlatform.buildRustPackage rec {
pname = "beancount-language-server";
version = "1.3.0";
version = "1.3.1";
src = fetchFromGitHub {
owner = "polarmutex";
repo = "beancount-language-server";
rev = "v${version}";
sha256 = "sha256-X3Mun5ZooipUkkcgEOC7ou0d1upABjmMs9MegPBXPyQ=";
hash = "sha256-9IkbEOG6xcmpowsLj/RHnMFGQxh02JMQsTVli4hvs/M=";
};
cargoHash = "sha256-OI/MGcFOJHEZJfqCz/+CxHB3VSn6joS7L7FqRYrS4us=";
cargoHash = "sha256-qhN2//hhCaKpm0HAiUL/CfdrtvAXgR34vXBECB8UDxE=";
doInstallCheck = true;
postInstallCheck = ''
@ -28,4 +28,3 @@ rustPlatform.buildRustPackage rec {
maintainers = with maintainers; [ polarmutex ];
};
}

4
pkgs/os-specific/linux/apfs/default.nix
View file

@ -6,7 +6,7 @@
}:
let
tag = "0.3.0";
tag = "0.3.1";
in
stdenv.mkDerivation {
pname = "apfs";
@ -16,7 +16,7 @@ stdenv.mkDerivation {
owner = "linux-apfs";
repo = "linux-apfs-rw";
rev = "v${tag}";
sha256 = "sha256-ABFqkiIJuFapFsUIFHfw8+TujePZm7ZX/qHuFO2KdnQ=";
sha256 = "sha256-KYPZsCAEqJl0VjV/TmJWi20Y7yApIJH0YMwQIL80Ep4=";
};
hardeningDisable = [ "pic" ];

12
pkgs/servers/mail/vsmtp/default.nix
View file

@ -8,19 +8,25 @@
rustPlatform.buildRustPackage rec {
pname = "vsmtp";
version = "2.1.1";
version = "2.2.1";
src = fetchFromGitHub {
owner = "viridIT";
repo = "vsmtp";
rev = "v${version}";
hash = "sha256-iyjtSeus1gctylYfXAEqpwZNPg/KU/lXv82Wi0h5mAM=";
hash = "sha256-dRw5Q6bejaAJCnoR9j2wBU+L+p1pk1Tnxtm0WcRyOaY=";
};
cargoHash = "sha256-N4cxAFAFtYnd1/wdomm0VYosDY5uy+0z9pRGThSMbG4=";
cargoHash = "sha256-RYHn9kZZApgXWTExAHl9ZnCsuvqnnb67unmvd4Pnwz0=";
nativeBuildInputs = [ installShellFiles ];
buildFeatures = [
"telemetry"
"journald"
"syslog"
];
# tests do not run well in the nix sandbox
doCheck = false;

2
pkgs/servers/unifi/default.nix
View file

@ -38,7 +38,7 @@ let
sourceProvenance = with sourceTypes; [ binaryBytecode ];
license = licenses.unfree;
platforms = platforms.unix;
maintainers = with maintainers; [ erictapen globin patryk27 pennae ];
maintainers = with maintainers; [ globin patryk27 pennae ];
};
});

20
pkgs/shells/fish/plugins/fzf-fish.nix
View file

@ -1,31 +1,35 @@
{ lib, stdenv, buildFishPlugin, fetchFromGitHub, fd, fzf, util-linux, clownfish, fishtape_3 }:
{ lib, stdenv, pkgs, buildFishPlugin, fetchFromGitHub, fd, util-linux, procps, clownfish, fishtape_3, }:
let
# we want `pkgs.fzf`, not `fishPlugins.fzf`
inherit (pkgs) fzf;
in
buildFishPlugin rec {
pname = "fzf.fish";
version = "9.2";
version = "9.7";
src = fetchFromGitHub {
owner = "PatrickF1";
repo = "fzf.fish";
rev = "v${version}";
sha256 = "sha256-XmRGe39O3xXmTvfawwT2mCwLIyXOlQm7f40mH5tzz+s=";
sha256 = "sha256-haNSqXJzLL3JGvD4JrASVmhLJz6i9lna6/EdojXdFOo=";
};
nativeCheckInputs = [ fzf fd util-linux ];
nativeCheckInputs = [ fzf fd util-linux procps ];
checkPlugins = [ clownfish fishtape_3 ];
checkFunctionDirs = [ "./functions" ];
checkPhase = ''
# Disable git tests which inspect the project's git repo, which isn't
# possible since we strip the impure .git from our build input
rm -r tests/*git*
rm -r tests/preview_changed_file/modified_path_with_spaces.fish
rm -r tests/preview_changed_file/renamed_path_modifications.fish
# Disable tests that are failing, probably because of our wrappers
rm -r tests/configure_bindings
rm -r tests/search_shell_variables
rm -r tests/search_variables
# Disable tests that are failing, because there is not 'rev' command
rm tests/preview_file/custom_file_preview.fish
'' + (
if stdenv.isDarwin then ''script /dev/null fish -c "fishtape tests/*/*.fish"''
else ''script -c 'fish -c "fishtape tests/*/*.fish"' ''
@ -35,6 +39,6 @@ buildFishPlugin rec {
description = "Augment your fish command line with fzf key bindings";
homepage = "https://github.com/PatrickF1/fzf.fish";
license = licenses.mit;
maintainers = with maintainers; [ pacien ];
maintainers = with maintainers; [ pacien natsukium ];
};
}

14
pkgs/top-level/all-packages.nix
View file

@ -22777,17 +22777,15 @@ with pkgs;
mkNvidiaContainerPkg = { name, containerRuntimePath, configTemplate, additionalPaths ? [] }:
let
nvidia-container-runtime = callPackage ../applications/virtualization/nvidia-container-runtime {
inherit containerRuntimePath configTemplate;
nvidia-container-toolkit = callPackage ../applications/virtualization/nvidia-container-toolkit {
inherit containerRuntimePath configTemplate libnvidia-container;
};
libnvidia-container =(callPackage ../applications/virtualization/libnvidia-container { });
in symlinkJoin {
inherit name;
paths = [
(callPackage ../applications/virtualization/libnvidia-container { })
nvidia-container-runtime
(callPackage ../applications/virtualization/nvidia-container-toolkit {
inherit nvidia-container-runtime;
})
libnvidia-container
nvidia-container-toolkit
] ++ additionalPaths;
};
@ -33064,6 +33062,8 @@ with pkgs;
properties-cpp = callPackage ../development/libraries/properties-cpp { };
proteus = callPackage ../applications/audio/proteus { };
protonmail-bridge = callPackage ../applications/networking/protonmail-bridge {
buildGoModule = buildGo119Module; # go 1.20 build failure
};