X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=shell.nix;h=2295f8cc10b8eca9bf4798562080a2256963c1e5;hb=bd5c5d4e23ebd3863a960976767ed4a83dfd07fe;hp=70c76044aa0d05aff88bbc4cbdff4c5ca4a6d465;hpb=da28a4e2afef21710f73860b26893fa18dd32858;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/shell.nix b/shell.nix
index 70c7604..2295f8c 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.nixops pkgs.niv pkgs.pass pkgs.curl pkgs.shellcheck pkgs.jq pkgs.gnumake ];
+  buildInputs = [ patchedNix pkgs.sops pkgs.morph pkgs.niv pkgs.curl pkgs.shellcheck pkgs.jq pkgs.gnumake pkgs.yq ];
 }