dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #249217 from figsoda/dufs

Browse Source
This commit is contained in:
figsoda 2023-08-17 16:57:30 -04:00 committed by GitHub
commit 6a47a2a939
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pkgs/servers/http/dufs/default.nix
View File

@ -1,17 +1,24 @@
{ stdenv, lib, fetchFromGitHub, rustPlatform, Security, openssl, pkg-config }: { lib
, rustPlatform
, fetchFromGitHub
, stdenv
, pkg-config
, openssl
, darwin
}:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "dufs"; pname = "dufs";
version = "0.34.2"; version = "0.35.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "sigoden"; owner = "sigoden";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-NkH7w5HEQFhnovUmjN/qW5QZwO8mVQZMbhpNFkKtLTI="; sha256 = "sha256-FrLvwXEnNEKi8FvPIs6A52WpSUT+pUCc61JBi9M/PPw=";
}; };
cargoHash = "sha256-bUznaVyhZswLaXUgC+GUh5ZpJQW7Vkcoui6CO9ds22g="; cargoHash = "sha256-YHFEjs8a1QJHWYVjAQxmpMIQ2aDbu6mxeuNqcvReYR0=";
nativeBuildInputs = lib.optionals stdenv.isLinux [ nativeBuildInputs = lib.optionals stdenv.isLinux [
pkg-config pkg-config
@ -20,7 +27,7 @@ rustPlatform.buildRustPackage rec {
buildInputs = lib.optionals stdenv.isLinux [ buildInputs = lib.optionals stdenv.isLinux [
openssl openssl
] ++ lib.optionals stdenv.isDarwin [ ] ++ lib.optionals stdenv.isDarwin [
Security darwin.apple_sdk.frameworks.Security
]; ];
# FIXME: checkPhase on darwin will leave some zombie spawn processes # FIXME: checkPhase on darwin will leave some zombie spawn processes
@ -34,7 +41,8 @@ rustPlatform.buildRustPackage rec {
meta = with lib; { meta = with lib; {
description = "A file server that supports static serving, uploading, searching, accessing control, webdav"; description = "A file server that supports static serving, uploading, searching, accessing control, webdav";
homepage = "https://github.com/sigoden/dufs"; homepage = "https://github.com/sigoden/dufs";
changelog = "https://github.com/sigoden/dufs/blob/${src.rev}/CHANGELOG.md";
license = with licenses; [ asl20 /* or */ mit ]; license = with licenses; [ asl20 /* or */ mit ];
maintainers = [ maintainers.holymonson ]; maintainers = with maintainers; [ figsoda holymonson ];
}; };
} }

4
pkgs/top-level/all-packages.nix
View File

@ -597,9 +597,7 @@ with pkgs;
dtv-scan-tables = callPackage ../data/misc/dtv-scan-tables { }; dtv-scan-tables = callPackage ../data/misc/dtv-scan-tables { };
dufs = callPackage ../servers/http/dufs { dufs = callPackage ../servers/http/dufs { };
inherit (darwin.apple_sdk.frameworks) Security;
};
dynein = callPackage ../development/tools/database/dynein { dynein = callPackage ../development/tools/database/dynein {
inherit (darwin.apple_sdk.frameworks) Security; inherit (darwin.apple_sdk.frameworks) Security;