Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
69f8807e20
|
|
@ -1558,6 +1558,12 @@
|
|||
githubId = 160646;
|
||||
name = "Patrick Jackson";
|
||||
};
|
||||
arduano = {
|
||||
email = "leonid.shchurov@gmail.com";
|
||||
github = "arduano";
|
||||
githubId = 13347712;
|
||||
name = "Leo Shchurov";
|
||||
};
|
||||
ardumont = {
|
||||
email = "eniotna.t@gmail.com";
|
||||
github = "ardumont";
|
||||
|
|
@ -1989,12 +1995,6 @@
|
|||
githubId = 687218;
|
||||
name = "averelld";
|
||||
};
|
||||
avery = {
|
||||
email = "averyl+nixos@protonmail.com";
|
||||
github = "AveryLychee";
|
||||
githubId = 9147625;
|
||||
name = "Avery Lychee";
|
||||
};
|
||||
avh4 = {
|
||||
email = "gruen0aermel@gmail.com";
|
||||
github = "avh4";
|
||||
|
|
@ -3248,6 +3248,12 @@
|
|||
matrix = "@cawilliamson:nixos.dev";
|
||||
name = "Christopher A. Williamson";
|
||||
};
|
||||
cbarrete = {
|
||||
github = "cbarrete";
|
||||
githubId = 62146989;
|
||||
matrix = "@cedric:cbarrete.com";
|
||||
name = "Cédric Barreteau";
|
||||
};
|
||||
cbleslie = {
|
||||
email = "cameronleslie@gmail.com";
|
||||
github = "cbleslie";
|
||||
|
|
@ -14423,6 +14429,12 @@
|
|||
githubId = 42322511;
|
||||
name = "Patryk Kwiatek";
|
||||
};
|
||||
nokazn = {
|
||||
email = "me@nokazn.me";
|
||||
github = "nokazn";
|
||||
githubId = 41154684;
|
||||
name = "nokazn";
|
||||
};
|
||||
nomeata = {
|
||||
email = "mail@joachim-breitner.de";
|
||||
github = "nomeata";
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
, ninja
|
||||
, pkg-config
|
||||
, python3
|
||||
, wrapGAppsHook
|
||||
, wrapGAppsHook4
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
|
|||
ninja
|
||||
pkg-config
|
||||
python3
|
||||
wrapGAppsHook
|
||||
wrapGAppsHook4
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
|
|
@ -58,6 +58,8 @@ stdenv.mkDerivation rec {
|
|||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace data/meson_post_install.py \
|
||||
--replace-fail 'gtk-update-icon-cache' 'gtk4-update-icon-cache'
|
||||
patchShebangs data/meson_post_install.py
|
||||
patchShebangs libparlatype/tests/data/generate_config_data
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -64,7 +64,7 @@
|
|||
, sratom
|
||||
, texi2html
|
||||
, vamp-plugin-sdk
|
||||
, wrapGAppsHook
|
||||
, wrapGAppsHook4
|
||||
, xdg-utils
|
||||
, xxHash
|
||||
, zix
|
||||
|
|
@ -112,7 +112,7 @@ stdenv.mkDerivation rec {
|
|||
python3.pkgs.sphinx
|
||||
sassc
|
||||
texi2html
|
||||
wrapGAppsHook
|
||||
wrapGAppsHook4
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, pkg-config
|
||||
, wrapGAppsHook
|
||||
, wrapGAppsHook4
|
||||
, glib
|
||||
, gtk4
|
||||
, pango
|
||||
|
|
@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec {
|
|||
|
||||
buildFeatures = [ "gtk4_8" ];
|
||||
|
||||
nativeBuildInputs = [ pkg-config wrapGAppsHook];
|
||||
nativeBuildInputs = [ pkg-config wrapGAppsHook4 ];
|
||||
buildInputs = [ glib gtk4 pango librsvg ];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -1 +1,3 @@
|
|||
{}
|
||||
{
|
||||
"kak-lsp": { "new": "kakoune-lsp", "date": "2024-04-01" }
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
{ lib, stdenv, fetchFromGitHub, fetchFromGitLab, fetchgit
|
||||
, buildKakounePluginFrom2Nix
|
||||
, kak-lsp, parinfer-rust, rep
|
||||
, kakoune-lsp, parinfer-rust, rep
|
||||
, fzf, git, guile, kakoune-unwrapped, lua5_3, plan9port
|
||||
}:
|
||||
|
||||
self: super: {
|
||||
inherit kak-lsp parinfer-rust rep;
|
||||
inherit kakoune-lsp parinfer-rust rep;
|
||||
|
||||
case-kak = buildKakounePluginFrom2Nix {
|
||||
pname = "case-kak";
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
, lib
|
||||
, libadwaita
|
||||
, python3Packages
|
||||
, wrapGAppsHook
|
||||
, wrapGAppsHook4
|
||||
, meson
|
||||
, ninja
|
||||
, desktop-file-utils
|
||||
|
|
@ -26,7 +26,7 @@ python3Packages.buildPythonApplication rec {
|
|||
|
||||
nativeBuildInputs = [
|
||||
gobject-introspection
|
||||
wrapGAppsHook
|
||||
wrapGAppsHook4
|
||||
desktop-file-utils
|
||||
appstream-glib
|
||||
meson
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ lib
|
||||
, python3
|
||||
, fetchFromGitHub
|
||||
, wrapGAppsHook
|
||||
, wrapGAppsHook4
|
||||
, appstream-glib
|
||||
, desktop-file-utils
|
||||
, gettext
|
||||
|
|
@ -31,7 +31,7 @@ python3.pkgs.buildPythonApplication rec {
|
|||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
wrapGAppsHook
|
||||
wrapGAppsHook4
|
||||
appstream-glib
|
||||
desktop-file-utils
|
||||
gettext
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
, pkg-config
|
||||
, python3
|
||||
, stdenv
|
||||
, wrapGAppsHook
|
||||
, wrapGAppsHook4
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
|
|
@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
wrapGAppsHook
|
||||
wrapGAppsHook4
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
|
|
@ -46,6 +46,8 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace build-aux/meson/postinstall.py \
|
||||
--replace-fail 'gtk-update-icon-cache' 'gtk4-update-icon-cache'
|
||||
patchShebangs build-aux/meson/postinstall.py
|
||||
'';
|
||||
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
, ninja
|
||||
, pkg-config
|
||||
, rustc
|
||||
, wrapGAppsHook
|
||||
, wrapGAppsHook4
|
||||
, python3
|
||||
, git
|
||||
, glib
|
||||
|
|
@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
|
|||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
wrapGAppsHook
|
||||
wrapGAppsHook4
|
||||
python3
|
||||
git
|
||||
desktop-file-utils
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
, gobject-introspection
|
||||
, vulkan-tools
|
||||
, python3
|
||||
, wrapGAppsHook
|
||||
, wrapGAppsHook4
|
||||
, gdk-pixbuf
|
||||
, lsb-release
|
||||
, glxinfo
|
||||
|
|
@ -35,7 +35,7 @@ python3.pkgs.buildPythonApplication rec {
|
|||
meson
|
||||
ninja
|
||||
gobject-introspection
|
||||
wrapGAppsHook
|
||||
wrapGAppsHook4
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
, python3Packages
|
||||
, gobject-introspection
|
||||
, libadwaita
|
||||
, wrapGAppsHook
|
||||
, wrapGAppsHook4
|
||||
, lmmath
|
||||
}:
|
||||
|
||||
|
|
@ -18,7 +18,7 @@ python3Packages.buildPythonApplication rec {
|
|||
hash = "sha256-GjNpaorxkkhZsqrKq4kO5nqF5+4I4tmSc023AZpY8Sw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ gobject-introspection wrapGAppsHook ];
|
||||
nativeBuildInputs = [ gobject-introspection wrapGAppsHook4 ];
|
||||
buildInputs = [ libadwaita ];
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
|
|
|
|||
|
|
@ -1,15 +1,15 @@
|
|||
{
|
||||
"packageVersion": "124.0.1-1",
|
||||
"packageVersion": "124.0.2-1",
|
||||
"source": {
|
||||
"rev": "124.0.1-1",
|
||||
"sha256": "1qyhwxc16qsmq3bvsmdwqib47v27fly1szq7jh78dylpib8xgb6f"
|
||||
"rev": "124.0.2-1",
|
||||
"sha256": "0qh40l1pif0b6n1amiw18pr13gvmi7rjd89q6n1qz8y14yf9w5xp"
|
||||
},
|
||||
"settings": {
|
||||
"rev": "8a499ecdab8a5136faee50aae1fdd48997711de6",
|
||||
"sha256": "1c12y7b09rrz8zlpar8nnd9k2nvldjqq3cicbc57g6s1npnf8rz6"
|
||||
},
|
||||
"firefox": {
|
||||
"version": "124.0.1",
|
||||
"sha512": "282c45e5c468419536dd8b81c8ea687b10d8002d7521403330e6eeef49207143bee88a44c3785748d461ed9a72687606f5da14f4dfb98eb40a5cd08a4a12722b"
|
||||
"version": "124.0.2",
|
||||
"sha512": "8cf340de6e34812f8ae3363265859a263330af770d981c3dd1ca1e7e0cfe513604d3e68184d4aa1446569aefbdf359d561fbc200faf19a5ed020a1709d9ef10e"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
, gettext
|
||||
, desktop-file-utils
|
||||
, appstream-glib
|
||||
, wrapGAppsHook
|
||||
, wrapGAppsHook4
|
||||
, python3
|
||||
# Not native
|
||||
, gst_all_1
|
||||
|
|
@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
gettext
|
||||
desktop-file-utils
|
||||
appstream-glib
|
||||
wrapGAppsHook
|
||||
wrapGAppsHook4
|
||||
python3
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ lib, stdenv, fetchFromGitHub
|
||||
, buildPackages
|
||||
, vala, cmake, ninja, wrapGAppsHook, pkg-config, gettext
|
||||
, vala, cmake, ninja, wrapGAppsHook4, pkg-config, gettext
|
||||
, gobject-introspection, glib, gdk-pixbuf, gtk4, glib-networking
|
||||
, libadwaita
|
||||
, libnotify, libsoup, libgee
|
||||
|
|
@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
|
|||
cmake
|
||||
ninja # https://github.com/dino/dino/issues/230
|
||||
pkg-config
|
||||
wrapGAppsHook
|
||||
wrapGAppsHook4
|
||||
gettext
|
||||
gobject-introspection
|
||||
];
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
, python3
|
||||
, webkitgtk_6_0
|
||||
, blueprint-compiler
|
||||
, wrapGAppsHook
|
||||
, wrapGAppsHook4
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
|
|||
pkg-config
|
||||
python3
|
||||
blueprint-compiler
|
||||
wrapGAppsHook
|
||||
wrapGAppsHook4
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -8,31 +8,33 @@
|
|||
, go
|
||||
, wrapQtAppsHook
|
||||
, qtbase
|
||||
, qtquickcontrols2
|
||||
, qtdeclarative
|
||||
, qtsvg
|
||||
, kconfig
|
||||
, kcoreaddons
|
||||
, kguiaddons
|
||||
, ki18n
|
||||
, kirigami2
|
||||
, kirigami
|
||||
, kirigami-addons
|
||||
, knotifications
|
||||
, nlohmann_json
|
||||
}:
|
||||
|
||||
let
|
||||
version = "0.9.0";
|
||||
version = "0.16.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "f-koehler";
|
||||
repo = "KTailctl";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-nY6DEHkDVWIlvc64smXb9KshrhNgNLKiilYydbMKCqc=";
|
||||
hash = "sha256-fIx6XfNGK+jDpeaoCzTKwv3J01yWoHOgWxjbwTGVK1U=";
|
||||
};
|
||||
|
||||
goDeps = (buildGoModule {
|
||||
pname = "tailwrap";
|
||||
inherit src version;
|
||||
modRoot = "tailwrap";
|
||||
vendorHash = "sha256-Y9xhoTf3vCtiNi5qOPg020EQmASo58BZI3rAoUEC8qE=";
|
||||
vendorHash = "sha256-egTzSdOKrhdEBKarIfROxZUsxbnR9F1JDbdoKzGf9UM=";
|
||||
}).goModules;
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
|
|
@ -63,14 +65,15 @@ stdenv.mkDerivation {
|
|||
|
||||
buildInputs = [
|
||||
qtbase
|
||||
qtquickcontrols2
|
||||
qtdeclarative
|
||||
qtsvg
|
||||
kconfig
|
||||
kcoreaddons
|
||||
kguiaddons
|
||||
ki18n
|
||||
kirigami2
|
||||
kirigami-addons
|
||||
kirigami
|
||||
knotifications
|
||||
nlohmann_json
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -62,7 +62,7 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
homepage = "https://strlen.com/treesheets/";
|
||||
maintainers = with maintainers; [ obadz avery ];
|
||||
maintainers = with maintainers; [ obadz ];
|
||||
platforms = platforms.unix;
|
||||
license = licenses.zlib;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -18,9 +18,8 @@
|
|||
, libgee
|
||||
, callPackage
|
||||
, python3
|
||||
, gtk3
|
||||
, desktop-file-utils
|
||||
, wrapGAppsHook
|
||||
, wrapGAppsHook4
|
||||
, sixelSupport ? false
|
||||
}:
|
||||
|
||||
|
|
@ -48,6 +47,8 @@ stdenv.mkDerivation rec {
|
|||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace build-aux/meson/postinstall.py \
|
||||
--replace-fail 'gtk-update-icon-cache' 'gtk4-update-icon-cache'
|
||||
patchShebangs build-aux/meson/postinstall.py
|
||||
'';
|
||||
|
||||
|
|
@ -57,9 +58,8 @@ stdenv.mkDerivation rec {
|
|||
pkg-config
|
||||
vala
|
||||
sassc
|
||||
wrapGAppsHook
|
||||
wrapGAppsHook4
|
||||
python3
|
||||
gtk3 # For gtk-update-icon-cache
|
||||
desktop-file-utils # For update-desktop-database
|
||||
];
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
, wrapGAppsHook
|
||||
, wrapGAppsHook4
|
||||
, desktop-file-utils
|
||||
, feedbackd
|
||||
, gtk4
|
||||
|
|
@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
|
|||
ninja
|
||||
phosh
|
||||
pkg-config
|
||||
wrapGAppsHook
|
||||
wrapGAppsHook4
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
{ appstream-glib
|
||||
, cargo
|
||||
, dbus
|
||||
, desktop-file-utils
|
||||
, fetchFromGitLab
|
||||
, git
|
||||
|
|
@ -16,7 +17,7 @@
|
|||
, rustPlatform
|
||||
, rustc
|
||||
, stdenv
|
||||
, wrapGAppsHook
|
||||
, wrapGAppsHook4
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "audio-sharing";
|
||||
|
|
@ -46,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
pkg-config
|
||||
python3
|
||||
rustc
|
||||
wrapGAppsHook
|
||||
wrapGAppsHook4
|
||||
] ++ (with rustPlatform; [
|
||||
cargoSetupHook
|
||||
]);
|
||||
|
|
@ -59,6 +60,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
gst_all_1.gstreamer
|
||||
gtk4
|
||||
libadwaita
|
||||
dbus
|
||||
];
|
||||
|
||||
passthru = {
|
||||
|
|
|
|||
|
|
@ -0,0 +1,35 @@
|
|||
{ lib, fetchFromGitHub, rustPlatform }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "buckle";
|
||||
version = "1.1.0";
|
||||
cargoHash = "sha256-O90/Xo9WjLVGFEkh6S6IyvanceRBJHneEret6W8e5Yc=";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "benbrittain";
|
||||
repo = "buckle";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-eWhcDzw+6I5N0dse5avwhcQ/y6YZ6b3QKyBwWBrA/xo=";
|
||||
};
|
||||
|
||||
checkFlags = [
|
||||
# Both tests access the network.
|
||||
"--skip=test_buck2_latest"
|
||||
"--skip=test_buck2_specific_version"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A buck2 launcher";
|
||||
longDescription = ''
|
||||
Buckle is a launcher for [Buck2](https://buck2.build). It manages
|
||||
Buck2 on a per-project basis. This enables a project or team to do
|
||||
seamless upgrades of their build system tooling. It is designed to
|
||||
be minimally intrusive. Buckle only manages fetching Buck2 and
|
||||
enforcing the prelude is upgraded in sync.
|
||||
'';
|
||||
homepage = "https://github.com/benbrittain/buckle";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ cbarrete ];
|
||||
mainProgram = "buckle";
|
||||
};
|
||||
}
|
||||
|
|
@ -3,7 +3,7 @@
|
|||
, python3Packages
|
||||
, gobject-introspection
|
||||
, libadwaita
|
||||
, wrapGAppsHook
|
||||
, wrapGAppsHook4
|
||||
, meson
|
||||
, ninja
|
||||
, desktop-file-utils
|
||||
|
|
@ -29,7 +29,7 @@ python3Packages.buildPythonApplication rec {
|
|||
|
||||
nativeBuildInputs = [
|
||||
gobject-introspection
|
||||
wrapGAppsHook
|
||||
wrapGAppsHook4
|
||||
desktop-file-utils
|
||||
meson
|
||||
ninja
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
, libfido2
|
||||
, libnotify
|
||||
, python3
|
||||
, wrapGAppsHook
|
||||
, wrapGAppsHook4
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
|
|
@ -55,7 +55,7 @@ buildGoModule rec {
|
|||
nativeBuildInputs = [
|
||||
gobject-introspection
|
||||
python3.pkgs.wrapPython
|
||||
wrapGAppsHook
|
||||
wrapGAppsHook4
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -0,0 +1,71 @@
|
|||
{ lib
|
||||
, fetchFromGitHub
|
||||
, rustPlatform
|
||||
, pkg-config
|
||||
, fontconfig
|
||||
, libGL
|
||||
, libX11
|
||||
, libXcursor
|
||||
, libXi
|
||||
, libXrandr
|
||||
, cmake
|
||||
, libxkbcommon
|
||||
, wayland
|
||||
, makeWrapper
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "gpustat";
|
||||
version = "0.1.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "arduano";
|
||||
repo = "gpustat";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-M9P/qfw/tp9ogkNOE3b2fD2rGFnii1/VwmqJHqXb7Mg=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-po/pEMZEtySZnz7l2FI7Wqbmp2CiWBijchKGkqlIMPU=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
makeWrapper
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
fontconfig
|
||||
libGL
|
||||
libX11
|
||||
libXcursor
|
||||
libXi
|
||||
libXrandr
|
||||
libxkbcommon
|
||||
wayland
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out/share/applications $out/share/pixmaps
|
||||
|
||||
cp assets/gpustat.desktop $out/share/applications
|
||||
cp assets/gpustat_icon_* $out/share/pixmaps
|
||||
'';
|
||||
|
||||
# Wrap the program in a script that sets the LD_LIBRARY_PATH environment variable
|
||||
# so that it can find the shared libraries it depends on. This is currently a
|
||||
# requirement for running Rust programs that depend on `egui` within a Nix environment.
|
||||
# https://github.com/emilk/egui/issues/2486
|
||||
postFixup = ''
|
||||
wrapProgram $out/bin/gpustat \
|
||||
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath buildInputs}:/run/opengl-driver/lib"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A simple utility for viewing GPU utilization";
|
||||
homepage = "https://github.com/arduano/gpustat";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ arduano ];
|
||||
mainProgram = "gpustat";
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,21 +1,23 @@
|
|||
{ stdenv, lib, fetchFromGitHub, rustPlatform, perl, CoreServices, Security, SystemConfiguration }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "kak-lsp";
|
||||
version = "15.0.1";
|
||||
pname = "kakoune-lsp";
|
||||
version = "16.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-W4z2YtOEBCTM+NsL1HBHSYCXJXN459chE4RW0CPMjD4=";
|
||||
sha256 = "sha256-d4Tc6iYp20uOKMd+T2LhWgXWZzvzq1E+VWqjhhiIiHE=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-tAA9eu4y1h6huNmEgY3L6v29itP5I4a8UZgoA+ANoq0=";
|
||||
cargoHash = "sha256-kV8d0PwIWS6gyfCtv70iv8MrL91ZOZbwYznhc3lUw0U=";
|
||||
|
||||
buildInputs = [ perl ] ++ lib.optionals stdenv.isDarwin [ CoreServices Security SystemConfiguration ];
|
||||
|
||||
patches = [ ./0001-Use-full-Perl-path.patch ];
|
||||
patches = [
|
||||
./Use-full-Perl-path.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace rc/lsp.kak \
|
||||
|
|
@ -24,7 +26,7 @@ rustPlatform.buildRustPackage rec {
|
|||
|
||||
meta = with lib; {
|
||||
description = "Kakoune Language Server Protocol Client";
|
||||
homepage = "https://github.com/kak-lsp/kak-lsp";
|
||||
homepage = "https://github.com/kakoune-lsp/kakoune-lsp";
|
||||
license = with licenses; [ unlicense /* or */ mit ];
|
||||
maintainers = with maintainers; [ spacekookie poweredbypie ];
|
||||
mainProgram = "kak-lsp";
|
||||
File diff suppressed because it is too large
Load Diff
|
|
@ -32,19 +32,19 @@ let
|
|||
in
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "liana";
|
||||
version = "4.0";
|
||||
version = "5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wizardsardine";
|
||||
repo = pname;
|
||||
repo = "liana";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-aeNbPtzS8QhZ+d/HC9/Nx1GvIWsCrjUrMqghIspt2+o=";
|
||||
hash = "sha256-RkZ2HSN7IjwN3tD0UhpMeQeqkb+Y79kSWnjJZ5KPbQk=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"liana-4.0.0" = "sha256-GT5/HlFU+Cf/Q5aQoT6ldZ+f+7I+S3wpUbq3JAhJjz8=";
|
||||
"liana-5.0.0" = "sha256-wePqsVpMBRP2eJZd8W05CaeesqY5g/rnr4OonmRzeeM=";
|
||||
"iced_futures-0.6.0" = "sha256-ejkAxU6DwiX1/119eA0GRapSmz7dqwx9M0uMwyDHATQ=";
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -0,0 +1,32 @@
|
|||
{ lib
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, pkg-config
|
||||
, udev
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec{
|
||||
pname = "makima";
|
||||
version = "0.4.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cyber-sushi";
|
||||
repo = "makima";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-uoUevsQo+BLKPwNGp7qC9wLAVTRMNiuo+wWDLRKECb0=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-k7eelGCDnfYtyU6NAas22U3jlioIqQBZ4H63p30T+E0=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ udev ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Linux daemon to remap and create macros for keyboards, mice and controllers";
|
||||
homepage = "https://github.com/cyber-sushi/makima";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ ByteSudoer ];
|
||||
platforms = platforms.linux;
|
||||
mainProgram = "makima";
|
||||
};
|
||||
}
|
||||
|
|
@ -0,0 +1,52 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, rustPlatform
|
||||
, darwin
|
||||
, libiconv
|
||||
, makeBinaryWrapper
|
||||
, pkg-config
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "proto";
|
||||
version = "0.32.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "moonrepo";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-QxaVXggVfr3O26RwSuUx4qpabhWE9+ZFLKRin/ya2e4=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-j5wXmlauhrUnUVTj/KyqDrf1y9bq3ZInREZXIUQImVE=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [
|
||||
darwin.apple_sdk.frameworks.SystemConfiguration
|
||||
libiconv
|
||||
];
|
||||
nativeBuildInputs = [ makeBinaryWrapper pkg-config ];
|
||||
|
||||
# Tests requires network access
|
||||
doCheck = false;
|
||||
cargoBuildFlags = [ "--bin proto" "--bin proto-shim" ];
|
||||
|
||||
postInstall = ''
|
||||
# proto looks up a proto-shim executable file in $PROTO_LOOKUP_DIR
|
||||
wrapProgram $out/bin/${pname} \
|
||||
--set PROTO_LOOKUP_DIR $out/bin
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "A pluggable multi-language version manager";
|
||||
longDescription = ''
|
||||
proto is a pluggable next-generation version manager for multiple programming languages. A unified toolchain.
|
||||
'';
|
||||
homepage = "https://moonrepo.dev/proto";
|
||||
changelog = "https://github.com/moonrepo/proto/releases/tag/v${version}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ nokazn ];
|
||||
mainProgram = "proto";
|
||||
platforms = lib.platforms.linux ++ lib.platforms.darwin;
|
||||
};
|
||||
}
|
||||
|
|
@ -4,7 +4,7 @@
|
|||
, pkg-config
|
||||
, gettext
|
||||
, gobject-introspection
|
||||
, wrapGAppsHook
|
||||
, wrapGAppsHook4
|
||||
, gjs
|
||||
, glib
|
||||
, gtk4
|
||||
|
|
@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
|
|||
meson
|
||||
ninja
|
||||
gobject-introspection
|
||||
wrapGAppsHook
|
||||
wrapGAppsHook4
|
||||
python3
|
||||
desktop-file-utils
|
||||
];
|
||||
|
|
@ -53,6 +53,8 @@ stdenv.mkDerivation rec {
|
|||
|
||||
postPatch = ''
|
||||
chmod +x build-aux/meson_post_install.py
|
||||
substituteInPlace build-aux/meson_post_install.py \
|
||||
--replace-fail 'gtk-update-icon-cache' 'gtk4-update-icon-cache'
|
||||
patchShebangs build-aux/meson_post_install.py
|
||||
'';
|
||||
|
||||
|
|
|
|||
|
|
@ -62,7 +62,7 @@
|
|||
, libepoxy
|
||||
, gnome-user-share
|
||||
, gnome-remote-desktop
|
||||
, wrapGAppsHook
|
||||
, wrapGAppsHook4
|
||||
, xvfb-run
|
||||
}:
|
||||
|
||||
|
|
@ -93,7 +93,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
pkg-config
|
||||
python3
|
||||
shared-mime-info
|
||||
wrapGAppsHook
|
||||
wrapGAppsHook4
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "rapidfuzz-cpp";
|
||||
version = "3.0.2";
|
||||
version = "3.0.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rapidfuzz";
|
||||
repo = "rapidfuzz-cpp";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-4J2j+/0ZVMNlrgLbEQk3me/EX07TZ/rLsT1/5ufxbic=";
|
||||
hash = "sha256-6Df0X/gkS0i1RWv1uh0Hcn/lrLlIHeRp/+vfUmQ2EmI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "hwi";
|
||||
version = "2.4.0";
|
||||
version = "3.0.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -24,7 +24,7 @@ buildPythonPackage rec {
|
|||
owner = "bitcoin-core";
|
||||
repo = "HWI";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-a1ppYDuY7CtNrKSvuAofS79nvDaYUMIm4FCHiiQYrtQ=";
|
||||
hash = "sha256-hpMH3Zy3/TTBYUukJQZw63f0KuE3O9G2aYcGdL6Q3eM=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "systembridgemodels";
|
||||
version = "4.0.3";
|
||||
version = "4.0.4";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.11";
|
||||
|
|
@ -18,12 +18,12 @@ buildPythonPackage rec {
|
|||
owner = "timmo001";
|
||||
repo = "system-bridge-models";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-5rbj58E8iDu2Rjf0k9Y1UoF3hbN7ntkx6dm20HYpw6I=";
|
||||
hash = "sha256-iFJ95ouhfbaC0D2Gkc1KO+JueYTFTOj1unnYSDyPAe8=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace systembridgemodels/_version.py \
|
||||
--replace-fail ", dev=0" ""
|
||||
--replace-fail ", dev=1" ""
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -56,7 +56,7 @@
|
|||
, grpcio
|
||||
}:
|
||||
let
|
||||
version = "0.13.0";
|
||||
version = "0.13.2";
|
||||
optional-dependencies = {
|
||||
huggingflace = [
|
||||
langdetect
|
||||
|
|
@ -90,7 +90,7 @@ buildPythonPackage {
|
|||
owner = "Unstructured-IO";
|
||||
repo = "unstructured";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-zRQOFYAh4QpDNlSPi1h70eOmw/8aTa6yAKBSgTuIhME=";
|
||||
hash = "sha256-6pR/tewHWstgIqqD8Jwj+AQutdhXU5aufm6RiEpXr9s=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -79,6 +79,12 @@ stdenv.mkDerivation rec {
|
|||
"-Dr2_gittap=${version}"
|
||||
];
|
||||
|
||||
# TODO: remove when upstream fixes the issue
|
||||
# https://github.com/radareorg/radare2/issues/22793
|
||||
env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.isDarwin [
|
||||
"-DTHREAD_CONVERT_THREAD_STATE_TO_SELF=1"
|
||||
]);
|
||||
|
||||
enableParallelBuilding = true;
|
||||
depsBuildBuild = [ buildPackages.stdenv.cc ];
|
||||
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "bazel-gazelle";
|
||||
version = "0.35.0";
|
||||
version = "0.36.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bazelbuild";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-9oWsVazmLPPptWW03H6nLTiqNBNgkzsWtYNIm5V8FdA=";
|
||||
hash = "sha256-jT+h3ehaqA6LLg2Q5JdWeHPwUomRDIapNALwa7nFDJ4=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "bazel-buildtools";
|
||||
version = "6.4.0";
|
||||
version = "7.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bazelbuild";
|
||||
repo = "buildtools";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-k4qbveJ1BORnwjOIZcJLWIGVMRjCAqVhISggQ/VTzA4=";
|
||||
hash = "sha256-/YHTMIhxFqxHpEmtYvFuQ1bjvKF6tDaYudSnBrCncPQ=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-DigTREfI6I48wxRpGp/bfH1NbUZ4E1B5UTQXpI0LY1A=";
|
||||
|
|
|
|||
|
|
@ -3,40 +3,49 @@
|
|||
, fetchFromGitHub
|
||||
, cargo
|
||||
, cmake
|
||||
, rustPlatform
|
||||
, rustc
|
||||
, libiconv
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "corrosion";
|
||||
version = "0.4.7";
|
||||
version = "0.4.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "corrosion-rs";
|
||||
repo = "corrosion";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-6jjcBBc1gtMG2sYppOIRa/tYjmUgW4kFxAuoGj7Tpgw=";
|
||||
};
|
||||
|
||||
cargoRoot = "generator";
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
inherit src;
|
||||
sourceRoot = "${src.name}/${cargoRoot}";
|
||||
name = "${pname}-${version}";
|
||||
hash = "sha256-M5Wnx+SfVvdhC5bHVZa0Di2up3Qt5z1jog8yxIKvG/Y=";
|
||||
hash = "sha256-ChoeN7qQRR1YmYYvPdJVJ2SVGTDGlM7PsN9jzFjQEyU=";
|
||||
};
|
||||
|
||||
buildInputs = lib.optional stdenv.isDarwin libiconv;
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
rustPlatform.cargoSetupHook
|
||||
cargo
|
||||
rustc
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
checkPhase = let
|
||||
excludedTests = [
|
||||
"cbindgen_rust2cpp_build"
|
||||
"cbindgen_rust2cpp_run_cpp-exe"
|
||||
"hostbuild_build"
|
||||
"hostbuild_run_rust-host-program"
|
||||
"parse_target_triple_build"
|
||||
"rustup_proxy_build"
|
||||
];
|
||||
excludedTestsRegex = lib.concatStringsSep "|" excludedTests;
|
||||
in ''
|
||||
runHook preCheck
|
||||
|
||||
ctest -E "${excludedTestsRegex}"
|
||||
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Tool for integrating Rust into an existing CMake project";
|
||||
homepage = "https://github.com/corrosion-rs/corrosion";
|
||||
|
|
|
|||
|
|
@ -26,8 +26,9 @@ mkKdeDerivation rec {
|
|||
extraNativeBuildInputs = [
|
||||
rustPlatform.cargoSetupHook
|
||||
cargo
|
||||
corrosion
|
||||
rustc
|
||||
];
|
||||
|
||||
extraBuildInputs = [corrosion xapian];
|
||||
extraBuildInputs = [xapian];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -25,8 +25,9 @@ mkKdeDerivation rec {
|
|||
extraNativeBuildInputs = [
|
||||
rustPlatform.cargoSetupHook
|
||||
cargo
|
||||
corrosion
|
||||
rustc
|
||||
];
|
||||
|
||||
extraBuildInputs = [corrosion qtsvg qtwebengine qcoro];
|
||||
extraBuildInputs = [qtsvg qtwebengine qcoro];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -28,8 +28,9 @@ mkKdeDerivation rec {
|
|||
extraNativeBuildInputs = [
|
||||
rustPlatform.cargoSetupHook
|
||||
cargo
|
||||
corrosion
|
||||
rustc
|
||||
];
|
||||
|
||||
extraBuildInputs = [corrosion discount alpaka];
|
||||
extraBuildInputs = [discount alpaka];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
# Do not edit!
|
||||
|
||||
{
|
||||
version = "2024.4.0";
|
||||
version = "2024.4.1";
|
||||
components = {
|
||||
"3_day_blinds" = ps: with ps; [
|
||||
];
|
||||
|
|
@ -4981,6 +4981,7 @@
|
|||
psutil-home-assistant
|
||||
sqlalchemy
|
||||
systembridgeconnector
|
||||
systembridgemodels
|
||||
zeroconf
|
||||
];
|
||||
"system_health" = ps: with ps; [
|
||||
|
|
|
|||
|
|
@ -508,7 +508,7 @@ let
|
|||
extraBuildInputs = extraPackages python.pkgs;
|
||||
|
||||
# Don't forget to run parse-requirements.py after updating
|
||||
hassVersion = "2024.4.0";
|
||||
hassVersion = "2024.4.1";
|
||||
|
||||
in python.pkgs.buildPythonApplication rec {
|
||||
pname = "homeassistant";
|
||||
|
|
@ -526,13 +526,13 @@ in python.pkgs.buildPythonApplication rec {
|
|||
owner = "home-assistant";
|
||||
repo = "core";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-Qca6BHeId/fHhIViU7BJhYXxoMxRSeaJQ7CJLmIBmuU=";
|
||||
hash = "sha256-fVuScSfXFQJjHLBD7w1KsswZ4yebOzPTvXffeMlWrmo=";
|
||||
};
|
||||
|
||||
# Secondary source is pypi sdist for translations
|
||||
sdist = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-SGXqDjt2wzC/rTAGlV8DSFxauUvIrG3RgOxPCUsAJQ0=";
|
||||
hash = "sha256-nMzB0qQrYRxJA1p4L4OZW25WRQBQ2hq/yZs5f3AcdAU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with python.pkgs; [
|
||||
|
|
@ -709,6 +709,10 @@ in python.pkgs.buildPythonApplication rec {
|
|||
package = home-assistant;
|
||||
command = "hass --version";
|
||||
};
|
||||
withoutCheckDeps = home-assistant.overridePythonAttrs {
|
||||
pname = "home-assistant-without-check-deps";
|
||||
doCheck = false;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ buildPythonPackage rec {
|
|||
# the frontend version corresponding to a specific home-assistant version can be found here
|
||||
# https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json
|
||||
pname = "home-assistant-frontend";
|
||||
version = "20240403.1";
|
||||
version = "20240404.1";
|
||||
format = "wheel";
|
||||
|
||||
src = fetchPypi {
|
||||
|
|
@ -12,7 +12,7 @@ buildPythonPackage rec {
|
|||
pname = "home_assistant_frontend";
|
||||
dist = "py3";
|
||||
python = "py3";
|
||||
hash = "sha256-kvgyecLgp5KFhwKl4AGhbJeq1mwhR0UVcjeZqaB+6nQ=";
|
||||
hash = "sha256-Vuk/e+wn8Cbko7tbjLIbclhdj3R+BdHzu4OSsBUAOcU=";
|
||||
};
|
||||
|
||||
# there is nothing to strip in this package
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "homeassistant-stubs";
|
||||
version = "2024.4.0";
|
||||
version = "2024.4.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = python.version != home-assistant.python.version;
|
||||
|
|
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
|||
owner = "KapJI";
|
||||
repo = "homeassistant-stubs";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-5igsxs0/1S0sYlaNxFSsTAo9HkIAqn3XZ031VjAkEQg=";
|
||||
hash = "sha256-aEQgHs7ldYvTbR+OypQg9tLYyxLIPYWYEUnw+X027x8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,10 +1,12 @@
|
|||
{ lib
|
||||
, buildGoModule
|
||||
, buildGo121Module
|
||||
, fetchFromGitHub
|
||||
, stdenv
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
# JuiceFS 1.1.2 doesn't build with Go 1.22. Fixed in upstream. This can be
|
||||
# reverted in future releases. https://github.com/juicedata/juicefs/issues/4339
|
||||
buildGo121Module rec {
|
||||
pname = "juicefs";
|
||||
version = "1.1.2";
|
||||
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
, atk
|
||||
, gdk-pixbuf
|
||||
, gtk4
|
||||
, wrapGAppsHook
|
||||
, wrapGAppsHook4
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
|
|
@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec {
|
|||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
wrapGAppsHook
|
||||
wrapGAppsHook4
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ lib, stdenv, fetchFromGitHub
|
||||
, meson, ninja, cmake, pkg-config
|
||||
, liblxi, readline, lua, bash-completion
|
||||
, wrapGAppsHook
|
||||
, wrapGAppsHook4
|
||||
, glib, gtk4, gtksourceview5, libadwaita, json-glib
|
||||
, desktop-file-utils, appstream-glib
|
||||
, gsettings-desktop-schemas
|
||||
|
|
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
nativeBuildInputs = [
|
||||
meson ninja cmake pkg-config
|
||||
] ++ lib.optional withGui wrapGAppsHook;
|
||||
] ++ lib.optional withGui wrapGAppsHook4;
|
||||
|
||||
buildInputs = [
|
||||
liblxi readline lua bash-completion
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "gopass";
|
||||
version = "1.15.12";
|
||||
version = "1.15.13";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles makeWrapper ];
|
||||
|
||||
|
|
@ -21,10 +21,10 @@ buildGoModule rec {
|
|||
owner = "gopasspw";
|
||||
repo = "gopass";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-sg3I/h0mkkWmK4GD1yoX14gM2oqwRjMXpX3KULHFJsg=";
|
||||
hash = "sha256-FoDb4+9x8waLWBk4d0TclpReu60vzNGE+8GQmKMmcMQ=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-jbwtxOfBL/5aXdWcsXZ5HQi83Oy00SSnLcvuWeCPBug=";
|
||||
vendorHash = "sha256-Om4ne8oyZBr6a4dgBIvd0NZaDwmmC68pg8D+1UApzLw=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
|
|
|||
|
|
@ -2,30 +2,21 @@
|
|||
, makeWrapper
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, gopass
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "git-credential-gopass";
|
||||
version = "1.15.12";
|
||||
version = "1.15.13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gopasspw";
|
||||
repo = "git-credential-gopass";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-5j5+so4LT3x+epEZf9OVn/kLNHBk2ENQxxRrzbziEA4=";
|
||||
hash = "sha256-X2i0w5sJXteCI1F1PAtIzElAD51I/nk1DPkBlQV5fxs=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# go mod tidy. Remove with next release
|
||||
(fetchpatch {
|
||||
url = "https://github.com/gopasspw/git-credential-gopass/commit/88d11d2b1b49f00b7fba9a917cf90f7ea14c9d1b.patch";
|
||||
hash = "sha256-mXxI9GXan0zYL8msL83VLqxOp4oAOwMyCOFaUOLAg5E=";
|
||||
})
|
||||
];
|
||||
|
||||
vendorHash = "sha256-y1PH0+tt/kcHw2I4LWD2XfLud3JtsYqrRd/yVRPdaTA=";
|
||||
vendorHash = "sha256-s1Zouw1619DbGjnZY26N6En91lzDaeDRZmul/te2z7M=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
|
|
|||
|
|
@ -2,30 +2,21 @@
|
|||
, makeWrapper
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, gopass
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gopass-hibp";
|
||||
version = "1.15.12";
|
||||
version = "1.15.13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gopasspw";
|
||||
repo = "gopass-hibp";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-5BnCaxF2XZ4f26KsTbapcZ2+Ii58nR/14pCj0c0QLKE=";
|
||||
hash = "sha256-ja9/iS6422ygnXD6lsowjmlKbNloS0Zr3CkOkO0ieus=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# go mod tidy. Remove with next release
|
||||
(fetchpatch {
|
||||
url = "https://github.com/gopasspw/gopass-hibp/commit/cdfdbc6da154874c74d7c8fc83bb11a98dd8fd81.patch";
|
||||
hash = "sha256-jCzg3c8EizhoRYvWUZCys6/q2ChVWy/psPofNGIYdxs=";
|
||||
})
|
||||
];
|
||||
|
||||
vendorHash = "sha256-GLqtwUg3fa1okdPoQBkF+ygpm8GLmDyIyUiC7/TTTaE=";
|
||||
vendorHash = "sha256-FI/GXPyibcQpNNHWPVSp4diFfbRPv2A8BFi4nRXCU+Y=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
|
|
|||
|
|
@ -2,31 +2,22 @@
|
|||
, makeWrapper
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, installShellFiles
|
||||
, gopass
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gopass-jsonapi";
|
||||
version = "1.15.12";
|
||||
version = "1.15.13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gopasspw";
|
||||
repo = "gopass-jsonapi";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-sR+48MRBHj3XpKLp/AOGf2H4ltZD1fHlIA2HPYSHdp0=";
|
||||
hash = "sha256-6l4y+osYYLtrtDmlmXuWDRqkatehwpu6ujvsk86hUIE=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# go mod tidy. Remove with next release
|
||||
(fetchpatch {
|
||||
url = "https://github.com/gopasspw/gopass-jsonapi/commit/cab33faab113d0c9702ebaa14cde13e5ccd465d2.patch";
|
||||
hash = "sha256-IoxU5r1k0Y6N+PKAZH8LEO/fXHjryx5y58RRFeHP7Bc=";
|
||||
})
|
||||
];
|
||||
|
||||
vendorHash = "sha256-2JADTyBgAK2j524G+ksKLJC255PmvMViFFCwmgtXZzA=";
|
||||
vendorHash = "sha256-R9aSa1Jy4R1ZJGWnOhnlJn3ZvT97lrf1BtuK/FadSJg=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
|
|
|||
|
|
@ -2,30 +2,21 @@
|
|||
, makeWrapper
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, gopass
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gopass-summon-provider";
|
||||
version = "1.15.12";
|
||||
version = "1.15.13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gopasspw";
|
||||
repo = "gopass-summon-provider";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-gvgHqeVB+4d8UJhMv3CYYidttCcaRPkgI7PXasv7pCI=";
|
||||
hash = "sha256-cYr9yk5AyTxEo+bO6TgBBZRDWsTR+lvGcCr4kF1aMik=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# go mod tidy. Remove with next release
|
||||
(fetchpatch {
|
||||
url = "https://github.com/gopasspw/gopass-summon-provider/commit/b3085cab14588cb6a5a383033947d9266fe0cd56.patch";
|
||||
hash = "sha256-8mvJqejqmuOloj9mW9zzsE/Xr0DtPhJeDItzVFVv4+c=";
|
||||
})
|
||||
];
|
||||
|
||||
vendorHash = "sha256-y1PH0+tt/kcHw2I4LWD2XfLud3JtsYqrRd/yVRPdaTA=";
|
||||
vendorHash = "sha256-s1Zouw1619DbGjnZY26N6En91lzDaeDRZmul/te2z7M=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
, fetchFromGitHub
|
||||
, blueprint-compiler
|
||||
, pkg-config
|
||||
, wrapGAppsHook
|
||||
, wrapGAppsHook4
|
||||
, gdk-pixbuf
|
||||
, gtk4
|
||||
, libdrm
|
||||
|
|
@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec {
|
|||
nativeBuildInputs = [
|
||||
blueprint-compiler
|
||||
pkg-config
|
||||
wrapGAppsHook
|
||||
wrapGAppsHook4
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -573,6 +573,7 @@ mapAliases ({
|
|||
# now kube3d/k3d will take it's place
|
||||
kube3d = k3d; # Added 2022-0705
|
||||
kafkacat = kcat; # Added 2021-10-07
|
||||
kak-lsp = kakoune-lsp; # Added 2024-04-01
|
||||
kdeconnect = plasma5Packages.kdeconnect-kde; # Added 2020-10-28
|
||||
keepassx = throw "KeePassX is no longer actively developed. Please consider KeePassXC as a maintained alternative."; # Added 2023-02-17
|
||||
keepassx2 = throw "KeePassX is no longer actively developed. Please consider KeePassXC as a maintained alternative."; # Added 2023-02-17
|
||||
|
|
|
|||
|
|
@ -4015,25 +4015,15 @@ with pkgs;
|
|||
|
||||
go-audit = callPackage ../tools/system/go-audit { };
|
||||
|
||||
gopass = callPackage ../tools/security/gopass {
|
||||
buildGoModule = buildGo122Module;
|
||||
};
|
||||
gopass = callPackage ../tools/security/gopass { };
|
||||
|
||||
gopass-hibp = callPackage ../tools/security/gopass/hibp.nix {
|
||||
buildGoModule = buildGo122Module;
|
||||
};
|
||||
gopass-hibp = callPackage ../tools/security/gopass/hibp.nix { };
|
||||
|
||||
gopass-jsonapi = callPackage ../tools/security/gopass/jsonapi.nix {
|
||||
buildGoModule = buildGo122Module;
|
||||
};
|
||||
gopass-jsonapi = callPackage ../tools/security/gopass/jsonapi.nix { };
|
||||
|
||||
git-credential-gopass = callPackage ../tools/security/gopass/git-credential.nix {
|
||||
buildGoModule = buildGo122Module;
|
||||
};
|
||||
git-credential-gopass = callPackage ../tools/security/gopass/git-credential.nix { };
|
||||
|
||||
gopass-summon-provider = callPackage ../tools/security/gopass/summon.nix {
|
||||
buildGoModule = buildGo122Module;
|
||||
};
|
||||
gopass-summon-provider = callPackage ../tools/security/gopass/summon.nix { };
|
||||
|
||||
gosh = callPackage ../tools/security/gosh { };
|
||||
|
||||
|
|
@ -9629,7 +9619,7 @@ with pkgs;
|
|||
|
||||
kaffeine = libsForQt5.callPackage ../applications/video/kaffeine { };
|
||||
|
||||
kak-lsp = callPackage ../tools/misc/kak-lsp {
|
||||
kakoune-lsp = callPackage ../by-name/ka/kakoune-lsp/package.nix {
|
||||
inherit (darwin.apple_sdk.frameworks) CoreServices Security SystemConfiguration;
|
||||
};
|
||||
|
||||
|
|
@ -10242,7 +10232,7 @@ with pkgs;
|
|||
|
||||
keama = callPackage ../tools/networking/keama { };
|
||||
|
||||
ktailctl = libsForQt5.callPackage ../applications/networking/ktailctl {};
|
||||
ktailctl = kdePackages.callPackage ../applications/networking/ktailctl {};
|
||||
|
||||
iredis = callPackage ../tools/admin/iredis { };
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue