Merge branch 'master' into staging-next

Conflicts:
	pkgs/development/python-modules/hahomematic/default.nix
This commit is contained in:
Jan Tojnar 2023-12-25 16:54:44 +01:00
commit 2ac16accc0
55 changed files with 315 additions and 166 deletions

View file

@ -228,14 +228,8 @@ in
description = "Guix daemon socket";
before = [ "multi-user.target" ];
listenStreams = [ "${cfg.stateDir}/guix/daemon-socket/socket" ];
unitConfig = {
RequiresMountsFor = [
cfg.storeDir
cfg.stateDir
];
ConditionPathIsReadWrite = "${cfg.stateDir}/guix/daemon-socket";
};
wantedBy = [ "socket.target" ];
unitConfig.RequiresMountsFor = [ cfg.storeDir cfg.stateDir ];
wantedBy = [ "sockets.target" ];
};
systemd.mounts = [{

View file

@ -294,7 +294,6 @@ in
systemd.services.freshrss-updater = {
description = "FreshRSS feed updater";
after = [ "freshrss-config.service" ];
wantedBy = [ "multi-user.target" ];
startAt = "*:0/5";
environment = {
DATA_PATH = cfg.dataDir;

View file

@ -56,6 +56,10 @@ in
retry(instance_is_up)
machine.succeed("echo true | incus exec container /run/current-system/sw/bin/bash -")
with subtest("Container mounts lxcfs overlays"):
machine.succeed("incus exec container mount | grep 'lxcfs on /proc/cpuinfo type fuse.lxcfs'")
machine.succeed("incus exec container mount | grep 'lxcfs on /proc/meminfo type fuse.lxcfs'")
with subtest("Container CPU limits can be managed"):
set_container("limits.cpu 1")
cpuinfo = machine.succeed("incus exec container grep -- -c ^processor /proc/cpuinfo").strip()

View file

@ -37,8 +37,10 @@ import ./make-test-python.nix ({ pkgs, ...} : {
with subtest("ensure munin-node starts and listens on 4949"):
one.wait_for_unit("munin-node.service")
one.wait_for_open_port(4949)
with subtest("ensure munin-cron output is correct"):
one.wait_for_file("/var/lib/munin/one/one-uptime-uptime-g.rrd")
one.wait_for_file("/var/www/munin/one/index.html")
one.wait_for_file("/var/www/munin/one/one/diskstat_iops_vda-day.png", timeout=60)
'';
})

View file

@ -25,16 +25,16 @@
rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } rec {
pname = "neovide";
version = "0.11.2";
version = "0.12.0";
src = fetchFromGitHub {
owner = "neovide";
repo = "neovide";
rev = version;
sha256 = "sha256-JCSFG7W4I1uXsVM7J059tHYq/DB16AZfGjsG0UvfctE=";
sha256 = "sha256-m3ZdzdmkW69j1sZ9h7M1m5fDNnJ7BM7nwYPx7QhsIso=";
};
cargoSha256 = "sha256-rH4jjbd0C1MKu3RE0bLvLo4iqyUXr0DvCudvFs1F+AA=";
cargoSha256 = "sha256-AAHMx4xxbC/JdmAPE2bub7qdF5sFNWjqXI1nuCUxsZA=";
SKIA_SOURCE_DIR =
let
@ -42,8 +42,8 @@ rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } rec {
owner = "rust-skia";
repo = "skia";
# see rust-skia:skia-bindings/Cargo.toml#package.metadata skia
rev = "m113-0.61.8";
sha256 = "sha256-xGfkc1JLBGQW4WcblFyluZ2paEuisCVPNDU4Rfkv3BE=";
rev = "m119-0.67.3";
sha256 = "sha256-U75NuJnQa5+SNlOrsBmdlvflGdjo3el63EeIsbnE7ms=";
};
# The externals for skia are taken from skia/DEPS
externals = linkFarm "skia-externals" (lib.mapAttrsToList
@ -116,5 +116,7 @@ rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } rec {
changelog = "https://github.com/neovide/neovide/releases/tag/${version}";
license = with licenses; [ mit ];
maintainers = with maintainers; [ ck3d multisn8 ];
platforms = platforms.all;
badPlatforms = platforms.darwin;
};
}

View file

@ -6,8 +6,8 @@
},
"libjpeg-turbo": {
"url": "https://chromium.googlesource.com/chromium/deps/libjpeg_turbo.git",
"rev": "22f1a22c99e9dde8cd3c72ead333f425c5a7aa77",
"sha256": "sha256-5MaYvyrhADFGKBxcS3kbKcn9tj0FNXAN/rAXXYW6ljs="
"rev": "ed683925e4897a84b3bffc5c1414c85b97a129a3",
"sha256": "sha256-DYJP3phe4OzCtRN2pMc07ITTWR8MuIlOWWg9PBsQAVw="
},
"icu": {
"url": "https://chromium.googlesource.com/chromium/deps/icu.git",
@ -21,13 +21,13 @@
},
"harfbuzz": {
"url": "https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git",
"rev": "09a266236147497bd8149240062c31c16fbc81e3",
"sha256": "sha256-NLydUJI15zRBFFDc7VRDXjgc0AwS3l6GMt2usMWOSG4="
"rev": "4cfc6d8e173e800df086d7be078da2e8c5cfca19",
"sha256": "sha256-rrstyAz7Eb8ZgFJZKUASY8nU4YFZAptd5VS9B2cs2Yg="
},
"wuffs": {
"url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git",
"rev": "a0041ac0310b3156b963e2f2bea09245f25ec073",
"sha256": "sha256-obRMrrKY3rPdFwQNa5IplpuKqiodHvRC8jbIOjp7R2w="
"rev": "e3f919ccfe3ef542cfc983a82146070258fb57f8",
"sha256": "sha256-373d2F/STcgCHEq+PO+SCHrKVOo6uO1rqqwRN5eeBCw="
},
"libpng": {
"url": "https://skia.googlesource.com/third_party/libpng.git",

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "sameboy";
version = "0.15.8";
version = "0.16";
src = fetchFromGitHub {
owner = "LIJI32";
repo = "SameBoy";
rev = "v${version}";
sha256 = "sha256-SBK+aYekEJreD0XBvYaU12eIKmm9JNYIpPt1XhUtH4c=";
sha256 = "sha256-sQVTCHOSc2N+Qs/rl0DfsUzg7P5Egws2UuNBQ9fpkoQ=";
};
enableParallelBuilding = true;

View file

@ -10,16 +10,16 @@
buildGoModule rec {
pname = "werf";
version = "1.2.270";
version = "1.2.275";
src = fetchFromGitHub {
owner = "werf";
repo = "werf";
rev = "v${version}";
hash = "sha256-8AF+D/kbRkalUOQmpGamyhq5LEu1Uyxj6NuzWviDKRM=";
hash = "sha256-8WMkarh/5ylCz1IqyLefivjvCBAl15TvT6TLqBmG7Hs=";
};
vendorHash = "sha256-20bPsBRya7Gg7p/hSSnnYLoSHf/fRwk1UrA/KlMT3Jk=";
vendorHash = "sha256-LXjGqI9cowou5ZHVRldwCD1vOzwCyU269TkTflIkdAc=";
proxyVendor = true;

View file

@ -108,8 +108,8 @@ stdenv.mkDerivation (finalAttrs: {
funding from the DOE. It is an open-source code, distributed freely
under the terms of the GNU Public License (GPL).
'';
homepage = "https://lammps.sandia.gov";
license = licenses.gpl2Plus;
homepage = "https://www.lammps.org";
license = licenses.gpl2Only;
platforms = platforms.linux;
# compiling lammps with 64 bit support blas and lapack might cause runtime
# segfaults. In anycase both blas and lapack should have the same #bits

View file

@ -178,7 +178,11 @@ let
buildPhase = ''
runHook preBuild
dart pub deps --json | jq .packages > $out
if [ -e ${dart}/bin/flutter ]; then
flutter pub deps --json | jq .packages > $out
else
dart pub deps --json | jq .packages > $out
fi
runHook postBuild
'';

View file

@ -7,16 +7,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-xwin";
version = "0.16.2";
version = "0.16.3";
src = fetchFromGitHub {
owner = "rust-cross";
repo = "cargo-xwin";
rev = "v${version}";
hash = "sha256-EZM1TeWUnoRcsF6m6mDNCoUR2WWe7ohqT3wNWnq0kQY=";
hash = "sha256-3i/XlCuHjVBSH4XZR5M457H+kheKZoJXlwqRwPhSnCM=";
};
cargoHash = "sha256-MEBMXP7a/w2aN6RuWrm16PsnIPw6+8k5jI2yRnwBy0s=";
cargoHash = "sha256-yKoUcrAZy66qahDvRgOnbJmXuUXDjDBTGt2p5gXjVyI=";
buildInputs = lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.Security

View file

@ -16,16 +16,16 @@
buildGoModule rec {
pname = "incus-unwrapped";
version = "0.3.0";
version = "0.4.0";
src = fetchFromGitHub {
owner = "lxc";
repo = "incus";
rev = "refs/tags/v${version}";
hash = "sha256-oPBrIN4XUc9GnBszEWAAnEcNahV4hfB48XSKvkpq5Kk=";
hash = "sha256-crWepf5j3Gd1lhya2DGIh/to7l+AnjKJPR+qUd9WOzw=";
};
vendorHash = "sha256-TwrHWjBd6Hn7CQMxFhHobopeefCvYeDz8fAPYmTKV9M=";
vendorHash = "sha256-YfUvkN1qUS3FFKb1wysg40WcJA8fT9SGDChSdT+xnkc=";
postPatch = ''
substituteInPlace internal/usbid/load.go \

View file

@ -16,13 +16,13 @@
assert lib.assertOneOf "graphicsLibrary" graphicsLibrary [ "SDL2" "GLFW" ];
stdenv.mkDerivation (finalAttrs: {
pname = "jazz2";
version = "2.3.0";
version = "2.4.0";
src = fetchFromGitHub {
owner = "deathkiller";
repo = "jazz2-native";
rev = finalAttrs.version;
hash = "sha256-oBDBq2SToab94mK0kIB0H53jJMFZrHvsdPmfAd5ZjCY=";
hash = "sha256-Rv+fU2SGxdmxfDANX+HpZDZBm9HYzSvAQDqPSQ8WJps=";
};
patches = [ ./nocontent.patch ];

View file

@ -4,23 +4,24 @@
, cmake
, pkg-config
, openssl
, samba
}:
rustPlatform.buildRustPackage rec {
pname = "legba";
version = "0.6.1";
version = "0.7.1";
src = fetchFromGitHub {
owner = "evilsocket";
repo = "legba";
rev = "v${version}";
hash = "sha256-/ASjvlsPQAPNZpzdTTyZYrcYImV2GS+SSfhSQP0K2n0=";
hash = "sha256-7HDW5M0lsKbcQw3p/CYmUeX2xE4BZXUSNqa9Ab/ZP0I=";
};
cargoHash = "sha256-QgnJ/oUpW4o2Hi2+xKfprxjCw4sho8kIyW+AUJ9pwuU=";
cargoHash = "sha256-rkqwc8BILW/OIHa95skkG4IDlBfH3qX1ROJgcn8f2W0=";
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ openssl.dev ];
buildInputs = [ openssl.dev samba ];
# Paho C test fails due to permission issue
doCheck = false;

View file

@ -6,18 +6,18 @@
buildGoModule rec {
pname = "lxd-to-incus";
version = "0.3.0";
version = "0.4.0";
src = fetchFromGitHub {
owner = "lxc";
repo = "incus";
rev = "refs/tags/v${version}";
hash = "sha256-oPBrIN4XUc9GnBszEWAAnEcNahV4hfB48XSKvkpq5Kk=";
hash = "sha256-crWepf5j3Gd1lhya2DGIh/to7l+AnjKJPR+qUd9WOzw=";
};
modRoot = "cmd/lxd-to-incus";
vendorHash = "sha256-/ONflpW1HGvXooPF+Xui8q4xFu/Zq5br+Vjm9d2gm5U=";
vendorHash = "sha256-cBAqJz3Y4CqyxTt7u/4mXoQPKmKgQ3gYJV1NiC/H+TA=";
CGO_ENABLED = 0;

View file

@ -2,7 +2,7 @@
python3Packages.buildPythonApplication rec {
pname = "pyprland";
version = "1.6.0";
version = "1.6.9";
format = "pyproject";
disabled = python3Packages.pythonOlder "3.10";
@ -11,7 +11,7 @@ python3Packages.buildPythonApplication rec {
owner = "hyprland-community";
repo = "pyprland";
rev = version;
hash = "sha256-QbbBpaBIlU4IoU/NM7igDap8TxOKePQ8JI3ZlH944Bs=";
hash = "sha256-qmITBg9csfCIcyTADUOfEo/Nrou01bXHORQ66+Jvodo=";
};
nativeBuildInputs = with python3Packages; [ poetry-core ];

View file

@ -2,20 +2,20 @@
buildNpmPackage rec {
pname = "vieb";
version = "10.6.0";
version = "11.0.0";
src = fetchFromGitHub {
owner = "Jelmerro";
repo = pname;
rev = version;
hash = "sha256-WVG30wkyGiqd3uEhk2h2MHu4L0yE6DRP6NAKMExjuOs=";
hash = "sha256-OBOxT2leZYD3td1+PJdLv7Nph/gY6U9tVC7b/fUmUJw=";
};
postPatch = ''
sed -i '/"electron"/d' package.json
'';
npmDepsHash = "sha256-kvC1+odojkSFWqcyNUg2SbeEn1EkA+EdfaVWY9QmPz4=";
npmDepsHash = "sha256-vgp20qVT4JZ7U24uu9ZPkveXchMNcdbljodALAMAu9s=";
makeCacheWritable = true;
dontNpmBuild = true;

View file

@ -23,13 +23,13 @@ in
stdenvNoCC.mkDerivation rec {
pname = "where-is-my-sddm-theme";
version = "1.5.1";
version = "1.6.0";
src = fetchFromGitHub {
owner = "stepanzubkov";
repo = pname;
rev = "v${version}";
hash = "sha256-T6b+rxjlxZCQ/KDaxBM8ZryA3n6a+3jo+J2nETBYslM=";
hash = "sha256-EK0bB2dRXNtDKFiyf+nMoDq9XK2f3PFwoNbQDZamB3Y=";
};
propagatedUserEnvPkgs = [ qtgraphicaleffects ];

View file

@ -1,4 +1,4 @@
{cudaVersion, lib}:
{cudaVersion, lib, addDriverRunpath}:
let
inherit (lib) attrsets lists strings;
# cudaVersionOlder : Version -> Boolean
@ -42,6 +42,21 @@ attrsets.filterAttrs (attr: _: (builtins.hasAttr attr prev)) {
lists.optionals (cudaVersionAtLeast "12.0") [final.libnvjitlink.lib]
);
cuda_cudart = prev.cuda_cudart.overrideAttrs (
prevAttrs: {
allowFHSReferences = false;
# The libcuda stub's pkg-config doesn't follow the general pattern:
postPatch = prevAttrs.postPatch or "" + ''
while IFS= read -r -d $'\0' path ; do
sed -i \
-e "s|^libdir\s*=.*/lib\$|libdir=''${!outputLib}/lib/stubs|" \
-e "s|^Libs\s*:\(.*\)\$|Libs: \1 -Wl,-rpath,${addDriverRunpath.driverLink}/lib|" \
"$path"
done < <(find -iname 'cuda-*.pc' -print0)
'';
});
cuda_compat = prev.cuda_compat.overrideAttrs (
prevAttrs: {
env.autoPatchelfIgnoreMissingDeps =
@ -115,7 +130,10 @@ attrsets.filterAttrs (attr: _: (builtins.hasAttr attr prev)) {
moveToOutput "nvvm" "''${!outputBin}"
'';
meta = (oldAttrs.meta or {}) // {
# The nvcc and cicc binaries contain hard-coded references to /usr
allowFHSReferences = true;
meta = (oldAttrs.meta or { }) // {
mainProgram = "nvcc";
};
}

View file

@ -94,7 +94,12 @@ backendStdenv.mkDerivation (
# Traversed in the order of the outputs speficied in outputs;
# entries are skipped if they don't exist in outputs.
outputToPatterns = {
bin = ["bin"];
bin = [ "bin" ];
dev = [
"share/pkg-config"
"**/*.pc"
"**/*.cmake"
];
lib = [
"lib"
"lib64"
@ -116,6 +121,22 @@ backendStdenv.mkDerivation (
inherit (redistribRelease.${redistArch}) sha256;
};
postPatch = ''
if [[ -d pkg-config ]] ; then
mkdir -p share/pkg-config
mv pkg-config/* share/pkg-config/
rmdir pkg-config
fi
for pc in share/pkg-config/*.pc ; do
sed -i \
-e "s|^cudaroot\s*=.*\$|cudaroot=''${!outputDev}|" \
-e "s|^libdir\s*=.*/lib\$|libdir=''${!outputLib}/lib|" \
-e "s|^includedir\s*=.*/include\$|includedir=''${!outputDev}/include|" \
"$pc"
done
'';
# We do need some other phases, like configurePhase, so the multiple-output setup hook works.
dontBuild = true;
@ -197,6 +218,20 @@ backendStdenv.mkDerivation (
runHook postInstall
'';
doInstallCheck = true;
allowFHSReferences = true; # TODO: Default to `false`
postInstallCheck = ''
echo "Executing postInstallCheck"
if [[ -z "''${allowFHSReferences-}" ]] ; then
mapfile -t outputPaths < <(for o in $(getAllOutputNames); do echo "''${!o}"; done)
if grep --max-count=5 --recursive --exclude=LICENSE /usr/ "''${outputPaths[@]}" ; then
echo "Detected references to /usr" >&2
exit 1
fi
fi
'';
# libcuda needs to be resolved during runtime
# NOTE: Due to the use of __structuredAttrs, we can't use a list for autoPatchelfIgnoreMissingDeps, since it
# will take only the first value. Instead, we produce a string with the values separated by spaces.

View file

@ -333,8 +333,8 @@ in {
};
ruby_3_3 = generic {
version = rubyVersion "3" "3" "0" "rc1";
hash = "sha256-xP+COVqQ73bH+Qa3aHAm4KuWsJTc86Uy2auXeEoHMiI=";
version = rubyVersion "3" "3" "0" "";
hash = "sha256-llGIFNmDK+zpKoVBWoGdSJOzB9tZIa4fD3Uamomla30=";
cargoHash = "sha256-GeelTMRFIyvz1QS2L+Q3KAnyQy7jc0ejhx3TdEFVEbk=";
};

View file

@ -29,7 +29,11 @@ stdenv.mkDerivation rec {
buildInputs = [ udev libcec_platform ] ++
lib.optional withLibraspberrypi libraspberrypi;
cmakeFlags = [ "-DBUILD_SHARED_LIBS=1" ];
cmakeFlags = [
"-DBUILD_SHARED_LIBS=1"
] ++ lib.optionals stdenv.isLinux [
"-DHAVE_LINUX_API=1"
];
meta = with lib; {
description = "Allows you (with the right hardware) to control your device with your TV remote control using existing HDMI cabling";

View file

@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
pname = "toml-f";
version = "0.4.1";
version = "0.4.2";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
hash = "sha256-sCU0uMdcXIA5O964hlK37cOrLTlk1CJeTcWD9FhevOs=";
hash = "sha256-+cac4rUNpd2w3yBdH1XoCKdJ9IgOHZioZg8AhzGY0FE=";
};
nativeBuildInputs = [ gfortran cmake ];

View file

@ -12,13 +12,13 @@
stdenv.mkDerivation rec {
pname = "zint";
version = "2.12.0";
version = "2.13.0";
src = fetchFromGitHub {
owner = "zint";
repo = "zint";
rev = version;
hash = "sha256-Ay6smir6zUpadmw1WpU+F7e9t7Gk3JNVtf2VVu92bDk=";
hash = "sha256-/ILq/7A8Lffe2NuiABiV3KeYXapuL1SO55Qk3wXfC/8=";
};
outputs = [ "out" "dev" ];

View file

@ -1,4 +1,5 @@
{ lib
, stdenv
, aiohttp
, buildPythonPackage
, cpufeature
@ -34,9 +35,8 @@ buildPythonPackage rec {
propagatedBuildInputs = [
aiohttp
cpufeature
zlib-ng
];
] ++ lib.optional (lib.meta.availableOn stdenv.hostPlatform cpufeature) cpufeature;
nativeCheckInputs = [
pytestCheckHook

View file

@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "botocore-stubs";
version = "1.34.2";
version = "1.34.7";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -17,7 +17,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "botocore_stubs";
inherit version;
hash = "sha256-+2DKdWGyqdHdq9xe65YRKy+Xjd+mopS74x0r/1pOZYo=";
hash = "sha256-iPbp3F0ZeZ9KWBO/aTMezo8ze6zziLO5YV+lfAXtJDs=";
};
nativeBuildInputs = [

View file

@ -46,5 +46,6 @@ buildPythonPackage rec {
homepage = "https://github.com/robbmcleod/cpufeature";
license = licenses.cc0;
maintainers = with maintainers; [ fab ];
platforms = [ "x86_64-linux" "x86_64-windows" ];
};
}

View file

@ -12,13 +12,13 @@
buildPythonPackage rec {
pname = "flet-core";
version = "0.15.0";
version = "0.17.0";
format = "pyproject";
src = fetchPypi {
pname = "flet_core";
inherit version;
hash = "sha256-nmQHWyLlyo6CVzn+dlTSnA10XRoSFBLEeYdcWpfoGBo=";
hash = "sha256-LYCbZKxHXrUUs3f3M2pGxz51R2dMet7/fYr9MZ10cgI=";
};
nativeBuildInputs = [

View file

@ -9,13 +9,13 @@
buildPythonPackage rec {
pname = "flet-runtime";
version = "0.15.0";
version = "0.17.0";
format = "pyproject";
src = fetchPypi {
pname = "flet_runtime";
inherit version;
hash = "sha256-CRrAz1V6bISgL2MU7ibhhNEB5IdiQKjRdIt2dmZh0h4=";
hash = "sha256-BhVle4Mpx+0YcAaTWk1AvYGuyPFPju1iuF6SLs2uAzU=";
};
nativeBuildInputs = [

View file

@ -21,12 +21,12 @@
buildPythonPackage rec {
pname = "flet";
version = "0.15.0";
version = "0.17.0";
format = "pyproject";
src = fetchPypi {
inherit pname version;
hash = "sha256-NnozZX8i5QsnVRW5cyIvKxYuHf9EoR6owWSQw6Y4dwQ=";
hash = "sha256-YNa1JDoGqtpzjx+3E1Ycz2E5yZ5MVzooPo9PgHFll9s=";
};
nativeBuildInputs = [

View file

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "hachoir";
version = "3.2.0";
version = "3.3.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "vstinner";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-BRrb6bnPSDVjZF1cOA9NlUYd2HrtqZEAVhHgkjmE0Xg=";
hash = "sha256-sTUJx8Xyhw4Z6juRtREw/okuVjSTSVWpSLKeZ7T8IR8=";
};
propagatedBuildInputs = [

View file

@ -18,7 +18,7 @@
buildPythonPackage rec {
pname = "hahomematic";
version = "2023.12.1";
version = "2023.12.4";
format = "pyproject";
disabled = pythonOlder "3.11";
@ -27,7 +27,7 @@ buildPythonPackage rec {
owner = "danielperna84";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-FqorpdGpm9uAzvEuX6F2Guvq795ix1A8RfX4KUi9jk8=";
hash = "sha256-IsRHJyFgoS7vfr/QcfzplsmFHMRRtLXVqU7bhL/fFto=";
};
postPatch = ''

View file

@ -7,14 +7,14 @@
buildPythonPackage rec {
pname = "temperusb";
version = "1.6.0";
version = "1.6.1";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-enYhqtJnORKhBoZkZPISLCt9Ec5SN6txD3z0SXuPrQo=";
hash = "sha256-PwKHT1zzVn+nmxO/R+aK+029WaaHBo7FyVV4eQtHhbM=";
};
propagatedBuildInputs = [

View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "algolia-cli";
version = "1.4.3";
version = "1.5.0";
src = fetchFromGitHub {
owner = "algolia";
repo = "cli";
rev = "v${version}";
hash = "sha256-tKLFJSlViiryH9j4ZaOtj6gA69fp//cG/ftBe2J2R+I=";
hash = "sha256-iaqr8/jPYEnOhGoiUC5lmd7l+AAOFh3iYVW+mbBV/V8=";
};
vendorHash = "sha256-cNuBTH7L2K4TgD0H9FZ9CjhE5AGXADaniGLD9Lhrtrk=";

View file

@ -7,17 +7,17 @@
buildGoModule rec {
pname = "forgejo-actions-runner";
version = "3.0.1";
version = "3.3.0";
src = fetchFromGitea {
domain = "codeberg.org";
domain = "code.forgejo.org";
owner = "forgejo";
repo = "runner";
rev = "v${version}";
hash = "sha256-idA74R6kbI7Bk0XvT7BOyctT0IKymsJoFCWgYrtZstU=";
hash = "sha256-ZpsHytsIp+ZW4DI7X9MmI7nZRnXVHvx905YdZGS6WMY=";
};
vendorHash = "sha256-HE//SD/doMf42y2KF10JAuUe86hpFhCUM61da2NC5CE=";
vendorHash = "sha256-5GnGXpMy1D7KpVAVroX07Vw5QKYYtwdIhQsk23WCLgc=";
ldflags = [
"-s"

View file

@ -5,16 +5,16 @@
rustPlatform.buildRustPackage rec {
pname = "vhdl-ls";
version = "0.67.0";
version = "0.77.0";
src = fetchFromGitHub {
owner = "VHDL-LS";
repo = "rust_hdl";
rev = "v${version}";
hash = "sha256-3ixU1OWRgDNG4aFAZTqqTSt1Hw41mB+mScVsozA01gM=";
hash = "sha256-IAe4m/GC6ubCcZZESC6fToWVQT73XrhjJOiGCGzNxnQ=";
};
cargoHash = "sha256-SDXWFb0SDMqAmKrPOUryiMgPxv0yffcrqFVvFt4VPS4=";
cargoHash = "sha256-p7BL8WuQiB1KihwAl5aeO6Fa9INYRTQgoQPHcSMnaiQ=";
postPatch = ''
substituteInPlace vhdl_lang/src/config.rs \

View file

@ -27,13 +27,13 @@
stdenv.mkDerivation rec {
pname = "vcmi";
version = "1.4.0";
version = "1.4.1";
src = fetchFromGitHub {
owner = "vcmi";
repo = "vcmi";
rev = version;
hash = "sha256-MhY3tpKlrIgq6QXZwAkMnObYYpUxsPcysTR5CZH1rhE=";
hash = "sha256-5G6qmn2b1/0h7aGNNx4t38Akzg2bZFKubOp3FLqSi+I=";
};
nativeBuildInputs = [

View file

@ -1,41 +1,58 @@
{ config, lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, help2man, fuse
, util-linux, makeWrapper
, enableDebugBuild ? config.lxcfs.enableDebugBuild or false }:
{
lib,
stdenv,
fetchFromGitHub,
fuse3,
help2man,
makeWrapper,
meson,
ninja,
nixosTests,
pkg-config,
python3,
util-linux,
}:
stdenv.mkDerivation rec {
pname = "lxcfs";
version = "4.0.12";
version = "5.0.4";
src = fetchFromGitHub {
owner = "lxc";
repo = "lxcfs";
rev = "lxcfs-${version}";
sha256 = "sha256-+wp29GD+toXGfQbPGYbDJ7/P+FY1uQY4uK3OQxTE9GM=";
sha256 = "sha256-vusxbFV7cnQVBOOo7E+fSyaE63f5QiE2xZhYavc8jJU=";
};
postPatch = ''
sed -i -e '1i #include <sys/pidfd.h>' src/bindings.c
'';
patches = [
# skip RPM spec generation
./no-spec.patch
nativeBuildInputs = [ pkg-config help2man autoreconfHook makeWrapper ];
buildInputs = [ fuse ];
# skip installing systemd files
./skip-init.patch
preConfigure = lib.optionalString enableDebugBuild ''
sed -i 's,#AM_CFLAGS += -DDEBUG,AM_CFLAGS += -DDEBUG,' Makefile.am
'';
configureFlags = [
"--with-init-script=systemd"
"--sysconfdir=/etc"
"--localstatedir=/var"
# fix pidfd checks and include
./pidfd.patch
];
installFlags = [ "SYSTEMD_UNIT_DIR=\${out}/lib/systemd" ];
nativeBuildInputs = [
meson
help2man
makeWrapper
ninja
(python3.withPackages (p: [ p.jinja2 ]))
pkg-config
];
buildInputs = [ fuse3 ];
preConfigure = ''
patchShebangs tools/
'';
postInstall = ''
# `mount` hook requires access to the `mount` command from `util-linux`:
wrapProgram "$out/share/lxcfs/lxc.mount.hook" \
--prefix PATH : "${util-linux}/bin"
wrapProgram "$out/share/lxcfs/lxc.mount.hook" --prefix PATH : "${util-linux}/bin"
'';
postFixup = ''
@ -43,6 +60,10 @@ stdenv.mkDerivation rec {
patchelf --set-rpath "$(patchelf --print-rpath "$out/bin/lxcfs"):$out/lib" "$out/bin/lxcfs"
'';
passthru.tests = {
incus-container = nixosTests.incus.container;
};
meta = {
description = "FUSE filesystem for LXC";
homepage = "https://linuxcontainers.org/lxcfs";

View file

@ -0,0 +1,24 @@
diff --git a/meson.build b/meson.build
index a0289ad..93fc61a 100644
--- a/meson.build
+++ b/meson.build
@@ -253,19 +253,6 @@ if want_tests == true
c_args: '-DRELOADTEST -DDEBUG')
endif
-# RPM spec.
-lxcfs_spec = custom_target(
- 'lxcfs.spec',
- build_by_default: true,
- input: 'lxcfs.spec.in',
- output: 'lxcfs.spec',
- command: [
- meson_render_jinja2,
- config_h,
- '@INPUT@',
- '@OUTPUT@',
- ])
-
# Man pages
if want_docs == true
help2man = find_program('help2man')

View file

@ -0,0 +1,29 @@
diff --git a/meson.build b/meson.build
index a0289ad..211b01b 100644
--- a/meson.build
+++ b/meson.build
@@ -134,11 +134,13 @@ foreach ident: [
'''#include <stdlib.h>
#include <unistd.h>
#include <signal.h>
+ #include <sys/pidfd.h>
#include <sys/wait.h>'''],
['pidfd_open',
'''#include <stdlib.h>
#include <unistd.h>
#include <signal.h>
+ #include <sys/pidfd.h>
#include <sys/wait.h>'''],
]
have = cc.has_function(ident[0], prefix: ident[1], args: '-D_GNU_SOURCE')
diff --git a/src/bindings.c b/src/bindings.c
index 13259c1..e760330 100644
--- a/src/bindings.c
+++ b/src/bindings.c
@@ -1,5 +1,6 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
+#include <sys/pidfd.h>
#include "config.h"
#include <dirent.h>

View file

@ -0,0 +1,12 @@
diff --git a/meson.build b/meson.build
index a0289ad..10c0a28 100644
--- a/meson.build
+++ b/meson.build
@@ -285,7 +285,6 @@ endif
# Include sub-directories.
-subdir('config/init')
subdir('share')
subdir('tests')

View file

@ -1,5 +1,6 @@
{ lib
, fetchFromGitHub
, fetchpatch
, python3Packages
, dnsmasq
, gawk
@ -12,24 +13,28 @@
, iptables
, util-linux
, wrapGAppsHook
, xclip
, wl-clipboard
, runtimeShell
}:
python3Packages.buildPythonApplication rec {
pname = "waydroid";
version = "1.4.1";
version = "1.4.2";
format = "other";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = version;
sha256 = "sha256-0AkNzMIumvgnVcLKX72E2+Eg54Y9j7tdIYPsroOTLWA=";
sha256 = "sha256-/dFvhiK3nCOOmAtrYkQEB8Ge8Rf1ea5cDO7puTwS5bI=";
};
buildInputs = [
gtk3
patches = [
# https://github.com/waydroid/waydroid/pull/1218
(fetchpatch {
url = "https://github.com/waydroid/waydroid/commit/595e0e5b309a79fedaa07d90b9073ddcb156314c.patch";
hash = "sha256-A+rUmJbFFhMZ5WpT+QBCTEcn82wJuvmi8Wbcsio41Nk=";
})
];
nativeBuildInputs = [
@ -37,6 +42,10 @@ python3Packages.buildPythonApplication rec {
wrapGAppsHook
];
buildInputs = [
gtk3
];
propagatedBuildInputs = with python3Packages; [
dbus-python
gbinder-python
@ -61,18 +70,15 @@ python3Packages.buildPythonApplication rec {
wrapProgram $out/lib/waydroid/data/scripts/waydroid-net.sh \
--prefix PATH ":" ${lib.makeBinPath [ dnsmasq getent iproute2 iptables ]}
wrapPythonProgramsIn $out/lib/waydroid/ "${lib.concatStringsSep " " [
wrapPythonProgramsIn $out/lib/waydroid/ "${lib.concatStringsSep " " ([
"$out"
python3Packages.dbus-python
python3Packages.gbinder-python
python3Packages.pygobject3
python3Packages.pyclip
] ++ propagatedBuildInputs ++ [
gawk
kmod
lxc
util-linux
xclip
]}"
wl-clipboard
])}"
substituteInPlace $out/lib/waydroid/tools/helpers/*.py \
--replace '"sh"' '"${runtimeShell}"'

View file

@ -1,7 +1,6 @@
{
lib,
stdenv,
pkgs,
fetchFromGitHub,
runCommand,
buildNpmPackage,
@ -17,13 +16,13 @@ let
nodejs = nodejs_18;
pname = "audiobookshelf";
version = "2.6.0";
version = "2.7.0";
src = fetchFromGitHub {
owner = "advplyr";
repo = pname;
rev = "v${version}";
sha256 = "sha256-lifvfh9dF3Hbgm5NHrzS9zQdv+INSByNkqMWTxTpUMo=";
sha256 = "sha256-bRQ/GbUe+vsgYjSVf3jssoxGzgNeKG4BCDIhNJovAN8=";
};
client = buildNpmPackage {
@ -37,7 +36,7 @@ let
NODE_OPTIONS = "--openssl-legacy-provider";
npmBuildScript = "generate";
npmDepsHash = "sha256-FxP1Kysx3ngk3napZ5uvKSabeOypBtA0kjhyAKpcdo8=";
npmDepsHash = "sha256-2E7Qy3Yew+j+eKKYJMV0SQ/LlJaIfOGm4MpxwP5Dn3Q=";
};
wrapper = import ./wrapper.nix {
@ -52,7 +51,7 @@ in buildNpmPackage {
dontNpmBuild = true;
npmInstallFlags = [ "--only-production" ];
npmDepsHash = "sha256-NcurZee1Z8Rvm2UcjvckbdirfgiIkXMx9GKbr4x/HqE=";
npmDepsHash = "sha256-BZSRa/27oKm2rJoHFq8TpPzkX2CDO9zk5twtcMeo0cQ=";
installPhase = ''
mkdir -p $out/opt/client
@ -69,6 +68,7 @@ in buildNpmPackage {
meta = with lib; {
homepage = "https://www.audiobookshelf.org/";
description = "Self-hosted audiobook and podcast server";
changelog = "https://github.com/advplyr/audiobookshelf/releases/tag/v${version}";
license = licenses.gpl3;
maintainers = [ maintainers.jvanbruegge ];
platforms = platforms.linux;

View file

@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
perlPackages.Socket6
perlPackages.URI
perlPackages.DBFile
perlPackages.DateManip
perlPackages.TimeDate
perlPackages.FileCopyRecursive
perlPackages.FCGI
perlPackages.NetSNMP
@ -126,7 +126,7 @@ stdenv.mkDerivation rec {
esac
wrapProgram "$file" \
--set PERL5LIB "$out/${perlPackages.perl.libPrefix}:${with perlPackages; makePerlPath [
LogLog4perl IOSocketINET6 Socket6 URI DBFile DateManip
LogLog4perl IOSocketINET6 Socket6 URI DBFile TimeDate
HTMLTemplate FileCopyRecursive FCGI NetCIDR NetSNMP NetServer
ListMoreUtils DBDPg LWP rrdtool
]}"

View file

@ -104,12 +104,12 @@ in
stdenv.mkDerivation rec {
pname = "freeswitch";
version = "1.10.10";
version = "1.10.11";
src = fetchFromGitHub {
owner = "signalwire";
repo = pname;
rev = "v${version}";
sha256 = "sha256-3Mm/hbMwnlwbtiOFlODtKItVyj34O3beZDlV8YoJmts=";
hash = "sha256-LzGqrXzPED3PoCDnrwUmmSQsvlAucYo2gTkwFausM7A=";
};
postPatch = ''
@ -126,20 +126,6 @@ stdenv.mkDerivation rec {
done
'';
## TODO Validate with the next upstream release
patches = [
(fetchpatch {
name = "CVE-2023-44488.patch";
url = "https://github.com/signalwire/freeswitch/commit/f1fb05214e4f427dcf922f531431ab649cf0622b.patch";
hash = "sha256-6GMebE6O2EBx60NE2LSRVljaiLm9T4zTrkIpwGvaB08=";
})
(fetchpatch {
name = "CVE-2023-5217.patch";
url = "https://github.com/signalwire/freeswitch/commit/6f9e72c585265d8def8a613b36cd4f524c201980.patch";
hash = "sha256-l64mBpyq/TzRM78n73kbuD0UNsk5zIH5QNJlMKdPfr4=";
})
];
strictDeps = true;
nativeBuildInputs = [ pkg-config autoreconfHook perl which yasm ];
buildInputs = [
@ -181,7 +167,7 @@ stdenv.mkDerivation rec {
description = "Cross-Platform Scalable FREE Multi-Protocol Soft Switch";
homepage = "https://freeswitch.org/";
license = lib.licenses.mpl11;
maintainers = with lib.maintainers; [ ];
maintainers = with lib.maintainers; [ mikaelfangel ];
platforms = with lib.platforms; unix;
broken = stdenv.isDarwin;
};

View file

@ -171,6 +171,7 @@ stdenv.mkDerivation rec {
description = "Sunshine is a Game stream host for Moonlight";
homepage = "https://github.com/LizardByte/Sunshine";
license = licenses.gpl3Only;
mainProgram = "sunshine";
maintainers = with maintainers; [ devusb ];
platforms = platforms.linux;
};

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "uftp";
version = "5.0.2";
version = "5.0.3";
src = fetchurl {
url = "mirror://sourceforge/uftp-multicast/source-tar/uftp-${version}.tar.gz";
sha256 = "sha256-V8EqauWZQlNfteYgOBrt6xfVAAnucfI2QnziN6RsCxQ=";
sha256 = "sha256-y4ZowZsfELxjoW/6iT4gXcPshjYQN9R32AAyYOvEAIA=";
};
buildInputs = [ openssl ];

View file

@ -5,14 +5,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "changedetection-io";
version = "0.45.8.1";
version = "0.45.9";
format = "setuptools";
src = fetchFromGitHub {
owner = "dgtlmoon";
repo = "changedetection.io";
rev = version;
hash = "sha256-DRbqWcbk9fwFp/gSCbAqEv8ZhWsOOnBBXCK8jXT5HdY=";
hash = "sha256-xiKXp9DBaiSteqZwQLZ4zLwT5MeETJx01rKRrWGYioc=";
};
postPatch = ''

View file

@ -1,6 +1,7 @@
{ lib
, stdenv
, buildNpmPackage
, overrideSDK
, fetchFromGitHub
, testers
, balena-cli
@ -10,18 +11,23 @@
, darwin
}:
buildNpmPackage rec {
let
# Fix for: https://github.com/NixOS/nixpkgs/issues/272156
buildNpmPackage' = buildNpmPackage.override {
stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv;
};
in buildNpmPackage' rec {
pname = "balena-cli";
version = "17.0.0";
version = "17.4.9";
src = fetchFromGitHub {
owner = "balena-io";
repo = "balena-cli";
rev = "v${version}";
hash = "sha256-sNpxjSumiP+4fX6b3j+HEl/lr4pvudrhfTzr2TYastE=";
hash = "sha256-0TWG90OB7tovfj4PB0qAiwdOtMss5ZqjSycAb4Vz5+A=";
};
npmDepsHash = "sha256-q2Yc6e5dEiP2Q4tFIeqj4mswM1/pX1pdGeoagyiupvs=";
npmDepsHash = "sha256-LSw/cNJ6kWYh477NAqLOx5bVZ6/qPoUM0V1Cksn7iDI=";
postPatch = ''
ln -s npm-shrinkwrap.json package-lock.json

View file

@ -18,11 +18,11 @@ let
in
stdenv.mkDerivation rec {
pname = "ugs";
version = "2.1.0";
version = "2.1.4";
src = fetchzip {
url = "https://github.com/winder/Universal-G-Code-Sender/releases/download/v${version}/UniversalGcodeSender.zip";
hash = "sha256-BH4oka2Ht4fGMD6/xy/MLBXNkJRggs4VQVG0UqmYQoI=";
hash = "sha256-2WGRHdxmGa2b8ca20xNJoA0NAY9a0pngzdf94ROfirk=";
};
dontUnpack = true;

View file

@ -5,16 +5,16 @@
buildGoModule rec {
pname = "url-parser";
version = "1.0.6";
version = "2.0.1";
src = fetchFromGitHub {
owner = "thegeeklab";
repo = "url-parser";
rev = "refs/tags/v${version}";
hash = "sha256-YZAcu1TDPTE2vLA9vQNWHhGIRQs4hkGAmz/zi27n0H0=";
hash = "sha256-g4fpyzDgIf/4kBAfNxLst0KKa+vNSCryljFAW1j8wmc=";
};
vendorHash = "sha256-8doDVHyhQKsBeN1H73KV/rxhpumDLIzjahdjtW79Bek=";
vendorHash = "sha256-HOlX8oHktbgnbPkRf9iUMCUpGlbcQwusMMcHJJl2nOs=";
ldflags = [
"-s"

View file

@ -2,7 +2,7 @@
buildGoModule rec {
pname = "snowflake";
version = "2.8.0";
version = "2.8.1";
src = fetchFromGitLab {
domain = "gitlab.torproject.org";
@ -10,10 +10,10 @@ buildGoModule rec {
owner = "anti-censorship/pluggable-transports";
repo = "snowflake";
rev = "v${version}";
sha256 = "sha256-/bip6hjYDTcSdtqeHxWcH7Yn4VepGVy3ki/kZWEQaPE=";
sha256 = "sha256-DSXzw/7aBfh4uqLV2JrbrLitNgXcgEdcwxyIMolGEsE=";
};
vendorHash = "sha256-dpOJE6FHaumL6vapigLTobS1r42DIFV8LHfVNvyZnsU=";
vendorHash = "sha256-+f7gxswHCzBT5wqJNYdR1/uDZJNpEyHMWchA4X0aK+M=";
meta = with lib; {
description = "System to defeat internet censorship";

View file

@ -7,13 +7,13 @@
buildGoModule rec {
pname = "trufflehog";
version = "3.63.5";
version = "3.63.7";
src = fetchFromGitHub {
owner = "trufflesecurity";
repo = "trufflehog";
rev = "refs/tags/v${version}";
hash = "sha256-x/SYiOukZZ5CIUWc8/pgvCQjSpsIQmPFP1x3e4/uJFM=";
hash = "sha256-RI2lNlPlc49E2Z88hEAQzvuXzz62ROsFpp1a9YjNd6I=";
};
vendorHash = "sha256-oZkrRaThXwBORoib1GIW7CUF5RGZJ5d/Jd6YM4z3ZIA=";

View file

@ -8,16 +8,16 @@
buildGoModule rec {
pname = "supercronic";
version = "0.2.27";
version = "0.2.29";
src = fetchFromGitHub {
owner = "aptible";
repo = pname;
rev = "v${version}";
hash = "sha256-sgKvE8Ze2qKPgdaAwN1sB0wX7k5VRx8+llkT54xXvrM=";
hash = "sha256-cYKVeWZEjWV5j68aTpBOE/z+5QcMBh5ovyXoV/u80o4=";
};
vendorHash = "sha256-j1iduvu+dKmhvPN8pe50fGQU5cC9N3gfoMh9gSQDbf8=";
vendorHash = "sha256-uQFceysbRdcSaFvdfdFcJX6yzPWE26YYiVzAEISQeCc=";
excludedPackages = [ "cronexpr/cronexpr" ];

View file

@ -592,7 +592,7 @@ mapAliases ({
matrique = spectral; # Added 2020-01-27
matrix-recorder = throw "matrix-recorder has been removed due to being unmaintained"; # Added 2023-05-21
maui-nota = libsForQt5.mauiPackages.nota; # added 2022-05-17
mbox = throw "'mobx' has been removed, as it was broken and unmaintained"; # Added 2023-12-21
mbox = throw "'mbox' has been removed, as it was broken and unmaintained"; # Added 2023-12-21
mcomix3 = mcomix; # Added 2022-06-05
meme = meme-image-generator; # Added 2021-04-21
mess = throw "'mess' has been renamed to/replaced by 'mame'"; # Converted to throw 2023-09-10