From b4e420d4ff3011b8fd515c2cab33fbde55859b8f Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Sat, 9 Jan 2021 16:26:13 +0300 Subject: chore(3p): Bump NixOS channels to 2021-01-09 Your regularly scheduled channel update, but slightly more regular than before. Included fixes: * 3p/emacs: Pick telega.el from stable channel, unstable is broken. * glittershark/fprintd: Compile with gcc9, since build fails with the new default of gcc10 * glittershark/fprintd: Use a global overlay for the fprintd package until https://github.com/NixOS/nixpkgs/pull/108962 lands in nixos-unstable * glittershark/home: Don't install rr, as it's not building with gcc10 Co-Author: Griffin Smith Change-Id: Ia715fef64a405a220049fc540017356fa7370e0b Reviewed-on: https://cl.tvl.fyi/c/depot/+/2341 Reviewed-by: tazjin Reviewed-by: glittershark Reviewed-by: lukegb Tested-by: BuildkiteCI --- users/glittershark/pkgs/fprintd/default.nix | 4 ++++ users/glittershark/pkgs/fprintd/libfprint-tod-clean.nix | 2 +- users/glittershark/pkgs/fprintd/libfprint-tod.nix | 2 +- users/glittershark/system/home/modules/development.nix | 1 - users/glittershark/system/system/machines/yeren.nix | 5 +++++ users/tazjin/emacs/default.nix | 8 ++------ 6 files changed, 13 insertions(+), 9 deletions(-) (limited to 'users') diff --git a/users/glittershark/pkgs/fprintd/default.nix b/users/glittershark/pkgs/fprintd/default.nix index 4c4632b7a32e..0f9d414aeb86 100644 --- a/users/glittershark/pkgs/fprintd/default.nix +++ b/users/glittershark/pkgs/fprintd/default.nix @@ -3,7 +3,11 @@ args @ { pkgs, ... }: let nixpkgs = import pkgs.nixpkgsSrc { config.allowUnfree = true; + overlays = [(self: super: { + gcc = super.gcc9; + })]; }; + inherit (nixpkgs) stdenv fetchFromGitLab diff --git a/users/glittershark/pkgs/fprintd/libfprint-tod-clean.nix b/users/glittershark/pkgs/fprintd/libfprint-tod-clean.nix index 17a4af450599..d8e64f3cc1c9 100644 --- a/users/glittershark/pkgs/fprintd/libfprint-tod-clean.nix +++ b/users/glittershark/pkgs/fprintd/libfprint-tod-clean.nix @@ -21,7 +21,7 @@ }: stdenv.mkDerivation rec { - pname = "libfprint"; + pname = "libfprint-tod-clean"; version = "1.90.2"; outputs = [ "out" "devdoc" ]; diff --git a/users/glittershark/pkgs/fprintd/libfprint-tod.nix b/users/glittershark/pkgs/fprintd/libfprint-tod.nix index 70c5d6d367c1..d9c87e673c97 100644 --- a/users/glittershark/pkgs/fprintd/libfprint-tod.nix +++ b/users/glittershark/pkgs/fprintd/libfprint-tod.nix @@ -22,7 +22,7 @@ }: stdenv.mkDerivation rec { - pname = "libfprint"; + pname = "libfprint-tod"; version = "1.90.2"; outputs = [ "out" "devdoc" ]; diff --git a/users/glittershark/system/home/modules/development.nix b/users/glittershark/system/home/modules/development.nix index cf7301cc60c2..c5338c8d9a84 100644 --- a/users/glittershark/system/home/modules/development.nix +++ b/users/glittershark/system/home/modules/development.nix @@ -63,7 +63,6 @@ with lib; config.lib.depot.third_party.clang-tools ] ++ optionals (stdenv.isLinux) [ valgrind - rr ]; programs.git = { diff --git a/users/glittershark/system/system/machines/yeren.nix b/users/glittershark/system/system/machines/yeren.nix index ae697592def2..c695608977be 100644 --- a/users/glittershark/system/system/machines/yeren.nix +++ b/users/glittershark/system/system/machines/yeren.nix @@ -70,6 +70,11 @@ intel-media-driver ]; + # the fprintd module hardcodes pkgs.fprintd :'( + nixpkgs.overlays = [(_: _: { + fprintd = config.depot.users.glittershark.pkgs.fprintd; + })]; + services.fprintd = { enable = true; package = config.depot.users.glittershark.pkgs.fprintd; diff --git a/users/tazjin/emacs/default.nix b/users/tazjin/emacs/default.nix index 4e96eff3cf58..b1ec90f18543 100644 --- a/users/tazjin/emacs/default.nix +++ b/users/tazjin/emacs/default.nix @@ -14,12 +14,8 @@ let emacsWithPackages = (third_party.emacsPackagesGen third_party.emacs27).emacsWithPackages; - # Pick telega from unstable channel for recent fixes. - unstable = import third_party.nixpkgsSrc {}; - telegaUnstable = (unstable.emacsPackagesGen third_party.emacs27).telega; - # $PATH for binaries that need to be available to Emacs - emacsBinPath = lib.makeBinPath [ telegaUnstable ]; + emacsBinPath = lib.makeBinPath [ third_party.stableTelega ]; identity = x: x; @@ -88,7 +84,6 @@ let sly string-edit swiper - telegaUnstable telephone-line terraform-mode toml-mode @@ -110,6 +105,7 @@ let tvl # patched / overridden versions of packages + depot.third_party.stableTelega depot.third_party.emacs.exwm depot.third_party.emacs.rcirc depot.third_party.emacs.vterm -- cgit 1.4.1