Merge master into staging-next

This commit is contained in:
github-actions[bot] 2022-08-14 00:02:38 +00:00 committed by GitHub
commit 2bc73e4c94
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
58 changed files with 415 additions and 213 deletions

View File

@ -8166,6 +8166,15 @@
githubId = 427866;
name = "Matthias Beyer";
};
MatthieuBarthel = {
email = "matthieu@imatt.ch";
name = "Matthieu Barthel";
github = "MatthieuBarthel";
githubId = 435534;
keys = [{
fingerprint = "80EB 0F2B 484A BB80 7BEF 4145 BA23 F10E AADC 2E26";
}];
};
matthuszagh = {
email = "huszaghmatt@gmail.com";
github = "matthuszagh";

View File

@ -354,6 +354,7 @@ in
webdav = 322;
pipewire = 323;
rstudio-server = 324;
localtimed = 325;
# When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399!
@ -662,6 +663,7 @@ in
webdav = 322;
pipewire = 323;
rstudio-server = 324;
localtimed = 325;
# When adding a gid, make sure it doesn't match an existing
# uid. Users and groups with the same name should have equal

View File

@ -1023,7 +1023,7 @@
./services/system/cloud-init.nix
./services/system/dbus.nix
./services/system/earlyoom.nix
./services/system/localtime.nix
./services/system/localtimed.nix
./services/system/kerberos/default.nix
./services/system/nscd.nix
./services/system/saslauthd.nix

View File

@ -1,37 +0,0 @@
{ config, lib, pkgs, ... }:
with lib;
let
cfg = config.services.localtimed;
in {
imports = [ (lib.mkRenamedOptionModule [ "services" "localtime" ] [ "services" "localtimed" ]) ];
options = {
services.localtimed = {
enable = mkOption {
type = types.bool;
default = false;
description = lib.mdDoc ''
Enable `localtimed`, a simple daemon for keeping the
system timezone up-to-date based on the current location. It uses
geoclue2 to determine the current location.
'';
};
};
};
config = mkIf cfg.enable {
services.geoclue2.appConfig.localtimed = {
isAllowed = true;
isSystem = true;
};
# Install the polkit rules.
environment.systemPackages = [ pkgs.localtime ];
# Install the systemd unit.
systemd.packages = [ pkgs.localtime ];
systemd.services.localtime.wantedBy = [ "multi-user.target" ];
};
}

View File

@ -0,0 +1,66 @@
{ config, lib, pkgs, ... }:
with lib;
let
cfg = config.services.localtimed;
in {
imports = [ (lib.mkRenamedOptionModule [ "services" "localtime" ] [ "services" "localtimed" ]) ];
options = {
services.localtimed = {
enable = mkOption {
type = types.bool;
default = false;
description = lib.mdDoc ''
Enable `localtimed`, a simple daemon for keeping the
system timezone up-to-date based on the current location. It uses
geoclue2 to determine the current location.
'';
};
};
};
config = mkIf cfg.enable {
services.geoclue2.appConfig.localtimed = {
isAllowed = true;
isSystem = true;
users = [ (toString config.ids.uids.localtimed) ];
};
# Install the polkit rules.
environment.systemPackages = [ pkgs.localtime ];
systemd.services.localtimed = {
wantedBy = [ "multi-user.target" ];
partOf = [ "localtimed-geoclue-agent.service" ];
after = [ "localtimed-geoclue-agent.service" ];
serviceConfig = {
ExecStart = "${pkgs.localtime}/bin/localtimed";
Restart = "on-failure";
Type = "exec";
User = "localtimed";
};
};
systemd.services.localtimed-geoclue-agent = {
wantedBy = [ "multi-user.target" ];
partOf = [ "geoclue.service" ];
after = [ "geoclue.service" ];
serviceConfig = {
ExecStart = "${pkgs.geoclue2-with-demo-agent}/libexec/geoclue-2.0/demos/agent";
Restart = "on-failure";
Type = "exec";
User = "localtimed";
};
};
users = {
users.localtimed = {
uid = config.ids.uids.localtimed;
group = "localtimed";
};
groups.localtimed.gid = config.ids.gids.localtimed;
};
};
}

View File

@ -18,13 +18,13 @@ let
in
mkDerivation rec {
pname = "mt32emu-qt";
version = "1.10.2";
version = "1.11.1";
src = fetchFromGitHub {
owner = "munt";
repo = "munt";
rev = "${char2underscore "-" pname}_${char2underscore "." version}";
sha256 = "1dh5xpnsgx367ch45mm5c2p26vnxf3shax2afg2cd2lrbrlii7l9";
sha256 = "sha256-PqYPYnKPlnU3PByxksBscl4GqDRllQdmD6RWpy/Ura0=";
};
postPatch = ''

View File

@ -12,13 +12,13 @@ let
in
stdenv.mkDerivation rec {
pname = "mt32emu-smf2wav";
version = "1.8.2";
version = "1.9.0";
src = fetchFromGitHub {
owner = "munt";
repo = "munt";
rev = "${char2underscore "-" pname}_${char2underscore "." version}";
sha256 = "1dh5xpnsgx367ch45mm5c2p26vnxf3shax2afg2cd2lrbrlii7l9";
sha256 = "sha256-XGds9lDfSiY0D8RhYG4TGyjYEVvVYuAfNSv9+VxiJEs=";
};
postPatch = ''

View File

@ -80,5 +80,6 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/xou816/spot";
license = licenses.mit;
maintainers = with maintainers; [ jtojnar tomfitzhenry ];
platforms = platforms.linux;
};
}

View File

@ -0,0 +1,70 @@
{ buildGoModule
, copyDesktopItems
, fetchFromGitLab
, lib
, libGL
, libX11
, libXcursor
, libXext
, libXi
, libXinerama
, libXrandr
, makeDesktopItem
, mesa
, pkg-config
}:
buildGoModule rec {
pname = "clipqr";
version = "1.0.0";
src = fetchFromGitLab {
owner = "imatt-foss";
repo = "clipqr";
rev = "v${version}";
sha256 = "sha256-E90nTJtx4GOacu8M7oQBznnSQVDIZatibgKMZEpTUaQ=";
};
vendorSha256 = "5kAOSyVbvot4TX/XfRNe1/zZk6fa7pS1Dvn9nz11u3U=";
ldflags = [ "-s" "-w" ];
buildInputs = [
libGL
libX11
libXcursor
libXext
libXi
libXinerama
libXrandr
mesa
];
nativeBuildInputs = [
copyDesktopItems
pkg-config
];
postInstall = ''
install -Dm644 icon.svg $out/share/icons/hicolor/scalable/apps/clipqr.svg
'';
desktopItems = [
(makeDesktopItem {
name = "ClipQR";
desktopName = "ClipQR";
exec = "clipqr";
categories = [ "Utility" ];
icon = "clipqr";
comment = "Scan QR codes on screen and from camera";
genericName = "ClipQR";
})
];
meta = with lib; {
description = "Scan QR codes on screen and from camera, the result is in your clipboard";
license = licenses.mit;
maintainers = with maintainers; [ MatthieuBarthel ];
homepage = "https://gitlab.com/imatt-foss/clipqr";
};
}

View File

@ -23,16 +23,16 @@
inherit maven; # use overridden maven version (see dbeaver's entry in all-packages.nix)
}) rec {
pname = "dbeaver";
version = "22.1.3"; # When updating also update mvnSha256
version = "22.1.4"; # When updating also update mvnSha256
src = fetchFromGitHub {
owner = "dbeaver";
repo = "dbeaver";
rev = version;
sha256 = "sha256-QrocrH/orgXvg0vNelm1hK4dHeDsxe3ZaVb3Q2FgYSo=";
sha256 = "sha256-5s2SFquB0i5X2deBO0FStudReB4wGhQkhR39PHPBEAM=";
};
mvnSha256 = "U+RqrXtwFrku4b5d47WrFLmrlfqBs8YVif/qGf5CXqQ=";
mvnSha256 = "YIeKSL5scU8NxEIf+jK1g9cdFDOBVh14ruKMqUuz1Ts=";
mvnParameters = "-P desktop,all-platforms";
nativeBuildInputs = [

View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "gpxsee";
version = "11.1";
version = "11.3";
src = fetchFromGitHub {
owner = "tumic0";
repo = "GPXSee";
rev = version;
sha256 = "sha256-0n1XPrJ+gssIP/7k9CI8AWXs9ddKOg3Lo3DfrXGUl84=";
sha256 = "sha256-n8busir6IYyWyGOv9AzYjm8erR0fjMAduIzITH+EvVI=";
};
patches = (substituteAll {

View File

@ -34,6 +34,7 @@ python3.pkgs.buildPythonApplication rec {
desktop-file-utils
glib
gtk3
gobject-introspection
meson
ninja
pkg-config
@ -41,7 +42,6 @@ python3.pkgs.buildPythonApplication rec {
];
buildInputs = [
gobject-introspection
gtk3
libhandy
librsvg

View File

@ -1,11 +1,11 @@
{
"packageVersion": "103.0-3",
"packageVersion": "103.0.2-1",
"source": {
"rev": "103.0-3",
"sha256": "1d8qh0s5zjh10cyyawpvr7ywygg1ibh1r0rx0vnqv1qakj3y4jcq"
"rev": "103.0.2-1",
"sha256": "0cfhrxnvxlidipg0cpz0gapya8pvfqcmjkyqns4xz1jq5lkm1xg3"
},
"firefox": {
"version": "103.0",
"sha512": "016c2f276fb94e5174626f7d8b1a821b2de0f5a07f8a10f00a7ea4d4285591b0c23dd3ef45306579de79b3dfa99ccc527224c33f3319f61cf088b1f4bd097f9e"
"version": "103.0.2",
"sha512": "f13984bb551039c80ef731931f08a284f070142ecb479b31a4caad026a6b535e3fc7ae506b629e933ba5f5a1676f14b6b36d031d22584170492676f8727c822a"
}
}

View File

@ -1,4 +1,4 @@
{ lib, buildGoModule, fetchFromGitHub, fetchzip, installShellFiles }:
{ lib, buildGoModule, fetchFromGitHub, fetchzip, installShellFiles, stdenv }:
let
version = "0.32.0";
@ -46,7 +46,7 @@ in buildGoModule rec {
$out/bin/flux --version | grep ${version} > /dev/null
'';
postInstall = ''
postInstall = lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) ''
for shell in bash fish zsh; do
$out/bin/flux completion $shell > flux.$shell
installShellCompletion flux.$shell

View File

@ -16,15 +16,15 @@
buildGoModule rec {
inherit pname ;
version = "1.5.0";
version = "1.7.1";
tags = lib.optionals enableGateway ["gateway"];
vendorSha256 = "sha256-ND1OTa37bxUNLDHceKdgiGE4LkEgBu9NmwuXtE4pZWk=";
vendorSha256 = "sha256-0YmWmGuzyES7BoHKWxzF2K1rDW7PO2DRdNmY3eJkUAM=";
src = fetchFromGitHub {
owner = "kumahq";
repo = "kuma";
rev = version;
sha256 = "sha256-CnL+OQfM1lamdCRHTLRmgpwfEfC7C9TX6UEF75bsOsQ=";
sha256 = "sha256-U8fWDXJ0ztod6r0qz63jbgYA06ItxA76BjSliniYnIQ=";
};
doCheck = false;

View File

@ -5,14 +5,14 @@
python3Packages.buildPythonApplication rec {
pname = "flexget";
version = "3.3.22";
version = "3.3.24";
# Fetch from GitHub in order to use `requirements.in`
src = fetchFromGitHub {
owner = "flexget";
repo = "flexget";
rev = "refs/tags/v${version}";
hash = "sha256-VDMcOiuEOTzyogkdpVogikrme2Q6drpb40PqDgDtr7Q=";
hash = "sha256-AjYX9f7v6lxMO6vTjAanDMluvGDAvTwcvcq/fwMzSfk=";
};
postPatch = ''

View File

@ -7,7 +7,7 @@ let
# Please keep the version x.y.0.z and do not update to x.y.76.z because the
# source of the latter disappears much faster.
version = "8.86.0.407";
version = "8.87.0.403";
rpath = lib.makeLibraryPath [
alsa-lib
@ -68,7 +68,7 @@ let
"https://mirror.cs.uchicago.edu/skype/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb"
"https://web.archive.org/web/https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb"
];
sha256 = "sha256-46M0JYP5QBCTCRqLtNyrQsEc6PsK6WRssb55IkG6pu0=";
sha256 = "sha256-ibugr15eRQ2gbvX8wmk2lFioLPST9ljAuWcJHCoi9l8=";
}
else
throw "Skype for linux is not supported on ${stdenv.hostPlatform.system}";

View File

@ -1,4 +1,11 @@
{ fetchFromGitHub, libcommuni, qtbase, qmake, lib, stdenv, wrapQtAppsHook }:
{ stdenv
, lib
, fetchFromGitHub
, libcommuni
, qmake
, qtbase
, wrapQtAppsHook
}:
stdenv.mkDerivation rec {
pname = "communi";
@ -15,12 +22,20 @@ stdenv.mkDerivation rec {
fetchSubmodules = true;
};
nativeBuildInputs = [ qmake ]
++ lib.optional stdenv.isDarwin wrapQtAppsHook;
nativeBuildInputs = [
qmake
wrapQtAppsHook
];
buildInputs = [ libcommuni qtbase ];
buildInputs = [
libcommuni
qtbase
];
dontWrapQtApps = true;
# libCommuni.dylib is installed in $out/Applications/Communi.app/Contents/Frameworks/ on Darwin
# Wrapper hook thinks it's a binary because it's in $out/Applications, wraps it with a shell script
# So we manually call the wrapper script on just the binary
dontWrapQtApps = stdenv.isDarwin;
preConfigure = ''
export QMAKEFEATURES=${libcommuni}/features
@ -32,20 +47,22 @@ stdenv.mkDerivation rec {
"COMMUNI_INSTALL_ICONS=${placeholder "out"}/share/icons/hicolor"
"COMMUNI_INSTALL_DESKTOP=${placeholder "out"}/share/applications"
"COMMUNI_INSTALL_THEMES=${placeholder "out"}/share/communi/themes"
(if stdenv.isDarwin
then [ "COMMUNI_INSTALL_BINS=${placeholder "out"}/Applications" ]
else [ "COMMUNI_INSTALL_BINS=${placeholder "out"}/bin" ])
"COMMUNI_INSTALL_BINS=${placeholder "out"}/${if stdenv.isDarwin then "Applications" else "bin"}"
];
postInstall = if stdenv.isDarwin then ''
# Nix qmake does not add the bundle rpath by default.
install_name_tool \
-add_rpath @executable_path/../Frameworks \
$out/Applications/Communi.app/Contents/MacOS/Communi
'' else ''
substituteInPlace "$out/share/applications/communi.desktop" \
--replace "/usr/bin" "$out/bin"
'';
postInstall =
if stdenv.isDarwin then ''
# Nix qmake does not add the bundle rpath by default.
install_name_tool \
-add_rpath @executable_path/../Frameworks \
$out/Applications/Communi.app/Contents/MacOS/Communi
# Do not remove until wrapQtAppsHook doesn't wrap dylibs in app bundles anymore
wrapQtApp $out/Applications/Communi.app/Contents/MacOS/Communi
'' else ''
substituteInPlace "$out/share/applications/communi.desktop" \
--replace "/usr/bin" "$out/bin"
'';
preFixup = ''
rm -rf lib
@ -56,6 +73,6 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/communi/communi-desktop";
license = licenses.bsd3;
maintainers = with maintainers; [ hrdinka ];
platforms = platforms.linux;
platforms = platforms.all;
};
}

View File

@ -5,14 +5,14 @@
stdenv.mkDerivation rec {
pname = "waypipe";
version = "0.8.2";
version = "0.8.3";
src = fetchFromGitLab {
domain = "gitlab.freedesktop.org";
owner = "mstoeckl";
repo = "waypipe";
rev = "v${version}";
sha256 = "02q8l1qaahmd41h6v3r46akh7xlqz7fpwwsy15qww4jdvypg6vg4";
sha256 = "sha256-f1XEcDMy4skddtbZFFhCF4xg6zQahOLiGcYiJPy2SHs=";
};
strictDeps = true;

View File

@ -14,13 +14,13 @@
stdenv.mkDerivation rec {
pname = "nvc";
version = "1.6.2";
version = "1.7.0";
src = fetchFromGitHub {
owner = "nickg";
repo = pname;
rev = "r${version}";
sha256 = "sha256-BtUMpT1MKRFGRlIbCEGo4OBZ/r9es1VRmJdgmk1oZFQ=";
sha256 = "sha256-U9VxpHzrAQPMqnSs0YcEnc9dlQUutTuZCJP5F1v7eaA=";
};
nativeBuildInputs = [
@ -38,9 +38,9 @@ stdenv.mkDerivation rec {
(if stdenv.isLinux then elfutils else libelf)
];
# TODO: remove me on 1.7.0
postPatch = ''
sed -i "/vests22/d;/vhpi4/d" test/regress/testlist.txt
# TODO: recheck me on next release
postPatch = lib.optionalString stdenv.isLinux ''
sed -i "/vhpi4/d" test/regress/testlist.txt
'';
preConfigure = ''

View File

@ -5,14 +5,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "snakemake";
version = "7.12.0";
version = "7.12.1";
format = "setuptools";
src = fetchFromGitHub {
owner = "snakemake";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-URywo88EcQBYorwnKqgGOzunf2JunEWa36adhA1wha0=";
hash = "sha256-QfSk6K/Vpj3+k+5w0thiP9O4CTvL8JDRwj4lDSt2NnU=";
};
propagatedBuildInputs = with python3.pkgs; [

View File

@ -0,0 +1,66 @@
{ lib
, stdenv
, fetchFromGitHub
, rustPlatform
, pkg-config
, cmake
, installShellFiles
, asciidoctor
, DarwinTools
, openssl
, libusb1
, AppKit
, openssh
}:
rustPlatform.buildRustPackage rec {
pname = "radicle-cli";
version = "0.6.1";
src = fetchFromGitHub {
owner = "radicle-dev";
repo = pname;
rev = "v${version}";
sha256 = "sha256-LS6zYpMg0LanRL2M8ioGG8Ys07TPT/3hP7geEGehwxg=";
};
cargoSha256 = "sha256-o7ahnV7NnvzKxXb7HdNqKcxekshOtKanYKb0Sy15mhs=";
nativeBuildInputs = [
pkg-config
cmake
installShellFiles
asciidoctor
] ++ lib.optionals stdenv.hostPlatform.isDarwin [
DarwinTools
];
buildInputs = [
openssl
] ++ lib.optionals stdenv.hostPlatform.isDarwin [
libusb1
AppKit
];
postInstall = ''
for f in $(find . -name '*.adoc'); do
mf=''${f%.*}
asciidoctor --doctype manpage --backend manpage $f -o $mf
installManPage $mf
done
'';
checkInputs = [ openssh ];
preCheck = ''
eval $(ssh-agent)
'';
meta = {
description = "Command-line tooling for Radicle, a decentralized code collaboration network";
homepage = "https://radicle.xyz";
license = lib.licenses.gpl3;
maintainers = with lib.maintainers; [ amesgen ];
platforms = lib.platforms.unix;
mainProgram = "rad";
};
}

View File

@ -1,7 +1,7 @@
{ fetchurl, lib, stdenv }:
let
version = "1.0.0";
version = "1.1.1";
suffix = {
x86_64-linux = "x86_64";
@ -22,8 +22,8 @@ stdenv.mkDerivation {
sourceRoot = ".";
src = dlbin {
x86_64-linux = "sha256-yeWVsrvH3yYlS2uH/TkSleHjXvIDnHWcZSvLgV+CGF0=";
aarch64-linux = "sha256-9ggRmijwXE9adVFv5XommgvdpeeWnWUFES+Ep2GrBVo=";
x86_64-linux = "sha256-KRlOE4iDWMYzKZUZnuKIwIGooj5o8ARpROS7f2VIr1c=";
aarch64-linux = "sha256-AqVFqUbMtjPmOsSgAaJ2AFNc0McC708fAD36qLz0VAc=";
};
dontConfigure = true;

View File

@ -4,16 +4,16 @@ buildGoModule rec {
pname = "firectl";
# The latest upstream 0.1.0 is incompatible with firecracker
# v0.1.0. See issue: https://github.com/firecracker-microvm/firectl/issues/82
version = "unstable-2022-03-01";
version = "unstable-2022-07-12";
src = fetchFromGitHub {
owner = "firecracker-microvm";
repo = pname;
rev = "9f1b639a446e8d75f31787a00b9f273c1e68f12c";
sha256 = "TjzzHY9VYPpWoPt6nHYUerKX94O03sm524wGM9lGzno=";
rev = "ec72798240c0561dea8341d828e8c72bb0cc36c5";
sha256 = "sha256-RAl1DaeMR7eYYwqVAvm6nib5gEGaM/t7TR8u1IpqOIM=";
};
vendorSha256 = "3SVEvvGNx6ienyJZg0EOofHNHCPSpJUGXwHxokdRG1c=";
vendorSha256 = "sha256-dXAJOifRtzcTyGzUTFu9+daGAlL/5dQSwcjerkZDuKA=";
doCheck = false;

View File

@ -85,9 +85,8 @@ let
in
stdenvNoCC.mkDerivation rec {
pname = "open-watcom-bin";
pname = "${passthru.prettyName}-unwrapped";
version = "1.9";
name = "${pname}-unwrapped-${version}";
src = fetchurl {
url = "http://ftp.openwatcom.org/install/open-watcom-c-linux-${version}";
@ -113,8 +112,11 @@ stdenvNoCC.mkDerivation rec {
done
'';
passthru.prettyName = "open-watcom-bin";
meta = with lib; {
description = "A C/C++ Compiler (binary distribution)";
description = "A project to maintain and enhance the Watcom C, C++, and Fortran cross compilers and tools";
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
homepage = "http://www.openwatcom.org/";
license = licenses.watcom;
platforms = [ "x86_64-linux" "i686-linux" ];

View File

@ -11,15 +11,14 @@
}:
stdenv.mkDerivation rec {
pname = "open-watcom-v2";
version = "unstable-2022-05-04";
name = "${pname}-unwrapped-${version}";
pname = "${passthru.prettyName}-unwrapped";
version = "unstable-2022-08-02";
src = fetchFromGitHub {
owner = "open-watcom";
repo = "open-watcom-v2";
rev = "01662ab4eb50c0757969fa53bd4270dbbba45dc5";
sha256 = "Nl5mcPDCr08XkVMWqkbbgTP/YjpfwMOo2GVu43FQQ3Y=";
rev = "4bdb73995b871982dd106838296903701ded29c2";
sha256 = "sha256-Ay/f+gnj8EklN8T/uP0a+Zji6HEHAoPLdkrSTQaC9Rs=";
};
postPatch = ''
@ -82,8 +81,11 @@ stdenv.mkDerivation rec {
# Stripping breaks many tools
dontStrip = true;
passthru.updateScript = unstableGitUpdater {
url = "https://github.com/open-watcom/open-watcom-v2.git";
passthru = {
prettyName = "open-watcom-v2";
updateScript = unstableGitUpdater {
url = "https://github.com/open-watcom/open-watcom-v2.git";
};
};
meta = with lib; {

View File

@ -29,7 +29,7 @@ let
++ lib.optional isWindows "h/nt"
++ lib.optional isLinux "lh";
listToDirs = list: lib.strings.concatMapStringsSep ":" (dir: "${placeholder "out"}/${dir}") list;
name = "${open-watcom.pname}-${open-watcom.version}";
name = "${open-watcom.passthru.prettyName}-${open-watcom.version}";
in
symlinkJoin {
inherit name;

View File

@ -11,13 +11,13 @@
stdenv.mkDerivation rec {
pname = "libzim";
version = "7.2.2";
version = "8.0.0";
src = fetchFromGitHub {
owner = "openzim";
repo = pname;
rev = version;
sha256 = "sha256-AEhhjinnnMA4NbYL7NVHYeRZX/zfNiidbY/VeFjZuQs=";
sha256 = "sha256-FSotc2hkWvkYEdZ3HI3JLzjtKFaWOc1Bx6r0WyeS/Kg=";
};
nativeBuildInputs = [

View File

@ -7,7 +7,7 @@
stdenv.mkDerivation rec {
pname = "ortp";
version = "5.1.12";
version = "5.1.55";
src = fetchFromGitLab {
domain = "gitlab.linphone.org";
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
group = "BC";
repo = pname;
rev = version;
sha256 = "sha256-CD9xn1m6zpUEC+shmNeWfGAJxNto87UbznD+TLdeuEg=";
sha256 = "sha256-FsPbpKkC1qhsZ4QBRzyV64H+lo/802qlaggDGCgbPlw=";
};
# Do not build static libraries

View File

@ -3,8 +3,8 @@
buildPecl {
pname = "protobuf";
version = "3.21.4";
sha256 = "sha256-vhfoUu63KhndfQTiITtTnaqFVF9OWMCaLf/9PUioKkQ=";
version = "3.21.5";
sha256 = "sha256-B8ytFyUJ8fLBwHmaKXxfOy0h6tRELjqc5IxUUl/YU5w=";
buildInputs = [ pcre2 ];

View File

@ -8,14 +8,14 @@
buildPythonPackage rec {
pname = "aiotractive";
version = "0.5.4";
version = "0.5.5";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "zhulik";
repo = pname;
rev = "v${version}";
sha256 = "sha256-pcGUl8mq1O1QY5EPkNhWRLCKDn2FWAF9XymXkUXWEUk=";
sha256 = "sha256-VCwIAeSAN4tMwB8TXN/ukrws0qYv/jHHeEu++m56AHA=";
};
propagatedBuildInputs = [

View File

@ -5,11 +5,11 @@
buildPythonPackage rec {
pname = "audioread";
version = "2.1.9";
version = "3.0.0";
src = fetchPypi {
inherit pname version;
sha256 = "a3480e42056c8e80a8192a54f6729a280ef66d27782ee11cbd63e9d4d1523089";
sha256 = "sha256-EhmVvSB+sf2j1Wa+uFHTU0J1klvDWk+22gyxHeD3JRo=";
};
# No tests, need to disable or py3k breaks

View File

@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "awscrt";
version = "0.13.14";
version = "0.14.0";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
hash = "sha256-K2x0Up3H6kIWcYeWvVegd1CkTjq8RoM0AOm0SX5u6wQ=";
hash = "sha256-MGLTFcsWVC/gTdgjny6LwyOO6QRc1QcLkVzy677Lqqw=";
};
buildInputs = lib.optionals stdenv.isDarwin [

View File

@ -6,13 +6,13 @@
buildPythonPackage rec {
pname = "azure-keyvault-administration";
version = "4.1.0";
version = "4.1.1";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "sha256-V8tppRExyvSt41nN+j2QoxGSund6RKvE4g5p6AWZ3qI=";
sha256 = "sha256-m5dkKUZoPkpUzSW1K39+wpIfWHc2oRyxMetOf/Ybzuc=";
};
propagatedBuildInputs = [

View File

@ -26,7 +26,7 @@
buildPythonPackage rec {
pname = "exchangelib";
version = "4.7.3";
version = "4.7.6";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -35,7 +35,7 @@ buildPythonPackage rec {
owner = "ecederstrand";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-79113cUVl07oeXjlDaqfdfwNZvD7EWJK8JKHsPnBRG8=";
hash = "sha256-Oarmdc2PuE4kQ/qUqQhuzdTpIrrMFCK72CrVmoSH1DI=";
};
propagatedBuildInputs = [

View File

@ -2,6 +2,7 @@
, glibcLocales
, buildPythonPackage
, fetchPypi
, setuptools
, six
, appdirs
, scandir ? null
@ -32,7 +33,7 @@ buildPythonPackage rec {
# strong cycle with paramaterized
doCheck = false;
checkInputs = [ pyftpdlib mock psutil pytestCheckHook ];
propagatedBuildInputs = [ six appdirs pytz ]
propagatedBuildInputs = [ six appdirs pytz setuptools ]
++ lib.optionals (!isPy3k) [ backports_os ]
++ lib.optionals (!pythonAtLeast "3.6") [ typing ]
++ lib.optionals (!pythonAtLeast "3.5") [ scandir ]

View File

@ -9,13 +9,13 @@
buildPythonPackage rec {
pname = "hpccm";
version = "22.5.0";
version = "22.8.0";
src = fetchFromGitHub {
owner = "NVIDIA";
repo = "hpc-container-maker";
rev = "v${version}";
sha256 = "sha256-zR5+X9BKaUvLPQ05FnfU817esgxVqP8n+wfdWy20BN4=";
sha256 = "sha256-nq1zixIu/Kv2CtkQX1Sw7Q3BsOZKcCJjV0+uroXPEBs=";
};
propagatedBuildInputs = [ six archspec ];

View File

@ -1,4 +1,5 @@
{ lib
, stdenv
, buildPythonPackage
, fetchFromGitHub
, fetchurl
@ -59,7 +60,7 @@ buildPythonPackage {
patches = [
(substituteAll {
src = ./libpq.patch;
libpq = "${postgresql.lib}/lib/libpq.so";
libpq = "${postgresql.lib}/lib/libpq${stdenv.hostPlatform.extensions.sharedLibrary}";
})
];

View File

@ -1,4 +1,4 @@
{ lib, fetchurl, pkg-config, buildPythonPackage, isPy3k, at-spi2-core, pygobject3, gnome }:
{ lib, fetchurl, pkg-config, buildPythonPackage, isPy3k, at-spi2-core, pygobject3, gnome, python }:
buildPythonPackage rec {
pname = "pyatspi";
@ -17,6 +17,16 @@ buildPythonPackage rec {
pygobject3
];
configureFlags = [
"PYTHON=${python.pythonForBuild.interpreter}"
];
postPatch = ''
# useless python existence check for us
substituteInPlace configure \
--replace '&& ! which' '&& false'
'';
disabled = !isPy3k;
passthru = {

View File

@ -10,11 +10,11 @@
buildPythonPackage rec {
pname = "PyPDF2";
version = "2.9.0";
version = "2.10.0";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-bPGMp9D3fhMG1I/NClc5BhbsZUV5a16zJaIJQ6VQHRg=";
sha256 = "sha256-smB4IGIhxkEeyXpaXAiXWuebp+xGdXXRFHepnM5gHrk=";
};
LC_ALL = "en_US.UTF-8";

View File

@ -1,5 +1,4 @@
{ stdenv
, lib
{ lib
, buildPythonPackage
, fetchFromGitHub
, pytestCheckHook
@ -44,7 +43,6 @@ buildPythonPackage rec {
];
meta = with lib; {
broken = stdenv.isDarwin;
description = "Module with file-system utilities";
homepage = "https://github.com/fabiocaccamo/python-fsutil";
license = licenses.mit;

View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "timescaledb-tune";
version = "0.13.0";
version = "0.13.1";
src = fetchFromGitHub {
owner = "timescale";
repo = pname;
rev = "v${version}";
sha256 = "sha256-YZMjgEnZKxmGIO9gK00JXBpBRvNgZoXNA/cNieovT+g=";
sha256 = "sha256-sCwMLVp4MCTJ5ZgALDs+of+upYMQeHz3xRk4YD2g23M=";
};
vendorSha256 = "sha256-n2jrg9FiR/gSrbds/QVV8Duf7BTEs36yYi4F3Ve+d0E=";

View File

@ -1,13 +0,0 @@
diff --git a/pkg/pgtune/misc.go b/pkg/pgtune/misc.go
index 1fceb6e..3e76be5 100644
--- a/pkg/pgtune/misc.go
+++ b/pkg/pgtune/misc.go
@@ -35,7 +35,7 @@ const (
// If you want to lower this value, consider that Patroni will not accept anything less than 25 as
// a valid max_connections and will replace it with 100, per
// https://github.com/zalando/patroni/blob/00cc62726d6df25d31f9b0baa082c83cd3f7bef9/patroni/postgresql/config.py#L280
- minMaxConns = 25
+ minMaxConns = 20
)
// MaxConnectionsDefault is the recommended default value for max_connections.

View File

@ -12,14 +12,14 @@
rustPlatform.buildRustPackage rec {
pname = "wasm-bindgen-cli";
version = "0.2.81";
version = "0.2.82";
src = fetchCrate {
inherit pname version;
sha256 = "sha256-DUcY22b9+PD6RD53CwcoB+ynGulYTEYjkkonDNeLbGM=";
sha256 = "sha256-BQ8v3rCLUvyCCdxo5U+NHh30l9Jwvk9Sz8YQv6fa0SU=";
};
cargoSha256 = "sha256-mfVQ6rSzCgwYrN9WwydEpkm6k0E3302Kfs/LaGzRSHE=";
cargoSha256 = "sha256-mP85+qi2KA0GieaBzbrQOBqYxBZNRJipvd2brCRGyOM=";
nativeBuildInputs = [ pkg-config ];

View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "pam_u2f";
version = "1.2.0";
version = "1.2.1";
src = fetchurl {
url = "https://developers.yubico.com/pam-u2f/Releases/${pname}-${version}.tar.gz";
sha256 = "sha256-IwPm+Zsf3o7jw6sopN4tpt3SJclTaT6EXWstg4giH7M=";
sha256 = "sha256-cOdBvKGXtktPvo3R9tV84ritWMp4Y1LFJfPy1EEliUw=";
};
nativeBuildInputs = [ pkg-config ];
@ -27,6 +27,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
homepage = "https://developers.yubico.com/pam-u2f/";
description = "A PAM module for allowing authentication with a U2F device";
changelog = "https://github.com/Yubico/pam-u2f/raw/pam_u2f-${version}/NEWS";
license = licenses.bsd2;
platforms = platforms.unix;
maintainers = with maintainers; [ philandstuff ];

View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "psmisc";
version = "23.4";
version = "23.5";
src = fetchFromGitLab {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "sha256-s7omgtsNooYqhr4JUTZ6WCtPaZVC1ujJGz6KxUBWIs8=";
sha256 = "sha256-02jvRPqN8DS30ID42hQFu400NoFC5QiH5YA3NB+EoFI=";
};
nativeBuildInputs = [ autoconf automake gettext ];

View File

@ -62,6 +62,7 @@ stdenv.mkDerivation rec {
homepage = "https://kafka.apache.org";
description = "A high-throughput distributed messaging system";
license = licenses.asl20;
sourceProvenance = with sourceTypes; [ binaryBytecode ];
maintainers = [ maintainers.ragge ];
platforms = platforms.unix;
};

View File

@ -0,0 +1,33 @@
{ lib
, stdenvNoCC
, fetchurl
, makeWrapper
, jdk11_headless
}:
stdenvNoCC.mkDerivation rec {
pname = "komga";
version = "0.157.0";
src = fetchurl {
url = "https://github.com/gotson/${pname}/releases/download/v${version}/${pname}-${version}.jar";
sha256 = "sha256-PkQL61fKplt6h1jcFCIMER+ZfzowDP466dR1AaDHw5Q=";
};
nativeBuildInputs = [
makeWrapper
];
buildCommand = ''
makeWrapper ${jdk11_headless}/bin/java $out/bin/komga --add-flags "-jar $src"
'';
meta = with lib; {
description = "Free and open source comics/mangas server";
homepage = "https://komga.org/";
license = licenses.mit;
platforms = jdk11_headless.meta.platforms;
maintainers = with maintainers; [ govanify ];
};
}

View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "redis_exporter";
version = "1.37.0";
version = "1.43.1";
src = fetchFromGitHub {
owner = "oliver006";
repo = "redis_exporter";
rev = "v${version}";
sha256 = "sha256-S60/SwbMp6INf98MGc26zMZH8q7gBynyaT/ivN7o0rA=";
sha256 = "sha256-5S9c2lx7EQthY0bTPCSwVcGCD5G+IJEMV5zpCkjTw0s=";
};
vendorSha256 = "sha256-u9FfKOD6kiCFTjwQ7LHE9WC4j2vPm0ZCluL8pC4aQIc=";
vendorSha256 = "sha256-E4+eUjkrOUnVg2CfCo1rc+Zs5HAm4+i8Ax0G8WnsL64=";
ldflags = [
"-X main.BuildVersion=${version}"

View File

@ -8,14 +8,14 @@
python3Packages.buildPythonApplication rec {
pname = "xonsh";
version = "0.13.0";
version = "0.13.1";
# fetch from github because the pypi package ships incomplete tests
src = fetchFromGitHub {
owner = "xonsh";
repo = "xonsh";
rev = version;
sha256 = "sha256-8X/+mQrwJ0yaUHRKdoY3G0P8kq22hYfRK+7WRl/zamc=";
sha256 = "sha256-Q9FJXccpTW3nPUOCf5UD8ZWJW25QX8PNHHpsVYjesYE=";
};
LC_ALL = "en_US.UTF-8";

View File

@ -1,12 +1,11 @@
{ lib, appimageTools, fetchurl, nodePackages }: let
pname = "flexoptix-app";
version = "5.11.0";
name = "${pname}-${version}";
version = "5.12.1";
src = fetchurl {
name = "${name}.AppImage";
name = "${pname}-${version}.AppImage";
url = "https://flexbox.reconfigure.me/download/electron/linux/x64/FLEXOPTIX%20App.${version}.AppImage";
hash = "sha256-Nj6S53b4w84qppkGB7lMpJhJlxifaD4acPryuZxY7cM=";
hash = "sha256-ugnJcSFgEEPJ9qxqmRGgW1fraE4E/HbbxpK/00TXPmw=";
};
udevRules = fetchurl {
@ -14,7 +13,7 @@
hash = "sha256-OZe5dV50xq99olImbo7JQxPjRd7hGyBIVwFvtR9cIVc=";
};
appimageContents = (appimageTools.extract { inherit name src; }).overrideAttrs (oA: {
appimageContents = (appimageTools.extract { inherit pname version src; }).overrideAttrs (oA: {
buildCommand = ''
${oA.buildCommand}
@ -26,7 +25,7 @@
});
in appimageTools.wrapAppImage {
inherit name;
inherit pname version;
src = appimageContents;
multiPkgs = null; # no 32bit needed
@ -36,7 +35,7 @@ in appimageTools.wrapAppImage {
extraInstallCommands = ''
# Add desktop convencience stuff
mv $out/bin/{${name},${pname}}
mv $out/bin/{${pname}-*,${pname}}
install -Dm444 ${appimageContents}/flexoptix-app.desktop -t $out/share/applications
install -Dm444 ${appimageContents}/flexoptix-app.png -t $out/share/pixmaps
substituteInPlace $out/share/applications/flexoptix-app.desktop \

View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "hdfview";
version = "3.1.4";
version = "3.2.0";
src = fetchurl {
url = "https://support.hdfgroup.org/ftp/HDF5/releases/HDF-JAVA/${pname}-${version}/src/${pname}-${version}.tar.gz";
sha256 = "sha256-iY/NUifU57aX795eWpaUBflrclF/nfvb3OKZEpD9VqA=";
sha256 = "sha256-08De/yy9lZUIxNqccS2nL7IE/2gYo0NPAKcHH46M8rg=";
};
patches = [

View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "txr";
version = "278";
version = "280";
src = fetchurl {
url = "http://www.kylheku.com/cgit/txr/snapshot/${pname}-${version}.tar.bz2";
sha256 = "sha256-RwPdDQGFL851eegQfMb8xHxC8AP39heSIALXjp/5/cw=";
sha256 = "sha256-1iqWerUehLFPM63ZjJYY6xo9oHoNK7ne/a6M3+4L4so=";
};
buildInputs = [ libffi ];

View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "redli";
version = "0.5.2";
version = "0.6.0";
src = fetchFromGitHub {
owner = "IBM-Cloud";
repo = pname;
rev = "v${version}";
sha256 = "sha256-bR02R9M3041oNUEQId1zgAxMNPyXXQNAYEyE/XIDdPE=";
sha256 = "sha256-nLauKt3OnFZFnFjw0s2kTFdvdYjFkeA6eQwZEhT4n/s=";
};
vendorSha256 = null;

View File

@ -2,15 +2,15 @@
buildGoModule rec {
pname = "kube-bench";
version = "0.6.8";
version = "0.6.9";
src = fetchFromGitHub {
owner = "aquasecurity";
repo = pname;
rev = "v${version}";
sha256 = "sha256-uqjF2WtsGMzA/JDS93BSQNuBJorMIJha9qPHJkIbjQo=";
sha256 = "sha256-bKgUnkfOWcX3/JdspEjNhFqS2dMlwEcVffIqNfS6FEU=";
};
vendorSha256 = "sha256-/LSgIfLBsGRSyz9gExgLKAjO+RF/C8CkxSvwx2jZjoI=";
vendorSha256 = "sha256-f/B9E9Ot9njop04PKh0XYG1DnWKBRsVi4XHQNmZeQho=";
nativeBuildInputs = [ installShellFiles ];

View File

@ -1,32 +0,0 @@
{ lib, stdenv, fetchurl, pcre2 }:
stdenv.mkDerivation {
pname = "hardlink";
version = "1.3-4";
src = fetchurl {
url = "https://src.fedoraproject.org/cgit/rpms/hardlink.git/snapshot/hardlink-aa6325ac4e8100b8ac7d38c7f0bc2708e69bd855.tar.xz";
sha256 = "0g4hyrnd9hpykbf06qvvp3s4yyk7flbd95gilkf7r3w9vqiagvs2";
};
buildInputs = [ pcre2 ];
NIX_CFLAGS_LINK = "-lpcre2-8";
buildPhase = ''
$CC -O2 hardlink.c -o hardlink $NIX_CFLAGS_LINK
'';
installPhase = ''
mkdir -p $out/bin $out/share/man/man1
cp -f hardlink $out/bin/hardlink
cp -f hardlink.1 $out/share/man/man1/hardlink.1
'';
meta = with lib; {
description = "Consolidate duplicate files via hardlinks";
homepage = "https://pagure.io/hardlink";
license = licenses.gpl2Plus;
platforms = platforms.unix;
};
}

View File

@ -581,6 +581,7 @@ mapAliases ({
### H ###
hal-flash = throw "hal-flash has been removed as Adobe Flash Player is now deprecated"; # Added 2021-02-07
hardlink = throw "hardlink was merged into util-linux since 2019-06-14."; # Added 2022-08-12
inherit (harePackages) hare harec; # Added 2022-08-10
hawkthorne = throw "hawkthorne has been removed because it depended on a broken version of love"; # Added 2022-01-15
heapster = throw "Heapster is now retired. See https://github.com/kubernetes-retired/heapster/blob/master/docs/deprecation.md"; # Added 2022-04-05

View File

@ -4087,6 +4087,8 @@ with pkgs;
klog = qt5.callPackage ../applications/radio/klog { };
komga = callPackage ../servers/komga { };
krapslog = callPackage ../tools/misc/krapslog { };
krelay = callPackage ../applications/networking/cluster/krelay { };
@ -7192,8 +7194,6 @@ with pkgs;
habitat = callPackage ../applications/networking/cluster/habitat { };
hardlink = callPackage ../tools/system/hardlink { };
hashcash = callPackage ../tools/security/hashcash { };
hashcat = callPackage ../tools/security/hashcat { };
@ -7261,9 +7261,7 @@ with pkgs;
hdf5-blosc = callPackage ../development/libraries/hdf5-blosc { };
hdfview = callPackage ../tools/misc/hdfview {
hdf5 = hdf5_1_10;
};
hdfview = callPackage ../tools/misc/hdfview { };
hecate = callPackage ../applications/editors/hecate { };
@ -23182,6 +23180,10 @@ with pkgs;
radicale = radicale3;
radicle-cli = callPackage ../applications/version-management/git-and-tools/radicle-cli {
inherit (darwin) DarwinTools;
inherit (darwin.apple_sdk.frameworks) AppKit;
};
radicle-upstream = callPackage ../applications/version-management/git-and-tools/radicle-upstream {};
rake = callPackage ../development/tools/build-managers/rake { };
@ -26431,6 +26433,8 @@ with pkgs;
clipit = callPackage ../applications/misc/clipit { };
clipqr = callPackage ../applications/misc/clipqr { };
cloud-hypervisor = callPackage ../applications/virtualization/cloud-hypervisor { };
clp = callPackage ../applications/science/math/clp { };