update flake lock, fix all errors (small tweaks)
This commit is contained in:
parent
42a6516376
commit
7232b225b7
36
flake.lock
36
flake.lock
|
|
@ -82,11 +82,11 @@
|
|||
"treefmt-nix": "treefmt-nix"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1743440092,
|
||||
"narHash": "sha256-6ykgLcWM5nHYtl26DzvMW5/XKzvetb+PGyXlI/+lTtU=",
|
||||
"lastModified": 1743460818,
|
||||
"narHash": "sha256-NmpDlQORTW1T2xot97mim7+4CQySFMMoWF10Ix8CXcY=",
|
||||
"owner": "koverstreet",
|
||||
"repo": "bcachefs-tools",
|
||||
"rev": "33483738c63542ce110ef74866a0d2468d87795c",
|
||||
"rev": "3aa2a4c47ce57ff3965b75df9dde1a7b40ed6ae1",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -503,11 +503,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1743438213,
|
||||
"narHash": "sha256-ZZDN+0v1r4I1xkQWlt8euOJv5S4EvElUCZMrDjTCEsY=",
|
||||
"lastModified": 1743519130,
|
||||
"narHash": "sha256-Nw6sLnuwDPW7pBJ5jIvFFMqBfeK31xcp7/w1oYH1Q7U=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "ccd7df836e1f42ea84806760f25b77b586370259",
|
||||
"rev": "0afad8f08014c992c832466c1d46a0aa96ca2563",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -728,11 +728,11 @@
|
|||
},
|
||||
"nixpkgs-edge": {
|
||||
"locked": {
|
||||
"lastModified": 1743441273,
|
||||
"narHash": "sha256-Bi22mEJLbL+oVXZSkEKcOfAHnmh2DdJTBSWdEoIk3Mc=",
|
||||
"lastModified": 1743520842,
|
||||
"narHash": "sha256-5lWR/Ku1xrwDGacNRyCUrCYr66AdR6BntH6vfHUpZns=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "dd0d35a8829dce4ef4f657534df24a2b71569e28",
|
||||
"rev": "963f97c0792f299d42f6ff9245618383bbce825e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -822,11 +822,11 @@
|
|||
},
|
||||
"nixpkgs_6": {
|
||||
"locked": {
|
||||
"lastModified": 1743076231,
|
||||
"narHash": "sha256-yQugdVfi316qUfqzN8JMaA2vixl+45GxNm4oUfXlbgw=",
|
||||
"lastModified": 1743441817,
|
||||
"narHash": "sha256-+OE03P3u0FRwhS+Ah6EYiwxdS1rcIYlXheuXGM3wP3Q=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "6c5963357f3c1c840201eda129a99d455074db04",
|
||||
"rev": "3eeaa42ef4c19447b48d1c676fe59077dfd0846e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -1053,11 +1053,11 @@
|
|||
"nixpkgs": "nixpkgs_6"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1743305778,
|
||||
"narHash": "sha256-Ux/UohNtnM5mn9SFjaHp6IZe2aAnUCzklMluNtV6zFo=",
|
||||
"lastModified": 1743502316,
|
||||
"narHash": "sha256-zI2WSkU+ei4zCxT+IVSQjNM9i0ST++T2qSFXTsAND7s=",
|
||||
"owner": "Mic92",
|
||||
"repo": "sops-nix",
|
||||
"rev": "8e873886bbfc32163fe027b8676c75637b7da114",
|
||||
"rev": "e7f4d7ed8bce8dfa7d2f2fe6f8b8f523e54646f8",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -1088,11 +1088,11 @@
|
|||
"tinted-zed": "tinted-zed"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1743434236,
|
||||
"narHash": "sha256-KH9Qdnjj9FJuktRHhK5hsQdeSPYsZfGRB7t+Q34In34=",
|
||||
"lastModified": 1743496321,
|
||||
"narHash": "sha256-xhHg8ixBhZngvGOMb2SJuJEHhHA10n8pA02fEKuKzek=",
|
||||
"owner": "danth",
|
||||
"repo": "stylix",
|
||||
"rev": "c546582bae1a2c8745295a167b8db779215d780b",
|
||||
"rev": "54721996d6590267d095f63297d9051e9342a33d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
|||
|
|
@ -131,7 +131,7 @@
|
|||
nix-index-database.nixosModules.nix-index
|
||||
{
|
||||
home-manager.sharedModules = [
|
||||
inputs.catppuccin.homeManagerModules.catppuccin
|
||||
catppuccin.homeModules.catppuccin
|
||||
./home-manager/shared
|
||||
sops-nix.homeManagerModules.sops
|
||||
];
|
||||
|
|
@ -164,7 +164,7 @@
|
|||
nixosModules = import ./modules/nixos;
|
||||
# Reusable home-manager modules you might want to export
|
||||
# These are usually stuff you would upstream into home-manager
|
||||
homeManagerModules = import ./modules/home-manager;
|
||||
# homeManagerModules = import ./modules/home-manager;
|
||||
|
||||
# Your custom packages and modifications, exported as overlays
|
||||
overlays = import ./overlays {inherit inputs;};
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "helix";
|
||||
version = "24.07";
|
||||
version = "25.01.1";
|
||||
|
||||
# This release tarball includes source code for the tree-sitter grammars,
|
||||
# which is not ordinarily part of the repository.
|
||||
|
|
@ -17,6 +17,7 @@ rustPlatform.buildRustPackage rec {
|
|||
stripRoot = false;
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "";
|
||||
|
||||
nativeBuildInputs = [git installShellFiles];
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@
|
|||
install-nix-no-inhibit
|
||||
update
|
||||
upgrade
|
||||
# simple-completion-language-server
|
||||
simple-completion-language-server
|
||||
|
||||
# System tools
|
||||
age
|
||||
|
|
|
|||
|
|
@ -1,202 +0,0 @@
|
|||
{
|
||||
lib,
|
||||
buildNpmPackage,
|
||||
cargo,
|
||||
copyDesktopItems,
|
||||
dbus,
|
||||
electron_28,
|
||||
fetchFromGitLab,
|
||||
glib,
|
||||
gnome,
|
||||
gtk3,
|
||||
jq,
|
||||
libsecret,
|
||||
makeDesktopItem,
|
||||
makeWrapper,
|
||||
moreutils,
|
||||
napi-rs-cli,
|
||||
nodejs_18,
|
||||
patchutils_0_4_2,
|
||||
pkg-config,
|
||||
python3,
|
||||
runCommand,
|
||||
rustc,
|
||||
rustPlatform,
|
||||
}: let
|
||||
description = "A secure and free password manager for all of your devices";
|
||||
icon = "bitwarden";
|
||||
electron = electron_28;
|
||||
in
|
||||
buildNpmPackage rec {
|
||||
pname = "bitwarden-desktop";
|
||||
version = "2024.3.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "videostreaming";
|
||||
repo = "fcast";
|
||||
rev = "b13d0f7e8150c279d377a78f89d338b7fc0f5539";
|
||||
hash = "sha256-XEZB95GnfSy/wtTWpF8KlUQwyephUZmSLtbOwbcvd7g=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./electron-builder-package-lock.patch
|
||||
];
|
||||
|
||||
# The nested package-lock.json from upstream is out-of-date, so copy the
|
||||
# lock metadata from the root package-lock.json.
|
||||
postPatch = ''
|
||||
cat {,apps/desktop/src/}package-lock.json \
|
||||
| ${lib.getExe jq} -s '
|
||||
.[1].packages."".dependencies.argon2 = .[0].packages."".dependencies.argon2
|
||||
| .[0].packages."" = .[1].packages.""
|
||||
| .[1].packages = .[0].packages
|
||||
| .[1]
|
||||
' \
|
||||
| ${moreutils}/bin/sponge apps/desktop/src/package-lock.json
|
||||
'';
|
||||
|
||||
nodejs = nodejs_18;
|
||||
|
||||
makeCacheWritable = true;
|
||||
npmFlags = ["--legacy-peer-deps"];
|
||||
npmWorkspace = "apps/desktop";
|
||||
npmDepsHash = "sha256-EpZXA+GkmHl5eqwIPTGHJZqrpr6k8gXneJG+GXumlkc=";
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
name = "${pname}-${version}";
|
||||
inherit src;
|
||||
patches =
|
||||
map
|
||||
(
|
||||
patch:
|
||||
runCommand
|
||||
(builtins.baseNameOf patch)
|
||||
{nativeBuildInputs = [patchutils_0_4_2];}
|
||||
''
|
||||
< ${patch} filterdiff -p1 --include=${lib.escapeShellArg cargoRoot}'/*' > $out
|
||||
''
|
||||
)
|
||||
patches;
|
||||
patchFlags = ["-p4"];
|
||||
sourceRoot = "${src.name}/${cargoRoot}";
|
||||
hash = "sha256-qAqEFlUzT28fw6kLB8d7U8yXWevAU+q03zjN2xWsGyI=";
|
||||
};
|
||||
cargoRoot = "apps/desktop/desktop_native";
|
||||
|
||||
env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
|
||||
|
||||
nativeBuildInputs = [
|
||||
cargo
|
||||
copyDesktopItems
|
||||
jq
|
||||
makeWrapper
|
||||
moreutils
|
||||
napi-rs-cli
|
||||
pkg-config
|
||||
python3
|
||||
rustc
|
||||
rustPlatform.cargoCheckHook
|
||||
rustPlatform.cargoSetupHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
glib
|
||||
gtk3
|
||||
libsecret
|
||||
];
|
||||
|
||||
preBuild = ''
|
||||
if [[ $(jq --raw-output '.devDependencies.electron' < package.json | grep -E --only-matching '^[0-9]+') != ${lib.escapeShellArg (lib.versions.major electron.version)} ]]; then
|
||||
echo 'ERROR: electron version mismatch'
|
||||
exit 1
|
||||
fi
|
||||
'';
|
||||
|
||||
postBuild = ''
|
||||
pushd apps/desktop
|
||||
|
||||
# desktop_native/index.js loads a file of that name regarldess of the libc being used
|
||||
mv desktop_native/desktop_native.* desktop_native/desktop_native.linux-x64-musl.node
|
||||
|
||||
npm exec electron-builder -- \
|
||||
--dir \
|
||||
-c.electronDist=${electron}/libexec/electron \
|
||||
-c.electronVersion=${electron.version}
|
||||
|
||||
popd
|
||||
'';
|
||||
|
||||
doCheck = true;
|
||||
|
||||
nativeCheckInputs = [
|
||||
dbus
|
||||
(gnome.gnome-keyring.override {useWrappedDaemon = false;})
|
||||
];
|
||||
|
||||
checkFlags = [
|
||||
"--skip=password::password::tests::test"
|
||||
];
|
||||
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
|
||||
pushd ${cargoRoot}
|
||||
export HOME=$(mktemp -d)
|
||||
export -f cargoCheckHook runHook _eval _callImplicitHook
|
||||
export cargoCheckType=release
|
||||
dbus-run-session \
|
||||
--config-file=${dbus}/share/dbus-1/session.conf \
|
||||
-- bash -e -c cargoCheckHook
|
||||
popd
|
||||
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir $out
|
||||
|
||||
pushd apps/desktop/dist/linux-unpacked
|
||||
mkdir -p $out/opt/Bitwarden
|
||||
cp -r locales resources{,.pak} $out/opt/Bitwarden
|
||||
popd
|
||||
|
||||
makeWrapper '${electron}/bin/electron' "$out/bin/bitwarden" \
|
||||
--add-flags $out/opt/Bitwarden/resources/app.asar \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \
|
||||
--set-default ELECTRON_IS_DEV 0 \
|
||||
--inherit-argv0
|
||||
|
||||
pushd apps/desktop/resources/icons
|
||||
for icon in *.png; do
|
||||
dir=$out/share/icons/hicolor/"''${icon%.png}"/apps
|
||||
mkdir -p "$dir"
|
||||
cp "$icon" "$dir"/${icon}.png
|
||||
done
|
||||
popd
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
desktopItems = [
|
||||
(makeDesktopItem {
|
||||
name = "bitwarden";
|
||||
exec = "bitwarden %U";
|
||||
inherit icon;
|
||||
comment = description;
|
||||
desktopName = "Bitwarden";
|
||||
categories = ["Utility"];
|
||||
})
|
||||
];
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/bitwarden/clients/releases/tag/${src.rev}";
|
||||
inherit description;
|
||||
homepage = "https://bitwarden.com";
|
||||
license = lib.licenses.gpl3;
|
||||
maintainers = with lib.maintainers; [amarshall kiwi];
|
||||
platforms = ["x86_64-linux"];
|
||||
mainProgram = "bitwarden";
|
||||
};
|
||||
}
|
||||
|
|
@ -5,16 +5,17 @@
|
|||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "simple-completion-language-server";
|
||||
version = "ff9f90bc96c347f284571bc6310bc31f95508d55";
|
||||
version = "6c797949ad5a6e9548b60b5475d1c9977f26c811";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "estin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-qybbZXjKzKcc6UXfAjwmkkB+qEUuGQXABRbMj7bNksM=";
|
||||
hash = "sha256-cITZdlDB03i7gOYbahV99wZOQ7tisnqdT/N2Z12oLFM=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-VTz2Fm+PRUPM5+u9D+2TzGGIEQwb1j0Lz0WRaQ5/Yzo=";
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-nannF4BKRLCcsS7VznzEHqrhLHYvN4X22t8jud87XEM=";
|
||||
meta = with lib; {
|
||||
description = "Language server to enable word completion and snippets for Helix editor";
|
||||
homepage = "https://github.com/estin/simple-completion-language-server";
|
||||
|
|
|
|||
Loading…
Reference in a new issue