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

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2022-08-16 12:01:42 +00:00 committed by GitHub
commit d4c5536c39
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
50 changed files with 22800 additions and 946 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
maintainers/maintainer-list.nix
View File

@ -7262,7 +7262,7 @@
};
lassulus = {
email = "lassulus@gmail.com";
matrix = "@lassulus:nixos.dev";
matrix = "@lassulus:lassul.us";
github = "Lassulus";
githubId = 621759;
name = "Lassulus";

2
nixos/modules/config/power-management.nix
View File

@ -91,7 +91,7 @@ in
systemd.services.post-resume =
{ description = "Post-Resume Actions";
after = [ "suspend.target" "hibernate.target" "hybrid-sleep.target" ];
after = [ "suspend.target" "hibernate.target" "hybrid-sleep.target" "suspend-then-hibernate.target" ];
script =
''
/run/current-system/systemd/bin/systemctl try-restart post-resume.target

27
nixos/tests/systemd-machinectl.nix
View File

@ -33,12 +33,12 @@ import ./make-test-python.nix (
networking.useNetworkd = true;
networking.useDHCP = false;
# open DHCP server on interface to container
networking.firewall.trustedInterfaces = [ "ve-+" ];
# do not try to access cache.nixos.org
nix.settings.substituters = lib.mkForce [ ];
# auto-start container
systemd.targets.machines.wants = [ "systemd-nspawn@${containerName}.service" ];
virtualisation.additionalPaths = [ containerSystem ];
};
@ -59,8 +59,19 @@ import ./make-test-python.nix (
machine.succeed("machinectl start ${containerName}");
machine.wait_until_succeeds("systemctl -M ${containerName} is-active default.target");
# Test nss_mymachines without nscd
machine.succeed('LD_LIBRARY_PATH="/run/current-system/sw/lib" getent -s hosts:mymachines hosts ${containerName}');
# Test failing nss_mymachines via nscd
# nscd has not enough rights to connect to systemd bus
# via sd_bus_open_system() in
# https://github.com/systemd/systemd/blob/main/src/nss-mymachines/nss-mymachines.c#L287
machine.fail("getent hosts ${containerName}");
# Test systemd-nspawn network configuration
machine.succeed("ping -n -c 1 ${containerName}");
machine.succeed("systemctl stop nscd");
machine.succeed('LD_LIBRARY_PATH="/run/current-system/sw/lib" ping -n -c 1 ${containerName}');
machine.succeed("systemctl start nscd");
# Test systemd-nspawn uses a user namespace
machine.succeed("test $(machinectl status ${containerName} | grep 'UID Shift: ' | wc -l) = 1")
@ -73,6 +84,14 @@ import ./make-test-python.nix (
machine.succeed("machinectl reboot ${containerName}");
machine.wait_until_succeeds("systemctl -M ${containerName} is-active default.target");
# Restart machine
machine.shutdown()
machine.start()
machine.wait_for_unit("default.target");
# Test auto-start
machine.succeed("machinectl show ${containerName}")
# Test machinectl stop
machine.succeed("machinectl stop ${containerName}");
machine.wait_until_succeeds("test $(systemctl is-active systemd-nspawn@${containerName}) = inactive");

1686
pkgs/applications/audio/netease-cloud-music-gtk/cargo-lock.patch
View File

File diff suppressed because it is too large Load Diff

82
pkgs/applications/audio/netease-cloud-music-gtk/default.nix
View File

@ -1,60 +1,78 @@
{ lib
, stdenv
, glib
, gtk3
, curl
, dbus
, openssl
, gst_all_1
, pkg-config
, rustPlatform
, wrapGAppsHook
, fetchurl
, fetchFromGitHub
, rustPlatform
, meson
, ninja
, pkg-config
, glib
, gtk4
, appstream-glib
, desktop-file-utils
, libxml2
, wrapGAppsHook4
, openssl
, dbus
, libadwaita
, gst_all_1
, Foundation
, SystemConfiguration
}:
rustPlatform.buildRustPackage rec {
stdenv.mkDerivation rec {
pname = "netease-cloud-music-gtk";
version = "1.2.2";
version = "2.0.1";
src = fetchFromGitHub {
owner = "gmg137";
repo = "netease-cloud-music-gtk";
repo = pname;
rev = version;
sha256 = "sha256-42MaylfG5LY+TiYHWQMoh9CiVLShKXSBpMrxdWhujow=";
hash = "sha256-dlJZvmfw9+cavAysxVzCekgPdygg5zbU3ZR5BOjPk08=";
};
patches = [ ./cargo-lock.patch ];
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src patches;
hash = "sha256-mJyjWEBsLhHwJCeZyRdby/K/jse0F9UBwfQxkNtZito=";
};
cargoSha256 = "sha256-A9wIcESdaJwLY4g/QlOxMU5PBB9wjvIzaXBSqeiRJBM=";
cargoPatches = [ ./cargo-lock.patch ];
nativeBuildInputs = [
glib
gtk3
dbus
meson
ninja
pkg-config
wrapGAppsHook
];
glib # glib-compile-resources
gtk4 # gtk4-update-icon-cache
appstream-glib # appstream-util
desktop-file-utils # update-desktop-database
libxml2 # xmllint
wrapGAppsHook4
] ++ (with rustPlatform; [
cargoSetupHook
rust.cargo
rust.rustc
]);
buildInputs = [
glib
gtk3
curl
dbus
openssl
dbus
libadwaita
] ++ (with gst_all_1; [
gstreamer
gst-plugins-base
gst-plugins-good
gst-plugins-bad
gst-plugins-ugly
]);
postPatch = ''
install -D netease-cloud-music-gtk.desktop $out/share/applications/netease-cloud-music-gtk.desktop
install -D icons/netease-cloud-music-gtk.svg $out/share/icons/hicolor/scalable/apps/netease-cloud-music-gtk.svg
'';
]) ++ lib.optionals stdenv.isDarwin [
Foundation
SystemConfiguration
];
meta = with lib; {
description = "netease-cloud-music-gtk is a Rust + GTK based netease cloud music player";
description = "A Rust + GTK based netease cloud music player";
homepage = "https://github.com/gmg137/netease-cloud-music-gtk";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ diffumist ];
mainProgram = "netease-cloud-music-gtk4";
};
}

2
pkgs/applications/audio/netease-cloud-music-gtk/update-cargo-lock.sh
View File

@ -6,7 +6,7 @@
set -eu -vx
here=$PWD
version=$(cat default.nix | rg '^ version = "' | cut -d '"' -f 2)
version=$(rg '^ version = "' default.nix | cut -d '"' -f 2)
checkout=$(mktemp -d)
git clone -b "$version" --depth=1 https://github.com/gmg137/netease-cloud-music-gtk "$checkout"

2
pkgs/applications/graphics/geeqie/default.nix
View File

@ -6,7 +6,7 @@
stdenv.mkDerivation rec {
pname = "geeqie";
version = "1.7.3";
version = "2.0.1";
src = fetchFromGitHub {
owner = "BestImageViewer";

4
pkgs/applications/misc/k4dirstat/default.nix
View File

@ -13,13 +13,13 @@
mkDerivation rec {
pname = "k4dirstat";
version = "3.4.0";
version = "3.4.2";
src = fetchFromGitHub {
owner = "jeromerobert";
repo = pname;
rev = version;
hash = "sha256-+JhMSatgCunzxIVSYIzt1L7O36LYbcFw7vmokgNffPY=";
hash = "sha256-nedtCa3h62pAmJYGIYp9jkNYiqe9WevVjwNAqVaaFuc=";
};
nativeBuildInputs = [ extra-cmake-modules ];

5
pkgs/applications/misc/prusa-slicer/default.nix
View File

@ -126,6 +126,11 @@ stdenv.mkDerivation rec {
# Since version 2.5.0 of nlopt we need to link to libnlopt, as libnlopt_cxx
# now seems to be integrated into the main lib.
sed -i 's|nlopt_cxx|nlopt|g' cmake/modules/FindNLopt.cmake
# Disable test_voronoi.cpp as the assembler hangs during build,
# likely due to commit e682dd84cff5d2420fcc0a40508557477f6cc9d3
# See issue #185808 for details.
sed -i 's|test_voronoi.cpp||g' tests/libslic3r/CMakeLists.txt
'';
src = fetchFromGitHub {

9
pkgs/applications/networking/cluster/helm/default.nix
View File

@ -2,23 +2,22 @@
buildGoModule rec {
pname = "kubernetes-helm";
version = "3.9.1";
gitCommit = "a7c043acb5ff905c261cfdc923a35776ba5e66e4";
version = "3.9.3";
src = fetchFromGitHub {
owner = "helm";
repo = "helm";
rev = "v${version}";
sha256 = "sha256-bhd8SyxiJ/8XrZpVwqvHSRe5gvE2VVEwmvUbVPsSC/4=";
sha256 = "sha256-fRlHI2g+pSexPzeEqUnow5WTPvNMGnQNWjnllzJ42fY=";
};
vendorSha256 = "sha256-v6jY90ht1S1tmO/Z9VGWDOz4zOSF0G77NSIqwAsktFo=";
vendorSha256 = "sha256-ZOY25wgxCdVQafdhBW4Z3aQxOGTs7N3SvSDJ/Fu5psg=";
subPackages = [ "cmd/helm" ];
ldflags = [
"-w"
"-s"
"-X helm.sh/helm/v3/internal/version.version=v${version}"
"-X helm.sh/helm/v3/internal/version.gitCommit=${gitCommit}"
"-X helm.sh/helm/v3/internal/version.gitCommit=${src.rev}"
];
preCheck = ''

6
pkgs/applications/networking/cluster/rancher/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "rancher";
version = "2.6.5";
version = "2.6.7";
src = fetchFromGitHub {
owner = "rancher";
repo = "cli";
rev = "v${version}";
sha256 = "sha256-/HI3qcpgNJTurPFEZFlg+H0ndowSgEF6cHp1cuaJjR8=";
sha256 = "sha256-vSwGUgGREH1veF4NN+LBGRVbuTcio6bcr6HuSN97BJI=";
};
ldflags = [
@ -19,7 +19,7 @@ buildGoModule rec {
"-static"
];
vendorSha256 = "sha256-Nay4YkUNXuH7vTK3ergILF0efCF1XyJZd2wBiT6fims=";
vendorSha256 = "sha256-oclMnt6uJa8SG2fNM0fi+HCVMMi4rkykx8VpK/tXilQ=";
postInstall = ''
mv $out/bin/cli $out/bin/rancher

43
pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix
View File

@ -1,35 +1,48 @@
{ lib, stdenv, fetchFromGitHub, openssl, sqlite }:
{ lib, stdenv, fetchFromGitHub, fetchpatch, openssl, sqlite }:
stdenv.mkDerivation rec {
pname = "signalbackup-tools";
version = "20220711";
version = "20220810";
src = fetchFromGitHub {
owner = "bepaald";
repo = pname;
rev = version;
sha256 = "sha256-dKU8oTQ6ECwycDN3k7NY/pKpNWH16ceJIFDnRNEA90c=";
sha256 = "sha256-z/RAvNUss9rNuBQvxjJQl66ZMrlxvmS9at8L/vSG0XU=";
};
buildInputs = [ openssl sqlite ];
buildFlags = [
"-Wall"
"-Wextra"
"-Wshadow"
"-Wold-style-cast"
"-Woverloaded-virtual"
"-pedantic"
"-std=c++2a"
"-O3"
"-march=native"
# TODO: Remove when updating to next release.
patches = [
(fetchpatch {
name = "fix-platform-checks.patch";
url = "https://github.com/bepaald/signalbackup-tools/compare/20220810..a81baf25b6ba63da7d30d9a239e5b4bbc8d1ab4f.patch";
sha256 = "sha256-i7fuPBil8zB+V3wHHdcbmP79OZoTfG2ZpXPQ3m7X06c=";
})
];
postPatch = ''
patchShebangs BUILDSCRIPT_MULTIPROC.bash44
'';
buildInputs = [ openssl sqlite ];
# Manually define `CXXFLAGS` and `LDFLAGS` on Darwin since the build scripts includes flags
# that don't work on Darwin.
buildPhase = ''
$CXX $buildFlags */*.cc *.cc -lcrypto -lsqlite3 -o signalbackup-tools
runHook preBuild
'' + lib.optionalString stdenv.isDarwin ''
export CXXFLAGS="-Wall -Wextra -Wshadow -Wold-style-cast -Woverloaded-virtual -pedantic -O3"
export LDFLAGS="-Wall -Wextra -O3"
'' + ''
./BUILDSCRIPT_MULTIPROC.bash44
runHook postBuild
'';
installPhase = ''
runHook preInstall
mkdir -p $out/bin
cp signalbackup-tools $out/bin/
runHook postInstall
'';
meta = with lib; {

15
pkgs/applications/office/zim/default.nix
View File

@ -7,18 +7,24 @@
python3Packages.buildPythonApplication rec {
pname = "zim";
version = "0.74.2";
version = "0.74.3";
src = fetchurl {
url = "https://zim-wiki.org/downloads/zim-${version}.tar.gz";
sha256 = "sha256-tZxBlpps2nLThSOq3WJ42iUQ4NG1Lb463bvDQ+djZJA=";
sha256 = "sha256-3ehPIkhsf1JnC9Qx3kQ6ilvRaBB7auBm2C1HOuNGzRU=";
};
buildInputs = [ gtk3 gobject-introspection wrapGAppsHook gnome.adwaita-icon-theme ];
buildInputs = [ gtk3 gobject-introspection gnome.adwaita-icon-theme ];
propagatedBuildInputs = with python3Packages; [ pyxdg pygobject3 ];
# see https://github.com/NixOS/nixpkgs/issues/56943#issuecomment-1131643663
nativeBuildInputs = [ gobject-introspection wrapGAppsHook ];
dontWrapGApps = true;
preFixup = ''
export makeWrapperArgs="--prefix XDG_DATA_DIRS : $out/share --argv0 $out/bin/.zim-wrapped"
makeWrapperArgs+=(--prefix XDG_DATA_DIRS : $out/share)
makeWrapperArgs+=(--argv0 $out/bin/.zim-wrapped)
makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
'';
# RuntimeError: could not create GtkClipboard object
@ -31,6 +37,7 @@ python3Packages.buildPythonApplication rec {
meta = with lib; {
description = "A desktop wiki";
homepage = "https://zim-wiki.org/";
changelog = "https://github.com/zim-desktop-wiki/zim-desktop-wiki/blob/${version}/CHANGELOG.md";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ pSub ];
broken = stdenv.isDarwin; # https://github.com/NixOS/nixpkgs/pull/52658#issuecomment-449565790

2
pkgs/applications/version-management/git-and-tools/radicle-cli/default.nix
View File

@ -58,7 +58,7 @@ rustPlatform.buildRustPackage rec {
meta = {
description = "Command-line tooling for Radicle, a decentralized code collaboration network";
homepage = "https://radicle.xyz";
license = lib.licenses.gpl3;
license = lib.licenses.gpl3Plus;
maintainers = with lib.maintainers; [ amesgen ];
platforms = lib.platforms.unix;
mainProgram = "rad";

13
pkgs/applications/video/mpv/scripts/mpris.nix
View File

@ -1,22 +1,15 @@
{ lib, stdenv, fetchpatch, fetchFromGitHub, pkg-config, glib, mpv-unwrapped }:
{ lib, stdenv, fetchFromGitHub, pkg-config, glib, mpv-unwrapped }:
stdenv.mkDerivation rec {
pname = "mpv-mpris";
version = "0.5";
version = "0.8.1";
src = fetchFromGitHub {
owner = "hoyon";
repo = "mpv-mpris";
rev = version;
sha256 = "07p6li5z38pkfd40029ag2jqx917vyl3ng5p2i4v5a0af14slcnk";
sha256 = "ugEiQZA1vQCVwyv3ViM84Qz8lhRvy17vcxjayYevTAs=";
};
patches = [
# Enables to "make SCRIPTS_DIR=... install" https://github.com/hoyon/mpv-mpris/pull/38
(fetchpatch {
url = "https://github.com/hoyon/mpv-mpris/commit/f1482350868bf20e4575f923943ec998469b255e.patch";
sha256 = "1lqy867wpmj6hv3zgi6g679a7x3dv5skpw24hwd05b28galnyd4l";
})
];
nativeBuildInputs = [ pkg-config ];

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

@ -17,6 +17,10 @@ stdenv.mkDerivation rec {
sha256 = "0vm96gxinhy48m3x9p1sfldyd03w3gk6iflb7n9kn06j1vqyswr6";
};
depsBuildBuild = [
pkg-config
];
nativeBuildInputs = [ meson ninja pkg-config wayland-scanner scdoc makeWrapper ];
buildInputs = [

60
pkgs/desktops/gnome/extensions/extensions.json
View File

File diff suppressed because one or more lines are too long

6
pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix
View File

@ -8,6 +8,7 @@
, vala
, glib
, libgee
, libhandy
, granite
, gexiv2
, gnome-settings-daemon
@ -24,13 +25,13 @@
stdenv.mkDerivation rec {
pname = "switchboard-plug-pantheon-shell";
version = "6.2.0";
version = "6.3.0";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "sha256-s7EMs8jeBFkDlLqOLtKuyQmCFNgXYMzKOKW/dVR2eqA=";
sha256 = "sha256-xaMoemI87uSlTN6qkxMiC26mdoU7nHTTCRnJgjQFtF4=";
};
nativeBuildInputs = [
@ -53,6 +54,7 @@ stdenv.mkDerivation rec {
granite
gtk3
libgee
libhandy
switchboard
wingpanel
];

2
pkgs/development/libraries/irrlichtmt/default.nix
View File

@ -7,7 +7,6 @@
, libjpeg
, libGL
, libX11
, libXxf86vm
, withTouchSupport ? false
, libXi
, libXext
@ -43,7 +42,6 @@ stdenv.mkDerivation rec {
libjpeg
libGL
libX11
libXxf86vm
] ++ lib.optionals withTouchSupport [
libXi
libXext

34
pkgs/development/libraries/libbluray/BDJ-JARFILE-path.patch
View File

@ -1,27 +1,27 @@
diff --git a/configure.ac b/configure.ac
index 5fd3c8de..7ae343e0 100644
index 5007bbd..f46de1a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -228,6 +228,10 @@ if test "x$use_bdjava_jar" = "xyes" && test "x$HAVE_ANT" = "xno"; then
AC_MSG_ERROR([BD-J requires ANT, but ant was not found. Please install it.])
fi
@@ -253,7 +253,7 @@ AS_IF([test "x${JDK_HOME}" != "x"], [
])
+if test "x$use_bdjava_jar" = "xyes"; then
+ CPPFLAGS="${CPPFLAGS} -DJARDIR='\"\$(datadir)/java\"'"
+fi
+
AC_DEFINE_UNQUOTED([JAVA_ARCH], ["$java_arch"], ["Defines the architecture of the java vm."])
AC_DEFINE_UNQUOTED([JDK_HOME], ["$JDK_HOME"], [""])
AM_CONDITIONAL([USING_BDJAVA_BUILD_JAR], [ test $use_bdjava_jar = "yes" ])
AS_IF([test "x$use_bdjava_jar" = "xyes"], [
-
+ CPPFLAGS="${CPPFLAGS} -DJARDIR='\"\$(datadir)/java\"'"
dnl check for ant
AC_CHECK_PROG(HAVE_ANT, [ant], yes, no)
AS_IF([test "x$HAVE_ANT" = "xno"], [
diff --git a/src/libbluray/bdj/bdj.c b/src/libbluray/bdj/bdj.c
index 511ad533..e273b9e0 100644
index 1cb1bfe..f3711c2 100644
--- a/src/libbluray/bdj/bdj.c
+++ b/src/libbluray/bdj/bdj.c
@@ -478,6 +478,7 @@ static const char *_find_libbluray_jar(BDJ_STORAGE *storage)
// pre-defined search paths for libbluray.jar
static const char * const jar_paths[] = {
#ifndef _WIN32
@@ -533,6 +533,9 @@ static char *_find_libbluray_jar0()
# ifdef __FreeBSD__
"/usr/local/share/java/" BDJ_JARFILE,
# else
+# ifdef JARDIR
+ JARDIR "/" BDJ_JARFILE,
+# endif
"/usr/share/java/" BDJ_JARFILE,
"/usr/share/libbluray/lib/" BDJ_JARFILE,
#endif
# endif

8
pkgs/development/libraries/libbluray/default.nix
View File

@ -20,11 +20,13 @@ stdenv.mkDerivation rec {
sha256 = "sha256-wksPQcW3N7u2XFRP5jSVY3p3HBClGd/IAudp8RK0O3U=";
};
patches = optional withJava ./BDJ-JARFILE-path.patch;
patches = [
./BDJ-JARFILE-path.patch
./libbluray-1.3.1-Fix-build-failure-after-Oracle-Java-CPU-for-April-2022.patch
];
nativeBuildInputs = [ pkg-config autoreconfHook ]
++ optionals withJava [ ant ]
;
++ optionals withJava [ ant ];
buildInputs = [ fontconfig ]
++ optional withJava jdk

25
pkgs/development/libraries/libbluray/libbluray-1.3.1-Fix-build-failure-after-Oracle-Java-CPU-for-April-2022.patch Normal file
View File

@ -0,0 +1,25 @@
From 8f26777b1ce124ff761f80ef52d6be10bcea323e Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Mon, 25 Apr 2022 14:28:58 +0300
Subject: [PATCH] Fix build failure after Oracle Java CPU for April 2022
--- a/src/libbluray/bdj/java/java/io/BDFileSystem.java
+++ b/src/libbluray/bdj/java/java/io/BDFileSystem.java
@@ -227,6 +227,17 @@ public abstract class BDFileSystem extends FileSystem {
return fs.isAbsolute(f);
}
+ public boolean isInvalid(File f) {
+ try {
+ Method m = fs.getClass().getDeclaredMethod("isInvalid", new Class[] { File.class });
+ Object[] args = new Object[] {(Object)f};
+ Boolean result = (Boolean)m.invoke(fs, args);
+ return result.booleanValue();
+ } finally {
+ return false;
+ }
+ }
+
public String resolve(File f) {
if (!booted)
return fs.resolve(f);

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

@ -17,7 +17,7 @@
buildPythonPackage rec {
pname = "aiohomekit";
version = "1.2.10";
version = "1.2.11";
format = "pyproject";
disabled = pythonOlder "3.9";
@ -26,7 +26,7 @@ buildPythonPackage rec {
owner = "Jc2k";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-JJaBspM1s8n+eZfRQQfX8EY2uBWdy23403AmCXbZ1Uw=";
hash = "sha256-A/exf2XTlogowdeFLmxO/P7JeGIE8CDsOX9tR0HOXws=";
};
nativeBuildInputs = [

6
pkgs/development/python-modules/inkbird-ble/default.nix
View File

@ -1,4 +1,5 @@
{ lib
, bluetooth-data-tools
, bluetooth-sensor-state-data
, buildPythonPackage
, fetchFromGitHub
@ -11,7 +12,7 @@
buildPythonPackage rec {
pname = "inkbird-ble";
version = "0.5.2";
version = "0.5.5";
format = "pyproject";
disabled = pythonOlder "3.9";
@ -20,7 +21,7 @@ buildPythonPackage rec {
owner = "Bluetooth-Devices";
repo = pname;
rev = "v${version}";
hash = "sha256-ieVjgNCkU6AJDTgLzmn2YPCNm+kId65QW3SNu2Xou1Q=";
hash = "sha256-KUBOjeFM4h2Qt9eT0mQKPFYJJ8OWdbYy9+AiHsJWNyU=";
};
nativeBuildInputs = [
@ -28,6 +29,7 @@ buildPythonPackage rec {
];
propagatedBuildInputs = [
bluetooth-data-tools
bluetooth-sensor-state-data
home-assistant-bluetooth
sensor-state-data

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

@ -6,14 +6,14 @@
buildPythonPackage rec {
pname = "peaqevcore";
version = "5.1.3";
version = "5.2.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-9cfxLbpA2WHsolF/jxrsx7mEWj6exlCNHce3waI308I=";
hash = "sha256-8zllJh34tAymjW3OaFNiDuChdk/og09l51OFlt0jNqs=";
};
postPatch = ''

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

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "pyathena";
version = "2.13.0";
version = "2.14.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -18,7 +18,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "PyAthena";
inherit version;
hash = "sha256-tt7Idp2MuR7DpXDUwtzqmMhQROb3018m/GxeSJia1j4=";
hash = "sha256-1DeqvlHlOt781nObnPdgZo3JqjwcK8lSREXqUNoKhhU=";
};
propagatedBuildInputs = [

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

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "pyswitchbot";
version = "0.18.7";
version = "0.18.10";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "Danielhiversen";
repo = "pySwitchbot";
rev = "refs/tags/${version}";
hash = "sha256-TAFrrCwlcbKoQk6puoSx2sk1WeucThf7614RNQ1NFbM=";
hash = "sha256-tK5U94rHPz/LHU4qAj1yv8CtMhjpAIQ1ktFooVIIqiw=";
};
propagatedBuildInputs = [

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

@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "python-gitlab";
version = "3.6.0";
version = "3.8.1";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-kBxU/5JvEEectZGjTWXwowIvK8xBB0+aGSx/p+TFcGE=";
sha256 = "sha256-4dslB2Ug4RjHwmvssNB0p6aBJ0OYcNQ7hjY0Igax4JE=";
};
propagatedBuildInputs = [

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

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "time-machine";
version = "2.7.1";
version = "2.8.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "adamchainz";
repo = pname;
rev = version;
sha256 = "sha256-bRqljS09IBp/uqbx9hrr1iEwqvAyOWyl4qjKhJqqGzc=";
sha256 = "sha256-L/03H91iZTyaB8vY0FGVu9iaesISAFHLIZliHI1NixI=";
};
propagatedBuildInputs = [

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

@ -5,13 +5,13 @@
buildPythonPackage rec {
pname = "types-dateutil";
version = "2.8.18";
version = "2.8.19";
format = "setuptools";
src = fetchPypi {
pname = "types-python-dateutil";
inherit version;
hash = "sha256-hpXH16WxrvQALzq04SR+I7HUHNfMEobUWUwtjFWTyZE=";
hash = "sha256-v9PrOcclOupLojsQ9psBfTCwE2YrtL5KtIsgu9dj8wk=";
};
pythonImportsCheck = [

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

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "weconnect-mqtt";
version = "0.39.0";
version = "0.39.1";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "tillsteinbach";
repo = "WeConnect-mqtt";
rev = "refs/tags/v${version}";
hash = "sha256-4qZWlICqYv8sewDfGbKSBGVVCtF/1BvYPc07gONZz8c=";
hash = "sha256-Mmv4rIABg8jlk7a2VYn3lozCdZtAy3w5tK+3z8bwqZA=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/whirlpool-sixth-sense/default.nix
View File

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "whirlpool-sixth-sense";
version = "unstable-2021-08-22";
version = "0.17.1";
format = "setuptools";
disabled = pythonOlder "3.6";
@ -20,7 +20,7 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "abmantis";
repo = pname;
rev = "ca336173d3b5d9a13e7e4b0fa7ca998a9b71d729";
rev = "refs/tags/${version}";
sha256 = "0b7bqg4h9q9rk3hv2im903xn7jgfyf36kcv31v96ap75yrvip6wa";
};

6
pkgs/development/tools/gopls/default.nix
View File

@ -2,17 +2,17 @@
buildGoModule rec {
pname = "gopls";
version = "0.9.3";
version = "0.9.4";
src = fetchFromGitHub {
owner = "golang";
repo = "tools";
rev = "gopls/v${version}";
sha256 = "sha256-WpSF3HnSjCqUkD1PVvtYXoWSyjYnasr85AK8wMULPBI=";
sha256 = "sha256-4bhKNMhC8kLRpS5DR6tLF7MgDX4LDeSKoeXcPYC2ywE=";
};
modRoot = "gopls";
vendorSha256 = "sha256-8NhZD7ImvsBGw0xi9NR7AB9SdHkwjsA+jV7UTjVF4wM=";
vendorSha256 = "sha256-r7XM7VX0VzFlUqrtvaQaiUXXiD1Vz4C3hmxRMonORAw=";
doCheck = false;

6
pkgs/development/tools/kubernetes-controller-tools/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "controller-tools";
version = "0.8.0";
version = "0.9.2";
src = fetchFromGitHub {
owner = "kubernetes-sigs";
repo = pname;
rev = "v${version}";
sha256 = "sha256-+nn/lj/MEtmC5NcvPOp1VZE13qJsGG+6eQaG+Yi8FTM=";
sha256 = "sha256-fMLydjdL9GCSX2rf7ORW1RhZJpjA0hyeK40AwKTkrxg=";
};
vendorSha256 = "sha256-QCF3sfBUAjiIGb2EFrLKj5wHJ6HxJVqLEjxUTpMiX6E=";
vendorSha256 = "sha256-6luowQB/j8ipHSuWMHia8SdacienDzpV8g2JH3k0W80=";
doCheck = false;

6
pkgs/development/tools/kubie/default.nix
View File

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "kubie";
version = "0.17.2";
version = "0.18.0";
src = fetchFromGitHub {
rev = "v${version}";
owner = "sbstp";
repo = "kubie";
sha256 = "sha256-fHZtJSxPA2OVNuJalRblsZFCCaYe5pXq0oQG1t6vqt0=";
sha256 = "sha256-mAm3St5Uc715Y7PCs9mAIp+IYvEHGSoS5ASdWCNPq2A=";
};
cargoSha256 = "sha256-yExKz1ckqIaN3fvX6/AJgq1ScDHF1bkYKeoiodFSK0o=";
cargoSha256 = "sha256-Z3W+XYhDriO+uWUIXAq3zv3GN0x9GFUc5C3ycrPz1e8=";
nativeBuildInputs = [ installShellFiles ];

4
pkgs/games/hedgewars/default.nix
View File

@ -33,6 +33,10 @@ stdenv.mkDerivation rec {
qtbase
] ++ lib.optional withServer ghc;
patches = [
./qt515.patch
];
postPatch = ''
substituteInPlace gameServer/CMakeLists.txt \
--replace mask evaluate

10
pkgs/games/hedgewars/qt515.patch Normal file
View File

@ -0,0 +1,10 @@
--- a/QTfrontend/ui/page/pagegamestats.cpp
+++ b/QTfrontend/ui/page/pagegamestats.cpp
@@ -22,6 +22,7 @@
#include <QGraphicsScene>
#include <QGroupBox>
#include <QSizePolicy>
+#include <QPainterPath>
#include "pagegamestats.h"
#include "team.h"

7
pkgs/games/minetest/default.nix
View File

@ -10,9 +10,7 @@
, libogg
, jsoncpp
, libjpeg
, libXxf86vm
, libGLU
, libGL
, openal
, libvorbis
, sqlite
@ -75,7 +73,6 @@ let
"-DENABLE_GETTEXT=1"
"-DENABLE_SPATIAL=1"
"-DENABLE_SYSTEM_JSONCPP=1"
"-DIRRLICHT_INCLUDE_DIR=${irrlichtmtInput.dev}/include/irrlichtmt"
# Remove when https://github.com/NixOS/nixpkgs/issues/144170 is fixed
"-DCMAKE_INSTALL_BINDIR=bin"
@ -85,8 +82,6 @@ let
"-DCMAKE_INSTALL_MANDIR=share/man"
"-DCMAKE_INSTALL_LOCALEDIR=share/locale"
] ++ optionals buildClient [
"-DOpenGL_GL_PREFERENCE=GLVND"
] ++ optionals buildServer [
"-DENABLE_PROMETHEUS=1"
] ++ optionals withTouchSupport [
@ -103,7 +98,7 @@ let
] ++ optionals stdenv.isDarwin [
libiconv OpenGL OpenAL Carbon Cocoa
] ++ optionals buildClient [
libpng libjpeg libGLU libGL openal libogg libvorbis xorg.libX11 libXxf86vm
libpng libjpeg libGLU openal libogg libvorbis xorg.libX11
] ++ optionals buildServer [
leveldb postgresql hiredis prometheus-cpp
];

2
pkgs/servers/home-assistant/component-packages.nix
View File

@ -2,7 +2,7 @@
# Do not edit!
{
version = "2022.8.4";
version = "2022.8.5";
components = {
"abode" = ps: with ps; [
abodepy

4
pkgs/servers/home-assistant/default.nix
View File

@ -307,7 +307,7 @@ let
extraPackagesFile = writeText "home-assistant-packages" (lib.concatMapStringsSep "\n" (pkg: pkg.pname) extraBuildInputs);
# Don't forget to run parse-requirements.py after updating
hassVersion = "2022.8.4";
hassVersion = "2022.8.5";
in python.pkgs.buildPythonApplication rec {
pname = "homeassistant";
@ -325,7 +325,7 @@ in python.pkgs.buildPythonApplication rec {
owner = "home-assistant";
repo = "core";
rev = version;
hash = "sha256-x6W69oGCPXK7OLN/XaF4A+OSubSnhFYof1SvLwy9+jY=";
hash = "sha256-cPoXL9YQolU5o/R9XhxfTDAwutzgksrsonitwjvxGM0=";
};
# leave this in, so users don't have to constantly update their downstream patch handling

1
pkgs/servers/home-assistant/tests.nix
View File

@ -6,6 +6,7 @@ let
# some components' tests have additional dependencies
extraCheckInputs = with home-assistant.python.pkgs; {
alexa = [ av ];
bluetooth = [ pyswitchbot ];
camera = [ av ];
cloud = [ mutagen ];
config = [ pydispatcher ];

55
pkgs/servers/mail/listmonk/default.nix Normal file
View File

@ -0,0 +1,55 @@
{ lib, buildGoModule, fetchFromGitHub, callPackage, stuffbin }:
buildGoModule rec {
pname = "listmonk";
version = "2.2.0";
src = fetchFromGitHub {
owner = "knadh";
repo = "listmonk";
rev = "v${version}";
sha256 = "sha256-dtIM0dkr8y+GbyCqrBlR5VRq6qMiZdmQyFvIoVY1eUg=";
};
vendorSha256 = "sha256-qeBuDM3REUxgu3ty02d7qsULH04USE0JUvBrtVnW8vg=";
nativeBuildInputs = [
stuffbin
];
ldflags = [ "-s" "-w" "-X main.version=${version}" ];
postInstall = ''
mv $out/bin/cmd $out/bin/listmonk
'';
# Run stuffbin to stuff the frontend and the static in the binary.
postFixup =
let
vfsMappings = [
"config.toml.sample"
"schema.sql"
"queries.sql"
"static/public:/public"
"static/email-templates"
"${passthru.frontend}:/admin"
"i18n:/i18n"
];
in
''
stuffbin -a stuff -in $out/bin/listmonk -out $out/bin/listmonk \
${lib.concatStringsSep " " vfsMappings}
'';
passthru = {
frontend = callPackage ./frontend.nix { inherit meta; };
};
meta = with lib; {
description = "High performance, self-hosted, newsletter and mailing list manager with a modern dashboard.";
homepage = "https://github.com/knadh/listmonk";
changelog = "https://github.com/knadh/listmonk/releases/tag/v${version}";
maintainers = with maintainers; [ raitobezarius ];
license = licenses.agpl3;
};
}

32
pkgs/servers/mail/listmonk/frontend.nix Normal file
View File

@ -0,0 +1,32 @@
{ yarn2nix-moretea
, fetchFromGitHub
, meta
}:
yarn2nix-moretea.mkYarnPackage rec {
pname = "listmonk-frontend";
version = "2.2.0";
src = fetchFromGitHub {
owner = "knadh";
repo = "listmonk";
rev = "v${version}";
sha256 = "sha256-dtIM0dkr8y+GbyCqrBlR5VRq6qMiZdmQyFvIoVY1eUg=";
};
packageJSON = ./package.json;
yarnLock = ./yarn.lock;
yarnNix = ./yarn.nix;
installPhase = ''
cd deps/listmonk-frontend/frontend
npm run build
mv dist $out
'';
doDist = false;
inherit meta;
}

46
pkgs/servers/mail/listmonk/package.json Normal file
View File

@ -0,0 +1,46 @@
{
"name": "listmonk-frontend",
"version": "0.1.0",
"private": true,
"scripts": {
"serve": "vue-cli-service serve",
"build": "vue-cli-service build",
"build-report": "vue-cli-service build --report",
"lint": "vue-cli-service lint"
},
"dependencies": {
"@tinymce/tinymce-vue": "^3",
"axios": "^0.27.2",
"buefy": "^0.9.10",
"c3": "^0.7.20",
"codeflask": "^1.4.1",
"core-js": "^3.12.1",
"dayjs": "^1.10.4",
"indent.js": "^0.3.5",
"qs": "^6.10.1",
"textversionjs": "^1.1.3",
"tinymce": "^5.10.0",
"turndown": "^7.0.0",
"vue": "^2.6.12",
"vue-i18n": "^8.22.2",
"vue-router": "^3.2.0",
"vuex": "^3.6.2"
},
"devDependencies": {
"@vue/cli-plugin-babel": "~4.5.13",
"@vue/cli-plugin-eslint": "~4.5.13",
"@vue/cli-plugin-router": "~4.5.13",
"@vue/cli-plugin-vuex": "~4.5.13",
"@vue/cli-service": "~4.5.13",
"@vue/eslint-config-airbnb": "^5.3.0",
"babel-eslint": "^10.1.0",
"cypress": "9.5.2",
"cypress-file-upload": "^5.0.2",
"eslint": "^7.27.0",
"eslint-plugin-import": "^2.23.3",
"eslint-plugin-vue": "^7.9.0",
"sass": "^1.34.0",
"sass-loader": "^10.2.0",
"vue-template-compiler": "^2.6.12"
}
}

25
pkgs/servers/mail/listmonk/stuffbin.nix Normal file
View File

@ -0,0 +1,25 @@
{ lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "stuffbin";
version = "1.1.0";
vendorSha256 = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo=";
src = fetchFromGitHub {
owner = "knadh";
repo = "stuffbin";
rev = "v${version}";
sha256 = "sha256-M72xNh7bKUMLzA+M8bJB++kJ5KCrkboQm1v8BasP3Yo=";
};
ldflags = [ "-s" "-w" "-X main.version=${version}" ];
meta = with lib; {
description = "Compress and embed static files and assets into Go binaries and access them with a virtual file system in production";
homepage = "https://github.com/knadh/stuffbin";
changelog = "https://github.com/knadh/stuffbin/releases/tag/v${version}";
maintainers = with maintainers; [ raitobezarius ];
license = licenses.mit;
};
}

10337
pkgs/servers/mail/listmonk/yarn.lock Normal file
View File

File diff suppressed because it is too large Load Diff

11085
pkgs/servers/mail/listmonk/yarn.nix Normal file
View File

File diff suppressed because it is too large Load Diff

4
pkgs/servers/unifi/default.nix
View File

@ -66,7 +66,7 @@ in rec {
};
unifi7 = generic {
version = "7.1.68";
sha256 = "sha256-N12/v1uUPBpU/lXOvj7AjSKo/CjWTjGr9SMIiE/ldF8=";
version = "7.2.92";
sha256 = "sha256-TB9fJAYnH09YSNAEdbMHsVJjil+ovBu8F/oVtxqhvIM=";
};
}

25
pkgs/tools/filesystems/stuffbin/default.nix Normal file
View File

@ -0,0 +1,25 @@
{ lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "stuffbin";
version = "1.1.0";
vendorSha256 = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo=";
src = fetchFromGitHub {
owner = "knadh";
repo = "stuffbin";
rev = "v${version}";
sha256 = "sha256-M72xNh7bKUMLzA+M8bJB++kJ5KCrkboQm1v8BasP3Yo=";
};
ldflags = [ "-s" "-w" "-X main.version=${version}" ];
meta = with lib; {
description = "Compress and embed static files and assets into Go binaries and access them with a virtual file system in production";
homepage = "https://github.com/knadh/stuffbin";
changelog = "https://github.com/knadh/stuffbin/releases/tag/v${version}";
maintainers = with maintainers; [ raitobezarius ];
license = licenses.mit;
};
}

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

@ -22620,6 +22620,8 @@ with pkgs;
lighttpd = callPackage ../servers/http/lighttpd { };
listmonk = callPackage ../servers/mail/listmonk { };
livepeer = callPackage ../servers/livepeer { };
lwan = callPackage ../servers/http/lwan { };
@ -25397,7 +25399,9 @@ with pkgs;
netease-music-tui = callPackage ../applications/audio/netease-music-tui { };
netease-cloud-music-gtk = callPackage ../applications/audio/netease-cloud-music-gtk { };
netease-cloud-music-gtk = callPackage ../applications/audio/netease-cloud-music-gtk {
inherit (darwin.apple_sdk.frameworks) Foundation SystemConfiguration;
};
nordic = callPackage ../data/themes/nordic { };
@ -30661,6 +30665,8 @@ with pkgs;
stretchly = callPackage ../applications/misc/stretchly { };
stuffbin = callPackage ../tools/filesystems/stuffbin { };
stumpish = callPackage ../applications/window-managers/stumpish {};
stumpwm = lispPackages.stumpwm;
@ -32772,7 +32778,7 @@ with pkgs;
harmonist = callPackage ../games/harmonist { };
hedgewars = libsForQt514.callPackage ../games/hedgewars {
hedgewars = libsForQt5.callPackage ../games/hedgewars {
inherit (haskellPackages) ghcWithPackages;
};