Merge master into staging-next
This commit is contained in:
github-actions[bot]
@@ -14178,6 +14178,16 @@
|
||||
githubId = 6277322;
|
||||
name = "Wei Tang";
|
||||
};
|
||||
soywod = {
|
||||
name = "Clément DOUIN";
|
||||
email = "clement.douin@posteo.net";
|
||||
matrix = "@soywod:matrix.org";
|
||||
github = "soywod";
|
||||
githubId = 10437171;
|
||||
keys = [{
|
||||
fingerprint = "75F0 AB7C FE01 D077 AEE6 CAFD 353E 4A18 EE0F AB72";
|
||||
}];
|
||||
};
|
||||
spacefrogg = {
|
||||
email = "spacefrogg-nixos@meterriblecrew.net";
|
||||
github = "spacefrogg";
|
||||
|
||||
@@ -702,7 +702,20 @@ in {
|
||||
users.groups.${user.name} = {};
|
||||
'';
|
||||
}
|
||||
]
|
||||
] ++ (map (shell: {
|
||||
assertion = (user.shell == pkgs.${shell}) -> (config.programs.${shell}.enable == true);
|
||||
message = ''
|
||||
users.users.${user.name}.shell is set to ${shell}, but
|
||||
programs.${shell}.enable is not true. This will cause the ${shell}
|
||||
shell to lack the basic nix directories in its PATH and might make
|
||||
logging in as that user impossible. You can fix it with:
|
||||
programs.${shell}.enable = true;
|
||||
'';
|
||||
}) [
|
||||
"fish"
|
||||
"xonsh"
|
||||
"zsh"
|
||||
])
|
||||
));
|
||||
|
||||
warnings =
|
||||
|
||||
@@ -2,21 +2,21 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "NoiseTorch";
|
||||
version = "0.12.0";
|
||||
version = "0.12.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "noisetorch";
|
||||
repo = "NoiseTorch";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-A6cX1ck47/ZIn9cnV/Ow4CxVFfOX5J0K0Q+B70jCFdQ=";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "sha256-gOPSMPH99Upi/30OnAdwSb7SaMV0i/uHB051cclfz6A=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
doCheck = false;
|
||||
|
||||
ldflags = [ "-s" "-w" "-X main.version=${version}" "-X main.distribution=nix" ];
|
||||
ldflags = [ "-s" "-w" "-X main.version=${version}" "-X main.distribution=nixpkgs" ];
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
@@ -32,9 +32,6 @@ buildGoModule rec {
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
insecure = true;
|
||||
knownVulnerabilities =
|
||||
lib.optional (lib.versionOlder version "0.12") "https://github.com/noisetorch/NoiseTorch/releases/tag/v0.12.0";
|
||||
description = "Virtual microphone device with noise supression for PulseAudio";
|
||||
homepage = "https://github.com/noisetorch/NoiseTorch";
|
||||
license = licenses.gpl3Plus;
|
||||
|
||||
@@ -5,6 +5,7 @@
|
||||
, buildGoModule
|
||||
, buildVimPluginFrom2Nix
|
||||
, fetchFromGitHub
|
||||
, fetchFromSourcehut
|
||||
, fetchpatch
|
||||
, fetchurl
|
||||
, substituteAll
|
||||
@@ -496,12 +497,13 @@ self: super: {
|
||||
});
|
||||
|
||||
himalaya-vim = super.himalaya-vim.overrideAttrs (old: {
|
||||
postPatch = ''
|
||||
substituteInPlace plugin/himalaya.vim \
|
||||
--replace "if !executable('himalaya')" "if v:false"
|
||||
substituteInPlace autoload/himalaya/request.vim \
|
||||
--replace "'himalaya" "'${himalaya}/bin/himalaya"
|
||||
'';
|
||||
buildInputs = [ himalaya ];
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~soywod";
|
||||
repo = "himalaya-vim";
|
||||
rev = "v${himalaya.version}";
|
||||
sha256 = "W+91hnNeS6WkDiR9r1s7xPTK9JlCWiVkI/nXVYbepY0=";
|
||||
};
|
||||
});
|
||||
|
||||
jedi-vim = super.jedi-vim.overrideAttrs (old: {
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "kubedog";
|
||||
version = "0.9.9";
|
||||
version = "0.9.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "werf";
|
||||
repo = "kubedog";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-j7LR6+c2ZZJCqmHihXodtiF5bJhNR8eizDEqwm9IUn0=";
|
||||
hash = "sha256-yHyCmUjxvMzeHpG5OqC3nAjWaiHErTXrbmS+/0Y4A7E=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-UPfB3nOzJpqh14xLKZP2mLfg7C55nQivrkmh3B7aKzo=";
|
||||
vendorHash = "sha256-OgfgCsysNtY7mZQXdmHFyJ0FqmBD3SeQdTLd5Lw3F7k=";
|
||||
|
||||
subPackages = [ "cmd/kubedog" ];
|
||||
|
||||
|
||||
@@ -2,44 +2,51 @@
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, stdenv
|
||||
, enableCompletions ? stdenv.hostPlatform == stdenv.buildPlatform
|
||||
, installShellFiles
|
||||
, installShellCompletions ? stdenv.hostPlatform == stdenv.buildPlatform
|
||||
, installManPages ? stdenv.hostPlatform == stdenv.buildPlatform
|
||||
, pkg-config
|
||||
, Security
|
||||
, libiconv
|
||||
, openssl
|
||||
, notmuch
|
||||
, withImapBackend ? true
|
||||
, withNotmuchBackend ? false
|
||||
, withSmtpSender ? true
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "himalaya";
|
||||
version = "0.6.0";
|
||||
version = "0.7.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "soywod";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-d+ERCUPUHx41HfBtjb6BjhGKzkUTGIb01BRWvAnLYwk=";
|
||||
sha256 = "sha256-yAfNH9LSXlS/Hzi5kAuur5BX2vITMucprDzxhlV8RiY=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-ICaahkIP1uSm4iXvSPMo8uVTtSa1nCyJdDihGdVEQvg=";
|
||||
cargoSha256 = "sha256-FXfh6T8dNsnD/V/wYSMDWs+ll0d1jg1Dc3cQT39b0ws=";
|
||||
|
||||
nativeBuildInputs = lib.optionals enableCompletions [ installShellFiles ]
|
||||
++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ pkg-config ];
|
||||
nativeBuildInputs = [ ]
|
||||
++ lib.optional (installManPages || installShellCompletions) installShellFiles
|
||||
++ lib.optional (!stdenv.hostPlatform.isDarwin) pkg-config;
|
||||
|
||||
buildInputs =
|
||||
if stdenv.hostPlatform.isDarwin then [
|
||||
Security
|
||||
libiconv
|
||||
] else [
|
||||
openssl
|
||||
];
|
||||
buildInputs = [ ]
|
||||
++ (if stdenv.hostPlatform.isDarwin then [ Security libiconv ] else [ openssl ])
|
||||
++ lib.optional withNotmuchBackend notmuch;
|
||||
|
||||
# flag added because without end-to-end testing is ran which requires
|
||||
# additional tooling and servers to test
|
||||
cargoTestFlags = [ "--lib" ];
|
||||
buildNoDefaultFeatures = true;
|
||||
buildFeatures = [ ]
|
||||
++ lib.optional withImapBackend "imap-backend"
|
||||
++ lib.optional withNotmuchBackend "notmuch-backend"
|
||||
++ lib.optional withSmtpSender "smtp-sender";
|
||||
|
||||
postInstall = lib.optionalString enableCompletions ''
|
||||
# Install shell function
|
||||
postInstall = lib.optionalString installManPages ''
|
||||
mkdir -p $out/man
|
||||
$out/bin/himalaya man $out/man
|
||||
installManPage $out/man/*
|
||||
'' + lib.optionalString installShellCompletions ''
|
||||
installShellCompletion --cmd himalaya \
|
||||
--bash <($out/bin/himalaya completion bash) \
|
||||
--fish <($out/bin/himalaya completion fish) \
|
||||
@@ -50,7 +57,7 @@ rustPlatform.buildRustPackage rec {
|
||||
description = "Command-line interface for email management";
|
||||
homepage = "https://github.com/soywod/himalaya";
|
||||
changelog = "https://github.com/soywod/himalaya/blob/v${version}/CHANGELOG.md";
|
||||
license = licenses.bsdOriginal;
|
||||
maintainers = with maintainers; [ toastal yanganto ];
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ soywod toastal yanganto ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
, CoreFoundation
|
||||
, cmake
|
||||
, wrapQtAppsHook
|
||||
, openimageio2
|
||||
, openimageio
|
||||
, openexr_3
|
||||
, portaudio
|
||||
, imath
|
||||
@@ -57,7 +57,7 @@ stdenv.mkDerivation {
|
||||
ffmpeg_4
|
||||
frei0r
|
||||
opencolorio
|
||||
openimageio2
|
||||
openimageio
|
||||
imath
|
||||
openexr_3
|
||||
portaudio
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "v2ray-geoip";
|
||||
version = "202303160048";
|
||||
version = "202303230043";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "v2fly";
|
||||
repo = "geoip";
|
||||
rev = "ca1a04c113293b00434d9d60e24aee17e660f4a6";
|
||||
sha256 = "sha256-YhFYrVN6ZQQeuM8ZCeFRmID/NTsI75oe4c51lOfb18s=";
|
||||
rev = "163f6f7caad67d43b51a9c342a72e34feeccb4d0";
|
||||
sha256 = "sha256-hwKRwCu/LHbjqzgpwG8YcTX4C+eEkonCDqVq36FIprQ=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "bluetooth-adapters";
|
||||
version = "0.15.2";
|
||||
version = "0.15.3";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@@ -26,7 +26,7 @@ buildPythonPackage rec {
|
||||
owner = "Bluetooth-Devices";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-vwcOMg10XRT6wNkQQF6qkbWSG2rsUXaDSEiIevii1eA=";
|
||||
hash = "sha256-sh5wOx/4J1AEzR5zrd77v7Cbq6Mt9vOjCSREKHRN4aQ=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -13,6 +13,7 @@
|
||||
, ase
|
||||
, numpy
|
||||
, scipy
|
||||
, pyyaml
|
||||
}:
|
||||
|
||||
assert lib.asserts.assertMsg (!blas.isILP64)
|
||||
@@ -85,7 +86,7 @@ in buildPythonPackage rec {
|
||||
|
||||
buildInputs = [ blas scalapack libxc libvdwxc ];
|
||||
|
||||
propagatedBuildInputs = [ ase scipy numpy mpi ];
|
||||
propagatedBuildInputs = [ ase scipy numpy mpi pyyaml ];
|
||||
|
||||
patches = [ ./SetupPath.patch ];
|
||||
|
||||
|
||||
@@ -0,0 +1,27 @@
|
||||
{ lib, buildPythonPackage, fetchPypi, poppler_utils, netpbm }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
|
||||
pname = "pnglatex";
|
||||
version = "1.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-CZUGDUkmttO0BzFYbGFSNMPkWzFC/BW4NmAeOwz4Y9M=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
poppler_utils
|
||||
netpbm
|
||||
];
|
||||
|
||||
# There are no tests
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/MaT1g3R/pnglatex";
|
||||
description = "a small program that converts LaTeX snippets to png";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ GaetanLepage ];
|
||||
};
|
||||
}
|
||||
@@ -11,7 +11,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "reolink-aio";
|
||||
version = "0.5.5";
|
||||
version = "0.5.6";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@@ -20,7 +20,7 @@ buildPythonPackage rec {
|
||||
owner = "starkillerOG";
|
||||
repo = "reolink_aio";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-Nu0U/I0dDwJ2wAk2Vj6nMt0/0galfTPurj8MqAUzSks=";
|
||||
hash = "sha256-tkmaWD+OfJfI3QjvdQivmqi8kv5Yuk2UxLlYw8hVocY=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "zeroconf";
|
||||
version = "0.47.3";
|
||||
version = "0.47.4";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@@ -22,7 +22,7 @@ buildPythonPackage rec {
|
||||
owner = "jstasiak";
|
||||
repo = "python-zeroconf";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-hpbJ7kcyM8S2xAaVjuPzHXl/gcAYk3CX7NHxsbZXQ10=";
|
||||
hash = "sha256-ig0AMGNshe0bm7ZOkqV62hEcLeYlHBayMLk2fJQ8Uyo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "buildkit";
|
||||
version = "0.11.4";
|
||||
version = "0.11.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "moby";
|
||||
repo = "buildkit";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-/9gP8ciHeFKjO0VAKXDor19Wm6wULLVlFYbHUYWFpWY=";
|
||||
hash = "sha256-bQqdHSmouZm89sV2GjBrEwYTdTYKttVBfXcm2fN09NI=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@@ -32174,6 +32174,8 @@ with pkgs;
|
||||
|
||||
pluto = callPackage ../applications/networking/cluster/pluto { };
|
||||
|
||||
pnglatex = with python3Packages; toPythonApplication pnglatex;
|
||||
|
||||
polybar = callPackage ../applications/misc/polybar { };
|
||||
|
||||
polybarFull = callPackage ../applications/misc/polybar {
|
||||
|
||||
@@ -7552,6 +7552,8 @@ self: super: with self; {
|
||||
|
||||
pmw = callPackage ../development/python-modules/pmw { };
|
||||
|
||||
pnglatex = callPackage ../development/python-modules/pnglatex { };
|
||||
|
||||
pocket = callPackage ../development/python-modules/pocket { };
|
||||
|
||||
podcastparser = callPackage ../development/python-modules/podcastparser { };
|
||||
|
||||
Reference in New Issue
Block a user