diff options
author | sterni <sternenseemann@systemli.org> | 2021-07-16T19·13+0200 |
---|---|---|
committer | sterni <sternenseemann@systemli.org> | 2021-07-28T12·10+0000 |
commit | 6b88df04c1986bf5c40433caa87f1dba8ce8971d (patch) | |
tree | 1e992e1487862a04c11d943deb91969efbde6dd1 | |
parent | f693f935a7cfe163e5c56ca182ff3a560c2dcdce (diff) |
chore(3p/nixpkgs): update channels to 2021-07-25 r/2696
* 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: https://github.com/NixOS/nixpkgs/commit/9140d4b06ff09bce8dd8e384eeef832e7811d288 * 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>
-rw-r--r-- | third_party/buzz/default.nix | 5 | ||||
-rw-r--r-- | third_party/emacs/explain-pause-mode.nix | 8 | ||||
-rw-r--r-- | third_party/nixpkgs/default.nix | 12 | ||||
-rw-r--r-- | third_party/overlays/emacs.nix | 6 |
4 files changed, 17 insertions, 14 deletions
diff --git a/third_party/buzz/default.nix b/third_party/buzz/default.nix index e6cd9df99865..2af9df912e94 100644 --- a/third_party/buzz/default.nix +++ b/third_party/buzz/default.nix @@ -4,9 +4,8 @@ depot.third_party.naersk.buildPackage { src = pkgs.fetchFromGitHub { owner = "jonhoo"; repo = "buzz"; - rev = "aede85850bd4b919128da6267c8cf151e7246a35"; - sha256 = "02z3cqqfaylasqyafv0fbzcfav0vby7nngh642gb4cxrm3jqkz2w"; - fetchSubmodules = true; + rev = "02479643ed1b0325050245dbb3b70411b8cffb7a"; + sha256 = "1spklfv02qlinlail5rmhh1c4926gyrkr2ydd9g6z919rxkl0ywk"; }; buildInputs = with pkgs; [ diff --git a/third_party/emacs/explain-pause-mode.nix b/third_party/emacs/explain-pause-mode.nix index 60e0cd149881..fc57d665d737 100644 --- a/third_party/emacs/explain-pause-mode.nix +++ b/third_party/emacs/explain-pause-mode.nix @@ -2,9 +2,13 @@ let inherit (pkgs) emacsPackages fetchFromGitHub; -in emacsPackages.melpaBuild { + + commit = "35f7d780a9c164b5c502023746473b1de3857904"; + +in emacsPackages.melpaBuild rec { pname = "explain-pause-mode"; version = "0.1"; # master on 20200603 + inherit commit; recipe = builtins.toFile "recipe.el" '' (explain-pause-mode :fetcher github @@ -14,7 +18,7 @@ in emacsPackages.melpaBuild { src = fetchFromGitHub { owner = "lastquestion"; repo = "explain-pause-mode"; - rev = "35f7d780a9c164b5c502023746473b1de3857904"; + rev = commit; sha256 = "0d9lwzqqwmz0n94i7959rj7m24265yf3825a5g8cd7fyzxznl1pc"; }; } diff --git a/third_party/nixpkgs/default.nix b/third_party/nixpkgs/default.nix index edbeec8cb92a..597c3a89ffab 100644 --- a/third_party/nixpkgs/default.nix +++ b/third_party/nixpkgs/default.nix @@ -13,16 +13,16 @@ let # nixos-unstable, and the current stable channel of the latest NixOS # release. - # Tracking nixpkgs-unstable as of 2021-07-03. + # Tracking nixos-unstable as of 2021-07-25. unstableHashes = { - commit = "20887e4bbfdae3aed6bfa1f53ddf138ee325515e"; - sha256 = "0hc79sv59appb7bynz5bzyqvrapyjdq63s79i649vxl93504kmnv"; + commit = "dd14e5d78e90a2ccd6007e569820de9b4861a6c2"; + sha256 = "1zmhwx1qqgl1wrrb9mjkck508887rldrnragvximhd7jrh1ya3fb"; }; - # Tracking nixos-21.05 as of 2021-06-02. + # Tracking nixos-21.05 as of 2021-07-25. stableHashes = { - commit = "eaba7870ffc3400eca4407baa24184b7fe337ec1"; - sha256 = "115disiz4b08iw46cidc7lm0advrxn5g2ldmlrxd53zf03skyb2w"; + commit = "973910f5c31b9ba6c171c33a8bd7199990b14c72"; + sha256 = "1n1kibmn1fcjazaxp8lydwdx646lknqksv5b2fm33fdq2dvafvj7"; }; # import the nixos-unstable package set, or optionally use the diff --git a/third_party/overlays/emacs.nix b/third_party/overlays/emacs.nix index 99844a33e715..b5d471b97048 100644 --- a/third_party/overlays/emacs.nix +++ b/third_party/overlays/emacs.nix @@ -2,10 +2,10 @@ { ... }: let - # from 2020-05-26 - commit = "5df3462dda05d8e44669cf374776274e1bc47d0a"; + # from 2021-07-25 + commit = "850ddaaadd4c640bd8eb4b154734a96bbe234d07"; src = builtins.fetchTarball { url = "https://github.com/nix-community/emacs-overlay/archive/${commit}.tar.gz"; - sha256 = "0ggmkg4shf9948wpwb0s40bjvwijvhv2wykrkayclvp419kbrfxq"; + sha256 = "178ysnqs6k7y8h9zvd3l7c0m6lqzncn3dh0fb8sqv4hgsvx95j6r"; }; in import src |