From 3cf1334510de69a4c2ceb360b57fa6c9821c6c22 Mon Sep 17 00:00:00 2001 From: Tomkoid Date: Fri, 8 Dec 2023 17:03:10 +0100 Subject: [PATCH 01/52] mdhtml: 0.3.1 -> 1.0 --- pkgs/tools/text/mdhtml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/mdhtml/default.nix b/pkgs/tools/text/mdhtml/default.nix index 4c9f6e5da28b..4c68eb32d9dd 100644 --- a/pkgs/tools/text/mdhtml/default.nix +++ b/pkgs/tools/text/mdhtml/default.nix @@ -5,14 +5,14 @@ buildGoModule rec { pname = "mdhtml"; - version = "0.3.1"; + version = "1.0"; src = fetchFromGitea { domain = "codeberg.org"; owner = "Tomkoid"; repo = pname; rev = version; - hash = "sha256-ISZUadJZOWwUygLnGYvuMUNCmTNGZLYq+q/FeK++kWE="; + hash = "sha256-Fv5XpWA2ebqXdA+46gZQouuZ3XxH4WDj/W6xJ0ETg8E="; }; vendorHash = null; From aa62e4d76378606b6ef0e4234ed327b964aa2e58 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 8 Dec 2023 22:52:02 +0000 Subject: [PATCH 02/52] cargo-mutants: 23.11.2 -> 23.12.0 --- 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 b4b9429997f9..f06e741f8a70 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.11.2"; + version = "23.12.0"; src = fetchFromGitHub { owner = "sourcefrog"; repo = "cargo-mutants"; rev = "v${version}"; - hash = "sha256-Rx/3U/wSV4OivUzVyjS+sHiPqCHdaoornngvfn59Bbc="; + hash = "sha256-6p+ri6An0rQTPSFUSE4MBNP5dFiVFsS0UDXUoWJoY20="; }; - cargoHash = "sha256-8PnxjZIOZ8DPso4Qd29mfiIPpfe3Erjnu5xXHf1eoGk="; + cargoHash = "sha256-4ej0Pl8n1Z001IdiM1u+/Z7ZTi9hwuoJLA4gHheQOsA="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration From 81f4e3c78459351cb150019b6cbdb819967028ea Mon Sep 17 00:00:00 2001 From: Muhammad Falak R Wani Date: Sat, 9 Dec 2023 14:00:57 +0530 Subject: [PATCH 03/52] containerd: 1.7.9 -> 1.7.11 Diff: https://github.com/containerd/containerd/compare/v1.7.9...v1.7.11 Changelog: https://github.com/containerd/containerd/releases/tag/v1.7.11 Signed-off-by: Muhammad Falak R Wani --- pkgs/applications/virtualization/containerd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/containerd/default.nix b/pkgs/applications/virtualization/containerd/default.nix index 82e814610dce..47381e4d1a1b 100644 --- a/pkgs/applications/virtualization/containerd/default.nix +++ b/pkgs/applications/virtualization/containerd/default.nix @@ -11,13 +11,13 @@ buildGoModule rec { pname = "containerd"; - version = "1.7.9"; + version = "1.7.11"; src = fetchFromGitHub { owner = "containerd"; repo = "containerd"; rev = "v${version}"; - hash = "sha256-/kCnzOL8CJuJJglHzmev3alt8cMwTUbIiZhNft9zwps="; + hash = "sha256-kvBD9Qh10kRowr32zDzjpHYh2IZC6+w+nOO4joShgEE="; }; vendorHash = null; From ad7d50a02f0cb532ffbc3c9b03ffa4f46f8be423 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Sun, 10 Dec 2023 01:57:35 +0000 Subject: [PATCH 04/52] etcd_3_5: 3.5.10 -> 3.5.11 --- pkgs/servers/etcd/3.5.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/etcd/3.5.nix b/pkgs/servers/etcd/3.5.nix index e5d9a677f950..226547087412 100644 --- a/pkgs/servers/etcd/3.5.nix +++ b/pkgs/servers/etcd/3.5.nix @@ -1,13 +1,13 @@ { lib, buildGoModule, fetchFromGitHub, symlinkJoin, nixosTests }: let - version = "3.5.10"; + version = "3.5.11"; src = fetchFromGitHub { owner = "etcd-io"; repo = "etcd"; rev = "v${version}"; - hash = "sha256-X/de8YA55SZ6p8r/pV8CGxfDKN8voJlyA0r4ckan6ZE="; + hash = "sha256-OjAWi5EXy1d1O6HLBzHcSfeCNmZZLNtrQXpTJ075B0I="; }; CGO_ENABLED = 0; @@ -25,7 +25,7 @@ let inherit CGO_ENABLED meta src version; - vendorHash = "sha256-kFR6RvHoNM4SZOgJd7inUuw5GfRLM+3WsKU73We8UzU="; + vendorHash = "sha256-1/ma737hGdek+263w5OuO5iN5DTA8fpb6m0Fefyww20="; modRoot = "./server"; @@ -45,7 +45,7 @@ let inherit CGO_ENABLED meta src version; - vendorHash = "sha256-oVabZ2JZlLKHFCuAeeWRTrcSCxzz05HlvDu/YSMKuCs="; + vendorHash = "sha256-AMN8iWTIFeT0HLqxYrp7sieT0nEKBNwFXV9mZG3xG5I="; modRoot = "./etcdutl"; }; @@ -55,7 +55,7 @@ let inherit CGO_ENABLED meta src version; - vendorHash = "sha256-0j35caQfLh7kwDKgmTe1novqKfz/3JlQLbUk3+GFPhk="; + vendorHash = "sha256-zwafVpNBvrRUbL0qkDK9TOyo8KCiGjpZhvdUrgklG5Y="; modRoot = "./etcdctl"; }; From c15f418082b065d32791be9086468b0e8b8840e9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 10 Dec 2023 09:11:00 +0000 Subject: [PATCH 05/52] postgresql12JitPackages.plpgsql_check: 2.6.2 -> 2.7.0 --- pkgs/servers/sql/postgresql/ext/plpgsql_check.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix b/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix index c3aaa5e9e740..89e720991e54 100644 --- a/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix +++ b/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "plpgsql_check"; - version = "2.6.2"; + version = "2.7.0"; src = fetchFromGitHub { owner = "okbob"; repo = pname; rev = "v${version}"; - hash = "sha256-JYlcd4VveSoQM/PIRRCeCLfJTDRGRl3zrc6iAd1V3aE="; + hash = "sha256-DSBr2pmJD/kW1b4nqCTS4KwAAH6eojDmE/RVwvSIAa0="; }; buildInputs = [ postgresql ]; From 659c0084940aede2c9d90c6cf16735b3bf9690ee Mon Sep 17 00:00:00 2001 From: Jonathan Davies Date: Sun, 10 Dec 2023 10:44:49 +0000 Subject: [PATCH 06/52] prometheus-zfs-exporter: Added ldflags to add version label to _build_info metric. --- pkgs/servers/monitoring/prometheus/zfs-exporter.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/servers/monitoring/prometheus/zfs-exporter.nix b/pkgs/servers/monitoring/prometheus/zfs-exporter.nix index 3e5ec75a2922..d229daa14b81 100644 --- a/pkgs/servers/monitoring/prometheus/zfs-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/zfs-exporter.nix @@ -16,6 +16,16 @@ buildGoModule rec { vendorHash = "sha256-uIilESEmAxANxFOy7qvYxlF/bId/Kqh4jUspNknlhlc="; + ldflags = [ + "-s" + "-w" + "-X github.com/prometheus/common/version.Version=${version}" + "-X github.com/prometheus/common/version.Revision=unknown" + "-X github.com/prometheus/common/version.Branch=unknown" + "-X github.com/prometheus/common/version.BuildUser=nix@nixpkgs" + "-X github.com/prometheus/common/version.BuildDate=unknown" + ]; + postInstall = '' install -Dm444 -t $out/share/doc/${pname} *.md ''; From 525872310821d6f5e99915097912f1ed58bec324 Mon Sep 17 00:00:00 2001 From: r-vdp Date: Sun, 10 Dec 2023 23:25:38 +0100 Subject: [PATCH 07/52] atuin: 17.0.1 -> 17.1.0 --- pkgs/tools/misc/atuin/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/atuin/default.nix b/pkgs/tools/misc/atuin/default.nix index 2722512992d5..b91880e067f4 100644 --- a/pkgs/tools/misc/atuin/default.nix +++ b/pkgs/tools/misc/atuin/default.nix @@ -12,20 +12,20 @@ rustPlatform.buildRustPackage rec { pname = "atuin"; - version = "17.0.1"; + version = "17.1.0"; src = fetchFromGitHub { owner = "atuinsh"; repo = "atuin"; rev = "v${version}"; - hash = "sha256-HJRlZwvBra2D7TzVKvMWJ0Hf17QgIEcBDQEHhxdVLIM="; + hash = "sha256-srFHVUZerxPmOQXVMoSgeLsylvILcOP7m62s4NCFDJE="; }; # TODO: unify this to one hash because updater do not support this cargoHash = if stdenv.isLinux - then "sha256-AhoXmEjXsi/OgFX3htOA6A/lWegUFlsywdotX3PDwcs=" - else "sha256-/nCnZ64pM8oWVX9a4JCeCZRyuo7aVc8YaBVEMbiRsqE="; + then "sha256-FyKcR6H3/2cra9VYJbW37cSCvOpAiC8UJYXnseNQlt4=" + else "sha256-NfoAjTshmb1L4bIkBctk90bZL93hsyAyIE9AEFUGcGQ="; nativeBuildInputs = [ installShellFiles ]; From 0fdc7bc6b5d3cba6eadc1ba562a2efef535411dc Mon Sep 17 00:00:00 2001 From: fedx Date: Sun, 10 Dec 2023 18:06:53 -0700 Subject: [PATCH 08/52] quickemu: 4.9.1 -> 4.9.2 --- pkgs/development/quickemu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/quickemu/default.nix b/pkgs/development/quickemu/default.nix index a8286ef5df9d..576c827e84b0 100644 --- a/pkgs/development/quickemu/default.nix +++ b/pkgs/development/quickemu/default.nix @@ -50,13 +50,13 @@ in stdenv.mkDerivation rec { pname = "quickemu"; - version = "4.9.1"; + version = "4.9.2"; src = fetchFromGitHub { owner = "quickemu-project"; repo = "quickemu"; rev = version; - hash = "sha256-tWl16dd0a6pDz+cUZx9Ku2ov+LJZabR2cDso5tPbML4="; + hash = "sha256-StYgnFBnEJUkJDyFluMm01xhgejXc99AEldGGxIvZU0="; }; postPatch = '' From a91b30141ffe5e2c3ee2f5ddcc2dea91e17375e8 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 14 Dec 2023 00:53:51 +0100 Subject: [PATCH 09/52] kexec-tools: mark unsupported on microblaze --- pkgs/os-specific/linux/kexec-tools/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/kexec-tools/default.nix b/pkgs/os-specific/linux/kexec-tools/default.nix index 2df5c0454ddc..c62f9047fc60 100644 --- a/pkgs/os-specific/linux/kexec-tools/default.nix +++ b/pkgs/os-specific/linux/kexec-tools/default.nix @@ -34,6 +34,7 @@ stdenv.mkDerivation rec { description = "Tools related to the kexec Linux feature"; platforms = platforms.linux; badPlatforms = [ + "microblaze-linux" "microblazeel-linux" "riscv64-linux" "riscv32-linux" "sparc-linux" "sparc64-linux" ]; From 6a7d205b49ad0218b7e299a68b9adaf64a3bf3b9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 14 Dec 2023 12:34:08 +0000 Subject: [PATCH 10/52] dua: 2.21.0 -> 2.23.0 --- pkgs/tools/misc/dua/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/dua/default.nix b/pkgs/tools/misc/dua/default.nix index f27acd85d9d4..6b9aff9572ec 100644 --- a/pkgs/tools/misc/dua/default.nix +++ b/pkgs/tools/misc/dua/default.nix @@ -7,13 +7,13 @@ rustPlatform.buildRustPackage rec { pname = "dua"; - version = "2.21.0"; + version = "2.23.0"; src = fetchFromGitHub { owner = "Byron"; repo = "dua-cli"; rev = "v${version}"; - hash = "sha256-szpM3PxIMcKJaCinzZltneCSJCDkPGvXOaGqa9hx9IQ="; + hash = "sha256-dHtPz5TxNQyBHOuCYH1XRIeR63ghMP/moaULI++tg8Y="; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. postFetch = '' @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { ''; }; - cargoHash = "sha256-/10trywiFX0UvePxlWek1uXTBRVk4saE+n1RJipinaw="; + cargoHash = "sha256-10etmf0eQw9nD74dJMpQGAV4cK9FnTWKSrhBT3ZJblc="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Foundation From 4fe2d40a72181f111b8f866045cda81963560633 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Tue, 5 Dec 2023 19:46:24 -0500 Subject: [PATCH 11/52] slurp: add nickcao to maintainers --- pkgs/tools/wayland/slurp/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/wayland/slurp/default.nix b/pkgs/tools/wayland/slurp/default.nix index 327cc7e91d1f..fb4ed3993827 100644 --- a/pkgs/tools/wayland/slurp/default.nix +++ b/pkgs/tools/wayland/slurp/default.nix @@ -53,6 +53,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/emersion/slurp"; license = licenses.mit; mainProgram = "slurp"; - maintainers = with maintainers; [ buffet ]; + maintainers = with maintainers; [ buffet nickcao ]; }; }) From 3507aba9252b9d73145984b6a1a0bd5e45af2adf Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Thu, 14 Dec 2023 09:16:13 -0500 Subject: [PATCH 12/52] slurp: 1.4.0 -> 1.5.0 Diff: https://github.com/emersion/slurp/compare/v1.4.0...v1.5.0 Changelog: https://github.com/emersion/slurp/releases/tag/v1.5.0 --- pkgs/tools/wayland/slurp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/wayland/slurp/default.nix b/pkgs/tools/wayland/slurp/default.nix index fb4ed3993827..e8be0deae6c2 100644 --- a/pkgs/tools/wayland/slurp/default.nix +++ b/pkgs/tools/wayland/slurp/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "slurp"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "emersion"; repo = "slurp"; rev = "v${finalAttrs.version}"; - hash = "sha256-jUuY2wuN00libHDaJEmrvQAb1o989Ly3nLyKHV0jz8Q="; + hash = "sha256-2M8f3kN6tihwKlUCp2Qowv5xD6Ufb71AURXqwQShlXI="; }; depsBuildBuild = [ From 52d6dff589b53abb9dc1a7d81ff39623362444bd Mon Sep 17 00:00:00 2001 From: Artturin Date: Fri, 15 Dec 2023 17:07:37 +0000 Subject: [PATCH 13/52] discord: 0.0.37 -> 0.0.38 --- .../networking/instant-messengers/discord/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index aa8db54725c9..d0041cfb43e5 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -2,7 +2,7 @@ let versions = if stdenv.isLinux then { - stable = "0.0.37"; + stable = "0.0.38"; ptb = "0.0.59"; canary = "0.0.213"; development = "0.0.1"; @@ -17,7 +17,7 @@ let x86_64-linux = { stable = fetchurl { url = "https://dl.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz"; - hash = "sha256-uyflZ1Zks7M1Re6DxuNUAkIuPY4wFSydf2AGMtIube8="; + hash = "sha256-0i3xtArA/5LDyGiNQ/FjV3tU7Jzs8E6ZRuSUFNEJyDo="; }; ptb = fetchurl { url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz"; From 02d622ef47145dc0d4c8776597014523625abec9 Mon Sep 17 00:00:00 2001 From: Artturin Date: Fri, 15 Dec 2023 17:09:00 +0000 Subject: [PATCH 14/52] discord-ptb: 0.0.59 -> 0.0.61 --- .../networking/instant-messengers/discord/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index d0041cfb43e5..61152a9f47ac 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -3,7 +3,7 @@ let versions = if stdenv.isLinux then { stable = "0.0.38"; - ptb = "0.0.59"; + ptb = "0.0.61"; canary = "0.0.213"; development = "0.0.1"; } else { @@ -21,7 +21,7 @@ let }; ptb = fetchurl { url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz"; - hash = "sha256-WhDEyRMjuy2e1N51tUj3v97Y0qWabCFPThaehadXFWs="; + hash = "sha256-wyP1a1bMpMx3m61EA6vtak1K4HOtCl6eMjh1DlHz5J8="; }; canary = fetchurl { url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; From ac80181714b5a5d8378de85b06188b2cadadc96d Mon Sep 17 00:00:00 2001 From: Artturin Date: Fri, 15 Dec 2023 17:11:22 +0000 Subject: [PATCH 15/52] discord-canary: 0.0.213 -> 0.0.224 --- .../networking/instant-messengers/discord/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 61152a9f47ac..74e9f127566d 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -4,7 +4,7 @@ let if stdenv.isLinux then { stable = "0.0.38"; ptb = "0.0.61"; - canary = "0.0.213"; + canary = "0.0.224"; development = "0.0.1"; } else { stable = "0.0.287"; @@ -25,7 +25,7 @@ let }; canary = fetchurl { url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; - hash = "sha256-DGRq58Xj5p/7BunY/vFds9LVmxYOl9LcF8ESHrCLly4="; + hash = "sha256-SDF4woekFmy6VUqYTfSZi4aqtZ5ARgaex6+8qOMSHMQ="; }; development = fetchurl { url = "https://dl-development.discordapp.net/apps/linux/${version}/discord-development-${version}.tar.gz"; From 13caeb6ce18e515959a5cf98d2abf0eb67a63205 Mon Sep 17 00:00:00 2001 From: Artturin Date: Fri, 15 Dec 2023 17:13:57 +0000 Subject: [PATCH 16/52] discord: 0.0.287 -> 0.0.289 --- .../networking/instant-messengers/discord/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 74e9f127566d..042adf865d24 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -7,7 +7,7 @@ let canary = "0.0.224"; development = "0.0.1"; } else { - stable = "0.0.287"; + stable = "0.0.289"; ptb = "0.0.90"; canary = "0.0.365"; development = "0.0.10"; @@ -35,7 +35,7 @@ let x86_64-darwin = { stable = fetchurl { url = "https://dl.discordapp.net/apps/osx/${version}/Discord.dmg"; - hash = "sha256-DTkWrUgSYP98IVFTWcm4muRR91Kfvs5pBxc1tvPmj/s="; + hash = "sha256-3XaiaWdP7GSnMeR6yU5lfeumrVm6WpUmitVuSs+xAvE="; }; ptb = fetchurl { url = "https://dl-ptb.discordapp.net/apps/osx/${version}/DiscordPTB.dmg"; From 962ebfb94e6b887bd226973c77df8ca5c69157fb Mon Sep 17 00:00:00 2001 From: Artturin Date: Fri, 15 Dec 2023 17:14:40 +0000 Subject: [PATCH 17/52] discord-ptb: 0.0.90 -> 0.0.91 --- .../networking/instant-messengers/discord/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 042adf865d24..6ce5ca700ce5 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -8,7 +8,7 @@ let development = "0.0.1"; } else { stable = "0.0.289"; - ptb = "0.0.90"; + ptb = "0.0.91"; canary = "0.0.365"; development = "0.0.10"; }; @@ -39,7 +39,7 @@ let }; ptb = fetchurl { url = "https://dl-ptb.discordapp.net/apps/osx/${version}/DiscordPTB.dmg"; - hash = "sha256-wOTgcHRUu/CjdnvQVNL+rkazhVbZjwI+UbfmsF6aveg="; + hash = "sha256-8pAoi8rAaHC17GxlDGEJxGX726qRe1LVMTQK6SngniM="; }; canary = fetchurl { url = "https://dl-canary.discordapp.net/apps/osx/${version}/DiscordCanary.dmg"; From c97d23dd70c986bd1be16e843256d7c2c1c17d09 Mon Sep 17 00:00:00 2001 From: Artturin Date: Fri, 15 Dec 2023 17:15:31 +0000 Subject: [PATCH 18/52] discord-canary: 0.0.365 -> 0.0.374 --- .../networking/instant-messengers/discord/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 6ce5ca700ce5..11d0dfc64d97 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -9,7 +9,7 @@ let } else { stable = "0.0.289"; ptb = "0.0.91"; - canary = "0.0.365"; + canary = "0.0.374"; development = "0.0.10"; }; version = versions.${branch}; @@ -43,7 +43,7 @@ let }; canary = fetchurl { url = "https://dl-canary.discordapp.net/apps/osx/${version}/DiscordCanary.dmg"; - hash = "sha256-a4MyO2Wst+ZYNSpUaF0TXJKtDQcPRLehapwRzp10R2k="; + hash = "sha256-CiE33dAcX/aAjOncpX62KX+XfrRd5FgH8qQ2picwe6Q="; }; development = fetchurl { url = "https://dl-development.discordapp.net/apps/osx/${version}/DiscordDevelopment.dmg"; From c573da08a41ac31eb92212d770e3ae9eca86c3c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 15 Dec 2023 09:13:26 -0800 Subject: [PATCH 19/52] nextcloud-notify_push: 0.6.5 -> 0.6.6 Diff: https://github.com/nextcloud/notify_push/compare/v0.6.5...v0.6.6 --- pkgs/servers/nextcloud/notify_push.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/nextcloud/notify_push.nix b/pkgs/servers/nextcloud/notify_push.nix index 51be1e026adf..8afc641124db 100644 --- a/pkgs/servers/nextcloud/notify_push.nix +++ b/pkgs/servers/nextcloud/notify_push.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "notify_push"; - version = "0.6.5"; + version = "0.6.6"; src = fetchFromGitHub { owner = "nextcloud"; repo = pname; rev = "v${version}"; - hash = "sha256-go41ZIUBj1nj8rDI/c4Pk5cnDbM8Y2+bCZIab4XdhUY="; + hash = "sha256-9wVH+msUh0t0PKz+5044PhT9lGsbfp4u44gX0O70Pbo="; }; - cargoHash = "sha256-EuYwPQo2TucAaQw63pESkJGAtyuMhk3JT6mBg6E84Xs="; + cargoHash = "sha256-Q4KA+mc48OfmxYY7vDJ2ZU/Wd+101kbimwAw6ag3d+w="; passthru = rec { test_client = rustPlatform.buildRustPackage { @@ -24,10 +24,13 @@ rustPlatform.buildRustPackage rec { buildAndTestSubdir = "test_client"; - cargoHash = "sha256-m4FHCrVGAmGIrgnMMleiTRgYGYh+b7EIH1ORE0tiBkY="; + cargoHash = "sha256-XiaeCVgVjre7NmH/B+dNw0u2HV0vJwlgDjhLXXgJS+Y="; }; tests = { - inherit (nixosTests.nextcloud) with-postgresql-and-redis26; + inherit (nixosTests.nextcloud) + with-postgresql-and-redis26 + with-postgresql-and-redis27 + with-postgresql-and-redis28; inherit test_client; }; }; From 89a0f89dc55f1bb70f1ab896f541741fe919e02b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 15 Dec 2023 18:14:58 +0000 Subject: [PATCH 20/52] hcloud: 1.40.0 -> 1.41.0 --- pkgs/development/tools/hcloud/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/hcloud/default.nix b/pkgs/development/tools/hcloud/default.nix index 5286a53342b2..3d5a359ff794 100644 --- a/pkgs/development/tools/hcloud/default.nix +++ b/pkgs/development/tools/hcloud/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "hcloud"; - version = "1.40.0"; + version = "1.41.0"; src = fetchFromGitHub { owner = "hetznercloud"; repo = "cli"; rev = "refs/tags/v${version}"; - hash = "sha256-usHBlfEym39p8S6w2eNeXVKpqxlJxLCn9DwK2J1AqdI="; + hash = "sha256-NcEJgC3FtGgv0m7qisCB8vaHvD5Yw/UIHsOFBYiID4c="; }; - vendorHash = "sha256-vytfRa4eiF53VTR50l/J2Df587u8xx3lj1QhMYSqglk="; + vendorHash = "sha256-qAgKotc+ypm0pHcbKCgpFmTY5W1b8Oq3XrrP6RVulig="; ldflags = [ "-s" From e37a3c3b506a5c4bc2e83f4a896dffa1360f86e0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 15 Dec 2023 19:44:57 +0000 Subject: [PATCH 21/52] hut: 0.3.0 -> 0.4.0 --- pkgs/applications/version-management/hut/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/hut/default.nix b/pkgs/applications/version-management/hut/default.nix index 931f85fd45f0..0a22f17fbf13 100644 --- a/pkgs/applications/version-management/hut/default.nix +++ b/pkgs/applications/version-management/hut/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "hut"; - version = "0.3.0"; + version = "0.4.0"; src = fetchFromSourcehut { owner = "~emersion"; repo = "hut"; rev = "v${version}"; - sha256 = "sha256-kr5EWQ3zHUp/oNPZV2d3j9AyoEmHEX8/rETiMKTBi3s="; + sha256 = "sha256-9RSJ+SRXYBjdiuHScgFm5i0/Xi81pJfURPKAGCk+l04="; }; - vendorHash = "sha256-aoqGb7g8UEC/ydmL3GbWGy3HDD1kfDJOMeUP4nO9waA="; + vendorHash = "sha256-OxnplvBx2sFctdNSVd0S0tgiRt5Yah3ga4mORT2Kz6U="; nativeBuildInputs = [ scdoc From 40dfb15d154419bc6785a0551ae2240b67a63eac Mon Sep 17 00:00:00 2001 From: Artturin Date: Fri, 15 Dec 2023 17:16:11 +0000 Subject: [PATCH 22/52] discord-development: 0.0.10 -> 0.0.15 --- .../networking/instant-messengers/discord/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 11d0dfc64d97..4eb13cb3b943 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -10,7 +10,7 @@ let stable = "0.0.289"; ptb = "0.0.91"; canary = "0.0.374"; - development = "0.0.10"; + development = "0.0.15"; }; version = versions.${branch}; srcs = rec { @@ -47,7 +47,7 @@ let }; development = fetchurl { url = "https://dl-development.discordapp.net/apps/osx/${version}/DiscordDevelopment.dmg"; - hash = "sha256-FoYRW5SaR/53yKs/T2XKVKQevA3MxMWAJFjixtwsEF4="; + hash = "sha256-Fxxrjkj3W1MagT4rCxVEtip1W9MImsdQOuHXKPKsEtM="; }; }; aarch64-darwin = x86_64-darwin; From 2d7244530d119cbe2478ca152426c2d3072b13a0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 16 Dec 2023 03:02:02 +0100 Subject: [PATCH 23/52] nss_latest: 3.95 -> 3.96 https://github.com/nss-dev/nss/blob/master/doc/rst/releases/nss_3_96.rst --- pkgs/development/libraries/nss/latest.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/nss/latest.nix b/pkgs/development/libraries/nss/latest.nix index a759e2c86f5e..e9a7c7ff3bf4 100644 --- a/pkgs/development/libraries/nss/latest.nix +++ b/pkgs/development/libraries/nss/latest.nix @@ -5,6 +5,6 @@ # Example: nix-shell ./maintainers/scripts/update.nix --argstr package cacert import ./generic.nix { - version = "3.95"; - hash = "sha256-qgSbzlRbU+gElC2ae3FEGRUFSM1JHd/lNGNXC0x4xt4="; + version = "3.96"; + hash = "sha256-OdvJ7OLL3CDvJkgtnMsuE1CVaaKpmgRmzEzW0WmD8Jo="; } From 7335c8ce07c0a56e8e73be9d89a7b8edc9b5e831 Mon Sep 17 00:00:00 2001 From: Daniel Olsen Date: Sat, 16 Dec 2023 04:31:08 +0100 Subject: [PATCH 24/52] python3Packages.caldav: remove outdated substituteInPlace https://github.com/python-caldav/caldav/commit/1abfac52725c5d79d5d954f4c3b8e61381604e3b https://github.com/python-caldav/caldav/commit/63603d91a092e2deac8919459f8c06ccd5f88187 This is also safe to do since it does not test xandikos or radicale by default if they are not available https://github.com/python-caldav/caldav/blob/f7e00211d6230c4c2ec84645ebce6f1140394fb7/tests/conf.py#L49 --- pkgs/development/python-modules/caldav/default.nix | 7 ------- 1 file changed, 7 deletions(-) diff --git a/pkgs/development/python-modules/caldav/default.nix b/pkgs/development/python-modules/caldav/default.nix index d577264a4880..634db13ce180 100644 --- a/pkgs/development/python-modules/caldav/default.nix +++ b/pkgs/development/python-modules/caldav/default.nix @@ -45,13 +45,6 @@ buildPythonPackage rec { pytestCheckHook ]; - # xandikos and radicale are only optional test dependencies, not available for python3 - postPatch = '' - substituteInPlace setup.py \ - --replace xandikos "" \ - --replace radicale "" - ''; - pythonImportsCheck = [ "caldav" ]; meta = with lib; { From 49c6c26a62204cd960c67789070449f7219e8279 Mon Sep 17 00:00:00 2001 From: Daniel Olsen Date: Sat, 16 Dec 2023 04:34:24 +0100 Subject: [PATCH 25/52] python3Packages.caldav: test with xandikos --- pkgs/development/python-modules/caldav/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/caldav/default.nix b/pkgs/development/python-modules/caldav/default.nix index 634db13ce180..97a2e3baf5b2 100644 --- a/pkgs/development/python-modules/caldav/default.nix +++ b/pkgs/development/python-modules/caldav/default.nix @@ -11,6 +11,7 @@ , setuptools , tzlocal , vobject +, xandikos }: buildPythonPackage rec { @@ -43,6 +44,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook + xandikos ]; pythonImportsCheck = [ "caldav" ]; From 319f2c98ea659628dc401bcf0fcdb941ef6eb6be Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 16 Dec 2023 03:51:14 +0000 Subject: [PATCH 26/52] kodiPackages.websocket: 1.6.2 -> 1.6.4 --- pkgs/applications/video/kodi/addons/websocket/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/kodi/addons/websocket/default.nix b/pkgs/applications/video/kodi/addons/websocket/default.nix index b05e6deede85..c2bbe9de09b6 100644 --- a/pkgs/applications/video/kodi/addons/websocket/default.nix +++ b/pkgs/applications/video/kodi/addons/websocket/default.nix @@ -3,11 +3,11 @@ buildKodiAddon rec { pname = "websocket"; namespace = "script.module.websocket"; - version = "1.6.2"; + version = "1.6.4"; src = fetchzip { url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip"; - sha256 = "sha256-vJGijCjIgLJAdJvl+hCAPtvq7fy2ksgjY90vjVyqDkI="; + sha256 = "sha256-1Wy+hxB059UoZnQlncytVT3sQ07dYAhNRnW3/QVD4ZE="; }; propagatedBuildInputs = [ From ba7c2690421c5e1afe7c2bf788bc06eb3c369a0d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 16 Dec 2023 03:51:53 +0000 Subject: [PATCH 27/52] kora-icon-theme: 1.5.8 -> 1.5.9 --- pkgs/data/icons/kora-icon-theme/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/icons/kora-icon-theme/default.nix b/pkgs/data/icons/kora-icon-theme/default.nix index 280b89cf6395..87093b2f357e 100644 --- a/pkgs/data/icons/kora-icon-theme/default.nix +++ b/pkgs/data/icons/kora-icon-theme/default.nix @@ -10,13 +10,13 @@ stdenvNoCC.mkDerivation rec { pname = "kora-icon-theme"; - version = "1.5.8"; + version = "1.5.9"; src = fetchFromGitHub { owner = "bikass"; repo = "kora"; rev = "v${version}"; - sha256 = "sha256-ZPjtY6s3Sgl0aU2pAxagTMFIOcwDAZQRYtvOC0FBJaI="; + sha256 = "sha256-ZXAS22Oe6C34DR1BfGmCGr1qh9mu1PCY5IQWxrm1EfY="; }; nativeBuildInputs = [ From 835f40250be1f81624b4bdbca96445f4d0aa7543 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 16 Dec 2023 03:51:53 +0000 Subject: [PATCH 28/52] kodiPackages.urllib3: 1.26.16+matrix.1 -> 2.1.0 --- pkgs/applications/video/kodi/addons/urllib3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/kodi/addons/urllib3/default.nix b/pkgs/applications/video/kodi/addons/urllib3/default.nix index 26e52997b1ab..8d13052b950e 100644 --- a/pkgs/applications/video/kodi/addons/urllib3/default.nix +++ b/pkgs/applications/video/kodi/addons/urllib3/default.nix @@ -3,11 +3,11 @@ buildKodiAddon rec { pname = "urllib3"; namespace = "script.module.urllib3"; - version = "1.26.16+matrix.1"; + version = "2.1.0"; src = fetchzip { url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip"; - sha256 = "sha256-HI99Cle/SpwulbDCVoDNy/0EfHVt4q7+LR60YRMaSFY="; + sha256 = "sha256-UCvkeguxytPoP1gIIt8N79TVs98ATzsfrRSabtbgnGc="; }; passthru = { From 9783c60b64cb84ef163e3f0604511b6951d4b50b Mon Sep 17 00:00:00 2001 From: Little Starfire Date: Sat, 16 Dec 2023 15:19:08 +0800 Subject: [PATCH 29/52] maintainers: add ltstf1re --- maintainers/maintainer-list.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index d20aa7db61ad..808f450fdaff 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -10730,6 +10730,16 @@ githubId = 8555953; name = "Laure Tavard"; }; + ltstf1re = { + email = "ltstf1re@disroot.org"; + github = "lsf1re"; + githubId = 153414530; + matrix = "@ltstf1re:converser.eu"; + name = "Little Starfire"; + keys = [{ + fingerprint = "FE6C C3C9 2ACF 4367 2B56 5B22 8603 2ACC 051A 873D"; + }]; + }; lu15w1r7h = { email = "lwirth2000@gmail.com"; github = "LU15W1R7H"; From 11aaa1ebdb0551844b4f49c13cd0dcba8f62ba98 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 16 Dec 2023 10:05:57 +0100 Subject: [PATCH 30/52] python311Packages.bthome-ble: 3.2.0 -> 3.3.1 Diff: https://github.com/Bluetooth-Devices/bthome-ble/compare/refs/tags/v3.2.0...v3.3.1 Changelog: https://github.com/bluetooth-devices/bthome-ble/blob/v3.3.1/CHANGELOG.md --- pkgs/development/python-modules/bthome-ble/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bthome-ble/default.nix b/pkgs/development/python-modules/bthome-ble/default.nix index dddf9d5d9c1f..7370bf814c93 100644 --- a/pkgs/development/python-modules/bthome-ble/default.nix +++ b/pkgs/development/python-modules/bthome-ble/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "bthome-ble"; - version = "3.2.0"; + version = "3.3.1"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = "bthome-ble"; rev = "refs/tags/v${version}"; - hash = "sha256-UYW7yEAg4RJR1ERFDDS6s8OBr0XRTHTJLSuOF7FO6u4="; + hash = "sha256-dFnEgUmmB9P8bKownMp0NsTWPAeMmdKiaxII3O1gT6A="; }; nativeBuildInputs = [ From 7bee166192a41dc664833220212217814ea43c2f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 16 Dec 2023 10:07:46 +0100 Subject: [PATCH 31/52] python311Packages.aioairzone: 0.6.9 -> 0.7.2 Diff: https://github.com/Noltari/aioairzone/compare/refs/tags/0.6.9...0.7.2 Changelog: https://github.com/Noltari/aioairzone/releases/tag/0.7.2 --- pkgs/development/python-modules/aioairzone/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioairzone/default.nix b/pkgs/development/python-modules/aioairzone/default.nix index 39c12ac6e2c0..c760300d7977 100644 --- a/pkgs/development/python-modules/aioairzone/default.nix +++ b/pkgs/development/python-modules/aioairzone/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "aioairzone"; - version = "0.6.9"; + version = "0.7.2"; format = "pyproject"; disabled = pythonOlder "3.11"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "Noltari"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-0nbH0pnTYRuSOkzG5Yn/fJmRKtXBMd6ti6Z+AW72j3Q="; + hash = "sha256-ppzusDyGTh2HnDFjqXClyHzjK/TFKvGOWg5Nb2fDGnc="; }; nativeBuildInputs = [ From 68fe9d69a70dfd38c53b081d84bbd601d22b14fc Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 16 Dec 2023 10:08:27 +0100 Subject: [PATCH 32/52] python311Packages.opower: 0.0.40 -> 0.0.41 Diff: https://github.com/tronikos/opower/compare/refs/tags/v0.0.40...v0.0.41 Changelog: https://github.com/tronikos/opower/releases/tag/v0.0.41 --- pkgs/development/python-modules/opower/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/opower/default.nix b/pkgs/development/python-modules/opower/default.nix index df8bc234e2af..3c990c15fe82 100644 --- a/pkgs/development/python-modules/opower/default.nix +++ b/pkgs/development/python-modules/opower/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "opower"; - version = "0.0.40"; + version = "0.0.41"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "tronikos"; repo = "opower"; rev = "refs/tags/v${version}"; - hash = "sha256-0vk8LGqU3rOgjC8zXkijmIZG8inxwTw2IDneFfy5eQw="; + hash = "sha256-dqSMZ/4R4TbPEg/wRCTYKRbwj3mU+YUeYOsWQWIp5OM="; }; pythonRemoveDeps = [ From 578495a6f2c795a0c66e4cf846a46613fb3ad69c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 16 Dec 2023 10:09:17 +0100 Subject: [PATCH 33/52] python311Packages.pytrafikverket: 0.3.9.1 -> 0.3.9.2 Changelog: https://github.com/endor-force/pytrafikverket/releases/tag/0.3.9.2 --- pkgs/development/python-modules/pytrafikverket/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytrafikverket/default.nix b/pkgs/development/python-modules/pytrafikverket/default.nix index c1c195fd5013..9a60920dd7b8 100644 --- a/pkgs/development/python-modules/pytrafikverket/default.nix +++ b/pkgs/development/python-modules/pytrafikverket/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "pytrafikverket"; - version = "0.3.9.1"; + version = "0.3.9.2"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-F0BMpZVzSK0i+tdvN//KZQqgxFrfLf0SCNztKCs6BYQ="; + hash = "sha256-NxxuyLnzJ8T2jaQ761O943rpBbNwp/F4PygyQULkXzw="; }; nativeBuildInputs = [ From 8da07755dec8321670400aa424b040443e157d97 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Sat, 16 Dec 2023 10:09:59 +0100 Subject: [PATCH 34/52] nixos/winbox: add missing `environment.systemPackages` --- nixos/modules/programs/winbox.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/programs/winbox.nix b/nixos/modules/programs/winbox.nix index 6af299d52009..1337f57839b0 100644 --- a/nixos/modules/programs/winbox.nix +++ b/nixos/modules/programs/winbox.nix @@ -18,6 +18,7 @@ in }; config = lib.mkIf cfg.enable { + environment.systemPackages = [ cfg.package ]; networking.firewall.allowedUDPPorts = lib.optionals cfg.openFirewall [ 5678 ]; }; } From 837c08fd9bada186b88dae6ffff8e22f177a13d3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 16 Dec 2023 10:10:36 +0100 Subject: [PATCH 35/52] python311Packages.bleak-esphome: 0.2.0 -> 0.3.0 Diff: https://github.com/bluetooth-devices/bleak-esphome/compare/refs/tags/v0.2.0...v0.3.0 Changelog: https://github.com/bluetooth-devices/bleak-esphome/blob/0.3.0/CHANGELOG.md --- pkgs/development/python-modules/bleak-esphome/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bleak-esphome/default.nix b/pkgs/development/python-modules/bleak-esphome/default.nix index 8a6f46eaca9e..ea3babc47ea8 100644 --- a/pkgs/development/python-modules/bleak-esphome/default.nix +++ b/pkgs/development/python-modules/bleak-esphome/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "bleak-esphome"; - version = "0.2.0"; + version = "0.3.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "bluetooth-devices"; repo = "bleak-esphome"; rev = "refs/tags/v${version}"; - hash = "sha256-QtSkrX7xGaV/13FonQhYR4MpZxVwR8dAFCRvID0zSGo="; + hash = "sha256-XJxx9m8ZJtCmH9R1A4J+EFSTP4z9acDgRbaASKR/tZY="; }; postPatch = '' From 8ef3f7ae07f3617bbad66871604002736fe4f230 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 16 Dec 2023 10:24:12 +0100 Subject: [PATCH 36/52] python311Packages.pyunifiprotect: 4.22.0 -> 4.22.3 Diff: https://github.com/briis/pyunifiprotect/compare/refs/tags/v4.22.0...v4.22.3 Changelog: https://github.com/AngellusMortis/pyunifiprotect/releases/tag/v4.22.3 --- pkgs/development/python-modules/pyunifiprotect/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyunifiprotect/default.nix b/pkgs/development/python-modules/pyunifiprotect/default.nix index 5d13ea6ce704..afb99b74c6dc 100644 --- a/pkgs/development/python-modules/pyunifiprotect/default.nix +++ b/pkgs/development/python-modules/pyunifiprotect/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { pname = "pyunifiprotect"; - version = "4.22.0"; + version = "4.22.3"; pyproject = true; disabled = pythonOlder "3.9"; @@ -41,7 +41,7 @@ buildPythonPackage rec { owner = "briis"; repo = "pyunifiprotect"; rev = "refs/tags/v${version}"; - hash = "sha256-qzom1mLTfP683GCYlUav/MlOkYj+AiEe13b74ceW7gI="; + hash = "sha256-KpijjKy5poiWghupXq8rNCtzuPXsPgu+ePAowhzOSYI="; }; env.SETUPTOOLS_SCM_PRETEND_VERSION = version; From a3e0e3deea088626e6ef8f974487e8f75ace329c Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 14 Dec 2023 00:05:23 +0100 Subject: [PATCH 37/52] ruff: 0.1.7 -> 0.1.8 Diff: https://github.com/astral-sh/ruff/compare/refs/tags/v0.1.7...v0.1.8 Changelog: https://github.com/astral-sh/ruff/releases/tag/v0.1.8 --- pkgs/development/tools/ruff/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/ruff/default.nix b/pkgs/development/tools/ruff/default.nix index aa81e9592317..77a668e9526a 100644 --- a/pkgs/development/tools/ruff/default.nix +++ b/pkgs/development/tools/ruff/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "ruff"; - version = "0.1.7"; + version = "0.1.8"; src = fetchFromGitHub { owner = "astral-sh"; repo = "ruff"; rev = "refs/tags/v${version}"; - hash = "sha256-Al256/8A/efLrf97xCwEocwgs3ngPnEAmkfcLWdlkTw="; + hash = "sha256-zf2280aSmGstcgxoU/IWtdtdWExvdKLBNh4Cn5tC1vU="; }; - cargoHash = "sha256-4iC9pRmhxC29zIrRxQfNG3KCWtHqw8ml6MJoT/XZjSI="; + cargoHash = "sha256-UC47RXgvjHInJuHVYmnAAb7SACRqt4d59k9/Cl9+x4Q="; nativeBuildInputs = [ installShellFiles From e05e5ac9a46ff932aeb2d554a876b1f47543a2d8 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 14 Dec 2023 00:05:53 +0100 Subject: [PATCH 38/52] ruff-lsp: 0.0.45 -> 0.0.47 Diff: https://github.com/astral-sh/ruff-lsp/compare/refs/tags/v0.0.45...v0.0.47 Changelog: https://github.com/astral-sh/ruff-lsp/releases/tag/v0.0.47 --- pkgs/development/tools/language-servers/ruff-lsp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/language-servers/ruff-lsp/default.nix b/pkgs/development/tools/language-servers/ruff-lsp/default.nix index 5b40af17c330..57e7e8fde1ab 100644 --- a/pkgs/development/tools/language-servers/ruff-lsp/default.nix +++ b/pkgs/development/tools/language-servers/ruff-lsp/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "ruff-lsp"; - version = "0.0.45"; + version = "0.0.47"; pyproject = true; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "astral-sh"; repo = "ruff-lsp"; rev = "refs/tags/v${version}"; - hash = "sha256-jTLkex2K/IQTKZp2duM26/EaYhG5E2bGs/QKt5PA7lc="; + hash = "sha256-ZbSqqjvYzee79nSeyfU4FPoOzsQwOjPHjltS9QrWcqw="; }; postPatch = '' From ef5a64ac381dd2a05b6bba4ed4aa3cb3ba3e6bba Mon Sep 17 00:00:00 2001 From: Little Starfire Date: Sat, 16 Dec 2023 18:03:20 +0800 Subject: [PATCH 39/52] crawley: init at 1.7.1 --- pkgs/by-name/cr/crawley/package.nix | 37 +++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 pkgs/by-name/cr/crawley/package.nix diff --git a/pkgs/by-name/cr/crawley/package.nix b/pkgs/by-name/cr/crawley/package.nix new file mode 100644 index 000000000000..3e0f4bc205f0 --- /dev/null +++ b/pkgs/by-name/cr/crawley/package.nix @@ -0,0 +1,37 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, installShellFiles +}: + +buildGoModule rec { + pname = "crawley"; + version = "1.7.1"; + + src = fetchFromGitHub { + owner = "s0rg"; + repo = "crawley"; + rev = "v${version}"; + hash = "sha256-IRhi6z2TQZOOw8EZkJ3/VEOBzAlg0DQjq9wSt+/c3ck="; + }; + + nativeBuildInputs = [ installShellFiles ]; + + vendorHash = "sha256-0BUbALCBR9CGwkqz1cUnzF3xjQkkzfdS7JDDTXkGmN4="; + + ldflags = [ "-w" "-s" ]; + + postInstall = '' + installShellCompletion --cmd crawley \ + --bash <(echo "complete -C $out/bin/crawley crawley") \ + --zsh <(echo "complete -o nospace -C $out/bin/crawley crawley") + ''; + + meta = with lib; { + description = "The unix-way web crawler"; + homepage = "https://github.com/s0rg/crawley"; + license = licenses.mit; + maintainers = with maintainers; [ ltstf1re ]; + mainProgram = "crawley"; + }; +} From 74b3ce843bf6634be9e22f35f88c6e228d15b0fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stanis=C5=82aw=20Pitucha?= Date: Sat, 16 Dec 2023 21:08:52 +1100 Subject: [PATCH 40/52] nushellPlugins: improve clang build The variable is needed on all clang builds. Macos error was incidental since it triggers clang by default. --- pkgs/shells/nushell/plugins/formats.nix | 2 +- pkgs/shells/nushell/plugins/gstat.nix | 2 +- pkgs/shells/nushell/plugins/query.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/nushell/plugins/formats.nix b/pkgs/shells/nushell/plugins/formats.nix index fbc2c0711614..571077a8d23b 100644 --- a/pkgs/shells/nushell/plugins/formats.nix +++ b/pkgs/shells/nushell/plugins/formats.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { inherit (nushell) version src; cargoHash = "sha256-eGRaYbYB+zHT8rXm6aCrnPVgyDA8ltsg0GOYgghmov0="; - env = lib.optionalAttrs stdenv.isDarwin { + env = lib.optionalAttrs stdenv.cc.isClang { LIBCLANG_PATH = "${libclang.lib}/lib"; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/shells/nushell/plugins/gstat.nix b/pkgs/shells/nushell/plugins/gstat.nix index 6563a9c295ff..378a1a273ca8 100644 --- a/pkgs/shells/nushell/plugins/gstat.nix +++ b/pkgs/shells/nushell/plugins/gstat.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { inherit (nushell) version src; cargoHash = "sha256-Ar5rFPHf+ugZuugVKVRFACYhh3F0JvQtfp6KibPIByw="; - env = lib.optionalAttrs stdenv.isDarwin { + env = lib.optionalAttrs stdenv.cc.isClang { LIBCLANG_PATH = "${libclang.lib}/lib"; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/shells/nushell/plugins/query.nix b/pkgs/shells/nushell/plugins/query.nix index 274848f8e8fc..f5f0bbd0acca 100644 --- a/pkgs/shells/nushell/plugins/query.nix +++ b/pkgs/shells/nushell/plugins/query.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage { inherit (nushell) version src; cargoHash = "sha256-NVdXbpmGBAcv47jbel2cccoe0m2FInSSOnMWofqtpiM="; - env = lib.optionalAttrs stdenv.isDarwin { + env = lib.optionalAttrs stdenv.cc.isClang { LIBCLANG_PATH = "${libclang.lib}/lib"; }; buildInputs = lib.optionals stdenv.isDarwin [ IOKit CoreFoundation ]; From 683a9b31c50c29809b861fc2e6cebfa94af43c8c Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Sat, 16 Dec 2023 11:12:36 +0100 Subject: [PATCH 41/52] php.extensions.xdebug: 3.3.0 -> 3.3.1 --- pkgs/development/php-packages/xdebug/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/php-packages/xdebug/default.nix b/pkgs/development/php-packages/xdebug/default.nix index f5e8f0f7af7a..9ff9b771401c 100644 --- a/pkgs/development/php-packages/xdebug/default.nix +++ b/pkgs/development/php-packages/xdebug/default.nix @@ -1,7 +1,7 @@ { buildPecl, lib, fetchFromGitHub }: let - version = "3.3.0"; + version = "3.3.1"; in buildPecl { inherit version; @@ -11,7 +11,7 @@ in buildPecl { owner = "xdebug"; repo = "xdebug"; rev = version; - hash = "sha256-i14po+0i25gRR87H6kUdyXF4rXZM70CqXi2EdFBn808="; + hash = "sha256-Zt1BIqNKsTHtIXy0Dar52sZxLi5k12LQAbxOLKQPMN8="; }; doCheck = true; From 89f3799077ebf7216849b59b30a8b6eb6f51b3ff Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 14 Dec 2023 07:50:23 +0100 Subject: [PATCH 42/52] python311Packages.diffusers: remove ruff dependency --- pkgs/development/python-modules/diffusers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/diffusers/default.nix b/pkgs/development/python-modules/diffusers/default.nix index 3485f9e3351d..5bcda2b40d7d 100644 --- a/pkgs/development/python-modules/diffusers/default.nix +++ b/pkgs/development/python-modules/diffusers/default.nix @@ -30,7 +30,6 @@ , pytest-xdist , pytestCheckHook , requests-mock -, ruff , scipy , sentencepiece , torchsde @@ -99,7 +98,6 @@ buildPythonPackage rec { pytest-xdist pytestCheckHook requests-mock - ruff scipy sentencepiece torchsde @@ -141,6 +139,8 @@ buildPythonPackage rec { "test_deprecate_stacklevel" # fails due to precision of floating point numbers "test_model_cpu_offload_forward_pass" + # tries to run ruff which we have intentionally removed from nativeCheckInputs + "test_is_copy_consistent" ]; meta = with lib; { From 14d07ef028399847708a573acc775adf036a1402 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 16 Dec 2023 11:58:54 +0000 Subject: [PATCH 43/52] license-scanner: 0.10.0 -> 0.11.0 --- pkgs/development/tools/license-scanner/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/license-scanner/default.nix b/pkgs/development/tools/license-scanner/default.nix index b859f60782ca..c1ea963f44b1 100644 --- a/pkgs/development/tools/license-scanner/default.nix +++ b/pkgs/development/tools/license-scanner/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "license-scanner"; - version = "0.10.0"; + version = "0.11.0"; src = fetchFromGitHub { owner = "CycloneDX"; repo = "license-scanner"; rev = "refs/tags/v${version}"; - hash = "sha256-X7omSecbb85dtxPJtgdjLLgJQRJ7dh12DGwzIG0tYcE="; + hash = "sha256-2KUaVDAZxMwZ3AAMEUmRiuvenPSFliUp6rZCZrVTDps="; }; vendorHash = "sha256-7xa2tdCDCXkOZCLL8YPtO7i1VqD61Mow7un0690I8mM="; From 3bed2bfeb5b0b024b2636c7a63f8105b9288f112 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 16 Dec 2023 04:47:03 +0000 Subject: [PATCH 44/52] fcft: 3.1.6 -> 3.1.7 --- pkgs/development/libraries/fcft/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/fcft/default.nix b/pkgs/development/libraries/fcft/default.nix index 4f47c3df8f6d..37084705d6ee 100644 --- a/pkgs/development/libraries/fcft/default.nix +++ b/pkgs/development/libraries/fcft/default.nix @@ -17,14 +17,14 @@ in stdenv.mkDerivation rec { pname = "fcft"; - version = "3.1.6"; + version = "3.1.7"; src = fetchFromGitea { domain = "codeberg.org"; owner = "dnkl"; repo = "fcft"; rev = version; - sha256 = "0cfyxf3xcj552bhd5awv5j0lb8xk3xhz87iixp3wnbvsgvl6dpwq"; + sha256 = "sha256-QS39vbf2JowovTBtT4DKDRbLXieOrzbO4cQObOdE788="; }; depsBuildBuild = [ pkg-config ]; From ceb8e4efd95627c0a86f106ba2afcd207ad5c6b3 Mon Sep 17 00:00:00 2001 From: Danila Danko <48378098+deemp@users.noreply.github.com> Date: Sat, 16 Dec 2023 15:32:15 +0300 Subject: [PATCH 45/52] doc: Update stdenv.chapter.md (#274706) Extended genericBuild description --- doc/stdenv/stdenv.chapter.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/stdenv/stdenv.chapter.md b/doc/stdenv/stdenv.chapter.md index 03bb8a9ff790..5a5a867ef2dc 100644 --- a/doc/stdenv/stdenv.chapter.md +++ b/doc/stdenv/stdenv.chapter.md @@ -591,7 +591,7 @@ See also the section about [`passthru.tests`](#var-meta-tests). `stdenv.mkDerivation` sets the Nix [derivation](https://nixos.org/manual/nix/stable/expressions/derivations.html#derivations)'s builder to a script that loads the stdenv `setup.sh` bash library and calls `genericBuild`. Most packaging functions rely on this default builder. -This generic command invokes a number of *phases*. Package builds are split into phases to make it easier to override specific parts of the build (e.g., unpacking the sources or installing the binaries). +This generic command either invokes a script at *buildCommandPath*, or a *buildCommand*, or a number of *phases*. Package builds are split into phases to make it easier to override specific parts of the build (e.g., unpacking the sources or installing the binaries). Each phase can be overridden in its entirety either by setting the environment variable `namePhase` to a string containing some shell commands to be executed, or by redefining the shell function `namePhase`. The former is convenient to override a phase from the derivation, while the latter is convenient from a build script. However, typically one only wants to *add* some commands to a phase, e.g. by defining `postInstall` or `preFixup`, as skipping some of the default actions may have unexpected consequences. The default script for each phase is defined in the file `pkgs/stdenv/generic/setup.sh`. From a5c588846c34505074ed84103d15e0a87b65d55e Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Sat, 16 Dec 2023 07:45:45 -0500 Subject: [PATCH 46/52] conmon: backport fix for regression causing NixOS test failure Should fix `nix-build -A podman.passthru.tests`, see bug report https://github.com/NixOS/nixpkgs/issues/274655 See also upstream: https://github.com/containers/conmon/pull/476 https://github.com/containers/conmon/issues/475 https://github.com/containers/conmon/issues/477 --- pkgs/applications/virtualization/conmon/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/applications/virtualization/conmon/default.nix b/pkgs/applications/virtualization/conmon/default.nix index c0d8bf884a20..ea729afb76f0 100644 --- a/pkgs/applications/virtualization/conmon/default.nix +++ b/pkgs/applications/virtualization/conmon/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch2 , pkg-config , glib , glibc @@ -20,6 +21,14 @@ stdenv.mkDerivation rec { hash = "sha256-GDbCjR3UWDo/AEKO3TZq29fxO9EUfymxWtvLBikJJ04="; }; + patches = [ + (fetchpatch2 { + # Fix regression with several upstream bug reports; also caused podman NixOS tests to fail + url = "https://github.com/containers/conmon/commit/53531ac78d35aa9e18a20cfff9f30b910e25ecaa.patch"; + hash = "sha256-rbLoXDmRK8P94rrhx2r22/EHZVpCsGTWItd/GW1VqZA="; + }) + ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib libseccomp systemd ] ++ lib.optionals (!stdenv.hostPlatform.isMusl) [ glibc glibc.static ]; From 4d5d5999142ed251c051b05ad83b6724fe92d5f2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 16 Dec 2023 14:57:53 +0000 Subject: [PATCH 47/52] mame: 0.260 -> 0.261 --- pkgs/applications/emulators/mame/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/emulators/mame/default.nix b/pkgs/applications/emulators/mame/default.nix index 0688947f6ba1..6a17905ccb29 100644 --- a/pkgs/applications/emulators/mame/default.nix +++ b/pkgs/applications/emulators/mame/default.nix @@ -38,14 +38,14 @@ let in stdenv.mkDerivation rec { pname = "mame"; - version = "0.260"; + version = "0.261"; srcVersion = builtins.replaceStrings [ "." ] [ "" ] version; src = fetchFromGitHub { owner = "mamedev"; repo = "mame"; rev = "mame${srcVersion}"; - hash = "sha256-spWnaf7xXK2xzgdUagsgN5doVrpJk7EA6fzYd9FlFm0="; + hash = "sha256-Tbsu4dYOBGwsPW94W0xN2+t4vqb1cWI7J1C2l6WU3qI="; }; outputs = [ "out" "tools" ]; From 043d2b5dea0e8db1f362917dcd4adb0deb896435 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 11 Dec 2023 23:20:43 +0100 Subject: [PATCH 48/52] python311Packages.pytensor: 2.18.2 -> 2.18.4 Changelog: https://github.com/pymc-devs/pytensor/releases/tag/rel-2.18.4 --- pkgs/development/python-modules/pytensor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytensor/default.nix b/pkgs/development/python-modules/pytensor/default.nix index ce04f0f9bea2..b256977a531d 100644 --- a/pkgs/development/python-modules/pytensor/default.nix +++ b/pkgs/development/python-modules/pytensor/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "pytensor"; - version = "2.18.2"; + version = "2.18.4"; pyproject = true; disabled = pythonOlder "3.9"; @@ -33,7 +33,7 @@ buildPythonPackage rec { owner = "pymc-devs"; repo = "pytensor"; rev = "refs/tags/rel-${version}"; - hash = "sha256-uB5VT4wP08pOkHlxdPJTXK4j5ubmf+hk5oHYPM6diHM="; + hash = "sha256-j7SNXFiQUofP5NtggSOwLxXkg267yneqoWH2uoDZogs="; }; postPatch = '' From ba9143c5e7da71ae733eb2b8c1af93d2dbea93d2 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 13 Dec 2023 15:10:51 +0100 Subject: [PATCH 49/52] python311Packages.pymc: 5.10.1 -> 5.10.2 Changelog: https://github.com/pymc-devs/pymc/releases/tag/v5.10.2 --- pkgs/development/python-modules/pymc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pymc/default.nix b/pkgs/development/python-modules/pymc/default.nix index f06c29622613..84e36567e034 100644 --- a/pkgs/development/python-modules/pymc/default.nix +++ b/pkgs/development/python-modules/pymc/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pymc"; - version = "5.10.1"; + version = "5.10.2"; pyproject = true; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "pymc-devs"; repo = "pymc"; rev = "refs/tags/v${version}"; - hash = "sha256-+hRj39teuxlHOEQ40E2ZteU+tN73j+cHWbxzWsl1+mE="; + hash = "sha256-Yrhd9pTHxdpGkea6BO/dM1O3nnGIV2CRsg40dpotf0U="; }; propagatedBuildInputs = [ From 2ebe5f00e6420db46edc89809a0cb4d3222eb9e4 Mon Sep 17 00:00:00 2001 From: Zhong Jianxin Date: Sat, 16 Dec 2023 23:24:26 +0800 Subject: [PATCH 50/52] home-assistant-custom-lovelace-modules.zigbee2mqtt-networkmap: unstable-2023-12-06 -> unstable-2023-12-16 --- .../zigbee2mqtt-networkmap/default.nix | 8 ++++---- .../zigbee2mqtt-networkmap/package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/zigbee2mqtt-networkmap/default.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/zigbee2mqtt-networkmap/default.nix index ef412801bfe9..f8e75ede0156 100644 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/zigbee2mqtt-networkmap/default.nix +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/zigbee2mqtt-networkmap/default.nix @@ -6,20 +6,20 @@ mkYarnPackage rec { pname = "zigbee2mqtt-networkmap"; - version = "unstable-2023-12-06"; + version = "unstable-2023-12-16"; src = fetchFromGitHub { owner = "azuwis"; repo = "zigbee2mqtt-networkmap"; - rev = "d5f1002118ba5881c6bdc27cb0f67642575c414f"; - hash = "sha256-ITqzMjom2XN7+ICDH0Z5YJWY5GNUXzaqSuEzXekhw9I="; + rev = "7851357d78ebc0d1cc3cb5c661267a1e8b4c09e3"; + hash = "sha256-x7RVy0stWT6+8f0/0VORVBgGpBbsbyJBC38xIxXhzos="; }; packageJSON = ./package.json; offlineCache = fetchYarnDeps { yarnLock = "${src}/yarn.lock"; - hash = "sha256-uPhD6UQ1KI7y6bqqQF7InT9eKU9VWGf2D60Lo5Mwcf8="; + hash = "sha256-s+vnyUeJKkkA5G0AmsfIG0Zh4bYdDc2B5MSNvdwhjgs="; }; configurePhase = '' diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/zigbee2mqtt-networkmap/package.json b/pkgs/servers/home-assistant/custom-lovelace-modules/zigbee2mqtt-networkmap/package.json index b989bfde28e4..3ab2dbb933ae 100644 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/zigbee2mqtt-networkmap/package.json +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/zigbee2mqtt-networkmap/package.json @@ -8,7 +8,7 @@ "lint": "vue-cli-service lint" }, "dependencies": { - "vue": "^3.3.4" + "vue": "^2.7.15" }, "devDependencies": { "@material/mwc-button": "^0.27.0", From 8fe6141ed958ab609604975d8220b5527e9e56dc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 16 Dec 2023 16:04:10 +0000 Subject: [PATCH 51/52] matrix-synapse-tools.synadm: 0.44 -> 0.45 --- pkgs/servers/matrix-synapse/tools/synadm.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/matrix-synapse/tools/synadm.nix b/pkgs/servers/matrix-synapse/tools/synadm.nix index 6a297acff610..e69319477493 100644 --- a/pkgs/servers/matrix-synapse/tools/synadm.nix +++ b/pkgs/servers/matrix-synapse/tools/synadm.nix @@ -6,12 +6,12 @@ python3.pkgs.buildPythonApplication rec { pname = "synadm"; - version = "0.44"; + version = "0.45"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-BNmdyEITSZJb+wwyLU+zZi70kmfuYOqVDhKi8xFCf2E="; + hash = "sha256-KstWVSU0IE1ncfIkIH1QsaQc/Yfs2lF+6+5x9zw9cA8="; }; propagatedBuildInputs = with python3.pkgs; [ From e5d438eda0248b062547cd45a9d34ea8fcfa8d23 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron <886074+teto@users.noreply.github.com> Date: Sat, 16 Dec 2023 18:46:34 +0100 Subject: [PATCH 52/52] luaPlugins.nlua-nvim: deprecate in favor of neodev.nvim (#274757) * luaPlugins.nlua-nvim: deprecate in favor of neodev.nvim Co-authored-by: Marc Jakobi --------- Co-authored-by: Marc Jakobi --- pkgs/applications/editors/vim/plugins/generated.nix | 12 ------------ .../editors/vim/plugins/vim-plugin-names | 1 - pkgs/development/lua-modules/aliases.nix | 1 + 3 files changed, 1 insertion(+), 13 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index d416b48f8930..40f2e163d0d5 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -6599,18 +6599,6 @@ final: prev: meta.homepage = "https://github.com/tamago324/nlsp-settings.nvim/"; }; - nlua-nvim = buildVimPlugin { - pname = "nlua.nvim"; - version = "2022-12-20"; - src = fetchFromGitHub { - owner = "tjdevries"; - repo = "nlua.nvim"; - rev = "01aa428ff00605d52d0c0ece560f6a6d7971726b"; - sha256 = "1v80qmhhqc1frpvnz42wa84qaz6xkasyrz59aisifp1vqcn01lgk"; - }; - meta.homepage = "https://github.com/tjdevries/nlua.nvim/"; - }; - nnn-vim = buildVimPlugin { pname = "nnn.vim"; version = "2023-05-23"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 13fe9fdbc27b..8f46539cbbe8 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -554,7 +554,6 @@ https://github.com/EdenEast/nightfox.nvim/,, https://github.com/zah/nim.vim/,, https://github.com/figsoda/nix-develop.nvim/,HEAD, https://github.com/tamago324/nlsp-settings.nvim/,main, -https://github.com/tjdevries/nlua.nvim/,, https://github.com/mcchrish/nnn.vim/,, https://github.com/shortcuts/no-neck-pain.nvim/,HEAD, https://github.com/folke/noice.nvim/,HEAD, diff --git a/pkgs/development/lua-modules/aliases.nix b/pkgs/development/lua-modules/aliases.nix index 8f4ed9799c2c..0b31689baf5f 100644 --- a/pkgs/development/lua-modules/aliases.nix +++ b/pkgs/development/lua-modules/aliases.nix @@ -41,4 +41,5 @@ in mapAliases { lpty = throw "lpy was removed because broken and unmaintained "; # added 2023-10-14 cyrussasl = throw "cyrussasl was removed because broken and unmaintained "; # added 2023-10-18 + nlua-nvim = throw "nlua-nvim was removed, use neodev-nvim instead"; # added 2023-12-16 }