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

Merge master into staging-next

Browse Source
This commit is contained in:
Frederik Rietdijk
2020-11-27 15:09:19 +01:00
parent 9778483751 be36f6f0a0
commit b2a3891e12
800 changed files with 21489 additions and 5337 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/filesystems/bcache-tools/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, utillinux, bash }:
{ stdenv, fetchurl, pkgconfig, util-linux, bash }:
stdenv.mkDerivation rec {
pname = "bcache-tools";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ utillinux ];
buildInputs = [ util-linux ];
# * Remove broken install rules (they ignore $PREFIX) for stuff we don't need
# anyway (it's distro specific stuff).
pkgs/tools/filesystems/bees/default.nix
+4 -3
View File
@@ -1,4 +1,4 @@
{ stdenv, runCommand, fetchFromGitHub, bash, btrfs-progs, coreutils, python3Packages, utillinux }:
{ stdenv, runCommand, fetchFromGitHub, bash, btrfs-progs, coreutils, python3Packages, util-linux }:
let
@@ -15,7 +15,7 @@ let
buildInputs = [
btrfs-progs # for btrfs/ioctl.h
utillinux # for uuid.h
util-linux # for uuid.h
];
nativeBuildInputs = [
@@ -56,7 +56,8 @@ let
in
runCommand "bees-service" {
inherit bash bees coreutils utillinux;
inherit bash bees coreutils;
utillinux = util-linux; # needs to be a valid shell variable name
btrfsProgs = btrfs-progs; # needs to be a valid shell variable name
} ''
mkdir -p -- "$out/bin"
pkgs/tools/filesystems/ceph/default.nix
+2 -2
View File
@@ -28,7 +28,7 @@
, nss ? null, nspr ? null
# Linux Only Dependencies
, linuxHeaders, utillinux, libuuid, udev, keyutils, rdma-core, rabbitmq-c
, linuxHeaders, util-linux, libuuid, udev, keyutils, rdma-core, rabbitmq-c
, libaio ? null, libxfs ? null, zfs ? null
, ...
}:
@@ -154,7 +154,7 @@ in rec {
malloc zlib openldap lttng-ust babeltrace gperf gtest cunit
snappy rocksdb lz4 oathToolkit leveldb libnl libcap_ng rdkafka
] ++ optionals stdenv.isLinux [
linuxHeaders utillinux libuuid udev keyutils optLibaio optLibxfs optZfs
linuxHeaders util-linux libuuid udev keyutils optLibaio optLibxfs optZfs
# ceph 14
rdma-core rabbitmq-c
] ++ optionals hasRadosgw [
pkgs/tools/filesystems/darling-dmg/default.nix
+13 -10
View File
@@ -1,26 +1,29 @@
{ stdenv, fetchFromGitHub, cmake, fuse, zlib, bzip2, openssl, libxml2, icu } :
{ stdenv, fetchFromGitHub, cmake, fuse, zlib, bzip2, openssl, libxml2, icu, lzfse }:
stdenv.mkDerivation rec {
pname = "darling-dmg";
version = "1.0.4+git20180914";
version = "1.0.4+git20200427";
src = fetchFromGitHub {
owner = "darlinghq";
repo = "darling-dmg";
rev = "97a92a6930e43cdbc9dedaee62716e3223deb027";
sha256 = "1bngr4827qnl4s2f7z39wjp13nfm3zzzykjshb43wvjz536bnqdj";
rev = "71cc76c792db30328663272788c0b64aca27fdb0";
sha256 = "08iphkxlmjddrxpbm13gxyqwcrd0k65z3l1944n4pccb6qbyj8gv";
};
nativeBuildInputs = [ cmake ];
buildInputs = [ fuse openssl zlib bzip2 libxml2 icu ];
buildInputs = [ fuse openssl zlib bzip2 libxml2 icu lzfse ];
# compat with icu61+ https://github.com/unicode-org/icu/blob/release-64-2/icu4c/readme.html#L554
CXXFLAGS = [ "-DU_USING_ICU_NAMESPACE=1" ];
CXXFLAGS = [
"-DCOMPILE_WITH_LZFSE=1"
"-llzfse"
];
meta = {
meta = with stdenv.lib; {
homepage = "https://www.darlinghq.org/";
description = "Darling lets you open macOS dmgs on Linux";
platforms = stdenv.lib.platforms.linux;
license = stdenv.lib.licenses.gpl3;
platforms = platforms.linux;
license = licenses.gpl3;
maintainers = with maintainers; [ Luflosi ];
};
}
pkgs/tools/filesystems/dislocker/default.nix
+2 -2
View File
@@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
pname = "dislocker";
version = "0.7.1";
version = "0.7.3";
src = fetchFromGitHub {
owner = "aorimn";
repo = "dislocker";
rev = "v${version}";
sha256 = "1crh2sg5x1kgqmdrl1nmrqwxjykxa4zwnbggcpdn97mj2gvdw7sb";
sha256 = "1ak68s1v5dwh8y2dy5zjybmrh0pnqralmyqzis67y21m87g47h2k";
};
nativeBuildInputs = [ cmake ];
pkgs/tools/filesystems/fatresize/default.nix
+3 -3
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, parted, utillinux, pkg-config }:
{ stdenv, fetchFromGitHub, parted, util-linux, pkg-config }:
stdenv.mkDerivation rec {
@@ -12,10 +12,10 @@ stdenv.mkDerivation rec {
sha256 = "1vhz84kxfyl0q7mkqn68nvzzly0a4xgzv76m6db0bk7xyczv1qr2";
};
buildInputs = [ parted utillinux ];
buildInputs = [ parted util-linux ];
nativeBuildInputs = [ pkg-config ];
propagatedBuildInputs = [ parted utillinux ];
propagatedBuildInputs = [ parted util-linux ];
meta = with stdenv.lib; {
description = "The FAT16/FAT32 non-destructive resizer";
pkgs/tools/filesystems/fuse-overlayfs/default.nix
+2 -2
View File
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "fuse-overlayfs";
version = "1.2.0";
version = "1.3.0";
src = fetchFromGitHub {
owner = "containers";
repo = pname;
rev = "v${version}";
sha256 = "1ihibhj48fk1c89yh7vyb44mkywxphxqqgz7xks9caw05qw5ac1y";
sha256 = "00pzwxn5a7dwz9ngl98198lx1c3nlhalzajyqazw9ydjkxibfpay";
};
nativeBuildInputs = [ autoreconfHook pkg-config ];
pkgs/tools/filesystems/glusterfs/default.nix
+5 -5
View File
@@ -1,7 +1,7 @@
{stdenv, fetchurl, fuse, bison, flex_2_5_35, openssl, python3, ncurses, readline,
autoconf, automake, libtool, pkgconfig, zlib, libaio, libxml2, acl, sqlite,
liburcu, attr, makeWrapper, coreutils, gnused, gnugrep, which,
openssh, gawk, findutils, utillinux, lvm2, btrfs-progs, e2fsprogs, xfsprogs, systemd,
openssh, gawk, findutils, util-linux, lvm2, btrfs-progs, e2fsprogs, xfsprogs, systemd,
rsync, glibc, rpcsvc-proto, libtirpc
}:
let
@@ -24,7 +24,7 @@ let
buildInputs = [
fuse bison flex_2_5_35 openssl ncurses readline
autoconf automake libtool pkgconfig zlib libaio libxml2
acl sqlite liburcu attr makeWrapper utillinux libtirpc
acl sqlite liburcu attr makeWrapper util-linux libtirpc
(python3.withPackages (pkgs: [
pkgs.flask
pkgs.prettytable
@@ -56,7 +56,7 @@ let
openssh # ssh
rsync # rsync, e.g. for geo-replication
systemd # systemctl
utillinux # mount umount
util-linux # mount umount
which # which
xfsprogs # xfs_info
];
@@ -76,9 +76,9 @@ stdenv.mkDerivation
substituteInPlace libglusterfs/src/glusterfs/lvm-defaults.h \
--replace '/sbin/' '${lvm2}/bin/'
substituteInPlace libglusterfs/src/glusterfs/compat.h \
--replace '/bin/umount' '${utillinux}/bin/umount'
--replace '/bin/umount' '${util-linux}/bin/umount'
substituteInPlace contrib/fuse-lib/mount-gluster-compat.h \
--replace '/bin/mount' '${utillinux}/bin/mount'
--replace '/bin/mount' '${util-linux}/bin/mount'
'';
# Note that the VERSION file is something that is present in release tarballs
pkgs/tools/filesystems/moosefs/default.nix
+1 -3
View File
@@ -22,12 +22,10 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig makeWrapper ];
buildInputs =
[ fuse libpcap zlib ];
[ fuse libpcap zlib python ];
postInstall = ''
substituteInPlace $out/sbin/mfscgiserv --replace "datapath=\"$out" "datapath=\""
wrapProgram $out/sbin/mfscgiserv \
--prefix PATH ":" "${python}/bin"
'';
meta = with stdenv.lib; {
pkgs/tools/filesystems/nixpart/0.4/blivet.nix
+3 -3
View File
@@ -1,7 +1,7 @@
# FIXME: Unify with pkgs/development/python-modules/blivet/default.nix.
{ stdenv, fetchurl, buildPythonApplication, pykickstart, pyparted, pyblock
, libselinux, cryptsetup, multipath_tools, lsof, utillinux
, libselinux, cryptsetup, multipath_tools, lsof, util-linux
, useNixUdev ? true, systemd ? null
# useNixUdev is here for bw compatibility
}:
@@ -24,11 +24,11 @@ buildPythonApplication rec {
sed -i -e 's|"multipath"|"${multipath_tools}/sbin/multipath"|' \
blivet/devicelibs/mpath.py blivet/devices.py
sed -i -e '/"wipefs"/ {
s|wipefs|${utillinux.bin}/sbin/wipefs|
s|wipefs|${util-linux.bin}/sbin/wipefs|
s/-f/--force/
}' blivet/formats/__init__.py
sed -i -e 's|"lsof"|"${lsof}/bin/lsof"|' blivet/formats/fs.py
sed -i -r -e 's|"(u?mount)"|"${utillinux.bin}/bin/\1"|' blivet/util.py
sed -i -r -e 's|"(u?mount)"|"${util-linux.bin}/bin/\1"|' blivet/util.py
sed -i -e '/find_library/,/find_library/ {
c libudev = "${stdenv.lib.getLib systemd}/lib/libudev.so.1"
}' blivet/pyudev.py
pkgs/tools/filesystems/nixpart/0.4/default.nix
+3 -3
View File
@@ -13,7 +13,7 @@ let
inherit stdenv fetchurl buildPythonApplication;
inherit pykickstart pyparted pyblock cryptsetup libselinux multipath_tools;
inherit useNixUdev;
inherit (pkgs) lsof utillinux systemd;
inherit (pkgs) lsof util-linux systemd;
};
cryptsetup = import ./cryptsetup.nix {
@@ -27,7 +27,7 @@ let
lvm2 = import ./lvm2.nix {
inherit stdenv fetchurl;
inherit (pkgs) fetchpatch pkgconfig utillinux systemd coreutils;
inherit (pkgs) fetchpatch pkgconfig util-linux systemd coreutils;
};
multipath_tools = import ./multipath-tools.nix {
@@ -37,7 +37,7 @@ let
parted = import ./parted.nix {
inherit stdenv fetchurl;
inherit (pkgs) fetchpatch utillinux readline libuuid gettext check lvm2;
inherit (pkgs) fetchpatch util-linux readline libuuid gettext check lvm2;
};
pyblock = import ./pyblock.nix {
pkgs/tools/filesystems/nixpart/0.4/lvm2.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, fetchpatch, pkgconfig, systemd, utillinux, coreutils }:
{ stdenv, fetchurl, fetchpatch, pkgconfig, systemd, util-linux, coreutils }:
let
v = "2.02.106";
@@ -60,7 +60,7 @@ stdenv.mkDerivation {
postInstall =
''
substituteInPlace $out/lib/udev/rules.d/13-dm-disk.rules \
--replace $out/sbin/blkid ${utillinux.bin}/sbin/blkid
--replace $out/sbin/blkid ${util-linux.bin}/sbin/blkid
# Systemd stuff
mkdir -p $out/etc/systemd/system $out/lib/systemd/system-generators
pkgs/tools/filesystems/nixpart/0.4/parted.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, fetchpatch, lvm2, libuuid, gettext, readline
, utillinux, check, enableStatic ? false }:
, util-linux, check, enableStatic ? false }:
stdenv.mkDerivation rec {
name = "parted-3.1";
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
++ stdenv.lib.optional enableStatic "--enable-static";
doCheck = true;
checkInputs = [ check utillinux ];
checkInputs = [ check util-linux ];
meta = {
description = "Create, destroy, resize, check, and copy partitions";
pkgs/tools/filesystems/ntfs-3g/default.nix
+3 -3
View File
@@ -1,4 +1,4 @@
{stdenv, fetchurl, utillinux, libuuid
{stdenv, fetchurl, util-linux, libuuid
, crypto ? false, libgcrypt, gnutls, pkgconfig}:
stdenv.mkDerivation rec {
@@ -19,8 +19,8 @@ stdenv.mkDerivation rec {
substituteInPlace src/Makefile.in --replace /sbin '@sbindir@'
substituteInPlace ntfsprogs/Makefile.in --replace /sbin '@sbindir@'
substituteInPlace libfuse-lite/mount_util.c \
--replace /bin/mount ${utillinux}/bin/mount \
--replace /bin/umount ${utillinux}/bin/umount
--replace /bin/mount ${util-linux}/bin/mount \
--replace /bin/umount ${util-linux}/bin/umount
'';
configureFlags = [
pkgs/tools/filesystems/sftpman/default.nix
+25
View File
@@ -0,0 +1,25 @@
{ lib, python3Packages, fetchFromGitHub }:
python3Packages.buildPythonApplication rec {
pname = "sftpman";
version = "1.1.3";
src = fetchFromGitHub {
owner = "spantaleev";
repo = pname;
rev = version;
sha256 = "04awwwfw51fi1q18xdysp54jyhr0rhb4kfyrgv0vhhrlpwwyhnqy";
};
checkPhase = ''
$out/bin/sftpman help
'';
meta = with lib; {
homepage = "https://github.com/spantaleev/sftpman";
description = "Application that handles sshfs/sftp file systems mounting";
license = licenses.gpl3;
platforms = platforms.unix;
maintainers = with maintainers; [ contrun ];
};
}