diff --git a/nixos/modules/services/databases/neo4j.nix b/nixos/modules/services/databases/neo4j.nix index d78ff8390e4..09050242402 100644 --- a/nixos/modules/services/databases/neo4j.nix +++ b/nixos/modules/services/databases/neo4j.nix @@ -636,6 +636,6 @@ in { }; meta = { - maintainers = with lib.maintainers; [ patternspandemic jonringer erictapen ]; + maintainers = with lib.maintainers; [ patternspandemic jonringer ]; }; } diff --git a/nixos/modules/services/networking/unifi.nix b/nixos/modules/services/networking/unifi.nix index 91eb385518c..73adf5572b3 100644 --- a/nixos/modules/services/networking/unifi.nix +++ b/nixos/modules/services/networking/unifi.nix @@ -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 ]; } diff --git a/pkgs/applications/audio/proteus/default.nix b/pkgs/applications/audio/proteus/default.nix new file mode 100644 index 00000000000..1b2da324bda --- /dev/null +++ b/pkgs/applications/audio/proteus/default.nix @@ -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 ]; + }; +} diff --git a/pkgs/applications/gis/qgis/unwrapped-ltr.nix b/pkgs/applications/gis/qgis/unwrapped-ltr.nix index a2e01303970..a53ad337d54 100644 --- a/pkgs/applications/gis/qgis/unwrapped-ltr.nix +++ b/pkgs/applications/gis/qgis/unwrapped-ltr.nix @@ -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 ]; }; } diff --git a/pkgs/applications/gis/qgis/unwrapped.nix b/pkgs/applications/gis/qgis/unwrapped.nix index 18603e38ec5..8c6fe7b85dd 100644 --- a/pkgs/applications/gis/qgis/unwrapped.nix +++ b/pkgs/applications/gis/qgis/unwrapped.nix @@ -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 ]; }; } diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index b7becb715bc..dc03e8120ce 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -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 = diff --git a/pkgs/applications/networking/instant-messengers/signal-cli/default.nix b/pkgs/applications/networking/instant-messengers/signal-cli/default.nix index 4d46c9870f0..baca7bd3943 100644 --- a/pkgs/applications/networking/instant-messengers/signal-cli/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-cli/default.nix @@ -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; }; } diff --git a/pkgs/applications/networking/mailreaders/meli/default.nix b/pkgs/applications/networking/mailreaders/meli/default.nix index 285fbdf3570..becc6193759 100644 --- a/pkgs/applications/networking/mailreaders/meli/default.nix +++ b/pkgs/applications/networking/mailreaders/meli/default.nix @@ -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; }; } diff --git a/pkgs/applications/office/wpsoffice/default.nix b/pkgs/applications/office/wpsoffice/default.nix index 44a16df595e..0685f52820a 100644 --- a/pkgs/applications/office/wpsoffice/default.nix +++ b/pkgs/applications/office/wpsoffice/default.nix @@ -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 ]; diff --git a/pkgs/applications/virtualization/nvidia-container-runtime/default.nix b/pkgs/applications/virtualization/nvidia-container-runtime/default.nix deleted file mode 100644 index 71621d6cd94..00000000000 --- a/pkgs/applications/virtualization/nvidia-container-runtime/default.nix +++ /dev/null @@ -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 ]; - }; -} diff --git a/pkgs/applications/virtualization/nvidia-container-toolkit/default.nix b/pkgs/applications/virtualization/nvidia-container-toolkit/default.nix index febd5e4cb1a..9d32d9864ac 100644 --- a/pkgs/applications/virtualization/nvidia-container-toolkit/default.nix +++ b/pkgs/applications/virtualization/nvidia-container-toolkit/default.nix @@ -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 ]; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 465754bf57b..b81b4a89948 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -192,9 +192,6 @@ package-maintainers: - vulkan-utils erictapen: - hakyll - - hakyll-contrib-hyphenation - - webify - - squeal-postgresql Gabriel439: - annah - bench diff --git a/pkgs/development/libraries/libassuan/default.nix b/pkgs/development/libraries/libassuan/default.nix index e2fbb3f9287..a807226f75a 100644 --- a/pkgs/development/libraries/libassuan/default.nix +++ b/pkgs/development/libraries/libassuan/default.nix @@ -38,6 +38,6 @@ stdenv.mkDerivation rec { homepage = "http://gnupg.org"; license = licenses.lgpl2Plus; platforms = platforms.all; - maintainers = [ maintainers.erictapen ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/libraries/libepoxy/default.nix b/pkgs/development/libraries/libepoxy/default.nix index da10cf22cf1..3eb1d47c98d 100644 --- a/pkgs/development/libraries/libepoxy/default.nix +++ b/pkgs/development/libraries/libepoxy/default.nix @@ -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; }; } diff --git a/pkgs/development/libraries/libviperfx/default.nix b/pkgs/development/libraries/libviperfx/default.nix index 3c980823f41..580329754b6 100644 --- a/pkgs/development/libraries/libviperfx/default.nix +++ b/pkgs/development/libraries/libviperfx/default.nix @@ -26,5 +26,6 @@ stdenv.mkDerivation rec { license = licenses.unfreeRedistributable; maintainers = with maintainers; [ rewine ]; platforms = [ "x86_64-linux" ]; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; }; } diff --git a/pkgs/development/libraries/mapnik/default.nix b/pkgs/development/libraries/mapnik/default.nix index f8da6e9ae03..8d0f5565947 100644 --- a/pkgs/development/libraries/mapnik/default.nix +++ b/pkgs/development/libraries/mapnik/default.nix @@ -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; }; diff --git a/pkgs/development/python-modules/adafruit-platformdetect/default.nix b/pkgs/development/python-modules/adafruit-platformdetect/default.nix index f92071b27a8..72dfbe23656 100644 --- a/pkgs/development/python-modules/adafruit-platformdetect/default.nix +++ b/pkgs/development/python-modules/adafruit-platformdetect/default.nix @@ -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; diff --git a/pkgs/development/python-modules/django-auth-ldap/default.nix b/pkgs/development/python-modules/django-auth-ldap/default.nix index 4631c13b6bd..57e7f45a2a8 100644 --- a/pkgs/development/python-modules/django-auth-ldap/default.nix +++ b/pkgs/development/python-modules/django-auth-ldap/default.nix @@ -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 = [ diff --git a/pkgs/development/python-modules/easyenergy/default.nix b/pkgs/development/python-modules/easyenergy/default.nix index cf16b6ac142..0ff5caa6661 100644 --- a/pkgs/development/python-modules/easyenergy/default.nix +++ b/pkgs/development/python-modules/easyenergy/default.nix @@ -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 = '' diff --git a/pkgs/development/python-modules/faraday-plugins/default.nix b/pkgs/development/python-modules/faraday-plugins/default.nix index 4bc9d1b239a..2a1e0f7afc9 100644 --- a/pkgs/development/python-modules/faraday-plugins/default.nix +++ b/pkgs/development/python-modules/faraday-plugins/default.nix @@ -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 = '' diff --git a/pkgs/development/python-modules/fastapi-mail/default.nix b/pkgs/development/python-modules/fastapi-mail/default.nix index dc1d232bf0f..395e427c540 100644 --- a/pkgs/development/python-modules/fastapi-mail/default.nix +++ b/pkgs/development/python-modules/fastapi-mail/default.nix @@ -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 = '' diff --git a/pkgs/development/python-modules/jupyterhub-systemdspawner/default.nix b/pkgs/development/python-modules/jupyterhub-systemdspawner/default.nix index 31f33821b95..7aeaa6cdb23 100644 --- a/pkgs/development/python-modules/jupyterhub-systemdspawner/default.nix +++ b/pkgs/development/python-modules/jupyterhub-systemdspawner/default.nix @@ -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 ]; }; } diff --git a/pkgs/development/python-modules/nbclient/default.nix b/pkgs/development/python-modules/nbclient/default.nix index 605ecf1d605..6f0d85ff920 100644 --- a/pkgs/development/python-modules/nbclient/default.nix +++ b/pkgs/development/python-modules/nbclient/default.nix @@ -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 diff --git a/pkgs/development/python-modules/osmpythontools/default.nix b/pkgs/development/python-modules/osmpythontools/default.nix index 5ceef2be378..7545d9c0100 100644 --- a/pkgs/development/python-modules/osmpythontools/default.nix +++ b/pkgs/development/python-modules/osmpythontools/default.nix @@ -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 ]; }; } diff --git a/pkgs/development/python-modules/psycopg/default.nix b/pkgs/development/python-modules/psycopg/default.nix index 1b84cc6140c..26129e82672 100644 --- a/pkgs/development/python-modules/psycopg/default.nix +++ b/pkgs/development/python-modules/psycopg/default.nix @@ -148,7 +148,6 @@ buildPythonPackage rec { propagatedBuildInputs = [ psycopg-c - ] ++ lib.optionals (pythonOlder "3.11") [ typing-extensions ] ++ lib.optionals (pythonOlder "3.9") [ backports-zoneinfo diff --git a/pkgs/development/python-modules/python-louvain/default.nix b/pkgs/development/python-modules/python-louvain/default.nix index 214ebf60a30..32bd611e704 100644 --- a/pkgs/development/python-modules/python-louvain/default.nix +++ b/pkgs/development/python-modules/python-louvain/default.nix @@ -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; [ ]; }; } diff --git a/pkgs/development/python-modules/python-mapnik/default.nix b/pkgs/development/python-modules/python-mapnik/default.nix index 8c623f286f1..18df3e4d565 100644 --- a/pkgs/development/python-modules/python-mapnik/default.nix +++ b/pkgs/development/python-modules/python-mapnik/default.nix @@ -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; }; diff --git a/pkgs/development/python-modules/pyvis/default.nix b/pkgs/development/python-modules/pyvis/default.nix index 5c9f054d764..c4698744531 100644 --- a/pkgs/development/python-modules/pyvis/default.nix +++ b/pkgs/development/python-modules/pyvis/default.nix @@ -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; [ ]; }; } diff --git a/pkgs/development/python-modules/tlslite-ng/default.nix b/pkgs/development/python-modules/tlslite-ng/default.nix index 37751890c7b..c6146140163 100644 --- a/pkgs/development/python-modules/tlslite-ng/default.nix +++ b/pkgs/development/python-modules/tlslite-ng/default.nix @@ -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 = [ ]; }; } diff --git a/pkgs/development/python-modules/xiaomi-ble/default.nix b/pkgs/development/python-modules/xiaomi-ble/default.nix index aa59481b8ed..22fe3f178b2 100644 --- a/pkgs/development/python-modules/xiaomi-ble/default.nix +++ b/pkgs/development/python-modules/xiaomi-ble/default.nix @@ -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 = [ diff --git a/pkgs/development/tools/database/dbmate/default.nix b/pkgs/development/tools/database/dbmate/default.nix index 89a12d52dfc..809c63f14e5 100644 --- a/pkgs/development/tools/database/dbmate/default.nix +++ b/pkgs/development/tools/database/dbmate/default.nix @@ -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="; diff --git a/pkgs/development/tools/language-servers/beancount-language-server/default.nix b/pkgs/development/tools/language-servers/beancount-language-server/default.nix index dfe591389ef..9eb1d746c21 100644 --- a/pkgs/development/tools/language-servers/beancount-language-server/default.nix +++ b/pkgs/development/tools/language-servers/beancount-language-server/default.nix @@ -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 ]; }; } - diff --git a/pkgs/os-specific/linux/apfs/default.nix b/pkgs/os-specific/linux/apfs/default.nix index e6961684d0e..1f0cc74f981 100644 --- a/pkgs/os-specific/linux/apfs/default.nix +++ b/pkgs/os-specific/linux/apfs/default.nix @@ -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" ]; diff --git a/pkgs/servers/mail/vsmtp/default.nix b/pkgs/servers/mail/vsmtp/default.nix index 63447dffb30..a6fc770cf5e 100644 --- a/pkgs/servers/mail/vsmtp/default.nix +++ b/pkgs/servers/mail/vsmtp/default.nix @@ -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; diff --git a/pkgs/servers/unifi/default.nix b/pkgs/servers/unifi/default.nix index b88509555ba..a62c4d23d23 100644 --- a/pkgs/servers/unifi/default.nix +++ b/pkgs/servers/unifi/default.nix @@ -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 ]; }; }); diff --git a/pkgs/shells/fish/plugins/fzf-fish.nix b/pkgs/shells/fish/plugins/fzf-fish.nix index 2480b9ea93c..f2f7fcd6540 100644 --- a/pkgs/shells/fish/plugins/fzf-fish.nix +++ b/pkgs/shells/fish/plugins/fzf-fish.nix @@ -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 ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f7c00387a75..33721b114fe 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 };