summaryrefslogtreecommitdiff
path: root/metadata/md5-cache/sys-apps/nix-2.3
diff options
context:
space:
mode:
Diffstat (limited to 'metadata/md5-cache/sys-apps/nix-2.3')
-rw-r--r--metadata/md5-cache/sys-apps/nix-2.34
1 files changed, 4 insertions, 0 deletions
diff --git a/metadata/md5-cache/sys-apps/nix-2.3 b/metadata/md5-cache/sys-apps/nix-2.3
index bff382c10899..9d71ad9faeb8 100644
--- a/metadata/md5-cache/sys-apps/nix-2.3
+++ b/metadata/md5-cache/sys-apps/nix-2.3
@@ -10,5 +10,9 @@ LICENSE=LGPL-2.1
RDEPEND=app-arch/brotli app-arch/bzip2 app-arch/xz-utils sys-apps/busybox[static] dev-db/sqlite dev-libs/editline:0= dev-libs/openssl:0= >=dev-libs/boost-1.66:0=[context] net-misc/curl sys-libs/libseccomp sys-libs/zlib gc? ( dev-libs/boehm-gc[cxx] ) doc? ( dev-libs/libxml2 dev-libs/libxslt app-text/docbook-xsl-stylesheets ) s3? ( dev-libs/aws-sdk-cpp ) sodium? ( dev-libs/libsodium:0= )
SLOT=0
SRC_URI=http://nixos.org/releases/nix/nix-2.3/nix-2.3.tar.xz
+<<<<<<< HEAD
_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6
+=======
+_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6
+>>>>>>> next
_md5_=5fd1851e7f8bc0370d3143bbb5ffb0fb