teutat3s/os
2
0
Fork 0
forked from pub-solar/os
Code Pull requests Activity

Idiomatic semantics for overlays changed

Browse source 
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
Show stats Download patch file Download diff file Expand all files Collapse all files

4
modules/services/torrent/qbittorrent.nix
View file

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

16
profiles/develop/kakoune/default.nix
View file

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

10
profiles/graphical/sway/default.nix
View file

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