112 lines
3.8 KiB
Nix
112 lines
3.8 KiB
Nix
final: prev:
|
|
let
|
|
inherit (prev) callPackage;
|
|
in
|
|
{
|
|
bwrap-helper = callPackage ./bwrap-helper { };
|
|
|
|
osu-lazer = callPackage ./osu-lazer { inherit (prev) osu-lazer; };
|
|
osu-lazer-sandbox = callPackage ./osu-lazer-sandbox { };
|
|
|
|
wordclock-dimmer = prev.python3Packages.callPackage ./wordclock-dimmer { };
|
|
|
|
sbruder = prev.recurseIntoAttrs {
|
|
contact = callPackage ./contact-page { };
|
|
imprint = callPackage ./imprint { };
|
|
};
|
|
|
|
# adapted nixpkgs upstream but changed to buildGoModule and updated to
|
|
# version that works in my setup
|
|
# TODO: Remove with 21.11
|
|
prometheus-fritzbox-exporter = callPackage ./prometheus-fritzbox-exporter { };
|
|
|
|
# TODO: Remove when pavucontrol > 4.0 is released
|
|
pavucontrol = prev.pavucontrol.overrideAttrs (o: o // {
|
|
patches = [
|
|
# This fixes context menus on wayland
|
|
# Bug report: https://gitlab.freedesktop.org/pulseaudio/pavucontrol/-/issues/63
|
|
# Merge Request: https://gitlab.freedesktop.org/pulseaudio/pavucontrol/-/merge_requests/20
|
|
(prev.fetchpatch {
|
|
url = "https://gitlab.freedesktop.org/pulseaudio/pavucontrol/-/commit/ae278b8643cf1089f66df18713c8154208d9a505.patch";
|
|
sha256 = "066vhxjz6gmi2sp2n4pa1cdsxjnq6yml5js094g5n7ld34p84dpj";
|
|
})
|
|
];
|
|
});
|
|
|
|
# adapted from https://github.com/NixOS/nixpkgs/pull/85790
|
|
# TODO: Remove when memtest86+ ≥ 5.31b is in nixpkgs
|
|
memtest86plus = prev.memtest86plus.overrideAttrs (o: o // rec {
|
|
version = "5.31b";
|
|
|
|
src = prev.fetchurl {
|
|
url = "https://www.memtest.org/download/${version}/memtest86+-${version}.tar.gz";
|
|
sha256 = "028zrch87ggajlb5xx1c2ab85ggl9qldpibf45735sy0haqzyiki";
|
|
};
|
|
|
|
NIX_CFLAGS_COMPILE = null;
|
|
|
|
buildFlags = [ ];
|
|
|
|
doCheck = prev.stdenv.isi686;
|
|
checkTarget = "run_self_test";
|
|
});
|
|
|
|
# TODO: remove once new version (> 0.3.0) is released and in nixpkgs
|
|
nar-serve = prev.nar-serve.overrideAttrs (o: o // {
|
|
version = "unstable-2021-04-08";
|
|
|
|
src = prev.fetchFromGitHub {
|
|
owner = "numtide";
|
|
repo = "nar-serve";
|
|
rev = "4243b0efa41910dfa4be8b9936ae460699d3f8f0";
|
|
sha256 = "0mjs3yilf5rixm67wk4h4jji54dsc0w3vfxd561pvfbxplbmgh3c";
|
|
};
|
|
});
|
|
|
|
vimPlugins = prev.vimPlugins // {
|
|
# TODO: Remove once (if?) https://github.com/LnL7/vim-nix/pull/28 lands
|
|
vim-nix = prev.vimPlugins.vim-nix.overrideAttrs (o: {
|
|
patches = o.patches or [ ] ++ (map prev.fetchpatch [
|
|
{
|
|
url = "https://github.com/LnL7/vim-nix/commit/d298418ba10e1460b3b22106633731c2a9c1c83b.patch";
|
|
sha256 = "sha256-JcSkHScZtEN7qLYKxQB3pasl98MBXVBilB1noLxJxb8=";
|
|
}
|
|
{
|
|
url = "https://github.com/LnL7/vim-nix/commit/7b26edee3e2f63cce096aff65cfdaf995ebd92b0.patch";
|
|
sha256 = "sha256-sId/HOUfYf5U9S3HgSmOsldRiEbXc5mVFol7M7CMdi8=";
|
|
}
|
|
{
|
|
url = "https://github.com/LnL7/vim-nix/commit/7cad7f3666a63ff00f7ecd73a98886031901b918.patch";
|
|
sha256 = "sha256-rSRPkCo1wLvyufQkOo3gOwHetxvLdI6L89r7UgApz54=";
|
|
}
|
|
{
|
|
url = "https://github.com/LnL7/vim-nix/commit/6affa2b211b02a907ab3bc7064821be57ae93446.patch";
|
|
sha256 = "sha256-/fFx2/v2bGLAf5xQD+Y5p79NyRQu2dRFNoc9sYXoglM=";
|
|
}
|
|
]);
|
|
});
|
|
};
|
|
} // (
|
|
let
|
|
rtw89AttrsOverride = (o: o // {
|
|
version = "unstable-2021-10-21";
|
|
|
|
src = prev.fetchFromGitHub {
|
|
owner = "lwfinger";
|
|
repo = "rtw89";
|
|
rev = "0684157cba90e36bff5bc61a59e7e87c359b5e5c";
|
|
sha256 = "sha256-YhiusEMwchY9XazwE1auFqJ1qL6R/4vy7InrGaLnajM=";
|
|
};
|
|
});
|
|
in
|
|
{
|
|
linuxPackages = prev.linuxPackages.extend (lpfinal: lpprev: {
|
|
rtw89 = lpprev.rtw89.overrideAttrs rtw89AttrsOverride;
|
|
});
|
|
|
|
linuxPackages_latest = prev.linuxPackages_latest.extend (lpfinal: lpprev: {
|
|
rtw89 = lpprev.rtw89.overrideAttrs rtw89AttrsOverride;
|
|
});
|
|
}
|
|
)
|