mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-23 15:33:13 +00:00
Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
3c6eb8fe49
@ -8974,12 +8974,6 @@
|
||||
githubId = 8641;
|
||||
name = "Pierre Carrier";
|
||||
};
|
||||
pengmeiyu = {
|
||||
email = "pengmyu@gmail.com";
|
||||
github = "pmeiyu";
|
||||
githubId = 8529551;
|
||||
name = "Peng Mei Yu";
|
||||
};
|
||||
penguwin = {
|
||||
email = "penguwin@penguwin.eu";
|
||||
github = "penguwin";
|
||||
@ -9255,6 +9249,12 @@
|
||||
githubId = 178496;
|
||||
name = "Philipp Middendorf";
|
||||
};
|
||||
pmy = {
|
||||
email = "pmy@xqzp.net";
|
||||
github = "pmeiyu";
|
||||
githubId = 8529551;
|
||||
name = "Peng Mei Yu";
|
||||
};
|
||||
pmyjavec = {
|
||||
email = "pauly@myjavec.com";
|
||||
github = "pmyjavec";
|
||||
|
||||
@ -22,7 +22,7 @@ rec {
|
||||
else throw "Unknown QEMU serial device for system '${pkgs.stdenv.hostPlatform.system}'";
|
||||
|
||||
qemuBinary = qemuPkg: {
|
||||
x86_64-linux = "${qemuPkg}/bin/qemu-kvm -cpu max";
|
||||
x86_64-linux = "${qemuPkg}/bin/qemu-kvm -cpu qemu64";
|
||||
armv7l-linux = "${qemuPkg}/bin/qemu-system-arm -enable-kvm -machine virt -cpu host";
|
||||
aarch64-linux = "${qemuPkg}/bin/qemu-system-aarch64 -enable-kvm -machine virt,gic-version=host -cpu host";
|
||||
powerpc64le-linux = "${qemuPkg}/bin/qemu-system-ppc64 -machine powernv";
|
||||
|
||||
@ -179,7 +179,7 @@ in
|
||||
in mkIf enabled {
|
||||
assertions = [
|
||||
{
|
||||
assertion = with config.services.xserver.displayManager; gdm.nvidiaWayland -> cfg.modesetting.enable;
|
||||
assertion = with config.services.xserver.displayManager; (gdm.enable && gdm.nvidiaWayland) -> cfg.modesetting.enable;
|
||||
message = "You cannot use wayland with GDM without modesetting enabled for NVIDIA drivers, set `hardware.nvidia.modesetting.enable = true`";
|
||||
}
|
||||
|
||||
|
||||
@ -351,6 +351,7 @@ in
|
||||
hqplayer = 319;
|
||||
moonraker = 320;
|
||||
distcc = 321;
|
||||
webdav = 322;
|
||||
|
||||
# When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399!
|
||||
|
||||
@ -656,6 +657,7 @@ in
|
||||
hqplayer = 319;
|
||||
moonraker = 320;
|
||||
distcc = 321;
|
||||
webdav = 322;
|
||||
|
||||
# When adding a gid, make sure it doesn't match an existing
|
||||
# uid. Users and groups with the same name should have equal
|
||||
|
||||
@ -84,12 +84,15 @@ in {
|
||||
"bdev"
|
||||
"binfmt"
|
||||
"binfmt_misc"
|
||||
"ceph"
|
||||
"cgroup"
|
||||
"cgroup2"
|
||||
"cifs"
|
||||
"coda"
|
||||
"configfs"
|
||||
"cramfs"
|
||||
"cpuset"
|
||||
"curlftpfs"
|
||||
"debugfs"
|
||||
"devfs"
|
||||
"devpts"
|
||||
@ -101,6 +104,13 @@ in {
|
||||
"ftpfs"
|
||||
"fuse"
|
||||
"fusectl"
|
||||
"fusesmb"
|
||||
"fuse.ceph"
|
||||
"fuse.glusterfs"
|
||||
"fuse.gvfsd-fuse"
|
||||
"fuse.mfs"
|
||||
"fuse.rclone"
|
||||
"fuse.rozofs"
|
||||
"fuse.sshfs"
|
||||
"gfs"
|
||||
"gfs2"
|
||||
@ -110,9 +120,15 @@ in {
|
||||
"iso9660"
|
||||
"jffs2"
|
||||
"lustre"
|
||||
"lustre_lite"
|
||||
"misc"
|
||||
"mfs"
|
||||
"mqueue"
|
||||
"ncpfs"
|
||||
"nfs"
|
||||
"NFS"
|
||||
"nfs4"
|
||||
"nfsd"
|
||||
"nnpfs"
|
||||
"ocfs"
|
||||
"ocfs2"
|
||||
@ -127,16 +143,14 @@ in {
|
||||
"smbfs"
|
||||
"sockfs"
|
||||
"spufs"
|
||||
"nfs"
|
||||
"NFS"
|
||||
"nfs4"
|
||||
"nfsd"
|
||||
"sshfs"
|
||||
"subfs"
|
||||
"supermount"
|
||||
"sysfs"
|
||||
"tmpfs"
|
||||
"tracefs"
|
||||
"ubifs"
|
||||
"udev"
|
||||
"udf"
|
||||
"usbfs"
|
||||
"vboxsf"
|
||||
|
||||
@ -685,6 +685,7 @@
|
||||
./services/network-filesystems/diod.nix
|
||||
./services/network-filesystems/u9fs.nix
|
||||
./services/network-filesystems/webdav.nix
|
||||
./services/network-filesystems/webdav-server-rs.nix
|
||||
./services/network-filesystems/yandex-disk.nix
|
||||
./services/network-filesystems/xtreemfs.nix
|
||||
./services/network-filesystems/ceph.nix
|
||||
|
||||
@ -253,7 +253,7 @@ chmod 400 /var/lib/secrets/certs.secret
|
||||
</programlisting>
|
||||
|
||||
<para>
|
||||
Now you're all set to generate certs! You should monitor the first invokation
|
||||
Now you're all set to generate certs! You should monitor the first invocation
|
||||
by running <literal>systemctl start acme-example.com.service &
|
||||
journalctl -fu acme-example.com.service</literal> and watching its log output.
|
||||
</para>
|
||||
|
||||
144
nixos/modules/services/network-filesystems/webdav-server-rs.nix
Normal file
144
nixos/modules/services/network-filesystems/webdav-server-rs.nix
Normal file
@ -0,0 +1,144 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
|
||||
with lib;
|
||||
let
|
||||
cfg = config.services.webdav-server-rs;
|
||||
format = pkgs.formats.toml { };
|
||||
settings = recursiveUpdate
|
||||
{
|
||||
server.uid = config.users.users."${cfg.user}".uid;
|
||||
server.gid = config.users.groups."${cfg.group}".gid;
|
||||
}
|
||||
cfg.settings;
|
||||
in
|
||||
{
|
||||
options = {
|
||||
services.webdav-server-rs = {
|
||||
enable = mkEnableOption "WebDAV server";
|
||||
|
||||
user = mkOption {
|
||||
type = types.str;
|
||||
default = "webdav";
|
||||
description = "User to run under when setuid is not enabled.";
|
||||
};
|
||||
|
||||
group = mkOption {
|
||||
type = types.str;
|
||||
default = "webdav";
|
||||
description = "Group to run under when setuid is not enabled.";
|
||||
};
|
||||
|
||||
settings = mkOption {
|
||||
type = format.type;
|
||||
default = { };
|
||||
description = ''
|
||||
Attrset that is converted and passed as config file. Available
|
||||
options can be found at
|
||||
<link xlink:href="https://github.com/miquels/webdav-server-rs/blob/master/webdav-server.toml">here</link>.
|
||||
'';
|
||||
example = literalExpression ''
|
||||
{
|
||||
server.listen = [ "0.0.0.0:4918" "[::]:4918" ];
|
||||
accounts = {
|
||||
auth-type = "htpasswd.default";
|
||||
acct-type = "unix";
|
||||
};
|
||||
htpasswd.default = {
|
||||
htpasswd = "/etc/htpasswd";
|
||||
};
|
||||
location = [
|
||||
{
|
||||
route = [ "/public/*path" ];
|
||||
directory = "/srv/public";
|
||||
handler = "filesystem";
|
||||
methods = [ "webdav-ro" ];
|
||||
autoindex = true;
|
||||
auth = "false";
|
||||
}
|
||||
{
|
||||
route = [ "/user/:user/*path" ];
|
||||
directory = "~";
|
||||
handler = "filesystem";
|
||||
methods = [ "webdav-rw" ];
|
||||
autoindex = true;
|
||||
auth = "true";
|
||||
setuid = true;
|
||||
}
|
||||
];
|
||||
}
|
||||
'';
|
||||
};
|
||||
|
||||
configFile = mkOption {
|
||||
type = types.path;
|
||||
default = format.generate "webdav-server.toml" settings;
|
||||
defaultText = "Config file generated from services.webdav-server-rs.settings";
|
||||
description = ''
|
||||
Path to config file. If this option is set, it will override any
|
||||
configuration done in services.webdav-server-rs.settings.
|
||||
'';
|
||||
example = "/etc/webdav-server.toml";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
assertions = [
|
||||
{
|
||||
assertion = hasAttr cfg.user config.users.users && config.users.users."${cfg.user}".uid != null;
|
||||
message = "users.users.${cfg.user} and users.users.${cfg.user}.uid must be defined.";
|
||||
}
|
||||
{
|
||||
assertion = hasAttr cfg.group config.users.groups && config.users.groups."${cfg.group}".gid != null;
|
||||
message = "users.groups.${cfg.group} and users.groups.${cfg.group}.gid must be defined.";
|
||||
}
|
||||
];
|
||||
|
||||
users.users = optionalAttrs (cfg.user == "webdav") {
|
||||
webdav = {
|
||||
description = "WebDAV user";
|
||||
group = cfg.group;
|
||||
uid = config.ids.uids.webdav;
|
||||
};
|
||||
};
|
||||
|
||||
users.groups = optionalAttrs (cfg.group == "webdav") {
|
||||
webdav.gid = config.ids.gids.webdav;
|
||||
};
|
||||
|
||||
systemd.services.webdav-server-rs = {
|
||||
description = "WebDAV server";
|
||||
after = [ "network.target" ];
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
serviceConfig = {
|
||||
ExecStart = "${pkgs.webdav-server-rs}/bin/webdav-server -c ${cfg.configFile}";
|
||||
|
||||
CapabilityBoundingSet = [
|
||||
"CAP_SETUID"
|
||||
"CAP_SETGID"
|
||||
];
|
||||
|
||||
NoExecPaths = [ "/" ];
|
||||
ExecPaths = [ "/nix/store" ];
|
||||
|
||||
# This program actively detects if it is running in root user account
|
||||
# when it starts and uses root privilege to switch process uid to
|
||||
# respective unix user when a user logs in. Maybe we can enable
|
||||
# DynamicUser in the future when it's able to detect CAP_SETUID and
|
||||
# CAP_SETGID capabilities.
|
||||
|
||||
NoNewPrivileges = true;
|
||||
PrivateDevices = true;
|
||||
PrivateTmp = true;
|
||||
ProtectClock = true;
|
||||
ProtectControlGroups = true;
|
||||
ProtectKernelLogs = true;
|
||||
ProtectKernelModules = true;
|
||||
ProtectKernelTunables = true;
|
||||
ProtectSystem = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
meta.maintainers = with maintainers; [ pmy ];
|
||||
}
|
||||
@ -80,13 +80,13 @@ in
|
||||
users.users = mkIf (cfg.user == "webdav") {
|
||||
webdav = {
|
||||
description = "WebDAV daemon user";
|
||||
isSystemUser = true;
|
||||
group = cfg.group;
|
||||
uid = config.ids.uids.webdav;
|
||||
};
|
||||
};
|
||||
|
||||
users.groups = mkIf (cfg.group == "webdav") {
|
||||
webdav = { };
|
||||
webdav.gid = config.ids.gids.webdav;
|
||||
};
|
||||
|
||||
systemd.services.webdav = {
|
||||
@ -103,5 +103,5 @@ in
|
||||
};
|
||||
};
|
||||
|
||||
meta.maintainers = with maintainers; [ pengmeiyu ];
|
||||
meta.maintainers = with maintainers; [ pmy ];
|
||||
}
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{lib, stdenv, fetchurl, SDL, SDL_gfx, SDL_image, tremor, flac, mpg123, libmikmod
|
||||
{lib, stdenv, fetchurl, fetchpatch, SDL, SDL_gfx, SDL_image, tremor, flac, mpg123, libmikmod
|
||||
, speex, ncurses
|
||||
, keymap ? "default"
|
||||
, conf ? "unknown"
|
||||
@ -13,6 +13,24 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "03x0mc0xw2if0bpf0a15yprcyx1xccki039zvl2099dagwk6xskv";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# pull pending upstream inclusion fix for ncurses-6.3:
|
||||
# https://github.com/jhe2/gmu/pull/7
|
||||
(fetchpatch {
|
||||
name = "ncurses-6.3.patch";
|
||||
url = "https://github.com/jhe2/gmu/commit/c8b3a10afee136feb333754ef6ec26383b11072f.patch";
|
||||
sha256 = "0xp2j3jp8pkmv6yvnzi378m2dylbfsaqrsrkw7hbxw6kglzj399r";
|
||||
})
|
||||
|
||||
# pull upstream fix for -fno-common toolchains like
|
||||
# upstream gcc-10 of clang-13.
|
||||
(fetchpatch {
|
||||
name = "fno-common.patch";
|
||||
url = "https://github.com/jhe2/gmu/commit/b705209f08ddfda141ad358ccd0c3d2d099be5e6.patch";
|
||||
sha256 = "1ci2b8kz3r58rzmivlfhqjmcgqwlkwlzzhnyxlk36vmk240a3gqq";
|
||||
})
|
||||
];
|
||||
|
||||
buildInputs = [ SDL SDL_gfx SDL_image tremor flac mpg123 libmikmod speex ncurses ];
|
||||
|
||||
makeFlags = [ "PREFIX=$(out)" ];
|
||||
|
||||
@ -2,12 +2,12 @@
|
||||
|
||||
let
|
||||
pname = "ledger-live-desktop";
|
||||
version = "2.35.1";
|
||||
version = "2.35.2";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/LedgerHQ/${pname}/releases/download/v${version}/${pname}-${version}-linux-x86_64.AppImage";
|
||||
hash = "sha256:0z60c4sjq63r5rs95rbv7afliia05l1p9bgfd5zv7i51qxgzfs4a";
|
||||
hash = "sha256-VJr1H6YcPtCzm6FeFA+rNANvYUQ3wZQalI9RdSv68cI=";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extractType2 {
|
||||
|
||||
40
pkgs/applications/editors/lifeograph/default.nix
Normal file
40
pkgs/applications/editors/lifeograph/default.nix
Normal file
@ -0,0 +1,40 @@
|
||||
{ stdenv, lib, fetchgit, pkg-config, meson, ninja
|
||||
, enchant, gtkmm3, libchamplain, libgcrypt }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lifeograph";
|
||||
version = "2.0.2";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://git.launchpad.net/lifeograph";
|
||||
# Specific commit hash related to version
|
||||
rev = "d635bbb30011c0d33c33643e6fa5c006f98ed7d6";
|
||||
sha256 = "0j9wn5bj7cbfnmyyx7ikx961sksv50agnb53prymldbsq43rfgnq";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libgcrypt
|
||||
enchant
|
||||
gtkmm3
|
||||
libchamplain
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
substituteInPlace $out/share/applications/net.sourceforge.Lifeograph.desktop \
|
||||
--replace "Exec=" "Exec=$out/bin/"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://lifeograph.sourceforge.net/wiki/Main_Page";
|
||||
description = "Lifeograph is an off-line and private journal and note taking application";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ wolfangaukang ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
@ -10,11 +10,11 @@ with lib;
|
||||
|
||||
perlPackages.buildPerlPackage rec {
|
||||
pname = "gscan2pdf";
|
||||
version = "2.12.3";
|
||||
version = "2.12.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/gscan2pdf/${version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "tdXTcoI7DnrBsXtXR0r07hz0lDcAjZJad+o4wwxHcOk=";
|
||||
sha256 = "sha256-UrBt0QkSk7IP4mZYFoxFNJQ1Qmcb53CemvlYfsxjZ/s=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ wrapGAppsHook ];
|
||||
|
||||
@ -12,6 +12,12 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "0975j4m93s9a21pazwdzn4gqhkngwq7q6ghp0q8a75r6c4fb7aar";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
# Add support for ncurses-6.3. Can be dropped with 0.9 release.
|
||||
# Fixed upstream at: https://git.2f30.org/noice/commit/53c35e6b340b7c135038e00057a198f03cb7d7cf.html
|
||||
substituteInPlace noice.c --replace 'printw(str);' 'printw("%s", str);'
|
||||
'';
|
||||
|
||||
configFile = optionalString (conf!=null) (builtins.toFile "config.def.h" conf);
|
||||
preBuild = optionalString (conf!=null) "cp ${configFile} config.def.h";
|
||||
|
||||
|
||||
@ -13,13 +13,13 @@
|
||||
# logitech-udev-rules instead of adding this to services.udev.packages on NixOS
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "solaar";
|
||||
version = "1.0.7";
|
||||
version = "1.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pwr-Solaar";
|
||||
repo = "Solaar";
|
||||
rev = version;
|
||||
sha256 = "sha256-RQ7iSiw/0xbPOYhuHg4cQpuJyRcaigWKVw4Jt12T9Uw=";
|
||||
sha256 = "sha256-rNz296pKw2/WaryxHekWHSAS1jdTviZxXDgO/L/PJCU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ wrapGAppsHook gdk-pixbuf ];
|
||||
|
||||
@ -14,11 +14,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "viking";
|
||||
version = "1.9";
|
||||
version = "1.10";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/viking/viking-${version}.tar.bz2";
|
||||
sha256 = "0fybpy6k0vmjp231h5ckysl3c0rcnh2afznijwq6y78j4hywyjpy";
|
||||
sha256 = "sha256-lFXIlfmLwT3iS9ayNM0PHV7NwbBotMvG62ZE9hJuRaw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ docbook_xml_dtd_45 docbook_xsl intltool itstool libxslt pkg-config wrapGAppsHook yelp-tools ];
|
||||
|
||||
@ -0,0 +1,78 @@
|
||||
{ stdenv, lib, fetchurl, dpkg, autoPatchelfHook, makeWrapper
|
||||
, alsa-lib, dbus, fontconfig, freetype, glib, gst_all_1, libGL
|
||||
, libinput, libpulseaudio, libsecret, libtiff, libxkbcommon
|
||||
, mesa, openssl, systemd, xorg }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "alfaview";
|
||||
version = "8.32.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://production-alfaview-assets.alfaview.com/stable/linux/${pname}_${version}.deb";
|
||||
sha256 = "sha256-cBf/9MdNXhFRYPAOhQQ8j3rpY4JYh/+NyA7Eji9/E9Q=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
dpkg
|
||||
makeWrapper
|
||||
autoPatchelfHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
alsa-lib
|
||||
dbus
|
||||
fontconfig
|
||||
freetype
|
||||
glib
|
||||
gst_all_1.gst-plugins-bad
|
||||
gst_all_1.gst-plugins-base
|
||||
libGL
|
||||
libinput
|
||||
libpulseaudio
|
||||
libsecret
|
||||
libtiff
|
||||
libxkbcommon
|
||||
mesa
|
||||
openssl
|
||||
stdenv.cc.cc
|
||||
systemd
|
||||
xorg.libX11
|
||||
xorg.xcbutilwm
|
||||
xorg.xcbutilimage
|
||||
xorg.xcbutilkeysyms
|
||||
xorg.xcbutilrenderutil
|
||||
];
|
||||
|
||||
libPath = lib.makeLibraryPath buildInputs;
|
||||
|
||||
dontBuild = true;
|
||||
dontConfigure = true;
|
||||
|
||||
unpackPhase = ''
|
||||
dpkg-deb -x ${src} ./
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mv usr $out
|
||||
mv opt $out
|
||||
|
||||
substituteInPlace $out/share/applications/alfaview.desktop \
|
||||
--replace "/opt/alfaview" "$out/bin" \
|
||||
--replace "/usr/share/pixmaps/alfaview_production.png" alfaview_production
|
||||
|
||||
makeWrapper $out/opt/alfaview/alfaview $out/bin/alfaview \
|
||||
--prefix LD_LIBRARY_PATH : ${libPath}
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Video-conferencing application, specialized in virtual online meetings, seminars, training sessions and conferences";
|
||||
homepage = "https://alfaview.com";
|
||||
license = licenses.unfree;
|
||||
maintainers = with maintainers; [ wolfangaukang ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
}
|
||||
@ -13,10 +13,10 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
inherit pname;
|
||||
version = "10.7.0";
|
||||
version = "10.7.1";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/betaflight/${pname}/releases/download/${version}/${pname}_${version}_linux64.zip";
|
||||
sha256 = "07r60n9422g5sm7x5b62p044cp961l51vx0s8ig2hy24s74hkam1";
|
||||
sha256 = "sha256-mMjy7Ve7wEmPxkAmux0WahUgJ86ylnWZP4smDZeBs8Q=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ wrapGAppsHook unzip ];
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ lib, stdenv, fetchurl, fetchpatch, python, zlib, pkg-config, glib
|
||||
, perl, pixman, vde2, alsa-lib, texinfo, flex
|
||||
, bison, lzo, snappy, libaio, libtasn1, gnutls, nettle, curl, ninja, meson, sigtool
|
||||
, makeWrapper, autoPatchelfHook
|
||||
, makeWrapper, autoPatchelfHook, runtimeShell
|
||||
, attr, libcap, libcap_ng
|
||||
, CoreServices, Cocoa, Hypervisor, rez, setfile
|
||||
, numaSupport ? stdenv.isLinux && !stdenv.isAarch32, numactl
|
||||
@ -228,10 +228,13 @@ stdenv.mkDerivation rec {
|
||||
|
||||
# Add a ‘qemu-kvm’ wrapper for compatibility/convenience.
|
||||
postInstall = ''
|
||||
cp -- $emitKvmWarningsPath $out/libexec/emit-kvm-warnings
|
||||
chmod a+x -- $out/libexec/emit-kvm-warnings
|
||||
if [ -x $out/bin/qemu-system-${stdenv.hostPlatform.qemuArch} ]; then
|
||||
makeWrapper $out/bin/qemu-system-${stdenv.hostPlatform.qemuArch} \
|
||||
$out/bin/qemu-kvm \
|
||||
--add-flags "\$([ -e /dev/kvm ] && echo -enable-kvm)"
|
||||
--run $out/libexec/emit-kvm-warnings \
|
||||
--add-flags "\$([ -r /dev/kvm -a -w /dev/kvm ] && echo -enable-kvm)"
|
||||
fi
|
||||
'';
|
||||
|
||||
@ -242,6 +245,26 @@ stdenv.mkDerivation rec {
|
||||
# Builds in ~3h with 2 cores, and ~20m with a big-parallel builder.
|
||||
requiredSystemFeatures = [ "big-parallel" ];
|
||||
|
||||
emitKvmWarnings = ''
|
||||
#!${runtimeShell}
|
||||
WARNCOL='\033[1;35m'
|
||||
NEUTRALCOL='\033[0m'
|
||||
WARNING="''${WARNCOL}warning:''${NEUTRALCOL}"
|
||||
if [ ! -e /dev/kvm ]; then
|
||||
echo -e "''${WARNING} KVM is not available - execution will be slow" >&2
|
||||
echo "Consider installing KVM for hardware-accelerated execution." >&2
|
||||
echo "If KVM is already installed make sure the kernel module is loaded." >&2
|
||||
elif [ ! -r /dev/kvm -o ! -w /dev/kvm ]; then
|
||||
echo -e "''${WARNING} /dev/kvm is not read-/writable - execution will be slow" >&2
|
||||
echo "/dev/kvm needs to be read-/writable by the user executing QEMU." >&2
|
||||
echo "" >&2
|
||||
echo "For hardware-acceleration inside the nix build sandbox /dev/kvm" >&2
|
||||
echo "must be world-read-/writable (rw-rw-rw-)." >&2
|
||||
fi
|
||||
'';
|
||||
|
||||
passAsFile = [ "emitKvmWarnings" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://www.qemu.org/";
|
||||
description = "A generic and open source machine emulator and virtualizer";
|
||||
|
||||
@ -61,6 +61,6 @@ stdenv.mkDerivation {
|
||||
# rime-cantonese
|
||||
cc-by-40
|
||||
];
|
||||
maintainers = [ maintainers.pengmeiyu ];
|
||||
maintainers = with maintainers; [ pmy ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
buildGraalvmNativeImage rec {
|
||||
pname = "babashka";
|
||||
version = "0.6.5";
|
||||
version = "0.6.7";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/babashka/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar";
|
||||
sha256 = "sha256-72D/HzDIxkGD4zTPE9gHf/uFtboLbNnT7CTslSlAqjc=";
|
||||
sha256 = "sha256-e5Mq2fPYqsPEENVGO+gBz9K79KcKOykdDtItjcXU/DI=";
|
||||
};
|
||||
|
||||
executable = "bb";
|
||||
|
||||
@ -238,4 +238,7 @@ stdenv.mkDerivation rec {
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ tobim veprbl cpcloud ];
|
||||
};
|
||||
passthru = {
|
||||
inherit enableFlight enableJemalloc enableS3 enableGcs;
|
||||
};
|
||||
}
|
||||
|
||||
@ -105,7 +105,6 @@ stdenv.mkDerivation rec {
|
||||
patches = [
|
||||
# Use pkgconfig to inject the includedirs
|
||||
./fix_pkgconfig_includedir.patch
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
# Fix “error: cannot initialize a parameter of type 'unsigned long *' with an rvalue of type 'typename std::remove_reference<decltype(*(&opencv_dilate_erode_type))>::type *' (aka 'volatile unsigned long *')” on Darwin.
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/commit/640a65bf966df065d41a511e2d76d1f26a2e770c.patch";
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "opencl-clhpp";
|
||||
version = "2.0.12";
|
||||
version = "2.0.15";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "KhronosGroup";
|
||||
repo = "OpenCL-CLHPP";
|
||||
rev = "v${version}";
|
||||
sha256 = "04g3mg2cpbi048fxxkghra81bpxzqr4r3gspx5mvqipx1lzypsci";
|
||||
sha256 = "sha256-A12GdevbMaO2QkGAk3VsXzwcDkF+6dEapse2xfdqzPM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake python3 ];
|
||||
|
||||
@ -15,13 +15,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "indilib";
|
||||
version = "1.9.2";
|
||||
version = "1.9.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "indilib";
|
||||
repo = "indi";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-5MaN1aNyHpZzKwQPUpp9NYRh7i+lx1N70+J1gczdtAE=";
|
||||
sha256 = "sha256-Ik62kbOetA2vSMpnwrSiNRNJqOgmqlCB2+KNhpBo9TA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -1,12 +1,12 @@
|
||||
{ stdenv, lib, callPackage, fetchFromGitHub, indilib }:
|
||||
|
||||
let
|
||||
indi-version = "1.9.2";
|
||||
indi-version = "1.9.3";
|
||||
indi-3rdparty-src = fetchFromGitHub {
|
||||
owner = "indilib";
|
||||
repo = "indi-3rdparty";
|
||||
rev = "v${indi-version}";
|
||||
sha256 = "sha256-dpuJ/J5gc+kAklbvMjsWic9jusXWB4gUcT8E/1eSLXQ=";
|
||||
sha256 = "sha256-TBccdheBEO48uIXd6tya6dytkzxaHg2+YancBkcL3bw=";
|
||||
};
|
||||
indi-firmware = callPackage ./indi-firmware.nix {
|
||||
version = indi-version;
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, lib, fetchFromGitHub, cmake }:
|
||||
{ stdenv, lib, fetchFromGitHub, cmake, llvmPackages }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cppe";
|
||||
@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "sha256-guM7+ZWDJLcAUJtPkKLvC4LYSA2eBvER7cgwPZ7FxHw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
nativeBuildInputs = [ cmake ]
|
||||
++ lib.optionals stdenv.cc.isClang [ llvmPackages.openmp ];
|
||||
|
||||
cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=lib" ];
|
||||
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
{ buildPythonPackage
|
||||
, lib
|
||||
, stdenv
|
||||
, cmake
|
||||
, cppe
|
||||
, eigen
|
||||
@ -12,6 +13,7 @@
|
||||
, pandas
|
||||
, polarizationsolver
|
||||
, pytest
|
||||
, llvmPackages
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
@ -31,7 +33,12 @@ buildPythonPackage rec {
|
||||
|
||||
dontUseCmakeConfigure = true;
|
||||
|
||||
buildInputs = [ pybind11 ];
|
||||
buildInputs = [ pybind11 ]
|
||||
++ lib.optional stdenv.cc.isClang llvmPackages.openmp;
|
||||
|
||||
NIX_CFLAGS_LINK = lib.optional stdenv.cc.isClang "-lomp";
|
||||
|
||||
hardeningDisable = lib.optional stdenv.cc.isClang "strictoverflow";
|
||||
|
||||
checkInputs = [
|
||||
pytest
|
||||
|
||||
@ -1,21 +1,22 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, ipykernel
|
||||
, ipywidgets
|
||||
, matplotlib
|
||||
, jupyter-packaging
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ipympl";
|
||||
version = "0.8.0";
|
||||
version = "0.8.2";
|
||||
format = "wheel";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "ef5d21820ed88a8bd6efddb884c333d0eaea7f2f7d4b3054e6d386b07a36dd9d";
|
||||
inherit pname version format;
|
||||
sha256 = "0509gzm5557lyxx8k3qqgp14ifnmfx796cfc8f592mv97pxkyibl";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ ipywidgets matplotlib jupyter-packaging ];
|
||||
|
||||
propagatedBuildInputs = [ ipykernel ipywidgets ];
|
||||
|
||||
# There are no unit tests in repository
|
||||
doCheck = false;
|
||||
@ -24,7 +25,7 @@ buildPythonPackage rec {
|
||||
meta = with lib; {
|
||||
description = "Matplotlib Jupyter Extension";
|
||||
homepage = "https://github.com/matplotlib/jupyter-matplotlib";
|
||||
maintainers = with maintainers; [ jluttine ];
|
||||
maintainers = with maintainers; [ jluttine fabiangd ];
|
||||
license = licenses.bsd3;
|
||||
};
|
||||
}
|
||||
|
||||
@ -17,7 +17,11 @@ buildPythonPackage rec {
|
||||
checkInputs = [ hypothesis pandas pytestCheckHook pytest-lazy-fixture ];
|
||||
|
||||
PYARROW_BUILD_TYPE = "release";
|
||||
|
||||
PYARROW_WITH_DATASET = true;
|
||||
PYARROW_WITH_FLIGHT = _arrow-cpp.enableFlight;
|
||||
PYARROW_WITH_PARQUET = true;
|
||||
|
||||
PYARROW_CMAKE_OPTIONS = [
|
||||
"-DCMAKE_INSTALL_RPATH=${ARROW_HOME}/lib"
|
||||
|
||||
@ -25,9 +29,13 @@ buildPythonPackage rec {
|
||||
# ourselves
|
||||
"-DCMAKE_POLICY_DEFAULT_CMP0025=NEW"
|
||||
];
|
||||
|
||||
ARROW_HOME = _arrow-cpp;
|
||||
PARQUET_HOME = _arrow-cpp;
|
||||
|
||||
ARROW_TEST_DATA = lib.optionalString doCheck _arrow-cpp.ARROW_TEST_DATA;
|
||||
|
||||
doCheck = true;
|
||||
dontUseCmakeConfigure = true;
|
||||
|
||||
preBuild = ''
|
||||
@ -62,6 +70,6 @@ buildPythonPackage rec {
|
||||
homepage = "https://arrow.apache.org/";
|
||||
license = licenses.asl20;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ veprbl ];
|
||||
maintainers = with maintainers; [ veprbl cpcloud ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -24,7 +24,9 @@ buildPythonPackage rec {
|
||||
# disabled tests access the network
|
||||
py.test tests -k "not test_no_content_length_header \
|
||||
and not test_read_file \
|
||||
and not test_reads_file_from_url_wrapper"
|
||||
and not test_reads_file_from_url_wrapper \
|
||||
and not test_x509_der \
|
||||
and not test_x509_pem"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoPackage rec {
|
||||
pname = "protoc-gen-twirp";
|
||||
version = "8.1.0";
|
||||
version = "8.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "twitchtv";
|
||||
repo = "twirp";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-ezSNrDfOE1nj4FlX7E7Z7/eGfQw1B7NP34aj8ml5pDk=";
|
||||
sha256 = "sha256-PnL7jgxAx/Xk/wajtQ+Q1G9KLes2NVANF2YmBcGFqe0=";
|
||||
};
|
||||
|
||||
goPackagePath = "github.com/twitchtv/twirp";
|
||||
|
||||
@ -1,36 +0,0 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
set -o nounset
|
||||
|
||||
# shellcheck source=/dev/null
|
||||
source "${stdenv}/setup"
|
||||
|
||||
mkdir -p "${out}/share/keen4"
|
||||
unzip -j "$dist" -d "${out}/share/keen4"
|
||||
|
||||
mkdir -p "${out}/bin"
|
||||
cat > "${out}/bin/keen4" <<EOF
|
||||
#! $SHELL -e
|
||||
if test -z "\$HOME"; then
|
||||
echo "HOME directory not set"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Game wants to write in the current directory, but of course we can't
|
||||
# let it write in the Nix store. So create symlinks to the game files
|
||||
# in ~/.keen4 and execute game from there.
|
||||
mkdir -p \$HOME/.keen4
|
||||
cd \$HOME/.keen4
|
||||
|
||||
ln -sf "${out}/share/keen4/"* .
|
||||
|
||||
"${dosbox}/bin/dosbox" ./KEEN4E.EXE -fullscreen -exit || true
|
||||
|
||||
# Cleanup the symlinks.
|
||||
for i in *; do
|
||||
if test -L "\$i"; then
|
||||
rm "\$i"
|
||||
fi
|
||||
done
|
||||
EOF
|
||||
chmod +x "${out}/bin/keen4"
|
||||
@ -2,16 +2,45 @@
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "keen4";
|
||||
builder = ./builder.sh;
|
||||
|
||||
dist = fetchurl {
|
||||
src = fetchurl {
|
||||
url = "http://tarballs.nixos.org/keen4.zip";
|
||||
sha256 = "12rnc9ksl7v6l8wsxvr26ylkafzq80dbsa7yafzw9pqc8pafkhx1";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ unzip ];
|
||||
|
||||
inherit dosbox;
|
||||
installPhase = ''
|
||||
mkdir -p $out/share/keen4
|
||||
mv * $out/share/keen4
|
||||
|
||||
mkdir -p $out/bin
|
||||
cat > $out/bin/keen4 <<EOF
|
||||
#! $SHELL -e
|
||||
if test -z "\$HOME"; then
|
||||
echo "HOME directory not set"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Game wants to write in the current directory, but of course we can't
|
||||
# let it write in the Nix store. So create symlinks to the game files
|
||||
# in ~/.keen4 and execute game from there.
|
||||
mkdir -p \$HOME/.keen4
|
||||
cd \$HOME/.keen4
|
||||
|
||||
ln -sf $out/share/keen4/* .
|
||||
|
||||
${dosbox}/bin/dosbox ./KEEN4E.EXE -fullscreen -exit || true
|
||||
|
||||
# Cleanup the symlinks.
|
||||
for i in *; do
|
||||
if test -L "\$i"; then
|
||||
rm "\$i"
|
||||
fi
|
||||
done
|
||||
EOF
|
||||
chmod +x $out/bin/keen4
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Commander Keen Episode 4: Secret of the Oracle";
|
||||
|
||||
@ -7,13 +7,13 @@
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "legendary-gl"; # Name in pypi
|
||||
version = "0.20.10";
|
||||
version = "0.20.18";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "derrod";
|
||||
repo = "legendary";
|
||||
rev = version;
|
||||
sha256 = "sha256-/OttNHwS08gHx/ZpOuB6yxfK2cX3BbMeQLZC7iXKKrk=";
|
||||
sha256 = "0d31c8grvcw7y3sh2x90cxhj612k6f491w2r12j1q33d2v9sqm4j";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ requests ];
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
let
|
||||
name = "lunar-client";
|
||||
version = "2.7.3";
|
||||
version = "2.8.8";
|
||||
|
||||
desktopItem = makeDesktopItem {
|
||||
name = "Lunar Client";
|
||||
@ -21,7 +21,7 @@ let
|
||||
src = fetchurl {
|
||||
url = "https://launcherupdates.lunarclientcdn.com/Lunar%20Client-${version}.AppImage";
|
||||
name = "lunar-client.AppImage";
|
||||
sha256 = "0ihi937rrj677y9b377b4hhp9wsarbqwrdrd6k3lhzx3jyh2fynf";
|
||||
sha256 = "sha256-zPu0rc/Qi6+EyHXeXRJfkPHKK6Hr1JsENBvLt8a9WBM=";
|
||||
};
|
||||
in appimageTools.wrapType1 rec {
|
||||
inherit name src;
|
||||
|
||||
@ -39,11 +39,11 @@ in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
inherit pname;
|
||||
version = "4.2.2";
|
||||
version = "4.2.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/${pname}/releases/${version}/${pname}_src.tar.xz";
|
||||
sha256 = "sha256-F7TlnlQeEfGp1IBXlfKUgILKukUQxBFkoqXYmxfQOpk=";
|
||||
sha256 = "sha256-nmHl/Qk8Knck9kDF8cuPUzOUxNNx0Vk/g1NW/H82vo0=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
|
||||
changelog = "https://raw.githubusercontent.com/lm-sensors/lm-sensors/V${dashedVersion}/CHANGES";
|
||||
description = "Tools for reading hardware sensors";
|
||||
license = with licenses; [ lgpl21Plus gpl2Plus ];
|
||||
maintainers = with maintainers; [ pengmeiyu ];
|
||||
maintainers = with maintainers; [ pmy ];
|
||||
platforms = platforms.linux;
|
||||
mainProgram = "sensors";
|
||||
};
|
||||
|
||||
@ -12,13 +12,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "solanum";
|
||||
version = "unstable-2021-04-27";
|
||||
version = "unstable-2021-11-14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "solanum-ircd";
|
||||
repo = pname;
|
||||
rev = "3ff5a12e75662e9a642f2a4364797bd361eb0925";
|
||||
sha256 = "14ywmfdv8cncbyg08y2qdis00kwg8lvhkcgj185is67smh0qf88f";
|
||||
rev = "bd38559fedcdfded4d9acbcbf988e4a8f5057eeb";
|
||||
sha256 = "sha256-2P+mqf5b+TD9+9dLahXOdH7ZZhPWUoR1eV73YHbRbAA=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
47
pkgs/servers/webdav-server-rs/default.nix
Normal file
47
pkgs/servers/webdav-server-rs/default.nix
Normal file
@ -0,0 +1,47 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, rustPlatform
|
||||
, libtirpc
|
||||
, pam
|
||||
, rpcsvc-proto
|
||||
, enablePAM ? stdenv.isLinux
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "webdav-server-rs";
|
||||
# The v0.4.0 tag cannot build. So we use the 547602e commit.
|
||||
version = "unstable-2021-08-16";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "miquels";
|
||||
repo = pname;
|
||||
rev = "547602e78783935b4ddd038fb795366c9c476bcc";
|
||||
sha256 = "sha256-nTygUEjAUXD0mRTmjt8/UPVfZA4rP6oop1s/fI5mYeg=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-TDDfGQig4i/DpsilTPqMQ1oT0mXK5DKlZmwsPPLrzFc=";
|
||||
|
||||
buildInputs = [ libtirpc ] ++ lib.optional enablePAM pam;
|
||||
nativeBuildInputs = [ rpcsvc-proto ];
|
||||
|
||||
buildNoDefaultFeatures = true;
|
||||
buildFeatures = [ "quota" ] ++ lib.optional enablePAM "pam";
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace fs_quota/build.rs \
|
||||
--replace '/usr/include/tirpc' '${libtirpc.dev}/include/tirpc'
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "An implementation of WebDAV server in Rust";
|
||||
longDescription = ''
|
||||
webdav-server-rs is an implementation of WebDAV with full support for
|
||||
RFC4918. It also supports local unix accounts, PAM authentication, and
|
||||
quota.
|
||||
'';
|
||||
homepage = "https://github.com/miquels/webdav-server-rs";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ pmy ];
|
||||
};
|
||||
}
|
||||
@ -17,6 +17,6 @@ buildGoModule rec {
|
||||
description = "Simple WebDAV server";
|
||||
homepage = "https://github.com/hacdias/webdav";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ pengmeiyu ];
|
||||
maintainers = with maintainers; [ pmy ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
{ lib, stdenv, autoconf, automake, fetchFromGitHub, libgcc, libjpeg_turbo
|
||||
{ lib, stdenv, autoconf, automake, fetchFromGitHub, fetchpatch
|
||||
, libgcc, libjpeg_turbo
|
||||
, libpng, libtool, libxml2, pkg-config, which, xorg
|
||||
, libtirpc
|
||||
}:
|
||||
@ -12,6 +13,14 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "sha256-qVOdD85sBMxKYx1cSLAGKeODsKKAm9UPBmYzPBbBOzQ=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "binutils-2.36.patch";
|
||||
url = "https://github.com/ArcticaProject/nx-libs/commit/605a266911b50ababbb3f8a8b224efb42743379c.patch";
|
||||
sha256 = "sha256-kk5ms3i0PrHL74I4OlsqDrdDcCJ0us03cQcBy4zjAoQ=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ autoconf automake libtool pkg-config which
|
||||
xorg.gccmakedep xorg.imake ];
|
||||
buildInputs = [ libgcc libjpeg_turbo libpng libxml2 xorg.fontutil
|
||||
|
||||
@ -39,6 +39,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://rime.im/";
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ pengmeiyu ];
|
||||
maintainers = with maintainers; [ pmy ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -2,14 +2,14 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "apkeep";
|
||||
version = "0.6.0";
|
||||
version = "0.7.0";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-RTzYvDkmE0kgl4FSOSjDuQ5G1E0ugFU41zVAMMroofM=";
|
||||
sha256 = "0anfp3nwsainx9sw4njcmkzczq1rmib3dyncwhcf7y3j9v978d3h";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-YFs2AOMGp0WNrceK14AnigZdJl+UsQdUchpxaI7HSXw=";
|
||||
cargoSha256 = "0npw8f8c0qcprcins0pc12c5w47kv8dd1nrzv4xyllr44vx488mc";
|
||||
|
||||
prePatch = ''
|
||||
rm .cargo/config.toml
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "direnv";
|
||||
version = "2.28.0";
|
||||
version = "2.29.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "direnv";
|
||||
repo = "direnv";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-iZ3Lf7Yg+N9BWyLLF+MrT2gpPT9BTcp6pNMpfqwcZXo=";
|
||||
sha256 = "sha256-gbaD//wkgdZEgQUuCUphqx0n9Xf2VFzQrBFrwOdQmi4=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-P8NLY1iGh86ntmYsTVlnNh5akdaM8nzcxDn6Nfmgr84=";
|
||||
|
||||
@ -6,20 +6,22 @@
|
||||
, pkg-config
|
||||
, libiconv
|
||||
, openssl
|
||||
, zellij
|
||||
, testVersion
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "zellij";
|
||||
version = "0.20.1";
|
||||
version = "0.21.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zellij-org";
|
||||
repo = "zellij";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-VeFKUNAOhNvNAqIp4yg0dulIVC6vCvD3ClYjMg1vM1g=";
|
||||
sha256 = "1n033qvidahpfsp4k3x30sav3asldhjlsbydb23vg0v7bxjl2c2q";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-qZjyl+irC5Cj3tpUs97jLxs1UB+7E1xZKbnF3TPFhKE=";
|
||||
cargoSha256 = "1pjmlwx966pgri58xx2zqr84wili0bzpl9gzhjdkvcx0j1f66anb";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
@ -43,9 +45,12 @@ rustPlatform.buildRustPackage rec {
|
||||
--zsh <($out/bin/zellij setup --generate-completion zsh)
|
||||
'';
|
||||
|
||||
passthru.tests.version = testVersion { package = zellij; };
|
||||
|
||||
meta = with lib; {
|
||||
description = "A terminal workspace with batteries included";
|
||||
homepage = "https://zellij.dev/";
|
||||
changelog = "https://github.com/zellij-org/zellij/blob/v${version}/Changelog.md";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ therealansh _0x4A6F ];
|
||||
};
|
||||
|
||||
@ -11,6 +11,12 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "sha256-ldGYVvAE2rxLjDQrJhLo0KnuvdUgBClxiDafFS6dxt8=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# fix build failure against ncurses-6.3 (pending upstream inclusion):
|
||||
# https://sourceforge.net/p/gptfdisk/mailman/message/37392412/
|
||||
./ncurses-6.3.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs gdisk_test.sh
|
||||
'' + lib.optionalString stdenv.isDarwin ''
|
||||
|
||||
96
pkgs/tools/system/gptfdisk/ncurses-6.3.patch
Normal file
96
pkgs/tools/system/gptfdisk/ncurses-6.3.patch
Normal file
@ -0,0 +1,96 @@
|
||||
From 9d5032d1487a8fe6ef7229d413418a27e32a28e5 Mon Sep 17 00:00:00 2001
|
||||
From: Sergei Trofimovich <slyich@gmail.com>
|
||||
Date: Mon, 1 Nov 2021 07:51:10 +0000
|
||||
Subject: [PATCH:gptfdisk] gptcurses.cc: always use "%s"-style format for printf()-style
|
||||
functions
|
||||
|
||||
`ncuses-6.3` added printf-style function attributes and now makes
|
||||
it easier to catch cases when user input is used in palce of format
|
||||
string when built with CFLAGS=-Werror=format-security:
|
||||
|
||||
gptcurses.cc:274:10: error:
|
||||
format not a string literal and no format arguments [-Werror=format-security]
|
||||
274 | printw(theLine.c_str());
|
||||
| ~~~~~~^~~~~~~~~~~~~~~~~
|
||||
|
||||
Let's wrap all the missing places with "%s" format.
|
||||
---
|
||||
gptcurses.cc | 24 ++++++++++++------------
|
||||
1 file changed, 12 insertions(+), 12 deletions(-)
|
||||
|
||||
--- a/gptcurses.cc
|
||||
+++ b/gptcurses.cc
|
||||
@@ -239,22 +239,22 @@ Space* GPTDataCurses::ShowSpace(int spaceNum, int lineNum) {
|
||||
ClearLine(lineNum);
|
||||
if (space->partNum == -1) { // space is empty
|
||||
move(lineNum, 12);
|
||||
- printw(BytesToIeee((space->lastLBA - space->firstLBA + 1), blockSize).c_str());
|
||||
+ printw("%s", BytesToIeee((space->lastLBA - space->firstLBA + 1), blockSize).c_str());
|
||||
move(lineNum, 24);
|
||||
printw("free space");
|
||||
} else { // space holds a partition
|
||||
move(lineNum, 3);
|
||||
printw("%d", space->partNum + 1);
|
||||
move(lineNum, 12);
|
||||
- printw(BytesToIeee((space->lastLBA - space->firstLBA + 1), blockSize).c_str());
|
||||
+ printw("%s", BytesToIeee((space->lastLBA - space->firstLBA + 1), blockSize).c_str());
|
||||
move(lineNum, 24);
|
||||
- printw(space->origPart->GetTypeName().c_str());
|
||||
+ printw("%s", space->origPart->GetTypeName().c_str());
|
||||
move(lineNum, 50);
|
||||
#ifdef USE_UTF16
|
||||
space->origPart->GetDescription().extract(0, 39, temp, 39);
|
||||
- printw(temp);
|
||||
+ printw("%s", temp);
|
||||
#else
|
||||
- printw(space->origPart->GetDescription().c_str());
|
||||
+ printw("%s", space->origPart->GetDescription().c_str());
|
||||
#endif
|
||||
} // if/else
|
||||
} // if
|
||||
@@ -271,10 +271,10 @@ int GPTDataCurses::DisplayParts(int selected) {
|
||||
|
||||
move(lineNum++, 0);
|
||||
theLine = "Part. # Size Partition Type Partition Name";
|
||||
- printw(theLine.c_str());
|
||||
+ printw("%s", theLine.c_str());
|
||||
move(lineNum++, 0);
|
||||
theLine = "----------------------------------------------------------------";
|
||||
- printw(theLine.c_str());
|
||||
+ printw("%s", theLine.c_str());
|
||||
numToShow = LINES - RESERVED_TOP - RESERVED_BOTTOM;
|
||||
pageNum = selected / numToShow;
|
||||
for (i = pageNum * numToShow; i <= (pageNum + 1) * numToShow - 1; i++) {
|
||||
@@ -636,7 +636,7 @@ void GPTDataCurses::DisplayOptions(char selectedKey) {
|
||||
} // if/else
|
||||
} // for
|
||||
move(LINES - 1, (COLS - optionDesc.length()) / 2);
|
||||
- printw(optionDesc.c_str());
|
||||
+ printw("%s", optionDesc.c_str());
|
||||
currentKey = selectedKey;
|
||||
} // if
|
||||
} // GPTDataCurses::DisplayOptions()
|
||||
@@ -748,11 +748,11 @@ void GPTDataCurses::DrawMenu(void) {
|
||||
|
||||
clear();
|
||||
move(0, (COLS - title.length()) / 2);
|
||||
- printw(title.c_str());
|
||||
+ printw("%s", title.c_str());
|
||||
move(2, (COLS - drive.length()) / 2);
|
||||
- printw(drive.c_str());
|
||||
+ printw("%s", drive.c_str());
|
||||
move(3, (COLS - size.str().length()) / 2);
|
||||
- printw(size.str().c_str());
|
||||
+ printw("%s", size.str().c_str());
|
||||
DisplayParts(currentSpaceNum);
|
||||
} // DrawMenu
|
||||
|
||||
@@ -802,7 +802,7 @@ void PromptToContinue(void) {
|
||||
void Report(string theText) {
|
||||
clear();
|
||||
move(0, 0);
|
||||
- printw(theText.c_str());
|
||||
+ printw("%s", theText.c_str());
|
||||
move(LINES - 2, (COLS - 29) / 2);
|
||||
printw("Press any key to continue....");
|
||||
cbreak();
|
||||
@ -11,10 +11,10 @@
|
||||
}:
|
||||
|
||||
let
|
||||
sha256 = "1hhbwyhw6nmzb2a88papfca5rjavav6srcnvmbni5l6ln79pgqj7";
|
||||
sha256 = "1kvlf9qcl0i7g24s9f2pj25msmlj0cjicjwrnnc65q8qkmk2br9q";
|
||||
# specVersion taken from: https://www.linode.com/docs/api/openapi.yaml at `info.version`.
|
||||
specVersion = "4.107.0";
|
||||
specSha256 = "1z260w0517k3sgd2ygzwzkhq5w9rbkls69mnl84501fpd2nx7qvi";
|
||||
specVersion = "4.108.0";
|
||||
specSha256 = "17n9wjd0hpkzc2bvsawdvl8hc5285r0n19xq59h4amqb2fhp676w";
|
||||
spec = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/linode/linode-api-docs/v${specVersion}/openapi.yaml";
|
||||
sha256 = specSha256;
|
||||
@ -24,7 +24,7 @@ in
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "linode-cli";
|
||||
version = "5.11.1";
|
||||
version = "5.12.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linode";
|
||||
|
||||
@ -3242,6 +3242,8 @@ with pkgs;
|
||||
|
||||
libxnd = callPackage ../development/libraries/libxnd { };
|
||||
|
||||
lifeograph = callPackage ../applications/editors/lifeograph { };
|
||||
|
||||
link-grammar = callPackage ../tools/text/link-grammar { };
|
||||
|
||||
linuxptp = callPackage ../os-specific/linux/linuxptp { };
|
||||
@ -21709,6 +21711,8 @@ with pkgs;
|
||||
|
||||
webdav = callPackage ../servers/webdav { };
|
||||
|
||||
webdav-server-rs = callPackage ../servers/webdav-server-rs { };
|
||||
|
||||
webmetro = callPackage ../servers/webmetro { };
|
||||
|
||||
wsdd = callPackage ../servers/wsdd { };
|
||||
@ -23995,6 +23999,8 @@ with pkgs;
|
||||
|
||||
alembic = callPackage ../development/libraries/alembic {};
|
||||
|
||||
alfaview = callPackage ../applications/networking/instant-messengers/alfaview { };
|
||||
|
||||
alchemy = callPackage ../applications/graphics/alchemy { };
|
||||
|
||||
alock = callPackage ../misc/screensavers/alock { };
|
||||
|
||||
@ -36,6 +36,7 @@ pkgs.runCommand "nixpkgs-release-checks" { src = nixpkgs; buildInputs = [nix]; }
|
||||
nix-env -f $src \
|
||||
--show-trace --argstr system "$platform" \
|
||||
--arg config '{ allowAliases = false; }' \
|
||||
--option experimental-features 'no-url-literals' \
|
||||
-qa --drv-path --system-filter \* --system \
|
||||
"''${opts[@]}" 2>&1 >/dev/null | tee eval-warnings.log
|
||||
|
||||
@ -48,6 +49,7 @@ pkgs.runCommand "nixpkgs-release-checks" { src = nixpkgs; buildInputs = [nix]; }
|
||||
nix-env -f $src \
|
||||
--show-trace --argstr system "$platform" \
|
||||
--arg config '{ allowAliases = false; }' \
|
||||
--option experimental-features 'no-url-literals' \
|
||||
-qa --drv-path --system-filter \* --system --meta --xml \
|
||||
"''${opts[@]}" > /dev/null
|
||||
done
|
||||
|
||||
Loading…
Reference in New Issue
Block a user