about summary refs log tree commit diff
path: root/third_party/nixpkgs/default.nix
diff options
context:
space:
mode:
authorsterni <sternenseemann@systemli.org>2021-12-07T09·02+0100
committersterni <sternenseemann@systemli.org>2021-12-07T10·36+0000
commit6ef5162a93dc207fb7bd158f9d7449573d05045d (patch)
treea1991ce63c1889fb1f10abf9a1904bd741d1c6b5 /third_party/nixpkgs/default.nix
parent7f2f5d07f25a77ba8224543339b78bc78495fe44 (diff)
chore(3p): bump NixOS channels and emacs overlay to 2021-12-07 r/3147
* //third_party/cgit: apply patch [1] for Git 2.34 compatibility to
  reflect dropping of the string_list_init function in 770fed [2].
  Patch hasn't been applied on cgit's master yet, over concern about a
  breaking change in git (?) [3].

[1]: https://lists.zx2c4.com/pipermail/cgit/2021-November/004666.html
[2]: https://github.com/git/git/commit/770fedaf9fb156bd8c18da41770eac0cb63fba63
[3]: https://lists.zx2c4.com/pipermail/cgit/2021-November/004667.html

Change-Id: Ie10c99c017ae5a43f4369b42151e19ecf07f7949
Diffstat (limited to 'third_party/nixpkgs/default.nix')
-rw-r--r--third_party/nixpkgs/default.nix12
1 files changed, 6 insertions, 6 deletions
diff --git a/third_party/nixpkgs/default.nix b/third_party/nixpkgs/default.nix
index f08b46b63c43..3048f9229f53 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 nixos-unstable as of 2021-11-24.
+  # Tracking nixos-unstable as of 2021-12-05.
   unstableHashes = {
-    commit = "39cb89ef2ffcbef8d2ac2d52267ac69121a6becb";
-    sha256 = "1x9vzpay56ap4hgfq1giz00050crdngv5jkxgkxzx276mzhw93na";
+    commit = "c71f061c68ba8ce53471b767d5049cbd0f3d8490";
+    sha256 = "1s2lmxswx30z80abccvrcygpnys3csbaygjdlw5i0lk4nwslnkmn";
   };
 
-  # Tracking nixos-21.05 as of 2021-11-24.
+  # Tracking nixos-21.05 as of 2021-12-07.
   stableHashes = {
-    commit = "09650059d7f5ae59a7f0fb2dd3bfc6d2042a74de";
-    sha256 = "0f06zcc8mh934fya0hwzklmga238yxiyfp183y48vyzkdsg7xgn0";
+    commit = "4a8751d694b46340072d95409804f59b98326f44";
+    sha256 = "14pmmd82s0anknd6g57i0c1795766bvylqalf9kz730q1v0ransl";
   };
 
   # import the nixos-unstable package set, or optionally use the