Idiomatic semantics for overlays changed

The idiom of 'self: super:' is changing upstream to 'final: prev:'.
This commit is contained in:
Timothy DeHerrera 2020-01-04 15:30:00 -07:00
parent a9765f7df6
commit 8ab0a92850
No known key found for this signature in database
GPG Key ID: 8985725DB5B0C122
3 changed files with 15 additions and 15 deletions

View File

@ -67,8 +67,8 @@ in {
environment.systemPackages = [ pkgs.qbittorrent ];
nixpkgs.overlays = [
(self: super: {
qbittorrent = super.qbittorrent.override { guiSupport = false; };
(final: prev: {
qbittorrent = prev.qbittorrent.override { guiSupport = false; };
})
];

View File

@ -19,23 +19,23 @@
};
nixpkgs.overlays = let
kak = self: super: {
kakoune = super.kakoune.override {
configure.plugins = with super.kakounePlugins; [
(kak-fzf.override { fzf = super.skim; })
kak = final: prev: {
kakoune = prev.kakoune.override {
configure.plugins = with prev.kakounePlugins; [
(kak-fzf.override { fzf = prev.skim; })
kak-auto-pairs
kak-buffers
kak-powerline
];
};
kakoune-config = super.writeShellScriptBin "k" ''
XDG_CONFIG_HOME=/etc/xdg exec ${self.kakoune}/bin/kak "$@"
kakoune-config = prev.writeShellScriptBin "k" ''
XDG_CONFIG_HOME=/etc/xdg exec ${final.kakoune}/bin/kak "$@"
'';
kakoune-unwrapped = super.kakoune-unwrapped.overrideAttrs (o: rec {
kakoune-unwrapped = prev.kakoune-unwrapped.overrideAttrs (o: rec {
version = "2019.12.10";
src = super.fetchFromGitHub {
src = prev.fetchFromGitHub {
repo = "kakoune";
owner = "mawww";
rev = "v${version}";

View File

@ -89,17 +89,17 @@ in {
};
nixpkgs.overlays = let
overlay = self: super: {
redshift = super.redshift.overrideAttrs (o: {
src = super.fetchFromGitHub {
overlay = final: prev: {
redshift = prev.redshift.overrideAttrs (o: {
src = prev.fetchFromGitHub {
owner = "CameronNemo";
repo = "redshift";
rev = "39c162ca487a59857c2eac231318f4b28855798b";
sha256 = "1in27draskwwi097wiam26bx2szcf58297am3gkyng1ms3rz6i58";
};
});
wl-clipboard = super.wl-clipboard.overrideAttrs (o: {
src = super.fetchFromGitHub {
wl-clipboard = prev.wl-clipboard.overrideAttrs (o: {
src = prev.fetchFromGitHub {
owner = "bugaevc";
repo = "wl-clipboard";
rev = "c010972e6b0d2eb3002c49a6a1b5620ff5f7c910";