From d2fa4e7c8677e248ac51139bf0be68314384b441 Mon Sep 17 00:00:00 2001 From: sterni Date: Fri, 5 May 2023 21:33:59 +0200 Subject: chore(3p/sources): Bump channels & overlays * //ops/modules/depot-inbox: Adapt to upstream option type declaration. See nixpkgs commit b6ed3b8f402893df91a8e21ce993520301c2f076. * //ops/machines/sanduny, //users/tazjin/polyanka: Remove boot.loader.grub.version options (no longer has any effect). * //users/sterni/emacs: reflect rename emacsPgtk -> emacs-pgtk * //3p/overlays: update tdlib to match emacs-overlay * //3p/overlays: give EXWM from depot a separate name * //users/grfn/system/home: disable Slack support in ntfy Change-Id: I03bde088bc70e05b23925f244899807210cb7b20 Reviewed-on: https://cl.tvl.fyi/c/depot/+/8547 Autosubmit: sterni Reviewed-by: sterni Reviewed-by: grfn Tested-by: BuildkiteCI Reviewed-by: tazjin --- ops/machines/sanduny/default.nix | 1 - ops/modules/depot-inbox.nix | 2 +- third_party/overlays/tvl.nix | 8 +++---- third_party/sources/sources.json | 36 +++++++++++++++--------------- users/grfn/system/home/modules/desktop.nix | 5 ++++- users/sterni/emacs/default.nix | 2 +- users/tazjin/nixos/polyanka/default.nix | 1 - 7 files changed, 28 insertions(+), 27 deletions(-) diff --git a/ops/machines/sanduny/default.nix b/ops/machines/sanduny/default.nix index 4db6311ceb6b..14f40d1fa09e 100644 --- a/ops/machines/sanduny/default.nix +++ b/ops/machines/sanduny/default.nix @@ -98,7 +98,6 @@ in # their own way of booting systems as long as config is in place. boot.loader.grub.device = "nodev"; boot.loader.grub.enable = true; - boot.loader.grub.version = 2; boot.initrd.availableKernelModules = [ "xen_blkfront" ]; hardware.cpu.intel.updateMicrocode = true; diff --git a/ops/modules/depot-inbox.nix b/ops/modules/depot-inbox.nix index 6110e47250cc..14fc646a9a43 100644 --- a/ops/modules/depot-inbox.nix +++ b/ops/modules/depot-inbox.nix @@ -104,7 +104,7 @@ in settings.publicinbox = { wwwlisting = "all"; nntpserver = [ "inbox.tvl.su" ]; - imapserver = "inbox.tvl.su"; + imapserver = [ "inbox.tvl.su" ]; depot.obfuscate = true; noObfuscate = [ diff --git a/third_party/overlays/tvl.nix b/third_party/overlays/tvl.nix index 3163a95db301..c68ec8f26292 100644 --- a/third_party/overlays/tvl.nix +++ b/third_party/overlays/tvl.nix @@ -41,12 +41,12 @@ depot.nix.readTree.drvTargets { # Too match telega in emacs-overlay or wherever tdlib = super.tdlib.overrideAttrs (_: { - version = "1.8.12"; + version = "1.8.14"; src = self.fetchFromGitHub { owner = "tdlib"; repo = "td"; - rev = "70bee089d492437ce931aa78446d89af3da182fc"; - sha256 = "1m1mnvrk9nr3d3sq191i5y1bdgnp1hnq0c6iqybzmyswr501prz3"; + rev = "e8ee1c51498c060c6f9b8511bf25a6c025e72adf"; + sha256 = "0vm5j5kzvzf5gdmg2rg6hw3dyzn9dy0l256asyjipbnhk9302s0n"; }; }); @@ -77,7 +77,7 @@ depot.nix.readTree.drvTargets { notmuch = super.notmuch.emacs; # Build EXWM with the depot sources instead. - exwm = esuper.exwm.overrideAttrs (_: { + depotExwm = esuper.exwm.overrideAttrs (_: { src = depot.path.origSrc + "/third_party/exwm"; }); diff --git a/third_party/sources/sources.json b/third_party/sources/sources.json index 575832c5dd14..898aa5c46912 100644 --- a/third_party/sources/sources.json +++ b/third_party/sources/sources.json @@ -17,10 +17,10 @@ "homepage": "", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "77269bb9a0c99fdc5f356eac10b41172775194fc", - "sha256": "1m7qzrg7cgsf7l4caz71q1yjngyr48z9n8z701ppbdzk66ydfjfm", + "rev": "d67534316f2307e133cfc4017e65c240af74fbb7", + "sha256": "1v0mpwl3rjnvlrd03rxlx41agi3dsrdl6lwzg6mdbajdh2smdw9v", "type": "tarball", - "url": "https://github.com/nix-community/emacs-overlay/archive/77269bb9a0c99fdc5f356eac10b41172775194fc.tar.gz", + "url": "https://github.com/nix-community/emacs-overlay/archive/d67534316f2307e133cfc4017e65c240af74fbb7.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "home-manager": { @@ -29,10 +29,10 @@ "homepage": "https://nix-community.github.io/home-manager/", "owner": "nix-community", "repo": "home-manager", - "rev": "2d963854ae2499193c0c72fd67435fee34d3e4fd", - "sha256": "1851n81s5z5gliq9ymcw1k1z46rhgb3q3q8b7qiim2y8phbmdbhy", + "rev": "e0034971f9def16bbc32124147787bc0f09f0e59", + "sha256": "0s9a0ym7yd67glvxyfpmz3rsxgjhsaac1q3jvzqfm7bkjww6v86y", "type": "tarball", - "url": "https://github.com/nix-community/home-manager/archive/2d963854ae2499193c0c72fd67435fee34d3e4fd.tar.gz", + "url": "https://github.com/nix-community/home-manager/archive/e0034971f9def16bbc32124147787bc0f09f0e59.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "impermanence": { @@ -53,10 +53,10 @@ "homepage": "", "owner": "nmattia", "repo": "naersk", - "rev": "88cd22380154a2c36799fe8098888f0f59861a15", - "sha256": "1wxi05lz4p2484w7iyw4k4fkxsqq8lkcsyjb87i34i40yz6fxwk6", + "rev": "8507af04eb40c5520bd35d9ce6f9d2342cea5ad1", + "sha256": "0x024pcj1jwnsdx2lkm12q9zclmrsd74xrvghb2a4qjjnsvywx4d", "type": "tarball", - "url": "https://github.com/nmattia/naersk/archive/88cd22380154a2c36799fe8098888f0f59861a15.tar.gz", + "url": "https://github.com/nmattia/naersk/archive/8507af04eb40c5520bd35d9ce6f9d2342cea5ad1.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "napalm": { @@ -77,10 +77,10 @@ "homepage": "", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4e37b4e55b60fb7d43d2b62deb51032a489bcbe8", - "sha256": "11a6j8kkk54518lncic5wa88fa5rski3rq6m9s7qlfngkqsihr0q", + "rev": "0eeebd64de89e4163f4d3cf34ffe925a5cf67a05", + "sha256": "1k3qlcbf5y15l4x2sn5i47n2chacn321kl6s7if751cnszrs08df", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/4e37b4e55b60fb7d43d2b62deb51032a489bcbe8.tar.gz", + "url": "https://github.com/NixOS/nixpkgs/archive/0eeebd64de89e4163f4d3cf34ffe925a5cf67a05.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "nixpkgs-stable": { @@ -101,10 +101,10 @@ "homepage": "", "owner": "oxalica", "repo": "rust-overlay", - "rev": "d6ac24aa7ff658552ce57913df4b0cb823cf15ab", - "sha256": "0f7a6p5137vfl03qngksf9j0lqgj1scjhj40ixbdsjiv0bjnw8cr", + "rev": "5c2b97c0a9bc5217fc3dfb1555aae0fb756d99f9", + "sha256": "0dsqvy0jcdj29ljri74b7fzrpq7sbybk2i7zni869l2rlk9bhdlc", "type": "tarball", - "url": "https://github.com/oxalica/rust-overlay/archive/d6ac24aa7ff658552ce57913df4b0cb823cf15ab.tar.gz", + "url": "https://github.com/oxalica/rust-overlay/archive/5c2b97c0a9bc5217fc3dfb1555aae0fb756d99f9.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "rustsec-advisory-db": { @@ -113,10 +113,10 @@ "homepage": "https://rustsec.org", "owner": "RustSec", "repo": "advisory-db", - "rev": "e162556b9e8c1542c187290453cbd322e8905f0c", - "sha256": "18s1zn7wyqw902lyi6r9k726mb6pj475gw4n4ng2danwsmfdnm9i", + "rev": "13b9455e9f7d2927f81088db3cffaafd6a6bbe16", + "sha256": "0dklw6795kgz3abpn345296z55cfjlh48sk8wqx2dyhfykdgiscm", "type": "tarball", - "url": "https://github.com/RustSec/advisory-db/archive/e162556b9e8c1542c187290453cbd322e8905f0c.tar.gz", + "url": "https://github.com/RustSec/advisory-db/archive/13b9455e9f7d2927f81088db3cffaafd6a6bbe16.tar.gz", "url_template": "https://github.com///archive/.tar.gz" } } diff --git a/users/grfn/system/home/modules/desktop.nix b/users/grfn/system/home/modules/desktop.nix index 08277e9c594c..fed3cb47a48f 100644 --- a/users/grfn/system/home/modules/desktop.nix +++ b/users/grfn/system/home/modules/desktop.nix @@ -10,7 +10,10 @@ ]; home.packages = with pkgs; [ - ntfy + (ntfy.override { + # Slack support is broken as of 2023-06-15 + withSlack = false; + }) ]; services.syncthing.tray.enable = true; diff --git a/users/sterni/emacs/default.nix b/users/sterni/emacs/default.nix index cd682fa2eec3..a66f9ca1529c 100644 --- a/users/sterni/emacs/default.nix +++ b/users/sterni/emacs/default.nix @@ -15,7 +15,7 @@ let ''; # emacsPgtk is defined in emacs-overlay - emacs = (pkgs.emacsPackagesFor pkgs.emacsPgtk).withPackages (epkgs: [ + emacs = (pkgs.emacsPackagesFor pkgs.emacs-pgtk).withPackages (epkgs: [ epkgs.bqn-mode #epkgs.elpaPackages.ada-mode epkgs.elpaPackages.rainbow-mode diff --git a/users/tazjin/nixos/polyanka/default.nix b/users/tazjin/nixos/polyanka/default.nix index c7f41b95aa0c..807e20e1bb30 100644 --- a/users/tazjin/nixos/polyanka/default.nix +++ b/users/tazjin/nixos/polyanka/default.nix @@ -19,7 +19,6 @@ in # Use the GRUB 2 boot loader. boot.loader.grub.enable = true; - boot.loader.grub.version = 2; boot.loader.grub.device = "/dev/sda"; # or "nodev" for efi only boot.initrd.availableKernelModules = [ "ata_piix" "vmw_pvscsi" "sd_mod" "sr_mod" ]; -- cgit 1.4.1