primrose/.files
1
0
Fork 0
mirror of https://codeberg.org/leana8959/.files.git synced 2025-12-06 06:39:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

nix/packages: use infuse

Browse source
This commit is contained in:
Primrose 2025-05-16 20:28:35 +02:00
parent 692fa17ccb
commit 5f404be7fb
Signed by: primrose
GPG key ID: 4E887A4CA9714ADA
2 changed files with 31 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

49
nix/packages/default.nix
View file

@ -18,6 +18,13 @@
pkgs.haskell.lib.dontHaddock pkgs.haskell.lib.dontHaddock
pkgs.haskell.lib.justStaticExecutables pkgs.haskell.lib.justStaticExecutables
]; ];
infuse-lib = import sources.infuse {
inherit lib;
sugars = infuse-lib.v1.default-sugars;
};
infuse = lib.flip infuse-lib.v1.infuse;
in rec { in rec {
# fonts # fonts
altiosevka = pkgs.callPackage ./altiosevka {}; altiosevka = pkgs.callPackage ./altiosevka {};
@ -85,35 +92,29 @@ in rec {
hbrainfuck = mkHaskellPackage { hbrainfuck = mkHaskellPackage {
name = "hbrainfuck"; name = "hbrainfuck";
src = sources.hbrainfuck; src = sources.hbrainfuck;
# apply = p: apply = infuse {
# p.overrideAttrs (old: { __output.nativeBuildInputs.__append = [pkgs.installShellFiles];
# nativeBuildInputs = (old.nativeBuildInputs or []) ++ [pkgs.installShellFiles]; __output.postInstall.__append = ''
# postInstall = installShellCompletion --cmd hbrainfuck \
# (old.postInstall or "") --bash <("$out/bin/hbrainfuck" --bash-completion-script "$out/bin/hbrainfuck") \
# + '' --fish <("$out/bin/hbrainfuck" --fish-completion-script "$out/bin/hbrainfuck") \
# installShellCompletion --cmd hbrainfuck \ --zsh <("$out/bin/hbrainfuck" --zsh-completion-script "$out/bin/hbrainfuck")
# --bash <("$out/bin/hbrainfuck" --bash-completion-script "$out/bin/hbrainfuck") \ '';
# --fish <("$out/bin/hbrainfuck" --fish-completion-script "$out/bin/hbrainfuck") \ };
# --zsh <("$out/bin/hbrainfuck" --zsh-completion-script "$out/bin/hbrainfuck")
# '';
# });
}; };
prop-solveur = mkHaskellPackage { prop-solveur = mkHaskellPackage {
name = "prop-solveur"; name = "prop-solveur";
src = sources.prop_solveur; src = sources.prop_solveur;
apply = p: apply = infuse {
p.overrideAttrs (old: { __output.nativeBuildInputs.__append = [pkgs.installShellFiles];
nativeBuildInputs = (old.nativeBuildInputs or []) ++ [pkgs.installShellFiles]; __output.postInstall.__append = ''
postInstall = installShellCompletion --cmd prop-solveur \
(old.postInstall or "") --bash <("$out/bin/prop-solveur" --bash-completion-script "$out/bin/prop-solveur") \
+ '' --fish <("$out/bin/prop-solveur" --fish-completion-script "$out/bin/prop-solveur") \
installShellCompletion --cmd prop-solveur \ --zsh <("$out/bin/prop-solveur" --zsh-completion-script "$out/bin/prop-solveur")
--bash <("$out/bin/prop-solveur" --bash-completion-script "$out/bin/prop-solveur") \ '';
--fish <("$out/bin/prop-solveur" --fish-completion-script "$out/bin/prop-solveur") \ };
--zsh <("$out/bin/prop-solveur" --zsh-completion-script "$out/bin/prop-solveur")
'';
});
}; };
hutils = mkHaskellPackage { hutils = mkHaskellPackage {

6
nix/sources.json
View file

@ -67,6 +67,12 @@
"rev": "ee04ec425af81e762362bc2c4bcd5d89ad50ddc8", "rev": "ee04ec425af81e762362bc2c4bcd5d89ad50ddc8",
"type": "git" "type": "git"
}, },
"infuse": {
"branch": "trunk",
"repo": "https://codeberg.org/amjoseph/infuse.nix",
"rev": "c8fb7397039215e1444c835e36a0da7dc3c743f8",
"type": "git"
},
"lix": { "lix": {
"branch": "main", "branch": "main",
"repo": "https://git.lix.systems/lix-project/lix.git", "repo": "https://git.lix.systems/lix-project/lix.git",