public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into staging-next

Browse Source 
Conflicts:
  nixos/doc/manual/release-notes/rl-2105.xml
  pkgs/tools/security/sequoia/default.nix
This commit is contained in:
Jonathan Ringer
2021-05-19 10:39:54 -07:00
parent 7000ae2b9a b73f621c25
commit c1f8a15dac
126 changed files with 2445 additions and 1530 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/filesystems/blobfuse/default.nix
+21 -8
View File
@@ -1,19 +1,32 @@
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, curl, gnutls, libgcrypt, libuuid, fuse }:
stdenv.mkDerivation rec {
pname = "blobfuse";
version = "1.0.2";
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, curl, gnutls, libgcrypt, libuuid, fuse, boost }:
let
version = "1.3.7";
src = fetchFromGitHub {
owner = "Azure";
repo = "azure-storage-fuse";
rev = "v${version}";
sha256 = "1qh04z1fsj1l6l12sz9yl2sy9hwlrnzac54hwrr7wvsgv90n9gbp";
rev = "blobfuse-${version}-Linux";
sha256 = "sha256-yihIuS4AG489U7eBi/p7H6S7Cg54kkQeNVCexxQZ60A=";
};
cpplite = stdenv.mkDerivation rec {
pname = "cpplite";
inherit version src;
sourceRoot = "source/cpplite";
patches = [ ./install-adls.patch ];
cmakeFlags = [ "-DBUILD_ADLS=ON" "-DUSE_OPENSSL=OFF" ];
buildInputs = [ curl libuuid gnutls ];
nativeBuildInputs = [ cmake pkg-config ];
};
in stdenv.mkDerivation rec {
pname = "blobfuse";
inherit version src;
NIX_CFLAGS_COMPILE = "-Wno-error=catch-value";
buildInputs = [ curl gnutls libgcrypt libuuid fuse ];
buildInputs = [ curl gnutls libgcrypt libuuid fuse boost cpplite ];
nativeBuildInputs = [ cmake pkg-config ];
meta = with lib; {
pkgs/tools/filesystems/blobfuse/install-adls.patch
+14
View File
@@ -0,0 +1,14 @@
diff --git a/adls/CMakeLists.txt b/adls/CMakeLists.txt
index 1fb7146..22e663a 100644
--- a/adls/CMakeLists.txt
+++ b/adls/CMakeLists.txt
@@ -50,3 +50,9 @@ if(BUILD_TESTS)
string(REGEX REPLACE "([^;]+)" "${CMAKE_CURRENT_SOURCE_DIR}/\\1" AZURE_STORAGE_ADLS_TEST_SOURCES "${AZURE_STORAGE_ADLS_TEST_SOURCES}")
set(AZURE_STORAGE_ADLS_TEST_SOURCES ${AZURE_STORAGE_ADLS_TEST_SOURCES} PARENT_SCOPE)
endif()
+
+install(TARGETS azure-storage-adls
+ ARCHIVE DESTINATION lib
+ LIBRARY DESTINATION lib
+ RUNTIME DESTINATION bin)
+