Merge pull request #25336 from matthewbauer/nix-bundle

nix-bundle: v0.1.1 -> v0.1.3
This commit is contained in:
Frederik Rietdijk 2017-04-30 09:58:18 +02:00 committed by GitHub
commit 3425c37ac6
2 changed files with 7 additions and 6 deletions

View File

@ -1,20 +1,21 @@
{ stdenv, lib, fetchFromGitHub, nix, makeWrapper }: { stdenv, lib, fetchFromGitHub, nix, makeWrapper, coreutils, gnutar, gzip, bzip2 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "nix-bundle"; pname = "nix-bundle";
name = "${pname}-${version}"; name = "${pname}-${version}";
version = "0.1.1"; version = "0.1.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "matthewbauer"; owner = "matthewbauer";
repo = pname; repo = pname;
rev = "v${version}"; 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)" ]; makeFlags = [ "PREFIX=$(out)" ];

View File

@ -18090,7 +18090,7 @@ with pkgs;
nixui = callPackage ../tools/package-management/nixui { node_webkit = nwjs_0_12; }; 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 { }) inherit (callPackages ../tools/package-management/nix-prefetch-scripts { })
nix-prefetch-bzr nix-prefetch-bzr