youthlic/nixos
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

switch nixfmt to alejandra to format nix code

Browse source
This commit is contained in:
ulic-youthlic 2025-04-28 21:20:32 +08:00
parent 582bdb783c
commit e44894c666
Signed by: youthlic
GPG key ID: 63E86C3C14A0D721
120 changed files with 1163 additions and 1237 deletions
Download patch file Download diff file Expand all files Collapse all files

17
pkgs/_sources/generated.nix
View file

@ -1,6 +1,10 @@
# This file was generated by nvfetcher, please do not modify it manually.
{ fetchgit, fetchurl, fetchFromGitHub, dockerTools }:
{
fetchgit,
fetchurl,
fetchFromGitHub,
dockerTools,
}: {
dioxionary = {
pname = "dioxionary";
version = "4db80d458ff7494967c94ebb1db596abba0775b2";
@ -10,13 +14,12 @@
fetchSubmodules = false;
deepClone = false;
leaveDotGit = false;
sparseCheckout = [ ];
sparseCheckout = [];
sha256 = "sha256-H5uMTtDX9hBV36MtiPPlHPaL//WM11J5kdtEhyJBZIU=";
};
cargoLock."./Cargo.lock" = {
lockFile = ./dioxionary-4db80d458ff7494967c94ebb1db596abba0775b2/./Cargo.lock;
outputHashes = {
};
};
date = "2025-04-07";
@ -30,7 +33,7 @@
fetchSubmodules = false;
deepClone = false;
leaveDotGit = false;
sparseCheckout = [ ];
sparseCheckout = [];
sha256 = "sha256-s/OYlW66mu/3MHwhZCxvQv8f/rNuCB4SLZ2jYPO5UQQ=";
};
date = "2025-02-20";
@ -45,7 +48,7 @@
fetchSubmodules = false;
deepClone = false;
leaveDotGit = false;
sparseCheckout = [ "Sans/OTC" ];
sparseCheckout = ["Sans/OTC"];
sha256 = "sha256-UxbwdY2w3u6i1kBWwr5vMKvsnD3eCllN+kBrCH38KlY=";
};
};
@ -59,7 +62,7 @@
fetchSubmodules = false;
deepClone = false;
leaveDotGit = false;
sparseCheckout = [ "Serif/OTC" ];
sparseCheckout = ["Serif/OTC"];
sha256 = "sha256-mfbBSdJrUCZiUUmsmndtEW6H3z6KfBn+dEftBySf2j4=";
};
};
@ -84,7 +87,7 @@
fetchSubmodules = false;
deepClone = false;
leaveDotGit = false;
sparseCheckout = [ ];
sparseCheckout = [];
sha256 = "sha256-aOAxb0KjhSwlNX/IDvGwEysYvImgUEIDeNDOWRl1qNk=";
};
name = "idris";

38
pkgs/default.nix
View file

@ -2,25 +2,23 @@
pkgs,
inputs,
...
}:
let
srcs = pkgs.callPackage ./_sources/generated.nix { };
callPackage =
fn: args: pkgs.lib.callPackageWith (pkgs // { inherit inputs srcs callPackage; }) fn args;
}: let
srcs = pkgs.callPackage ./_sources/generated.nix {};
callPackage = fn: args: pkgs.lib.callPackageWith (pkgs // {inherit inputs srcs callPackage;}) fn args;
in
{
pinentry-selector = callPackage ./pinentry-selector.nix { };
helix = callPackage ./helix { };
juicity = callPackage ./juicity.nix { };
rime-ice = callPackage ./rime-ice.nix { };
dioxionary = callPackage ./dioxionary.nix { };
{
pinentry-selector = callPackage ./pinentry-selector.nix {};
helix = callPackage ./helix {};
juicity = callPackage ./juicity.nix {};
rime-ice = callPackage ./rime-ice.nix {};
dioxionary = callPackage ./dioxionary.nix {};
noto-serif-cjk = callPackage ./noto-serif-cjk.nix { };
noto-sans-cjk = callPackage ./noto-sans-cjk.nix { };
}
// (
let
firefox-addons = (callPackage "${inputs.nur-rycee}/pkgs/firefox-addons/default.nix" { });
in
pkgs.lib.genAttrs [ "immersive-translate" "tridactyl" ] (name: firefox-addons."${name}")
)
noto-serif-cjk = callPackage ./noto-serif-cjk.nix {};
noto-sans-cjk = callPackage ./noto-sans-cjk.nix {};
}
// (
let
firefox-addons = callPackage "${inputs.nur-rycee}/pkgs/firefox-addons/default.nix" {};
in
pkgs.lib.genAttrs ["immersive-translate" "tridactyl"] (name: firefox-addons."${name}")
)

53
pkgs/dioxionary.nix
View file

@ -6,32 +6,31 @@
installShellFiles,
lib,
...
}:
let
}: let
src = srcs.dioxionary;
in
rustPlatform.buildRustPackage {
inherit (src) pname src;
version = "${src.version}";
cargoLock = src.cargoLock."./Cargo.lock";
nativeBuildInputs = [
pkg-config
installShellFiles
];
buildInputs = [ openssl.dev ];
doCheck = false;
postInstall = ''
installShellCompletion --cmd dioxionary \
--bash <($out/bin/dioxionary completion bash) \
--zsh <($out/bin/dioxionary completion zsh) \
--fish <($out/bin/dioxionary completion fish)
'';
meta = {
description = "Rusty stardict. Enables terminal-based word lookup and vocabulary memorization using offline or online dictionaries";
homepage = "https://github.com/vaaandark/dioxionary";
changelog = "https://github.com/vaaandark/dioxionary/releases/tag/${src.version}";
license = lib.licenses.gpl2Only;
maintainers = with lib.maintainers; [ ulic-youthlic ];
mainProgram = "dioxionary";
};
}
rustPlatform.buildRustPackage {
inherit (src) pname src;
version = "${src.version}";
cargoLock = src.cargoLock."./Cargo.lock";
nativeBuildInputs = [
pkg-config
installShellFiles
];
buildInputs = [openssl.dev];
doCheck = false;
postInstall = ''
installShellCompletion --cmd dioxionary \
--bash <($out/bin/dioxionary completion bash) \
--zsh <($out/bin/dioxionary completion zsh) \
--fish <($out/bin/dioxionary completion fish)
'';
meta = {
description = "Rusty stardict. Enables terminal-based word lookup and vocabulary memorization using offline or online dictionaries";
homepage = "https://github.com/vaaandark/dioxionary";
changelog = "https://github.com/vaaandark/dioxionary/releases/tag/${src.version}";
license = lib.licenses.gpl2Only;
maintainers = with lib.maintainers; [ulic-youthlic];
mainProgram = "dioxionary";
};
}

36
pkgs/helix/default.nix
View file

@ -4,13 +4,11 @@
inputs,
callPackage,
...
}:
let
}: let
inherit (inputs.helix.packages."${pkgs.system}") helix;
runtime = callPackage ./runtime.nix { };
runtime = callPackage ./runtime.nix {};
runtimeInputs = (
with pkgs;
[
with pkgs; [
idris2Packages.idris2Lsp
lua-language-server
bash-language-server
@ -30,7 +28,7 @@ let
marksman
nixd
deno
nixfmt-rfc-style
alejandra
vscode-langservers-extracted
fish-lsp
gopls
@ -45,16 +43,16 @@ let
]
);
in
pkgs.symlinkJoin {
name = "helix-wrapped";
paths = [ helix ];
inherit (helix) meta;
buildInputs = [
pkgs.makeWrapper
];
postBuild = ''
wrapProgram $out/bin/hx \
--suffix PATH : ${lib.makeBinPath runtimeInputs} \
--set HELIX_RUNTIME ${runtime}
'';
}
pkgs.symlinkJoin {
name = "helix-wrapped";
paths = [helix];
inherit (helix) meta;
buildInputs = [
pkgs.makeWrapper
];
postBuild = ''
wrapProgram $out/bin/hx \
--suffix PATH : ${lib.makeBinPath runtimeInputs} \
--set HELIX_RUNTIME ${runtime}
'';
}

20
pkgs/helix/runtime.nix
View file

@ -4,10 +4,8 @@
stdenv,
runCommandNoCCLocal,
...
}:
let
buildGrammar =
grammar:
}: let
buildGrammar = grammar:
stdenv.mkDerivation {
pname = "helix-tree-sitter-${grammar.name}";
version = grammar.version;
@ -81,20 +79,20 @@ let
}
)
|> lib.mapAttrsToList (_: value: "ln -s ${value.value}/${value.name}.so $out/${value.name}.so");
grammarDir = runCommandNoCCLocal "helix-grammars" { } ''
grammarDir = runCommandNoCCLocal "helix-grammars" {} ''
mkdir -p $out
${builtins.concatStringsSep "\n" grammarLinks}
'';
queryDir = runCommandNoCCLocal "helix-query" { } ''
queryDir = runCommandNoCCLocal "helix-query" {} ''
mkdir -p $out
${builtins.concatStringsSep "\n" queries}
'';
in
runCommandNoCCLocal "helix-runtime" { } ''
mkdir -p $out
runCommandNoCCLocal "helix-runtime" {} ''
mkdir -p $out
ln -s ${grammarDir} $out/grammars
ln -s ${queryDir} $out/queries
''
ln -s ${grammarDir} $out/grammars
ln -s ${queryDir} $out/queries
''

6
pkgs/juicity.nix
View file

@ -1,4 +1,8 @@
{ buildGoModule, srcs, ... }:
{
buildGoModule,
srcs,
...
}:
buildGoModule rec {
name = "juicity";
version = "unstable-${srcs.juicity.date}.${srcs.juicity.version}";

21
pkgs/noto-sans-cjk.nix
View file

@ -3,19 +3,18 @@
srcs,
stdenvNoCC,
...
}:
let
}: let
source = srcs.noto-sans-cjk;
in
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "noto-sans-cjk";
version = source.version;
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "noto-sans-cjk";
version = source.version;
src = source.src;
src = source.src;
installPhase = ''
install -m444 -Dt $out/share/fonts/opentype/noto-sans-cjk Sans/OTC/*.ttc
'';
installPhase = ''
install -m444 -Dt $out/share/fonts/opentype/noto-sans-cjk Sans/OTC/*.ttc
'';
passthru.tests.noto-fonts = nixosTests.noto-fonts;
})
passthru.tests.noto-fonts = nixosTests.noto-fonts;
})

21
pkgs/noto-serif-cjk.nix
View file

@ -3,19 +3,18 @@
srcs,
stdenvNoCC,
...
}:
let
}: let
source = srcs.noto-serif-cjk;
in
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "noto-serif-cjk";
version = source.version;
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "noto-serif-cjk";
version = source.version;
src = source.src;
src = source.src;
installPhase = ''
install -m444 -Dt $out/share/fonts/opentype/noto-serif-cjk Serif/OTC/*.ttc
'';
installPhase = ''
install -m444 -Dt $out/share/fonts/opentype/noto-serif-cjk Serif/OTC/*.ttc
'';
passthru.tests.noto-fonts = nixosTests.noto-fonts;
})
passthru.tests.noto-fonts = nixosTests.noto-fonts;
})

2
pkgs/pinentry-selector.nix
View file

@ -1,4 +1,4 @@
{ pkgs }:
{pkgs}:
pkgs.writeShellApplication {
name = "pinentry";
runtimeInputs = with pkgs; [

25
pkgs/rime-ice.nix
View file

@ -1,16 +1,19 @@
{ srcs, stdenvNoCC, ... }:
let
{
srcs,
stdenvNoCC,
...
}: let
source = srcs.rime-ice;
in
stdenvNoCC.mkDerivation {
inherit (source) pname version src;
stdenvNoCC.mkDerivation {
inherit (source) pname version src;
installPhase = ''
runHook preInstall
installPhase = ''
runHook preInstall
mkdir -p $out/share/rime-data
cp -r * $out/share/rime-data/
mkdir -p $out/share/rime-data
cp -r * $out/share/rime-data/
runHook postInstall
'';
}
runHook postInstall
'';
}