overlays/pkgs.nix: cleanup: use next.callPackage
instead of prev.callPackage
This commit is contained in:
parent
f3151320a3
commit
4ac5c5f469
|
@ -2,45 +2,39 @@
|
||||||
let
|
let
|
||||||
sane = rec {
|
sane = rec {
|
||||||
#### my own, non-upstreamable packages:
|
#### my own, non-upstreamable packages:
|
||||||
sane-scripts = prev.callPackage ../pkgs/sane-scripts { };
|
sane-scripts = next.callPackage ../pkgs/sane-scripts { };
|
||||||
feeds = prev.callPackage ../pkgs/feeds { };
|
feeds = next.callPackage ../pkgs/feeds { };
|
||||||
tow-boot-pinephone = prev.callPackage ../pkgs/tow-boot-pinephone { };
|
tow-boot-pinephone = next.callPackage ../pkgs/tow-boot-pinephone { };
|
||||||
tow-boot-rpi4 = prev.callPackage ../pkgs/tow-boot-rpi4 { };
|
tow-boot-rpi4 = next.callPackage ../pkgs/tow-boot-rpi4 { };
|
||||||
bootpart-uefi-x86_64 = prev.callPackage ../pkgs/bootpart-uefi-x86_64 { };
|
bootpart-uefi-x86_64 = next.callPackage ../pkgs/bootpart-uefi-x86_64 { };
|
||||||
bootpart-tow-boot-rpi-aarch64 = prev.callPackage ../pkgs/bootpart-tow-boot-rpi-aarch64 {
|
bootpart-tow-boot-rpi-aarch64 = next.callPackage ../pkgs/bootpart-tow-boot-rpi-aarch64 { };
|
||||||
# not sure why i can't just do `next.callPackage` instead
|
bootpart-u-boot-rpi-aarch64 = next.callPackage ../pkgs/bootpart-u-boot-rpi-aarch64 { };
|
||||||
inherit tow-boot-rpi4;
|
rtl8723cs-firmware = next.callPackage ../pkgs/rtl8723cs-firmware { };
|
||||||
};
|
linux-megous = next.callPackage ../pkgs/linux-megous {
|
||||||
bootpart-u-boot-rpi-aarch64 = prev.callPackage ../pkgs/bootpart-u-boot-rpi-aarch64 {
|
|
||||||
# not sure why i can't just do `next.callPackage` instead
|
|
||||||
inherit ubootRaspberryPi4_64bit;
|
|
||||||
};
|
|
||||||
rtl8723cs-firmware = prev.callPackage ../pkgs/rtl8723cs-firmware { };
|
|
||||||
linux-megous = prev.callPackage ../pkgs/linux-megous {
|
|
||||||
kernelPatches = [
|
kernelPatches = [
|
||||||
prev.kernelPatches.bridge_stp_helper
|
prev.kernelPatches.bridge_stp_helper
|
||||||
prev.kernelPatches.request_key_helper
|
prev.kernelPatches.request_key_helper
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
sublime-music-mobile = prev.callPackage ../pkgs/sublime-music-mobile { };
|
sublime-music-mobile = next.callPackage ../pkgs/sublime-music-mobile { };
|
||||||
|
|
||||||
#### customized packages
|
#### customized packages
|
||||||
fluffychat-moby = prev.callPackage ../pkgs/fluffychat-moby { };
|
fluffychat-moby = next.callPackage ../pkgs/fluffychat-moby { };
|
||||||
gpodder-configured = prev.callPackage ../pkgs/gpodder-configured { };
|
gpodder-configured = next.callPackage ../pkgs/gpodder-configured { };
|
||||||
# jackett doesn't allow customization of the bind address: this will probably always be here.
|
# jackett doesn't allow customization of the bind address: this will probably always be here.
|
||||||
jackett = prev.callPackage ../pkgs/jackett { inherit (prev) jackett; };
|
jackett = next.callPackage ../pkgs/jackett { inherit (prev) jackett; };
|
||||||
# mozilla keeps nerfing itself and removing configuration options
|
# mozilla keeps nerfing itself and removing configuration options
|
||||||
firefox-unwrapped = next.callPackage ../pkgs/firefox-unwrapped { inherit (prev) firefox-unwrapped; };
|
firefox-unwrapped = next.callPackage ../pkgs/firefox-unwrapped { inherit (prev) firefox-unwrapped; };
|
||||||
|
|
||||||
# patch rpi uboot with something that fixes USB HDD boot
|
# patch rpi uboot with something that fixes USB HDD boot
|
||||||
ubootRaspberryPi4_64bit = prev.callPackage ../pkgs/ubootRaspberryPi4_64bit { };
|
ubootRaspberryPi4_64bit = next.callPackage ../pkgs/ubootRaspberryPi4_64bit { };
|
||||||
|
|
||||||
gocryptfs = prev.callPackage ../pkgs/gocryptfs { inherit (prev) gocryptfs; };
|
gocryptfs = next.callPackage ../pkgs/gocryptfs { inherit (prev) gocryptfs; };
|
||||||
|
|
||||||
browserpass = prev.callPackage ../pkgs/browserpass { inherit (prev) browserpass; inherit sane-scripts; };
|
browserpass = next.callPackage ../pkgs/browserpass { inherit (prev) browserpass; };
|
||||||
|
|
||||||
fractal-latest = prev.callPackage ../pkgs/fractal-latest { };
|
fractal-latest = next.callPackage ../pkgs/fractal-latest { };
|
||||||
|
|
||||||
#### TEMPORARY: PACKAGES WAITING TO BE UPSTREAMED
|
#### TEMPORARY: PACKAGES WAITING TO BE UPSTREAMED
|
||||||
|
|
||||||
|
@ -50,14 +44,14 @@
|
||||||
})
|
})
|
||||||
];
|
];
|
||||||
|
|
||||||
kaiteki = prev.callPackage ../pkgs/kaiteki { };
|
kaiteki = next.callPackage ../pkgs/kaiteki { };
|
||||||
lightdm-mobile-greeter = prev.callPackage ../pkgs/lightdm-mobile-greeter { };
|
lightdm-mobile-greeter = next.callPackage ../pkgs/lightdm-mobile-greeter { };
|
||||||
browserpass-extension = prev.callPackage ../pkgs/browserpass-extension { };
|
browserpass-extension = next.callPackage ../pkgs/browserpass-extension { };
|
||||||
gopass-native-messaging-host = prev.callPackage ../pkgs/gopass-native-messaging-host { };
|
gopass-native-messaging-host = next.callPackage ../pkgs/gopass-native-messaging-host { };
|
||||||
tokodon = prev.libsForQt5.callPackage ../pkgs/tokodon { };
|
tokodon = prev.libsForQt5.callPackage ../pkgs/tokodon { };
|
||||||
|
|
||||||
# provided by nixpkgs patch or upstream preview
|
# provided by nixpkgs patch or upstream preview
|
||||||
# splatmoji = prev.callPackage ../pkgs/splatmoji { };
|
# splatmoji = next.callPackage ../pkgs/splatmoji { };
|
||||||
};
|
};
|
||||||
in sane // { inherit sane; }
|
in sane // { inherit sane; }
|
||||||
)
|
)
|
||||||
|
|
Loading…
Reference in New Issue
Block a user