From 0c506c055cb2fe42bcc92e905dc7996a75a66b7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Isma=C3=ABl=20Bouya?= <ismael.bouya@normalesup.org>
Date: Thu, 28 Jan 2021 00:15:47 +0100
Subject: Update nix unstable

---
 shell.nix | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

(limited to 'shell.nix')

diff --git a/shell.nix b/shell.nix
index 93caa0b..3aa03a7 100644
--- a/shell.nix
+++ b/shell.nix
@@ -1,4 +1,18 @@
-{ pkgs ? import <nixpkgs> { overlays = builtins.attrValues (import ./overlays); } }:
+{ pkgs ? import <nixpkgs> { overlays = builtins.attrValues (import ./overlays); },
+  pkgs-nix ? import <nixpkgs-nix> { overlays = builtins.attrValues (import ./overlays); }
+}:
+let
+  patchedNix = pkgs-nix.nixUnstable.overrideAttrs(old: {
+    patches = old.patches ++ [
+      # Fix the ETag bug. PR merged. Remove when updating to >= 20210125
+      # https://github.com/NixOS/nixpkgs/pull/109309#issuecomment-768331750
+      (pkgs-nix.fetchpatch {
+        url = "https://patch-diff.githubusercontent.com/raw/NixOS/nix/pull/4470.diff";
+        sha256 = "sha256-d4RNOKMxa4NMbFgYcqWRv2ByHt8F/XUWV+6P9qHz7S4=";
+      })
+    ];
+  });
+in
 pkgs.mkShell {
-  buildInputs = [ pkgs.nixUnstable pkgs.morph pkgs.niv pkgs.pass pkgs.curl pkgs.shellcheck pkgs.jq pkgs.gnumake ];
+  buildInputs = [ patchedNix pkgs.morph pkgs.niv pkgs.pass pkgs.curl pkgs.shellcheck pkgs.jq pkgs.gnumake ];
 }
-- 
cgit v1.2.3