mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

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

4
third_party/overlays/tvl.nix vendored
View file

@ -92,6 +92,10 @@ in
};
});
# SBCL 2.2.10 breaks lisp-binary somehow
# https://github.com/j3pic/lisp-binary/issues/59
sbcl = self.sbcl_2_2_9;
# nix-serve does not work with nix 2.4
# https://github.com/edolstra/nix-serve/issues/28
nix-serve = super.nix-serve.override { nix = super.nix_2_3; };

30
third_party/sources/sources.json vendored
View file

@ -17,10 +17,10 @@
"homepage": "",
"owner": "nix-community",
"repo": "emacs-overlay",
"rev": "57e743882976214a6ca0524b0de3bdba2d30cd8d",
"sha256": "0flfr4kc793vv3h8y1dka8pxqx50ywjrhs16v1ihrkmjwdkyky8k",
"rev": "61e8c3167cd2a748a7a805caca3ae5756b2b6eb5",
"sha256": "0fmpcx00id923h2w01bf1n1y1vffjmphj3sn3ylb7qz2p10svpam",
"type": "tarball",
"url": "https://github.com/nix-community/emacs-overlay/archive/57e743882976214a6ca0524b0de3bdba2d30cd8d.tar.gz",
"url": "https://github.com/nix-community/emacs-overlay/archive/61e8c3167cd2a748a7a805caca3ae5756b2b6eb5.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
"home-manager": {
@ -29,10 +29,10 @@
"homepage": "https://nix-community.github.io/home-manager/",
"owner": "nix-community",
"repo": "home-manager",
"rev": "478610aa37c8339eacabfa03f07dacf5574edd47",
"sha256": "1viz7m0d0n1lbiwqq280m3c5x84fmv3j9j2n03b7j6ci50fmj68z",
"rev": "054d9e3187ca00479e8036dc0e92900a384f30fd",
"sha256": "07mfsylmzp1rd808kry236wa5lvmavrlhnb9y450y60vzghzpqls",
"type": "tarball",
"url": "https://github.com/nix-community/home-manager/archive/478610aa37c8339eacabfa03f07dacf5574edd47.tar.gz",
"url": "https://github.com/nix-community/home-manager/archive/054d9e3187ca00479e8036dc0e92900a384f30fd.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
"impermanence": {
@ -77,10 +77,10 @@
"homepage": "",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "e76c78d20685a043d23f5f9e0ccd2203997f1fb1",
"sha256": "1rfa46kp0pvfsb816mg4wifylcgflcgkvfxr1aq9y8yfcw1yh5r8",
"rev": "64e0bf055f9d25928c31fb12924e59ff8ce71e60",
"sha256": "1hmx7hhjr74fqmxhb49yfyrpqhzwayrq48xwjv3a117czpb0gnjx",
"type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/e76c78d20685a043d23f5f9e0ccd2203997f1fb1.tar.gz",
"url": "https://github.com/NixOS/nixpkgs/archive/64e0bf055f9d25928c31fb12924e59ff8ce71e60.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
"nixpkgs-stable": {
@ -101,10 +101,10 @@
"homepage": "",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "3d506453ce9c510b12e8dd98781bfaa2ea436772",
"sha256": "05xyj194x73hmwd59p4snqjh4rpychq1jysx3wb52gc16iszdwl5",
"rev": "fe185fac76e009b4bd543704a8c61077cf70155b",
"sha256": "1ipbr07gxdp7q15vavskypqc1faspz7y7f0sygy88xr7i8p0mls5",
"type": "tarball",
"url": "https://github.com/oxalica/rust-overlay/archive/3d506453ce9c510b12e8dd98781bfaa2ea436772.tar.gz",
"url": "https://github.com/oxalica/rust-overlay/archive/fe185fac76e009b4bd543704a8c61077cf70155b.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
"rustsec-advisory-db": {
@ -113,10 +113,10 @@
"homepage": "https://rustsec.org",
"owner": "RustSec",
"repo": "advisory-db",
"rev": "b80f8edaa7e5ce5a6babcd61f14dddee77875c2c",
"sha256": "1x9pvqdzl8rv3k88690q58zr3i7xrsy4g551xksf2cpzwgwkqjys",
"rev": "0a2faeb87195392b23333a8097309d29f2c5d31d",
"sha256": "01qqn7my4w4v2af3914carlhmy5d5jp500y8nbljqv4jp8alihvz",
"type": "tarball",
"url": "https://github.com/RustSec/advisory-db/archive/b80f8edaa7e5ce5a6babcd61f14dddee77875c2c.tar.gz",
"url": "https://github.com/RustSec/advisory-db/archive/0a2faeb87195392b23333a8097309d29f2c5d31d.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
}
}

2
users/grfn/system/home/modules/games.nix
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" { } ''

4
users/grfn/system/system/iso.nix
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 {

4
users/sterni/emacs/default.nix
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

2
users/tazjin/emacs/default.nix
View file

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

2
users/tazjin/nixos/modules/physical.nix
View file

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