darkkirb/nix-packages
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request 'base nix-packages on an overlay' (#81) from use-overlay-again into main
Some checks failed
Hydra hydra Hydra build #22230 of nix-packages:aarch64-linux-master:hydra
Details
Hydra hydra-unstable Hydra build #22231 of nix-packages:aarch64-linux-master:hydra-unstable
Details
ci/woodpecker/cron/update Pipeline failed
Details
ci/woodpecker/cron/update-lockfile Pipeline failed
Details

Browse source 
Reviewed-on: #81
This commit is contained in:
Charlotte 🦝 Delenk 2023-04-22 15:26:58 +00:00
commit b0ad8a7971
Signed by: gitea-bot
GPG key ID: C9974EDF9932B558
3 changed files with 211 additions and 81 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

65
default.nix
View file

@ -8,9 +8,72 @@
{pkgs ? import <nixpkgs> {}}: let
lib = import ./lib {inherit pkgs;}; # functions
flake = (lib.importFlake {inherit (pkgs) system;}).defaultNix;
pkgsWithOverlay = pkgs.appendOverlays [(import ./overlay.nix pkgs.system)];
in
{
# The `lib`, `modules`, and `overlay` names are special
inherit (flake) lib modules overlays;
}
// (flake.packages.${pkgs.system})
// {
inherit
(pkgsWithOverlay)
akkoma
pleroma-fe
admin-fe
emoji-lotte
emoji-volpeon-blobfox
emoji-volpeon-blobfox-flip
emoji-volpeon-bunhd
emoji-volpeon-bunhd-flip
emoji-volpeon-drgn
emoji-volpeon-fox
emoji-volpeon-gphn
emoji-volpeon-raccoon
emoji-volpeon-vlpn
emoji-caro
lotte-art
alco-sans
constructium
fairfax
fairfax-hd
kreative-square
nasin-nanpa
matrix-media-repo
mautrix-discord
mautrix-whatsapp
mautrix-signal
mautrix-telegram
python-mautrix
python-tulir-telethon
papermc
python-plover-stroke
python-rtf-tokenize
plover
plover-plugins-manager
python-simplefuzzyset
plover-plugin-emoji
plover-plugin-tapey-tape
plover-plugin-yaml-dictionary
plover-plugin-machine-hid
plover-plugin-rkb1-hid
plover-dict-didoesdigital
miifox-net
old-homepage
python-instagram
element-web
mautrix-cleanup
woodpecker-agent
woodpecker-cli
woodpecker-frontend
woodpecker-server
hydra
hydra-unstable
;
}
// (
if pkgs.system == "riscv64-linux"
then {
inherit (pkgsWithOverlay) vf2Kernel vf2KernelPackages;
}
else {}
)

131
flake.nix
View file

@ -29,12 +29,11 @@
};
outputs = {
self,
nixpkgs,
flake-utils,
gomod2nix,
hydra,
...
} @ inputs:
}:
flake-utils.lib.eachSystem ["aarch64-darwin" "aarch64-linux" "x86_64-darwin" "x86_64-linux" "riscv64-linux"] (
system: let
pkgs = import nixpkgs {
@ -42,12 +41,14 @@
config.allowUnfree = true;
config.allowUnsupportedSystem = true;
overlays = [
gomod2nix.overlays.default
self.overlays.${system}.default
];
};
in rec {
formatter = pkgs.alejandra;
overlays.default = import ./overlay.nix system;
devShells.default = pkgs.mkShell {
nativeBuildInputs = with pkgs; [
statix
@ -57,77 +58,69 @@
packages =
{
akkoma = pkgs.callPackage ./akkoma {};
pleroma-fe = pkgs.callPackage ./akkoma/pleroma-fe {};
admin-fe = pkgs.callPackage ./akkoma/admin-fe {};
emoji-lotte = pkgs.callPackage ./art/emoji/lotte {};
emoji-volpeon-blobfox = pkgs.callPackage ./art/emoji/volpeon/blobfox.nix {};
emoji-volpeon-blobfox-flip = pkgs.callPackage ./art/emoji/volpeon/blobfox_flip.nix {};
emoji-volpeon-bunhd = pkgs.callPackage ./art/emoji/volpeon/bunhd.nix {};
emoji-volpeon-bunhd-flip = pkgs.callPackage ./art/emoji/volpeon/bunhd_flip.nix {};
emoji-volpeon-drgn = pkgs.callPackage ./art/emoji/volpeon/drgn.nix {};
emoji-volpeon-fox = pkgs.callPackage ./art/emoji/volpeon/fox.nix {};
emoji-volpeon-gphn = pkgs.callPackage ./art/emoji/volpeon/gphn.nix {};
emoji-volpeon-raccoon = pkgs.callPackage ./art/emoji/volpeon/raccoon.nix {};
emoji-volpeon-vlpn = pkgs.callPackage ./art/emoji/volpeon/vlpn.nix {};
emoji-caro = pkgs.callPackage ./art/emoji/caro {};
lotte-art = pkgs.callPackage ./art/lotte {};
alco-sans = pkgs.callPackage ./fonts/kreative/alco-sans.nix {};
constructium = pkgs.callPackage ./fonts/kreative/constructium.nix {};
fairfax = pkgs.callPackage ./fonts/kreative/fairfax.nix {};
fairfax-hd = pkgs.callPackage ./fonts/kreative/fairfax-hd.nix {};
kreative-square = pkgs.callPackage ./fonts/kreative/kreative-square.nix {};
nasin-nanpa = pkgs.callPackage ./fonts/nasin-nanpa {};
matrix-media-repo = pkgs.callPackage ./matrix/matrix-media-repo {};
mautrix-discord = pkgs.callPackage ./matrix/mautrix-discord {};
mautrix-whatsapp = pkgs.callPackage ./matrix/mautrix-whatsapp {};
mautrix-signal = pkgs.callPackage ./matrix/mautrix-signal {};
mautrix-telegram = pkgs.callPackage ./matrix/mautrix-telegram {};
python-mautrix = pkgs.python3Packages.callPackage ./python/mautrix.nix {};
python-tulir-telethon = pkgs.python3Packages.callPackage ./python/tulir-telethon.nix {};
papermc = pkgs.callPackage ./minecraft/papermc {};
python-plover-stroke = pkgs.python3Packages.callPackage ./plover/plover-stroke.nix {};
python-rtf-tokenize = pkgs.python3Packages.callPackage ./python/rtf-tokenize.nix {};
plover = pkgs.python3Packages.callPackage ./plover/plover {};
plover-plugins-manager = pkgs.python3Packages.callPackage ./plover/plover-plugins-manager.nix {};
python-simplefuzzyset = pkgs.python3Packages.callPackage ./python/simplefuzzyset.nix {};
plover-plugin-emoji = pkgs.python3Packages.callPackage ./plover/plover-emoji.nix {};
plover-plugin-tapey-tape = pkgs.python3Packages.callPackage ./plover/plover-tapey-tape.nix {};
plover-plugin-yaml-dictionary = pkgs.python3Packages.callPackage ./plover/plover-yaml-dictionary.nix {};
plover-plugin-machine-hid = pkgs.python3Packages.callPackage ./plover/plover-machine-hid.nix {};
plover-plugin-rkb1-hid = pkgs.python3Packages.callPackage ./plover/plover-rkb1-hid.nix {};
plover-dict-didoesdigital = pkgs.callPackage ./plover/didoesdigital-dictionary.nix {};
miifox-net = pkgs.python3Packages.callPackage ./web/miifox-net.nix {};
old-homepage = pkgs.callPackage ./web/old-homepage.nix {};
python-instagram = pkgs.python3Packages.callPackage ./python/instagram.nix {};
inherit (inputs.attic.packages.${pkgs.system}) attic attic-client attic-server;
element-web = pkgs.callPackage ./matrix/element-web {};
mautrix-cleanup = inputs.mautrix-cleanup.packages.${pkgs.system}.default;
woodpecker-agent = pkgs.callPackage ./ci/woodpecker/agent.nix {};
woodpecker-cli = pkgs.callPackage ./ci/woodpecker/cli.nix {};
woodpecker-frontend = pkgs.callPackage ./ci/woodpecker/frontend.nix {};
woodpecker-server = pkgs.callPackage ./ci/woodpecker/server.nix {};
inherit
(pkgs)
akkoma
pleroma-fe
admin-fe
emoji-lotte
emoji-volpeon-blobfox
emoji-volpeon-blobfox-flip
emoji-volpeon-bunhd
emoji-volpeon-bunhd-flip
emoji-volpeon-drgn
emoji-volpeon-fox
emoji-volpeon-gphn
emoji-volpeon-raccoon
emoji-volpeon-vlpn
emoji-caro
lotte-art
alco-sans
constructium
fairfax
fairfax-hd
kreative-square
nasin-nanpa
matrix-media-repo
mautrix-discord
mautrix-whatsapp
mautrix-signal
mautrix-telegram
python-mautrix
python-tulir-telethon
papermc
python-plover-stroke
python-rtf-tokenize
plover
plover-plugins-manager
python-simplefuzzyset
plover-plugin-emoji
plover-plugin-tapey-tape
plover-plugin-yaml-dictionary
plover-plugin-machine-hid
plover-plugin-rkb1-hid
plover-dict-didoesdigital
miifox-net
old-homepage
python-instagram
element-web
mautrix-cleanup
woodpecker-agent
woodpecker-cli
woodpecker-frontend
woodpecker-server
hydra
hydra-unstable
;
}
// (
if system == "riscv64-linux"
then rec {
vf2Kernel = pkgs.callPackage ./linux/vf2 {kernelPatches = [];};
vf2KernelPackages = pkgs.linuxPackagesFor vf2Kernel;
then {
inherit (pkgs) vf2Kernel vf2KernelPackages;
}
else {}
) // (if system == "aarch64-linux" || system == "x86_64-linux" then {
hydra = hydra.packages.${system}.hydra.overrideAttrs (super: {
doCheck = false;
patches = (super.patches or []) ++ [
./ci/hydra/add-ca-support.patch
./ci/hydra/add-gitea-push-hook.patch
./ci/hydra/jobset-inputs-for-flakes.patch
./ci/hydra/remove-hydra-size-limit.patch
];
});
} else {});
);
overlays = import ./overlays;
modules = import ./modules;
lib = import ./lib {inherit pkgs;};

96
overlay.nix
View file

@ -1,15 +1,89 @@
# You can use this file as a nixpkgs overlay. This is useful in the
# You can use this file as a nixself overlay. This is useful in the
# case where you don't want to add the whole NUR namespace to your
# configuration.
self: super: let
isReserved = n: n == "lib" || n == "overlays" || n == "modules";
nameValuePair = n: v: {
name = n;
value = v;
system: self: super: let
lib = import ./lib {pkgs = super;}; # functions
flake = (lib.importFlake {inherit system;}).defaultNix;
getFlakeOverlay = flakeName: overlay: self: super: let
lib = import ./lib {pkgs = super;};
flake = (lib.importFlake {inherit system;}).defaultNix;
in
flake.inputs.${flakeName}.outputs.overlays.${overlay} self super;
riscv-overlay = self: super: {
vf2Kernel = self.callPackage ./linux/vf2 {kernelPatches = [];};
vf2KernelPackages = super.linuxPackagesFor self.vf2Kernel;
};
nurAttrs = import ./default.nix {pkgs = super;};
overlays = [
(getFlakeOverlay "attic" "default")
(getFlakeOverlay "hydra" "default")
(getFlakeOverlay "gomod2nix" "default")
(self: super: {
akkoma = self.callPackage ./akkoma {};
pleroma-fe = self.callPackage ./akkoma/pleroma-fe {};
admin-fe = self.callPackage ./akkoma/admin-fe {};
emoji-lotte = self.callPackage ./art/emoji/lotte {};
emoji-volpeon-blobfox = self.callPackage ./art/emoji/volpeon/blobfox.nix {};
emoji-volpeon-blobfox-flip = self.callPackage ./art/emoji/volpeon/blobfox_flip.nix {};
emoji-volpeon-bunhd = self.callPackage ./art/emoji/volpeon/bunhd.nix {};
emoji-volpeon-bunhd-flip = self.callPackage ./art/emoji/volpeon/bunhd_flip.nix {};
emoji-volpeon-drgn = self.callPackage ./art/emoji/volpeon/drgn.nix {};
emoji-volpeon-fox = self.callPackage ./art/emoji/volpeon/fox.nix {};
emoji-volpeon-gphn = self.callPackage ./art/emoji/volpeon/gphn.nix {};
emoji-volpeon-raccoon = self.callPackage ./art/emoji/volpeon/raccoon.nix {};
emoji-volpeon-vlpn = self.callPackage ./art/emoji/volpeon/vlpn.nix {};
emoji-caro = self.callPackage ./art/emoji/caro {};
lotte-art = self.callPackage ./art/lotte {};
alco-sans = self.callPackage ./fonts/kreative/alco-sans.nix {};
constructium = self.callPackage ./fonts/kreative/constructium.nix {};
fairfax = self.callPackage ./fonts/kreative/fairfax.nix {};
fairfax-hd = self.callPackage ./fonts/kreative/fairfax-hd.nix {};
kreative-square = self.callPackage ./fonts/kreative/kreative-square.nix {};
nasin-nanpa = self.callPackage ./fonts/nasin-nanpa {};
matrix-media-repo = self.callPackage ./matrix/matrix-media-repo {};
mautrix-discord = self.callPackage ./matrix/mautrix-discord {};
mautrix-whatsapp = self.callPackage ./matrix/mautrix-whatsapp {};
mautrix-signal = self.callPackage ./matrix/mautrix-signal {};
mautrix-telegram = self.callPackage ./matrix/mautrix-telegram {};
python-mautrix = self.python3Packages.callPackage ./python/mautrix.nix {};
python-tulir-telethon = self.python3Packages.callPackage ./python/tulir-telethon.nix {};
papermc = self.callPackage ./minecraft/papermc {};
python-plover-stroke = self.python3Packages.callPackage ./plover/plover-stroke.nix {};
python-rtf-tokenize = self.python3Packages.callPackage ./python/rtf-tokenize.nix {};
plover = self.python3Packages.callPackage ./plover/plover {};
plover-plugins-manager = self.python3Packages.callPackage ./plover/plover-plugins-manager.nix {};
python-simplefuzzyset = self.python3Packages.callPackage ./python/simplefuzzyset.nix {};
plover-plugin-emoji = self.python3Packages.callPackage ./plover/plover-emoji.nix {};
plover-plugin-tapey-tape = self.python3Packages.callPackage ./plover/plover-tapey-tape.nix {};
plover-plugin-yaml-dictionary = self.python3Packages.callPackage ./plover/plover-yaml-dictionary.nix {};
plover-plugin-machine-hid = self.python3Packages.callPackage ./plover/plover-machine-hid.nix {};
plover-plugin-rkb1-hid = self.python3Packages.callPackage ./plover/plover-rkb1-hid.nix {};
plover-dict-didoesdigital = self.callPackage ./plover/didoesdigital-dictionary.nix {};
miifox-net = self.python3Packages.callPackage ./web/miifox-net.nix {};
old-homepage = self.callPackage ./web/old-homepage.nix {};
python-instagram = self.python3Packages.callPackage ./python/instagram.nix {};
element-web = self.callPackage ./matrix/element-web {};
mautrix-cleanup = flake.inputs.mautrix-cleanup.packages.${system}.default;
woodpecker-agent = self.callPackage ./ci/woodpecker/agent.nix {};
woodpecker-cli = self.callPackage ./ci/woodpecker/cli.nix {};
woodpecker-frontend = self.callPackage ./ci/woodpecker/frontend.nix {};
woodpecker-server = self.callPackage ./ci/woodpecker/server.nix {};
hydra = super.hydra.overrideAttrs (super: {
doCheck = false;
patches =
(super.patches or [])
++ [
./ci/hydra/add-ca-support.patch
./ci/hydra/add-gitea-push-hook.patch
./ci/hydra/jobset-inputs-for-flakes.patch
./ci/hydra/remove-hydra-size-limit.patch
];
});
hydra-unstable = self.hydra;
})
riscv-overlay
];
in
builtins.listToAttrs
(map (n: nameValuePair n nurAttrs.${n})
(builtins.filter (n: !isReserved n)
(builtins.attrNames nurAttrs)))
super.lib.composeManyExtensions overlays self super