From 8b5854e260a556d623442b82575aa3f8a38ede17 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Fri, 28 Apr 2017 14:14:49 -0500 Subject: [PATCH] nix-bundle: 0.1.2 -> 0.1.3 --- pkgs/tools/package-management/nix-bundle/default.nix | 11 ++++++----- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/package-management/nix-bundle/default.nix b/pkgs/tools/package-management/nix-bundle/default.nix index b01836e1eb8..e3255afe7fe 100644 --- a/pkgs/tools/package-management/nix-bundle/default.nix +++ b/pkgs/tools/package-management/nix-bundle/default.nix @@ -1,20 +1,21 @@ -{ stdenv, lib, fetchFromGitHub, nix, makeWrapper }: +{ stdenv, lib, fetchFromGitHub, nix, makeWrapper, coreutils, gnutar, gzip, bzip2 }: stdenv.mkDerivation rec { pname = "nix-bundle"; name = "${pname}-${version}"; - version = "0.1.1"; + version = "0.1.3"; src = fetchFromGitHub { owner = "matthewbauer"; repo = pname; rev = "v${version}"; - sha256 = "13730rfnqjv1m2mky2g0cq77yzp2j215zrvy3lhpiwgmh97vviih"; + sha256 = "15r77pchf4s4cdv4lvw2zw1yic78k8p0n2r954qq370vscw30yac"; }; - buildInputs = [ nix makeWrapper ]; + # coreutils, gnutar is actually needed by nix for bootstrap + buildInputs = [ nix coreutils makeWrapper gnutar gzip bzip2 ]; - binPath = lib.makeBinPath [ nix ]; + binPath = lib.makeBinPath [ nix coreutils gnutar gzip bzip2 ]; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2f7d6ea92b5..71ceb67e4cc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18081,7 +18081,7 @@ with pkgs; nixui = callPackage ../tools/package-management/nixui { node_webkit = nwjs_0_12; }; - nix-bundle = callPackage ../tools/package-management/nix-bundle { nix = nixStable; }; + nix-bundle = callPackage ../tools/package-management/nix-bundle { nix = nixUnstable; }; inherit (callPackages ../tools/package-management/nix-prefetch-scripts { }) nix-prefetch-bzr