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 <grfn@gws.fyi> Change-Id: Ia715fef64a405a220049fc540017356fa7370e0b Reviewed-on: https://cl.tvl.fyi/c/depot/+/2341 Reviewed-by: tazjin <mail@tazj.in> Reviewed-by: glittershark <grfn@gws.fyi> Reviewed-by: lukegb <lukegb@tvl.fyi> Tested-by: BuildkiteCI
This commit is contained in:
parent
216e7334f6
commit
b4e420d4ff
7 changed files with 22 additions and 15 deletions
15
third_party/default.nix
vendored
15
third_party/default.nix
vendored
|
@ -5,11 +5,11 @@
|
|||
{ ... }:
|
||||
|
||||
let
|
||||
# Tracking nixos-unstable as of 2020-12-28.
|
||||
nixpkgsCommit = "2f47650c2f28d87f86ab807b8a339c684d91ec56";
|
||||
# Tracking nixos-unstable as of 2021-01-09.
|
||||
nixpkgsCommit = "f211631c1cb3e94828c7650b5d12c1e5a89e0e16";
|
||||
nixpkgsSrc = fetchTarball {
|
||||
url = "https://github.com/NixOS/nixpkgs/archive/${nixpkgsCommit}.tar.gz";
|
||||
sha256 = "17akl75x28rzq97gaad32flswdsp150nfsg7h909kda721zql71a";
|
||||
sha256 = "0r085j42991qcbzx4l0hnwlsxw016y4b7r821s4qxvqnvwr9lxar";
|
||||
};
|
||||
nixpkgs = import nixpkgsSrc {
|
||||
config.allowUnfree = true;
|
||||
|
@ -21,11 +21,11 @@ let
|
|||
];
|
||||
};
|
||||
|
||||
# Tracking nixos-20.09 as of 2020-12-28.
|
||||
stableCommit = "0c81b9a4f170f734bd7e587a39e56470c59733e7";
|
||||
# Tracking nixos-20.09 as of 2021-01-09.
|
||||
stableCommit = "0cfd08f4881bbfdaa57e68835b923d4290588d98";
|
||||
stableNixpkgsSrc = fetchTarball {
|
||||
url = "https://github.com/NixOS/nixpkgs/archive/${stableCommit}.tar.gz";
|
||||
sha256 = "1fl5ks6p78bamqanbk9xpy83jzzcdw2mdabrp59n33xv7jix1jzx";
|
||||
sha256 = "1srd9p37jmrsxgvrxvlibmscphz5p42244285yc5piacvrz1rdcc";
|
||||
};
|
||||
stableNixpkgs = import stableNixpkgsSrc {};
|
||||
|
||||
|
@ -66,6 +66,9 @@ in exposed.lib.fix(self: exposed // {
|
|||
emacs27-nox = assert ((exposed.lib.versions.major nixpkgs.emacs.version) == "27");
|
||||
nixpkgs.emacs-nox;
|
||||
|
||||
# Provide telega.el from stable
|
||||
stableTelega = stableNixpkgs.emacsPackages.telega;
|
||||
|
||||
# The Go authors have released a version of Go (in alpha) that has a
|
||||
# type system. This makes it available, specifically for use with
|
||||
# //nix/buildTypedGo.
|
||||
|
|
|
@ -3,7 +3,11 @@ args @ { pkgs, ... }:
|
|||
let
|
||||
nixpkgs = import pkgs.nixpkgsSrc {
|
||||
config.allowUnfree = true;
|
||||
overlays = [(self: super: {
|
||||
gcc = super.gcc9;
|
||||
})];
|
||||
};
|
||||
|
||||
inherit (nixpkgs)
|
||||
stdenv
|
||||
fetchFromGitLab
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libfprint";
|
||||
pname = "libfprint-tod-clean";
|
||||
version = "1.90.2";
|
||||
outputs = [ "out" "devdoc" ];
|
||||
|
||||
|
|
|
@ -22,7 +22,7 @@
|
|||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libfprint";
|
||||
pname = "libfprint-tod";
|
||||
version = "1.90.2";
|
||||
outputs = [ "out" "devdoc" ];
|
||||
|
||||
|
|
|
@ -63,7 +63,6 @@ with lib;
|
|||
config.lib.depot.third_party.clang-tools
|
||||
] ++ optionals (stdenv.isLinux) [
|
||||
valgrind
|
||||
rr
|
||||
];
|
||||
|
||||
programs.git = {
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue