Merge master into staging-next
This commit is contained in:
commit
900f6d92f1
|
@ -78,6 +78,13 @@
|
|||
fingerprint = "2536 9E86 1AA5 9EB7 4C47 B138 6510 870A 77F4 9A99";
|
||||
}];
|
||||
};
|
||||
_0xC45 = {
|
||||
email = "jason@0xc45.com";
|
||||
name = "Jason Vigil";
|
||||
github = "0xC45";
|
||||
githubId = 56617252;
|
||||
matrix = "@oxc45:matrix.org";
|
||||
};
|
||||
_1000101 = {
|
||||
email = "b1000101@pm.me";
|
||||
github = "1000101";
|
||||
|
|
|
@ -35,13 +35,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "easyeffects";
|
||||
version = "6.2.5";
|
||||
version = "6.2.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wwmm";
|
||||
repo = "easyeffects";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-LvTvNBo3aUGUD4vA04YtINFBjTplhmkxj3FlbTZDTA0=";
|
||||
sha256 = "sha256-1kXYh2Qk0Wj0LgHTcRVAKro7LAPV/UM5i9VmHjmxTx0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -12,12 +12,12 @@ let
|
|||
if extension == "zip" then fetchzip args else fetchurl args;
|
||||
|
||||
pname = "1password-cli";
|
||||
version = "2.4.1";
|
||||
version = "2.5.1";
|
||||
sources = rec {
|
||||
aarch64-linux = fetch "linux_arm64" "sha256-ANRYE1BoezrcDxZrQYp/OPdtn4J+FmC/PLSIP5Amm18=" "zip";
|
||||
i686-linux = fetch "linux_386" "sha256-w3anr76uj/Z+ilZ+LUGOB1CoKkvxcD+v8c8lVADPwRY=" "zip";
|
||||
x86_64-linux = fetch "linux_amd64" "sha256-axZ+XDIMJlAicnYTIXgcaoT+Zcg6xvHlchl/ng7V9GY=" "zip";
|
||||
aarch64-darwin = fetch "apple_universal" "sha256-/DnrQ4fwbc2ELtsEClvzA9kTrse3pMgGLbhiKZ3gphA=" "pkg";
|
||||
aarch64-linux = fetch "linux_arm64" "sha256-HZ6AVheJrw9ZR9HGWbB6/kCzbrfYcwApa2z18tDBo1k=" "zip";
|
||||
i686-linux = fetch "linux_386" "sha256-aG6oW0epF+P9pSWMlTStSbBynBDkGX1B+0NHUnwLRhs=" "zip";
|
||||
x86_64-linux = fetch "linux_amd64" "sha256-7GkBVcvXM/WZiXEiIbYh9lS0f4BS4Hc4RCVjr8FoW8A=" "zip";
|
||||
aarch64-darwin = fetch "apple_universal" "sha256-XebD33fX15RsFUdbV+DvMRIi1MSyMfIRC3JOwcmi8kk=" "pkg";
|
||||
x86_64-darwin = aarch64-darwin;
|
||||
};
|
||||
platforms = builtins.attrNames sources;
|
||||
|
@ -48,6 +48,7 @@ stdenv.mkDerivation {
|
|||
'';
|
||||
|
||||
postInstall = ''
|
||||
HOME=$TMPDIR
|
||||
installShellCompletion --cmd ${mainProgram} \
|
||||
--bash <($out/bin/${mainProgram} completion bash) \
|
||||
--fish <($out/bin/${mainProgram} completion fish) \
|
||||
|
|
|
@ -2,22 +2,39 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "cilium-cli";
|
||||
version = "0.11.7";
|
||||
version = "0.11.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cilium";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-4+4E7v/b74DDekqymH8PR7/GfH3GGzSQFQk24VJisQ0=";
|
||||
sha256 = "sha256-BkcnChxUceWGG5hBOHvzZokgcw8T/vvNwIEtHkLfUJA=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
|
||||
subPackages = [ "cmd/cilium" ];
|
||||
|
||||
ldflags = [
|
||||
"-s" "-w"
|
||||
"-X github.com/cilium/cilium-cli/internal/cli/cmd.Version=${version}"
|
||||
];
|
||||
|
||||
|
||||
# Required to workaround install check error:
|
||||
# 2022/06/25 10:36:22 Unable to start gops: mkdir /homeless-shelter: permission denied
|
||||
HOME = "$TMPDIR";
|
||||
|
||||
doInstallCheck = true;
|
||||
installCheckPhase = ''
|
||||
$out/bin/cilium version | grep ${version} > /dev/null
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "CLI to install, manage & troubleshoot Kubernetes clusters running Cilium";
|
||||
license = licenses.asl20;
|
||||
homepage = "https://www.cilium.io/";
|
||||
maintainers = with maintainers; [ humancalico ];
|
||||
maintainers = with maintainers; [ humancalico bryanasdev000 ];
|
||||
mainProgram = "cilium";
|
||||
};
|
||||
}
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "helm-docs";
|
||||
version = "1.8.1";
|
||||
version = "1.10.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "norwoodj";
|
||||
repo = "helm-docs";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-OpS/CYBb2Ll6ktvEhqkw/bWMSrFa4duidK3Glu8EnPw=";
|
||||
sha256 = "sha256-V7Qw20PPoAEXl/XAMj/WSM73fLdp/gH4G3ipx49p06o=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-FpmeOQ8nV+sEVu2+nY9o9aFbCpwSShQUFOmyzwEQ9Pw=";
|
||||
|
|
|
@ -71,7 +71,7 @@ let
|
|||
in
|
||||
env.mkDerivation rec {
|
||||
pname = "telegram-desktop";
|
||||
version = "4.0.0";
|
||||
version = "4.0.2";
|
||||
# Note: Update via pkgs/applications/networking/instant-messengers/telegram/tdesktop/update.py
|
||||
|
||||
# Telegram-Desktop with submodules
|
||||
|
@ -80,7 +80,7 @@ env.mkDerivation rec {
|
|||
repo = "tdesktop";
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "16j5rvlqr2bb1dkc7cc920ylhw3sp4qnqvm1aznnnjzcimqb8xf0";
|
||||
sha256 = "07fhm36394171w0rvay1x9x1br3z36z4dlpi57bkq23dvi331pxj";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
@ -1,22 +0,0 @@
|
|||
--- a/syncthing_gtk/configuration.py
|
||||
+++ b/syncthing_gtk/configuration.py
|
||||
@@ -30,7 +30,7 @@
|
||||
"autokill_daemon" : (int, 2), # 0 - never kill, 1 - always kill, 2 - ask
|
||||
"daemon_priority" : (int, 0), # uses nice values
|
||||
"max_cpus" : (int, 0), # 0 for all cpus
|
||||
- "syncthing_binary" : (str, "/usr/bin/syncthing"),
|
||||
+ "syncthing_binary" : (str, "@syncthing@"),
|
||||
"syncthing_arguments" : (str, ""),
|
||||
"minimize_on_start" : (bool, False),
|
||||
"folder_as_path" : (bool, True),
|
||||
--- a/syncthing_gtk/tools.py
|
||||
+++ b/syncthing_gtk/tools.py
|
||||
@@ -303,7 +303,7 @@
|
||||
return False
|
||||
# signal 0 doesn't kill anything, but killall exits with 1 if
|
||||
# named process is not found
|
||||
- p = Popen(["killall", "-u", os.environ["USER"], "-q", "-s", "0", "syncthing"])
|
||||
+ p = Popen(["@killall@", "-u", os.environ["USER"], "-q", "-s", "0", "syncthing"])
|
||||
p.communicate()
|
||||
return p.returncode == 0
|
||||
else:
|
|
@ -15,16 +15,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "i3status-rust";
|
||||
version = "0.21.10";
|
||||
version = "0.22.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "greshake";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-HtPgl52ysE/CVX706YeKBFc6CgGpHzvHwZoS+DzHADY=";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-9Fp5k14QkV1CwLSL1nUUu6NYIpjfvI9vNJRYNqvyr3M=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-ini0AIYwvTskNFMSC+Gy23ohL75PTET95e1mjpjCsWE=";
|
||||
cargoSha256 = "sha256-MzosatZ4yPHAdANqOBPVW2wpjnojLo9B9N9o4DtU0Iw=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config makeWrapper ];
|
||||
|
||||
|
|
|
@ -7,13 +7,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cpp-utilities";
|
||||
version = "5.15.0";
|
||||
version = "5.16.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Martchus";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-3D/5Bl5vANZrHtJGehoHwQ0mDrL8TJ7iK2GoViiuj6E=";
|
||||
sha256 = "sha256-B/pWdfK3KddAIppJXQRohiIK8mouAQjXRHic75IzY/Q=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
|
@ -1,12 +1,12 @@
|
|||
{ lib, stdenv, fetchurl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.3.0";
|
||||
version = "1.3.1";
|
||||
pname = "commons-daemon";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://apache/commons/daemon/binaries/commons-daemon-${version}-bin.tar.gz";
|
||||
sha256 = "sha256-Fihsar8HR2adN2f9deo7bk8tRgeiD6BljVZ/mfkLUUA=";
|
||||
sha256 = "sha256-EaQ4wy32GX1MGByCqo811WblqZgsNSw3psr94lrxEqw=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libkqueue";
|
||||
version = "2.6.1";
|
||||
version = "2.6.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mheily";
|
||||
repo = "libkqueue";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-YKKBHOxjUS7+/ib4gcR7EYjjVOwhHVksYasLhErdV8s=";
|
||||
sha256 = "sha256-5Zds9sqHkFldJf3ThTPOiaGKohmFcIzY0ARDA0iswVk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
@ -16,6 +16,7 @@ stdenv.mkDerivation rec {
|
|||
meta = with lib; {
|
||||
description = "kqueue(2) compatibility library";
|
||||
homepage = "https://github.com/mheily/libkqueue";
|
||||
changelog = "https://github.com/mheily/libkqueue/raw/v${version}/ChangeLog";
|
||||
license = licenses.bsd2;
|
||||
maintainers = [ maintainers.marsam ];
|
||||
platforms = platforms.linux;
|
||||
|
|
|
@ -1,22 +1,23 @@
|
|||
{ lib
|
||||
, buildDunePackage
|
||||
, fetchurl
|
||||
, fetchFromGitHub
|
||||
, cstruct
|
||||
, mirage-crypto
|
||||
, alcotest
|
||||
}:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "pbkdf";
|
||||
version = "1.1.0";
|
||||
version = "1.2.0";
|
||||
|
||||
useDune2 = true;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/abeaumont/ocaml-pbkdf/releases/download/${version}/pbkdf-${version}.tbz";
|
||||
sha256 = "e53ed1bd9abf490c858a341c10fb548bc9ad50d4479acdf95a9358a73d042264";
|
||||
src = fetchFromGitHub {
|
||||
owner = "abeaumont";
|
||||
repo = "ocaml-pbkdf";
|
||||
rev = version;
|
||||
sha256 = "sha256-dGi4Vw+7VBpK/NpJ6zdpogm+E6G/oJovXCksJBSmqjI=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ mirage-crypto ];
|
||||
propagatedBuildInputs = [ cstruct mirage-crypto ];
|
||||
checkInputs = [ alcotest ];
|
||||
doCheck = true;
|
||||
|
||||
|
|
|
@ -47,6 +47,7 @@ buildPythonPackage rec {
|
|||
"test_schedule_parser_with_a_daily_recurring_enabled_schedule_data"
|
||||
"test_schedule_parser_with_a_partial_daily_recurring_enabled_schedule_data"
|
||||
"test_schedule_parser_with_a_non_recurring_enabled_schedule_data"
|
||||
"test_hexadecimale_timestamp_to_localtime_with_the_current_timestamp_should_return_a_time_string"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "aioswitcher" ];
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "bimmer-connected";
|
||||
version = "0.9.4";
|
||||
version = "0.9.6";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
|||
owner = "bimmerconnected";
|
||||
repo = "bimmer_connected";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-+K+RffQzbJiKld0AM41OlK0ma0aopJRaTz+ZcCcYzJk=";
|
||||
hash = "sha256-R7QmxSUbVsvb+MRTYlihxuM05WLYASRSfUs09fl7l1k=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -8,12 +8,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "manuel";
|
||||
version = "1.11.2";
|
||||
version = "1.12.4";
|
||||
disabled = isPy27;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-nJt3WMQ66oa3VlW5InJCzOea96Wf7WwxSbBp9WIfzqc=";
|
||||
sha256 = "sha256-A5Wq32mR+SSseVz61Z2l3AYYcyqMxYrQ9HSWWrco9/Q=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ six ];
|
||||
|
|
|
@ -18,14 +18,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "snowflake-connector-python";
|
||||
version = "2.7.8";
|
||||
version = "2.7.9";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-nPsHsEi8sf5kbQP3SAzLaod+nEUGcwLpC8/3/XL2vC8=";
|
||||
hash = "sha256-HQ/d7luqdG1BriuP8QXzZk5JZwwLJH1JQIN3BtEDpM4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -1,4 +1,10 @@
|
|||
{ lib, buildPythonPackage, fetchFromGitHub, systemd, pkg-config }:
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchpatch
|
||||
, fetchFromGitHub
|
||||
, systemd
|
||||
, pkg-config
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "systemd";
|
||||
|
@ -11,14 +17,36 @@ buildPythonPackage rec {
|
|||
sha256 = "1fakw7qln44mfd6pj4kqsgyrhkc6cyr653id34kv0rdnb1bvysrz";
|
||||
};
|
||||
|
||||
buildInputs = [ systemd ];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
patches = [
|
||||
# Fix runtime issues on Python 3.10
|
||||
# https://github.com/systemd/python-systemd/issues/107
|
||||
(fetchpatch {
|
||||
url = "https://github.com/systemd/python-systemd/commit/c71bbac357f0ac722e1bcb2edfa925b68cca23c9.patch";
|
||||
sha256 = "22s72Wa/BCwNNvwbxEUh58jhHlbA00SNwNVchVDovcc=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
systemd
|
||||
];
|
||||
|
||||
# No module named 'systemd._journal
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"systemd.journal"
|
||||
"systemd.id128"
|
||||
"systemd.daemon"
|
||||
"systemd.login"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python module for native access to the systemd facilities";
|
||||
homepage = "http://www.freedesktop.org/software/systemd/python-systemd/";
|
||||
license = licenses.lgpl21;
|
||||
license = licenses.lgpl21Plus;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "time-machine";
|
||||
version = "2.7.0";
|
||||
version = "2.7.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
|||
owner = "adamchainz";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-d/jUyzqC4weWdY2x6lf85noE/6gNBFhhDfAaYcwB9XQ=";
|
||||
sha256 = "sha256-bRqljS09IBp/uqbx9hrr1iEwqvAyOWyl4qjKhJqqGzc=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -6,12 +6,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "types-requests";
|
||||
version = "2.27.31";
|
||||
version = "2.28.0";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-b6uXuZ/qUrnHtGak3ZPga7MlvH50IEdeh4MQJqjdNcw=";
|
||||
sha256 = "sha256-mGPRbfuz+lXc2mT6O5ieduiFkDOybB4WI+MEZc/ilNM=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -7,13 +7,13 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "cvehound";
|
||||
version = "1.0.9";
|
||||
version = "1.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "evdenis";
|
||||
repo = "cvehound";
|
||||
rev = version;
|
||||
hash = "sha256-qwQfpelY1Air3wVQ3RziM/+MNOR3jiKmLpO2w6kXZwM=";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-4+0Virpsq4mwOIpostS87VYTX8hsumXEL1w8FiOrNtA=";
|
||||
};
|
||||
|
||||
makeWrapperArgs = [
|
||||
|
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "apko";
|
||||
version = "0.3.3";
|
||||
version = "0.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "chainguard-dev";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-j/tfa9O10HSEwzuXE2mjV2TVYuwk9lpA0PgsKDm70uI=";
|
||||
sha256 = "sha256-gmBcN1lxzkkRpiUUWv87ji/G4Uy3DA8a6+6Qs+p/2mg=";
|
||||
# populate values that require us to use git. By doing this in postFetch we
|
||||
# can delete .git afterwards and maintain better reproducibility of the src.
|
||||
leaveDotGit = true;
|
||||
|
@ -24,7 +24,7 @@ buildGoModule rec {
|
|||
find "$out" -name .git -print0 | xargs -0 rm -rf
|
||||
'';
|
||||
};
|
||||
vendorSha256 = "sha256-jsNSYlTXUAUPG7vccjmonZUN1HAmULprCmJ1TYLYP00=";
|
||||
vendorSha256 = "sha256-3gRECgKvGqkgBzB3SSxm6/LxZG8RxhjoC6Q7DZj/Has=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "cloud-nuke";
|
||||
version = "0.11.6";
|
||||
version = "0.11.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gruntwork-io";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-wsCe32Ui+czM0+qpMxgTahJ7FlcnFMkueEkrcwm1sdE=";
|
||||
sha256 = "sha256-0GP7T/OspaJVATd0dYNVniDh0XAiL09dopNnOQrLpCs=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-McCbogZvgm9pnVjay9O2CxAh+653JnDMcU4CHD0PTPI=";
|
||||
vendorSha256 = "sha256-4BUKUDr0bcd4AcMGIDC7HIhDI7pdTu2efkLqRD7Piw0=";
|
||||
|
||||
ldflags = [ "-s" "-w" "-X main.VERSION=${version}" ];
|
||||
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "doctl";
|
||||
version = "1.76.0";
|
||||
version = "1.77.0";
|
||||
|
||||
vendorSha256 = null;
|
||||
|
||||
|
@ -31,7 +31,7 @@ buildGoModule rec {
|
|||
owner = "digitalocean";
|
||||
repo = "doctl";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-rascG0WXDsmParwzR8QZEayiQEARu8YXfU0JT2yhQrc=";
|
||||
sha256 = "sha256-i+Z5xFO3e04c/CfOyPAjD1nwPvm5vmYLsvj6OblJuqg=";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
|
22
pkgs/development/tools/misc/grpc-client-cli/default.nix
Normal file
22
pkgs/development/tools/misc/grpc-client-cli/default.nix
Normal file
|
@ -0,0 +1,22 @@
|
|||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "grpc-client-cli";
|
||||
version = "1.12.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vadimi";
|
||||
repo = "grpc-client-cli";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-hsx+nmkYLkSsrUEDAf5556qNLeZ3w5txFBUpDv+b3a4=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-1WcnEl3odjxyXfSNyzPU3fa5yrF4MaEgfCAsbr3xedA=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "generic gRPC command line client";
|
||||
maintainers = with maintainers; [ Philipp-M ];
|
||||
homepage = "https://github.com/vadimi/grpc-client-cli";
|
||||
license = licenses.mit;
|
||||
};
|
||||
}
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-bloat";
|
||||
version = "0.11.0";
|
||||
version = "0.11.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "RazrFalcon";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-UzMo+IqoP3GpGu7tWlrkEU1YpVLgEL7UwIU1hPmoJNg=";
|
||||
sha256 = "sha256-lCA7C1G2xu65jn3/wzj6prWSrjQz3EqqJyMlPR/HRFs=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-w3+ypGuVRGwC94zj/OaDUUoUbBnepGHvqulY4IVIsfo=";
|
||||
cargoSha256 = "sha256-fOenXn5gagFss9DRDXXsGxQlDqVXZ5LZcdM4WsXAyUU=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A tool and Cargo subcommand that helps you find out what takes most of the space in your executable";
|
||||
|
|
|
@ -13,16 +13,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-crev";
|
||||
version = "0.23.1";
|
||||
version = "0.23.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "crev-dev";
|
||||
repo = "cargo-crev";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-XzjZEVyPVn+7VrjG4QsqVBFmuGC1TWTWLEoqFcwQhaI=";
|
||||
sha256 = "sha256-q/GbEsGQip7+wXxbVFfm9l3tdCT2o4yhWVTY1qmnEic=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-p87ZnOxaF9ytSUxp0P3QE3K1/jo7hz/N7BH1f2Lc0I0=";
|
||||
cargoSha256 = "sha256-pqOVKLh+ovUy+rJIz0tjp56qhilZTno4t4dZyCY1r7c=";
|
||||
|
||||
preCheck = ''
|
||||
export HOME=$(mktemp -d)
|
||||
|
|
|
@ -7,16 +7,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-expand";
|
||||
version = "1.0.21";
|
||||
version = "1.0.27";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dtolnay";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-hxG7e5JBDv79eA7IQEdU8kpvE0B69Gqc+aPdCoc6Uf4=";
|
||||
sha256 = "sha256-lj6B+9AdKhHc71cyzp7TcHmHv3K2ZoXEzMn/d3H0bB4=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-7CMNJb/HGHPP4CIBEYK+2HC/JAce25qGI86NkSvyxos=";
|
||||
cargoSha256 = "sha256-j14l3E+vyeyEMYN+TEsuxlEdWa2Em0B6Y2LoTot2Np8=";
|
||||
|
||||
buildInputs = lib.optional stdenv.isDarwin libiconv;
|
||||
|
||||
|
|
|
@ -2,17 +2,17 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-insta";
|
||||
version = "1.14.0";
|
||||
version = "1.15.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mitsuhiko";
|
||||
repo = "insta";
|
||||
rev = version;
|
||||
sha256 = "sha256-kTICdLL3paJIj779w4i7QUzhdynzyjo+YjtBorJsms4=";
|
||||
sha256 = "sha256-IwtAd8qhG7FgnC7esipwAbSssVKIirB6GCedgNRPabo=";
|
||||
};
|
||||
|
||||
sourceRoot = "source/cargo-insta";
|
||||
cargoSha256 = "sha256-Hfjz3arOvRbMIvV3o60zjRB2p4JbBUFPj66OpHZdIJg=";
|
||||
cargoSha256 = "sha256-asWf+wIOpbZx9YOw5c4prg2D6FSRCTcc5FgWY93MNII=";
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-llvm-lines";
|
||||
version = "0.4.15";
|
||||
version = "0.4.16";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dtolnay";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-pP1kMwxIrL2ADvj4AkbhqKH5vzGyQnfL7hjg3/QYIY8=";
|
||||
sha256 = "sha256-MDRVNCfyObEaN0eNnaDBQCYQV2Y1Ck5/8zdpG4eZbaE=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-V9mD9NAG7bB8uB/pjl0XGXmJqOUm4ZrFJV7nv569XOM=";
|
||||
cargoSha256 = "sha256-oOUidCM3Xex8bqBVJmrigHZHMdjXBNDdKaPiA/+MR7s=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Count the number of lines of LLVM IR across all instantiations of a generic function";
|
||||
|
|
|
@ -2,18 +2,18 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "cadvisor";
|
||||
version = "0.40.0";
|
||||
version = "0.44.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "google";
|
||||
repo = "cadvisor";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-8HOaKjdATVZpyx4yLf7xefz+jiOEqmkWiZnA3DOyT50=";
|
||||
sha256 = "sha256-OVUKQGP9zzlzoC/25BHNbJuP6ELstBMaRFAzUnDSR0U=";
|
||||
};
|
||||
|
||||
modRoot = "./cmd";
|
||||
|
||||
vendorSha256 = "sha256-+nrXD0hQ3zBwTTq9xoBqO3ho4s4tf8uZQz2wL1nYi/k=";
|
||||
vendorSha256 = "sha256-LGMouB76GT/ZvG3kLoo/jmnHT0CEeND9pObTOKaS9T0=";
|
||||
|
||||
ldflags = [ "-s" "-w" "-X github.com/google/cadvisor/version.Version=${version}" ];
|
||||
|
||||
|
|
|
@ -0,0 +1,14 @@
|
|||
--- a/src/mongo/stdx/thread.h
|
||||
+++ b/src/mongo/stdx/thread.h
|
||||
@@ -103,10 +103,7 @@ private:
|
||||
// . N Y : 4,344 | 13,048 | 7,352
|
||||
// . Y Y : 4,424 | 13,672 | 8,392
|
||||
// ( https://jira.mongodb.org/secure/attachment/233569/233569_stacktrace-writeup.txt )
|
||||
- static constexpr std::size_t kMongoMinSignalStackSize = std::size_t{64} << 10;
|
||||
-
|
||||
- static constexpr std::size_t kStackSize =
|
||||
- std::max(kMongoMinSignalStackSize, std::size_t{MINSIGSTKSZ});
|
||||
+ static constexpr std::size_t kStackSize = std::size_t{64} << 10;
|
||||
std::unique_ptr<char[]> _stackStorage = std::make_unique<char[]>(kStackSize);
|
||||
|
||||
#else // !MONGO_HAS_SIGALTSTACK
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, callPackage, lib, sasl, boost, Security, CoreFoundation, cctools }:
|
||||
{ stdenv, callPackage, fetchpatch, lib, sasl, boost, Security, CoreFoundation, cctools }:
|
||||
|
||||
let
|
||||
buildMongoDB = callPackage ./mongodb.nix {
|
||||
|
@ -11,7 +11,15 @@ let
|
|||
in buildMongoDB {
|
||||
version = "4.0.27";
|
||||
sha256 = "sha256-ct33mnK4pszhYM4Is7j0GZQRyi8i8Qmy0wcklyq5LjM=";
|
||||
patches =
|
||||
[ ./forget-build-dependencies.patch ./mozjs-45_fix-3-byte-opcode.patch ]
|
||||
patches = [
|
||||
./forget-build-dependencies.patch
|
||||
./mozjs-45_fix-3-byte-opcode.patch
|
||||
./patches/mongodb-4.0-glibc-2.34.patch # https://github.com/NixOS/nixpkgs/issues/171928
|
||||
(fetchpatch {
|
||||
name = "mongodb-4.4.1-gcc11.patch";
|
||||
url = "https://raw.githubusercontent.com/gentoo/gentoo/7168257cad6ea7c4856b01c5703d0ed5b764367c/dev-db/mongodb/files/mongodb-4.4.1-gcc11.patch";
|
||||
sha256 = "sha256-RvfCP462RG+ZVjcb23DgCuxCdfPl2/UgH8N7FgCghGI=";
|
||||
})
|
||||
]
|
||||
++ lib.optionals stdenv.isDarwin [ ./asio-no-experimental-string-view.patch ];
|
||||
}
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, callPackage, lib, sasl, boost, Security, CoreFoundation, cctools }:
|
||||
{ stdenv, callPackage, fetchpatch, lib, sasl, boost, Security, CoreFoundation, cctools }:
|
||||
|
||||
let
|
||||
buildMongoDB = callPackage ./mongodb.nix {
|
||||
|
@ -11,7 +11,12 @@ let
|
|||
in buildMongoDB {
|
||||
version = "4.2.19";
|
||||
sha256 = "sha256-fngTHd+fSdHqiqQYOYS7o6P5eHybeZy3iNKkGzFmjTw=";
|
||||
patches =
|
||||
[ ./forget-build-dependencies-4-2.patch ]
|
||||
++ lib.optionals stdenv.isDarwin [ ./asio-no-experimental-string-view-4-2.patch ];
|
||||
patches = [
|
||||
./forget-build-dependencies-4-2.patch
|
||||
(fetchpatch {
|
||||
name = "mongodb-4.4.1-gcc11.patch";
|
||||
url = "https://raw.githubusercontent.com/gentoo/gentoo/7168257cad6ea7c4856b01c5703d0ed5b764367c/dev-db/mongodb/files/mongodb-4.4.1-gcc11.patch";
|
||||
sha256 = "sha256-RvfCP462RG+ZVjcb23DgCuxCdfPl2/UgH8N7FgCghGI=";
|
||||
})
|
||||
] ++ lib.optionals stdenv.isDarwin [ ./asio-no-experimental-string-view-4-2.patch ];
|
||||
}
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
{ lib, stdenv, file, fetchurl, makeWrapper,
|
||||
autoPatchelfHook, jsoncpp, libpulseaudio }:
|
||||
let
|
||||
versionMajor = "7.9";
|
||||
versionMinor = "2";
|
||||
versionMajor = "7.10";
|
||||
versionMinor = "1";
|
||||
versionBuild_x86_64 = "1";
|
||||
versionBuild_i686 = "1";
|
||||
in
|
||||
|
@ -14,12 +14,12 @@ in
|
|||
if stdenv.hostPlatform.system == "x86_64-linux" then
|
||||
fetchurl {
|
||||
url = "https://download.nomachine.com/download/${versionMajor}/Linux/nomachine_${version}_${versionBuild_x86_64}_x86_64.tar.gz";
|
||||
sha256 = "sha256-Gsi0Hj6cfpxzr0zbWfsq0ZJvCPATQn9YvHbx0Cziia4=";
|
||||
sha256 = "sha256-alClFaNbQ76r8LukbygesWWXA5rx6VEzxK+bY5tOfO0=";
|
||||
}
|
||||
else if stdenv.hostPlatform.system == "i686-linux" then
|
||||
fetchurl {
|
||||
url = "https://download.nomachine.com/download/${versionMajor}/Linux/nomachine_${version}_${versionBuild_i686}_i686.tar.gz";
|
||||
sha256 = "sha256-zmXOLzFePAD+oH00bAkNsEFviQwkjjqC/gAv87E1qX4=";
|
||||
sha256 = "sha256-UDvrjb/2rXvSvpiA+UwiVi4YyXhFLNiEtrszqjAPGXc=";
|
||||
}
|
||||
else
|
||||
throw "NoMachine client is not supported on ${stdenv.hostPlatform.system}";
|
||||
|
|
|
@ -9,12 +9,12 @@
|
|||
with lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "2.7.5";
|
||||
version = "2.7.6";
|
||||
pname = "dar";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/dar/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-lfpJOomadV/oTJsOloH1rYF5Wy3kVr+EBUvqZ+xaCWY=";
|
||||
sha256 = "sha256-PV5ESJE1B2gQnX6QUeJgOb3rkG3jApTn4NcRBbh9bao=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
|
|
@ -9,11 +9,11 @@ let
|
|||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "blueman";
|
||||
version = "2.2.4";
|
||||
version = "2.2.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/blueman-project/blueman/releases/download/${version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-VdY5/u2gtDsYplnmWYUhOlS0fcsTSPO07/tSONskJgI=";
|
||||
sha256 = "sha256-yfPAqU3HyAvTIwS7Jf3tIU/jC3AY6e9Gsvy9HYA8fHw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchFromGitHub, shared-mime-info
|
||||
{ lib, stdenv, fetchFromGitHub, fetchpatch, shared-mime-info
|
||||
, autoconf, automake, intltool, libtool, pkg-config, cmake
|
||||
, ruby, librsvg
|
||||
, ncurses, m17n_lib, m17n_db, expat
|
||||
|
@ -86,7 +86,21 @@ stdenv.mkDerivation rec {
|
|||
./autogen.sh
|
||||
'';
|
||||
|
||||
patches = [ ./data-hook.patch ];
|
||||
patches = [
|
||||
./data-hook.patch
|
||||
|
||||
# Pull upstream fix for -fno-common toolchains
|
||||
# https://github.com/uim/libgcroots/pull/4
|
||||
(fetchpatch {
|
||||
name = "libgcroots-fno-common.patch";
|
||||
url = "https://github.com/uim/libgcroots/commit/7e39241344ad0663409e836560ae6b5eb231e1fc.patch";
|
||||
sha256 = "0iifcl5lk8bvl0cflm47gkymg88aiwzj0gxh2aj3mqlyhvyx78nz";
|
||||
# Patch comes from git submodule. Relocate as:
|
||||
# a/include/private/gc_priv.h -> a/sigscheme/libgcroots/include/private/gc_priv.h
|
||||
stripLen = 1;
|
||||
extraPrefix = "sigscheme/libgcroots/";
|
||||
})
|
||||
];
|
||||
|
||||
configureFlags = [
|
||||
# configure in maintainer mode or else some pixmaps won't get autogenerated
|
||||
|
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "chezmoi";
|
||||
version = "2.16.0";
|
||||
version = "2.18.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "twpayne";
|
||||
repo = "chezmoi";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-J5L4xFdRV8eOJgILQqK0DhvP5/AXAmr7spzokhd4kcg=";
|
||||
sha256 = "sha256-eRlEhtpUBZBS3fNrkkXPiktPyGQ2K8MFwsDVo3DUb+o=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-y+xPuW8l3XvpnlqdlNIWdweNXMsAOrwbXHq2cJQRcOY=";
|
||||
vendorSha256 = "sha256-u+iFnBzlaa+7heQEI18WWD45TSxEpIY73ZrxjLx84Ic=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
@ -1,12 +1,12 @@
|
|||
{ lib, stdenv, fetchurl, autoreconfHook, tzdata, fetchpatch }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.4.9";
|
||||
version = "0.4.10";
|
||||
pname = "dateutils";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://bitbucket.org/hroptatyr/dateutils/downloads/${pname}-${version}.tar.xz";
|
||||
sha256 = "1hy96h9imxdbg9y7305mgv4grr6x4qic9xy3vhgh15lvjkcmc0kr";
|
||||
sha256 = "sha256-PFCOKIm51a7Kt9WdcyWnAIlZMRGhIwpJbasPWtZ3zew=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
|
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "brook";
|
||||
version = "20220515";
|
||||
version = "20220707";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "txthinking";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-olYlAuIcK34nNXbfiPT4+u0L3xcxBMMty72FjSeuNqg=";
|
||||
sha256 = "sha256-TlbVXfNUvCHHX0BReSVE6GNfmS+p6lWSdO0OtOC+I2U=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-ic5QYRVElEuH4D29PXgTzMHU0KjrxDqcdfg7Kd37/YU=";
|
||||
vendorSha256 = "sha256-MPLM1lBM1K55q6nsfmOekdFlSDmPsLLDv09mD1XqLNo=";
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/txthinking/brook";
|
||||
|
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "clash";
|
||||
version = "1.10.6";
|
||||
version = "1.11.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Dreamacro";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-v9MUMgHIpHDUEmB5vXOIOkSriX+PCPtiiHHB4H5FeMw=";
|
||||
sha256 = "sha256-8g5rrkRA31wHvwY3JDFIU+slU0cLHFpADyd897hVyw0=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-egbXCRmC862tctapMUWTcNej1g6a9wCt2JIC9DSEP6k=";
|
||||
vendorSha256 = "sha256-iW14KxtUY2nhpShcdrHLiCRZxsoXyLSPt01dB0Ds28Y=";
|
||||
|
||||
# Do not build testing suit
|
||||
excludedPackages = [ "./test" ];
|
||||
|
|
|
@ -1,61 +1,54 @@
|
|||
{ lib, stdenv, fetchFromGitHub, sqlite, pkg-config, autoreconfHook, pmccabe
|
||||
, xapian, glib, gmime3, texinfo, emacs, guile
|
||||
, gtk3, webkitgtk, libsoup, icu
|
||||
, makeWrapper
|
||||
, withMug ? false
|
||||
, batchSize ? null }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
, coreutils
|
||||
, emacs
|
||||
, glib
|
||||
, gmime3
|
||||
, texinfo
|
||||
, xapian
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mu";
|
||||
version = "1.6.11";
|
||||
version = "1.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "djcb";
|
||||
repo = "mu";
|
||||
rev = version;
|
||||
sha256 = "E/6+vEwYXk65/ZoAtUeTjvg56g6gz+Qtcaz0qwEru6c=";
|
||||
rev = "v${version}";
|
||||
sha256 = "rb8R04eU/rG7PXx/horYk0+/3AgbxYYZtxy4ACILOZ8=";
|
||||
};
|
||||
|
||||
postPatch = lib.optionalString (batchSize != null) ''
|
||||
sed -i lib/mu-store.cc --regexp-extended \
|
||||
-e 's@(constexpr auto BatchSize).*@\1 = ${toString batchSize};@'
|
||||
'';
|
||||
postPatch = ''
|
||||
# Fix mu4e-builddir (set it to $out)
|
||||
substituteInPlace mu4e/mu4e-config.el.in \
|
||||
--replace "@abs_top_builddir@" "$out"
|
||||
substituteInPlace lib/utils/mu-utils.cc \
|
||||
--replace "/bin/rm" "${coreutils}/bin/rm"
|
||||
'';
|
||||
|
||||
buildInputs = [
|
||||
sqlite xapian glib gmime3 texinfo emacs libsoup icu
|
||||
]
|
||||
# Workaround for https://github.com/djcb/mu/issues/1641
|
||||
++ lib.optional (!stdenv.isDarwin) guile
|
||||
++ lib.optionals withMug [ gtk3 webkitgtk ];
|
||||
buildInputs = [ emacs glib gmime3 texinfo xapian ];
|
||||
|
||||
nativeBuildInputs = [ pkg-config autoreconfHook pmccabe makeWrapper ];
|
||||
mesonFlags = [
|
||||
"-Dguile=disabled"
|
||||
"-Dreadline=disabled"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ pkg-config meson ninja ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
preBuild = ''
|
||||
# Fix mu4e-builddir (set it to $out)
|
||||
substituteInPlace mu4e/mu4e-meta.el.in \
|
||||
--replace "@abs_top_builddir@" "$out"
|
||||
'';
|
||||
|
||||
# Make sure included scripts can find their dependencies & optionally install mug
|
||||
postInstall = ''
|
||||
wrapProgram "$out/bin/mu" \
|
||||
--prefix LD_LIBRARY_PATH : "$out/lib" \
|
||||
--prefix GUILE_LOAD_PATH : "$out/share/guile/site/2.2"
|
||||
'' + lib.optionalString withMug ''
|
||||
for f in mug ; do
|
||||
install -m755 toys/$f/$f $out/bin/$f
|
||||
done
|
||||
'';
|
||||
|
||||
doCheck = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "A collection of utilties for indexing and searching Maildirs";
|
||||
license = licenses.gpl3Plus;
|
||||
homepage = "https://www.djcbsoftware.nl/code/mu/";
|
||||
changelog = "https://github.com/djcb/mu/releases/tag/${version}";
|
||||
changelog = "https://github.com/djcb/mu/releases/tag/v${version}";
|
||||
maintainers = with maintainers; [ antono chvp peterhoeg ];
|
||||
platforms = platforms.mesaPlatforms;
|
||||
};
|
||||
|
|
52
pkgs/tools/security/regpg/default.nix
Normal file
52
pkgs/tools/security/regpg/default.nix
Normal file
|
@ -0,0 +1,52 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, makeWrapper
|
||||
, gnupg
|
||||
, perl
|
||||
}:
|
||||
|
||||
let
|
||||
perlEnv = perl.withPackages (p: with p; [ TextMarkdown ]);
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "regpg";
|
||||
version = "1.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fanf2";
|
||||
repo = "regpg";
|
||||
rev = "regpg-${version}";
|
||||
sha256 = "2ea99950804078190e1cc2a76d4740e3fdd5395a9043db3f3fe86bf2477d3a7d";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper perlEnv ];
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs ./util/insert-here.pl ./util/markdown.pl
|
||||
substituteInPlace ./Makefile \
|
||||
--replace 'util/insert-here.pl' 'perl util/insert-here.pl'
|
||||
substituteInPlace ./Makefile \
|
||||
--replace 'util/markdown.pl' 'perl util/markdown.pl'
|
||||
substituteInPlace util/insert-here.pl \
|
||||
--replace 'qx(git describe)' '"regpg-${version}"'
|
||||
'';
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
makeFlags = [ "prefix=$(out)" ];
|
||||
|
||||
postFixup = ''
|
||||
patchShebangs $out/bin/regpg
|
||||
wrapProgram $out/bin/regpg --prefix PATH ":" \
|
||||
"${lib.makeBinPath [ gnupg ]}"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "GPG wrapper utility for storing secrets in VCS";
|
||||
homepage = "https://dotat.at/prog/regpg";
|
||||
license = licenses.gpl3;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ _0xC45 ];
|
||||
};
|
||||
}
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dos2unix";
|
||||
version = "7.4.2";
|
||||
version = "7.4.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://waterlan.home.xs4all.nl/dos2unix/${pname}-${version}.tar.gz";
|
||||
sha256 = "00dfsf4rfyjb5j12gan8xjiirm0asshdz6dmd3l34a7ays6wadb0";
|
||||
sha256 = "sha256-to20GVba+TOChCOqMFEOAMEtKe9ZFucV6NTmlP5mynI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ perl gettext ];
|
||||
|
|
|
@ -6809,6 +6809,8 @@ with pkgs;
|
|||
|
||||
grpc-tools = callPackage ../development/tools/misc/grpc-tools { };
|
||||
|
||||
grpc-client-cli = callPackage ../development/tools/misc/grpc-client-cli { };
|
||||
|
||||
grub = pkgsi686Linux.callPackage ../tools/misc/grub ({
|
||||
stdenv = overrideCC stdenv buildPackages.pkgsi686Linux.gcc6;
|
||||
} // (config.grub or {}));
|
||||
|
@ -10007,6 +10009,8 @@ with pkgs;
|
|||
|
||||
reftools = callPackage ../development/tools/reftools { };
|
||||
|
||||
regpg = callPackage ../tools/security/regpg { };
|
||||
|
||||
remote-touchpad = callPackage ../tools/inputmethods/remote-touchpad { };
|
||||
|
||||
reposurgeon = callPackage ../applications/version-management/reposurgeon { };
|
||||
|
|
Loading…
Reference in a new issue