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

chore(3p/nixpkgs): update channels to 2021-07-25

Browse source 
* 3p/buzz: bump to latest master (1.6.0)

* 3p/emacs/explain-pause-mode: adjust to package-build update
  MELPA's package build now cares about git revisions, but calling VC
  commands in a nix build is usually a bad idea. Thus upstream nixpkgs
  passes `$commit` to the `buildPhase` and otherwise fails with an
  error message that doesn't really point to the issue. Upstream change:
  9140d4b06f

* 3p/overlays/emacs: udpate to 2021-07-25 to support the package-build
  update. Without this emacsPackages.xelb (for tazjin's exwm) would fail.

Change-Id: I7cd782fe7d66ed4ea78c529b79fe761d921f46a8
Reviewed-on: https://cl.tvl.fyi/c/depot/+/3253
Tested-by: BuildkiteCI
Reviewed-by: tazjin <mail@tazj.in>
Reviewed-by: grfn <grfn@gws.fyi>
This commit is contained in:
sterni 2021-07-16 21:13:04 +02:00
parent f693f935a7
commit 6b88df04c1
4 changed files with 17 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
third_party/buzz/default.nix vendored
View file

@ -4,9 +4,8 @@ depot.third_party.naersk.buildPackage {
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "jonhoo"; owner = "jonhoo";
repo = "buzz"; repo = "buzz";
rev = "aede85850bd4b919128da6267c8cf151e7246a35"; rev = "02479643ed1b0325050245dbb3b70411b8cffb7a";
sha256 = "02z3cqqfaylasqyafv0fbzcfav0vby7nngh642gb4cxrm3jqkz2w"; sha256 = "1spklfv02qlinlail5rmhh1c4926gyrkr2ydd9g6z919rxkl0ywk";
fetchSubmodules = true;
}; };
buildInputs = with pkgs; [ buildInputs = with pkgs; [

8
third_party/emacs/explain-pause-mode.nix vendored
View file

@ -2,9 +2,13 @@
let let
inherit (pkgs) emacsPackages fetchFromGitHub; inherit (pkgs) emacsPackages fetchFromGitHub;
in emacsPackages.melpaBuild {
commit = "35f7d780a9c164b5c502023746473b1de3857904";
in emacsPackages.melpaBuild rec {
pname = "explain-pause-mode"; pname = "explain-pause-mode";
version = "0.1"; # master on 20200603 version = "0.1"; # master on 20200603
inherit commit;
recipe = builtins.toFile "recipe.el" '' recipe = builtins.toFile "recipe.el" ''
(explain-pause-mode :fetcher github (explain-pause-mode :fetcher github
@ -14,7 +18,7 @@ in emacsPackages.melpaBuild {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "lastquestion"; owner = "lastquestion";
repo = "explain-pause-mode"; repo = "explain-pause-mode";
rev = "35f7d780a9c164b5c502023746473b1de3857904"; rev = commit;
sha256 = "0d9lwzqqwmz0n94i7959rj7m24265yf3825a5g8cd7fyzxznl1pc"; sha256 = "0d9lwzqqwmz0n94i7959rj7m24265yf3825a5g8cd7fyzxznl1pc";
}; };
} }

12
third_party/nixpkgs/default.nix vendored
View file

@ -13,16 +13,16 @@ let
# nixos-unstable, and the current stable channel of the latest NixOS # nixos-unstable, and the current stable channel of the latest NixOS
# release. # release.
# Tracking nixpkgs-unstable as of 2021-07-03. # Tracking nixos-unstable as of 2021-07-25.
unstableHashes = { unstableHashes = {
commit = "20887e4bbfdae3aed6bfa1f53ddf138ee325515e"; commit = "dd14e5d78e90a2ccd6007e569820de9b4861a6c2";
sha256 = "0hc79sv59appb7bynz5bzyqvrapyjdq63s79i649vxl93504kmnv"; sha256 = "1zmhwx1qqgl1wrrb9mjkck508887rldrnragvximhd7jrh1ya3fb";
}; };
# Tracking nixos-21.05 as of 2021-06-02. # Tracking nixos-21.05 as of 2021-07-25.
stableHashes = { stableHashes = {
commit = "eaba7870ffc3400eca4407baa24184b7fe337ec1"; commit = "973910f5c31b9ba6c171c33a8bd7199990b14c72";
sha256 = "115disiz4b08iw46cidc7lm0advrxn5g2ldmlrxd53zf03skyb2w"; sha256 = "1n1kibmn1fcjazaxp8lydwdx646lknqksv5b2fm33fdq2dvafvj7";
}; };
# import the nixos-unstable package set, or optionally use the # import the nixos-unstable package set, or optionally use the

6
third_party/overlays/emacs.nix vendored
View file

@ -2,10 +2,10 @@
{ ... }: { ... }:
let let
# from 2020-05-26 # from 2021-07-25
commit = "5df3462dda05d8e44669cf374776274e1bc47d0a"; commit = "850ddaaadd4c640bd8eb4b154734a96bbe234d07";
src = builtins.fetchTarball { src = builtins.fetchTarball {
url = "https://github.com/nix-community/emacs-overlay/archive/${commit}.tar.gz"; url = "https://github.com/nix-community/emacs-overlay/archive/${commit}.tar.gz";
sha256 = "0ggmkg4shf9948wpwb0s40bjvwijvhv2wykrkayclvp419kbrfxq"; sha256 = "178ysnqs6k7y8h9zvd3l7c0m6lqzncn3dh0fb8sqv4hgsvx95j6r";
}; };
in import src in import src