dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot] 2023-11-18 12:01:43 +00:00 committed by GitHub
commit 7d142a90de
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
36 changed files with 385 additions and 140 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nixos/lib/systemd-network-units.nix
View File

@ -23,6 +23,12 @@ in {
'' + optionalString (def.vlanConfig != { }) ''
[VLAN]
${attrsToSection def.vlanConfig}
'' + optionalString (def.ipvlanConfig != { }) ''
[IPVLAN]
${attrsToSection def.ipvlanConfig}
'' + optionalString (def.ipvtapConfig != { }) ''
[IPVTAP]
${attrsToSection def.ipvtapConfig}
'' + optionalString (def.macvlanConfig != { }) ''
[MACVLAN]
${attrsToSection def.macvlanConfig}

11
nixos/modules/services/misc/forgejo.nix
View File

@ -436,17 +436,6 @@ in
];
};
# Work around 'pq: permission denied for schema public' with postgres v15, until a
# solution for `services.postgresql.ensureUsers` is found.
# See https://github.com/NixOS/nixpkgs/issues/216989
systemd.services.postgresql.postStart = lib.mkIf (
usePostgresql
&& cfg.database.createDatabase
&& lib.strings.versionAtLeast config.services.postgresql.package.version "15.0"
) (lib.mkAfter ''
$PSQL -tAc 'ALTER DATABASE "${cfg.database.name}" OWNER TO "${cfg.database.user}";'
'');
services.mysql = optionalAttrs (useMysql && cfg.database.createDatabase) {
enable = mkDefault true;
package = mkDefault pkgs.mariadb;

36
nixos/modules/system/boot/networkd.nix
View File

@ -122,6 +122,16 @@ let
(assertValueOneOf "PacketInfo" boolValues)
(assertValueOneOf "VNetHeader" boolValues)
];
# See https://www.freedesktop.org/software/systemd/man/latest/systemd.netdev.html#%5BIPVTAP%5D%20Section%20Options
ipVlanVtapChecks = [
(assertOnlyFields [
"Mode"
"Flags"
])
(assertValueOneOf "Mode" ["L2" "L3" "L3S" ])
(assertValueOneOf "Flags" ["private" "vepa" "bridge" ])
];
in {
sectionNetdev = checkUnitConfig "Netdev" [
@ -146,6 +156,7 @@ let
"ip6gretap"
"ipip"
"ipvlan"
"ipvtap"
"macvlan"
"macvtap"
"sit"
@ -191,6 +202,10 @@ let
(assertValueOneOf "ReorderHeader" boolValues)
];
sectionIPVLAN = checkUnitConfig "IPVLAN" ipVlanVtapChecks;
sectionIPVTAP = checkUnitConfig "IPVTAP" ipVlanVtapChecks;
sectionMACVLAN = checkUnitConfig "MACVLAN" [
(assertOnlyFields [
"Mode"
@ -615,6 +630,7 @@ let
"VRF"
"VLAN"
"IPVLAN"
"IPVTAP"
"MACVLAN"
"MACVTAP"
"VXLAN"
@ -1623,6 +1639,26 @@ let
'';
};
ipvlanConfig = mkOption {
default = {};
example = { Mode = "L2"; Flags = "private"; };
type = types.addCheck (types.attrsOf unitOption) check.netdev.sectionIPVLAN;
description = lib.mdDoc ''
Each attribute in this set specifies an option in the `[IPVLAN]` section of the unit.
See {manpage}`systemd.netdev(5)` for details.
'';
};
ipvtapConfig = mkOption {
default = {};
example = { Mode = "L3"; Flags = "vepa"; };
type = types.addCheck (types.attrsOf unitOption) check.netdev.sectionIPVTAP;
description = lib.mdDoc ''
Each attribute in this set specifies an option in the `[IPVTAP]` section of the unit.
See {manpage}`systemd.netdev(5)` for details.
'';
};
macvlanConfig = mkOption {
default = {};
example = { Mode = "private"; };

4
pkgs/applications/audio/ledfx/default.nix
View File

@ -5,12 +5,12 @@
python3.pkgs.buildPythonPackage rec {
pname = "ledfx";
version = "2.0.69";
version = "2.0.78";
format = "setuptools";
src = fetchPypi {
inherit pname version;
hash = "sha256-gkO6XYiPMkU/zRLvc0yd3jJXVcAgAkR1W1ELTSN461o=";
hash = "sha256-IalfA/nfQrnE90ycOnPEZ4A/L8rwi08ECNA/8YxeAgQ=";
};
postPatch = ''

2
pkgs/applications/editors/emacs/make-emacs.nix
View File

@ -90,6 +90,7 @@
, withXinput2 ? withX && lib.versionAtLeast version "29"
, withXwidgets ? !stdenv.isDarwin && !noGui && (withGTK3 || withPgtk)
, withSmallJaDic ? false
, withCompressInstall ? true
# Options
, siteStart ? ./site-start.el
@ -339,6 +340,7 @@ mkDerivation (finalAttrs: {
++ lib.optional withXinput2 "--with-xinput2"
++ lib.optional withXwidgets "--with-xwidgets"
++ lib.optional withSmallJaDic "--with-small-ja-dic"
++ lib.optional (!withCompressInstall) "--without-compress-install"
;
env = lib.optionalAttrs withNativeCompilation {

4
pkgs/applications/graphics/gimp/default.nix
View File

@ -56,13 +56,13 @@ let
python = python2.withPackages (pp: [ pp.pygtk ]);
in stdenv.mkDerivation (finalAttrs: {
pname = "gimp";
version = "2.10.34";
version = "2.10.36";
outputs = [ "out" "dev" ];
src = fetchurl {
url = "http://download.gimp.org/pub/gimp/v${lib.versions.majorMinor finalAttrs.version}/gimp-${finalAttrs.version}.tar.bz2";
sha256 = "hABGQtNRs5ikKTzX/TWSBEqUTwW7UoUO5gaPJHxleqM=";
sha256 = "sha256-PTvDxppL2zrqm6LVOF7ZjqA5U/OFeq/R1pdgEe1827I=";
};
patches = [

4
pkgs/applications/window-managers/e16/default.nix
View File

@ -21,11 +21,11 @@
stdenv.mkDerivation rec {
pname = "e16";
version = "1.0.28";
version = "1.0.29";
src = fetchurl {
url = "mirror://sourceforge/enlightenment/e16-${version}.tar.xz";
hash = "sha256-k3W2IoBc75DNQ2QSjChsC/yVRO/aZT3E31Tl/njgH30=";
hash = "sha256-LvLiw6+hduAl8dNBTtBwqvgKBRwojBUd5tNm1hZl5Hs=";
};
nativeBuildInputs = [

81
pkgs/applications/misc/free42/default.nix → pkgs/by-name/fr/free42/package.nix
View File

@ -1,22 +1,22 @@
{ lib
, stdenv
, fetchFromGitHub
, makeDesktopItem
, copyDesktopItems
, pkg-config
, gtk3
, alsa-lib
, copyDesktopItems
, gtk3
, makeDesktopItem
, pkg-config
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "free42";
version = "3.0.21";
version = "3.1";
src = fetchFromGitHub {
owner = "thomasokken";
repo = pname;
rev = "v${version}";
hash = "sha256-zRO0buYfKtybUisWZJRkvLJVLJYZwLcDnT04rnQWy+s=";
repo = "free42";
rev = "v${finalAttrs.version}";
hash = "sha256-v3nZMjV9KnoTefeu2jl3k1B7efnJnNVOAfDVLyce6QI=";
};
nativeBuildInputs = [
@ -35,6 +35,27 @@ stdenv.mkDerivation rec {
dontConfigure = true;
desktopItems = [
(makeDesktopItem {
name = "com.thomasokken.free42bin";
desktopName = "Free42Bin";
genericName = "Calculator";
exec = "free42bin";
type = "Application";
comment = finalAttrs.meta.description;
categories = [ "Utility" "Calculator" ];
})
(makeDesktopItem {
name = "com.thomasokken.free42dec";
desktopName = "Free42Dec";
genericName = "Calculator";
exec = "free42dec";
type = "Application";
comment = finalAttrs.meta.description;
categories = [ "Utility" "Calculator" ];
})
];
buildPhase = ''
runHook preBuild
@ -50,48 +71,28 @@ stdenv.mkDerivation rec {
runHook preInstall
install --directory $out/bin \
$out/share/doc/${pname} \
$out/share/${pname}/skins \
$out/share/doc/free42 \
$out/share/free42/skins \
$out/share/icons/hicolor/48x48/apps \
$out/share/icons/hicolor/128x128/apps
install -m755 gtk/free42dec gtk/free42bin $out/bin
install -m644 gtk/README $out/share/doc/${pname}/README-GTK
install -m644 README $out/share/doc/${pname}/README
install -m644 gtk/README $out/share/doc/free42/README-GTK
install -m644 README $out/share/doc/free42/README
install -m644 gtk/icon-48x48.xpm $out/share/icons/hicolor/48x48/apps
install -m644 gtk/icon-128x128.xpm $out/share/icons/hicolor/128x128/apps
install -m644 skins/* $out/share/${pname}/skins
install -m644 skins/* $out/share/free42/skins
runHook postInstall
'';
desktopItems = [
(makeDesktopItem {
name = "com.thomasokken.free42bin";
desktopName = "Free42Bin";
genericName = "Calculator";
exec = "free42bin";
type = "Application";
comment = meta.description;
categories = [ "Utility" "Calculator" ];
})
(makeDesktopItem {
name = "com.thomasokken.free42dec";
desktopName = "Free42Dec";
genericName = "Calculator";
exec = "free42dec";
type = "Application";
comment = meta.description;
categories = [ "Utility" "Calculator" ];
})
];
meta = with lib; {
meta = {
homepage = "https://github.com/thomasokken/free42";
description = "A software clone of HP-42S Calculator";
license = licenses.gpl2Only;
maintainers = with maintainers; [ AndersonTorres plabadens ];
platforms = with platforms; unix;
license = with lib.licenses; [ gpl2Only ];
maintainers = with lib.maintainers; [ AndersonTorres ];
mainProgram = "free42dec";
platforms = with lib.platforms; unix;
};
}
})

34
pkgs/applications/networking/browsers/offpunk/default.nix → pkgs/by-name/of/offpunk/package.nix
View File

@ -1,14 +1,15 @@
{
fetchFromSourcehut,
installShellFiles,
less,
lib,
offpunk,
python3Packages,
testers,
timg,
xdg-utils,
xsel,
{ fetchFromSourcehut
, file
, installShellFiles
, less
, lib
, offpunk
, python3Packages
, testers
, timg
, xdg-utils
, xsel
,
}:
let
@ -23,6 +24,7 @@ let
setproctitle
];
otherDependencies = [
file
less
timg
xdg-utils
@ -31,7 +33,7 @@ let
in
python3Packages.buildPythonPackage rec {
pname = "offpunk";
version = "1.10";
version = "2.0";
format = "pyproject";
disabled = python3Packages.pythonOlder "3.7";
@ -40,23 +42,21 @@ python3Packages.buildPythonPackage rec {
owner = "~lioploum";
repo = "offpunk";
rev = "v${version}";
hash = "sha256-+jGKPPnKZHn+l6VAwuae6kICwR7ymkYJjsM2OHQAEmU=";
hash = "sha256-6ftc2goCNgvXf5kszvjeSHn24Hn73jq26Irl5jiN6pk=";
};
nativeBuildInputs = [ python3Packages.flit-core installShellFiles ];
nativeBuildInputs = [ python3Packages.hatchling installShellFiles ];
propagatedBuildInputs = otherDependencies ++ pythonDependencies;
postInstall = ''
installManPage man/*.1
'';
passthru.tests.version = testers.testVersion { package = offpunk; };
meta = with lib; {
description = "An Offline-First browser for the smolnet ";
homepage = src.meta.homepage;
maintainers = with maintainers; [ DamienCassou ];
platforms = platforms.linux;
license = licenses.bsd2;
license = licenses.agpl3Plus;
};
}

58
pkgs/by-name/si/signaturepdf/package.nix Normal file
View File

@ -0,0 +1,58 @@
{ lib
, stdenv
, fetchFromGitHub
, php
, makeWrapper
, imagemagick
, librsvg
, potrace
, pdftk
, ghostscript
}:
stdenv.mkDerivation rec {
pname = "signaturepdf";
version = "1.5.0";
src = fetchFromGitHub {
owner = "24eme";
repo = "${pname}";
rev = "v${version}";
hash = "sha256-7yhvTxpjxHcmRxTE7avM+dN+yz9iVr8Ea/e2yfkBURA=";
};
nativeBuildInputs = [ makeWrapper ];
dontConfigure = true;
dontBuild = true;
installPhase = ''
runHook preInstall
mkdir -p $out/share/signaturepdf $out/bin
cp --target-directory=$out/share/signaturepdf --recursive \
app.php config locale public templates vendor
makeWrapper ${lib.getExe php} $out/bin/signaturepdf \
--inherit-argv0 \
--chdir $out/share/signaturepdf \
--prefix PATH : ${lib.makeBinPath [ imagemagick librsvg potrace pdftk ghostscript ]} \
--run 'port=$1' \
--run '[ $# -ge 1 ] || ( echo "Usage $0 <port> -d upload_max_filesize=24M -d post_max_size=24M -d max_file_uploads=201" >&2 && exit 1 )' \
--run 'shift' \
--run 'echo "You may now open a web browser on http://localhost:$port"' \
--add-flags '-S "localhost:$port" -t public'
runHook preInstall
'';
meta = with lib; {
description = "Web software for signing PDFs and also organize pages, edit metadata and compress pdf";
homepage = "https://pdf.24eme.fr/";
changelog =
"https://github.com/24eme/signaturepdf/releases/tag/v${version}";
license = licenses.agpl3;
platforms = platforms.all;
maintainers = with maintainers; [ DamienCassou ];
};
}

37
pkgs/development/libraries/libepc/default.nix
View File

@ -1,30 +1,51 @@
{ lib, stdenv, fetchurl, pkg-config, intltool, gtk-doc, glib, avahi, gnutls, libuuid, libsoup, gtk3, gnome }:
{ stdenv
, lib
, fetchurl
, autoreconfHook
, pkg-config
, intltool
, gtk-doc
, glib
, avahi
, gnutls
, libuuid
, libsoup
, gtk3
, gnome
}:
let
avahiWithGtk = avahi.override { gtk3Support = true; };
in stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "libepc";
version = "0.4.6";
outputs = [ "out" "dev" "devdoc" ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
url = "mirror://gnome/sources/libepc/${lib.versions.majorMinor finalAttrs.version}/libepc-${finalAttrs.version}.tar.xz";
sha256 = "1s3svb2slqjsrqfv50c2ymnqcijcxb5gnx6bfibwh9l5ga290n91";
};
patches = [
# Remove dependency that is only needed by uninstalled examples.
./no-avahi-ui.patch
];
nativeBuildInputs = [
autoreconfHook
gnome.gnome-common
pkg-config
intltool
gtk-doc
];
buildInputs = [
glib
libuuid
gtk3
];
propagatedBuildInputs = [
avahiWithGtk
avahi
gnutls
libsoup
];
@ -33,7 +54,7 @@ in stdenv.mkDerivation rec {
passthru = {
updateScript = gnome.updateScript {
packageName = pname;
packageName = "libepc";
versionPolicy = "odd-unstable";
};
};
@ -45,4 +66,4 @@ in stdenv.mkDerivation rec {
maintainers = teams.gnome.members;
platforms = platforms.linux;
};
}
})

36
pkgs/development/libraries/libepc/no-avahi-ui.patch Normal file
View File

@ -0,0 +1,36 @@
diff --git a/Makefile.am b/Makefile.am
index acf0d25..13022d1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -32,8 +32,6 @@ noinst_PROGRAMS = \
examples/lookup-resource \
examples/service-browser \
examples/simple-publisher \
- examples/consumer-ui \
- examples/publisher-ui \
examples/server-credentials \
$(TESTS)
TESTS = \
@@ -155,10 +153,6 @@ examples_service_browser_LDADD = $(example_epc_libs)
examples_simple_publisher_CFLAGS = $(example_epc_cflags)
examples_simple_publisher_LDADD = $(example_epc_libs)
-examples_consumer_ui_CFLAGS = $(example_epc_ui_cflags) $(AVAHI_UI_CFLAGS)
-examples_consumer_ui_LDADD = $(example_epc_ui_libs) $(AVAHI_UI_LIBS)
-examples_publisher_ui_CFLAGS = $(example_epc_ui_cflags) $(AVAHI_UI_CFLAGS) -rdynamic
-examples_publisher_ui_LDADD = $(example_epc_ui_libs) $(AVAHI_UI_LIBS)
examples_server_credentials_CFLAGS = $(example_epc_ui_cflags)
examples_server_credentials_LDADD = $(example_epc_ui_libs)
diff --git a/configure.ac b/configure.ac
index d68bf94..89bd471 100644
--- a/configure.ac
+++ b/configure.ac
@@ -53,7 +53,6 @@ PKG_CHECK_EXISTS([$GIO_REQUIREMENT],
GIO=$GIO_REQUIREMENT],
[AC_MSG_RESULT([no])])
-PKG_CHECK_MODULES(AVAHI_UI, [avahi-ui-gtk3 >= 0.6])
PKG_CHECK_MODULES(LIBEPC, [avahi-client >= 0.6
avahi-glib >= 0.6
glib-2.0 >= 2.36

1
pkgs/development/libraries/libspatialindex/default.nix
View File

@ -32,6 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
description = "Extensible spatial index library in C++";
homepage = "https://libspatialindex.org";
license = licenses.mit;
maintainers = teams.geospatial.members;
platforms = platforms.unix;
};
})

4
pkgs/development/python-modules/aioesphomeapi/default.nix
View File

@ -22,7 +22,7 @@
buildPythonPackage rec {
pname = "aioesphomeapi";
version = "18.4.1";
version = "18.5.2";
pyproject = true;
disabled = pythonOlder "3.9";
@ -31,7 +31,7 @@ buildPythonPackage rec {
owner = "esphome";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-o1Yv4/wSM2k+L2/JP3teUj129QlyLjoShCRWJ3lIN98=";
hash = "sha256-kj4FHsNsGsMxK+EI1jgqBfvldkyAoBkCTGT1yiZMmzY=";
};
nativeBuildInputs = [

6
pkgs/development/python-modules/appthreat-vulnerability-db/default.nix
View File

@ -17,8 +17,8 @@
buildPythonPackage rec {
pname = "appthreat-vulnerability-db";
version = "5.5.2";
format = "pyproject";
version = "5.5.3";
pyproject = true;
disabled = pythonOlder "3.7";
@ -26,7 +26,7 @@ buildPythonPackage rec {
owner = "AppThreat";
repo = "vulnerability-db";
rev = "refs/tags/v${version}";
hash = "sha256-ioFTayuPkxXIaaKKVHBLyU47jID6dGWCX1G9kVkD5Yo=";
hash = "sha256-6kfkHLW5PftzrhKjywc670HpKCrrU0POEiJ3u2doBTk=";
};
postPatch = ''

4
pkgs/development/python-modules/google-cloud-org-policy/default.nix
View File

@ -11,14 +11,14 @@
buildPythonPackage rec {
pname = "google-cloud-org-policy";
version = "1.8.2";
version = "1.8.3";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-SJpjS72keOf9QF1imsWLbgMSzxCDloO4tuc4vUy8ZBk=";
hash = "sha256-VU+vB+x2DElwzl1cO7qTdV91Mn1i2Dsq2safnMrwuqI=";
};
propagatedBuildInputs = [

45
pkgs/development/python-modules/linknlink/default.nix Normal file
View File

@ -0,0 +1,45 @@
{ lib
, buildPythonPackage
, cryptography
, fetchFromGitHub
, pythonOlder
, setuptools
}:
buildPythonPackage rec {
pname = "linknlink";
version = "0.1.1";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "xuanxuan000";
repo = "python-linknlink";
rev = "refs/tags/${version}";
hash = "sha256-pr0FwNweg7hFcvaOHQyXjIzH1L6Q4q/1llwfdl9k0Sk=";
};
nativeBuildInputs = [
setuptools
];
propagatedBuildInputs = [
cryptography
];
pythonImportsCheck = [
"linknlink"
];
# Module has no test
doCheck = false;
meta = with lib; {
description = "Module and CLI for controlling Linklink devices locally";
homepage = "https://github.com/xuanxuan000/python-linknlink";
changelog = "";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
};
}

4
pkgs/development/python-modules/md-toc/default.nix
View File

@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "md-toc";
version = "8.2.0";
version = "8.2.2";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "frnmst";
repo = pname;
rev = version;
hash = "sha256-7Udmon/5E741+v2vBHHL7h31r91RR33hN1WhL3FiDQc=";
hash = "sha256-fL3JlZWTEEinYILNeHw0cuvVza27atLLxjrBZkVLRiU=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/meraki/default.nix
View File

@ -8,14 +8,14 @@
buildPythonPackage rec {
pname = "meraki";
version = "1.38.0";
version = "1.39.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-LYwjcm4qZfzrDSujQ9eaxjPN9z0qWDSfT+IU1f32cY0=";
hash = "sha256-B3+2KnRXWkB83Sy/NH9kJwgSha9L17tx37fFwBjT3Mw=";
};
propagatedBuildInputs = [

16
pkgs/development/python-modules/mopeka-iot-ble/default.nix
View File

@ -12,8 +12,8 @@
buildPythonPackage rec {
pname = "mopeka-iot-ble";
version = "0.4.1";
format = "pyproject";
version = "0.5.0";
pyproject = true;
disabled = pythonOlder "3.9";
@ -21,9 +21,14 @@ buildPythonPackage rec {
owner = "bluetooth-devices";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-x/cKg2NC6kssUQeBuQH4yghlRDgs/fJ0bWWL+qnHgcM=";
hash = "sha256-m27As3tB77JbgY0kDDJ6kmYFTv2O/Sh6y9tFiKDIjbI=";
};
postPatch = ''
substituteInPlace pyproject.toml \
--replace " --cov=mopeka_iot_ble --cov-report=term-missing:skip-covered" ""
'';
nativeBuildInputs = [
poetry-core
];
@ -39,11 +44,6 @@ buildPythonPackage rec {
pytestCheckHook
];
postPatch = ''
substituteInPlace pyproject.toml \
--replace " --cov=mopeka_iot_ble --cov-report=term-missing:skip-covered" ""
'';
pythonImportsCheck = [
"mopeka_iot_ble"
];

4
pkgs/development/python-modules/oslo-log/default.nix
View File

@ -17,7 +17,7 @@
buildPythonPackage rec {
pname = "oslo-log";
version = "5.3.0";
version = "5.4.0";
format = "setuptools";
disabled = pythonOlder "3.8";
@ -25,7 +25,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "oslo.log";
inherit version;
hash = "sha256-zJSqvbUOHiVxxsvEs5lpSgVBV2c1kIqYSgIjqeH72z4=";
hash = "sha256-LrNVtYVw8lgR2nb6gUU7h1x8lEoZoj0sMFtKTf670iM=";
};
propagatedBuildInputs = [

18
pkgs/development/python-modules/pygobject-stubs/default.nix
View File

@ -1,25 +1,23 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, setuptools
, black
, codespell
, isort
, mypy
, pre-commit
, pygobject3
, pythonOlder
, setuptools
}:
buildPythonPackage rec {
pname = "pygobject-stubs";
version = "2.9.0";
format = "pyproject";
version = "2.10.0";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "pygobject";
repo = "pygobject-stubs";
rev = "refs/tags/v${version}";
hash = "sha256-A28vH5S5xxY7VIJORbgQ7jAi/wG4WiffNGryiumHWf0=";
hash = "sha256-fz+qzFWl9JJu9CEVkeiV6XUIPDvwWgrfhTo/nj1EH5c=";
};
nativeBuildInputs = [
@ -32,7 +30,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "PEP 561 Typing Stubs for PyGObject";
homepage = "https://github.com/pygobject/pygobject-stubs";
changelog = "https://github.com/pygobject/pygobject-stubs/blob/${src.rev}/CHANGELOG.md";
changelog = "https://github.com/pygobject/pygobject-stubs/blob/${version}/CHANGELOG.md";
license = licenses.lgpl21Plus;
maintainers = with maintainers; [ hacker1024 ];
};

4
pkgs/development/python-modules/pyinsteon/default.nix
View File

@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "pyinsteon";
version = "1.5.1";
version = "1.5.2";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -25,7 +25,7 @@ buildPythonPackage rec {
owner = pname;
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-H2rgPA0GW6neFIHZVZxmAP50HJUPCWDZcJ90QxLGXJ8=";
hash = "sha256-7iiB/a8E8E2TSkGuAWR08ESExDz8DKTMjqp4Xnp3wHU=";
};
nativeBuildInputs = [

4
pkgs/development/python-modules/ring-doorbell/default.nix
View File

@ -17,7 +17,7 @@
buildPythonPackage rec {
pname = "ring-doorbell";
version = "0.8.0";
version = "0.8.1";
pyproject = true;
disabled = pythonOlder "3.8";
@ -25,7 +25,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "ring_doorbell";
inherit version;
hash = "sha256-6kfD87GlEb+f6hUSqhyPIy4Xg63f8zDdGKMaOxQYWoM=";
hash = "sha256-A7FQeeYym0nAQlkbpejpZqd5ZgX2cw3/DbshDxlrivw=";
};
nativeBuildInputs = [

4
pkgs/development/python-modules/syrupy/default.nix
View File

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "syrupy";
version = "4.5.0";
version = "4.6.0";
format = "pyproject";
disabled = lib.versionOlder python.version "3.8.1";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "tophat";
repo = "syrupy";
rev = "refs/tags/v${version}";
hash = "sha256-HRCURqnFzo1l+PjX1LtXTSVZGA36OaRgmy4xKizeuOg=";
hash = "sha256-FjDGwSOKvDWx+LwUCNGEOBKV3rFG+09gtFpLLi0xgD4=";
};
nativeBuildInputs = [

4
pkgs/development/python-modules/total-connect-client/default.nix
View File

@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "total-connect-client";
version = "2023.7";
version = "2023.11";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "craigjmidwinter";
repo = "total-connect-client";
rev = "refs/tags/${version}";
hash = "sha256-sx4KfWQCvGS+w83tECJSyLLWU9GkwYpo39gt4EKndPk=";
hash = "sha256-UTMYuSKNn5ACKg9BmeUf1SFhDV1jknbxggkmCgzB/xk=";
};
nativeBuildInputs = [

10
pkgs/development/python-modules/wakeonlan/default.nix
View File

@ -8,15 +8,16 @@
buildPythonPackage rec {
pname = "wakeonlan";
version = "3.0.0";
disabled = pythonOlder "3.6";
format = "pyproject";
version = "3.1.0";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "remcohaszing";
repo = "pywakeonlan";
rev = "refs/tags/${version}";
hash = "sha256-7BDE7TmTT8rSaG0rEn5QwH+izGWA2PeQzxpGiv7+3fo=";
hash = "sha256-VPdklyD3GVn0cex4I6zV61I0bUr4KQp8DdMKAM/r4io=";
};
nativeBuildInputs = [
@ -38,6 +39,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Python module for wake on lan";
homepage = "https://github.com/remcohaszing/pywakeonlan";
changelog = "https://github.com/remcohaszing/pywakeonlan/releases/tag/${version}";
license = licenses.mit;
maintainers = with maintainers; [ peterhoeg ];
};

4
pkgs/development/tools/misc/uncrustify/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "uncrustify";
version = "0.77.1";
version = "0.78.0";
src = fetchFromGitHub {
owner = "uncrustify";
repo = "uncrustify";
rev = "uncrustify-${version}";
sha256 = "sha256-9U6PTeU/LVFL9XzP9XSFjDx18CR3athThEz+h2+5qZ8=";
sha256 = "sha256-wuwZFTa8XGMN3dlpdaMYiKvyS3DJMUgqRgaDtj/s7vI=";
};
nativeBuildInputs = [ cmake python3 ];

8
pkgs/development/tools/rust/cargo-llvm-cov/default.nix
View File

@ -26,7 +26,7 @@
let
pname = "cargo-llvm-cov";
version = "0.5.36";
version = "0.5.37";
owner = "taiki-e";
homepage = "https://github.com/${owner}/${pname}";
@ -37,7 +37,7 @@ let
cargoLock = fetchurl {
name = "Cargo.lock";
url = "https://crates.io/api/v1/crates/${pname}/${version}/download";
sha256 = "sha256-ZI5vxtMcIEtVPIeedha3S6GEvvQDBB9eyOFwkAAO22I=";
sha256 = "sha256-UJXZ7FhbkIcVAv4PymO4sCqhJ0KFORCCO3w0w9W46qQ=";
downloadToTemp = true;
postFetch = ''
tar xzf $downloadedFile ${pname}-${version}/Cargo.lock
@ -55,7 +55,7 @@ rustPlatform.buildRustPackage {
inherit owner;
repo = pname;
rev = "v${version}";
sha256 = "sha256-Ii21kjQ4nWEttvGY9bxhGmfLkI2MrAsYJZcwfE2y6uQ=";
sha256 = "sha256-aJIMG2gaotu1XdNxcE2xJS78qAqlNzF3p2RMvqBraTk=";
leaveDotGit = true;
};
@ -64,7 +64,7 @@ rustPlatform.buildRustPackage {
cp ${cargoLock} source/Cargo.lock
'';
cargoSha256 = "sha256-BHocUJpk4qplwMfpSXNTZjOpUCZGS676xYrqtSFnP7s=";
cargoSha256 = "sha256-dbC8OcH/Ae98SUx9d4rsBdhYQfzsWZpiGqJoIGPDSbY=";
# `cargo-llvm-cov` reads these environment variables to find these binaries,
# which are needed to run the tests

9
pkgs/development/web/deno/default.nix
View File

@ -13,16 +13,16 @@
rustPlatform.buildRustPackage rec {
pname = "deno";
version = "1.38.0";
version = "1.38.2";
src = fetchFromGitHub {
owner = "denoland";
repo = pname;
rev = "v${version}";
hash = "sha256-x01KggCu/sJnVvfJW/NZ+ARcl2Nl9LKn9dPBVmZcLi4=";
hash = "sha256-DLVeI1pnHpUya8muVUP6VNXiLmlaedOOPPef3tHNOng=";
};
cargoHash = "sha256-PEKdQoAYhPpeHfv2pKGTsNaA1EANpf/GJw/3s+6TCoA=";
cargoHash = "sha256-qTvPpUBinPm3eQ5PLcqdCcZEG5Q6kGyt35mL914K9jk=";
postPatch = ''
# upstream uses lld on aarch64-darwin for faster builds
@ -44,6 +44,9 @@ rustPlatform.buildRustPackage rec {
(with darwin.apple_sdk.frameworks; [ Security CoreServices Metal Foundation QuartzCore ])
);
# work around "error: unknown warning group '-Wunused-but-set-parameter'"
env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-unknown-warning-option";
buildAndTestSubdir = "cli";
# The v8 package will try to download a `librusty_v8.a` release at build time to our read-only filesystem

17
pkgs/tools/graphics/zbar/0.23.92-CVE-2023-40889.patch Normal file
View File

@ -0,0 +1,17 @@
Simple bounds checks for CVE-2023-40889, based on third-party
fix by Remi Meier @
https://github.com/Raemi/zbar/commit/5e8acc6974f17e56c3ddaa5509870beb8d7a599c
--- a/zbar/qrcode/qrdec.c
+++ b/zbar/qrcode/qrdec.c
@@ -3900,8 +3900,8 @@ void qr_reader_match_centers(qr_reader *_reader,qr_code_data_list *_qrlist,
/*TODO: We might be able to accelerate this step significantly by
considering the remaining finder centers in a more intelligent order,
based on the first finder center we just chose.*/
- for(j=i+1;!mark[i]&&j<_ncenters;j++){
- for(k=j+1;!mark[j]&&k<_ncenters;k++)if(!mark[k]){
+ for(j=i+1; i < _ncenters && !mark[i]&&j<_ncenters;j++){
+ for(k=j+1; j < _ncenters && !mark[j]&&k<_ncenters;k++)if(!mark[k]){
qr_finder_center *c[3];
qr_code_data qrdata;
int version;

26
pkgs/tools/graphics/zbar/0.23.92-CVE-2023-40890.patch Normal file
View File

@ -0,0 +1,26 @@
Simple bounds checks for CVE-2023-40890
--- a/zbar/decoder/databar.c
+++ b/zbar/decoder/databar.c
@@ -23,6 +23,8 @@
#include <config.h>
#include <zbar.h>
+#include <stdlib.h>
+#include <stdio.h>
#ifdef DEBUG_DATABAR
# define DEBUG_LEVEL (DEBUG_DATABAR)
@@ -691,6 +693,12 @@ lookup_sequence (databar_segment_t *seg,
fixed = -1;
s <<= 1;
dbprintf(2, "%x", s);
+
+ if (i > 20) {
+ fprintf(stderr, "Bug: Out-of-bounds condition detected\n");
+ exit(99);
+ }
+
seq[i++] = s++;
seq[i++] = s;
}

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

@ -1,6 +1,7 @@
{ stdenv
, lib
, fetchFromGitHub
, fetchpatch
, imagemagickBig
, pkg-config
, withXorg ? true
@ -42,6 +43,11 @@ stdenv.mkDerivation rec {
sha256 = "sha256-VhVrngAX7pXZp+szqv95R6RGAJojp3svdbaRKigGb0w=";
};
patches = [
./0.23.92-CVE-2023-40889.patch
./0.23.92-CVE-2023-40890.patch
];
nativeBuildInputs = [
pkg-config
xmlto

4
pkgs/tools/misc/fzf/default.nix
View File

@ -25,13 +25,13 @@ let
in
buildGoModule rec {
pname = "fzf";
version = "0.44.0";
version = "0.44.1";
src = fetchFromGitHub {
owner = "junegunn";
repo = pname;
rev = version;
hash = "sha256-YIMtLQzxORWFWCgdnLUQLmmE79aw40LhcxqiHCWjgNk=";
hash = "sha256-oL3AA/3RPKcXLBNYaBYleueQph7/xvN/UEhwcYM9lAs=";
};
vendorHash = "sha256-EutNjyW5bvGvMZP9xBrcu91TOAbl9TDZe2+g0/qnuAQ=";

4
pkgs/top-level/all-packages.nix
View File

@ -8462,8 +8462,6 @@ with pkgs;
fornalder = callPackage ../applications/version-management/fornalder { };
free42 = callPackage ../applications/misc/free42 { };
galen = callPackage ../development/tools/galen { };
gallery-dl = python3Packages.callPackage ../applications/misc/gallery-dl { };
@ -32527,8 +32525,6 @@ with pkgs;
noson = libsForQt5.callPackage ../applications/audio/noson { };
offpunk = callPackage ../applications/networking/browsers/offpunk { };
owl-compositor = callPackage ../applications/window-managers/owl { };
p2pool = callPackage ../applications/misc/p2pool { };

2
pkgs/top-level/python-packages.nix
View File

@ -6354,6 +6354,8 @@ self: super: with self; {
linkify-it-py = callPackage ../development/python-modules/linkify-it-py { };
linknlink = callPackage ../development/python-modules/linknlink { };
linode-api = callPackage ../development/python-modules/linode-api { };
linode = callPackage ../development/python-modules/linode { };