Merge branch 'staging' into fix-ncurses-darwin-extensions
This commit is contained in:
@@ -59,6 +59,8 @@ stdenv.mkDerivation rec {
|
||||
configureFlags =
|
||||
stdenv.lib.optional (stdenv.system == "x86_64-linux" || stdenv.system == "x86_64-darwin") "--enable-only64bit";
|
||||
|
||||
doCheck = false; # fails
|
||||
|
||||
postInstall = ''
|
||||
for i in $out/lib/valgrind/*.supp; do
|
||||
substituteInPlace $i \
|
||||
|
||||
@@ -101,6 +101,7 @@ stdenv.mkDerivation rec {
|
||||
# CMAKE_SYSTEM_NAME, etc.
|
||||
configurePlatforms = [ ];
|
||||
|
||||
doCheck = false; # fails
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = http://www.cmake.org/;
|
||||
|
||||
@@ -20,12 +20,12 @@ let newPython = python.override {
|
||||
};
|
||||
|
||||
in newPython.pkgs.buildPythonApplication rec {
|
||||
version = "1.1.1"; # remove patch below when updating
|
||||
version = "1.2.3";
|
||||
pname = "conan";
|
||||
|
||||
src = newPython.pkgs.fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1k1r401bc9fgmhd5n5f29mjcn346r3zdrm7p28nwpr2r2p3fslrl";
|
||||
sha256 = "623e92d99cd0f4ec92552b23af66a6bb066071e213659f502480bb9a96d7be23";
|
||||
};
|
||||
|
||||
checkInputs = with newPython.pkgs; [
|
||||
@@ -39,15 +39,7 @@ in newPython.pkgs.buildPythonApplication rec {
|
||||
propagatedBuildInputs = with newPython.pkgs; [
|
||||
requests fasteners pyyaml pyjwt colorama patch
|
||||
bottle pluginbase six distro pylint node-semver
|
||||
future pygments mccabe
|
||||
];
|
||||
|
||||
patches = [
|
||||
# already merged, remove with the next package update
|
||||
(fetchpatch {
|
||||
url = "https://github.com/conan-io/conan/commit/51cc4cbd51ac8f9b9efa2bf678a2d7810e273ff3.patch";
|
||||
sha256 = "0d93g4hjpfk8z870imwdswkw5qba2h5zhfgwwijiqhr2pv7fl1y7";
|
||||
})
|
||||
future pygments mccabe deprecation
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
|
||||
@@ -14,6 +14,8 @@ stdenv.mkDerivation rec {
|
||||
|
||||
installPhase = "make PREFIX=/ DESTDIR=$out install";
|
||||
|
||||
doCheck = false; # fails with "ERROR: Run 'git submodule update --init test/samples' first."
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "DTS Coherent Acoustics decoder with support for HD extensions";
|
||||
maintainers = with maintainers; [ edwtjo ];
|
||||
@@ -21,4 +23,4 @@ stdenv.mkDerivation rec {
|
||||
license = licenses.lgpl21;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
@@ -25,6 +25,7 @@ stdenv.mkDerivation rec {
|
||||
stdenv.lib.optional stdenv.isDarwin "-mmacosx-version-min=10.9";
|
||||
|
||||
enableParallelBuilding = true;
|
||||
doCheck = false; # fails
|
||||
|
||||
meta = {
|
||||
license = stdenv.lib.licenses.gpl2Plus;
|
||||
|
||||
@@ -28,6 +28,9 @@ stdenv.mkDerivation rec {
|
||||
|
||||
configureFlags = "--disable-scrollkeeper";
|
||||
|
||||
doCheck = false; # requires a lot of stuff
|
||||
doInstallCheck = false; # fails
|
||||
|
||||
passthru = {
|
||||
# Consumers are expected to copy the m4 files to their source tree, let them reuse the patch
|
||||
respect_xml_catalog_files_var_patch = ./respect-xml-catalog-files-var.patch;
|
||||
|
||||
@@ -33,6 +33,8 @@ buildGoPackage rec {
|
||||
|
||||
allowGoReference = true;
|
||||
|
||||
doCheck = false; # tries to access the net
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Go apps packaging for Nix";
|
||||
homepage = https://github.com/kamilchm/go2nix;
|
||||
|
||||
@@ -4,7 +4,7 @@ buildGoPackage rec {
|
||||
name = "govers-${version}";
|
||||
version = "20150109-${stdenv.lib.strings.substring 0 7 rev}";
|
||||
rev = "3b5f175f65d601d06f48d78fcbdb0add633565b9";
|
||||
|
||||
|
||||
goPackagePath = "github.com/rogpeppe/govers";
|
||||
|
||||
src = fetchgit {
|
||||
@@ -14,4 +14,7 @@ buildGoPackage rec {
|
||||
};
|
||||
|
||||
dontRenameImports = true;
|
||||
|
||||
doCheck = false; # fails, silently
|
||||
|
||||
}
|
||||
|
||||
@@ -23,10 +23,12 @@ stdenv.mkDerivation rec {
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
preCheck =
|
||||
# Make the Autotest test suite run in parallel.
|
||||
'' export TESTSUITEFLAGS="-j$NIX_BUILD_CORES"
|
||||
'';
|
||||
# Make the Autotest test suite run in parallel.
|
||||
preCheck =''
|
||||
export TESTSUITEFLAGS="-j$NIX_BUILD_CORES"
|
||||
'';
|
||||
|
||||
doInstallCheck = false; # fails
|
||||
|
||||
meta = {
|
||||
homepage = http://www.gnu.org/software/autoconf/;
|
||||
|
||||
@@ -24,10 +24,12 @@ stdenv.mkDerivation rec {
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
preCheck =
|
||||
# Make the Autotest test suite run in parallel.
|
||||
'' export TESTSUITEFLAGS="-j$NIX_BUILD_CORES"
|
||||
'';
|
||||
# Make the Autotest test suite run in parallel.
|
||||
preCheck =''
|
||||
export TESTSUITEFLAGS="-j$NIX_BUILD_CORES"
|
||||
'';
|
||||
|
||||
doInstallCheck = false; # fails
|
||||
|
||||
meta = {
|
||||
homepage = http://www.gnu.org/software/autoconf/;
|
||||
|
||||
@@ -70,7 +70,7 @@ stdenv.mkDerivation rec {
|
||||
# be satisfied on aarch64 platform. Add backported fix from bugzilla.
|
||||
# https://sourceware.org/bugzilla/show_bug.cgi?id=22764
|
||||
./relax-R_AARCH64_ABS32-R_AARCH64_ABS16-absolute.patch
|
||||
];
|
||||
] ++ stdenv.lib.optional targetPlatform.isiOS ./support-ios.patch;
|
||||
|
||||
outputs = [ "out" "info" "man" ];
|
||||
|
||||
@@ -121,6 +121,8 @@ stdenv.mkDerivation rec {
|
||||
"--enable-fix-loongson2f-nop"
|
||||
] ++ optionals gold [ "--enable-gold" "--enable-plugins" ];
|
||||
|
||||
doCheck = false; # fails
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
passthru = {
|
||||
|
||||
@@ -2,11 +2,11 @@
|
||||
# We need the same Python as is used to build libxml2Python
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "itstool-2.0.2";
|
||||
name = "itstool-2.0.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://files.itstool.org/itstool/${name}.tar.bz2";
|
||||
sha256 = "bf909fb59b11a646681a8534d5700fec99be83bb2c57badf8c1844512227033a";
|
||||
sha256 = "0q7b4qrc758zfx3adsgvz0r93swdbxjr42w37rahngm33nshihlp";
|
||||
};
|
||||
|
||||
buildInputs = [ python2 libxml2Python ];
|
||||
|
||||
@@ -22,6 +22,7 @@ stdenv.mkDerivation rec {
|
||||
# XXX: The GNU ld wrapper does all sorts of nasty things wrt. RPATH, which
|
||||
# leads to the failure of a number of tests.
|
||||
doCheck = false;
|
||||
doInstallCheck = false;
|
||||
|
||||
# Don't run the native `strip' when cross-compiling. This breaks at least
|
||||
# with `.a' files for MinGW.
|
||||
|
||||
@@ -32,6 +32,7 @@ stdenv.mkDerivation rec {
|
||||
"ac_cv_func_posix_getgrgid_r=yes"
|
||||
];
|
||||
|
||||
doCheck = false; # fails
|
||||
|
||||
postInstall = ''rm -f "$out"/bin/*-pkg-config''; # clean the duplicate file
|
||||
|
||||
@@ -42,4 +43,3 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -1,10 +1,11 @@
|
||||
{ stdenv, fetchurl, ncurses, lzma }:
|
||||
{ stdenv, fetchurl, texinfo, ncurses, lzma }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "texinfo-4.13a";
|
||||
name = "texinfo-${version}";
|
||||
version = "4.13a";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/texinfo/texinfo-4.13a.tar.lzma";
|
||||
url = "mirror://gnu/texinfo/${name}.tar.lzma";
|
||||
sha256 = "1rf9ckpqwixj65bw469i634897xwlgkm5i9g2hv3avl6mv7b0a3d";
|
||||
};
|
||||
|
||||
@@ -14,29 +15,5 @@ stdenv.mkDerivation rec {
|
||||
# Disabled because we don't have zdiff in the stdenv bootstrap.
|
||||
#doCheck = true;
|
||||
|
||||
meta = {
|
||||
description = "The GNU documentation system";
|
||||
|
||||
longDescription = ''
|
||||
Texinfo is the official documentation format of the GNU project.
|
||||
It was invented by Richard Stallman and Bob Chassell many years
|
||||
ago, loosely based on Brian Reid's Scribe and other formatting
|
||||
languages of the time. It is used by many non-GNU projects as
|
||||
well.
|
||||
|
||||
Texinfo uses a single source file to produce output in a number
|
||||
of formats, both online and printed (dvi, html, info, pdf, xml,
|
||||
etc.). This means that instead of writing different documents
|
||||
for online information and another for a printed manual, you
|
||||
need write only one document. And when the work is revised, you
|
||||
need revise only that one document. The Texinfo system is
|
||||
well-integrated with GNU Emacs.
|
||||
'';
|
||||
|
||||
license = stdenv.lib.licenses.gpl3Plus;
|
||||
|
||||
homepage = http://www.gnu.org/software/texinfo/;
|
||||
branch = "4.13";
|
||||
platforms = stdenv.lib.platforms.unix;
|
||||
};
|
||||
meta = texinfo.meta // { branch = version; };
|
||||
}
|
||||
|
||||
@@ -1,54 +1,4 @@
|
||||
{ stdenv, buildPackages, fetchurl, ncurses, perl, xz, procps, interactive ? false }:
|
||||
|
||||
with stdenv.lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "texinfo-5.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/texinfo/${name}.tar.xz";
|
||||
sha256 = "1njfwh2z34r2c4r0iqa7v24wmjzvsfyz4vplzry8ln3479lfywal";
|
||||
};
|
||||
|
||||
# We need a native compiler to build perl XS extensions
|
||||
# when cross-compiling.
|
||||
depsBuildBuild = [ buildPackages.stdenv.cc perl ];
|
||||
|
||||
buildInputs = [ perl xz.bin ]
|
||||
++ optional interactive ncurses
|
||||
++ optional doCheck procps; # for tests
|
||||
|
||||
configureFlags = [ "PERL=${buildPackages.perl}/bin/perl" ]
|
||||
++ stdenv.lib.optional stdenv.isSunOS "AWK=${gawk}/bin/awk";
|
||||
|
||||
preInstall = ''
|
||||
installFlags="TEXMF=$out/texmf-dist";
|
||||
installTargets="install install-tex";
|
||||
'';
|
||||
|
||||
doCheck = !stdenv.isDarwin;
|
||||
|
||||
meta = {
|
||||
homepage = http://www.gnu.org/software/texinfo/;
|
||||
description = "The GNU documentation system";
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.all;
|
||||
|
||||
longDescription = ''
|
||||
Texinfo is the official documentation format of the GNU project.
|
||||
It was invented by Richard Stallman and Bob Chassell many years
|
||||
ago, loosely based on Brian Reid's Scribe and other formatting
|
||||
languages of the time. It is used by many non-GNU projects as
|
||||
well.
|
||||
|
||||
Texinfo uses a single source file to produce output in a number
|
||||
of formats, both online and printed (dvi, html, info, pdf, xml,
|
||||
etc.). This means that instead of writing different documents
|
||||
for online information and another for a printed manual, you
|
||||
need write only one document. And when the work is revised, you
|
||||
need revise only that one document. The Texinfo system is
|
||||
well-integrated with GNU Emacs.
|
||||
'';
|
||||
branch = "5.2";
|
||||
};
|
||||
import ./common.nix {
|
||||
version = "5.2";
|
||||
sha256 = "1njfwh2z34r2c4r0iqa7v24wmjzvsfyz4vplzry8ln3479lfywal";
|
||||
}
|
||||
|
||||
@@ -1,56 +1,4 @@
|
||||
{ stdenv, buildPackages, fetchurl, ncurses, perl, xz, libiconv, gawk, procps, interactive ? false }:
|
||||
|
||||
with stdenv.lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "texinfo-6.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/texinfo/${name}.tar.xz";
|
||||
sha256 = "0qjzvbvnv9003xdrcpi3jp7y68j4hq2ciw9frh2hghh698zlnxvp";
|
||||
};
|
||||
|
||||
# We need a native compiler to build perl XS extensions
|
||||
# when cross-compiling.
|
||||
depsBuildBuild = [ buildPackages.stdenv.cc perl ];
|
||||
|
||||
buildInputs = [ xz ]
|
||||
++ optionals stdenv.isSunOS [ libiconv gawk ]
|
||||
++ optional interactive ncurses
|
||||
++ optional doCheck procps; # for tests
|
||||
|
||||
configureFlags = [ "PERL=${buildPackages.perl}/bin/perl" ]
|
||||
++ stdenv.lib.optional stdenv.isSunOS "AWK=${gawk}/bin/awk";
|
||||
|
||||
preInstall = ''
|
||||
installFlags="TEXMF=$out/texmf-dist";
|
||||
installTargets="install install-tex";
|
||||
'';
|
||||
|
||||
doCheck = interactive # simplify bootstrapping
|
||||
&& !stdenv.isDarwin && !stdenv.isSunOS/*flaky*/;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = http://www.gnu.org/software/texinfo/;
|
||||
description = "The GNU documentation system";
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.all;
|
||||
maintainers = [ maintainers.vrthra ];
|
||||
|
||||
longDescription = ''
|
||||
Texinfo is the official documentation format of the GNU project.
|
||||
It was invented by Richard Stallman and Bob Chassell many years
|
||||
ago, loosely based on Brian Reid's Scribe and other formatting
|
||||
languages of the time. It is used by many non-GNU projects as
|
||||
well.
|
||||
|
||||
Texinfo uses a single source file to produce output in a number
|
||||
of formats, both online and printed (dvi, html, info, pdf, xml,
|
||||
etc.). This means that instead of writing different documents
|
||||
for online information and another for a printed manual, you
|
||||
need write only one document. And when the work is revised, you
|
||||
need revise only that one document. The Texinfo system is
|
||||
well-integrated with GNU Emacs.
|
||||
'';
|
||||
};
|
||||
import ./common.nix {
|
||||
version = "6.5";
|
||||
sha256 = "0qjzvbvnv9003xdrcpi3jp7y68j4hq2ciw9frh2hghh698zlnxvp";
|
||||
}
|
||||
|
||||
64
pkgs/development/tools/misc/texinfo/common.nix
Normal file
64
pkgs/development/tools/misc/texinfo/common.nix
Normal file
@@ -0,0 +1,64 @@
|
||||
{ version, sha256 }:
|
||||
|
||||
{ stdenv, buildPackages, fetchurl, perl, xz
|
||||
|
||||
# we are a dependency of gcc, this simplifies bootstraping
|
||||
, interactive ? false, ncurses, procps
|
||||
}:
|
||||
|
||||
with stdenv.lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "texinfo-${optionalString interactive "interactive-"}${version}";
|
||||
inherit version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/texinfo/texinfo-${version}.tar.xz";
|
||||
inherit sha256;
|
||||
};
|
||||
|
||||
# We need a native compiler to build perl XS extensions
|
||||
# when cross-compiling.
|
||||
depsBuildBuild = [ buildPackages.stdenv.cc perl ];
|
||||
|
||||
buildInputs = [ xz.bin ]
|
||||
++ optionals stdenv.isSunOS [ libiconv gawk ]
|
||||
++ optionals interactive [ ncurses procps ];
|
||||
|
||||
configureFlags = [ "PERL=${buildPackages.perl}/bin/perl" ]
|
||||
++ stdenv.lib.optional stdenv.isSunOS "AWK=${gawk}/bin/awk";
|
||||
|
||||
preInstall = ''
|
||||
installFlags="TEXMF=$out/texmf-dist";
|
||||
installTargets="install install-tex";
|
||||
'';
|
||||
|
||||
doCheck = interactive
|
||||
&& !stdenv.isDarwin
|
||||
&& !stdenv.isSunOS; # flaky
|
||||
|
||||
meta = {
|
||||
homepage = http://www.gnu.org/software/texinfo/;
|
||||
description = "The GNU documentation system";
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ vrthra oxij ];
|
||||
|
||||
longDescription = ''
|
||||
Texinfo is the official documentation format of the GNU project.
|
||||
It was invented by Richard Stallman and Bob Chassell many years
|
||||
ago, loosely based on Brian Reid's Scribe and other formatting
|
||||
languages of the time. It is used by many non-GNU projects as
|
||||
well.
|
||||
|
||||
Texinfo uses a single source file to produce output in a number
|
||||
of formats, both online and printed (dvi, html, info, pdf, xml,
|
||||
etc.). This means that instead of writing different documents
|
||||
for online information and another for a printed manual, you
|
||||
need write only one document. And when the work is revised, you
|
||||
need revise only that one document. The Texinfo system is
|
||||
well-integrated with GNU Emacs.
|
||||
'';
|
||||
branch = version;
|
||||
};
|
||||
}
|
||||
@@ -13,6 +13,9 @@ stdenv.mkDerivation rec {
|
||||
nativeBuildInputs = [ m4 perl ] ++ stdenv.lib.optional stdenv.isSunOS help2man;
|
||||
propagatedBuildInputs = [ m4 ];
|
||||
|
||||
doCheck = false; # fails
|
||||
doInstallCheck = false; # fails
|
||||
|
||||
meta = {
|
||||
homepage = http://www.gnu.org/software/bison/;
|
||||
description = "Yacc-compatible parser generator";
|
||||
|
||||
@@ -1,2 +1,2 @@
|
||||
source "https://rubygems.org"
|
||||
gem 'vagrant'
|
||||
gem 'vagrant', git: "https://github.com/hashicorp/vagrant.git", tag: "v2.0.4"
|
||||
|
||||
@@ -1,17 +1,9 @@
|
||||
GIT
|
||||
remote: https://github.com/mitchellh/vagrant-spec.git
|
||||
revision: 7ac8b4191de578e345b29acaf62ecc72c8e73be1
|
||||
remote: https://github.com/hashicorp/vagrant.git
|
||||
revision: 6a6805f284dff05207e359acdfb1ca8443b78751
|
||||
tag: v2.0.4
|
||||
specs:
|
||||
vagrant-spec (0.0.1)
|
||||
childprocess (~> 0.6.0)
|
||||
log4r (~> 1.1.9)
|
||||
rspec (~> 3.5.0)
|
||||
thor (~> 0.18.1)
|
||||
|
||||
PATH
|
||||
remote: .
|
||||
specs:
|
||||
vagrant (2.0.2)
|
||||
vagrant (2.0.4)
|
||||
childprocess (~> 0.6.0)
|
||||
erubis (~> 2.7.0)
|
||||
hashicorp-checkpoint (~> 0.1.5)
|
||||
@@ -25,6 +17,8 @@ PATH
|
||||
rest-client (>= 1.6.0, < 3.0)
|
||||
ruby_dep (<= 1.3.1)
|
||||
wdm (~> 0.1.0)
|
||||
win32-file (~> 0.8.1)
|
||||
win32-file-security (~> 1.0.10)
|
||||
winrm (~> 2.1)
|
||||
winrm-elevated (~> 1.1)
|
||||
winrm-fs (~> 1.0)
|
||||
@@ -32,24 +26,19 @@ PATH
|
||||
GEM
|
||||
remote: https://rubygems.org/
|
||||
specs:
|
||||
addressable (2.5.2)
|
||||
public_suffix (>= 2.0.2, < 4.0)
|
||||
builder (3.2.3)
|
||||
childprocess (0.6.3)
|
||||
ffi (~> 1.0, >= 1.0.11)
|
||||
crack (0.4.3)
|
||||
safe_yaml (~> 1.0.0)
|
||||
diff-lcs (1.3)
|
||||
domain_name (0.5.20170404)
|
||||
domain_name (0.5.20180417)
|
||||
unf (>= 0.0.5, < 1.0.0)
|
||||
erubis (2.7.0)
|
||||
fake_ftp (0.1.1)
|
||||
ffi (1.9.18)
|
||||
ffi (1.9.23)
|
||||
ffi-win32-extensions (1.0.3)
|
||||
ffi
|
||||
gssapi (1.2.0)
|
||||
ffi (>= 1.0.1)
|
||||
gyoku (1.3.1)
|
||||
builder (>= 2.1.2)
|
||||
hashdiff (0.3.7)
|
||||
hashicorp-checkpoint (0.1.5)
|
||||
http-cookie (1.0.3)
|
||||
domain_name (~> 0.5)
|
||||
@@ -75,8 +64,6 @@ GEM
|
||||
net-ssh (4.2.0)
|
||||
netrc (0.11.0)
|
||||
nori (2.6.0)
|
||||
public_suffix (3.0.1)
|
||||
rake (12.0.0)
|
||||
rb-fsevent (0.10.3)
|
||||
rb-inotify (0.9.10)
|
||||
ffi (>= 0.5.0, < 2)
|
||||
@@ -86,35 +73,23 @@ GEM
|
||||
http-cookie (>= 1.0.2, < 2.0)
|
||||
mime-types (>= 1.16, < 4.0)
|
||||
netrc (~> 0.8)
|
||||
rspec (3.5.0)
|
||||
rspec-core (~> 3.5.0)
|
||||
rspec-expectations (~> 3.5.0)
|
||||
rspec-mocks (~> 3.5.0)
|
||||
rspec-core (3.5.4)
|
||||
rspec-support (~> 3.5.0)
|
||||
rspec-expectations (3.5.0)
|
||||
diff-lcs (>= 1.2.0, < 2.0)
|
||||
rspec-support (~> 3.5.0)
|
||||
rspec-its (1.2.0)
|
||||
rspec-core (>= 3.0.0)
|
||||
rspec-expectations (>= 3.0.0)
|
||||
rspec-mocks (3.5.0)
|
||||
diff-lcs (>= 1.2.0, < 2.0)
|
||||
rspec-support (~> 3.5.0)
|
||||
rspec-support (3.5.0)
|
||||
ruby_dep (1.3.1)
|
||||
rubyntlm (0.6.2)
|
||||
rubyzip (1.2.1)
|
||||
safe_yaml (1.0.4)
|
||||
thor (0.18.1)
|
||||
unf (0.1.4)
|
||||
unf_ext
|
||||
unf_ext (0.0.7.5)
|
||||
wdm (0.1.1)
|
||||
webmock (2.3.2)
|
||||
addressable (>= 2.3.6)
|
||||
crack (>= 0.3.2)
|
||||
hashdiff
|
||||
win32-file (0.8.1)
|
||||
ffi
|
||||
ffi-win32-extensions
|
||||
win32-file-stat (>= 1.4.0)
|
||||
win32-file-security (1.0.10)
|
||||
ffi
|
||||
ffi-win32-extensions
|
||||
win32-file-stat (1.5.5)
|
||||
ffi
|
||||
ffi-win32-extensions
|
||||
winrm (2.2.3)
|
||||
builder (>= 2.1.2)
|
||||
erubis (~> 2.7)
|
||||
@@ -137,13 +112,7 @@ PLATFORMS
|
||||
ruby
|
||||
|
||||
DEPENDENCIES
|
||||
fake_ftp (~> 0.1.1)
|
||||
rake (~> 12.0.0)
|
||||
rspec (~> 3.5.0)
|
||||
rspec-its (~> 1.2.0)
|
||||
vagrant!
|
||||
vagrant-spec!
|
||||
webmock (~> 2.3.1)
|
||||
|
||||
BUNDLED WITH
|
||||
1.14.6
|
||||
1.16.1
|
||||
|
||||
@@ -1,36 +1,29 @@
|
||||
{ lib, fetchurl, buildRubyGem, bundlerEnv, ruby, libarchive }:
|
||||
{ lib, buildRubyGem, bundlerEnv, ruby, libarchive }:
|
||||
|
||||
|
||||
# To update vagrant, visit the Gemfile and re-run bundix.
|
||||
|
||||
let
|
||||
version = "2.0.2";
|
||||
url = "https://github.com/hashicorp/vagrant/archive/v${version}.tar.gz";
|
||||
sha256 = "1sjfwgy2y6q5s1drd8h8xgz2a0sv1l3kx9jilgc02hlcdz070iir";
|
||||
gemset = import ./gemset.nix;
|
||||
inherit (gemset.vagrant) version;
|
||||
|
||||
deps = bundlerEnv rec {
|
||||
name = "${pname}-${version}";
|
||||
name = "vagrant-${version}";
|
||||
pname = "vagrant";
|
||||
inherit version;
|
||||
|
||||
inherit ruby;
|
||||
gemdir = ./.;
|
||||
gemset = lib.recursiveUpdate (import ./gemset.nix) {
|
||||
vagrant = {
|
||||
source = {
|
||||
type = "url";
|
||||
inherit url sha256;
|
||||
};
|
||||
inherit version;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
in buildRubyGem rec {
|
||||
name = "${gemName}-${version}";
|
||||
gemName = "vagrant";
|
||||
inherit version;
|
||||
|
||||
doInstallCheck = true;
|
||||
dontBuild = false;
|
||||
src = fetchurl { inherit url sha256; };
|
||||
|
||||
inherit (deps.gems.vagrant) src;
|
||||
|
||||
patches = [
|
||||
./unofficial-installation-nowarn.patch
|
||||
|
||||
@@ -1,13 +1,4 @@
|
||||
{
|
||||
addressable = {
|
||||
dependencies = ["public_suffix"];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0viqszpkggqi8hq87pqp0xykhvz60g99nwmkwsb0v45kc2liwxvk";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.5.2";
|
||||
};
|
||||
builder = {
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
@@ -25,31 +16,14 @@
|
||||
};
|
||||
version = "0.6.3";
|
||||
};
|
||||
crack = {
|
||||
dependencies = ["safe_yaml"];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0abb0fvgw00akyik1zxnq7yv391va148151qxdghnzngv66bl62k";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.4.3";
|
||||
};
|
||||
diff-lcs = {
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "18w22bjz424gzafv6nzv98h0aqkwz3d9xhm7cbr1wfbyas8zayza";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.3";
|
||||
};
|
||||
domain_name = {
|
||||
dependencies = ["unf"];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "12hs8yijhak7p2hf1xkh98g0mnp5phq3mrrhywzaxpwz1gw5r3kf";
|
||||
sha256 = "0abdlwb64ns7ssmiqhdwgl27ly40x2l27l8hs8hn0z4kb3zd2x3v";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.5.20170404";
|
||||
version = "0.5.20180417";
|
||||
};
|
||||
erubis = {
|
||||
source = {
|
||||
@@ -59,21 +33,22 @@
|
||||
};
|
||||
version = "2.7.0";
|
||||
};
|
||||
fake_ftp = {
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0rn7lxdk3sqc2i4v2c5k25b9ca1qnkdf32nv04y760aml9mszwf7";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.1.1";
|
||||
};
|
||||
ffi = {
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "034f52xf7zcqgbvwbl20jwdyjwznvqnwpbaps9nk18v9lgb1dpx0";
|
||||
sha256 = "0zw6pbyvmj8wafdc7l5h7w20zkp1vbr2805ql5d941g2b20pk4zr";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.9.18";
|
||||
version = "1.9.23";
|
||||
};
|
||||
ffi-win32-extensions = {
|
||||
dependencies = ["ffi"];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1ywkkbr3bpi2ais2jr8yrsqwwrm48jg262anmdkcb9if95vajx7l";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.0.3";
|
||||
};
|
||||
gssapi = {
|
||||
dependencies = ["ffi"];
|
||||
@@ -93,14 +68,6 @@
|
||||
};
|
||||
version = "1.3.1";
|
||||
};
|
||||
hashdiff = {
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0yj5l2rw8i8jc725hbcpc4wks0qlaaimr3dpaqamfjkjkxl0hjp9";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.3.7";
|
||||
};
|
||||
hashicorp-checkpoint = {
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
@@ -235,22 +202,6 @@
|
||||
};
|
||||
version = "2.6.0";
|
||||
};
|
||||
public_suffix = {
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0mvzd9ycjw8ydb9qy3daq3kdzqs2vpqvac4dqss6ckk4rfcjc637";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.0.1";
|
||||
};
|
||||
rake = {
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "01j8fc9bqjnrsxbppncai05h43315vmz9fwg28qdsgcjw9ck1d7n";
|
||||
type = "gem";
|
||||
};
|
||||
version = "12.0.0";
|
||||
};
|
||||
rb-fsevent = {
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
@@ -286,59 +237,6 @@
|
||||
};
|
||||
version = "2.0.2";
|
||||
};
|
||||
rspec = {
|
||||
dependencies = ["rspec-core" "rspec-expectations" "rspec-mocks"];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "16g3mmih999f0b6vcz2c3qsc7ks5zy4lj1rzjh8hf6wk531nvc6s";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.5.0";
|
||||
};
|
||||
rspec-core = {
|
||||
dependencies = ["rspec-support"];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1nacs062qbr98fx6czf1vwppn1js956nv2c8vfwj6i65axdfs46i";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.5.4";
|
||||
};
|
||||
rspec-expectations = {
|
||||
dependencies = ["diff-lcs" "rspec-support"];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0bbqfrb1x8gmwf8x2xhhwvvlhwbbafq4isbvlibxi6jk602f09gs";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.5.0";
|
||||
};
|
||||
rspec-its = {
|
||||
dependencies = ["rspec-core" "rspec-expectations"];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1pwphny5jawcm1hda3vs9pjv1cybaxy17dc1s75qd7drrvx697p3";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.2.0";
|
||||
};
|
||||
rspec-mocks = {
|
||||
dependencies = ["diff-lcs" "rspec-support"];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0nl3ksivh9wwrjjd47z5dggrwx40v6gpb3a0gzbp1gs06a5dmk24";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.5.0";
|
||||
};
|
||||
rspec-support = {
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "10vf3k3d472y573mag2kzfsfrf6rv355s13kadnpryk8d36yq5r0";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.5.0";
|
||||
};
|
||||
ruby_dep = {
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
@@ -363,22 +261,6 @@
|
||||
};
|
||||
version = "1.2.1";
|
||||
};
|
||||
safe_yaml = {
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1hly915584hyi9q9vgd968x2nsi5yag9jyf5kq60lwzi5scr7094";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.0.4";
|
||||
};
|
||||
thor = {
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0d1g37j6sc7fkidf8rqlm3wh9zgyg3g7y8h2x1y34hmil5ywa8c3";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.18.1";
|
||||
};
|
||||
unf = {
|
||||
dependencies = ["unf_ext"];
|
||||
source = {
|
||||
@@ -397,18 +279,15 @@
|
||||
version = "0.0.7.5";
|
||||
};
|
||||
vagrant = {
|
||||
dependencies = ["childprocess" "erubis" "hashicorp-checkpoint" "i18n" "listen" "log4r" "net-scp" "net-sftp" "net-ssh" "rb-kqueue" "rest-client" "ruby_dep" "wdm" "winrm" "winrm-elevated" "winrm-fs"];
|
||||
};
|
||||
vagrant-spec = {
|
||||
dependencies = ["childprocess" "log4r" "rspec" "thor"];
|
||||
dependencies = ["childprocess" "erubis" "hashicorp-checkpoint" "i18n" "listen" "log4r" "net-scp" "net-sftp" "net-ssh" "rb-kqueue" "rest-client" "ruby_dep" "wdm" "win32-file" "win32-file-security" "winrm" "winrm-elevated" "winrm-fs"];
|
||||
source = {
|
||||
fetchSubmodules = false;
|
||||
rev = "7ac8b4191de578e345b29acaf62ecc72c8e73be1";
|
||||
sha256 = "0qybgxdnndx7xfmhyjcj46b2mv78d98yk30d68ppmfnmm3jx590h";
|
||||
rev = "6a6805f284dff05207e359acdfb1ca8443b78751";
|
||||
sha256 = "07c7r4xk0md9hkbcnij0kp7acxz0li9ak1ah7lmh52j10gq4cjmw";
|
||||
type = "git";
|
||||
url = "https://github.com/mitchellh/vagrant-spec.git";
|
||||
url = "https://github.com/hashicorp/vagrant.git";
|
||||
};
|
||||
version = "0.0.1";
|
||||
version = "2.0.4";
|
||||
};
|
||||
wdm = {
|
||||
source = {
|
||||
@@ -418,14 +297,32 @@
|
||||
};
|
||||
version = "0.1.1";
|
||||
};
|
||||
webmock = {
|
||||
dependencies = ["addressable" "crack" "hashdiff"];
|
||||
win32-file = {
|
||||
dependencies = ["ffi" "ffi-win32-extensions" "win32-file-stat"];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "04hkcqsmbfnp8g237pisnc834vpgildklicbjbyikqg0bg1rwcy5";
|
||||
sha256 = "0mjylzv4bbnxyjqf7hnd9ghcs5xr2sv8chnmkqdi2cc6pya2xax0";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.3.2";
|
||||
version = "0.8.1";
|
||||
};
|
||||
win32-file-security = {
|
||||
dependencies = ["ffi" "ffi-win32-extensions"];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0lpq821a1hrxmm0ki5c34wijzhn77g4ny76v698ixwg853y2ir9r";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.0.10";
|
||||
};
|
||||
win32-file-stat = {
|
||||
dependencies = ["ffi" "ffi-win32-extensions"];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0lc3yajcb8xxabvj9qian938k60ixydvs3ixl5fldi0nlvnvk468";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.5.5";
|
||||
};
|
||||
winrm = {
|
||||
dependencies = ["builder" "erubis" "gssapi" "gyoku" "httpclient" "logging" "nori" "rubyntlm"];
|
||||
|
||||
Reference in New Issue
Block a user