simon/nixos-config
simon/nixos-config
1
1
Fork 0
Code Issues 8 Pull requests Actions Projects Activity

overlay: Replace self/super with final/prev

Browse source
This commit is contained in:
Simon Bruder 2021-05-01 13:15:32 +02:00
parent 236ac3488a
commit ef790a285a
Signed by: simon
GPG key ID: 8D3C82F9F309F8EC
1 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
pkgs/default.nix
View file

@ -1,48 +1,48 @@
self: super: final: prev:
let let
inherit (super) callPackage; inherit (prev) callPackage;
srcs = import ./srcs.nix; srcs = import ./srcs.nix;
in in
{ {
bang-evaluator = import srcs.bang-evaluator { pkgs = self; }; bang-evaluator = import srcs.bang-evaluator { pkgs = final; };
bwrap-helper = callPackage ./bwrap-helper { }; bwrap-helper = callPackage ./bwrap-helper { };
osu-lazer = callPackage ./osu-lazer { inherit (super) osu-lazer; }; osu-lazer = callPackage ./osu-lazer { inherit (prev) osu-lazer; };
osu-lazer-sandbox = callPackage ./osu-lazer-sandbox { }; osu-lazer-sandbox = callPackage ./osu-lazer-sandbox { };
wordclock-dimmer = super.python3Packages.callPackage ./wordclock-dimmer { }; wordclock-dimmer = prev.python3Packages.callPackage ./wordclock-dimmer { };
sbruder = super.recurseIntoAttrs { sbruder = prev.recurseIntoAttrs {
imprint = callPackage ./imprint { }; imprint = callPackage ./imprint { };
}; };
aria2_exporter = import srcs.aria2_exporter { pkgs = self; }; aria2_exporter = import srcs.aria2_exporter { pkgs = final; };
# adapted nixpkgs upstream but changed to buildGoModule and updated to # adapted nixpkgs upstream but changed to buildGoModule and updated to
# version that works in my setup # version that works in my setup
prometheus-fritzbox-exporter = callPackage ./prometheus-fritzbox-exporter { }; prometheus-fritzbox-exporter = callPackage ./prometheus-fritzbox-exporter { };
# FIXME: 21.05: Move to home-manager module package attribute # FIXME: 21.05: Move to home-manager module package attribute
mpv-unwrapped = super.mpv-unwrapped.overrideAttrs (o: o // { mpv-unwrapped = prev.mpv-unwrapped.overrideAttrs (o: o // {
patches = [ patches = [
# FIXME: 21.05: Remove since it has mpv 0.33 # FIXME: 21.05: Remove since it has mpv 0.33
(super.fetchpatch { (prev.fetchpatch {
url = "https://github.com/mpv-player/mpv/commit/43c13e5ea23230edca38426d4a9eed049a70890e.patch"; url = "https://github.com/mpv-player/mpv/commit/43c13e5ea23230edca38426d4a9eed049a70890e.patch";
sha256 = "0g73ws36cs2hfzqck6xiaimj5yd5hz68b4wf3qayyv4nrf5sz02c"; sha256 = "0g73ws36cs2hfzqck6xiaimj5yd5hz68b4wf3qayyv4nrf5sz02c";
}) })
]; ];
}); });
mpvScripts = (super.mpvScripts or { }) // { mpvScripts = (prev.mpvScripts or { }) // {
pitchcontrol = callPackage ./mpv-scripts/pitchcontrol { }; pitchcontrol = callPackage ./mpv-scripts/pitchcontrol { };
}; };
# TODO: Remove patch once mako > 1.4.1 is released and in nixpkgs # TODO: Remove patch once mako > 1.4.1 is released and in nixpkgs
mako = super.mako.overrideAttrs (o: o // { mako = prev.mako.overrideAttrs (o: o // {
patches = [ patches = [
# Adds makoctl set # Adds makoctl set
(super.fetchpatch { (prev.fetchpatch {
url = "https://github.com/emersion/mako/commit/782ef66b04d5d927fe19254be175e0b5ddff343f.patch"; url = "https://github.com/emersion/mako/commit/782ef66b04d5d927fe19254be175e0b5ddff343f.patch";
sha256 = "1qjaxhf11fyysmi9l8vwrz2vag3lcbllx8y8v2fgg3p52a7cwdjs"; sha256 = "1qjaxhf11fyysmi9l8vwrz2vag3lcbllx8y8v2fgg3p52a7cwdjs";
}) })
@ -52,12 +52,12 @@ in
cyanrip = callPackage ./cyanrip { }; cyanrip = callPackage ./cyanrip { };
# TODO: Remove when pavucontrol > 4.0 is released # TODO: Remove when pavucontrol > 4.0 is released
pavucontrol = super.pavucontrol.overrideAttrs (o: o // { pavucontrol = prev.pavucontrol.overrideAttrs (o: o // {
patches = [ patches = [
# This fixes context menus on wayland # This fixes context menus on wayland
# Bug report: https://gitlab.freedesktop.org/pulseaudio/pavucontrol/-/issues/63 # Bug report: https://gitlab.freedesktop.org/pulseaudio/pavucontrol/-/issues/63
# Merge Request: https://gitlab.freedesktop.org/pulseaudio/pavucontrol/-/merge_requests/20 # Merge Request: https://gitlab.freedesktop.org/pulseaudio/pavucontrol/-/merge_requests/20
(super.fetchpatch { (prev.fetchpatch {
url = "https://gitlab.freedesktop.org/pulseaudio/pavucontrol/-/commit/ae278b8643cf1089f66df18713c8154208d9a505.patch"; url = "https://gitlab.freedesktop.org/pulseaudio/pavucontrol/-/commit/ae278b8643cf1089f66df18713c8154208d9a505.patch";
sha256 = "066vhxjz6gmi2sp2n4pa1cdsxjnq6yml5js094g5n7ld34p84dpj"; sha256 = "066vhxjz6gmi2sp2n4pa1cdsxjnq6yml5js094g5n7ld34p84dpj";
}) })
@ -66,10 +66,10 @@ in
# adapted from https://github.com/NixOS/nixpkgs/pull/85790 # adapted from https://github.com/NixOS/nixpkgs/pull/85790
# TODO: Remove when memtest86+ ≥ 5.31b is in nixpkgs # TODO: Remove when memtest86+ ≥ 5.31b is in nixpkgs
memtest86plus = super.memtest86plus.overrideAttrs (o: o // rec { memtest86plus = prev.memtest86plus.overrideAttrs (o: o // rec {
version = "5.31b"; version = "5.31b";
src = super.fetchurl { src = prev.fetchurl {
url = "https://www.memtest.org/download/${version}/memtest86+-${version}.tar.gz"; url = "https://www.memtest.org/download/${version}/memtest86+-${version}.tar.gz";
sha256 = "028zrch87ggajlb5xx1c2ab85ggl9qldpibf45735sy0haqzyiki"; sha256 = "028zrch87ggajlb5xx1c2ab85ggl9qldpibf45735sy0haqzyiki";
}; };
@ -78,7 +78,7 @@ in
buildFlags = [ ]; buildFlags = [ ];
doCheck = super.stdenv.isi686; doCheck = prev.stdenv.isi686;
checkTarget = "run_self_test"; checkTarget = "run_self_test";
}); });
} }