diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-11-18 09:38:27 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-11-18 09:38:27 +0000 |
commit | 536c3711867ec947c1738f2c4b96f22e4863322d (patch) | |
tree | 697733f5cb713908dcf378e13fd15a798a906a91 /sys-apps/nix | |
parent | f65628136faa35d0c4d3b5e7332275c7b35fcd96 (diff) |
gentoo resync : 18.11.2018
Diffstat (limited to 'sys-apps/nix')
-rw-r--r-- | sys-apps/nix/Manifest | 6 | ||||
-rw-r--r-- | sys-apps/nix/metadata.xml | 1 | ||||
-rw-r--r-- | sys-apps/nix/nix-2.0.4.ebuild | 15 | ||||
-rw-r--r-- | sys-apps/nix/nix-2.1.3.ebuild | 12 |
4 files changed, 26 insertions, 8 deletions
diff --git a/sys-apps/nix/Manifest b/sys-apps/nix/Manifest index 35231d975d8c..c9401e1b6bff 100644 --- a/sys-apps/nix/Manifest +++ b/sys-apps/nix/Manifest @@ -7,6 +7,6 @@ DIST nix-2.0.2.tar.xz 796404 BLAKE2B 0906488bf2c800544c0747a6860ef51f667467f5003 DIST nix-2.0.4.tar.xz 798352 BLAKE2B 0eaf7e507c87e5398ab5967e1f2064a5827038bb84208768aa1c1deadc95e44aab922846b728467e3355d1f25e740590c3d1748ec05dfeae6a171952fd941b77 SHA512 bce3b3a14269d42648a4935770260c36dab25fde3ebcfed730063d1d139603468e1c30acf15eb0cffff617fa36a6b39d4ae31ccfd9cba762f631ecac213fd09a DIST nix-2.1.3.tar.xz 816396 BLAKE2B 9627626075841e7f389f5010418fe17569ae69ea07de5ff9a0557df864052cc8b48f2a4dbfe16dffc5dca3fb180f527199f367810899ae9474d00e8fcc00b760 SHA512 d22718d23d8960dac7d07739835caa8183f573b303d77613e77314d873c1fe6da1cb0ed78337fe3219a94675307b23132a62ae7d9aa5354707e58400f403524b EBUILD nix-2.0.2.ebuild 3110 BLAKE2B d7930a0e21775cb2d531621f4ce6dbc52a2b7d4a437506bedd19bf34694bed08c99aec4e36b017af283bdf5c3069b757b68a9b45549d3fc42beec59c29aa79de SHA512 234a27599be84a79a035c1c9a7633ba85c36f44e4fd53f104d981bc4795f8ff59de68768e21b722735c760e2a8bbb9714d562a2d13c8be4a0014b4c819ef9d48 -EBUILD nix-2.0.4.ebuild 3110 BLAKE2B d7930a0e21775cb2d531621f4ce6dbc52a2b7d4a437506bedd19bf34694bed08c99aec4e36b017af283bdf5c3069b757b68a9b45549d3fc42beec59c29aa79de SHA512 234a27599be84a79a035c1c9a7633ba85c36f44e4fd53f104d981bc4795f8ff59de68768e21b722735c760e2a8bbb9714d562a2d13c8be4a0014b4c819ef9d48 -EBUILD nix-2.1.3.ebuild 3179 BLAKE2B 619405197f3593f020bfb08df60ba2834882eaf6458f9913724a80634ad1cb53ed7ff971eaf700f7721e67a7408a4ad5fe328153d11cdc71d22a45dca7ea0f88 SHA512 f976aa9d2f78f7be65355201b14588ae36be2e326f8f2b259230165cde378afe85facd32cbaef024fdbb522392d3b6349cd38e85bb80db72cf302cb396c0edf0 -MISC metadata.xml 566 BLAKE2B 3891567411993e2864f7e0d6fd158937c0c7075ca92aef2413d28e0aa18e6d51982383d3ee71ab6b926ba6a397c59c3ef84f4a4b7cdd4f103f4256f4693f0cf0 SHA512 93d33392316264e30403abbf79a0bf836ed35f2eaf802f930743cb9f31955f939ac263946b93ee32bba34d2534329d95476e96816d1893747b077b0d9690281c +EBUILD nix-2.0.4.ebuild 3288 BLAKE2B 7c2fc988eb075af7977e0a2252357779382856c288e6e9aedfe00a414726c7fc933dd4393fa9851b6b2c1fc1d5f57b20f4fdeec99debc50401f6651ae6b9dfd1 SHA512 729b481d24a1af5d9465820d4531ee807a37a9a7cfef8551de5e4f1464a2f50d803915c2eae332e2be8a05954b48838c72216631747ca2f5385df2c18aef1a48 +EBUILD nix-2.1.3.ebuild 3359 BLAKE2B f91cae5d9562ea976222b7f893d4beba3f2f99967dac16381270afe69ecda3df6ffbf1896fe487999c80648477ac22431dc3af9cd3b7fcf09778bc92f9f1c0fa SHA512 f6c9c8a0b1fd25e5484f6c13e9c564868b432c84961e600ae9b3cdb5646c2e4286b8cd6b5dff43f63c58646583d70c6445ce61530f143f4654903bb8e1380971 +MISC metadata.xml 681 BLAKE2B 53ec9e4c35af4d73756dabebcc9d0423c3708c24e085d35ec589334971d2b76b40408793b5202d625043fe3bd23399a457b7cae4eea665156e2ba3c0d60fc292 SHA512 b473a72e96cc53eeca793b60acd627ebafb918a05fc328126d3a3f32fe8f09d95ebd4643c17f27a69ac64c0b3bee87f6c0818b0316ab2e5e7158999adc8e8a94 diff --git a/sys-apps/nix/metadata.xml b/sys-apps/nix/metadata.xml index ad64c7e5102b..c7035d7472ff 100644 --- a/sys-apps/nix/metadata.xml +++ b/sys-apps/nix/metadata.xml @@ -8,6 +8,7 @@ <use> <flag name="etc_profile">Install /etc/profile.d/ entry to inject nix support for all users.</flag> <flag name="gc">Enable garbage collection in the Nix expression evaluator (use <pkg>dev-libs/boehm-gc</pkg>).</flag> + <flag name="s3">Enable Amazon S3 bucket to load and store packages (use <pkg>dev-libs/aws-sdk-cpp</pkg>).</flag> <flag name="sodium">Use <pkg>dev-libs/libsodium</pkg> for cryptography</flag> </use> </pkgmetadata> diff --git a/sys-apps/nix/nix-2.0.4.ebuild b/sys-apps/nix/nix-2.0.4.ebuild index bea6bd1a4240..965584cf6f01 100644 --- a/sys-apps/nix/nix-2.0.4.ebuild +++ b/sys-apps/nix/nix-2.0.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -12,7 +12,7 @@ SRC_URI="http://nixos.org/releases/${PN}/${P}/${P}.tar.xz" LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="+etc_profile +gc doc sodium" +IUSE="+etc_profile +gc doc s3 sodium" RDEPEND=" app-arch/brotli @@ -28,6 +28,7 @@ RDEPEND=" dev-libs/libxslt app-text/docbook-xsl-stylesheets ) + s3? ( dev-libs/aws-sdk-cpp ) sodium? ( dev-libs/libsodium:0= ) " DEPEND="${RDEPEND} @@ -79,9 +80,17 @@ src_prepare() { } src_configure() { + local econf_args=() + + if ! use s3; then + # Disable automagic depend: bug #670256 + export ac_cv_header_aws_s3_S3Client_h=no + fi + econf \ --localstatedir="${EPREFIX}"/nix/var \ - $(use_enable gc) + $(use_enable gc) \ + "${args[@]}" } src_compile() { diff --git a/sys-apps/nix/nix-2.1.3.ebuild b/sys-apps/nix/nix-2.1.3.ebuild index a104f3b883a0..4eb0d459fc84 100644 --- a/sys-apps/nix/nix-2.1.3.ebuild +++ b/sys-apps/nix/nix-2.1.3.ebuild @@ -13,7 +13,7 @@ LICENSE="LGPL-2.1" SLOT="0" #keywords are blocked by boost-1.66 #KEYWORDS="~amd64 ~x86" -IUSE="+etc_profile +gc doc sodium" +IUSE="+etc_profile +gc doc s3 sodium" RDEPEND=" app-arch/brotli @@ -30,6 +30,7 @@ RDEPEND=" dev-libs/libxslt app-text/docbook-xsl-stylesheets ) + s3? ( dev-libs/aws-sdk-cpp ) sodium? ( dev-libs/libsodium:0= ) " DEPEND="${RDEPEND} @@ -81,9 +82,16 @@ src_prepare() { } src_configure() { + local econf_args=() + + if ! use s3; then + # Disable automagic depend: bug #670256 + export ac_cv_header_aws_s3_S3Client_h=no + fi econf \ --localstatedir="${EPREFIX}"/nix/var \ - $(use_enable gc) + $(use_enable gc) \ + "${args[@]}" } src_compile() { |