From c1a13108e20f02b4882fd46b484194203aa0b746 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 11 Jan 2019 15:05:17 +0100 Subject: [PATCH] nix: Add editline dependency Also fix incorrect hash for nixUnstable. --- pkgs/tools/package-management/nix/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 44383ee5aa1..995f123b81d 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, fetchFromGitHub, fetchpatch, perl, curl, bzip2, sqlite, openssl ? null, xz -, pkgconfig, boehmgc, perlPackages, libsodium, brotli, boost +, pkgconfig, boehmgc, perlPackages, libsodium, brotli, boost, editline , autoreconfHook, autoconf-archive, bison, flex, libxml2, libxslt, docbook5, docbook_xsl_ns , busybox-sandbox-shell , storeDir ? "/nix/store" @@ -30,7 +30,7 @@ let buildInputs = [ curl openssl sqlite xz bzip2 ] ++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium - ++ lib.optionals is20 [ brotli boost ] + ++ lib.optionals is20 [ brotli boost editline ] ++ lib.optional withLibseccomp libseccomp ++ lib.optional (withAWS && is20) ((aws-sdk-cpp.override { @@ -166,7 +166,7 @@ in rec { owner = "NixOS"; repo = "nix"; rev = "85488a93ec3b07210339f2b05aa93e970f9ac3be"; - sha256 = "0fkmx7gmgg0yij9kw52fkyvib88hj1jsj90vbpy13ccfwknh1044"; + sha256 = "1n5dp7p2lzpnj7f834d25k020v16gnnsm56jz46y87v2x7b69ccm"; }; fromGit = true; })) // { perl-bindings = perl-bindings {