Merge master into haskell-updates

This commit is contained in:
github-actions[bot] 2022-08-07 00:16:16 +00:00 committed by GitHub
commit 148ab9d602
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
84 changed files with 664 additions and 223 deletions

View file

@ -923,6 +923,15 @@
name = "Anselm Schüler";
matrix = "@schuelermine:matrix.org";
};
anthonyroussel = {
email = "anthony@roussel.dev";
github = "anthonyroussel";
githubId = 220084;
name = "Anthony Roussel";
keys = [{
fingerprint = "472D 368A F107 F443 F3A5 C712 9DC4 987B 1A55 E75E";
}];
};
antoinerg = {
email = "roygobeil.antoine@gmail.com";
github = "antoinerg";

View file

@ -1,4 +1,4 @@
{ config, lib, pkgs, ... }:
{ config, lib, pkgs, utils, ... }:
with lib;
@ -7,10 +7,20 @@ let
keyboard = {
options = {
device = mkOption {
type = types.str;
example = "/dev/input/by-id/usb-0000_0000-event-kbd";
description = lib.mdDoc "Path to the keyboard device.";
devices = mkOption {
type = types.addCheck (types.listOf types.str)
(devices: (length devices) > 0);
example = [ "/dev/input/by-id/usb-0000_0000-event-kbd" ];
# TODO replace note with tip, which has not been implemented yet in
# nixos/lib/make-options-doc/mergeJSON.py
description = mdDoc ''
Paths to keyboard devices.
::: {.note}
To avoid unnecessary triggers of the service unit, unplug devices in
the order of the list.
:::
'';
};
config = mkOption {
type = types.lines;
@ -33,18 +43,32 @@ let
;; tap within 100ms for capslk, hold more than 100ms for lctl
cap (tap-hold 100 100 caps lctl))
'';
description = lib.mdDoc ''
Configuration other than defcfg.
See <https://github.com/jtroo/kanata> for more information.
description = mdDoc ''
Configuration other than `defcfg`. See [example config
files](https://github.com/jtroo/kanata) for more information.
'';
};
extraDefCfg = mkOption {
type = types.lines;
default = "";
example = "danger-enable-cmd yes";
description = lib.mdDoc ''
Configuration of defcfg other than linux-dev.
See <https://github.com/jtroo/kanata> for more information.
description = mdDoc ''
Configuration of `defcfg` other than `linux-dev`. See [example
config files](https://github.com/jtroo/kanata) for more information.
'';
};
extraArgs = mkOption {
type = types.listOf types.str;
default = [ ];
description = mdDoc "Extra command line arguments passed to kanata.";
};
port = mkOption {
type = types.nullOr types.port;
default = null;
example = 6666;
description = mdDoc ''
Port to run the notification server on. `null` will not run the
server.
'';
};
};
@ -52,16 +76,18 @@ let
mkName = name: "kanata-${name}";
mkDevices = devices: concatStringsSep ":" devices;
mkConfig = name: keyboard: pkgs.writeText "${mkName name}-config.kdb" ''
(defcfg
${keyboard.extraDefCfg}
linux-dev ${keyboard.device})
linux-dev ${mkDevices keyboard.devices})
${keyboard.config}
'';
mkService = name: keyboard: nameValuePair (mkName name) {
description = "kanata for ${keyboard.device}";
description = "kanata for ${mkDevices keyboard.devices}";
# Because path units are used to activate service units, which
# will start the old stopped services during "nixos-rebuild
@ -72,10 +98,14 @@ let
serviceConfig = {
ExecStart = ''
${cfg.package}/bin/kanata \
--cfg ${mkConfig name keyboard}
--cfg ${mkConfig name keyboard} \
--symlink-path ''${RUNTIME_DIRECTORY}/${name} \
${optionalString (keyboard.port != null) "--port ${toString keyboard.port}"} \
${utils.escapeSystemdExecArgs keyboard.extraArgs}
'';
DynamicUser = true;
RuntimeDirectory = mkName name;
SupplementaryGroups = with config.users.groups; [
input.name
uinput.name
@ -83,15 +113,16 @@ let
# hardening
DeviceAllow = [
"/dev/uinput w"
"/dev/uinput rw"
"char-input r"
];
CapabilityBoundingSet = "";
CapabilityBoundingSet = [ "" ];
DevicePolicy = "closed";
IPAddressDeny = "any";
IPAddressAllow = optional (keyboard.port != null) "localhost";
IPAddressDeny = [ "any" ];
LockPersonality = true;
MemoryDenyWriteExecute = true;
PrivateNetwork = true;
PrivateNetwork = keyboard.port == null;
PrivateUsers = true;
ProcSubset = "pid";
ProtectClock = true;
@ -102,10 +133,11 @@ let
ProtectKernelModules = true;
ProtectKernelTunables = true;
ProtectProc = "invisible";
RestrictAddressFamilies = "none";
RestrictAddressFamilies =
if (keyboard.port == null) then "none" else [ "AF_INET" ];
RestrictNamespaces = true;
RestrictRealtime = true;
SystemCallArchitectures = "native";
SystemCallArchitectures = [ "native" ];
SystemCallFilter = [
"@system-service"
"~@privileged"
@ -115,13 +147,32 @@ let
};
};
mkPath = name: keyboard: nameValuePair (mkName name) {
description = "kanata trigger for ${keyboard.device}";
wantedBy = [ "multi-user.target" ];
pathConfig = {
PathExists = keyboard.device;
mkPathName = i: name: "${mkName name}-${toString i}";
mkPath = name: n: i: device:
nameValuePair (mkPathName i name) {
description =
"${toString (i+1)}/${toString n} kanata trigger for ${name}, watching ${device}";
wantedBy = optional (i == 0) "multi-user.target";
pathConfig = {
PathExists = device;
# (ab)use systemd.path to construct a trigger chain so that the
# service unit is only started when all paths exist
# however, manual of systemd.path says Unit's suffix is not ".path"
Unit =
if (i + 1) == n
then "${mkName name}.service"
else "${mkPathName (i + 1) name}.path";
};
unitConfig.StopPropagatedFrom = optional (i > 0) "${mkName name}.service";
};
};
mkPaths = name: keyboard:
let
n = length keyboard.devices;
in
imap0 (mkPath name n) keyboard.devices
;
in
{
options.services.kanata = {
@ -131,15 +182,19 @@ in
default = pkgs.kanata;
defaultText = lib.literalExpression "pkgs.kanata";
example = lib.literalExpression "pkgs.kanata-with-cmd";
description = lib.mdDoc ''
kanata package to use.
If you enable danger-enable-cmd, pkgs.kanata-with-cmd should be used.
description = mdDoc ''
The kanata package to use.
::: {.note}
If `danger-enable-cmd` is enabled in any of the keyboards, the
`kanata-with-cmd` package should be used.
:::
'';
};
keyboards = mkOption {
type = types.attrsOf (types.submodule keyboard);
default = { };
description = lib.mdDoc "Keyboard configurations.";
description = mdDoc "Keyboard configurations.";
};
};
@ -147,7 +202,11 @@ in
hardware.uinput.enable = true;
systemd = {
paths = mapAttrs' mkPath cfg.keyboards;
paths = trivial.pipe cfg.keyboards [
(mapAttrsToList mkPaths)
concatLists
listToAttrs
];
services = mapAttrs' mkService cfg.keyboards;
};
};

View file

@ -132,8 +132,9 @@ in {
systemd.services.yggdrasil = {
description = "Yggdrasil Network Service";
bindsTo = [ "network-online.target" ];
after = [ "network-online.target" ];
after = [ "network-pre.target" ];
wants = [ "network.target" ];
before = [ "network.target" ];
wantedBy = [ "multi-user.target" ];
preStart =

View file

@ -21,7 +21,7 @@
}:
let
version = "4.2.2";
version = "4.3.0";
libsecp256k1_name =
if stdenv.isLinux then "libsecp256k1.so.0"
@ -30,6 +30,7 @@ let
libzbar_name =
if stdenv.isLinux then "libzbar.so.0"
else if stdenv.isDarwin then "libzbar.0.dylib"
else "libzbar${stdenv.hostPlatform.extensions.sharedLibrary}";
# Not provided in official source releases, which are what upstream signs.
@ -37,7 +38,7 @@ let
owner = "spesmilo";
repo = "electrum";
rev = version;
sha256 = "sha256-bFceOu+3SLtD2eY+aSBEn13xJw7a3aVwX39QfAuqVSo=";
sha256 = "sha256-/bYz2KB9Fggo6cnKM3hvwL/Jy4Xsw2phx1sInuqZpFg=";
postFetch = ''
mv $out ./all
@ -53,7 +54,7 @@ python3.pkgs.buildPythonApplication {
src = fetchurl {
url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz";
sha256 = "sha256-ucLLfqmTKO5Qpg+PnmcdQwht7cWMWJoFjQWnDecEtVs=";
sha256 = "sha256-E941wseIQEn1+d06NWKQLQM0C+A8a0+Xxl+LzBTwEcw=";
};
postUnpack = ''
@ -90,7 +91,6 @@ python3.pkgs.buildPythonApplication {
];
preBuild = ''
sed -i 's,usr_share = .*,usr_share = "'$out'/share",g' setup.py
substituteInPlace ./electrum/ecc_fast.py \
--replace ${libsecp256k1_name} ${secp256k1}/lib/libsecp256k1${stdenv.hostPlatform.extensions.sharedLibrary}
'' + (if enableQt then ''
@ -101,17 +101,11 @@ python3.pkgs.buildPythonApplication {
'');
postInstall = lib.optionalString stdenv.isLinux ''
# Despite setting usr_share above, these files are installed under
# $out/nix ...
mv $out/${python3.sitePackages}/nix/store"/"*/share $out
rm -rf $out/${python3.sitePackages}/nix
substituteInPlace $out/share/applications/electrum.desktop \
--replace 'Exec=sh -c "PATH=\"\\$HOME/.local/bin:\\$PATH\"; electrum %u"' \
"Exec=$out/bin/electrum %u" \
--replace 'Exec=sh -c "PATH=\"\\$HOME/.local/bin:\\$PATH\"; electrum --testnet %u"' \
"Exec=$out/bin/electrum --testnet %u"
'';
postFixup = lib.optionalString enableQt ''

View file

@ -3,20 +3,20 @@
}:
let
pname = "josm";
version = "18513";
version = "18531";
srcs = {
jar = fetchurl {
url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar";
sha256 = "sha256-rKBDKPq6hn4VGlzW4ad/gBU4eCVRF9JgRLrDaTKjCbI=";
sha256 = "sha256-/esGbLbidQ60+auMC1W2GwH7V5qdTVzblDNsskuhcjs=";
};
macosx = fetchurl {
url = "https://josm.openstreetmap.de/download/macosx/josm-macos-${version}-java17.zip";
sha256 = "sha256-M8ZV3FXZJHqaegPKQnjQkMYMWt2BUiKzM8Tit4NqtU4=";
sha256 = "sha256-ldcTuacUUxsssJqJ8cRjbP+TWlxQdcNtVbj8clDNEGw=";
};
pkg = fetchsvn {
url = "https://josm.openstreetmap.de/svn/trunk/native/linux/tested";
rev = version;
sha256 = "sha256-cguvKl9yvthNWcLD6YDLKiialJmutJTa9egMdfKHRpU=";
sha256 = "sha256-Cga17ymUROJb5scpyOlo6JIgQ77yHavI0ciUpZN+jLk=";
};
};
in

View file

@ -0,0 +1,80 @@
{ lib
, stdenv
, rustPlatform
, fetchFromGitHub
, makeDesktopItem
, copyDesktopItems
, pkg-config
, openssl
, xorg
, libGL
, withGui ? false # build GUI version
}:
rustPlatform.buildRustPackage rec {
pname = "rusty-psn";
version = "0.1.2";
src = fetchFromGitHub {
owner = "RainbowCookie32";
repo = "rusty-psn";
rev = "v${version}";
sha256 = "14li5fsaj4l5al6lcxy07g3gzmi0l3cyiczq44q7clq4myhykhhb";
};
cargoSha256 = "0kjaq3ik3lwaz7rjb5jaxavpahzp33j7vln3zyifql7j7sbr300f";
nativeBuildInputs = [
pkg-config
copyDesktopItems
];
buildInputs = if withGui then [
openssl
xorg.libxcb
xorg.libX11
xorg.libXcursor
xorg.libXrandr
xorg.libXi
xorg.libxcb
libGL
libGL.dev
] else [
openssl
];
buildNoDefaultFeatures = true;
buildFeatures = [ (if withGui then "egui" else "cli") ];
postFixup = ''
patchelf --set-rpath "${lib.makeLibraryPath buildInputs}" $out/bin/rusty-psn
'' + lib.optionalString withGui ''
mv $out/bin/rusty-psn $out/bin/rusty-psn-gui
'';
desktopItem = lib.optionalString withGui (makeDesktopItem {
name = "rusty-psn";
desktopName = "rusty-psn";
exec = "rusty-psn-gui";
comment = "A simple tool to grab updates for PS3 games, directly from Sony's servers using their updates API.";
categories = [
"Network"
];
keywords = [
"psn"
"ps3"
"sony"
"playstation"
"update"
];
});
desktopItems = lib.optionals withGui [ desktopItem ];
meta = with lib; {
description = "Simple tool to grab updates for PS3 games, directly from Sony's servers using their updates API";
homepage = "https://github.com/RainbowCookie32/rusty-psn/";
license = licenses.mit;
platforms = [ "x86_64-linux" ];
maintainers = with maintainers; [ AngryAnt ];
};
}

View file

@ -25,12 +25,19 @@ python3Packages.buildPythonApplication rec {
outputs = [ "out" "udev" ];
nativeBuildInputs = [ wrapGAppsHook gdk-pixbuf ];
buildInputs = [ libappindicator librsvg ];
nativeBuildInputs = [
gdk-pixbuf
gobject-introspection
wrapGAppsHook
];
buildInputs = [
libappindicator
librsvg
];
propagatedBuildInputs = with python3Packages; [
evdev
gobject-introspection
gtk3
psutil
pygobject3
@ -47,6 +54,17 @@ python3Packages.buildPythonApplication rec {
install -Dm444 -t $udev/etc/udev/rules.d rules.d-uinput/*.rules
'';
dontWrapGApps = true;
preFixup = ''
makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
'';
# no tests
doCheck = false;
pythonImportsCheck = [ "solaar" ];
meta = with lib; {
description = "Linux devices manager for the Logitech Unifying Receiver";
longDescription = ''

View file

@ -41,5 +41,14 @@ stdenv.mkDerivation rec {
license = licenses.lgpl21;
maintainers = with maintainers; [ bluescreen303 mgdelacroix ];
platforms = platforms.linux;
knownVulnerabilities = [
"CVE-2022-1035"
"CVE-2022-1172"
"CVE-2022-1222"
"CVE-2022-1795"
"CVE-2022-2453"
"CVE-2022-2454"
"CVE-2022-2549"
];
};
}

View file

@ -64,6 +64,10 @@ python3.pkgs.buildPythonApplication rec {
gappsWrapperArgs+=(--prefix PATH : "${lib.makeBinPath [ cpio e2fsprogs file findutils gzip ]}")
makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
# Fixes testCLI0051virt_install_initrd_inject on Darwin: "cpio: root:root: invalid group"
substituteInPlace virtinst/install/installerinject.py \
--replace "'--owner=root:root'" "'--owner=0:0'"
'';
checkInputs = with python3.pkgs; [
@ -95,8 +99,7 @@ python3.pkgs.buildPythonApplication rec {
manages Xen and LXC (linux containers).
'';
license = licenses.gpl2;
# exclude Darwin since libvirt-glib currently doesn't build there
platforms = platforms.linux;
platforms = platforms.unix;
maintainers = with maintainers; [ qknight offline fpletz globin ];
};
}

View file

@ -0,0 +1,34 @@
{ lib, stdenv, fetchFromGitHub, gtk-engine-murrine }:
stdenv.mkDerivation {
pname = "omni-gtk-theme";
version = "unstable-2021-03-30";
src = fetchFromGitHub {
owner = "getomni";
repo = "gtk";
rev = "e81b3fbebebf53369cffe1fb662abc400edb04f7";
sha256 = "sha256-NSZjkG+rY6h8d7FYq5kipPAjMDAgyaYAgOOOJlfqBCI=";
};
propagatedUserEnvPkgs = [
gtk-engine-murrine
];
installPhase = ''
runHook preInstall
mkdir -p $out/share/themes/Omni
cp -a {assets,gnome-shell,gtk-2.0,gtk-3.0,gtk-3.20,index.theme,metacity-1,unity,xfwm4} $out/share/themes/Omni
runHook postInstall
'';
meta = with lib; {
description = "Dark theme created by Rocketseat";
homepage = "https://github.com/getomni/gtk";
license = licenses.gpl3;
platforms = platforms.all;
maintainers = with maintainers; [ zoedsoupe ];
};
}

View file

@ -2,8 +2,8 @@
let
base = callPackage ./generic.nix (_args // {
version = "8.0.21";
hash = "sha256-HLd2LR/+zOruuvufbiQTLKI/sUQ8tWMND8z1PwTPoSY=";
version = "8.0.22";
hash = "sha256-40KRjT7NQi8QAy3wrD/7Dhf1aPrWz44jK296ah/cPJw=";
});
in

View file

@ -2,8 +2,8 @@
let
base = callPackage ./generic.nix (_args // {
version = "8.1.8";
hash = "sha256-uIFaWgJDFFPUJh41mL0fKFFuTANU8yjBKJDyV4cOTAE=";
version = "8.1.9";
hash = "sha256-nrsOLlcdtv1ZMEKNyy0Z7T4FAzjsHxNHwoLK6S/Ahv8=";
});
in

View file

@ -16,6 +16,7 @@
# tests
, python3
, arrow-cpp
}:
stdenv.mkDerivation rec {
@ -92,6 +93,7 @@ stdenv.mkDerivation rec {
passthru.tests = {
inherit (python3.pkgs) grpcio-status grpcio-tools;
inherit arrow-cpp;
};
meta = with lib; {

View file

@ -136,9 +136,12 @@ stdenv.mkDerivation rec {
'' + optionalString isDarwin ''
sed -i '/qemucapabilitiestest/d' tests/meson.build
sed -i '/vircryptotest/d' tests/meson.build
'' + optionalString (isDarwin && isx86_64) ''
sed -i '/qemucaps2xmltest/d' tests/meson.build
sed -i '/qemuhotplugtest/d' tests/meson.build
sed -i '/virnetdaemontest/d' tests/meson.build
'';
nativeBuildInputs = [
meson

View file

@ -35,13 +35,13 @@ let
in
stdenv.mkDerivation rec {
pname = "poppler-${suffix}";
version = "22.06.0"; # beware: updates often break cups-filters build, check texlive and scribus too!
version = "22.08.0"; # beware: updates often break cups-filters build, check texlive and scribus too!
outputs = [ "out" "dev" ];
src = fetchurl {
url = "https://poppler.freedesktop.org/poppler-${version}.tar.xz";
sha256 = "sha256-oPmqo5GLrXgQOfwwemNWUqFNGzkc1Vm2bt7Evtujxdc=";
sha256 = "sha256-tJMyhyFALyXLdSP5zcL318WfRa2Zm951xjyQYE2w8gs=";
};
nativeBuildInputs = [

View file

@ -51,6 +51,6 @@ stdenv.mkDerivation rec {
license = licenses.gpl3Plus;
platforms = platforms.linux;
broken = lib.versionOlder qtbase.version "5.14";
maintainers = [ maintainers.bugworm ];
maintainers = [ maintainers.romildo ];
};
}

View file

@ -9,13 +9,13 @@
stdenv.mkDerivation rec {
pname = "qtutilities";
version = "6.6.2";
version = "6.7.0";
src = fetchFromGitHub {
owner = "Martchus";
repo = pname;
rev = "v${version}";
sha256 = "sha256-zt/d6V1/6Kqh0ZdJX3dLkj36NHlvlmFSxPPqcNyC6ZM=";
sha256 = "sha256-RjVmrdUHDBelwagWD5Mx+S3tdFO7I0+8RmFR7hwoe8o=";
};
buildInputs = [ qtbase cpp-utilities ];

View file

@ -8,14 +8,14 @@
buildPythonPackage rec {
pname = "aiolifx";
version = "0.8.1";
version = "0.8.2";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-w6d2qpU8jPrE2Dtuq4825qOCU1SoIpkEjOEX+BYxhuU=";
hash = "sha256-k47cXi2CDtFIV3gzfdYU4i17ry0ABXcWK5CcWhwTdT0=";
};
propagatedBuildInputs = [

View file

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "asyncwhois";
version = "1.0.0";
version = "1.0.1";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "pogzyb";
repo = pname;
rev = "v${version}";
hash = "sha256-9tSGfF/Ezuya4pEyr1XolWXvSO/F/UrobRVlyHITNTU=";
hash = "sha256-TpUiUW9ntrpuT/rUhucedl+DM5X88Mislrd+3D5/TUE=";
};
propagatedBuildInputs = [

View file

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "bleak-retry-connector";
version = "1.3.0";
version = "1.4.0";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "Bluetooth-Devices";
repo = pname;
rev = "v${version}";
hash = "sha256-WjjpehrYy9187C3wUDR3sfQG+2p6YbQfp4EwC5FbzGU=";
hash = "sha256-vp+tZIDFuO41r34z8+aUf3dhYhaUeLZ3l9JNvjsqKc4=";
};
nativeBuildInputs = [

View file

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "blinkpy";
version = "0.19.1";
version = "0.19.2";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "fronzbot";
repo = "blinkpy";
rev = "refs/tags/v${version}";
hash = "sha256-29wfdRbJ4U3ou/4jkpWBE2FrUuo09k4hTYLnIP1S3uU=";
hash = "sha256-depaXtbXo5F1JC3M24i6ynWhpm9x9O7UCjkoSzFaSZI=";
};
propagatedBuildInputs = [

View file

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "container-inspector";
version = "31.1.0";
version = "32.0.1";
format = "setuptools";
disabled = pythonOlder "3.6";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "nexB";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-44sTZelCT6sGPyMteJZBcPRReTHuO1ZUxeQ0Vp7Zmqo=";
hash = "sha256-J9glnfs6l36/IQoIvE8a+Cw4B8x/6r5UeAU8+T/OiQg=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;

View file

@ -19,7 +19,7 @@
buildPythonPackage rec {
pname = "cyclonedx-python-lib";
version = "2.7.0";
version = "2.7.1";
format = "pyproject";
disabled = pythonOlder "3.9";
@ -28,7 +28,7 @@ buildPythonPackage rec {
owner = "CycloneDX";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-Imn9wl5I7dzkUnVBzK2vhWOrf89FycVW4GvEYFeSujU=";
hash = "sha256-c/KhoJOa121/h0n0GUazjUFChnUo05ThD+fuZXc5/Pk=";
};
nativeBuildInputs = [

View file

@ -1,20 +1,42 @@
{ lib, buildPythonPackage, fetchPypi
, django
, azure-storage-blob
, boto3
, dropbox
, google-cloud-storage
, libcloud
, paramiko
}:
buildPythonPackage rec {
pname = "django-storages";
version = "1.12.3";
version = "1.13";
src = fetchPypi {
inherit pname version;
sha256 = "a475edb2f0f04c4f7e548919a751ecd50117270833956ed5bd585c0575d2a5e7";
sha256 = "sha256-1P7Zi7+1NHCW3frCpmZdUTPHiLnsMsFW7F9/sCrlczU=";
};
propagatedBuildInputs = [ django ];
# django.core.exceptions.ImproperlyConfigured: Requested setting DEFAULT_INDEX_TABLESPACE, but settings are not configured. You must either define the environment variable DJANGO_SETTINGS_MODULE or call settings.configure() before accessing settings.
doCheck = false;
preCheck = ''
export DJANGO_SETTINGS_MODULE=tests.settings
# timezone issues https://github.com/jschneier/django-storages/issues/1171
substituteInPlace tests/test_sftp.py \
--replace 'test_accessed_time' 'dont_test_accessed_time' \
--replace 'test_modified_time' 'dont_test_modified_time'
'';
checkInputs = [
azure-storage-blob
boto3
dropbox
google-cloud-storage
libcloud
paramiko
];
pythonImportsCheck = [ "storages" ];
meta = with lib; {
description = "Collection of custom storage backends for Django";

View file

@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "dvc-data";
version = "0.1.5";
version = "0.1.13";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "iterative";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-SQ4w2Yqho5kbM4fRQkji69wOV8rYAIyFFve7pTEjgMM=";
hash = "sha256-dKqn7dMwPxKnLLBPJGgmD/2MFzdzrw7W9+w9Zi/9hsA=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;

View file

@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "dvc-objects";
version = "0.1.5";
version = "0.1.7";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -25,7 +25,7 @@ buildPythonPackage rec {
owner = "iterative";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-vRQhlxaNy0bJTkNVlGZ+c9ocnzG/jeZYCxCabMuI5Ag=";
hash = "sha256-Edp2MRhe/eTUosL4XQfVbtwFWBg3D5RDWRb6r1C4MgE=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;

View file

@ -4,24 +4,26 @@
, fetchFromGitHub
, pytestCheckHook
, pythonOlder
, tabulate
}:
buildPythonPackage rec {
pname = "dvclive";
version = "0.9.0";
version = "0.10.0";
format = "pyproject";
disabled = pythonOlder "3.6";
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "iterative";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-3kbP8eL/cO/aSAIVrbfGS+vwCTsWoCbNS2orExYt4aw=";
hash = "sha256-4sixsWZNnI3UJRlFyB21eAdUCgF8iIZ56ECgIeFV/u8=";
};
propagatedBuildInputs = [
dvc-render
tabulate # will be available as dvc-render.optional-dependencies.table
];
# Circular dependency with dvc

View file

@ -28,7 +28,7 @@
buildPythonPackage rec {
pname = "elastic-apm";
version = "6.10.1";
version = "6.10.2";
format = "setuptools";
disabled = pythonOlder "3.8";
@ -37,7 +37,7 @@ buildPythonPackage rec {
owner = "elastic";
repo = "apm-agent-python";
rev = "v${version}";
hash = "sha256-ql6qBnZXa0JL1qEXj2OzzP3onjYrMx6+Be6K3SDuWf4=";
hash = "sha256-Ru/yGND7xkpO3QH/cTMu4rxWUXSMsFx5u/V/rHY8k1E=";
};
propagatedBuildInputs = [

View file

@ -1,14 +1,14 @@
{ lib
, fetchPypi
, buildPythonPackage
, extractcode-7z
, extractcode-libarchive
, fetchPypi
, patch
, pytest-xdist
, pytestCheckHook
, pythonOlder
, setuptools-scm
, typecode
, patch
, extractcode-libarchive
, extractcode-7z
, pytestCheckHook
, pytest-xdist
, pythonOlder
}:
buildPythonPackage rec {
@ -41,21 +41,23 @@ buildPythonPackage rec {
pytest-xdist
];
# CLI test tests the cli which we can't do until after install
disabledTestPaths = [
# CLI test tests the CLI which we can't do until after install
"tests/test_extractcode_cli.py"
];
# test_uncompress_* wants to use a binary to extract instead of the provided library
disabledTests = [
# test_uncompress_* wants to use a binary to extract instead of the provided library
"test_uncompress_lz4_basic"
"test_extract_tarlz4_basic"
"test_extract_rar_with_trailing_data"
# tries to parse /boot/vmlinuz-*, which is not available in the nix sandbox
# Tries to parse /boot/vmlinuz-*, which is not available in the nix sandbox
"test_can_extract_qcow2_vm_image_as_tarball"
"test_can_extract_qcow2_vm_image_not_as_tarball"
"test_can_listfs_from_qcow2_image"
"test_get_extractor_qcow2"
# WARNING patch:patch.py:450 inconsistent line ends in patch hunks
"test_patch_info_patch_patches_windows_plugin_explorer_patch"
];
pythonImportsCheck = [

View file

@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "google-cloud-bigtable";
version = "2.10.1";
version = "2.11.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-f4wMYlmex0QrcJrl33VyOZgbURYnIjeWDR7rz4MzMJw=";
hash = "sha256-WI/mUT5UxVkA5h4gndEkTWtxgOXK5LHqmweiRVzb+5A=";
};
propagatedBuildInputs = [

View file

@ -11,14 +11,14 @@
buildPythonPackage rec {
pname = "h5netcdf";
version = "1.0.1";
version = "1.0.2";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
hash = "sha256-d2cE+s2LgiRtbUBoxQXDibO3C5v5kgzPusfzXNxjTaw=";
hash = "sha256-iAih4JXwEitPtAjMmMYK3zmb1X/vSNHKfN9M2h0Ka0o=";
};
nativeBuildInputs = [

View file

@ -8,14 +8,14 @@
buildPythonPackage rec {
pname = "json-stream";
version = "1.3.0";
version = "1.4.0";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-J5DBa8zeandkDIXpEaRN6cneZIIG2aRHS5zjmM/H0Uw=";
hash = "sha256-ebB8l8H6yPLoCXmVOy60IijdBI61SEzJInC30aMe9Bk=";
};
propagatedBuildInputs = [

View file

@ -6,14 +6,14 @@
buildPythonPackage rec {
pname = "mailchecker";
version = "4.1.18";
version = "4.1.19";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-zBikruHBTXKK4Yk7euTp0lTcdCG5AQ/kMZrECAvQ7Zw=";
hash = "sha256-oNIh9mRdPXai6SDfyvfoOrgsbVWyRYhJva+bsqgGOoo=";
};
# Module has no tests

View file

@ -10,13 +10,13 @@
buildPythonPackage rec {
pname = "mediapy";
version = "1.0.3";
version = "1.1.0";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
hash = "sha256-cM8u27XSN4VzXONk+tQElZgT5XdShWXq0UtDg5JbF9o=";
hash = "sha256-CejgiCiW7an1GpKB5MUiA1Alkigv3RmfTq0um9pc93E=";
};
propagatedBuildInputs = [ ipython matplotlib numpy pillow ];

View file

@ -2,7 +2,6 @@
, lib
, buildPythonPackage
, fetchFromGitHub
, fetchpatch
, jinja2
, poetry-core
, pytestCheckHook
@ -13,7 +12,7 @@
buildPythonPackage rec {
pname = "netutils";
version = "1.1.0";
version = "1.2.0";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -22,7 +21,7 @@ buildPythonPackage rec {
owner = "networktocode";
repo = pname;
rev = "v${version}";
hash = "sha256-rTSesG7XmIzu2DcJMVgZMlh0kRQ8jEB3t++rgf63Flw=";
hash = "sha256-6FoadV5QMZCJnF/eD3FXRsyP4MymO5nayJ/54PJXOB4=";
};
nativeBuildInputs = [
@ -36,15 +35,6 @@ buildPythonPackage rec {
toml
];
patches = [
# Switch to poetry-core, https://github.com/networktocode/netutils/pull/115
(fetchpatch {
name = "switch-to-poetry-core.patch";
url = "https://github.com/networktocode/netutils/commit/edc8b06686db4e5b4c8c4deb6d0effbc22177b31.patch";
sha256 = "sha256-K5oSbtOJYeKbxzbaZQBXcl6LsHQAK8CxBLfkak15V6M=";
})
];
pythonImportsCheck = [
"netutils"
];
@ -59,10 +49,10 @@ buildPythonPackage rec {
];
meta = with lib; {
broken = stdenv.isDarwin;
description = "Library that is a collection of objects for common network automation tasks";
homepage = "https://github.com/networktocode/netutils";
license = licenses.asl20;
maintainers = with maintainers; [ fab ];
broken = stdenv.isDarwin;
};
}

View file

@ -0,0 +1,49 @@
{ lib
, aiohttp
, aioresponses
, buildPythonPackage
, fetchFromGitHub
, orjson
, pytest-asyncio
, pytest-error-for-skips
, pytestCheckHook
, pythonOlder
}:
buildPythonPackage rec {
pname = "nextdns";
version = "1.0.2";
format = "setuptools";
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "bieniu";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-joPg5XZ5qEDnON96XCy5j4/OC+EkFw09Db4TH+ThsTY=";
};
propagatedBuildInputs = [
aiohttp
orjson
];
checkInputs = [
aioresponses
pytest-asyncio
pytest-error-for-skips
pytestCheckHook
];
pythonImportsCheck = [
"nextdns"
];
meta = with lib; {
description = "Module for the NextDNS API";
homepage = "https://github.com/bieniu/nextdns";
license = licenses.asl20;
maintainers = with maintainers; [ fab ];
};
}

View file

@ -18,12 +18,12 @@
buildPythonPackage rec {
pname = "oslo-concurrency";
version = "4.5.1";
version = "5.0.0";
src = fetchPypi {
pname = "oslo.concurrency";
inherit version;
sha256 = "sha256-aGm5Rrk9lbq/IM0Wvgb8NaXsFNB+osHzFfSsbqXw2hc=";
sha256 = "sha256-n0aUbp+KcqBvFP49xBiaTT3TmGKDFSU5OjEZvbvniX4=";
};
postPatch = ''

View file

@ -6,14 +6,14 @@
buildPythonPackage rec {
pname = "peaqevcore";
version = "4.0.1";
version = "4.0.8";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-iCHXiGKg3ENqw4cX1iNpVZAA944siKbFGKooo+KswsY=";
hash = "sha256-B0t9kNl55VsPC8ZXP7/lRDJ0Hfm4uhSEMGX9To4fjAU=";
};
postPatch = ''

View file

@ -7,14 +7,14 @@
buildPythonPackage rec {
pname = "pex";
version = "2.1.102";
version = "2.1.103";
format = "flit";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-+jTO8IO+3j6kVBNjjCToRpiUmQTvBVmZTnNLbSHeNjw=";
hash = "sha256-B7zWM2Jrf9bRjrDWMDrP0KT7yzFpLnN7FXlGJtqJa/A=";
};
nativeBuildInputs = [

View file

@ -9,14 +9,14 @@
buildPythonPackage rec {
pname = "plaid-python";
version = "9.8.0";
version = "9.9.0";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
hash = "sha256-iILDOpajLdTi+yPBNIr2+Sb1qBl0KCoSow2XBmDpFSI=";
hash = "sha256-uvozG1l+aGDs4nzOOjKUPScLLMNVop5u2Y89se8GvtY=";
};
propagatedBuildInputs = [

View file

@ -21,7 +21,7 @@
buildPythonPackage rec {
pname = "plugwise";
version = "0.21.0";
version = "0.21.1";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -30,7 +30,7 @@ buildPythonPackage rec {
owner = pname;
repo = "python-plugwise";
rev = "refs/tags/v${version}";
sha256 = "sha256-pw1apxqjKKv05Qw2VFN0cKit/3fas7PUb1wS/XsJruY=";
sha256 = "sha256-9tnLUzr7FWZlpN6mLLv1Q5EZ4wgquCC5nxGNyT63dzY=";
};
propagatedBuildInputs = [

View file

@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "pubnub";
version = "6.5.0";
version = "6.5.1";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = pname;
repo = "python";
rev = "refs/tags/v${version}";
hash = "sha256-zY40VLjjb9VBbw2579UPD/csk9o0AWIZMWRKxo78NrE=";
hash = "sha256-+x58aEvemav0Pz2jeICLFG36FTtZCu5dk/arb+j5nmo=";
};
propagatedBuildInputs = [

View file

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "pycep-parser";
version = "0.3.7";
version = "0.3.8";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "gruebel";
repo = "pycep";
rev = "refs/tags/${version}";
hash = "sha256-5XivzmwcJi+DrrskM0u3XBXtC5j0pjXbWHI+8mciMXM=";
hash = "sha256-y6npvFh6/QykOAKK8ihTHDcv5dFd4lLU64UXPIhBELA=";
};
nativeBuildInputs = [

View file

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "pydeconz";
version = "101";
version = "103";
format = "setuptools";
disabled = pythonOlder "3.9";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "Kane610";
repo = "deconz";
rev = "refs/tags/v${version}";
hash = "sha256-U9jdKKT6RtvdJlWTwuUby0q7Qxa3mWUds8HQvsME9R4=";
hash = "sha256-nxM9airO1/CF4g9CeyV2WMxh22fBtu0fjz1R3X1zm+o=";
};
propagatedBuildInputs = [

View file

@ -8,13 +8,13 @@
buildPythonPackage rec {
pname = "pyipma";
version = "2.1.5";
version = "3.0.0";
disabled = pythonOlder "3.7";
# Request for GitHub releases, https://github.com/dgomes/pyipma/issues/10
src = fetchPypi {
inherit pname version;
sha256 = "0hq5dasqpsn64x2sf6a28hdmysygmcdq4in6s08w97jfvwc6xmym";
sha256 = "sha256-LfnatA8CimHIXH3f3T4PatDBIEhh6vlQtI080iu8UEg=";
};
propagatedBuildInputs = [

View file

@ -1,23 +1,45 @@
{ buildPythonPackage, fetchPypi, lib, libmemcached, zlib, cyrus_sasl }:
{ lib
, buildPythonPackage
, cyrus_sasl
, fetchPypi
, libmemcached
, pythonOlder
, zlib
}:
buildPythonPackage rec {
version = "1.6.1";
pname = "pylibmc";
version = "1.6.2";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "1sg7d9j0v6g3xg3finf4l1hb72c13vcyyi6rqrc9shbx903d93ca";
hash = "sha256-QatJ05VAdnN0iRvvC+tSkcqXvrcEi3r3dSEGSVPATcA=";
};
buildInputs = [ libmemcached zlib cyrus_sasl ];
setupPyBuildFlags = [ "--with-sasl2" ];
buildInputs = [
cyrus_sasl
libmemcached
zlib
];
# requires an external memcached server running
setupPyBuildFlags = [
"--with-sasl2"
];
# Requires an external memcached server running
doCheck = false;
pythonImportsCheck = [
"pylibmc"
];
meta = with lib; {
description = "Quick and small memcached client for Python";
homepage = "http://sendapatch.se/projects/pylibmc/";
license = licenses.bsd3;
maintainers = with maintainers; [ ];
};
}

View file

@ -45,6 +45,11 @@ buildPythonPackage rec {
pytestCheckHook
];
postPatch = ''
substituteInPlace pyproject.toml \
--replace 'backoff = "^1.10.0"' 'backoff = "*"'
'';
pythonImportsCheck = [
"pyoverkiz"
];

View file

@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "pyskyqremote";
version = "0.3.12";
version = "0.3.14";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "RogerSelwyn";
repo = "skyq_remote";
rev = "refs/tags/${version}";
sha256 = "sha256-NEdlhp0Bjbb1oRCFf0OPEuFlLE2JjRWYWwnTaHozPr0=";
sha256 = "sha256-ps83Jo1H5hkCZ6kmuSSEC+UAdul84JJ7syMJq95Z2wQ=";
};
propagatedBuildInputs = [

View file

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "pyswitchbot";
version = "0.17.3";
version = "0.18.4";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "Danielhiversen";
repo = "pySwitchbot";
rev = "refs/tags/${version}";
hash = "sha256-vyfIt9Tkl6jpO//xizraqBwwwGmuJjkFGU3TzN3dqhQ=";
hash = "sha256-lj2ud+Bp4z154XfPPJ6ocA9mlmRtlHOZRaOeDLQfYyo=";
};
propagatedBuildInputs = [

View file

@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "pytibber";
version = "0.23.0";
version = "0.24.0";
format = "setuptools";
disabled = pythonOlder "3.9";
@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "Danielhiversen";
repo = "pyTibber";
rev = version;
hash = "sha256-DMYSv66PVBuOHuIio06OLrtGP0q7PeuDGKK+OznaLec=";
hash = "sha256-Ib9Rb6RkhUe4WDDHVLgaOYOleSFj7LFys6pW3WgxMQo=";
};
propagatedBuildInputs = [

View file

@ -71,6 +71,8 @@ buildPythonPackage rec {
postPatch = ''
substituteInPlace pyproject.toml \
--replace "--cov=pyunifiprotect --cov-append" ""
substituteInPlace setup.cfg \
--replace "pydantic!=1.9.1" "pydantic"
'';
pythonImportsCheck = [

View file

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "pyupgrade";
version = "2.37.1";
version = "2.37.3";
format = "setuptools";
disabled = pythonOlder "3.6";
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "asottile";
repo = pname;
rev = "v${version}";
sha256 = "sha256-nWiaKfs2eVnwyA+UACcB/OImWSb5Nn6n/8gcGPNevM4=";
sha256 = "sha256-woHYMzk1xLDfJ14UycPlbaMG8mHeBixqDvs9vO0TKQI=";
};
checkInputs = [

View file

@ -11,13 +11,13 @@
buildPythonPackage rec {
pname = "pyvips";
version = "2.2.0";
version = "2.2.1";
src = fetchFromGitHub {
owner = "libvips";
repo = "pyvips";
rev = "v${version}";
sha256 = "sha256-qMVoVzqXALhPWVKLzu+VqihHPN7J+pMhKnXdb+ow0zw=";
sha256 = "sha256-9S7h3bkm+QP78cpemYS7l3c8t+wXsJ5MUAP2T50R/Mc=";
};
nativeBuildInputs = [ pkgconfig pkg-config ];
@ -42,6 +42,6 @@ buildPythonPackage rec {
description = "A python wrapper for libvips";
homepage = "https://github.com/libvips/pyvips";
license = licenses.mit;
maintainers = with maintainers; [ ccellado ];
maintainers = with maintainers; [ ccellado anthonyroussel ];
};
}

View file

@ -40,7 +40,7 @@ let
in
buildPythonPackage rec {
pname = "rdkit";
version = "2022.03.3";
version = "2022.03.4";
src =
let
@ -50,7 +50,7 @@ buildPythonPackage rec {
owner = pname;
repo = pname;
rev = "Release_${versionTag}";
sha256 = "sha256-YZq1JKDlCQVvjv7+XpEhD/wfFcQ5m3i5VO4rNQ3ONRQ=";
sha256 = "13aga2fy1hgldb229n16niv30n3lwlypd7xv16smpbgw0cp1xpp2";
};
unpackPhase = ''

View file

@ -17,14 +17,14 @@
buildPythonPackage rec {
pname = "sagemaker";
version = "2.101.1";
version = "2.103.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-f3bmx8iJkTJ6WSl3RkQ19cbOKB4UrhoAP8pEYEtyr74=";
hash = "sha256-0iXIUWvoL6+kT+KaJq7yzdEzYA0orKBbQkGAVUYcSKk=";
};
propagatedBuildInputs = [

View file

@ -7,11 +7,11 @@
buildPythonPackage rec {
pname = "sqlmap";
version = "1.6.7";
version = "1.6.8";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-J0USsiCWaysQOir/wpkw6GT1ILckjK7EUiY541aoahA=";
sha256 = "sha256-OWIuYAms4SXQXVr0Wx8y7pne13IBclfq0P3VTy91Kz8=";
};
postPatch = ''

View file

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "svglib";
version = "1.3.0";
version = "1.4.1";
disabled = pythonOlder "3.7";
@ -20,7 +20,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
sha256 = "sha256-o4mYuV0buZVk3J3/rxXk6UU3YfJ5DS3UFHpK1fusEHg=";
sha256 = "sha256-SMJHBsI7tCYhc7b6Seq7EK+hW4QS8UKDEgVJUXzPoxQ=";
};
propagatedBuildInputs = [

View file

@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "einarhauks";
repo = pname;
rev = version;
sha256 = "sha256-JBtlGd9aHY8ikhpJ5v7ZcNu3BfLdBmOBZCMa6C0s6gE=";
hash = "sha256-JBtlGd9aHY8ikhpJ5v7ZcNu3BfLdBmOBZCMa6C0s6gE=";
};
nativeBuildInputs = [
@ -40,13 +40,17 @@ buildPythonPackage rec {
pytestCheckHook
];
postPatch = ''
substituteInPlace pyproject.toml \
--replace 'backoff = "^1.11.1"' 'backoff = "*"'
'';
pythonImportsCheck = [
"tesla_wall_connector"
];
meta = with lib; {
description = "Python library for communicating with a Tesla Wall Connector";
description = "Library for communicating with a Tesla Wall Connector";
homepage = "https://github.com/einarhauks/tesla-wall-connector";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];

View file

@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "teslajsonpy";
version = "2.3.0";
version = "2.4.0";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -24,7 +24,7 @@ buildPythonPackage rec {
owner = "zabuldon";
repo = pname;
rev = "refs/tags/v${version}";
sha256 = "sha256-wAhi8TW0rOeJ3QWjmfLqJ3cKnLZShMekyQ6j7I2uwGY=";
sha256 = "sha256-BAayVUmp2dsaWzH8dvTjZCKGnpc6uY6Y/6gWYIgaES8=";
};
nativeBuildInputs = [

View file

@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "trimesh";
version = "3.12.9";
version = "3.13.0";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-rEWMPK07AqFEd/5ax/kIh49QSlbYqjlSxDDS6Q5ZaLU=";
sha256 = "sha256-hmfjsyOyFJXw/B08g/ZkdN746vK5ZgmNQqo81gDUQA0=";
};
propagatedBuildInputs = [ numpy ];

View file

@ -6,12 +6,12 @@
buildPythonPackage rec {
pname = "types-requests";
version = "2.28.6";
version = "2.28.8";
format = "setuptools";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-zzODu9eTlL8FGgqSAtaDH6li8Yb5I8F498BZ40JL0A4=";
sha256 = "sha256-ep97FS1ZShwY3UkyzdJZa4777t/XPKpOSrs3VYBbRoU=";
};
propagatedBuildInputs = [

View file

@ -5,12 +5,12 @@
buildPythonPackage rec {
pname = "types-setuptools";
version = "63.2.2";
version = "63.4.0";
format = "setuptools";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-qaoMAdXzRDzVRAJtX/yXuV3a33MdqxNBnDk9Q/2GF8A=";
sha256 = "sha256-+VQEQDQGbNPYzszIfi1c6+epbJ+HmW9hw8apLNVsyKQ=";
};
# Module doesn't have tests

View file

@ -5,12 +5,12 @@
buildPythonPackage rec {
pname = "types-urllib3";
version = "1.26.19";
version = "1.26.22";
format = "setuptools";
src = fetchPypi {
inherit pname version;
hash = "sha256-RbMHvbc9LqwML7E4bal+UcmufxR07zX2ECTDCEtr83E=";
hash = "sha256-sFr5DnOInmiAlACKl8qVeI24vzc24ndv1D+2sXFIXZQ=";
};
# Module doesn't have tests

View file

@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "whodap";
version = "0.1.5";
version = "0.1.6";
format = "setuptools";
disabled = pythonOlder "3.8";
@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "pogzyb";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-Jm3+WMGuYc910TNDVzHjYcbNcts668D3xYORXxozWqA=";
hash = "sha256-gLA6tT6ZUMjb2ZF5t6DdI5nqiX2Uxatj3ThmQ+VZu9A=";
};
propagatedBuildInputs = [

View file

@ -17,7 +17,7 @@
buildPythonPackage rec {
pname = "yalexs";
version = "1.1.25";
version = "1.2.1";
format = "setuptools";
disabled = pythonOlder "3.6";
@ -26,7 +26,7 @@ buildPythonPackage rec {
owner = "bdraco";
repo = pname;
rev = "v${version}";
sha256 = "sha256-O7M9Shh8jp2fTaVQPM8mgh1pkv75wn22PFpxJVenbAo=";
sha256 = "sha256-7+4Icg3E6xrWmxObNzNuDc+MXJ9rnbgBHMK4uPBJeuY=";
};
propagatedBuildInputs = [

View file

@ -1,5 +1,6 @@
{ stdenv
, lib
{ lib
, stdenv
, async-timeout
, buildPythonPackage
, fetchFromGitHub
, ifaddr
@ -10,7 +11,7 @@
buildPythonPackage rec {
pname = "zeroconf";
version = "0.38.7";
version = "0.39.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -19,10 +20,11 @@ buildPythonPackage rec {
owner = "jstasiak";
repo = "python-zeroconf";
rev = version;
hash = "sha256-Q/rrN7xzbehwMa3yFVP5F9ztUcJCDsfBIGf0b/GPzLM=";
hash = "sha256-R6q5fq8P91q+qhy+lOCuoKUMFBvkKFsKLVCoqIy7Qpk=";
};
propagatedBuildInputs = [
async-timeout
ifaddr
];
@ -39,7 +41,7 @@ buildPythonPackage rec {
"test_launch_and_close_v4_v6"
"test_launch_and_close_v6_only"
"test_integration_with_listener_ipv6"
# Starting with 0.38.7: AssertionError: assert [('add', '_ht..._tcp.local.')]
# Starting with 0.39.0: AssertionError: assert [('add', '_ht..._tcp.local.')]
"test_service_browser_expire_callbacks"
] ++ lib.optionals stdenv.isDarwin [
"test_lots_of_names"

View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "esbuild";
version = "0.14.51";
version = "0.14.53";
src = fetchFromGitHub {
owner = "evanw";
repo = "esbuild";
rev = "v${version}";
sha256 = "sha256-IzFjbKX4DoRo57i9ogGCuvZpamk+brkKnsI6Yy843VA=";
sha256 = "sha256-o92OVyaiOXtJOAT5WJiclOBt2f1GK3t9vD3cjw1nv+8=";
};
vendorSha256 = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ=";

View file

@ -1,5 +1,5 @@
{ stdenv, lib, fetchurl, makeWrapper, getconf,
ocaml, unzip, ncurses, curl, aspcud, bubblewrap
ocaml, unzip, ncurses, curl, bubblewrap
}:
assert lib.versionAtLeast ocaml.version "4.02.3";
@ -119,7 +119,7 @@ in stdenv.mkDerivation {
mv $out/bin/opam $out/bin/.opam-wrapped
makeWrapper $out/bin/.opam-wrapped $out/bin/opam \
--argv0 "opam" \
--suffix PATH : ${aspcud}/bin:${unzip}/bin:${curl}/bin:${lib.optionalString stdenv.isLinux "${bubblewrap}/bin:"}${getconf}/bin \
--suffix PATH : ${unzip}/bin:${curl}/bin:${lib.optionalString stdenv.isLinux "${bubblewrap}/bin:"}${getconf}/bin \
--set OPAM_USER_PATH_RO /run/current-system/sw/bin:/nix/
$out/bin/opam-installer --prefix=$installer opam-installer.install
'';

View file

@ -21,12 +21,12 @@ chomp $OPAM_RELEASE_SHA256;
my $OPAM_BASE_URL = "https://raw.githubusercontent.com/$OPAM_GITHUB_REPO/$OPAM_TAG";
my $OPAM_OPAM = `curl -L --url \Q$OPAM_BASE_URL\E/opam-devel.opam`;
my($OCAML_MIN_VERSION) = $OPAM_OPAM =~ /^ "ocaml" {>= "(.*)"}$/m
my($OCAML_MIN_VERSION) = $OPAM_OPAM =~ /^ "ocaml" \{>= "(.*)"}$/m
or die "could not parse ocaml version bound\n";
print <<"EOF";
{ stdenv, lib, fetchurl, makeWrapper, getconf,
ocaml, unzip, ncurses, curl, aspcud, bubblewrap
ocaml, unzip, ncurses, curl, bubblewrap
}:
assert lib.versionAtLeast ocaml.version "$OCAML_MIN_VERSION";
@ -114,7 +114,7 @@ print <<'EOF';
mv $out/bin/opam $out/bin/.opam-wrapped
makeWrapper $out/bin/.opam-wrapped $out/bin/opam \
--argv0 "opam" \
--suffix PATH : ${aspcud}/bin:${unzip}/bin:${curl}/bin:${lib.optionalString stdenv.isLinux "${bubblewrap}/bin:"}${getconf}/bin \
--suffix PATH : ${unzip}/bin:${curl}/bin:${lib.optionalString stdenv.isLinux "${bubblewrap}/bin:"}${getconf}/bin \
--set OPAM_USER_PATH_RO /run/current-system/sw/bin:/nix/
$out/bin/opam-installer --prefix=$installer opam-installer.install
'';

View file

@ -1818,7 +1818,8 @@
nextcloudmonitor
];
"nextdns" = ps: with ps; [
]; # missing inputs: nextdns
nextdns
];
"nfandroidtv" = ps: with ps; [
]; # missing inputs: notifications-android-tv
"nightscout" = ps: with ps; [
@ -3617,6 +3618,7 @@
"network"
"nexia"
"nextbus"
"nextdns"
"nightscout"
"nina"
"no_ip"

View file

@ -15,13 +15,13 @@ in
stdenv.mkDerivation rec {
pname = "janus-gateway";
version = "1.0.3";
version = "1.0.4";
src = fetchFromGitHub {
owner = "meetecho";
repo = pname;
rev = "v${version}";
sha256 = "sha256-c+5NvJqrYoG96CPaR4CkC9y/CmpTDxyHUmPr+C0t484=";
sha256 = "sha256-1WQo1v5TJPPJjC2lc8k9aWmtRUFITYEuwSfsPzh5320=";
};
nativeBuildInputs = [ autoreconfHook pkg-config gengetopt ];

View file

@ -0,0 +1,32 @@
{ lib
, buildGoModule
, fetchFromGitHub
}:
buildGoModule rec {
pname = "spicedb";
version = "1.11.0";
src = fetchFromGitHub {
owner = "authzed";
repo = "spicedb";
rev = "v${version}";
hash = "sha256-X52sf21IMr5muEx9SUoYQmFonXDPeW8NKylPmoAZYjw";
};
vendorHash = "sha256-lO4H2DlMfYuV2BYPnMV3Ynx0khFE6KDxf/aXA53pBpU";
subPackages = [ "cmd/spicedb" ];
meta = with lib; {
description = "Open source permission database";
longDescription = ''
SpiceDB is an open-source permissions database inspired by
Google Zanzibar.
'';
homepage = "https://authzed.com/";
license = licenses.asl20;
maintainers = with maintainers; [ thoughtpolice ];
};
}

View file

@ -0,0 +1,29 @@
{ lib
, buildGoModule
, fetchFromGitHub
}:
buildGoModule rec {
pname = "zed";
version = "0.4.4";
src = fetchFromGitHub {
owner = "authzed";
repo = "zed";
rev = "v${version}";
hash = "sha256-tw8Z8JtmmRLcvFacRDAdIi6TyMtm9FAZvRYNgd49qXg=";
};
vendorHash = "sha256-/BxQiaBFkJsySnQRU870CzvPxtPwvdwx4DwSzhaYYYQ=";
meta = with lib; {
description = "Command line for managing SpiceDB";
longDescription = ''
SpiceDB is an open-source permissions database inspired by
Google Zanzibar. zed is the command line client for SpiceDB.
'';
homepage = "https://authzed.com/";
license = licenses.asl20;
maintainers = with maintainers; [ thoughtpolice ];
};
}

View file

@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
pname = "repmgr";
version = "5.3.1";
version = "5.3.2";
src = fetchFromGitHub {
owner = "2ndQuadrant";
repo = "repmgr";
rev = "v${version}";
sha256 = "sha256-fHoXbFOF3xj/eNHgQIghF15vbDObnuwl2DAH+zRVGZQ=";
sha256 = "sha256-M8FMin9y6nAiPYeT5pUUy0KyZ1dkuH708GshZ6GoXXw=";
};
nativeBuildInputs = [ flex ];

View file

@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
version = "1.16.3";
src = fetchurl {
url = "https://dlcdn.apache.org/nifi/${version}/nifi-${version}-bin.tar.gz";
url = "https://archive.apache.org/dist/nifi/${version}/nifi-${version}-bin.tar.gz";
sha256 = "sha256-57ZtgK1Z8G/nX2rtf7osmymvE4RukGi7CIvCvRQNKuE=";
};

View file

@ -9,6 +9,7 @@
, glib
, pkg-config
, cyrus_sasl
, pulseaudioSupport ? stdenv.isLinux
, libpulseaudio
, libgcrypt
, gtk3
@ -51,8 +52,13 @@ stdenv.mkDerivation rec {
glib
libgcrypt
cyrus_sasl
libpulseaudio
gtk3
] ++ lib.optionals pulseaudioSupport [
libpulseaudio
];
mesonFlags = lib.optionals (!pulseaudioSupport) [
"-Dpulseaudio=disabled"
];
passthru = {
@ -67,6 +73,6 @@ stdenv.mkDerivation rec {
homepage = "https://wiki.gnome.org/Projects/gtk-vnc";
license = licenses.lgpl2Plus;
maintainers = with maintainers; [ raskin offline ];
platforms = platforms.linux;
platforms = platforms.unix;
};
}

View file

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "watchexec";
version = "1.20.4";
version = "1.20.5";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "cli-v${version}";
sha256 = "sha256-se3iqz+qjwf71wvHQhCWYryEdUc+kY0Q0ZTg4i1ayNI=";
sha256 = "sha256-x1weerTOpD4g1Fbm5erbS4S87ZjygF2X3MyyXl+9DXw=";
};
cargoSha256 = "sha256-YM+Zm3wFp3Lsx5LmyjGwZywV/SZjriL6JMDO1l0tNf4=";
cargoSha256 = "sha256-hyPIdMVUXc03B8opcqq7y0wS1rqCfOQ1W5M8jDUqr0k=";
nativeBuildInputs = [ installShellFiles ];

View file

@ -10,7 +10,7 @@
rustPlatform.buildRustPackage rec {
pname = "arti";
version = "0.5.0";
version = "0.6.0";
src = fetchFromGitLab {
domain = "gitlab.torproject.org";
@ -18,10 +18,10 @@ rustPlatform.buildRustPackage rec {
owner = "core";
repo = "arti";
rev = "arti-v${version}";
sha256 = "sha256-xze8Frxy9Rv01yz0L8GkEaXUoLlpODv3pEat1HnDIOs=";
sha256 = "sha256-3zlpmOGCjox8dVItVxyQloPgC0+dYw57pFFBySAXC5g=";
};
cargoSha256 = "sha256-yCQLSLxEziDQGDNtP7pmXlTImSKzr/O/5sITMHVJg8E=";
cargoSha256 = "sha256-LvhSgJQyPyTSD1koXBXYaC6I5njZavgQK4WaW5/b9g4=";
nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ];

View file

@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
pname = "brutespray";
version = "1.7.0";
version = "1.8";
src = fetchFromGitHub {
owner = "x90skysn3k";
repo = pname;
rev = "${pname}-${version}";
sha256 = "0lkm3fvx35ml5jh4ykjr2srq8qfajkmxwp4qfcn9xi58khk3asq3";
sha256 = "sha256-hlFp2ZQnoydxF2NBCjSKtmNzMj9V14AKrNYKMF/8m70=";
};
postPatch = ''

View file

@ -0,0 +1,38 @@
{ lib, stdenv, fetchFromGitHub, makeWrapper, metasploit, curl, inetutils, openssl }:
stdenv.mkDerivation rec {
pname = "msfpc";
version = "1.4.5";
src = fetchFromGitHub {
owner = "g0tmi1k";
repo = pname;
rev = "v${version}";
sha256 = "UIdE0oSaNu16pf+M96x8AnNju88hdzokv86wm8uBYDQ=";
};
nativeBuildInputs = [
makeWrapper
];
installPhase = ''
runHook preInstall
install -Dm755 msfpc.sh $out/bin/msfpc
runHook postInstall
'';
postFixup = ''
wrapProgram $out/bin/msfpc \
--prefix PATH : "${lib.makeBinPath [ metasploit curl inetutils openssl ]}"
'';
meta = with lib; {
description = "MSFvenom Payload Creator";
homepage = "https://github.com/g0tmi1k/msfpc";
license = licenses.mit;
maintainers = with maintainers; [ emilytrau ];
platforms = platforms.unix;
};
}

View file

@ -1,4 +1,5 @@
{ fetchFromGitHub
, fetchpatch
, lib
, libevdev
, pkg-config
@ -8,16 +9,24 @@
rustPlatform.buildRustPackage rec {
pname = "kanata";
version = "1.0.5";
version = "1.0.6";
src = fetchFromGitHub {
owner = "jtroo";
repo = pname;
rev = "v${version}";
sha256 = "sha256-sL9hP+222i8y0sK3ZEx66yXBTgZp5ewoPUlZS4XnphY=";
sha256 = "sha256-0S27dOwtHxQi5ERno040RWZNo5+ao0ULFwHKJz27wWw=";
};
cargoHash = "sha256-uhN1UdwtU0C0/lpxUYoCcMLABFTPNO5wKsIGOBnFpzw=";
cargoHash = "sha256-Ge9CiYIl6R8cjfUAY4B9ggjNZv5vpjmQKMPv93wGJwc=";
cargoPatches = [
(fetchpatch {
name = "update-cargo.lock-for-1.0.6.patch";
url = "https://github.com/jtroo/kanata/commit/29a7669ac230571c30c9113e5c82e8440c8b89af.patch";
sha256 = "sha256-s4R7vUFlrL1XTNpgXRyIpIq4rDuM5A85ECzbMUX4MAw=";
})
];
buildFeatures = lib.optional withCmd "cmd";

View file

@ -8772,6 +8772,8 @@ with pkgs;
mscgen = callPackage ../tools/graphics/mscgen { };
msfpc = callPackage ../tools/security/msfpc { };
melt = callPackage ../tools/security/melt { };
metabigor = callPackage ../tools/security/metabigor { };
@ -13536,6 +13538,9 @@ with pkgs;
remarkable2-toolchain = callPackage ../development/tools/misc/remarkable/remarkable2-toolchain { };
spicedb = callPackage ../servers/spicedb { };
spicedb-zed = callPackage ../servers/spicedb/zed.nix { };
tacacsplus = callPackage ../servers/tacacsplus { };
tamarin-prover =
@ -25341,6 +25346,8 @@ with pkgs;
oldsindhi = callPackage ../data/fonts/oldsindhi { };
omni-gtk-theme = callPackage ../data/themes/omni-gtk-theme { };
onestepback = callPackage ../data/themes/onestepback { };
open-dyslexic = callPackage ../data/fonts/open-dyslexic { };
@ -30230,6 +30237,10 @@ with pkgs;
runc = callPackage ../applications/virtualization/runc {};
rusty-psn = callPackage ../applications/misc/rusty-psn {};
rusty-psn-gui = rusty-psn.override { withGui = true; };
rymcast = callPackage ../applications/audio/rymcast {
inherit (gnome) zenity;
};

View file

@ -759,10 +759,10 @@ let
Appcpm = buildPerlModule {
pname = "App-cpm";
version = "0.997006";
version = "0.997011";
src = fetchurl {
url = "mirror://cpan/authors/id/S/SK/SKAJI/App-cpm-0.997006.tar.gz";
sha256 = "1mh4bg141qbch0vdvir2l9533zzm3k8hnqx36iwciwzhvpd9hl9s";
url = "mirror://cpan/authors/id/S/SK/SKAJI/App-cpm-0.997011.tar.gz";
sha256 = "sha256-YyECxuZ958nP9R1vqg2dA7/vvtNbXMXZaRn3uSAlAck=";
};
buildInputs = [ ModuleBuildTiny ];
propagatedBuildInputs = [ CPAN02PackagesSearch CPANCommonIndex CPANDistnameInfo ClassTiny CommandRunner ExtUtilsInstall ExtUtilsInstallPaths FileCopyRecursive Filepushd HTTPTinyish MenloLegacy Modulecpmfile ModuleCPANfile ParsePMFile ParallelPipes locallib ];
@ -3527,13 +3527,13 @@ let
CommandRunner = buildPerlModule {
pname = "Command-Runner";
version = "0.103";
version = "0.200";
src = fetchurl {
url = "mirror://cpan/authors/id/S/SK/SKAJI/Command-Runner-0.103.tar.gz";
sha256 = "0f180b5c3b3fc9db7b83d4a5fdd959db34f7d6d2472f817dbf8b4b795a9dc82a";
url = "mirror://cpan/authors/id/S/SK/SKAJI/Command-Runner-0.200.tar.gz";
sha256 = "sha256-WtJtBhEb/s1TyPW7XeqUvyAl9seOlfbYAS5M+oninyY=";
};
buildInputs = [ ModuleBuildTiny ];
propagatedBuildInputs = [ CaptureTiny StringShellQuote Win32ShellQuote ];
propagatedBuildInputs = [ CaptureTiny Filepushd StringShellQuote Win32ShellQuote ];
meta = {
homepage = "https://github.com/skaji/Command-Runner";
description = "Run external commands and Perl code refs";
@ -11014,10 +11014,10 @@ let
Imager = buildPerlPackage {
pname = "Imager";
version = "1.012";
version = "1.019";
src = fetchurl {
url = "mirror://cpan/authors/id/T/TO/TONYC/Imager-1.012.tar.gz";
sha256 = "a321c728e3277fd15de842351e69bbef0e2a5a608a31d089e5029b8381e23f21";
url = "mirror://cpan/authors/id/T/TO/TONYC/Imager-1.019.tar.gz";
sha256 = "sha256-dNRNcBwfFPxLmE+toelVcmtQTC2LBtJl56hh+llDy0g=";
};
buildInputs = [ pkgs.freetype pkgs.fontconfig pkgs.libjpeg pkgs.libpng ];
makeMakerFlags = "--incpath ${pkgs.libjpeg.dev}/include --libpath ${pkgs.libjpeg.out}/lib --incpath ${pkgs.libpng.dev}/include --libpath ${pkgs.libpng.out}/lib";
@ -11230,10 +11230,10 @@ let
IOAsyncSSL = buildPerlModule {
pname = "IO-Async-SSL";
version = "0.22";
version = "0.23";
src = fetchurl {
url = "mirror://cpan/authors/id/P/PE/PEVANS/IO-Async-SSL-0.22.tar.gz";
sha256 = "0c7363a7f1a08805bd1b2cf2b1a42a950ca71914c2aedbdd985970e011331a21";
url = "mirror://cpan/authors/id/P/PE/PEVANS/IO-Async-SSL-0.23.tar.gz";
sha256 = "sha256-0vyuFuJ+F6yjkDpK1aK/L7wmjQZRzn8ARabQVG9YTy4=";
};
buildInputs = [ TestIdentity ];
propagatedBuildInputs = [ Future IOAsync IOSocketSSL ];

View file

@ -5882,6 +5882,8 @@ in {
nextcord = callPackage ../development/python-modules/nextcord { };
nextdns = callPackage ../development/python-modules/nextdns { };
nftables = toPythonModule (pkgs.nftables.override {
python3 = python;
withPython = true;