From 2e6f50cf31e6108cdd6293af4bf0d251e109edcc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 1 Sep 2023 16:21:42 +0200 Subject: [PATCH 001/128] nixos/no-x-libs: add intel-vaapi-driver --- nixos/modules/config/no-x-libs.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/config/no-x-libs.nix b/nixos/modules/config/no-x-libs.nix index b2eb46f273b1..a07217d86b78 100644 --- a/nixos/modules/config/no-x-libs.nix +++ b/nixos/modules/config/no-x-libs.nix @@ -44,6 +44,7 @@ with lib; }; imagemagick = super.imagemagick.override { libX11Support = false; libXtSupport = false; }; imagemagickBig = super.imagemagickBig.override { libX11Support = false; libXtSupport = false; }; + intel-vaapi-driver = super.intel-vaapi-driver.override { enableGui = false; }; libdevil = super.libdevil-nox; libextractor = super.libextractor.override { gtkSupport = false; }; libva = super.libva-minimal; From ff61f2bb3ff587df1a81c54f0f1b31bce46eec01 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 19 Nov 2023 17:05:49 +0100 Subject: [PATCH 002/128] gnome.gdm: Simplify DESTDIR hack MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Let’s point `DESTDIR` to a path under the build directory rather than under "$out". This will prevent `installPhase` from creating `$out` or any other output directory, allowing us to install the outputs just by moving them out of `$DESTDIR` directly into the store with `mv`. Of course, that will also require moving the installing of `etc` after the outputs are installed. Since `$out` does not currently contain `etc` subdirectory, we can also just move `$DESTDIR/etc` directly to `$out` rather than copying it. And even if `$out/etc` existed, we could just merge it with `cp --recursive` instead of `rsync` so `rsync` is not actually necessary. The code remains written defensively against files accidentally being misplaced while shuffling them around – parent directories of targets are used as `mv` destinations so that the move fails loudly if the directory already exists, rather than being moved inside as e.g. `$out/etc/etc`. While at it let’s also improve practices a bit: - Quote command arguments. - Move `DESTDIR` definition into `env` block. - Add vertical space and clearer comments. - Handle non-standard Nix store paths. --- pkgs/desktops/gnome/core/gdm/default.nix | 35 ++++++++++++------------ 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/pkgs/desktops/gnome/core/gdm/default.nix b/pkgs/desktops/gnome/core/gdm/default.nix index cfdde43ae776..63d9af032cc7 100644 --- a/pkgs/desktops/gnome/core/gdm/default.nix +++ b/pkgs/desktops/gnome/core/gdm/default.nix @@ -5,7 +5,6 @@ , substituteAll , meson , ninja -, rsync , pkg-config , glib , itstool @@ -70,7 +69,6 @@ stdenv.mkDerivation (finalAttrs: { meson ninja pkg-config - rsync gobject-introspection ]; @@ -131,33 +129,36 @@ stdenv.mkDerivation (finalAttrs: { ''; preInstall = '' - install -D ${override} $DESTDIR/$out/share/glib-2.0/schemas/org.gnome.login-screen.gschema.override + install -D ${override} "$DESTDIR/$out/share/glib-2.0/schemas/org.gnome.login-screen.gschema.override" ''; postInstall = '' # Move stuff from DESTDIR to proper location. - # We use rsync to merge the directories. - rsync --archive "$DESTDIR/etc" "$out" - rm --recursive "$DESTDIR/etc" for o in $(getAllOutputNames); do + # debug is created later by _separateDebugInfo hook. if [[ "$o" = "debug" ]]; then continue; fi - rsync --archive "$DESTDIR/''${!o}" "$(dirname "''${!o}")" - rm --recursive "$DESTDIR/''${!o}" + mv "$DESTDIR''${!o}" "$(dirname "''${!o}")" done - # Ensure the DESTDIR is removed. - rmdir "$DESTDIR/nix/store" "$DESTDIR/nix" "$DESTDIR" + + mv "$DESTDIR/etc" "$out" + + # Ensure we did not forget to install anything. + rmdir --parents --ignore-fail-on-non-empty "$DESTDIR${builtins.storeDir}" + ! test -e "$DESTDIR" # We are setting DESTDIR so the post-install script does not compile the schemas. glib-compile-schemas "$out/share/glib-2.0/schemas" ''; - # HACK: We want to install configuration files to $out/etc - # but GDM should read them from /etc on a NixOS system. - # With autotools, it was possible to override Make variables - # at install time but Meson does not support this - # so we need to convince it to install all files to a temporary - # location using DESTDIR and then move it to proper one in postInstall. - DESTDIR = "${placeholder "out"}/dest"; + env = { + # HACK: We want to install configuration files to $out/etc + # but GDM should read them from /etc on a NixOS system. + # With autotools, it was possible to override Make variables + # at install time but Meson does not support this + # so we need to convince it to install all files to a temporary + # location using DESTDIR and then move it to proper one in postInstall. + DESTDIR = "dest"; + }; separateDebugInfo = true; From 8ef5fcf4f5aa1a862a6787ea765e5bec8c5eb648 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 19 Nov 2023 18:24:30 +0100 Subject: [PATCH 003/128] upower: Simplify DESTDIR hack MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Let’s point `DESTDIR` to a path under the build directory rather than under "$out". This will prevent `installPhase` from creating `$out` or any other output directory, allowing us to install the outputs just by moving them out of `$DESTDIR` directly into the store with `mv`. Of course, that will also require moving the installing of `etc` and `var` after the outputs are installed and ensuring there is no library litter from `checkPhase`. Since `$out` does not currently contain `var` subdirectory, we can also just move `$DESTDIR/var` directly to `$out` rather than copying it. `$out/etc` does exist but we can just merge it with `cp --recursive` instead of `rsync` so `rsync` is not actually necessary. The code remains written defensively against files accidentally being misplaced while shuffling them around – parent directories of targets are used as `mv` destinations so that the move fails loudly if the directory already exists, rather than being moved inside as e.g. `$out/etc/etc`. While at it let’s also improve practices a bit: - Add vertical space and clearer comments. - Handle non-standard Nix store paths. --- pkgs/os-specific/linux/upower/default.nix | 32 +++++++++++++---------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/pkgs/os-specific/linux/upower/default.nix b/pkgs/os-specific/linux/upower/default.nix index 36d8a3b9c45f..b0b7b4f6776c 100644 --- a/pkgs/os-specific/linux/upower/default.nix +++ b/pkgs/os-specific/linux/upower/default.nix @@ -3,7 +3,6 @@ , fetchFromGitLab , makeWrapper , pkg-config -, rsync , libxslt , meson , ninja @@ -69,7 +68,6 @@ stdenv.mkDerivation (finalAttrs: { libxslt makeWrapper pkg-config - rsync glib ] ++ lib.optionals withIntrospection [ gobject-introspection @@ -138,7 +136,6 @@ stdenv.mkDerivation (finalAttrs: { # Our gobject-introspection patches make the shared library paths absolute # in the GIR files. When running tests, the library is not yet installed, # though, so we need to replace the absolute path with a local one during build. - # We are using a symlink that will be overwitten during installation. mkdir -p "$out/lib" ln -s "$PWD/libupower-glib/libupower-glib.so" "$out/lib/libupower-glib.so.3" ''; @@ -159,21 +156,28 @@ stdenv.mkDerivation (finalAttrs: { # meson rebuild during install and it is not used at runtime anyway. sed -Ei 's~#!.+/bin/python3~#!/usr/bin/python3~' \ ../src/linux/integration-test.py + + # Undo preCheck installation since DESTDIR hack expects outputs to not exist. + rm "$out/lib/libupower-glib.so.3" + rmdir "$out/lib" "$out" ''; postInstall = '' # Move stuff from DESTDIR to proper location. - # We use rsync to merge the directories. - for dir in etc var; do - rsync --archive "$DESTDIR/$dir" "$out" - rm --recursive "$DESTDIR/$dir" + for o in $(getAllOutputNames); do + # devdoc is created later by _multioutDocs hook. + if [[ "$o" = "devdoc" ]]; then continue; fi + mv "$DESTDIR''${!o}" "$(dirname "''${!o}")" done - for o in out dev installedTests; do - rsync --archive "$DESTDIR/''${!o}" "$(dirname "''${!o}")" - rm --recursive "$DESTDIR/''${!o}" - done - # Ensure the DESTDIR is removed. - rmdir "$DESTDIR/nix/store" "$DESTDIR/nix" "$DESTDIR" + + mv "$DESTDIR/var" "$out" + # The /etc already exist so we need to merge it. + cp --recursive "$DESTDIR/etc" "$out" + rm --recursive "$DESTDIR/etc" + + # Ensure we did not forget to install anything. + rmdir --parents --ignore-fail-on-non-empty "$DESTDIR${builtins.storeDir}" + ! test -e "$DESTDIR" ''; postFixup = '' @@ -194,7 +198,7 @@ stdenv.mkDerivation (finalAttrs: { # at install time but Meson does not support this # so we need to convince it to install all files to a temporary # location using DESTDIR and then move it to proper one in postInstall. - DESTDIR = "${placeholder "out"}/dest"; + DESTDIR = "dest"; }; passthru = { From 35248080ac286b31d0df8efd997e4dc1c751848a Mon Sep 17 00:00:00 2001 From: Mikael Fangel <34864484+MikaelFangel@users.noreply.github.com> Date: Sun, 26 Nov 2023 22:49:53 +0100 Subject: [PATCH 004/128] ticktick: 1.0.80 -> 2.0.0 --- pkgs/applications/office/ticktick/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/ticktick/default.nix b/pkgs/applications/office/ticktick/default.nix index c236ba45056b..a3b333d1698c 100644 --- a/pkgs/applications/office/ticktick/default.nix +++ b/pkgs/applications/office/ticktick/default.nix @@ -15,11 +15,11 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "ticktick"; - version = "1.0.80"; + version = "2.0.0"; src = fetchurl { url = "https://d2atcrkye2ik4e.cloudfront.net/download/linux/linux_deb_x64/${finalAttrs.pname}-${finalAttrs.version}-amd64.deb"; - hash = "sha256-EK+8NFEim2gcFj9t6AGYdGVlyFj9Yq7NaOia3XKy3cc="; + hash = "sha256-LOllYdte+Y+pbjXI2zOQrwptmUo4Ck6OyYoEX6suY08="; }; nativeBuildInputs = [ From 1a242ec25d07c9e3b18e96dc0bdfb6c166beff26 Mon Sep 17 00:00:00 2001 From: Mikael Fangel <34864484+MikaelFangel@users.noreply.github.com> Date: Mon, 9 Oct 2023 01:16:00 +0200 Subject: [PATCH 005/128] darktile: 0.0.10 -> 0.0.11 --- .../terminal-emulators/darktile/default.nix | 33 +++++-------------- 1 file changed, 8 insertions(+), 25 deletions(-) diff --git a/pkgs/applications/terminal-emulators/darktile/default.nix b/pkgs/applications/terminal-emulators/darktile/default.nix index fc2b470178f3..d300853ee4a5 100644 --- a/pkgs/applications/terminal-emulators/darktile/default.nix +++ b/pkgs/applications/terminal-emulators/darktile/default.nix @@ -1,7 +1,6 @@ { stdenv , fetchFromGitHub , lib -, go , pkg-config , libX11 , libXcursor @@ -12,20 +11,23 @@ , libXxf86vm , libGL , nixosTests +, buildGoModule }: -stdenv.mkDerivation rec { +buildGoModule rec { pname = "darktile"; - version = "0.0.10"; + version = "0.0.11"; src = fetchFromGitHub { owner = "liamg"; repo = "darktile"; rev = "v${version}"; - sha256 = "0pdj4yv3qrq56gb67p85ara3g8qrzw5ha787bl2ls4vcx85q7303"; + hash = "sha256-M3vySAyYwqscR9n0GGXp1ttO/mhdSCponZNYJRBBI18="; }; - nativeBuildInputs = [ go pkg-config ]; + vendorHash = null; + + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 @@ -38,25 +40,6 @@ stdenv.mkDerivation rec { libGL ]; - postPatch = '' - substituteInPlace scripts/build.sh \ - --replace "bash" "sh" - ''; - - postConfigure = '' - export GOPATH=$TMP/go - ''; - - makeFlags = [ "HOME=$TMP" ]; - - installPhase = '' - runHook preInstall - - install -Dm755 darktile -t $out/bin - - runHook postInstall - ''; - passthru.tests.test = nixosTests.terminal-emulators.darktile; meta = with lib; { @@ -65,7 +48,7 @@ stdenv.mkDerivation rec { downloadPage = "https://github.com/liamg/darktile/releases"; changelog = "https://github.com/liamg/darktile/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ flexagoon ]; + maintainers = with maintainers; [ mikaelfangel ]; mainProgram = "darktile"; }; } From f5375ec98618347da6b036a5e06381ab7380db03 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Wed, 6 Dec 2023 15:48:25 +0100 Subject: [PATCH 006/128] bitcoin: 25.1 -> 26.0 --- pkgs/applications/blockchains/bitcoin/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/blockchains/bitcoin/default.nix b/pkgs/applications/blockchains/bitcoin/default.nix index 83c1f35c5fbd..f31fea152710 100644 --- a/pkgs/applications/blockchains/bitcoin/default.nix +++ b/pkgs/applications/blockchains/bitcoin/default.nix @@ -33,14 +33,14 @@ let in stdenv.mkDerivation rec { pname = if withGui then "bitcoin" else "bitcoind"; - version = "25.1"; + version = "26.0"; src = fetchurl { urls = [ "https://bitcoincore.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz" ]; # hash retrieved from signed SHA256SUMS - sha256 = "bec2a598d8dfa8c2365b77f13012a733ec84b8c30386343b7ac1996e901198c9"; + sha256 = "ab1d99276e28db62d1d9f3901e85ac358d7f1ebcb942d348a9c4e46f0fcdc0a1"; }; nativeBuildInputs = @@ -55,9 +55,9 @@ stdenv.mkDerivation rec { ++ lib.optionals withGui [ qrencode qtbase qttools ]; postInstall = '' - installShellCompletion --cmd bitcoin-cli --bash contrib/completions/bash/bitcoin-cli.bash-completion - installShellCompletion --cmd bitcoind --bash contrib/completions/bash/bitcoind.bash-completion - installShellCompletion --cmd bitcoin-tx --bash contrib/completions/bash/bitcoin-tx.bash-completion + installShellCompletion --bash contrib/completions/bash/bitcoin-cli.bash + installShellCompletion --bash contrib/completions/bash/bitcoind.bash + installShellCompletion --bash contrib/completions/bash/bitcoin-tx.bash installShellCompletion --fish contrib/completions/fish/bitcoin-cli.fish installShellCompletion --fish contrib/completions/fish/bitcoind.fish From 953752738923f68b041e0630b048c37ee9ffef8d Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sun, 10 Dec 2023 11:00:02 +0100 Subject: [PATCH 007/128] nixos/installation-device: remove warning about mdadm --- nixos/modules/profiles/installation-device.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/profiles/installation-device.nix b/nixos/modules/profiles/installation-device.nix index 52750cd472da..58f07b050b5c 100644 --- a/nixos/modules/profiles/installation-device.nix +++ b/nixos/modules/profiles/installation-device.nix @@ -105,6 +105,8 @@ with lib; ]; boot.swraid.enable = true; + # remove warning about unset mail + boot.swraid.mdadmConf = "PROGRAM ${pkgs.coreutils}/bin/true"; # Show all debug messages from the kernel but don't log refused packets # because we have the firewall enabled. This makes installs from the From 572300c97fd03daf74be77c73b7e61900dc3d670 Mon Sep 17 00:00:00 2001 From: Jeff Huffman Date: Sun, 10 Dec 2023 20:41:44 -0500 Subject: [PATCH 008/128] vieb: 10.6.0 -> 11.0.0 --- pkgs/by-name/vi/vieb/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/vi/vieb/package.nix b/pkgs/by-name/vi/vieb/package.nix index 8d3b3de6a124..0c8afad3fb00 100644 --- a/pkgs/by-name/vi/vieb/package.nix +++ b/pkgs/by-name/vi/vieb/package.nix @@ -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; From 3bff45aac60acab116d35195aa9f53390bf401a1 Mon Sep 17 00:00:00 2001 From: Mikael Fangel <34864484+MikaelFangel@users.noreply.github.com> Date: Mon, 11 Dec 2023 21:07:21 +0100 Subject: [PATCH 009/128] darktile: add aarch64-linux to badPlatforms --- pkgs/applications/terminal-emulators/darktile/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/terminal-emulators/darktile/default.nix b/pkgs/applications/terminal-emulators/darktile/default.nix index d300853ee4a5..2aaa68801cb7 100644 --- a/pkgs/applications/terminal-emulators/darktile/default.nix +++ b/pkgs/applications/terminal-emulators/darktile/default.nix @@ -48,6 +48,8 @@ buildGoModule rec { downloadPage = "https://github.com/liamg/darktile/releases"; changelog = "https://github.com/liamg/darktile/releases/tag/v${version}"; license = licenses.mit; + platforms = platforms.linux; + badPlatforms = [ "aarch64-linux" ]; maintainers = with maintainers; [ mikaelfangel ]; mainProgram = "darktile"; }; From 8222fa33b3388dc6d4cd4acd71d4ee17a1b56c78 Mon Sep 17 00:00:00 2001 From: Alexandre Acebedo Date: Fri, 3 Nov 2023 19:04:21 +0100 Subject: [PATCH 010/128] hyprlandPlugins.hy3: init at 0.32.0 --- .../hyprwm/hyprland/plugins.nix | 51 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 53 insertions(+) create mode 100644 pkgs/applications/window-managers/hyprwm/hyprland/plugins.nix diff --git a/pkgs/applications/window-managers/hyprwm/hyprland/plugins.nix b/pkgs/applications/window-managers/hyprwm/hyprland/plugins.nix new file mode 100644 index 000000000000..f8742673f3d7 --- /dev/null +++ b/pkgs/applications/window-managers/hyprwm/hyprland/plugins.nix @@ -0,0 +1,51 @@ +{ lib +, callPackage +, pkg-config +, gcc13Stdenv +, hyprland +}: +let + mkHyprlandPlugin = + args@{ pluginName, ... }: + gcc13Stdenv.mkDerivation (args // { + pname = "${pluginName}"; + nativeBuildInputs = [ pkg-config ] ++ args.nativeBuildInputs or [ ]; + buildInputs = [ hyprland ] + ++ hyprland.buildInputs + ++ (args.buildInputs or [ ]); + meta = args.meta // { + description = (args.meta.description or ""); + longDescription = (args.meta.lonqDescription or "") + + "\n\nPlugins can be installed via a plugin entry in the Hyprland NixOS or Home Manager options."; + }; + }); + + plugins = { + hy3 = { fetchFromGitHub, cmake, hyprland }: + mkHyprlandPlugin rec { + pluginName = "hy3"; + version = "0.32.0"; + + src = fetchFromGitHub { + owner = "outfoxxed"; + repo = "hy3"; + rev = "hl${version}"; + hash = "sha256-j49bEOLjBa1CH2gTwM+A2Edrw/GspE2m8q1teAn6SuQ="; + }; + + nativeBuildInputs = [ cmake ]; + + dontStrip = true; + + meta = with lib; { + homepage = "https://github.com/outfoxxed/hy3"; + description = "Hyprland plugin for an i3 / sway like manual tiling layout"; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = [ maintainers.aacebedo ]; + }; + }; + }; +in +lib.mapAttrs (name: plugin: callPackage plugin { }) plugins + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5404a77beab0..0eb190bbe6e8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5694,6 +5694,8 @@ with pkgs; hyprshade = python311Packages.callPackage ../applications/window-managers/hyprwm/hyprshade { }; + hyprlandPlugins = recurseIntoAttrs (callPackage ../applications/window-managers/hyprwm/hyprland/plugins.nix { }); + hysteria = callPackage ../tools/networking/hysteria { }; hyx = callPackage ../tools/text/hyx { }; From c45fb30b2fc38c34df80e0517e49681e33db3015 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 18 Dec 2023 08:09:59 +0000 Subject: [PATCH 011/128] python310Packages.aioguardian: 2023.11.0 -> 2023.12.0 --- pkgs/development/python-modules/aioguardian/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioguardian/default.nix b/pkgs/development/python-modules/aioguardian/default.nix index 3b72b53045b0..cd4247b4c9b3 100644 --- a/pkgs/development/python-modules/aioguardian/default.nix +++ b/pkgs/development/python-modules/aioguardian/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "aioguardian"; - version = "2023.11.0"; + version = "2023.12.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "bachya"; repo = "aioguardian"; rev = "refs/tags/${version}"; - hash = "sha256-hTV6P9J7SS5lnV/9eFUCFPZu1GIeshytWQvNTbGs52w="; + hash = "sha256-7fY8+aAxlDtOBLu8SadY5qiH6+RvxnFpOw1RXTonP2o="; }; nativeBuildInputs = [ From 2a747794f4125affcf58244326764edbb955cb62 Mon Sep 17 00:00:00 2001 From: Mikael Fangel <34864484+MikaelFangel@users.noreply.github.com> Date: Mon, 18 Dec 2023 21:56:01 +0100 Subject: [PATCH 012/128] legba: 0.6.1 -> 0.7.1 --- pkgs/by-name/le/legba/package.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/le/legba/package.nix b/pkgs/by-name/le/legba/package.nix index fcb3bea4a7b3..c4f52fcc0902 100644 --- a/pkgs/by-name/le/legba/package.nix +++ b/pkgs/by-name/le/legba/package.nix @@ -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; From 4724490830d7703e54f2c124fd26d0b3c9889a1b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 19 Dec 2023 12:45:24 +0000 Subject: [PATCH 013/128] python310Packages.flet: 0.15.0 -> 0.17.0 --- pkgs/development/python-modules/flet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/flet/default.nix b/pkgs/development/python-modules/flet/default.nix index 8608e77bb5e2..9259bb26b1f6 100644 --- a/pkgs/development/python-modules/flet/default.nix +++ b/pkgs/development/python-modules/flet/default.nix @@ -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 = [ From 0775a7f46029ef10a76ff57d84a5b2b49244bd7e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 19 Dec 2023 12:54:48 +0000 Subject: [PATCH 014/128] python310Packages.flet-core: 0.15.0 -> 0.17.0 --- pkgs/development/python-modules/flet-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/flet-core/default.nix b/pkgs/development/python-modules/flet-core/default.nix index c8a8d678717c..da635578e0dd 100644 --- a/pkgs/development/python-modules/flet-core/default.nix +++ b/pkgs/development/python-modules/flet-core/default.nix @@ -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 = [ From 00225acf818da04aa8c883280af99fca97f3985f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 19 Dec 2023 13:20:14 +0000 Subject: [PATCH 015/128] python310Packages.flet-runtime: 0.15.0 -> 0.17.0 --- pkgs/development/python-modules/flet-runtime/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/flet-runtime/default.nix b/pkgs/development/python-modules/flet-runtime/default.nix index b4754b911b4c..57466f1d33f7 100644 --- a/pkgs/development/python-modules/flet-runtime/default.nix +++ b/pkgs/development/python-modules/flet-runtime/default.nix @@ -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 = [ From 31659d0b93547aa5cb2a818f450260f96bb55bb2 Mon Sep 17 00:00:00 2001 From: Mikael Fangel <34864484+MikaelFangel@users.noreply.github.com> Date: Thu, 21 Dec 2023 00:43:01 +0100 Subject: [PATCH 016/128] changedetection-io: 0.45.8.1 -> 0.45.9 --- pkgs/servers/web-apps/changedetection-io/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/web-apps/changedetection-io/default.nix b/pkgs/servers/web-apps/changedetection-io/default.nix index be97cf838e70..a162448e637e 100644 --- a/pkgs/servers/web-apps/changedetection-io/default.nix +++ b/pkgs/servers/web-apps/changedetection-io/default.nix @@ -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 = '' From d3e246f9fa217545eb7dc957cc7bd0d820040d3c Mon Sep 17 00:00:00 2001 From: Gabriel Arazas Date: Thu, 21 Dec 2023 22:18:56 +0800 Subject: [PATCH 017/128] nixos/guix: fix systemd socket unit --- nixos/modules/services/misc/guix/default.nix | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/nixos/modules/services/misc/guix/default.nix b/nixos/modules/services/misc/guix/default.nix index 3e1a212693b9..2bfa3b77971f 100644 --- a/nixos/modules/services/misc/guix/default.nix +++ b/nixos/modules/services/misc/guix/default.nix @@ -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 = [{ From 74a4a70d8e68957c4ab11545c8e81401153f3219 Mon Sep 17 00:00:00 2001 From: Adam Stephens Date: Thu, 21 Dec 2023 14:19:53 -0500 Subject: [PATCH 018/128] incus-unwrapped: 0.3.0 -> 0.4.0 Changelog: https://github.com/lxc/incus/releases/tag/incus-0.4.0 --- pkgs/by-name/in/incus-unwrapped/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/in/incus-unwrapped/package.nix b/pkgs/by-name/in/incus-unwrapped/package.nix index 907b8ce29197..43bf65bef83e 100644 --- a/pkgs/by-name/in/incus-unwrapped/package.nix +++ b/pkgs/by-name/in/incus-unwrapped/package.nix @@ -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 \ From 557bd745bc6742e0f42700805c46c6d8233024ab Mon Sep 17 00:00:00 2001 From: Adam Stephens Date: Thu, 21 Dec 2023 14:20:18 -0500 Subject: [PATCH 019/128] lxd-to-incus: 0.3.0 -> 0.4.0 --- pkgs/by-name/lx/lxd-to-incus/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/lx/lxd-to-incus/package.nix b/pkgs/by-name/lx/lxd-to-incus/package.nix index c08dda5a4d86..b9c15347d3ba 100644 --- a/pkgs/by-name/lx/lxd-to-incus/package.nix +++ b/pkgs/by-name/lx/lxd-to-incus/package.nix @@ -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; From 56e9ca19b3f8f353c374c662fa909db86eea925c Mon Sep 17 00:00:00 2001 From: Adam Stephens Date: Thu, 21 Dec 2023 14:55:08 -0500 Subject: [PATCH 020/128] lxcfs: 4.0.12 -> 5.0.4 Diff: https://github.com/lxc/lxcfs/compare/lxcfs-4.0.12...lxcfs-5.0.4 Changelog: https://linuxcontainers.org/lxcfs/news/ --- nixos/tests/incus/container.nix | 4 ++ pkgs/os-specific/linux/lxcfs/default.nix | 63 +++++++++++++------- pkgs/os-specific/linux/lxcfs/no-spec.patch | 24 ++++++++ pkgs/os-specific/linux/lxcfs/pidfd.patch | 29 +++++++++ pkgs/os-specific/linux/lxcfs/skip-init.patch | 12 ++++ 5 files changed, 111 insertions(+), 21 deletions(-) create mode 100644 pkgs/os-specific/linux/lxcfs/no-spec.patch create mode 100644 pkgs/os-specific/linux/lxcfs/pidfd.patch create mode 100644 pkgs/os-specific/linux/lxcfs/skip-init.patch diff --git a/nixos/tests/incus/container.nix b/nixos/tests/incus/container.nix index 2d3fa49e5bd1..2fa1709c7484 100644 --- a/nixos/tests/incus/container.nix +++ b/nixos/tests/incus/container.nix @@ -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() diff --git a/pkgs/os-specific/linux/lxcfs/default.nix b/pkgs/os-specific/linux/lxcfs/default.nix index 28777d36e6be..ee923786c295 100644 --- a/pkgs/os-specific/linux/lxcfs/default.nix +++ b/pkgs/os-specific/linux/lxcfs/default.nix @@ -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 ' 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"; diff --git a/pkgs/os-specific/linux/lxcfs/no-spec.patch b/pkgs/os-specific/linux/lxcfs/no-spec.patch new file mode 100644 index 000000000000..ead4bfcf80f7 --- /dev/null +++ b/pkgs/os-specific/linux/lxcfs/no-spec.patch @@ -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') diff --git a/pkgs/os-specific/linux/lxcfs/pidfd.patch b/pkgs/os-specific/linux/lxcfs/pidfd.patch new file mode 100644 index 000000000000..3d9b6faa57f9 --- /dev/null +++ b/pkgs/os-specific/linux/lxcfs/pidfd.patch @@ -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 + #include + #include ++ #include + #include '''], + ['pidfd_open', + '''#include + #include + #include ++ #include + #include '''], + ] + 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 + #include "config.h" + + #include diff --git a/pkgs/os-specific/linux/lxcfs/skip-init.patch b/pkgs/os-specific/linux/lxcfs/skip-init.patch new file mode 100644 index 000000000000..6e7cdc90d706 --- /dev/null +++ b/pkgs/os-specific/linux/lxcfs/skip-init.patch @@ -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') + From e028a52d6f26cc2b9aad598fd941717b1b2b125c Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Thu, 21 Dec 2023 21:07:55 +0100 Subject: [PATCH 021/128] php81: 8.1.26 -> 8.1.27 --- pkgs/development/interpreters/php/8.1.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/php/8.1.nix b/pkgs/development/interpreters/php/8.1.nix index 5f5be6b3d1d8..3082f8b85b62 100644 --- a/pkgs/development/interpreters/php/8.1.nix +++ b/pkgs/development/interpreters/php/8.1.nix @@ -2,10 +2,9 @@ let base = callPackage ./generic.nix (_args // { - version = "8.1.26"; - hash = "sha256-g73iSchKoaBDqMjQ7qCTRcLK5puXhM3wIin8kW+7nqA="; + version = "8.1.27"; + hash = "sha256-oV/XPqRPLfMLB9JHhuB9GUiw6j7tC4uEVzXVANwov/E="; }); - in base.withExtensions ({ all, ... }: with all; ([ bcmath From 9d236a8acee7227c25574b7bc8ee6c7f4cf50347 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Thu, 21 Dec 2023 21:08:12 +0100 Subject: [PATCH 022/128] php82: 8.2.13 -> 8.2.14 --- pkgs/development/interpreters/php/8.2.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/php/8.2.nix b/pkgs/development/interpreters/php/8.2.nix index 20aa6aaa0bc0..b934647d9b8c 100644 --- a/pkgs/development/interpreters/php/8.2.nix +++ b/pkgs/development/interpreters/php/8.2.nix @@ -2,10 +2,9 @@ let base = callPackage ./generic.nix (_args // { - version = "8.2.13"; - hash = "sha256-ZlKfQ7ITEx5rJTxWAr7wXwSUWNISknMPzNY7SKBtZ7o="; + version = "8.2.14"; + hash = "sha256-+HHhMTM9YK5sU3sa3dvCrqVMQ2xWKvmG+4MJwGAEC54="; }); - in base.withExtensions ({ all, ... }: with all; ([ bcmath From 90493f9411fd2205823bfe5aec3ee35d48cc55ca Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 22 Dec 2023 10:34:38 +0000 Subject: [PATCH 023/128] python310Packages.regenmaschine: 2023.11.0 -> 2023.12.0 --- pkgs/development/python-modules/regenmaschine/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/regenmaschine/default.nix b/pkgs/development/python-modules/regenmaschine/default.nix index c3b959a65ef0..21be8caaa8c0 100644 --- a/pkgs/development/python-modules/regenmaschine/default.nix +++ b/pkgs/development/python-modules/regenmaschine/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "regenmaschine"; - version = "2023.11.0"; + version = "2023.12.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "bachya"; repo = "regenmaschine"; rev = "refs/tags/${version}"; - hash = "sha256-FRfw3B2zHEspKf1LENrB3Ayu6/t3hyS8sjuwoBC5Lfk="; + hash = "sha256-9VBqLmbWJCrfDw9T1qmE9KkdlS+MDnvoG8O9dPCuJDs="; }; nativeBuildInputs = [ From f743f1dba967c308b24ede2d0a93b3b37b038d2e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 22 Dec 2023 12:58:29 +0000 Subject: [PATCH 024/128] python310Packages.simplisafe-python: 2023.10.0 -> 2023.12.0 --- pkgs/development/python-modules/simplisafe-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/simplisafe-python/default.nix b/pkgs/development/python-modules/simplisafe-python/default.nix index 6863d1f1a889..b9039bf5beda 100644 --- a/pkgs/development/python-modules/simplisafe-python/default.nix +++ b/pkgs/development/python-modules/simplisafe-python/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "simplisafe-python"; - version = "2023.10.0"; + version = "2023.12.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "bachya"; repo = "simplisafe-python"; rev = "refs/tags/${version}"; - hash = "sha256-U3SbaR8PTTvoAMu65+LAHSwTmR7iwqiidbefW8bNSCo="; + hash = "sha256-Nr4HvjIOLk/WMKCjj/ZX67OBSImRhs9SfZtLjFs81Sk="; }; From ee3e7ac1800f08c8cdab393be0c7428b8555f298 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Thu, 21 Dec 2023 21:08:26 +0100 Subject: [PATCH 025/128] php83: 8.3.0 -> 8.3.1 --- pkgs/development/interpreters/php/8.3.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/php/8.3.nix b/pkgs/development/interpreters/php/8.3.nix index 6327e23504a8..942507d7d355 100644 --- a/pkgs/development/interpreters/php/8.3.nix +++ b/pkgs/development/interpreters/php/8.3.nix @@ -1,9 +1,9 @@ -{ callPackage, fetchurl, ... }@_args: +{ callPackage, ... }@_args: let base = callPackage ./generic.nix (_args // { - version = "8.3.0"; - hash = "sha256-3mfQgz1CsZblpm+hozL0Xilsvo6UcuklayoHHDTcXtY="; + version = "8.3.1"; + hash = "sha256-xA+ukZf6aKUy9qBiwxba/jsExUUTa1S56tSTL8JsauE="; }); in base.withExtensions ({ all, ... }: with all; ([ From 60f5b2dba43aec207dd0459783f3be5ef260bf64 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 22 Dec 2023 17:12:03 +0000 Subject: [PATCH 026/128] python310Packages.temperusb: 1.6.0 -> 1.6.1 --- pkgs/development/python-modules/temperusb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/temperusb/default.nix b/pkgs/development/python-modules/temperusb/default.nix index 929560167e76..79363508ecbf 100644 --- a/pkgs/development/python-modules/temperusb/default.nix +++ b/pkgs/development/python-modules/temperusb/default.nix @@ -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 = [ From 21acf7c055ab7750ea22b406a3ed07012f20baeb Mon Sep 17 00:00:00 2001 From: Mikael Fangel <34864484+MikaelFangel@users.noreply.github.com> Date: Fri, 22 Dec 2023 21:10:35 +0100 Subject: [PATCH 027/128] freeswitch: 1.10.10 -> 1.10.11 --- pkgs/servers/sip/freeswitch/default.nix | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/pkgs/servers/sip/freeswitch/default.nix b/pkgs/servers/sip/freeswitch/default.nix index 55721a38cd8b..8174e85c3a43 100644 --- a/pkgs/servers/sip/freeswitch/default.nix +++ b/pkgs/servers/sip/freeswitch/default.nix @@ -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; }; From 4a67cc2c36bd05516182f413da105299c03edc45 Mon Sep 17 00:00:00 2001 From: Mikael Fangel <34864484+MikaelFangel@users.noreply.github.com> Date: Fri, 22 Dec 2023 21:24:06 +0100 Subject: [PATCH 028/128] vscode-extensions.asvetliakov.vscode-neovim: 1.0.1 -> 1.5.0 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 2c2bcecff804..52fa085311ef 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -344,8 +344,8 @@ let mktplcRef = { name = "vscode-neovim"; publisher = "asvetliakov"; - version = "1.0.1"; - sha256 = "1yf065syb5hskds47glnv18nk0fg7d84w1j72hg1pqb082gn1sdv"; + version = "1.5.0"; + sha256 = "1glad9xmzq58jc7js8afjmqrxgd3rqm80fk528wv5kqcmn90bgk3"; }; meta = { changelog = "https://marketplace.visualstudio.com/items/asvetliakov.vscode-neovim/changelog"; From 933b95109bca233b7774357de80dbc0080bd891e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 23 Dec 2023 06:43:47 +0000 Subject: [PATCH 029/128] sameboy: 0.15.8 -> 0.16 --- pkgs/applications/emulators/sameboy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/emulators/sameboy/default.nix b/pkgs/applications/emulators/sameboy/default.nix index 035351885568..9d0eb1570287 100644 --- a/pkgs/applications/emulators/sameboy/default.nix +++ b/pkgs/applications/emulators/sameboy/default.nix @@ -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; From 2ed176b99f80cf69c6c8ed80e65b814695563bbc Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Sat, 23 Dec 2023 09:30:46 +0000 Subject: [PATCH 030/128] txtpbfmt: unstable-2023-03-28 -> unstable-2023-10-25 --- pkgs/development/tools/txtpbfmt/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/txtpbfmt/default.nix b/pkgs/development/tools/txtpbfmt/default.nix index 757e1e560bef..384320bb3b95 100644 --- a/pkgs/development/tools/txtpbfmt/default.nix +++ b/pkgs/development/tools/txtpbfmt/default.nix @@ -1,14 +1,14 @@ { lib, buildGoModule, fetchFromGitHub }: -buildGoModule rec { +buildGoModule { pname = "txtpbfmt"; - version = "unstable-2023-03-28"; + version = "unstable-2023-10-25"; src = fetchFromGitHub { owner = "protocolbuffers"; repo = "txtpbfmt"; - rev = "3462fbc510c07c0844c2e370719c9c18302f476f"; - hash = "sha256-vvkZWDGrId164K6jhMXNa5BtOxQSgFDhMACGAH+9F08="; + rev = "084445ff1adf0d8a27429bba65dbde5663f02d26"; + hash = "sha256-SoU1GON9avesty6FSZ+z6o2JHInUtwv+PVOzqCu+8L8="; }; vendorHash = "sha256-IdD+R8plU4/e9fQaGSM5hJxyMECb6hED0Qg8afwHKbY="; From 5802b1d04df01eba1be34c6c580c553654a3a303 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Sat, 23 Dec 2023 10:39:28 +0000 Subject: [PATCH 031/128] kubectx: 0.9.4 -> 0.9.5 --- .../tools/kubectx/bump-golang-x-sys.patch | 25 ------------------- pkgs/development/tools/kubectx/default.nix | 10 +++----- 2 files changed, 3 insertions(+), 32 deletions(-) delete mode 100644 pkgs/development/tools/kubectx/bump-golang-x-sys.patch diff --git a/pkgs/development/tools/kubectx/bump-golang-x-sys.patch b/pkgs/development/tools/kubectx/bump-golang-x-sys.patch deleted file mode 100644 index ec838728410a..000000000000 --- a/pkgs/development/tools/kubectx/bump-golang-x-sys.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/go.mod b/go.mod -index c523783..1ef8d00 100644 ---- a/go.mod -+++ b/go.mod -@@ -9,6 +9,7 @@ require ( - github.com/imdario/mergo v0.3.9 // indirect - github.com/mattn/go-isatty v0.0.12 - github.com/pkg/errors v0.9.1 -+ golang.org/x/sys v0.0.0-20220731174439-a90be440212d // indirect - gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c - k8s.io/apimachinery v0.21.0-alpha.1 - k8s.io/client-go v0.21.0-alpha.1 -diff --git a/go.sum b/go.sum -index 8f16b5a..7426c68 100644 ---- a/go.sum -+++ b/go.sum -@@ -293,6 +293,8 @@ golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7w - golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= - golang.org/x/sys v0.0.0-20201112073958-5cba982894dd h1:5CtCZbICpIOFdgO940moixOPjc0178IU44m4EjOO5IY= - golang.org/x/sys v0.0.0-20201112073958-5cba982894dd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -+golang.org/x/sys v0.0.0-20220731174439-a90be440212d h1:Sv5ogFZatcgIMMtBSTTAgMYsicp25MXBubjXNDKwm80= -+golang.org/x/sys v0.0.0-20220731174439-a90be440212d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= - golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= - golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= - golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= diff --git a/pkgs/development/tools/kubectx/default.nix b/pkgs/development/tools/kubectx/default.nix index 628f6771899d..839525c30eba 100644 --- a/pkgs/development/tools/kubectx/default.nix +++ b/pkgs/development/tools/kubectx/default.nix @@ -2,20 +2,16 @@ buildGoModule rec { pname = "kubectx"; - version = "0.9.4"; + version = "0.9.5"; src = fetchFromGitHub { owner = "ahmetb"; repo = pname; rev = "v${version}"; - sha256 = "sha256-WY0zFt76mvdzk/s2Rzqys8n+DVw6qg7V6Y8JncOUVCM="; + hash = "sha256-HVmtUhdMjbkyMpTgbsr5Mm286F9Q7zbc5rOxi7OBZEg="; }; - patches = [ - ./bump-golang-x-sys.patch - ]; - - vendorHash = "sha256-p4KUBmJw6hWG1J2qwg4QBbh6Vo1cr/HQz0IqytIDJjU="; + vendorHash = "sha256-3xetjviMuH+Nev12DB2WN2Wnmw1biIDAckUSGVRHQwM="; nativeBuildInputs = [ installShellFiles ]; From 0894361fa417e9f3055cfc4d9afcf00c5307310c Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Sat, 23 Dec 2023 12:15:38 +0100 Subject: [PATCH 032/128] wordpressPackages.plugins.simple-mastodon-verification: init at 1.1.3 --- .../wordpress/packages/languages.json | 18 +-- .../web-apps/wordpress/packages/plugins.json | 138 +++++++++--------- .../wordpress/packages/wordpress-plugins.json | 1 + 3 files changed, 82 insertions(+), 75 deletions(-) diff --git a/pkgs/servers/web-apps/wordpress/packages/languages.json b/pkgs/servers/web-apps/wordpress/packages/languages.json index 66a2f6c1ba11..6a9d4361f226 100644 --- a/pkgs/servers/web-apps/wordpress/packages/languages.json +++ b/pkgs/servers/web-apps/wordpress/packages/languages.json @@ -1,20 +1,20 @@ { "de_DE": { "path": "de_DE", - "rev": "1238966", - "sha256": "1qrizj0smwlxzv70l2f4dz737qggij2saqx4dc0vfrp4pn0qxw56", - "version": "6.3" + "rev": "1286009", + "sha256": "1w6q2ja1y77yagg73zhrw94f2vpgd521zahwhvxqxa8isphbrybj", + "version": "6.4" }, "fr_FR": { "path": "fr_FR", - "rev": "1263147", - "sha256": "0rgypx5z7pi88da7ll0aby6hlvahja6wqjl8iacabwsnqawqbbx6", - "version": "6.3" + "rev": "1285884", + "sha256": "1qlq7p9pmspizbgjp895jldb6cbsvfal6h02p44r87ag356cjk6j", + "version": "6.4" }, "ro_RO": { "path": "ro_RO", - "rev": "1255832", - "sha256": "0c6hp40rgxg8ai3f35k2bgh4q66qf1g8qgv3jgbq6dcxr090fia2", - "version": "6.3" + "rev": "1296680", + "sha256": "0m98iaai240yn4lx4lhqgzi2wlxkz67v1cg86jhfi72n0rhr4l46", + "version": "6.4" } } diff --git a/pkgs/servers/web-apps/wordpress/packages/plugins.json b/pkgs/servers/web-apps/wordpress/packages/plugins.json index 346c459530a5..e85bf69310c1 100644 --- a/pkgs/servers/web-apps/wordpress/packages/plugins.json +++ b/pkgs/servers/web-apps/wordpress/packages/plugins.json @@ -1,9 +1,9 @@ { "add-widget-after-content": { - "path": "add-widget-after-content/tags/2.4.5", - "rev": "2844985", - "sha256": "17h55fzmssaqv5k2s2a2n5rz49flhzg9gflnps1qpr62apki5156", - "version": "2.4.5" + "path": "add-widget-after-content/tags/2.4.6", + "rev": "3003516", + "sha256": "1nqhx66fy82mwcnfg0r9v2mb6q2nnmhxy9j2451rphxhlxxjf1bf", + "version": "2.4.6" }, "akismet": { "path": "akismet/tags/5.3", @@ -24,10 +24,10 @@ "version": "2.21.08.31" }, "breeze": { - "path": "breeze/tags/2.0.32", - "rev": "2995658", - "sha256": "0c0sh7l6cwz6hbc54gjaasdldrv8h6ynx4b75zzkj2arrmyhjjxg", - "version": "2.0.32" + "path": "breeze/tags/2.1.2", + "rev": "3011880", + "sha256": "164sf180j99icn39215s997qqmqddyqnkf7k29fwpkgz5ww0zkkd", + "version": "2.1.2" }, "co-authors-plus": { "path": "co-authors-plus/tags/3.5.15", @@ -42,10 +42,10 @@ "version": "3.1.1" }, "cookie-notice": { - "path": "cookie-notice/tags/2.4.11.1", - "rev": "2974733", - "sha256": "0bq6i4s7zkx0x5qb65d93h0sdkd17vka10k8xicfin7qdy5fdcf6", - "version": "2.4.11.1" + "path": "cookie-notice/tags/2.4.13", + "rev": "3002920", + "sha256": "0rw511zygmg1i8zp388s4fc526wr4pgszsqxw0bmwia6sjz0a9pn", + "version": "2.4.13" }, "disable-xml-rpc": { "path": "disable-xml-rpc/tags/1.0.1", @@ -60,10 +60,10 @@ "version": "1.4.0" }, "gutenberg": { - "path": "gutenberg/tags/17.0.2", - "rev": "2995211", - "sha256": "07c1smvapzm0gzkjzjk5irnp47x6hl2d4zcmlfprzj17igdqwa5s", - "version": "17.0.2" + "path": "gutenberg/tags/17.3.0", + "rev": "3012944", + "sha256": "0n51lldbbk0sfzcjk8mcjnaj6dmhhbg45kc9a03igl6cnppw6g53", + "version": "17.3.0" }, "hello-dolly": { "path": "hello-dolly/tags/1.7.2", @@ -72,16 +72,16 @@ "version": "1.7.2" }, "hkdev-maintenance-mode": { - "path": "hkdev-maintenance-mode/tags/2.4.5", - "rev": "2971903", - "sha256": "1nq3f0qv8zkws490h86m57972wp7vcngr62x90m8bcq4v6r110wd", - "version": "2.4.5" + "path": "hkdev-maintenance-mode/trunk", + "rev": "3003933", + "sha256": "1mfn9njy7sp23hgpd597y74gs52gi9lm8qajv7xbgza82920mlgd", + "version": "2.5.0" }, "jetpack": { - "path": "jetpack/tags/12.8.1", - "rev": "2995420", - "sha256": "1i59npwwk29rsq5myl0axr1vsyfw19dyx22ckc2szkc3a4my8h40", - "version": "12.8.1" + "path": "jetpack/tags/12.9.3", + "rev": "3013460", + "sha256": "1lgkd3bgaqf155a39zfxx7ikmfxpzfsfak71mrlga12sfmyrrw74", + "version": "12.9.3" }, "jetpack-lite": { "path": "jetpack-lite/tags/3.0.3", @@ -90,28 +90,28 @@ "version": "3.0.3" }, "lightbox-photoswipe": { - "path": "lightbox-photoswipe/tags/5.0.44", - "rev": "2968868", - "sha256": "0nbs05lxdf85ig373l3k558ncw0li1zrqnajq5mw9vkw15mxgy90", - "version": "5.0.44" + "path": "lightbox-photoswipe/tags/5.1.0", + "rev": "3001652", + "sha256": "1mdrxc15skbg8gm18b88hj97mps668in7xvyvymfn5sgpf843glz", + "version": "5.1.0" }, "login-lockdown": { - "path": "login-lockdown/tags/2.06", - "rev": "2951219", - "sha256": "0sl1pydylz1xpp3404nv2rdw8y2ccjvwglncj8flhjmgiwkjf47x", - "version": "2.06" + "path": "login-lockdown/tags/2.08", + "rev": "3007562", + "sha256": "0s9ahqbqcl0rlbbszrbdggyhnqw8k60xzlwq3nzsh2dxaphnmbi5", + "version": "2.08" }, "mailpoet": { - "path": "mailpoet/tags/4.36.0", - "rev": "2995974", - "sha256": "1782z2b1bwg7mx9qzvyzpiymmkqiafd5ymb31q11i7ks19gxlmbw", - "version": "4.36.0" + "path": "mailpoet/tags/4.40.0", + "rev": "3008786", + "sha256": "18604065zjwdrr63ad0a8zqy0cdfh8f5i3jyq5na5iayspgmy0lz", + "version": "4.40.0" }, "merge-minify-refresh": { "path": "merge-minify-refresh/trunk", - "rev": "2997367", - "sha256": "158i9pqn4qqa5mzn57pg4m9gsln35c0gfb8v7sg1y02hp9876shg", - "version": "2.2" + "rev": "3007859", + "sha256": "1f9ppjkpza5h6z23ma7x9lrpqsq5qxc0n8zfffs44njf086n7k4f", + "version": "2.7" }, "opengraph": { "path": "opengraph/tags/1.11.2", @@ -125,6 +125,12 @@ "sha256": "1byq8f5qkxxnhjc4dk1ab7h8vzcr01y1nid81wwj2k1i03z9llqa", "version": "1.3.5" }, + "simple-mastodon-verification": { + "path": "simple-mastodon-verification/tags/1.1.3", + "rev": "2998678", + "sha256": "0ikymrf21l86gpdcjfawadqg1nbfsm6gggcc1g2g553pjg277grz", + "version": "1.1.3" + }, "static-mail-sender-configurator": { "path": "static-mail-sender-configurator/tags/0.10.0", "rev": "2941521", @@ -138,10 +144,10 @@ "version": "1.2.3" }, "webp-converter-for-media": { - "path": "webp-converter-for-media/tags/5.11.4", - "rev": "2995294", - "sha256": "0grlszp00rw63psv21n70alapkw1pgaq8cp9c0b1klk50jcnnx8q", - "version": "5.11.4" + "path": "webp-converter-for-media/tags/5.11.5", + "rev": "3006520", + "sha256": "1mkfki9148w43r3h8afp1j8vkrljsch68y8l4m6i8w5jsjvb5c18", + "version": "5.11.5" }, "webp-express": { "path": "webp-express/tags/0.25.8", @@ -150,16 +156,16 @@ "version": "0.25.8" }, "wordpress-seo": { - "path": "wordpress-seo/tags/21.5", - "rev": "2986840", - "sha256": "1a1mnsh4imy7ab0b7hp0nis46ixwvj47wgibifa90qndbkv2mwsn", - "version": "21.5" + "path": "wordpress-seo/tags/21.7", + "rev": "3008568", + "sha256": "1iigdycbxhdzrprnajw54b1jjmp8akig72z9v78infaf2sjawmgh", + "version": "21.7" }, "worker": { - "path": "worker/tags/4.9.17", - "rev": "2894123", - "sha256": "067zx6b8fl87g901vglci870z38kg8igrdxlrcra4xwrll2c01si", - "version": "4.9.17" + "path": "worker/tags/4.9.18", + "rev": "3010154", + "sha256": "1wkkabw0g2c9bfqwqddjqrc13wwf39h508bb25cxwz2yi5fdhp9v", + "version": "4.9.18" }, "wp-change-email-sender": { "path": "wp-change-email-sender/trunk", @@ -180,22 +186,22 @@ "version": "2.0.22" }, "wp-mail-smtp": { - "path": "wp-mail-smtp/tags/3.10.0", - "rev": "2992136", - "sha256": "0py4ns4vsy9rpqq5gjyfc2p1lvf2gy28klw9ixkm6gdiim8pvl61", - "version": "3.10.0" + "path": "wp-mail-smtp/tags/3.11.0", + "rev": "3009463", + "sha256": "1vk6bdchqka5nmiakq9s8kj7psk2nq2yxln377bidqyqj0q9kqmk", + "version": "3.11.0" }, "wp-statistics": { - "path": "wp-statistics/tags/14.2", - "rev": "2976338", - "sha256": "0vcw6qp5w2whbpwcd9m0dpxf4ah0i7snygszp211lqg4g53qbyyv", - "version": "14.2" + "path": "wp-statistics/tags/14.3.2", + "rev": "3013471", + "sha256": "03iahbjnyyy1lxvxmfgzzzin0sfng0dyagx0q0bvfa9bqx4pi37h", + "version": "14.3.2" }, "wp-swiper": { "path": "wp-swiper/trunk", - "rev": "2978937", - "sha256": "0pn3l5v43hc572bym15pcdirq9n64mdgshacnr92hryq4vagyvzb", - "version": "1.0.34" + "rev": "3013138", + "sha256": "1h5l99m73z7fn0l5sa4qbdpi3r8nanvrbciix5756qj4qbzb51li", + "version": "1.1.0" }, "wp-user-avatars": { "path": "wp-user-avatars/trunk", @@ -204,9 +210,9 @@ "version": "1.4.1" }, "wpforms-lite": { - "path": "wpforms-lite/tags/1.8.4.1", - "rev": "2982999", - "sha256": "08yl41kxxdq36wcrypjrrbmckkpx464sqcarbk7pkzz83933z2pv", - "version": "1.8.4.1" + "path": "wpforms-lite/tags/1.8.5.3", + "rev": "3009465", + "sha256": "1xj4wn1zfdjqxh1h6k9xa316276k8n26nmgjfcapwss452qajwkm", + "version": "1.8.5.3" } } diff --git a/pkgs/servers/web-apps/wordpress/packages/wordpress-plugins.json b/pkgs/servers/web-apps/wordpress/packages/wordpress-plugins.json index ebcf43c24b06..185017124343 100644 --- a/pkgs/servers/web-apps/wordpress/packages/wordpress-plugins.json +++ b/pkgs/servers/web-apps/wordpress/packages/wordpress-plugins.json @@ -20,6 +20,7 @@ , "merge-minify-refresh" , "opengraph" , "simple-login-captcha" +, "simple-mastodon-verification" , "static-mail-sender-configurator" , "tc-custom-javascript" , "webp-converter-for-media" From 1e09a54e899b43fea266c45ea4b43f8dda01591e Mon Sep 17 00:00:00 2001 From: iliayar Date: Sat, 23 Dec 2023 14:35:45 +0300 Subject: [PATCH 033/128] pyprland: 1.6.0 -> 1.6.9 --- pkgs/by-name/py/pyprland/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/py/pyprland/package.nix b/pkgs/by-name/py/pyprland/package.nix index 51bf39609590..fd0b5583b36e 100644 --- a/pkgs/by-name/py/pyprland/package.nix +++ b/pkgs/by-name/py/pyprland/package.nix @@ -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 ]; From d033bda2a5a593c48002eaa4d3dc258b3b98f0cd Mon Sep 17 00:00:00 2001 From: Auguste Baum Date: Sat, 23 Dec 2023 00:12:18 +0100 Subject: [PATCH 034/128] django-mdeditor: init at 0.1.20 --- .../django-mdeditor/default.nix | 33 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/development/python-modules/django-mdeditor/default.nix diff --git a/pkgs/development/python-modules/django-mdeditor/default.nix b/pkgs/development/python-modules/django-mdeditor/default.nix new file mode 100644 index 000000000000..dc58e3cd665d --- /dev/null +++ b/pkgs/development/python-modules/django-mdeditor/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, django +}: +let + version = "0.1.20"; +in +buildPythonPackage { + pname = "django-mdeditor"; + inherit version; + + src = fetchFromGitHub { + owner = "pylixm"; + repo = "django-mdeditor"; + rev = "v${version}"; + hash = "sha256-t57j1HhjNQtBwlbqe4mAHQ9WiNcIhMKYmrZkiqh+k5k="; + }; + + propagatedBuildInputs = [ django ]; + + # no tests + doCheck = false; + pythonImportsCheck = [ "mdeditor" ]; + + meta = with lib; { + description = "Markdown Editor plugin application for django based on Editor.md"; + homepage = "https://github.com/pylixm/django-mdeditor"; + changelog = "https://github.com/pylixm/django-mdeditor/releases"; + license = licenses.gpl3; + maintainers = with maintainers; [ augustebaum ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9cc0aec97ed1..b535a1422187 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3089,6 +3089,8 @@ self: super: with self; { django-maintenance-mode = callPackage ../development/python-modules/django-maintenance-mode { }; + django-mdeditor = callPackage ../development/python-modules/django-mdeditor { }; + django-mptt = callPackage ../development/python-modules/django-mptt { }; django-mysql = callPackage ../development/python-modules/django-mysql { }; From b9b3fe2818827950f5aa5c53da1ab54107c524ac Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 23 Dec 2023 21:24:57 +0100 Subject: [PATCH 035/128] python311Packages.botocore-stubs: 1.34.2 -> 1.34.7 --- pkgs/development/python-modules/botocore-stubs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/botocore-stubs/default.nix b/pkgs/development/python-modules/botocore-stubs/default.nix index 088782775d61..4a6eb3aa9950 100644 --- a/pkgs/development/python-modules/botocore-stubs/default.nix +++ b/pkgs/development/python-modules/botocore-stubs/default.nix @@ -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 = [ From fa5f38e14fb9bda49d179457812b0f0f97347dfd Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 23 Dec 2023 21:26:06 +0100 Subject: [PATCH 036/128] python311Packages.hahomematic: 2023.11.4 -> 2023.12.4 Diff: https://github.com/danielperna84/hahomematic/compare/refs/tags/2023.11.4...2023.12.4 Changelog: https://github.com/danielperna84/hahomematic/releases/tag/2023.12.4 --- pkgs/development/python-modules/hahomematic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hahomematic/default.nix b/pkgs/development/python-modules/hahomematic/default.nix index e69d51887050..bbaa5347dff7 100644 --- a/pkgs/development/python-modules/hahomematic/default.nix +++ b/pkgs/development/python-modules/hahomematic/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "hahomematic"; - version = "2023.11.4"; + 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-LB0BGj/DWjHGAFkyACkkzGY1oYNc7hJ2BeT1lHlNjqU="; + hash = "sha256-IsRHJyFgoS7vfr/QcfzplsmFHMRRtLXVqU7bhL/fFto="; }; postPatch = '' From 67d640710092e0b0d9a6548873e67222344f0930 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 23 Dec 2023 21:26:50 +0100 Subject: [PATCH 037/128] python311Packages.hachoir: 3.2.0 -> 3.3.0 Diff: https://github.com/vstinner/hachoir/compare/refs/tags/3.2.0...3.3.0 Changelog: https://github.com/vstinner/hachoir/blob/3.3.0/doc/changelog.rst --- pkgs/development/python-modules/hachoir/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hachoir/default.nix b/pkgs/development/python-modules/hachoir/default.nix index 0de262ab7b43..4480dd893275 100644 --- a/pkgs/development/python-modules/hachoir/default.nix +++ b/pkgs/development/python-modules/hachoir/default.nix @@ -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 = [ From ee2d1ac62bb1aac428d2cd7082f61e1924566216 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 23 Dec 2023 21:36:22 +0100 Subject: [PATCH 038/128] trufflehog: 3.63.5 -> 3.63.7 Diff: https://github.com/trufflesecurity/trufflehog/compare/refs/tags/v3.63.5...v3.63.7 Changelog: https://github.com/trufflesecurity/trufflehog/releases/tag/v3.63.7 --- pkgs/tools/security/trufflehog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/trufflehog/default.nix b/pkgs/tools/security/trufflehog/default.nix index 8f61c00e27b0..ac6577ceed92 100644 --- a/pkgs/tools/security/trufflehog/default.nix +++ b/pkgs/tools/security/trufflehog/default.nix @@ -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="; From fa08b454a871887bf2021b0eb093c5138dbf045e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 23 Dec 2023 21:26:13 +0000 Subject: [PATCH 039/128] jazz2: 2.3.0 -> 2.4.0 --- pkgs/by-name/ja/jazz2/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ja/jazz2/package.nix b/pkgs/by-name/ja/jazz2/package.nix index c90365bac287..44a039e40029 100644 --- a/pkgs/by-name/ja/jazz2/package.nix +++ b/pkgs/by-name/ja/jazz2/package.nix @@ -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 ]; From 83078b0c86cee197644a983deeedb5a08a6fb790 Mon Sep 17 00:00:00 2001 From: Mikael Fangel <34864484+MikaelFangel@users.noreply.github.com> Date: Sun, 24 Dec 2023 00:32:17 +0100 Subject: [PATCH 040/128] nwjs: 0.82.0 -> 0.83.0 --- pkgs/development/tools/nwjs/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/nwjs/default.nix b/pkgs/development/tools/nwjs/default.nix index f88dc1f3f905..752ec8b70188 100644 --- a/pkgs/development/tools/nwjs/default.nix +++ b/pkgs/development/tools/nwjs/default.nix @@ -85,7 +85,7 @@ let extraOutputsToInstall = [ "lib" "out" ]; }; - version = "0.82.0"; + version = "0.83.0"; in stdenv.mkDerivation { pname = "nwjs"; @@ -96,10 +96,10 @@ stdenv.mkDerivation { in fetchurl { url = "https://dl.nwjs.io/v${version}/nwjs-${flavor}v${version}-linux-${bits}.tar.gz"; hash = { - "sdk-ia32" = "sha256-aIRnZDslOhoD5F0coX43VNFWGEImPU5oq9Roc4jYfsY="; - "sdk-x64" = "sha256-rKbnNAq9AVjSUjTipYze2VHiVi0RnZZsdQj1725DPd0="; - "ia32" = "sha256-pA53+A+EtS7m6026jPlC3vFxb2iheS4peDJFNkQAf/s="; - "x64" = "sha256-hRih8o8hBbYBEes3Z62PSMIC720SLRa3t2rL/5LaJAE="; + "sdk-ia32" = "sha256-Sps0XFOnnJIkDRPI+PJSjseF8cyaYvXXs4ZeVI8mcm8="; + "sdk-x64" = "sha256-qsNPfmDQK/BZzMTlX9MDaV7KZsU32YQ1B/Qh/EHIZrQ="; + "ia32" = "sha256-99+EU4Kg8lH8facRmIl2SV3GyWUw46rGYpso5QSP//k="; + "x64" = "sha256-y0oBVvVguRDe391EsQs6qYqkTRPzUfm50m6NDOZh+7o="; }."${flavor + bits}"; }; From 0c27e026de6d0b92581745ebc92a2e0210ffeadf Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 24 Dec 2023 04:20:00 +0000 Subject: [PATCH 041/128] mcfly: 0.8.1 -> 0.8.4 Diff: https://github.com/cantino/mcfly/compare/v0.8.1...v0.8.4 Changelog: https://github.com/cantino/mcfly/raw/v0.8.4/CHANGELOG.txt --- pkgs/tools/misc/mcfly/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/mcfly/default.nix b/pkgs/tools/misc/mcfly/default.nix index 127dd142a9f1..675639a03294 100644 --- a/pkgs/tools/misc/mcfly/default.nix +++ b/pkgs/tools/misc/mcfly/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "mcfly"; - version = "0.8.1"; + version = "0.8.4"; src = fetchFromGitHub { owner = "cantino"; repo = "mcfly"; rev = "v${version}"; - hash = "sha256-9muBKJXsXiSxSmLRygGATEbwpiz6B8oTFQIkVMJMWAk="; + hash = "sha256-beoXLTy3XikdZBS0Lh3cugHflNJ51PbqsCE3xtCHpj0="; }; postPatch = '' @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { substituteInPlace mcfly.fish --replace '(command which mcfly)' '${placeholder "out"}/bin/mcfly' ''; - cargoHash = "sha256-LhIAJ3JI7cp+vzEH5vthefgExPORF6Xnjj3cQkIkhSA="; + cargoHash = "sha256-wWYpDU6oXT+sDCzX8VWJ6GfNPOi7T02LK0JKcWHFGi8="; meta = with lib; { homepage = "https://github.com/cantino/mcfly"; From fa159633943de14e914fbb67115875d0509d474a Mon Sep 17 00:00:00 2001 From: Patrick Steinhardt Date: Mon, 4 Dec 2023 21:12:35 +0100 Subject: [PATCH 042/128] kodiPackages.inputstream-adaptive: 20.3.13 -> 20.3.14 https://github.com/xbmc/inputstream.adaptive/releases/tag/20.3.14-Nexus --- .../video/kodi/addons/inputstream-adaptive/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/kodi/addons/inputstream-adaptive/default.nix b/pkgs/applications/video/kodi/addons/inputstream-adaptive/default.nix index 61e5147be360..60c67f75fa51 100644 --- a/pkgs/applications/video/kodi/addons/inputstream-adaptive/default.nix +++ b/pkgs/applications/video/kodi/addons/inputstream-adaptive/default.nix @@ -10,13 +10,13 @@ in buildKodiBinaryAddon rec { pname = "inputstream-adaptive"; namespace = "inputstream.adaptive"; - version = "20.3.13"; + version = "20.3.14"; src = fetchFromGitHub { owner = "xbmc"; repo = "inputstream.adaptive"; rev = "${version}-${rel}"; - sha256 = "sha256-xvU+DcVEaQ/1sm6o21/6N1znCtzrct0qDhMxXGFZjL4="; + sha256 = "sha256-9S98LgeXq2Wc5CLd5WGo7iNM9ZkSuDBO/O35wf0SjZY="; }; extraCMakeFlags = [ From 8106e2d74e8b476d6588ecfc6b3eb2f0590de15f Mon Sep 17 00:00:00 2001 From: Patrick Steinhardt Date: Mon, 4 Dec 2023 21:05:09 +0100 Subject: [PATCH 043/128] kodiPackages.netflix: 1.22.3 -> 1.23.0 https://github.com/CastagnaIT/plugin.video.netflix/releases/tag/v1.23.0 --- pkgs/applications/video/kodi/addons/netflix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/kodi/addons/netflix/default.nix b/pkgs/applications/video/kodi/addons/netflix/default.nix index 3352ae4c63d3..a94cdb9d2756 100644 --- a/pkgs/applications/video/kodi/addons/netflix/default.nix +++ b/pkgs/applications/video/kodi/addons/netflix/default.nix @@ -3,13 +3,13 @@ buildKodiAddon rec { pname = "netflix"; namespace = "plugin.video.netflix"; - version = "1.22.3"; + version = "1.23.0"; src = fetchFromGitHub { owner = "CastagnaIT"; repo = namespace; rev = "v${version}"; - sha256 = "sha256-8NGj8n1p8euqYYdPDSeFh2ZE9lly5ThSmg69yXY3Te8="; + sha256 = "sha256-hMGL1DojtSFOV6dX7MC+68aXnN+DEDieQN7GJBbGiZM="; }; propagatedBuildInputs = [ From bfe1dfee4af4ac347684f6c4d591fe2a439d8b7f Mon Sep 17 00:00:00 2001 From: Patrick Steinhardt Date: Sun, 24 Dec 2023 09:37:41 +0100 Subject: [PATCH 044/128] kodiPackages.netflix: 1.23.0 -> 1.23.1 https://github.com/CastagnaIT/plugin.video.netflix/releases/tag/v1.23.1 --- pkgs/applications/video/kodi/addons/netflix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/kodi/addons/netflix/default.nix b/pkgs/applications/video/kodi/addons/netflix/default.nix index a94cdb9d2756..ce66665ee73b 100644 --- a/pkgs/applications/video/kodi/addons/netflix/default.nix +++ b/pkgs/applications/video/kodi/addons/netflix/default.nix @@ -3,13 +3,13 @@ buildKodiAddon rec { pname = "netflix"; namespace = "plugin.video.netflix"; - version = "1.23.0"; + version = "1.23.1"; src = fetchFromGitHub { owner = "CastagnaIT"; repo = namespace; rev = "v${version}"; - sha256 = "sha256-hMGL1DojtSFOV6dX7MC+68aXnN+DEDieQN7GJBbGiZM="; + sha256 = "sha256-ZY59I3RR/gl24XqZiBkenHM/D4tW/5ZyE4UngtvODYQ="; }; propagatedBuildInputs = [ From 87add9a0e542ee80577d8d16f68c28dc11c80196 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 24 Dec 2023 09:20:58 +0000 Subject: [PATCH 045/128] snowflake: 2.8.0 -> 2.8.1 --- pkgs/tools/networking/snowflake/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/snowflake/default.nix b/pkgs/tools/networking/snowflake/default.nix index 071305f951cf..137e2f3087c0 100644 --- a/pkgs/tools/networking/snowflake/default.nix +++ b/pkgs/tools/networking/snowflake/default.nix @@ -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"; From 4c638870731167e36fc09d6e6fb40f01038c0498 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 24 Dec 2023 09:42:55 +0000 Subject: [PATCH 046/128] supercronic: 0.2.27 -> 0.2.29 --- pkgs/tools/system/supercronic/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/supercronic/default.nix b/pkgs/tools/system/supercronic/default.nix index 6b2b4ef5c43a..745202ce15c5 100644 --- a/pkgs/tools/system/supercronic/default.nix +++ b/pkgs/tools/system/supercronic/default.nix @@ -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" ]; From 6a16b6e2eb6b0de36747ad87974f4b124a07a52c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 24 Dec 2023 10:00:20 +0000 Subject: [PATCH 047/128] svdtools: 0.3.6 -> 0.3.8 --- pkgs/development/embedded/svdtools/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/embedded/svdtools/default.nix b/pkgs/development/embedded/svdtools/default.nix index 4a57b0ace290..ad270e0ba651 100644 --- a/pkgs/development/embedded/svdtools/default.nix +++ b/pkgs/development/embedded/svdtools/default.nix @@ -5,14 +5,14 @@ rustPlatform.buildRustPackage rec { pname = "svdtools"; - version = "0.3.6"; + version = "0.3.8"; src = fetchCrate { inherit version pname; - hash = "sha256-bk6kv13HMDSRBjShWnRZJzb0YX0zKljPoEC6tebkVKI="; + hash = "sha256-daATz1bd5fwfYnfVbweJd/I6SsQyg2CC+MEZ5WLyZBw="; }; - cargoHash = "sha256-MdYzYmbI7ZNLeLZdnLIVo9y2rvmGevEGy7t+2FFu5yo="; + cargoHash = "sha256-TSLUBkPRab6cwlXJw8tHpqYjhLtVa+QJZq13Qj/0UzU="; meta = with lib; { description = "Tools to handle vendor-supplied, often buggy SVD files"; From f82870a99b420b772707d190c835742f0b8550b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Sat, 23 Dec 2023 22:09:26 +0100 Subject: [PATCH 048/128] cinnamon.cinnamon-session: add patch for using login shell w/ wayland This adds the patch from https://github.com/linuxmint/cinnamon-session/pull/161 to fix an issue with services.xserver.cinnamon.sessionPath not being correctly applied when using gdm + wayland and possibly other combinations --- ...-Use-login-shell-for-wayland-session.patch | 76 +++++++++++++++++++ .../cinnamon/cinnamon-session/default.nix | 1 + 2 files changed, 77 insertions(+) create mode 100644 pkgs/desktops/cinnamon/cinnamon-session/0002-Use-login-shell-for-wayland-session.patch diff --git a/pkgs/desktops/cinnamon/cinnamon-session/0002-Use-login-shell-for-wayland-session.patch b/pkgs/desktops/cinnamon/cinnamon-session/0002-Use-login-shell-for-wayland-session.patch new file mode 100644 index 000000000000..6c44f93d8f3c --- /dev/null +++ b/pkgs/desktops/cinnamon/cinnamon-session/0002-Use-login-shell-for-wayland-session.patch @@ -0,0 +1,76 @@ +From 174d14edcbb401aa2bfb77932b214512befb486c Mon Sep 17 00:00:00 2001 +From: Bobby Rong +Date: Sat, 23 Dec 2023 23:24:59 +0800 +Subject: [PATCH] cinnamon-session: make sure wayland sessions get a login + shell + +Users expect their shell profiles to get sourced at startup, which +doesn't happen with wayland sessions. + +This commit brings back that feature, by making the cinnamon-session +wrapper script run a login shell. + +ref: https://gitlab.gnome.org/GNOME/gnome-session/-/commit/7e307f8ddb91db5d4051c4c792519a660ba67f35 +--- + cinnamon-session/cinnamon-session.in | 16 ++++++++++++++++ + cinnamon-session/meson.build | 14 +++++++++++++- + 2 files changed, 29 insertions(+), 1 deletion(-) + create mode 100755 cinnamon-session/cinnamon-session.in + +diff --git a/cinnamon-session/cinnamon-session.in b/cinnamon-session/cinnamon-session.in +new file mode 100755 +index 0000000..d9d7cb2 +--- /dev/null ++++ b/cinnamon-session/cinnamon-session.in +@@ -0,0 +1,16 @@ ++#!/bin/sh ++ ++if [ "x$XDG_SESSION_TYPE" = "xwayland" ] && ++ [ "x$XDG_SESSION_CLASS" != "xgreeter" ] && ++ [ -n "$SHELL" ] && ++ grep -q "$SHELL" /etc/shells && ++ ! (echo "$SHELL" | grep -q "false") && ++ ! (echo "$SHELL" | grep -q "nologin"); then ++ if [ "$1" != '-l' ]; then ++ exec bash -c "exec -l '$SHELL' -c '$0 -l $*'" ++ else ++ shift ++ fi ++fi ++ ++exec @libexecdir@/cinnamon-session-binary "$@" +diff --git a/cinnamon-session/meson.build b/cinnamon-session/meson.build +index 10092ee..3d32fdc 100644 +--- a/cinnamon-session/meson.build ++++ b/cinnamon-session/meson.build +@@ -54,7 +54,7 @@ cinnamon_session_sources = [ + ] + + dbus_glib = dependency('dbus-glib-1') +-executable('cinnamon-session', ++executable('cinnamon-session-binary', + cinnamon_session_sources, + dependencies: [ + cinnamon_desktop, +@@ -76,6 +76,18 @@ executable('cinnamon-session', + ], + include_directories: [ rootInclude ], + install: true, ++ install_dir: get_option('libexecdir'), ++) ++ ++script_conf = configuration_data() ++script_conf.set('libexecdir', get_option('prefix') / get_option('libexecdir')) ++ ++configure_file( ++ input: 'cinnamon-session.in', ++ output: 'cinnamon-session', ++ install: true, ++ install_dir: get_option('bindir'), ++ configuration: script_conf + ) + + units = [ +-- +2.42.0 + diff --git a/pkgs/desktops/cinnamon/cinnamon-session/default.nix b/pkgs/desktops/cinnamon/cinnamon-session/default.nix index a6800f94737d..a0dfab6503c2 100644 --- a/pkgs/desktops/cinnamon/cinnamon-session/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-session/default.nix @@ -43,6 +43,7 @@ stdenv.mkDerivation rec { patches = [ ./0001-Use-dbus_glib-instead-of-elogind.patch + ./0002-Use-login-shell-for-wayland-session.patch ]; buildInputs = [ From 6698e960266f333d31b284af154ea9ef456676a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Thu, 14 Dec 2023 18:27:54 +0100 Subject: [PATCH 049/128] nixos/gpaste: also add to cinnamon session path - fixes #276028 This fixes gpaste-reloaded applet for cinnamon, which requires gpaste's typelib to be accessible --- nixos/modules/programs/gpaste.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/programs/gpaste.nix b/nixos/modules/programs/gpaste.nix index 074b4d59a365..37172c9583a3 100644 --- a/nixos/modules/programs/gpaste.nix +++ b/nixos/modules/programs/gpaste.nix @@ -32,5 +32,7 @@ with lib; systemd.packages = [ pkgs.gnome.gpaste ]; # gnome-control-center crashes in Keyboard Shortcuts pane without the GSettings schemas. services.xserver.desktopManager.gnome.sessionPath = [ pkgs.gnome.gpaste ]; + # gpaste-reloaded applet doesn't work without the typelib + services.xserver.desktopManager.cinnamon.sessionPath = [ pkgs.gnome.gpaste ]; }; } From b07ca0897e89060aa73367bebe4ff0f078cd19f0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 24 Dec 2023 13:58:14 +0000 Subject: [PATCH 050/128] toml-f: 0.4.1 -> 0.4.2 --- pkgs/development/libraries/toml-f/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/toml-f/default.nix b/pkgs/development/libraries/toml-f/default.nix index 696e41ac71cc..ed6fc26ee205 100644 --- a/pkgs/development/libraries/toml-f/default.nix +++ b/pkgs/development/libraries/toml-f/default.nix @@ -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 ]; From 29e54d26206bc306b8c77da0161148fc7b785427 Mon Sep 17 00:00:00 2001 From: Adam Stephens Date: Sun, 24 Dec 2023 09:19:30 -0500 Subject: [PATCH 051/128] forgejo-actions-runner: 3.0.1 -> 3.3.0 Diff: https://codeberg.org/forgejo/runner/compare/v3.0.1...v3.3.0 Changelog: https://gitea.com/gitea/act_runner/releases/tag/v3.3.0 --- .../forgejo-actions-runner/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/forgejo-actions-runner/default.nix b/pkgs/development/tools/continuous-integration/forgejo-actions-runner/default.nix index f32c5b138aba..dc5ad3708a0e 100644 --- a/pkgs/development/tools/continuous-integration/forgejo-actions-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/forgejo-actions-runner/default.nix @@ -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" From 28a5992e725caa7c7b210ee2f80d437bc27bd5da Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 24 Dec 2023 18:09:54 +0000 Subject: [PATCH 052/128] uftp: 5.0.2 -> 5.0.3 --- pkgs/servers/uftp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/uftp/default.nix b/pkgs/servers/uftp/default.nix index 0da5257aee98..e2251e1a20c8 100644 --- a/pkgs/servers/uftp/default.nix +++ b/pkgs/servers/uftp/default.nix @@ -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 ]; From d3397164c5523115d8237bcf1e420a41dbeae647 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 24 Dec 2023 20:08:23 +0000 Subject: [PATCH 053/128] ugs: 2.1.0 -> 2.1.4 --- pkgs/tools/misc/ugs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/ugs/default.nix b/pkgs/tools/misc/ugs/default.nix index 395a9e42009c..58c221ee9e84 100644 --- a/pkgs/tools/misc/ugs/default.nix +++ b/pkgs/tools/misc/ugs/default.nix @@ -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; From 91b445737aa226bafbbe167960aa456263779836 Mon Sep 17 00:00:00 2001 From: squalus Date: Sun, 24 Dec 2023 12:57:30 -0800 Subject: [PATCH 054/128] librewolf-unwrapped: 120.0.1-1 -> 121.0-1 --- .../networking/browsers/librewolf/src.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/networking/browsers/librewolf/src.json b/pkgs/applications/networking/browsers/librewolf/src.json index 65ce8374f357..89856df00ed4 100644 --- a/pkgs/applications/networking/browsers/librewolf/src.json +++ b/pkgs/applications/networking/browsers/librewolf/src.json @@ -1,15 +1,15 @@ { - "packageVersion": "120.0.1-1", + "packageVersion": "121.0-1", "source": { - "rev": "120.0.1-1", - "sha256": "0kvfa97m7dq1b030d62zblpb445fkbgb2w19bckxwxv7mx36awy7" + "rev": "121.0-1", + "sha256": "1vd4vz4i27p1lwx5ibaxqf7r1ll5zlvf54n6mqmaya3q0lrawb14" }, "settings": { - "rev": "9dac02778ebed3e2614da52c36b7cede45f4f602", - "sha256": "0flk6v50cyiaajzcz9gm1hig00vkw9xdbjd5rdxidrmhcqxy24vy" + "rev": "41623492f2b6970972014f6ce196015d3d7f1b59", + "sha256": "0ayyyw44q0gh668bzlv6cfl7baa0818bnz83g53l5j2f10xd52by" }, "firefox": { - "version": "120.0.1", - "sha512": "dd0e3eb234d58c39431d1f100834ef4bcc8cfb89ff471a37b948eda4dd3874b63b1979cda39a0db0dd3b4a579b5f09a7d2d1f39d26fd9f2b8d5635e4b8738b6c" + "version": "121.0", + "sha512": "52e9e21ce825c4e58f09fd2c7347f1ac4efbca47e119136a712f0d4ee80c769ef80a43bad74a4c88cd377f804f5780b07f7af5b779f3fb5d244fa095e6b3b18a" } } From 1bbad9ad762aa499f1862943c9d81f2f4ad38884 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 24 Dec 2023 21:25:07 +0000 Subject: [PATCH 055/128] url-parser: 1.0.6 -> 2.0.1 --- pkgs/tools/misc/url-parser/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/url-parser/default.nix b/pkgs/tools/misc/url-parser/default.nix index ae74dc7396f2..8a4e34c8187a 100644 --- a/pkgs/tools/misc/url-parser/default.nix +++ b/pkgs/tools/misc/url-parser/default.nix @@ -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" From 167624ad7e9d507d10c862f835f68870cdd23a69 Mon Sep 17 00:00:00 2001 From: Yureka Date: Sun, 24 Dec 2023 22:42:04 +0100 Subject: [PATCH 056/128] lsp-plugins: 1.2.13 -> 1.2.14 Changelog: https://github.com/lsp-plugins/lsp-plugins/releases/tag/1.2.14 --- pkgs/applications/audio/lsp-plugins/default.nix | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/audio/lsp-plugins/default.nix b/pkgs/applications/audio/lsp-plugins/default.nix index e6db737c4016..c3df2ecd30d4 100644 --- a/pkgs/applications/audio/lsp-plugins/default.nix +++ b/pkgs/applications/audio/lsp-plugins/default.nix @@ -5,20 +5,12 @@ stdenv.mkDerivation rec { pname = "lsp-plugins"; - version = "1.2.13"; + version = "1.2.14"; src = fetchurl { url = "https://github.com/sadko4u/${pname}/releases/download/${version}/${pname}-src-${version}.tar.gz"; - sha256 = "sha256-eJO+1fCNzqjTdGrPlhIrHc3UimkJOydRqTq49IN+Iwo="; + sha256 = "sha256-GjNZ7ouKgpcb1+nuq+Q/WM5rSkeT2F+xb5exAOTt7po="; }; - patches = [ - (fetchpatch { - url = "https://github.com/lsp-plugins/lsp-dsp-lib/commit/58c3f985f009c84347fa91236f164a9e47aafa93.patch"; - stripLen = 1; - extraPrefix = "modules/lsp-dsp-lib/"; - hash = "sha256-pCLucLijXOgp69xNjSRCRxgVoQziT0YiHLnQGbkefqE="; - }) - ]; outputs = [ "out" "dev" "doc" ]; From 2058c3a373f047961549b3bd8531de5822139766 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sun, 24 Dec 2023 23:05:00 +0100 Subject: [PATCH 057/128] lammps: fix homepage and license --- .../science/molecular-dynamics/lammps/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/molecular-dynamics/lammps/default.nix b/pkgs/applications/science/molecular-dynamics/lammps/default.nix index feb7a98bd59d..a6dc8592ae3c 100644 --- a/pkgs/applications/science/molecular-dynamics/lammps/default.nix +++ b/pkgs/applications/science/molecular-dynamics/lammps/default.nix @@ -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 From 68906a5fc5fa320213f4ed18dd615bef080e0608 Mon Sep 17 00:00:00 2001 From: Marcus Ramberg Date: Sun, 24 Dec 2023 23:51:30 +0100 Subject: [PATCH 058/128] aliases: fix typo --- pkgs/top-level/aliases.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index a8213508067d..b9881eea3b5f 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -590,7 +590,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 From 60907d4769dc7707ad08adbd0d93fc68ec66468b Mon Sep 17 00:00:00 2001 From: Adam Stephens Date: Sun, 24 Dec 2023 18:16:37 -0500 Subject: [PATCH 059/128] just: 1.17.0 -> 1.18.1 Changelog: https://github.com/casey/just/blob/1.18.1/CHANGELOG.md --- pkgs/development/tools/just/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/just/default.nix b/pkgs/development/tools/just/default.nix index 4dea1df99700..213a411b6b6b 100644 --- a/pkgs/development/tools/just/default.nix +++ b/pkgs/development/tools/just/default.nix @@ -11,17 +11,17 @@ rustPlatform.buildRustPackage rec { pname = "just"; - version = "1.17.0"; + version = "1.18.1"; outputs = [ "out" "man" "doc" ]; src = fetchFromGitHub { owner = "casey"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-tT8WNenYTLL5dGrRbhfASRMEcyuoHS7RNXpMX/GG+wE="; + hash = "sha256-jmTSTx2WSLOtxy0gPCTonjcoy4o9FKA5aiQW3+wPrZQ="; }; - cargoHash = "sha256-1R2kl5E5OU3U38LfcBzlvth4bBpVVnbXiet2N5LNNZk="; + cargoHash = "sha256-4kbvtmXkU5bhuC079K5NOGKVdqYvTileVNXSNLIV0ok="; nativeBuildInputs = [ installShellFiles mdbook ]; buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; From fc82acb9ebe48fd1824a6b04617db570b19c3547 Mon Sep 17 00:00:00 2001 From: Adam Stephens Date: Sun, 24 Dec 2023 18:17:32 -0500 Subject: [PATCH 060/128] audiobookshelf: 2.6.0 -> 2.7.0 Diff: https://github.com/advplyr/audiobookshelf/compare/v2.6.0...v2.7.0 --- pkgs/servers/audiobookshelf/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/audiobookshelf/default.nix b/pkgs/servers/audiobookshelf/default.nix index 5ed446b8bbad..127abe161a64 100644 --- a/pkgs/servers/audiobookshelf/default.nix +++ b/pkgs/servers/audiobookshelf/default.nix @@ -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; From dad9c990826e522976afca663de01ae75aa439ad Mon Sep 17 00:00:00 2001 From: Someone Serge Date: Thu, 21 Dec 2023 23:59:09 +0000 Subject: [PATCH 061/128] cudaPackages: replace the fhs paths in pkg-config files Cf. https://github.com/NixOS/nixpkgs/issues/224119 --- .../cuda-modules/cuda/overrides.nix | 5 ++- .../generic-builders/manifest.nix | 37 ++++++++++++++++++- 2 files changed, 40 insertions(+), 2 deletions(-) diff --git a/pkgs/development/cuda-modules/cuda/overrides.nix b/pkgs/development/cuda-modules/cuda/overrides.nix index 12e14ef9965b..bcb41f43e98e 100644 --- a/pkgs/development/cuda-modules/cuda/overrides.nix +++ b/pkgs/development/cuda-modules/cuda/overrides.nix @@ -115,7 +115,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"; }; } diff --git a/pkgs/development/cuda-modules/generic-builders/manifest.nix b/pkgs/development/cuda-modules/generic-builders/manifest.nix index 71c914c8c8f2..6b29f55c3e31 100644 --- a/pkgs/development/cuda-modules/generic-builders/manifest.nix +++ b/pkgs/development/cuda-modules/generic-builders/manifest.nix @@ -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 = 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. From cfa07014b6af63298365329c8ffc2a132941d985 Mon Sep 17 00:00:00 2001 From: Someone Serge Date: Fri, 22 Dec 2023 00:33:55 +0000 Subject: [PATCH 062/128] cudaPackages.cuda_cudart: patch cuda-XX.Y.pc --- pkgs/development/cuda-modules/cuda/overrides.nix | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/pkgs/development/cuda-modules/cuda/overrides.nix b/pkgs/development/cuda-modules/cuda/overrides.nix index bcb41f43e98e..b835b5350aee 100644 --- a/pkgs/development/cuda-modules/cuda/overrides.nix +++ b/pkgs/development/cuda-modules/cuda/overrides.nix @@ -1,4 +1,4 @@ -{cudaVersion, lib}: +{cudaVersion, lib, addDriverRunpath}: let inherit (lib) attrsets lists strings; # cudaVersionOlder : Version -> Boolean @@ -42,6 +42,20 @@ attrsets.filterAttrs (attr: _: (builtins.hasAttr attr prev)) { lists.optionals (cudaVersionAtLeast "12.0") [final.libnvjitlink.lib] ); + cuda_cudart = prev.cuda_cudart.overrideAttrs ( + prevAttrs: { + + # 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 = From 5d6136a53eea91bcc7f32c83eb203d1b96494f52 Mon Sep 17 00:00:00 2001 From: Someone Serge Date: Mon, 25 Dec 2023 00:38:48 +0000 Subject: [PATCH 063/128] cudaPackages: allow FHS references by default ...harden gradually instead --- pkgs/development/cuda-modules/cuda/overrides.nix | 1 + pkgs/development/cuda-modules/generic-builders/manifest.nix | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/cuda-modules/cuda/overrides.nix b/pkgs/development/cuda-modules/cuda/overrides.nix index b835b5350aee..225dada7c16b 100644 --- a/pkgs/development/cuda-modules/cuda/overrides.nix +++ b/pkgs/development/cuda-modules/cuda/overrides.nix @@ -44,6 +44,7 @@ attrsets.filterAttrs (attr: _: (builtins.hasAttr attr prev)) { 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 "" + '' diff --git a/pkgs/development/cuda-modules/generic-builders/manifest.nix b/pkgs/development/cuda-modules/generic-builders/manifest.nix index 6b29f55c3e31..67f6e93559c4 100644 --- a/pkgs/development/cuda-modules/generic-builders/manifest.nix +++ b/pkgs/development/cuda-modules/generic-builders/manifest.nix @@ -219,7 +219,7 @@ backendStdenv.mkDerivation ( ''; doInstallCheck = true; - allowFHSReferences = false; + allowFHSReferences = true; # TODO: Default to `false` postInstallCheck = '' echo "Executing postInstallCheck" From 2f38b15f1612f9d961a747ba48e3b5dd25d731c5 Mon Sep 17 00:00:00 2001 From: Aaron Janse Date: Mon, 25 Dec 2023 01:04:12 +0000 Subject: [PATCH 064/128] flyctl: remove myself as maintainer --- pkgs/development/web/flyctl/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix index 1bac4b232cec..1aa253775294 100644 --- a/pkgs/development/web/flyctl/default.nix +++ b/pkgs/development/web/flyctl/default.nix @@ -57,7 +57,7 @@ buildGoModule rec { downloadPage = "https://github.com/superfly/flyctl"; homepage = "https://fly.io/"; license = licenses.asl20; - maintainers = with maintainers; [ aaronjanse adtya jsierles techknowlogick viraptor ]; + maintainers = with maintainers; [ adtya jsierles techknowlogick viraptor ]; mainProgram = "flyctl"; }; } From c238335625e6892cf0c012db1c5f07032d246957 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 24 Dec 2023 02:07:43 +0100 Subject: [PATCH 065/128] waydroid: 1.4.1 -> 1.4.2 Diff: https://github.com/waydroid/waydroid/compare/1.4.1...1.4.2 --- pkgs/os-specific/linux/waydroid/default.nix | 30 ++++++++++++--------- 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/pkgs/os-specific/linux/waydroid/default.nix b/pkgs/os-specific/linux/waydroid/default.nix index e8e0727b8dbf..97818ba9c4d4 100644 --- a/pkgs/os-specific/linux/waydroid/default.nix +++ b/pkgs/os-specific/linux/waydroid/default.nix @@ -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}"' From 5bf728a6d494946b3a2027814ce96f8c86f76d97 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 25 Dec 2023 01:24:12 +0000 Subject: [PATCH 066/128] vcmi: 1.4.0 -> 1.4.1 --- pkgs/games/vcmi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/vcmi/default.nix b/pkgs/games/vcmi/default.nix index 2dd27400961d..2cbbaa25ae5a 100644 --- a/pkgs/games/vcmi/default.nix +++ b/pkgs/games/vcmi/default.nix @@ -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 = [ From 76ee867f63f8357b9bdcd58618aed92b9b5a2d98 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 25 Dec 2023 01:39:35 +0000 Subject: [PATCH 067/128] vendir: 0.37.0 -> 0.38.0 --- pkgs/development/tools/vendir/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/vendir/default.nix b/pkgs/development/tools/vendir/default.nix index 02e5102c9e25..bc0edbccf9ac 100644 --- a/pkgs/development/tools/vendir/default.nix +++ b/pkgs/development/tools/vendir/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "vendir"; - version = "0.37.0"; + version = "0.38.0"; src = fetchFromGitHub { owner = "vmware-tanzu"; repo = "carvel-vendir"; rev = "v${version}"; - sha256 = "sha256-AxHVr6XryTXqm+iL54eqxIRE2MfxLbwFz7+aCauP0x8="; + sha256 = "sha256-H5SeDZzl2KdVp3KsRpsmp6/ZOxLq+3y9Coe1NIEi5YQ="; }; vendorHash = null; From 121e5a6a30a17d7ece2516b1512bfe15b7d6eb9e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 25 Dec 2023 01:54:10 +0000 Subject: [PATCH 068/128] vhdl-ls: 0.67.0 -> 0.77.0 --- pkgs/development/tools/language-servers/vhdl-ls/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/language-servers/vhdl-ls/default.nix b/pkgs/development/tools/language-servers/vhdl-ls/default.nix index 1c71adecebd2..1ca6f8930709 100644 --- a/pkgs/development/tools/language-servers/vhdl-ls/default.nix +++ b/pkgs/development/tools/language-servers/vhdl-ls/default.nix @@ -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 \ From ed528caa132bea8ee4fa72a84a3d8b7b4ef95d92 Mon Sep 17 00:00:00 2001 From: Lin Yinfeng Date: Fri, 22 Dec 2023 12:31:27 +0800 Subject: [PATCH 069/128] backblaze-b2: add missing dependency setuptools --- pkgs/development/tools/backblaze-b2/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/tools/backblaze-b2/default.nix b/pkgs/development/tools/backblaze-b2/default.nix index a29afaaea40d..ef6c30db5ffc 100644 --- a/pkgs/development/tools/backblaze-b2/default.nix +++ b/pkgs/development/tools/backblaze-b2/default.nix @@ -36,6 +36,7 @@ python3Packages.buildPythonApplication rec { tqdm platformdirs packaging + setuptools ]; nativeCheckInputs = with python3Packages; [ From 5ab79e192eeea36641574464e37b0f6b9eac5d14 Mon Sep 17 00:00:00 2001 From: Lin Yinfeng Date: Fri, 22 Dec 2023 16:13:56 +0800 Subject: [PATCH 070/128] backblaze-b2: add a version test --- pkgs/development/tools/backblaze-b2/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/backblaze-b2/default.nix b/pkgs/development/tools/backblaze-b2/default.nix index ef6c30db5ffc..e37fd54832c2 100644 --- a/pkgs/development/tools/backblaze-b2/default.nix +++ b/pkgs/development/tools/backblaze-b2/default.nix @@ -1,4 +1,4 @@ -{ lib, python3Packages, fetchPypi, installShellFiles }: +{ lib, python3Packages, fetchPypi, installShellFiles, testers, backblaze-b2 }: python3Packages.buildPythonApplication rec { pname = "backblaze-b2"; @@ -76,6 +76,15 @@ python3Packages.buildPythonApplication rec { --zsh <(${python3Packages.argcomplete}/bin/register-python-argcomplete backblaze-b2) ''; + passthru.tests.version = (testers.testVersion { + package = backblaze-b2; + command = "backblaze-b2 version --short"; + }).overrideAttrs (old: { + # workaround the error: Permission denied: '/homeless-shelter' + # backblaze-b2 fails to create a 'b2' directory under the XDG config path + HOME = "$(mktemp -d)"; + }); + meta = with lib; { description = "Command-line tool for accessing the Backblaze B2 storage service"; homepage = "https://github.com/Backblaze/B2_Command_Line_Tool"; From 106c75f1bbcdae9abc6cf710a4f205ff0c8363e4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 25 Dec 2023 03:17:54 +0000 Subject: [PATCH 071/128] web-ext: 7.6.2 -> 7.9.0 --- pkgs/development/tools/web-ext/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/web-ext/default.nix b/pkgs/development/tools/web-ext/default.nix index 494eee2e6a96..f75f8a66142e 100644 --- a/pkgs/development/tools/web-ext/default.nix +++ b/pkgs/development/tools/web-ext/default.nix @@ -7,16 +7,16 @@ buildNpmPackage rec { pname = "web-ext"; - version = "7.6.2"; + version = "7.9.0"; src = fetchFromGitHub { owner = "mozilla"; repo = "web-ext"; rev = version; - hash = "sha256-tFMngcoHFA3QmR0AK68elUVpli37PsVlcL978o7DQCs="; + hash = "sha256-7fBUWQFUsIGQnyNhZISvdtAQMAMZ38mbzGuC+6Cwu1Y="; }; - npmDepsHash = "sha256-KPBKUjCxva11w/E+Qhlx+1vikpCL7Hr9MiKenYHEVSU="; + npmDepsHash = "sha256-3Dq4sNPZm9fDxPxOZL+rDxFA/FEs2/+zdz8sF3JFJ3s="; npmBuildFlags = [ "--production" ]; From 51962449f1434273278994c4034d986ae8b00fb8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 25 Dec 2023 03:30:00 +0000 Subject: [PATCH 072/128] wgcf: 2.2.19 -> 2.2.20 --- pkgs/applications/networking/wgcf/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/wgcf/default.nix b/pkgs/applications/networking/wgcf/default.nix index a975f1c26cef..a6f728c1bf37 100644 --- a/pkgs/applications/networking/wgcf/default.nix +++ b/pkgs/applications/networking/wgcf/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "wgcf"; - version = "2.2.19"; + version = "2.2.20"; src = fetchFromGitHub { owner = "ViRb3"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-wEBPaqqpiQdFohlzpVDVMwYq8+NjSQrh58yWl/W+n8M="; + hash = "sha256-k4oOejJiVZk9s4niG/r0mSoI363uuQh3C9OWVweELWc="; }; subPackages = "."; - vendorHash = "sha256-i1CM0rG2DmgYMa+Na0In4fVJSGZlMTRajjLEZUvrmE8="; + vendorHash = "sha256-U1VHbD2l5C5ws7Mt5a7PmtHQkZJ6hzDU1TyiEFqMYEM="; meta = with lib; { description = "Cross-platform, unofficial CLI for Cloudflare Warp"; From 994b18cde11e2deba11f43d0e0a9221eaecba7f7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 25 Dec 2023 03:31:09 +0000 Subject: [PATCH 073/128] werf: 1.2.270 -> 1.2.275 --- pkgs/applications/networking/cluster/werf/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/werf/default.nix b/pkgs/applications/networking/cluster/werf/default.nix index 4c727ce14048..c10bd88f4d76 100644 --- a/pkgs/applications/networking/cluster/werf/default.nix +++ b/pkgs/applications/networking/cluster/werf/default.nix @@ -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; From cf4268174bd4a4229ae965104944084c5cd11a6d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 25 Dec 2023 03:36:58 +0000 Subject: [PATCH 074/128] where-is-my-sddm-theme: 1.5.1 -> 1.6.0 --- pkgs/data/themes/where-is-my-sddm-theme/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/themes/where-is-my-sddm-theme/default.nix b/pkgs/data/themes/where-is-my-sddm-theme/default.nix index 13ea576b3fbf..64fc67b30026 100644 --- a/pkgs/data/themes/where-is-my-sddm-theme/default.nix +++ b/pkgs/data/themes/where-is-my-sddm-theme/default.nix @@ -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 ]; From 213dcb7fa12ea0c4d581548fde71ddfbcf0313cf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 25 Dec 2023 03:41:41 +0000 Subject: [PATCH 075/128] wiiload: 0.5.1 -> 0.5.3 --- pkgs/development/tools/wiiload/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/wiiload/default.nix b/pkgs/development/tools/wiiload/default.nix index 2f2fe174d14e..3d7f1b798633 100644 --- a/pkgs/development/tools/wiiload/default.nix +++ b/pkgs/development/tools/wiiload/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, autoconf, automake, zlib }: stdenv.mkDerivation rec { - version = "0.5.1"; + version = "0.5.3"; pname = "wiiload"; nativeBuildInputs = [ autoconf automake ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "devkitPro"; repo = "wiiload"; rev = "v${version}"; - sha256 = "0dffy603zggkqv7g1a2jninmi64vy519gpgkdfhjnijhdm9gs5m3"; + sha256 = "sha256-pZdZzCAPfAVucuiV/q/ROY3cz/wxQWep6dCTGNn2fSo="; }; preConfigure = "./autogen.sh"; From 4999f97c9b88b9664d2d2b99652ab0a6d3ed3630 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 25 Dec 2023 03:59:42 +0000 Subject: [PATCH 076/128] woodpecker-plugin-git: 2.2.0 -> 2.4.0 --- .../continuous-integration/woodpecker-plugin-git/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/woodpecker-plugin-git/default.nix b/pkgs/development/tools/continuous-integration/woodpecker-plugin-git/default.nix index 899fdc7d82ef..a3f27e533e7d 100644 --- a/pkgs/development/tools/continuous-integration/woodpecker-plugin-git/default.nix +++ b/pkgs/development/tools/continuous-integration/woodpecker-plugin-git/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "woodpecker-plugin-git"; - version = "2.2.0"; + version = "2.4.0"; src = fetchFromGitHub { owner = "woodpecker-ci"; repo = "plugin-git"; rev = "refs/tags/${version}"; - hash = "sha256-BQG1+icfV21qZCwgNvLQm8+1f5WF8owKnQKTIF7O80A="; + hash = "sha256-9aK6c2uUBhTzBni6S4XwevdVRxswiMYGJKwmKOGHIbg="; }; vendorHash = "sha256-ol5k37gGFsyeEnGOVcJaerkIejShHyNCBu4RZ8WyHvU="; From 01ff3717a29d730205d16f13be3ef05a7ea91559 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Mon, 25 Dec 2023 04:20:00 +0000 Subject: [PATCH 077/128] ruby_3_3: 3.3.0-rc1 -> 3.3.0 Changelog: https://www.ruby-lang.org/en/news/2023/12/25/ruby-3-3-0-released/ --- pkgs/development/interpreters/ruby/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index 2269ff2b61c1..e358ea31e0fc 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -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="; }; From 870cf99aec58d784bb71f8c86f8d94b9453856a6 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Mon, 25 Dec 2023 04:20:00 +0000 Subject: [PATCH 078/128] rubyPackages: update --- pkgs/top-level/ruby-packages.nix | 146 +++++++++++++++---------------- 1 file changed, 73 insertions(+), 73 deletions(-) diff --git a/pkgs/top-level/ruby-packages.nix b/pkgs/top-level/ruby-packages.nix index 54e70b1936de..7d4d220e23a8 100644 --- a/pkgs/top-level/ruby-packages.nix +++ b/pkgs/top-level/ruby-packages.nix @@ -126,10 +126,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "05r1fwy487klqkya7vzia8hnklcxy4vr92m9dmni3prfwk6zpw33"; + sha256 = "0irbdwkkjwzajq1ip6ba46q49sxnrl2cw7ddkdhsfhb6aprnm3vr"; type = "gem"; }; - version = "2.8.5"; + version = "2.8.6"; }; algoliasearch = { dependencies = ["httpclient" "json"]; @@ -238,10 +238,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07y615s8yldk3k13lmkhpk1k190lcqvmxmnjwgh4bzjan9xrc36y"; + sha256 = "1b1gqa90amazwnll9590m5ighywh9sacsmpyd5ihljivmvjswksk"; type = "gem"; }; - version = "3.1.4"; + version = "3.1.5"; }; bindata = { groups = ["default"]; @@ -279,10 +279,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1sm8wnvxz4r9iq79s295jsrvznvjpd0pagnh1pz3xfmc9qffi7yi"; + sha256 = "1a85gisjb2n236bpay7cjqlxq07m4swc8mqnwy8c5rkxfhil194c"; type = "gem"; }; - version = "1.17.12"; + version = "1.17.13"; }; cairo-gobject = { dependencies = ["cairo" "glib2"]; @@ -965,10 +965,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1hr6q367ngnjjlclhjx8gma98dndmk04bj1pap5p5sqarn8ic01x"; + sha256 = "1vsqmx8pslcg1zca7hfc89vfnbcfvgyfbbxpdk2xm4cidl80zmv9"; type = "gem"; }; - version = "0.4.3"; + version = "0.6.0"; }; erubi = { groups = ["default"]; @@ -1016,10 +1016,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "138gi8b95nqv8m83dynpsszz11a6c5si1pym6y0b6bfb01r33pyi"; + sha256 = "1q9yz7x36mpzpz04bg6hdyrzzk4bri9jg3h2ygw26bf6v3axq53q"; type = "gem"; }; - version = "0.105.0"; + version = "0.108.0"; }; execjs = { groups = ["default"]; @@ -1037,10 +1037,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "19w1lzipnxs6vy3y0pw1mf956f768ppzgfrnlpwgrpnjjv9xqf7d"; + sha256 = "19p45ryrvxff6ggdj4fq76dk7wlkfgrh474c3kwzdsjx3xpdq8x8"; type = "gem"; }; - version = "2.7.12"; + version = "2.8.1"; }; faraday-net_http = { groups = ["default"]; @@ -1324,10 +1324,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1i6xmglna30galqdsq7iq0pwxxwyrs57ymwmxhash4jhnsk7wk7z"; + sha256 = "15yxph91zswbnfy7szpdcfbdfqqn595ff290hm4f6fcnhryvhvlf"; type = "gem"; }; - version = "6.2.3"; + version = "6.3.0"; }; hashie = { groups = ["default"]; @@ -1509,10 +1509,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0dikardh14c72gd9ypwh8dim41wvqmzfzf35mincaj5yals9m7ff"; + sha256 = "1fmwbcapyhla84xhwj3gfws6rb4lw3928ybz6g3lr372dgxakzx5"; type = "gem"; }; - version = "0.6.0"; + version = "0.7.1"; }; irb = { dependencies = ["rdoc" "reline"]; @@ -1520,10 +1520,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0appka5sbafafn4f8d285skxw3qkhbap28vn9ms0pf7pbp7s2449"; + sha256 = "0phrzmmxbwqmkh4dzld3pc82yml996nzfdzjipniv8wwrxwbgb3r"; type = "gem"; }; - version = "1.9.1"; + version = "1.11.0"; }; jaro_winkler = { groups = ["default"]; @@ -2010,20 +2010,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0wi7g6c8q0v1kahwp38mv8d526p1n2ddsr79ajx84idvih0c601i"; + sha256 = "0r9jmjhg2ly3l736flk7r2al47b5c8cayh0gqkq0yhjqzc9a6zhq"; type = "gem"; }; - version = "2.7.0"; + version = "2.7.1"; }; json_pure = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ilnxmppz9dcwp61dbciv6nk4qsggc6l20gsxdb1flffik6q90z9"; + sha256 = "09w7f7xlcas9irlaavhz0rnh17cjvjmmqm07drgghx5gwjcrar31"; type = "gem"; }; - version = "2.7.0"; + version = "2.7.1"; }; jsonpath = { dependencies = ["multi_json"]; @@ -2105,10 +2105,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0317sr3nrl51sp844bps71smkrwim3fjn47wdfpbycixnbxspivm"; + sha256 = "0kd4d5x9sxsbpbsk4xp66rxbmj2x3iglwirqws56wp7dzf7cd978"; type = "gem"; }; - version = "8.4.255.0"; + version = "8.4.255.0.1"; }; libxml-ruby = { groups = ["default"]; @@ -2125,10 +2125,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1rc5mzk017rgi56xzy93f80v1jdcpph1ihgdhm4qq4mibfh26f27"; + sha256 = "1wp8sdrv5j89gbb68zvxlyd84q4ddyz726db76sn76bbmm9621mc"; type = "gem"; }; - version = "5.0.0"; + version = "5.1.0"; }; liquid = { groups = ["default"]; @@ -2221,10 +2221,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1j4jc31ycydbkh5h3q6zwidzpavg3g5mbb5lqyaczd3jrq78rd7i"; + sha256 = "0da76p1gvfabm49a0g0pppxgcdackw8f3qhljalqykd4d5mb828j"; type = "gem"; }; - version = "0.9.0"; + version = "0.9.3"; }; matrix = { groups = ["default"]; @@ -2272,10 +2272,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0yjv0apysnrhbc70ralinfpcqn9382lxr643swp7a5sdwpa9cyqg"; + sha256 = "08ja4k3yjczzz7n6rp1f3qvz4v45bc6fy04clnvdxbq3kfr7jk4c"; type = "gem"; }; - version = "3.2023.1003"; + version = "3.2023.1205"; }; mini_magick = { groups = ["default"]; @@ -2414,10 +2414,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "004wx9xhcam92g1d4ybvrl1yqablm2svalyck9sq4igy9nwkz9nb"; + sha256 = "0bvr9q7qwbmg9jfg85r1i5l7d0yxlgp0l2jg62j921vm49mipd7v"; type = "gem"; }; - version = "1.1.8"; + version = "1.1.9"; }; ncursesw = { groups = ["default"]; @@ -2435,10 +2435,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0541lfqaz46h8s3fks11vsd1iqzmgjjw3c0jp9agg92zblwj0axs"; + sha256 = "1izifdsinnfi34v2x3yavc0kxcmi1cwph11akqf949rf00sckkcp"; type = "gem"; }; - version = "0.4.7"; + version = "0.4.9"; }; net-pop = { dependencies = ["net-protocol"]; @@ -2489,10 +2489,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1jyj6j7w9zpj2zhp4dyhdjiwsn9rqwksj7s7fzpnn7rx2xvz2a1a"; + sha256 = "1i01340c4i144vvn3x54lc2rb77ch829qipl1rh6rqwm3yxzml9w"; type = "gem"; }; - version = "7.2.0"; + version = "7.2.1"; }; netrc = { groups = ["default"]; @@ -2627,10 +2627,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jcc512l38c0c163ni3jgskvq1vc3mr8ly5pvjijzwvfml9lf597"; + sha256 = "15wkxrg1sj3n1h2g8jcrn7gcapwcgxr659ypjf75z1ipkgxqxwsv"; type = "gem"; }; - version = "1.23.0"; + version = "1.24.0"; }; parser = { dependencies = ["ast" "racc"]; @@ -2731,10 +2731,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1hzd04pzq97rjb1a148gm0wgfb2nr89axbd16d2h6kp666fg4i00"; + sha256 = "1iavhgs7iahjz28sks5kkml9gr43fx5rpq5l0ql81pkmfv3i0cbi"; type = "gem"; }; - version = "4.0.3"; + version = "4.0.4"; }; prettier_print = { groups = ["default"]; @@ -2751,10 +2751,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "172qxf1zyrhxzwbn4c7gz12zdyb1jkdqrqvb2c7863lmxp53rrxs"; + sha256 = "0qiv9irrca2la1awqgvzsg7a17z2nydqyq43w4fhapdkq2l7xwa7"; type = "gem"; }; - version = "0.18.0"; + version = "0.19.0"; }; pry = { dependencies = ["coderay" "method_source"]; @@ -2795,10 +2795,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0wjzrkssjfjpynij5dpycyflhqbjvi1gc2j73xgq3b196s1d3c24"; + sha256 = "0s5383m6004q76xm3lb732bp4sjzb6mxb6rbgn129gy2izsj4wrk"; type = "gem"; }; - version = "5.1.1.1"; + version = "5.1.2"; }; public_suffix = { groups = ["default"]; @@ -2869,10 +2869,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "11w6yd60n8ng1ncs1ajlv42dg08yks09drlsgriydgpcjwz21d40"; + sha256 = "0xhxhlsz6shh8nm44jsmd9276zcnyzii364vhcvf0k8b8bjia8d0"; type = "gem"; }; - version = "1.0.1"; + version = "1.0.2"; }; rack-test = { dependencies = ["rack"]; @@ -3028,10 +3028,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pnkgnk2vli1y8bbc25qbgv6z2al44dlgcm2mx3ssm34j7xz7gqh"; + sha256 = "14wnrpd1kl43ynk1wwwgv9avsw84d1lrvlfyrjy3d4h7h7ndnqzp"; type = "gem"; }; - version = "6.6.0"; + version = "6.6.2"; }; re2 = { dependencies = ["mini_portile2"]; @@ -3039,10 +3039,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bbh1lddqffsck99ivynjyf9n39s9as6cn9dn17xsx9vid5ysf2b"; + sha256 = "0ih6igmfcb4b9a8hd46ggn85zfyclz9h828d0xafy2pq5qlz9fs2"; type = "gem"; }; - version = "2.4.3"; + version = "2.5.0"; }; red-colors = { dependencies = ["matrix"]; @@ -3082,21 +3082,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "013p2968vqrr282yvxp3pyy5vn0nrgdppzqywbwbfjq2kkwx2fx9"; + sha256 = "1afyfxg5kxmrxsbsvqvk9zmqdi85wa0v164a3x3dwb3x03plp06y"; type = "gem"; }; - version = "0.18.0"; + version = "0.19.1"; }; redis-rack = { - dependencies = ["rack" "redis-store"]; + dependencies = ["rack-session" "redis-store"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0k3pn706wnf7lb24l6hwsi00c8rx693hvgfnccw3qj1y635ywwh8"; + sha256 = "10438w0y1jbgr205zndvmz6md0mrqazh2j9fr88lvb8hms10pddb"; type = "gem"; }; - version = "2.1.4"; + version = "3.0.0"; }; redis-store = { dependencies = ["redis"]; @@ -3114,10 +3114,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1d9a5s3qrjdy50ll2s32gg3qmf10ryp3v2nr5k718kvfadp50ray"; + sha256 = "1xrghj2vka7girycp1m88kvl4qxkm4mj4djz4w1jzywb4v97fclm"; type = "gem"; }; - version = "2.8.2"; + version = "2.8.3"; }; reline = { dependencies = ["io-console"]; @@ -3253,10 +3253,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06qnp5zs233j4f59yyqrg8al6hr9n4a7vcdg3p31v0np8bz9srwg"; + sha256 = "0hzwl0ak1i455fp3hzhdn8z14jzgwbsv04f7imz7fzz89j3lpkq9"; type = "gem"; }; - version = "1.57.2"; + version = "1.59.0"; }; rubocop-ast = { dependencies = ["parser"]; @@ -3275,10 +3275,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pzsrnjmrachdjxzl9jpw47cydicn3408vgdg3a4bss4v5r42rjj"; + sha256 = "0rfg3p6bblx9gv934fdgaji0wg0xl1drhrnlifqdgkw8wbiaw0jg"; type = "gem"; }; - version = "1.19.1"; + version = "1.20.1"; }; ruby-graphviz = { dependencies = ["rexml"]; @@ -3318,10 +3318,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "13snp4q09vv3g7nskaza9xm50shxrdc2xxdyz6gp4vgzbvp4ihc0"; + sha256 = "1g1vdas991rv6lrjppjxjbfyzif4jxbncrcg9shgzrmibzilbnwr"; type = "gem"; }; - version = "0.13.0"; + version = "0.13.2"; }; ruby-lxc = { groups = ["default"]; @@ -3507,10 +3507,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0p5i06vygm601822vydxniad2rhxg6xkl97r9f6pgk6pnz7spq38"; + sha256 = "148cmk9bdj6y2ax06rd5q5i322lmzn49qd1cal616hys6qd04bm1"; type = "gem"; }; - version = "0.20.1"; + version = "0.21.0"; }; sequel = { dependencies = ["bigdecimal"]; @@ -3518,10 +3518,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zj66n0m1la1anxjjdb8a35frzabym112rf9ssyxq42mq05ln4m2"; + sha256 = "1b2ypz0sgivfjzsr4igh6cm46fifzkanmz0fw8p0yq5xr4isv722"; type = "gem"; }; - version = "5.74.0"; + version = "5.75.0"; }; sequel_pg = { dependencies = ["pg" "sequel"]; @@ -3644,20 +3644,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "18wpma2mgw82qzf1jwjalmz7nwdvn87b22wd5yy16jb67fqgrq78"; + sha256 = "0qbjgsrlrwvbywzi0shf3nmfhb52y5fmp9al9nk7c4qqwxyhz397"; type = "gem"; }; - version = "0.49.0"; + version = "0.50.0"; }; sorbet-runtime = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "18280l1wgdmr9xhr4mzxr4ycskwbgjzd91vmdzx0dlp6xp2dydnb"; + sha256 = "0xm54yjrdz200iahvily91n0nlv9xr2yp1rjz077fq1z2pi1kadg"; type = "gem"; }; - version = "0.5.11144"; + version = "0.5.11164"; }; sqlite3 = { dependencies = ["mini_portile2"]; @@ -3788,10 +3788,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06fa5xpw5zrnhg0ds246l8sq49k22hpplqa1msxylnqibbsnb2y9"; + sha256 = "1fqzm5a7wf7r9jl7pxs7g6m3qpvyzpia0pid0blzc0b34n0nrb35"; type = "gem"; }; - version = "2.1.5"; + version = "2.1.6"; }; treetop = { dependencies = ["polyglot"]; From f75d3dbffc9ea110a49f16e1515251fb962876d3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 25 Dec 2023 04:40:17 +0000 Subject: [PATCH 079/128] xemu: 0.7.117 -> 0.7.118 --- pkgs/applications/emulators/xemu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/emulators/xemu/default.nix b/pkgs/applications/emulators/xemu/default.nix index e0e022ebb402..3fc8adde9b67 100644 --- a/pkgs/applications/emulators/xemu/default.nix +++ b/pkgs/applications/emulators/xemu/default.nix @@ -28,13 +28,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "xemu"; - version = "0.7.117"; + version = "0.7.118"; src = fetchFromGitHub { owner = "xemu-project"; repo = "xemu"; rev = "v${finalAttrs.version}"; - hash = "sha256-R6BPDBMrVhxUkjMWK8Jz9vqEz5P3v62PIyulHp6Q+KM="; + hash = "sha256-IGzPxwNxuqMsZhQ63VUyDzPSBpAgc0U0oUjM/blEd7g="; fetchSubmodules = true; }; From b45547a0a2b0e8064c445a50aaedc7f3b27e8ff7 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Mon, 25 Dec 2023 13:55:18 +1000 Subject: [PATCH 080/128] nomad: fix licenses 1.7 is bsl11 https://github.com/hashicorp/nomad/commit/b3e30b1dfa185d9437a25830522da47b91f78816 --- pkgs/applications/networking/cluster/nomad/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/nomad/default.nix b/pkgs/applications/networking/cluster/nomad/default.nix index be82663079d1..942a4d3ce013 100644 --- a/pkgs/applications/networking/cluster/nomad/default.nix +++ b/pkgs/applications/networking/cluster/nomad/default.nix @@ -9,8 +9,8 @@ let generic = - { buildGoModule, version, sha256, vendorHash, ... }@attrs: - let attrs' = builtins.removeAttrs attrs [ "buildGoModule" "version" "sha256" "vendorHash" ]; + { buildGoModule, version, sha256, vendorHash, license, ... }@attrs: + let attrs' = builtins.removeAttrs attrs [ "buildGoModule" "version" "sha256" "vendorHash" "license" ]; in buildGoModule (rec { pname = "nomad"; @@ -40,7 +40,7 @@ let meta = with lib; { homepage = "https://www.nomadproject.io/"; description = "A Distributed, Highly Available, Datacenter-Aware Scheduler"; - license = licenses.mpl20; + inherit license; maintainers = with maintainers; [ rushmorem pradeepchhetri endocrimes amaxine techknowlogick cottand ]; }; } // attrs'); @@ -59,6 +59,7 @@ rec { version = "1.4.12"; sha256 = "sha256-dO98FOaO5MB5pWzeF705s/aBDTaF0OyWnVxWGB91suI="; vendorHash = "sha256-D5TcTZa64Jr47u4mrTXK4lUIC5gfBQNVgL6QKh1CaQM="; + license = lib.licenses.mpl20; passthru.tests.nomad = nixosTests.nomad; }; @@ -67,6 +68,7 @@ rec { version = "1.5.12"; sha256 = "sha256-BhKetWtwysWTYI0ruEp/Ixh4eoGxDX0Geup2PCXfsZY="; vendorHash = "sha256-X4pBxKWr5QFRxh9tw5QDpytyuVNXQvV1LHm5IbPELY0="; + license = lib.licenses.mpl20; passthru.tests.nomad = nixosTests.nomad; preCheck = '' export PATH="$PATH:$NIX_BUILD_TOP/go/bin" @@ -78,6 +80,7 @@ rec { version = "1.6.5"; sha256 = "sha256-10s/yRWGoYTRbMytWShuTgYc1b388IID5doAvWXpyCU="; vendorHash = "sha256-gd6a/CBJ+OOTNHEaRLoDky2f2cDCyW9wSZzD6K22voQ="; + license = lib.licenses.mpl20; passthru.tests.nomad = nixosTests.nomad; preCheck = '' export PATH="$PATH:$NIX_BUILD_TOP/go/bin" @@ -89,6 +92,7 @@ rec { version = "1.7.2"; sha256 = "sha256-tFmsX9C++nuUBqLjjpMMyVCwQHn4nlB3OywIPMYE32Q="; vendorHash = "sha256-iMEEBDxK7ALa19GMIabofzq557aXcYpt0H3/jAKnBBM="; + license = lib.licenses.bsl11; passthru.tests.nomad = nixosTests.nomad; preCheck = '' export PATH="$PATH:$NIX_BUILD_TOP/go/bin" From a53336ae53f6f8724880604edce172477caf8c7a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 25 Dec 2023 06:00:23 +0000 Subject: [PATCH 081/128] xsubfind3r: 0.4.0 -> 0.7.0 --- pkgs/tools/security/xsubfind3r/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/xsubfind3r/default.nix b/pkgs/tools/security/xsubfind3r/default.nix index 6ec445696bf9..7c5470a0715a 100644 --- a/pkgs/tools/security/xsubfind3r/default.nix +++ b/pkgs/tools/security/xsubfind3r/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "xsubfind3r"; - version = "0.4.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "hueristiq"; repo = "xsubfind3r"; rev = "refs/tags/${version}"; - hash = "sha256-Xlxn9IZ9TTDzkEkyBoBwrS9AdQX21mmHngm03w+c4UM="; + hash = "sha256-tukynKPcIwDwpH0/SFyif6OGVZrmLVdXfhrFaaVd1d8="; }; - vendorHash = "sha256-DkYQkuhBAYnGx9gxi2X/Coh0FYV+z5/4IX1zTfUM6uI="; + vendorHash = "sha256-0tX/s5a6PPQuEw3BTs6uW9c5OHqXryzIfDNPnQH5sS8="; ldflags = [ "-s" From d6ec71046837691b15c96c34d07793aecae2b19a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 25 Dec 2023 06:12:25 +0000 Subject: [PATCH 082/128] xwaylandvideobridge: 0.3.0 -> 0.4.0 --- pkgs/tools/wayland/xwaylandvideobridge/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/wayland/xwaylandvideobridge/default.nix b/pkgs/tools/wayland/xwaylandvideobridge/default.nix index 103c92eed5a1..5614ef40d537 100644 --- a/pkgs/tools/wayland/xwaylandvideobridge/default.nix +++ b/pkgs/tools/wayland/xwaylandvideobridge/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "xwaylandvideobridge"; - version = "0.3.0"; + version = "0.4.0"; src = fetchurl { url = "mirror://kde/stable/xwaylandvideobridge/xwaylandvideobridge-${finalAttrs.version}.tar.xz"; - hash = "sha256-+Npuj+DsO9XqeXr4qtj+Haqzb8PHfi02u3RDgyzfz/o="; + hash = "sha256-6nKseypnV46ZlNywYZYC6tMJekb7kzZmHaIA5jkn6+Y="; }; nativeBuildInputs = [ From 72de499b3895d738bb8365e9c4433256daa9a504 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 25 Dec 2023 06:23:56 +0000 Subject: [PATCH 083/128] yor: 0.1.185 -> 0.1.187 --- pkgs/applications/networking/cluster/yor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/yor/default.nix b/pkgs/applications/networking/cluster/yor/default.nix index 9177ed8110da..ea89d83f6bf7 100644 --- a/pkgs/applications/networking/cluster/yor/default.nix +++ b/pkgs/applications/networking/cluster/yor/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "yor"; - version = "0.1.185"; + version = "0.1.187"; src = fetchFromGitHub { owner = "bridgecrewio"; repo = pname; rev = version; - hash = "sha256-5CBOLbqsEVzYyU67c7QTGTe471XQlEC/826wYCPHzEo="; + hash = "sha256-w82kJhMnupVv4eq3SUDFaWSvkVrxOSPsN+OXl8aIKog="; }; vendorHash = "sha256-ZeTjGmlu8LndD2DKNncPzlpECdvkOjfwaVvV6S3sL9E="; From 245fce8b6189badf9249050cb38f3b7c786f860b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 25 Dec 2023 06:36:58 +0000 Subject: [PATCH 084/128] ytt: 0.46.2 -> 0.46.3 --- pkgs/development/tools/ytt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/ytt/default.nix b/pkgs/development/tools/ytt/default.nix index 668fc47fe72d..1df8887afe68 100644 --- a/pkgs/development/tools/ytt/default.nix +++ b/pkgs/development/tools/ytt/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "ytt"; - version = "0.46.2"; + version = "0.46.3"; src = fetchFromGitHub { owner = "vmware-tanzu"; repo = "carvel-ytt"; rev = "v${version}"; - sha256 = "sha256-r9LQMQffnc/g1WFJU8m+Oy0hD+DudCNiVAcbAAPy1vI="; + sha256 = "sha256-K2+5NplyQuvc78NnNDiQhfrewqn84jDbiAyN8J9iTm0="; }; vendorHash = null; From 676ef2b4b21cf98d9f0349c2763c7c016a5ae6e6 Mon Sep 17 00:00:00 2001 From: linsui Date: Sun, 24 Dec 2023 15:20:27 +0800 Subject: [PATCH 085/128] dart: fix fetchDartDeps --- pkgs/build-support/dart/fetch-dart-deps/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/dart/fetch-dart-deps/default.nix b/pkgs/build-support/dart/fetch-dart-deps/default.nix index e6e5cf76a60f..29e5209a2877 100644 --- a/pkgs/build-support/dart/fetch-dart-deps/default.nix +++ b/pkgs/build-support/dart/fetch-dart-deps/default.nix @@ -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 ''; From 02584ffe4c06680d7406e08505d7aca0a1cf8de3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 25 Dec 2023 07:03:54 +0000 Subject: [PATCH 086/128] zef: 0.21.1 -> 0.21.2 --- pkgs/development/interpreters/rakudo/zef.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/rakudo/zef.nix b/pkgs/development/interpreters/rakudo/zef.nix index 2ce4a164f7e6..60c14d9d4641 100644 --- a/pkgs/development/interpreters/rakudo/zef.nix +++ b/pkgs/development/interpreters/rakudo/zef.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "zef"; - version = "0.21.1"; + version = "0.21.2"; src = fetchFromGitHub { owner = "ugexe"; repo = "zef"; rev = "v${finalAttrs.version}"; - hash = "sha256-ji+KTxAOPZhuGryK0+svsVkU+HC1egKZWOboSBUON+s="; + hash = "sha256-7mqKcioMal4OR/xlzQ/EgGICau7Ijc13j4pSfu4/74E="; }; nativeBuildInputs = [ From ad610b750aa466d9e00cd2fead6a3e232142e1ce Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 25 Dec 2023 07:15:25 +0000 Subject: [PATCH 087/128] zint: 2.12.0 -> 2.13.0 --- pkgs/development/libraries/zint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/zint/default.nix b/pkgs/development/libraries/zint/default.nix index 69ec64ada9d2..8ba4a68e4b82 100644 --- a/pkgs/development/libraries/zint/default.nix +++ b/pkgs/development/libraries/zint/default.nix @@ -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" ]; From 2cd1a5ef3bd2d79b0c99a38ad0f81012f84a8864 Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 25 Dec 2023 10:24:21 +0300 Subject: [PATCH 088/128] python311Packages.cpufeature: add supported platforms --- pkgs/development/python-modules/cpufeature/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/cpufeature/default.nix b/pkgs/development/python-modules/cpufeature/default.nix index f65cf04fa4cb..cade32a1955b 100644 --- a/pkgs/development/python-modules/cpufeature/default.nix +++ b/pkgs/development/python-modules/cpufeature/default.nix @@ -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" ]; }; } From b866b626cce208ce9c57ba6bad381e61bb78feb6 Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 25 Dec 2023 10:24:37 +0300 Subject: [PATCH 089/128] python311Packages.aiohttp-zlib-ng: only depend on cpufeature where available --- pkgs/development/python-modules/aiohttp-zlib-ng/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiohttp-zlib-ng/default.nix b/pkgs/development/python-modules/aiohttp-zlib-ng/default.nix index 65e996535a6f..b912224b0037 100644 --- a/pkgs/development/python-modules/aiohttp-zlib-ng/default.nix +++ b/pkgs/development/python-modules/aiohttp-zlib-ng/default.nix @@ -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 From 4a9ba100b44d6b63d1b73ae142a52a18914f91f6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 25 Dec 2023 07:45:06 +0000 Subject: [PATCH 090/128] abaddon: 0.1.13 -> 0.1.14 --- .../networking/instant-messengers/abaddon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/abaddon/default.nix b/pkgs/applications/networking/instant-messengers/abaddon/default.nix index 7e47b6fe698b..3dbab9211dfa 100644 --- a/pkgs/applications/networking/instant-messengers/abaddon/default.nix +++ b/pkgs/applications/networking/instant-messengers/abaddon/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "abaddon"; - version = "0.1.13"; + version = "0.1.14"; src = fetchFromGitHub { owner = "uowuo"; repo = "abaddon"; rev = "v${version}"; - hash = "sha256-2iozeRuY/+JDnaHfAYiXNS1VgSrHAxXPuI8BevEEKTc="; + hash = "sha256-Amp6PkQWd4PnwUL29fzGETLuQXVEaARr+jIRlfrxTKc="; fetchSubmodules = true; }; From a84b2cbe541c39c303ae3b05901ef422ce0c4d09 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 25 Dec 2023 08:10:36 +0000 Subject: [PATCH 091/128] algolia-cli: 1.4.3 -> 1.5.0 --- pkgs/development/tools/algolia-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/algolia-cli/default.nix b/pkgs/development/tools/algolia-cli/default.nix index 64ad473c3b75..75f69e021e1f 100644 --- a/pkgs/development/tools/algolia-cli/default.nix +++ b/pkgs/development/tools/algolia-cli/default.nix @@ -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="; From ed1a16e8869a2bf54b9f2bb3e7a7fd48cab7d197 Mon Sep 17 00:00:00 2001 From: Midnight Veil Date: Mon, 25 Dec 2023 16:15:27 +1100 Subject: [PATCH 092/128] munin: fix missing Date::Parse module error & make test fail w/o a fix Upstream change: https://github.com/munin-monitoring/munin/pull/1502 --- nixos/tests/munin.nix | 2 ++ pkgs/servers/monitoring/munin/default.nix | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/nixos/tests/munin.nix b/nixos/tests/munin.nix index 4ec17e0339df..e371b2dffa6b 100644 --- a/nixos/tests/munin.nix +++ b/nixos/tests/munin.nix @@ -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) ''; }) diff --git a/pkgs/servers/monitoring/munin/default.nix b/pkgs/servers/monitoring/munin/default.nix index bc99ae1f8f69..ad5c6e36a62e 100644 --- a/pkgs/servers/monitoring/munin/default.nix +++ b/pkgs/servers/monitoring/munin/default.nix @@ -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 ]}" From 186c2d34c65bc34e646a1af79eff9f195012fc8f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 25 Dec 2023 09:13:37 +0100 Subject: [PATCH 093/128] python311Packages.pyoutbreaksnearme: 2023.10.0 -> 2023.12.0 Diff: https://github.com/bachya/pyoutbreaksnearme/compare/refs/tags/2023.10.0...2023.12.0 Changelog: https://github.com/bachya/pyoutbreaksnearme/releases/tag/2023.12.0 --- pkgs/development/python-modules/pyoutbreaksnearme/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyoutbreaksnearme/default.nix b/pkgs/development/python-modules/pyoutbreaksnearme/default.nix index 0c07a12fc1f3..5aa9352f7a4c 100644 --- a/pkgs/development/python-modules/pyoutbreaksnearme/default.nix +++ b/pkgs/development/python-modules/pyoutbreaksnearme/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "pyoutbreaksnearme"; - version = "2023.10.0"; + version = "2023.12.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "bachya"; repo = "pyoutbreaksnearme"; rev = "refs/tags/${version}"; - hash = "sha256-G+/ooNhiYOaV0kjfr8Z1d31XxRYFArQnt1oIuMQfXdY="; + hash = "sha256-oR/DApOxNSSczrBeH4sytd/vasbD4rA1poW4zNoeAnU="; }; nativeBuildInputs = [ From d8441a73a5575be19fea7c6847c5c6d9471e9b36 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 25 Dec 2023 09:15:30 +0100 Subject: [PATCH 094/128] python311Packages.pysml: 0.1.1 -> 0.1.2 Diff: https://github.com/mtdcr/pysml/compare/refs/tags/0.1.1...0.1.2 --- pkgs/development/python-modules/pysml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pysml/default.nix b/pkgs/development/python-modules/pysml/default.nix index 67dae25bdd02..58381f99db3e 100644 --- a/pkgs/development/python-modules/pysml/default.nix +++ b/pkgs/development/python-modules/pysml/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pysml"; - version = "0.1.1"; + version = "0.1.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "mtdcr"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-BtOx/kqPuvaaIyh/2/X5pW5BRvpsnMUMr1u6iZzbkt4="; + hash = "sha256-TLIpc0bVx1As2oLyYD+BBMalwJiKdvBCcrd1tUNyh6Y="; }; nativeBuildInputs = [ From 77b028c179c4e14cd7dfb1ac42c63887b8c4304d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 25 Dec 2023 08:30:33 +0000 Subject: [PATCH 095/128] amf-headers: 1.4.30 -> 1.4.32 --- pkgs/development/libraries/amf-headers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/amf-headers/default.nix b/pkgs/development/libraries/amf-headers/default.nix index 2d908e043f29..b1b93d38cedc 100644 --- a/pkgs/development/libraries/amf-headers/default.nix +++ b/pkgs/development/libraries/amf-headers/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "amf-headers"; - version = "1.4.30"; + version = "1.4.32"; src = fetchFromGitHub { owner = "GPUOpen-LibrariesAndSDKs"; repo = "AMF"; rev = "v${version}"; - sha256 = "sha256-eShqo5EBbhl2Us4feFjiX+NfEl1OQ2jPQUC+Hlm+yFs="; + sha256 = "sha256-3CdC/9o6ur2CeVLImz2QfaZAH2+KtDdxs5zRF7W5/oo="; }; installPhase = '' From 4ecab957267c174d87d6d8dbf0fca47fa53a9eac Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 25 Dec 2023 08:55:51 +0000 Subject: [PATCH 096/128] api-linter: 1.59.2 -> 1.60.0 --- pkgs/development/tools/api-linter/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/api-linter/default.nix b/pkgs/development/tools/api-linter/default.nix index 0320b499b145..940338ece201 100644 --- a/pkgs/development/tools/api-linter/default.nix +++ b/pkgs/development/tools/api-linter/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "api-linter"; - version = "1.59.2"; + version = "1.60.0"; src = fetchFromGitHub { owner = "googleapis"; repo = "api-linter"; rev = "v${version}"; - hash = "sha256-tgDrzYaomB0Pj7JQmvp+8G25CBDxGiMYCUnbm8vRkDU="; + hash = "sha256-3uxPHSmIFrkAm82sqQxWKzJwU3cFhTDVsJYp8cENaRg="; }; vendorHash = "sha256-egAZ4CeSSStfkN2mGgzGHTBojHKHoVEf3o0oi+OpMkw="; @@ -23,7 +23,7 @@ buildGoModule rec { "-w" ]; - # reference: https://github.com/googleapis/api-linter/blob/v1.59.2/.github/workflows/release.yaml#L76 + # reference: https://github.com/googleapis/api-linter/blob/v1.60.0/.github/workflows/release.yaml#L76 preBuild = '' cat > cmd/api-linter/version.go < Date: Mon, 25 Dec 2023 09:57:47 +0100 Subject: [PATCH 097/128] nixos/freshrss: Stop running the updater service on system activation --- nixos/modules/services/web-apps/freshrss.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/modules/services/web-apps/freshrss.nix b/nixos/modules/services/web-apps/freshrss.nix index 9683730bbe1f..c8399143c37b 100644 --- a/nixos/modules/services/web-apps/freshrss.nix +++ b/nixos/modules/services/web-apps/freshrss.nix @@ -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; From 9f7ddbd2981c3cd0e55838f2953e095b8a679d71 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 25 Dec 2023 10:07:28 +0100 Subject: [PATCH 098/128] python310Packages.regenmaschine: update disabled --- pkgs/development/python-modules/regenmaschine/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/regenmaschine/default.nix b/pkgs/development/python-modules/regenmaschine/default.nix index 21be8caaa8c0..2b702284be7d 100644 --- a/pkgs/development/python-modules/regenmaschine/default.nix +++ b/pkgs/development/python-modules/regenmaschine/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { version = "2023.12.0"; pyproject = true; - disabled = pythonOlder "3.9"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "bachya"; From 93459c34828b1fc8955ada064456e854e51256ee Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 25 Dec 2023 10:12:24 +0100 Subject: [PATCH 099/128] python311Packages.aioguardian: update disabled --- pkgs/development/python-modules/aioguardian/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/aioguardian/default.nix b/pkgs/development/python-modules/aioguardian/default.nix index cd4247b4c9b3..4e7ec48ac585 100644 --- a/pkgs/development/python-modules/aioguardian/default.nix +++ b/pkgs/development/python-modules/aioguardian/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { version = "2023.12.0"; pyproject = true; - disabled = pythonOlder "3.9"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "bachya"; From 5fa3201105aab14292243a88153d4f7f46a272ca Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 25 Dec 2023 09:52:17 +0000 Subject: [PATCH 100/128] aws-iam-authenticator: 0.6.14 -> 0.6.16 --- pkgs/tools/security/aws-iam-authenticator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/aws-iam-authenticator/default.nix b/pkgs/tools/security/aws-iam-authenticator/default.nix index 046f173ce100..8ea3c543b4ea 100644 --- a/pkgs/tools/security/aws-iam-authenticator/default.nix +++ b/pkgs/tools/security/aws-iam-authenticator/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "aws-iam-authenticator"; - version = "0.6.14"; + version = "0.6.16"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-NWYTOHqeCxIgKvslezHAZT1GastWcbavWdfmY6KlbXc="; + hash = "sha256-E/DkCDtnzI6yBEYemlLqxc1r8ZEuX+6jDefaZTRFRek="; }; vendorHash = "sha256-TDsY05jnutNIKx0z6/8vGvsgYCIKBkTxh9mXqk4IR38="; From 3465e1aa80ba2833c7759fc793aaaa72e855aad9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 25 Dec 2023 10:09:52 +0000 Subject: [PATCH 101/128] balena-cli: 17.0.0 -> 17.4.9 --- pkgs/tools/admin/balena-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/balena-cli/default.nix b/pkgs/tools/admin/balena-cli/default.nix index bb674a83f322..50f4cfc0133a 100644 --- a/pkgs/tools/admin/balena-cli/default.nix +++ b/pkgs/tools/admin/balena-cli/default.nix @@ -12,16 +12,16 @@ 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 From 5a85f6a490ed0c09e618542da07be3934b97dcdc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 25 Dec 2023 10:10:03 +0000 Subject: [PATCH 102/128] baresip: 3.6.0 -> 3.7.0 --- .../networking/instant-messengers/baresip/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/baresip/default.nix b/pkgs/applications/networking/instant-messengers/baresip/default.nix index fd9bdf89234d..5f234ab52300 100644 --- a/pkgs/applications/networking/instant-messengers/baresip/default.nix +++ b/pkgs/applications/networking/instant-messengers/baresip/default.nix @@ -27,13 +27,13 @@ , dbusSupport ? true }: stdenv.mkDerivation rec { - version = "3.6.0"; + version = "3.7.0"; pname = "baresip"; src = fetchFromGitHub { owner = "baresip"; repo = "baresip"; rev = "v${version}"; - hash = "sha256-cp9aaOtvFl9RUHPQRMkSjPvf0fJ29Bclh4SKnAHo7fE="; + hash = "sha256-A1S8pen0aPd3CmeRpttwivhwHnAv7Rk2lao8I/CWvo0="; }; prePatch = lib.optionalString (!dbusSupport) '' substituteInPlace cmake/modules.cmake --replace 'list(APPEND MODULES ctrl_dbus)' "" From 9f066b97ab0ac71ca81136444553be94bf600526 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 25 Dec 2023 10:10:09 +0000 Subject: [PATCH 103/128] azure-storage-azcopy: 10.22.0 -> 10.22.1 --- pkgs/development/tools/azcopy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/azcopy/default.nix b/pkgs/development/tools/azcopy/default.nix index c35309daca88..a6c719611ca9 100644 --- a/pkgs/development/tools/azcopy/default.nix +++ b/pkgs/development/tools/azcopy/default.nix @@ -6,18 +6,18 @@ buildGoModule rec { pname = "azure-storage-azcopy"; - version = "10.22.0"; + version = "10.22.1"; src = fetchFromGitHub { owner = "Azure"; repo = "azure-storage-azcopy"; rev = "refs/tags/v${version}"; - hash = "sha256-njDC1KxxWaeCxALF5MRE/6+z6bcEQt/PTjN29hEg4Hw="; + hash = "sha256-WS8h4WRiCTthZOT3NQE8h7BihpaHFfCe39XoGvnDZ1k="; }; subPackages = [ "." ]; - vendorHash = "sha256-vHHUbXpO4Z2VKSyA8itywx5oei9bFuSmvW1d7KENeUM="; + vendorHash = "sha256-afqDnrmbTR6yZHT7NysysORci4b0Oh0sjpftgAXJ5Uk="; doCheck = false; From 6838bf4fead07067070c9394804cbc0200e5b9fb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 25 Dec 2023 10:28:39 +0000 Subject: [PATCH 104/128] bearer: 1.33.0 -> 1.33.1 --- pkgs/development/tools/bearer/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/bearer/default.nix b/pkgs/development/tools/bearer/default.nix index e1f56a56fbc6..78534868d39b 100644 --- a/pkgs/development/tools/bearer/default.nix +++ b/pkgs/development/tools/bearer/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "bearer"; - version = "1.33.0"; + version = "1.33.1"; src = fetchFromGitHub { owner = "bearer"; repo = "bearer"; rev = "refs/tags/v${version}"; - hash = "sha256-sdtZOj3jksXDVVYi+Uy/zXgZoqlhGlPKjokXNErBe9k="; + hash = "sha256-cdD4LYQZwkS5dRhmvyHkio7TXPDgfDo7kutVAGJCitc="; }; - vendorHash = "sha256-u3pqG74o8xRxxepS5u3lTo4rPgbFABDC/dLWD1JAyxA="; + vendorHash = "sha256-nh2hkwscb4EYEfumBXPFrLgxIxRlkVqBCnQZ4eMZbgg="; subPackages = [ "cmd/bearer" From f544c46984b35e0120b2bee731d146278d340b17 Mon Sep 17 00:00:00 2001 From: Zane van Iperen Date: Mon, 25 Dec 2023 03:58:50 +1000 Subject: [PATCH 105/128] libcec: enable the "Linux CEC Framework". As per documentation [1]. [1]: https://github.com/Pulse-Eight/libcec/blob/master/docs/README.linux.md?plain=1#L57 --- pkgs/development/libraries/libcec/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libcec/default.nix b/pkgs/development/libraries/libcec/default.nix index 1d6fd44acb69..90ffcb01cf91 100644 --- a/pkgs/development/libraries/libcec/default.nix +++ b/pkgs/development/libraries/libcec/default.nix @@ -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"; From 1a179d00ccb1bcf1b36f09d693d03cc8a1dc1430 Mon Sep 17 00:00:00 2001 From: MultisampledNight Date: Sun, 24 Dec 2023 12:12:59 +0100 Subject: [PATCH 106/128] neovide: 0.11.2 -> 0.12.0 --- pkgs/applications/editors/neovim/neovide/default.nix | 12 +++++++----- .../editors/neovim/neovide/skia-externals.json | 12 ++++++------ 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/editors/neovim/neovide/default.nix b/pkgs/applications/editors/neovim/neovide/default.nix index ccd7d754e44c..6840ac60919c 100644 --- a/pkgs/applications/editors/neovim/neovide/default.nix +++ b/pkgs/applications/editors/neovim/neovide/default.nix @@ -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; }; } diff --git a/pkgs/applications/editors/neovim/neovide/skia-externals.json b/pkgs/applications/editors/neovim/neovide/skia-externals.json index 82730f5458a3..e57814e2a2d8 100644 --- a/pkgs/applications/editors/neovim/neovide/skia-externals.json +++ b/pkgs/applications/editors/neovim/neovide/skia-externals.json @@ -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", From 40b8d88dd5fefa670d0b2efe5107bd1dbfb618ac Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Mon, 25 Dec 2023 13:24:13 +0200 Subject: [PATCH 107/128] balena-cli: fix darwin build --- pkgs/tools/admin/balena-cli/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/admin/balena-cli/default.nix b/pkgs/tools/admin/balena-cli/default.nix index 50f4cfc0133a..862fcf7aa0eb 100644 --- a/pkgs/tools/admin/balena-cli/default.nix +++ b/pkgs/tools/admin/balena-cli/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , buildNpmPackage +, overrideSDK , fetchFromGitHub , testers , balena-cli @@ -10,7 +11,12 @@ , 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.4.9"; From 6ae269357f06bc08c054f05e09cf65a3e80678d9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 25 Dec 2023 11:37:23 +0000 Subject: [PATCH 108/128] buildkite-agent-metrics: 5.9.2 -> 5.9.3 --- pkgs/servers/monitoring/buildkite-agent-metrics/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/buildkite-agent-metrics/default.nix b/pkgs/servers/monitoring/buildkite-agent-metrics/default.nix index 67a1218d1bd1..bf1af9e944d7 100644 --- a/pkgs/servers/monitoring/buildkite-agent-metrics/default.nix +++ b/pkgs/servers/monitoring/buildkite-agent-metrics/default.nix @@ -4,7 +4,7 @@ }: buildGoModule rec { pname = "buildkite-agent-metrics"; - version = "5.9.2"; + version = "5.9.3"; outputs = [ "out" "lambda" ]; @@ -12,10 +12,10 @@ buildGoModule rec { owner = "buildkite"; repo = "buildkite-agent-metrics"; rev = "v${version}"; - hash = "sha256-JYpsQUIKTlQz1VUmPfTzvgh++0p3NAoa105mvGoqgt8="; + hash = "sha256-DepIptvR4i0+/45stCMErJtDeAFIDiNbhioitQ8gYBs="; }; - vendorHash = "sha256-2EbZLLaddR7oWXb9H9E35foevp6gMbWfoymDf2lQuto="; + vendorHash = "sha256-YEvVGtfhe/RBeuD87C2BNOFEeK40JDidX4loSLdBwhs="; postInstall = '' mkdir -p $lambda/bin From 78d486bc1aba1a6b1cb87aa76ab25fc38edda2bd Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Mon, 25 Dec 2023 13:16:58 +0200 Subject: [PATCH 109/128] hplip: add support for qtwayland Otherwise, if `QT_QPA_PLATFORM=wayland`, qt based programs will segfault. --- pkgs/misc/drivers/hplip/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix index 0b4abe265060..854c0c39fa15 100644 --- a/pkgs/misc/drivers/hplip/default.nix +++ b/pkgs/misc/drivers/hplip/default.nix @@ -66,6 +66,8 @@ python3Packages.buildPythonApplication { perl zlib avahi + ] ++ lib.optionals withQt5 [ + qt5.qtwayland ]; nativeBuildInputs = [ From c4b20bb40ea49f48da04a0b7878fe60756dfd48e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 25 Dec 2023 12:31:28 +0000 Subject: [PATCH 110/128] c2fmzq: 0.4.15 -> 0.4.16 --- pkgs/by-name/c2/c2fmzq/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/c2/c2fmzq/package.nix b/pkgs/by-name/c2/c2fmzq/package.nix index 414564f65e0c..36cc9518514d 100644 --- a/pkgs/by-name/c2/c2fmzq/package.nix +++ b/pkgs/by-name/c2/c2fmzq/package.nix @@ -6,20 +6,20 @@ buildGoModule rec { pname = "c2FmZQ"; - version = "0.4.15"; + version = "0.4.16"; src = fetchFromGitHub { owner = "c2FmZQ"; repo = "c2FmZQ"; rev = "v${version}"; - hash = "sha256-xQOzuJfGmnmOJqHCm5xUNuLHQO4UVRMu1vABsuUbv60="; + hash = "sha256-DJvcWUPIEu3zCVIVB/mUBqbOzHwUI+01gMQUdYk4qm4="; }; ldflags = [ "-s" "-w" ]; sourceRoot = "source/c2FmZQ"; - vendorHash = "sha256-aG1YPg8jeBJShICujUgrcvgAlb7ySdwjc+x6jEUYHXA="; + vendorHash = "sha256-lnoEh6etfVLx+GYWNCvra40qOYtzTIH3SC28T6mXC2U="; subPackages = [ "c2FmZQ-client" "c2FmZQ-server" ]; From 70954d5b527cbae1a5c1b6437a41c7e345e05bbb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 25 Dec 2023 12:48:23 +0000 Subject: [PATCH 111/128] cargo-mutants: 23.12.0 -> 23.12.2 --- pkgs/development/tools/rust/cargo-mutants/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-mutants/default.nix b/pkgs/development/tools/rust/cargo-mutants/default.nix index f06e741f8a70..62a73b536037 100644 --- a/pkgs/development/tools/rust/cargo-mutants/default.nix +++ b/pkgs/development/tools/rust/cargo-mutants/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-mutants"; - version = "23.12.0"; + version = "23.12.2"; src = fetchFromGitHub { owner = "sourcefrog"; repo = "cargo-mutants"; rev = "v${version}"; - hash = "sha256-6p+ri6An0rQTPSFUSE4MBNP5dFiVFsS0UDXUoWJoY20="; + hash = "sha256-TFVk8uq+wBfCmwU5klqapxp6IeJNnvoH6pDKC8NJuao="; }; - cargoHash = "sha256-4ej0Pl8n1Z001IdiM1u+/Z7ZTi9hwuoJLA4gHheQOsA="; + cargoHash = "sha256-cN7mgyKzuYZT+g8j04Ncqb4s2mwyTsNib5RssrEa2F8="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration From d1ea7f192477e69b889c7f165dbd6e818af51f93 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 25 Dec 2023 12:48:25 +0000 Subject: [PATCH 112/128] cargo-run-bin: 1.6.0 -> 1.6.1 --- pkgs/development/tools/rust/cargo-run-bin/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-run-bin/default.nix b/pkgs/development/tools/rust/cargo-run-bin/default.nix index facc1566a990..2022a887457a 100644 --- a/pkgs/development/tools/rust/cargo-run-bin/default.nix +++ b/pkgs/development/tools/rust/cargo-run-bin/default.nix @@ -5,14 +5,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-run-bin"; - version = "1.6.0"; + version = "1.6.1"; src = fetchCrate { inherit pname version; - hash = "sha256-PB44m39TDH1z8N3DrxAlZ/FKOdZmpe+U84tbmBBP9VQ="; + hash = "sha256-B4tkP2QuL3MFQn3iAPg4TMJfFbn1D8w/C1OX+TbpgSE="; }; - cargoHash = "sha256-FMlirUr3c8QhnTmTHvfNPff7PYlWSl83vCGLOLbyaR4="; + cargoHash = "sha256-tn+NqugSK5R/lIQVF1URWoDbdsSCvi5tjdjOlT293tg="; # multiple impurities in tests doCheck = false; From 3a546238f47d8979aa3071d59d17b1305323c354 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Mon, 25 Dec 2023 14:18:20 +0200 Subject: [PATCH 113/128] hplip: don't double wrap with qt env --- pkgs/misc/drivers/hplip/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix index 854c0c39fa15..577cb3ecf8e3 100644 --- a/pkgs/misc/drivers/hplip/default.nix +++ b/pkgs/misc/drivers/hplip/default.nix @@ -239,6 +239,8 @@ python3Packages.buildPythonApplication { # 1. Calling patchPythonProgram on the original script in $out/share/hplip # 2. Making our own wrapper pointing directly to the original script. dontWrapPythonPrograms = true; + # We also avoid double wrapping in case we add qt5 support + dontWrapQtApps = true; preFixup = '' buildPythonPath "$out $pythonPath" @@ -248,7 +250,7 @@ python3Packages.buildPythonApplication { echo "patching \`$py'..." patchPythonScript "$py" echo "wrapping \`$bin'..." - makeWrapper "$py" "$bin" \ + ${if withQt5 then "makeQtWrapper" else "makeWrapper"} "$py" "$bin" \ --prefix PATH ':' "$program_PATH" \ --set PYTHONNOUSERSITE "true" \ $makeWrapperArgs @@ -266,10 +268,6 @@ python3Packages.buildPythonApplication { --replace {,${util-linux}/bin/}logger \ --replace {/usr,$out}/bin remove-references-to -t ${stdenv.cc.cc} $(readlink -f $out/lib/*.so) - '' + lib.optionalString withQt5 '' - for f in $out/bin/hp-*;do - wrapQtApp $f - done ''; # There are some binaries there, which reference gcc-unwrapped otherwise. From cbc10f8c7b2a191f8f987a09348d4358a8179354 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 25 Dec 2023 13:08:31 +0000 Subject: [PATCH 114/128] cargo-xwin: 0.16.2 -> 0.16.3 --- pkgs/by-name/ca/cargo-xwin/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ca/cargo-xwin/package.nix b/pkgs/by-name/ca/cargo-xwin/package.nix index 6052d780ced3..274ab5ef77ec 100644 --- a/pkgs/by-name/ca/cargo-xwin/package.nix +++ b/pkgs/by-name/ca/cargo-xwin/package.nix @@ -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 From 51f6fbefdce3e71895144c13ec092434786517a5 Mon Sep 17 00:00:00 2001 From: lucasew Date: Mon, 25 Dec 2023 10:10:24 -0300 Subject: [PATCH 115/128] sunshine: add meta.mainProgram Signed-off-by: lucasew --- pkgs/servers/sunshine/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/sunshine/default.nix b/pkgs/servers/sunshine/default.nix index 1767b544f21a..331770a565d5 100644 --- a/pkgs/servers/sunshine/default.nix +++ b/pkgs/servers/sunshine/default.nix @@ -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; }; From 6ea6cfd99eacaa2ee159dd373b29693f5d090949 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 25 Dec 2023 13:28:20 +0000 Subject: [PATCH 116/128] ceph-csi: 3.10.0 -> 3.10.1 --- pkgs/tools/filesystems/ceph-csi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/ceph-csi/default.nix b/pkgs/tools/filesystems/ceph-csi/default.nix index c63eb034dfee..d6b39ef68e4f 100644 --- a/pkgs/tools/filesystems/ceph-csi/default.nix +++ b/pkgs/tools/filesystems/ceph-csi/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "ceph-csi"; - version = "3.10.0"; + version = "3.10.1"; nativeBuildInputs = [ go ]; buildInputs = [ ceph ]; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { owner = "ceph"; repo = "ceph-csi"; rev = "v${version}"; - sha256 = "sha256-k7eipiBcr/a2V62tEtiQrduk5Cj8KGxbmiVo4x6BVwE="; + sha256 = "sha256-S5jv9l/Oozv0NrEEf+Bik0jnaK4AYIChFm2pU2/DQow="; }; preConfigure = '' From 49db25dccbba28ff7e10089aa4e782b7fa9da7c9 Mon Sep 17 00:00:00 2001 From: linsui Date: Mon, 18 Dec 2023 23:26:33 +0800 Subject: [PATCH 117/128] rust: set sourceProvenance for bootstrap binary --- pkgs/development/compilers/rust/binary.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/compilers/rust/binary.nix b/pkgs/development/compilers/rust/binary.nix index efef07aba4c6..a4a82a3d619c 100644 --- a/pkgs/development/compilers/rust/binary.nix +++ b/pkgs/development/compilers/rust/binary.nix @@ -27,6 +27,7 @@ rec { meta = with lib; { homepage = "http://www.rust-lang.org/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; description = "A safe, concurrent, practical language"; maintainers = with maintainers; [ qknight ]; license = [ licenses.mit licenses.asl20 ]; @@ -71,6 +72,7 @@ rec { meta = with lib; { homepage = "http://www.rust-lang.org/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; description = "A safe, concurrent, practical language"; maintainers = with maintainers; [ qknight ]; license = [ licenses.mit licenses.asl20 ]; From 1810a8cf9925cfe9d8793d6f3bfc671b3143cbe9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 25 Dec 2023 13:50:55 +0000 Subject: [PATCH 118/128] changie: 1.16.1 -> 1.17.0 --- pkgs/development/tools/changie/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/changie/default.nix b/pkgs/development/tools/changie/default.nix index 7679541e4174..7b155d4c40ba 100644 --- a/pkgs/development/tools/changie/default.nix +++ b/pkgs/development/tools/changie/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "changie"; - version = "1.16.1"; + version = "1.17.0"; src = fetchFromGitHub { owner = "miniscruff"; repo = "changie"; rev = "v${version}"; - hash = "sha256-NN/ohZPwgvl1ZUqFI06vKfUYs4KG9dtBKSz76+FR6pM="; + hash = "sha256-IS4KKvAi4VutJADSpst56ZdeqoqVkSMQ1TyQR12pqNg="; }; vendorHash = "sha256-JmK7bcS8UYCOUvJGs0PAYPNc8iwvCSFzjLlkBEVUa40="; From a2ed961c894c242fcffe27ad24cd27523dc5ec62 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Mon, 25 Dec 2023 10:57:52 +0100 Subject: [PATCH 119/128] hugo: add missing `meta.mainProgram` --- .../hugo/default.nix => by-name/hu/hugo/package.nix} | 10 ++++++---- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 6 insertions(+), 6 deletions(-) rename pkgs/{applications/misc/hugo/default.nix => by-name/hu/hugo/package.nix} (83%) diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/by-name/hu/hugo/package.nix similarity index 83% rename from pkgs/applications/misc/hugo/default.nix rename to pkgs/by-name/hu/hugo/package.nix index a593ecdb1ad0..3c2cce32fb2c 100644 --- a/pkgs/applications/misc/hugo/default.nix +++ b/pkgs/by-name/hu/hugo/package.nix @@ -14,7 +14,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "gohugoio"; - repo = pname; + repo = "hugo"; rev = "refs/tags/v${version}"; hash = "sha256-XNOp0k2t5Tv4HKKz3ZqL/sAdiYedOACaZ/1T7t7/Q1A="; }; @@ -48,10 +48,12 @@ buildGoModule rec { version = "v${version}"; }; - meta = with lib; { + meta = { + changelog = "https://github.com/gohugoio/hugo/releases/tag/v${version}"; description = "A fast and modern static website engine"; homepage = "https://gohugo.io"; - license = licenses.asl20; - maintainers = with maintainers; [ schneefux Br1ght0ne Frostman ]; + license = lib.licenses.asl20; + mainProgram = "hugo"; + maintainers = with lib.maintainers; [ schneefux Br1ght0ne Frostman ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4a5a6f9df840..ebf23d7bcd2a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32483,8 +32483,6 @@ with pkgs; huggle = libsForQt5.callPackage ../applications/misc/huggle { }; - hugo = callPackage ../applications/misc/hugo { }; - ghosttohugo = callPackage ../applications/misc/ghosttohugo {}; gatekeeper = callPackage ../applications/networking/cluster/gatekeeper { }; From a90c911ba67b972c299d5c08e0480bf8a012bcc0 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Mon, 25 Dec 2023 14:19:34 +0000 Subject: [PATCH 120/128] Revert "gwyddion: mark as broken" --- pkgs/applications/science/chemistry/gwyddion/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/science/chemistry/gwyddion/default.nix b/pkgs/applications/science/chemistry/gwyddion/default.nix index 59ff285c1537..5794d7077af9 100644 --- a/pkgs/applications/science/chemistry/gwyddion/default.nix +++ b/pkgs/applications/science/chemistry/gwyddion/default.nix @@ -68,6 +68,7 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2; platforms = with lib.platforms; linux ++ darwin; maintainers = [ lib.maintainers.cge ]; - broken = true; # Build error: h5py-3.9.0 not supported for interpreter python2.7 + # never built on aarch64-darwin since first introduction in nixpkgs + broken = stdenv.isDarwin && stdenv.isAarch64; }; } From a4544466078e39d1f298416593a5c5f80afcbe48 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 25 Dec 2023 15:42:00 +0000 Subject: [PATCH 121/128] cheat: 4.4.0 -> 4.4.2 --- pkgs/applications/misc/cheat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/cheat/default.nix b/pkgs/applications/misc/cheat/default.nix index 1b85a1ec65fe..da39da86ef7b 100644 --- a/pkgs/applications/misc/cheat/default.nix +++ b/pkgs/applications/misc/cheat/default.nix @@ -3,13 +3,13 @@ buildGoModule rec { pname = "cheat"; - version = "4.4.0"; + version = "4.4.2"; src = fetchFromGitHub { owner = "cheat"; repo = "cheat"; rev = version; - sha256 = "sha256-lEMwPGXvgI8wtXska9ngAy9R2tr41Jq5yO6xQk9V5n4="; + sha256 = "sha256-GUU6VWfTmNS6ny12HnMr3uQmS7HI86Oupcmqx0MVAvE="; }; subPackages = [ "cmd/cheat" ]; From f36a80e54da29775c78d7eff0e628c2b4e34d1d7 Mon Sep 17 00:00:00 2001 From: Zane van Iperen Date: Mon, 25 Dec 2023 15:26:41 +1000 Subject: [PATCH 122/128] cwiid: fix cross-compilation * Remove hardcoded use of ar. * Move flex and bison to nativeBuildInputs. * Reformat for good measure. --- pkgs/development/libraries/cwiid/default.nix | 39 +++++++++++++++----- pkgs/development/libraries/cwiid/fix-ar.diff | 26 +++++++++++++ 2 files changed, 56 insertions(+), 9 deletions(-) create mode 100644 pkgs/development/libraries/cwiid/fix-ar.diff diff --git a/pkgs/development/libraries/cwiid/default.nix b/pkgs/development/libraries/cwiid/default.nix index e640b6cbbbab..d8c472870c43 100644 --- a/pkgs/development/libraries/cwiid/default.nix +++ b/pkgs/development/libraries/cwiid/default.nix @@ -1,13 +1,22 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, bison, flex, bluez, pkg-config, gtk2 }: +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, bison +, flex +, bluez +, pkg-config +, gtk2 +}: stdenv.mkDerivation rec { pname = "cwiid"; version = "unstable-2010-02-21"; src = fetchFromGitHub { - owner = "abstrakraft"; - repo = "cwiid"; - rev = "fadf11e89b579bcc0336a0692ac15c93785f3f82"; + owner = "abstrakraft"; + repo = "cwiid"; + rev = "fadf11e89b579bcc0336a0692ac15c93785f3f82"; sha256 = "0qdb0x757k76nfj32xc2nrrdqd9jlwgg63vfn02l2iznnzahxp0h"; }; @@ -19,9 +28,21 @@ stdenv.mkDerivation rec { sed -i -e '/$(LDCONFIG)/d' common/include/lib.mak.in ''; - buildInputs = [ bison flex bluez gtk2 ]; + patches = [ + ./fix-ar.diff + ]; - nativeBuildInputs = [ autoreconfHook pkg-config ]; + buildInputs = [ + bluez + gtk2 + ]; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + bison + flex + ]; NIX_LDFLAGS = "-lbluetooth"; @@ -32,9 +53,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Linux Nintendo Wiimote interface"; - homepage = "http://cwiid.org"; - license = licenses.gpl2Plus; + homepage = "http://cwiid.org"; + license = licenses.gpl2Plus; maintainers = with maintainers; [ bennofs ]; - platforms = platforms.linux; + platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/cwiid/fix-ar.diff b/pkgs/development/libraries/cwiid/fix-ar.diff new file mode 100644 index 000000000000..8ca4b885a0a3 --- /dev/null +++ b/pkgs/development/libraries/cwiid/fix-ar.diff @@ -0,0 +1,26 @@ +diff --git a/common/include/lib.mak.in b/common/include/lib.mak.in +index 3afbb14..b8df9d9 100644 +--- a/common/include/lib.mak.in ++++ b/common/include/lib.mak.in +@@ -22,7 +22,7 @@ static: $(STATIC_LIB) + shared: $(SHARED_LIB) + + $(STATIC_LIB): $(OBJECTS) +- ar rcs $(STATIC_LIB) $(OBJECTS) ++ $(AR) rcs $(STATIC_LIB) $(OBJECTS) + + $(SHARED_LIB): $(OBJECTS) + $(CC) -shared -Wl,-soname,$(SO_NAME) $(LDFLAGS) -o $(SHARED_LIB) \ +diff --git a/configure.ac b/configure.ac +index 82ca3e1..0a78283 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -15,6 +15,8 @@ if test "$YACC" != "bison -y"; then + AC_MSG_ERROR([bison not found]) + fi + ++AC_CHECK_TOOL([AR], [ar], [:]) ++ + AC_ARG_WITH( + [python], + [AS_HELP_STRING([--without-python],[compile without python support])], From 62266dbe341a9028d7b489972bbd39c28e8b3408 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 25 Dec 2023 18:38:24 +0000 Subject: [PATCH 123/128] eask: 0.8.1 -> 0.9.1 --- pkgs/development/tools/eask/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/eask/default.nix b/pkgs/development/tools/eask/default.nix index 799a507fee35..fdd18db0210e 100644 --- a/pkgs/development/tools/eask/default.nix +++ b/pkgs/development/tools/eask/default.nix @@ -5,16 +5,16 @@ buildNpmPackage rec { pname = "eask"; - version = "0.8.1"; + version = "0.9.1"; src = fetchFromGitHub { owner = "emacs-eask"; repo = "cli"; rev = version; - hash = "sha256-NoYWRIkJEOUsHsjBYTtCNrCmAGG0pqaAHDOc9VcaRwk="; + hash = "sha256-uQHYVhoa0wkpqV3ScQKT1XnMhJQYs/KiFUMkUG2/ll0="; }; - npmDepsHash = "sha256-ctIVBrx9fagSX3f2/wn5wWkReOYK0nldFoxTJWVsx0g="; + npmDepsHash = "sha256-IfuBxU4CNpMUdbGwqykoG7H9LMzrfNbmTN/8VU83ArM="; dontBuild = true; From 4d8e7dfe21c179fa03661927c79a3f4b79c79daf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 25 Dec 2023 20:51:26 +0100 Subject: [PATCH 124/128] cargo: fix description and homepage --- pkgs/development/compilers/rust/binary.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/rust/binary.nix b/pkgs/development/compilers/rust/binary.nix index a4a82a3d619c..8fdc046a98e3 100644 --- a/pkgs/development/compilers/rust/binary.nix +++ b/pkgs/development/compilers/rust/binary.nix @@ -71,9 +71,9 @@ rec { inherit src; meta = with lib; { - homepage = "http://www.rust-lang.org/"; + homepage = "https://doc.rust-lang.org/cargo/"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - description = "A safe, concurrent, practical language"; + description = "The Rust package manager"; maintainers = with maintainers; [ qknight ]; license = [ licenses.mit licenses.asl20 ]; }; From e25b2d4e377b8db9ea2b2b86141cb588c5fab338 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 25 Dec 2023 20:52:38 +0100 Subject: [PATCH 125/128] rustc: link to https homepage --- pkgs/development/compilers/rust/binary.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/rust/binary.nix b/pkgs/development/compilers/rust/binary.nix index 8fdc046a98e3..c546e278e7fa 100644 --- a/pkgs/development/compilers/rust/binary.nix +++ b/pkgs/development/compilers/rust/binary.nix @@ -26,7 +26,7 @@ rec { inherit src; meta = with lib; { - homepage = "http://www.rust-lang.org/"; + homepage = "https://www.rust-lang.org/"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; description = "A safe, concurrent, practical language"; maintainers = with maintainers; [ qknight ]; From a5ac2d8dc26c255541bd8cd2f67dcce5c55db274 Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Tue, 26 Dec 2023 04:38:25 +0800 Subject: [PATCH 126/128] kanata: mention breaking changes of v1.5.0 --- nixos/doc/manual/release-notes/rl-2405.section.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-2405.section.md b/nixos/doc/manual/release-notes/rl-2405.section.md index c2c8f8acab65..3762f784ce3d 100644 --- a/nixos/doc/manual/release-notes/rl-2405.section.md +++ b/nixos/doc/manual/release-notes/rl-2405.section.md @@ -50,6 +50,8 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m - `mkosi` was updated to v19. Parts of the user interface have changed. Consult the [release notes](https://github.com/systemd/mkosi/releases/tag/v19) for a list of changes. +- The `kanata` package has been updated to v1.5.0, which includes [breaking changes](https://github.com/jtroo/kanata/releases/tag/v1.5.0). + - The latest available version of Nextcloud is v28 (available as `pkgs.nextcloud28`). The installation logic is as follows: - If [`services.nextcloud.package`](#opt-services.nextcloud.package) is specified explicitly, this package will be installed (**recommended**) - If [`system.stateVersion`](#opt-system.stateVersion) is >=24.05, `pkgs.nextcloud28` will be installed by default. From 2100a51ebdcf1373105e76f4e6b0e56f1083e53c Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Mon, 25 Dec 2023 22:38:35 +0100 Subject: [PATCH 127/128] phpExtensions.apcu: remove obsolete patch --- pkgs/development/php-packages/apcu/default.nix | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/pkgs/development/php-packages/apcu/default.nix b/pkgs/development/php-packages/apcu/default.nix index 737ef933a8f4..9aec7d660763 100644 --- a/pkgs/development/php-packages/apcu/default.nix +++ b/pkgs/development/php-packages/apcu/default.nix @@ -13,13 +13,6 @@ in buildPecl { sha256 = "sha256-UDKLLCCnYJj/lCD8ZkkDf2WYZMoIbcP75+0/IXo4vdQ="; }; - patches = lib.optionals (lib.versionAtLeast php.version "8.3") [ - (fetchpatch { - url = "https://github.com/krakjoe/apcu/commit/c9a29161c68c0faf71046e8f03f6a90900023ded.patch"; - hash = "sha256-B0ZKk9TJy2+sYGs7TEX2KxUiOVawIb+RXNgToU1Fz5I="; - }) - ]; - buildInputs = [ pcre2 ]; doCheck = true; checkTarget = "test"; @@ -30,8 +23,8 @@ in buildPecl { meta = with lib; { changelog = "https://github.com/krakjoe/apcu/releases/tag/v${version}"; description = "Userland cache for PHP"; - license = licenses.php301; homepage = "https://pecl.php.net/package/APCu"; + license = licenses.php301; maintainers = teams.php.members; }; } From 2293e04065f706a7af08c50e0a30e72193c23c7d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 25 Dec 2023 10:11:21 +0100 Subject: [PATCH 128/128] python311Packages.simplisafe-python: refactor --- pkgs/development/python-modules/simplisafe-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/simplisafe-python/default.nix b/pkgs/development/python-modules/simplisafe-python/default.nix index b9039bf5beda..03acfc90c5d8 100644 --- a/pkgs/development/python-modules/simplisafe-python/default.nix +++ b/pkgs/development/python-modules/simplisafe-python/default.nix @@ -20,9 +20,9 @@ buildPythonPackage rec { pname = "simplisafe-python"; version = "2023.12.0"; - format = "pyproject"; + pyproject = true; - disabled = pythonOlder "3.9"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "bachya";