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

Merge release-21.05 into staging-next-21.05

Browse Source
This commit is contained in:
github-actions[bot]
2021-07-03 06:02:17 +00:00
committed by GitHub
parent a9f1434ec7 fe80e34fef
commit 31d5f83f39
13 changed files with 62 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/tools/filesystems/ceph/default.nix
View File

@@ -38,7 +38,7 @@
# Linux Only Dependencies
, linuxHeaders, util-linux, libuuid, udev, keyutils, rdma-core, rabbitmq-c
, libaio ? null, libxfs ? null, zfs ? null
, libaio ? null, libxfs ? null, zfs ? null, liburing ? null
, ...
}:
@@ -114,6 +114,8 @@ let
ps.Mako
ceph-common
ps.cherrypy
ps.cmd2
ps.colorama
ps.dateutil
ps.jsonpatch
ps.pecan
@@ -163,7 +165,7 @@ in rec {
snappy lz4 oathToolkit leveldb libnl libcap_ng rdkafka
cryptsetup sqlite lua icu bzip2
] ++ lib.optionals stdenv.isLinux [
linuxHeaders util-linux libuuid udev keyutils optLibaio optLibxfs optZfs
linuxHeaders util-linux libuuid udev keyutils liburing optLibaio optLibxfs optZfs
# ceph 14
rdma-core rabbitmq-c
] ++ lib.optionals hasRadosgw [
@@ -194,11 +196,12 @@ in rec {
"-DMGR_PYTHON_VERSION=${ceph-python-env.python.pythonVersion}"
"-DWITH_SYSTEMD=OFF"
"-DWITH_TESTS=OFF"
"-DWITH_CEPHFS_SHELL=ON"
# TODO breaks with sandbox, tries to download stuff with npm
"-DWITH_MGR_DASHBOARD_FRONTEND=OFF"
# WITH_XFS has been set default ON from Ceph 16, keeping it optional in nixpkgs for now
''-DWITH_XFS=${if optLibxfs != null then "ON" else "OFF"}''
];
] ++ lib.optional stdenv.isLinux "-DWITH_SYSTEM_LIBURING=ON";
postFixup = ''
wrapPythonPrograms

6
pkgs/tools/graphics/yaxg/default.nix
View File

@@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, makeWrapper,
maim, slop, ffmpeg_3, byzanz, libnotify, xdpyinfo }:
maim, slop, ffmpeg, byzanz, libnotify, xdpyinfo }:
stdenv.mkDerivation rec {
pname = "yaxg";
@@ -13,13 +13,13 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ maim slop ffmpeg_3 byzanz libnotify xdpyinfo ];
buildInputs = [ maim slop ffmpeg byzanz libnotify xdpyinfo ];
installPhase = ''
mkdir -p $out/bin/
mv yaxg $out/bin/
chmod +x $out/bin/yaxg
wrapProgram $out/bin/yaxg --prefix PATH : ${ lib.makeBinPath [ maim slop ffmpeg_3 byzanz libnotify xdpyinfo ]}
wrapProgram $out/bin/yaxg --prefix PATH : ${ lib.makeBinPath [ maim slop ffmpeg byzanz libnotify xdpyinfo ]}
'';
meta = with lib; {