chore(3p/sources): Bump channels & overlays

* //users/grfn/modules/games: StoneSense requires DFHack to be enabled

* //users/grfn/system/iso: gtk needs cairo with xlibs

* //users: deal with emacs-overlay attribute renames

* //3p/overlays: downgrade sbcl to workaround lisp-binary compilation
  failure

Change-Id: I1573280a923e5021ef399734cb5519b37e72c670
Reviewed-on: https://cl.tvl.fyi/c/depot/+/7563
Reviewed-by: sterni <sternenseemann@systemli.org>
Reviewed-by: tazjin <tazjin@tvl.su>
Autosubmit: sterni <sternenseemann@systemli.org>
Reviewed-by: grfn <grfn@gws.fyi>
Tested-by: BuildkiteCI
This commit is contained in:
sterni 2022-12-12 10:48:21 +01:00
parent d026a021b7
commit fcdf5d2845
7 changed files with 28 additions and 20 deletions

View file

@ -11,7 +11,7 @@ let
theme = null;
enableIntro = false;
enableFPS = true;
enableDFHack = false; # Fails to build currently
enableDFHack = true;
});
init = runCommand "init.txt" { } ''

View file

@ -11,6 +11,10 @@ let
networking.useDHCP = false;
networking.firewall.enable = false;
networking.wireless.enable = lib.mkForce false;
# TODO(grfn): enabling this (in the minimal profile) fails the iso build,
# since gtk+3 needs to be built which fails due to cairo without xlibs
environment.noXlibs = false;
};
in
(depot.third_party.nixos {

View file

@ -3,8 +3,8 @@
let
inherit (pkgs.stdenv.hostPlatform) is64bit;
# emacsPgtkNativeComp is defined in emacs-overlay
emacs = (pkgs.emacsPackagesFor pkgs.emacsPgtkNativeComp).withPackages (epkgs: [
# emacsPgtk is defined in emacs-overlay
emacs = (pkgs.emacsPackagesFor pkgs.emacsPgtk).withPackages (epkgs: [
epkgs.bqn-mode
#epkgs.elpaPackages.ada-mode
epkgs.elpaPackages.rainbow-mode

View file

@ -3,7 +3,7 @@
{ lib, pkgs, ... }:
pkgs.makeOverridable
({ emacs ? pkgs.emacsNativeComp }:
({ emacs ? pkgs.emacsUnstable }:
let
emacsWithPackages = (pkgs.emacsPackagesFor emacs).emacsWithPackages;

View file

@ -24,7 +24,7 @@ in
direnv
dnsutils
electrum
emacsNativeComp # emacsclient
emacsUnstable # emacsclient
exa
fd
file