From 516682d47fa439dc87c68b05a36d5b629f208f08 Mon Sep 17 00:00:00 2001 From: luftmensch-luftmensch Date: Sat, 19 Oct 2024 18:01:04 +0200 Subject: [PATCH 01/35] glab: fix formatting --- pkgs/by-name/gl/glab/package.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/gl/glab/package.nix b/pkgs/by-name/gl/glab/package.nix index c0a321858f0e..febf5a527a7b 100644 --- a/pkgs/by-name/gl/glab/package.nix +++ b/pkgs/by-name/gl/glab/package.nix @@ -1,4 +1,10 @@ -{ lib, buildGo123Module, fetchFromGitLab, installShellFiles, stdenv }: +{ + lib, + buildGo123Module, + fetchFromGitLab, + installShellFiles, + stdenv, +}: buildGo123Module rec { pname = "glab"; From 6fb2d94d980916b734353537d71a70e51d113429 Mon Sep 17 00:00:00 2001 From: luftmensch-luftmensch Date: Sat, 19 Oct 2024 18:06:23 +0200 Subject: [PATCH 02/35] glab: 1.47.0 -> 1.48.0 --- pkgs/by-name/gl/glab/package.nix | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/gl/glab/package.nix b/pkgs/by-name/gl/glab/package.nix index febf5a527a7b..602d6f1ea9fc 100644 --- a/pkgs/by-name/gl/glab/package.nix +++ b/pkgs/by-name/gl/glab/package.nix @@ -8,16 +8,16 @@ buildGo123Module rec { pname = "glab"; - version = "1.47.0"; + version = "1.48.0"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "cli"; rev = "v${version}"; - hash = "sha256-mAM11nQ6YJJWNFOR9xQbgma7Plvo4MdcW2Syniw7o60="; + hash = "sha256-cddXgjJR8SD/mggDzbyxp/hdffE5ZqmT9oEPaEd8ZCo="; }; - vendorHash = "sha256-uwSVdebZtIpSol553gJC0ItkEqa6qXXOAVFvzjsHSSI="; + vendorHash = "sha256-quQqQRXMByUgXlnPpR2mCPhxw5AbFdHN5sBsawuHc18="; ldflags = [ "-s" @@ -43,12 +43,15 @@ buildGo123Module rec { --zsh <($out/bin/glab completion -s zsh) ''; - meta = with lib; { + meta = { description = "GitLab CLI tool bringing GitLab to your command line"; - license = licenses.mit; + license = lib.licenses.mit; homepage = "https://gitlab.com/gitlab-org/cli"; changelog = "https://gitlab.com/gitlab-org/cli/-/releases/v${version}"; - maintainers = with maintainers; [ freezeboy ]; + maintainers = with lib.maintainers; [ + freezeboy + luftmensch-luftmensch + ]; mainProgram = "glab"; }; } From e4eab5f5e60a8dd3ad02d43794b7db33904b75b9 Mon Sep 17 00:00:00 2001 From: Matteo Pacini Date: Wed, 30 Oct 2024 12:33:29 +0000 Subject: [PATCH 03/35] duckstation-bin: 0.1-7294 -> 0.1-7371 --- pkgs/by-name/du/duckstation-bin/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/du/duckstation-bin/package.nix b/pkgs/by-name/du/duckstation-bin/package.nix index 2deddb86cbe0..8349b98ef84f 100644 --- a/pkgs/by-name/du/duckstation-bin/package.nix +++ b/pkgs/by-name/du/duckstation-bin/package.nix @@ -7,11 +7,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "duckstation-bin"; - version = "0.1-7294"; + version = "0.1-7371"; src = fetchurl { url = "https://github.com/stenzek/duckstation/releases/download/v${finalAttrs.version}/duckstation-mac-release.zip"; - hash = "sha256-33aipZjYJOquQBbe8Ve9KRfLGW29v9xoztUsaY8LAjw="; + hash = "sha256-ukORbTG0lZIsUInkEnyPB9+PwFxxK5hbgj9D6tjOEAY="; }; nativeBuildInputs = [ unzip ]; From e7998d1f1f6bb91386e6fa95cac0d13304b48e6e Mon Sep 17 00:00:00 2001 From: Phillip Cloud <417981+cpcloud@users.noreply.github.com> Date: Fri, 1 Nov 2024 08:34:52 -0400 Subject: [PATCH 04/35] python3.pkgs.jupysql: disable broken tests due to duckdb>=1.1.0 --- .../python-modules/jupysql/default.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/pkgs/development/python-modules/jupysql/default.nix b/pkgs/development/python-modules/jupysql/default.nix index 350c2e43c8f2..01fa1c0f3163 100644 --- a/pkgs/development/python-modules/jupysql/default.nix +++ b/pkgs/development/python-modules/jupysql/default.nix @@ -84,6 +84,21 @@ buildPythonPackage rec { disabledTests = [ # AttributeError: 'DataFrame' object has no attribute 'frame_equal' "test_resultset_polars_dataframe" + # all of these are broken with later versions of duckdb; see + # https://github.com/ploomber/jupysql/issues/1030 + "test_resultset_getitem" + "test_resultset_dict" + "test_resultset_len" + "test_resultset_dicts" + "test_resultset_dataframe" + "test_resultset_csv" + "test_resultset_str" + "test_resultset_repr_html_when_feedback_is_2" + "test_resultset_repr_html_with_reduced_feedback" + "test_invalid_operation_error" + "test_resultset_config_autolimit_dict" + # fails due to strict warnings + "test_calling_legacy_plotting_functions_displays_warning" ]; disabledTestPaths = [ From 5e5192e6c12a630e592e38b2a119933463b8b8cb Mon Sep 17 00:00:00 2001 From: Gliczy <129636582+Gliczy@users.noreply.github.com> Date: Mon, 4 Nov 2024 18:19:24 +0100 Subject: [PATCH 05/35] taisei: move to pkgs/by-name --- pkgs/{games => by-name/ta}/taisei/0001-lto-fix.patch | 0 .../{games/taisei/default.nix => by-name/ta/taisei/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 2 deletions(-) rename pkgs/{games => by-name/ta}/taisei/0001-lto-fix.patch (100%) rename pkgs/{games/taisei/default.nix => by-name/ta/taisei/package.nix} (100%) diff --git a/pkgs/games/taisei/0001-lto-fix.patch b/pkgs/by-name/ta/taisei/0001-lto-fix.patch similarity index 100% rename from pkgs/games/taisei/0001-lto-fix.patch rename to pkgs/by-name/ta/taisei/0001-lto-fix.patch diff --git a/pkgs/games/taisei/default.nix b/pkgs/by-name/ta/taisei/package.nix similarity index 100% rename from pkgs/games/taisei/default.nix rename to pkgs/by-name/ta/taisei/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 062a4d288373..2a8a82cba2f3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -34980,8 +34980,6 @@ with pkgs; t4kcommon = callPackage ../games/t4kcommon { }; - taisei = callPackage ../games/taisei { }; - tcl2048 = callPackage ../games/tcl2048 { }; the-powder-toy = callPackage ../by-name/th/the-powder-toy/package.nix { From daf3bcfbd363375a492442d0e57c1e8318594302 Mon Sep 17 00:00:00 2001 From: Gliczy <129636582+Gliczy@users.noreply.github.com> Date: Mon, 4 Nov 2024 18:21:06 +0100 Subject: [PATCH 06/35] taisei: format with nixfmt --- pkgs/by-name/ta/taisei/package.nix | 48 +++++++++++++++++++++++------- 1 file changed, 38 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/ta/taisei/package.nix b/pkgs/by-name/ta/taisei/package.nix index ee5712f7b7f6..fc3b99db6e0a 100644 --- a/pkgs/by-name/ta/taisei/package.nix +++ b/pkgs/by-name/ta/taisei/package.nix @@ -1,9 +1,23 @@ -{ lib, stdenv, fetchurl -# Build depends -, docutils, meson, ninja, pkg-config, python3 -# Runtime depends -, glfw, SDL2, SDL2_mixer -, cglm, freetype, libpng, libwebp, libzip, zlib +{ + lib, + stdenv, + fetchurl, + # Build depends + docutils, + meson, + ninja, + pkg-config, + python3, + # Runtime depends + glfw, + SDL2, + SDL2_mixer, + cglm, + freetype, + libpng, + libwebp, + libzip, + zlib, }: stdenv.mkDerivation rec { @@ -16,12 +30,23 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - docutils meson ninja pkg-config python3 + docutils + meson + ninja + pkg-config + python3 ]; buildInputs = [ - glfw SDL2 SDL2_mixer - cglm freetype libpng libwebp libzip zlib + glfw + SDL2 + SDL2_mixer + cglm + freetype + libpng + libwebp + libzip + zlib ]; patches = [ ./0001-lto-fix.patch ]; @@ -40,7 +65,10 @@ stdenv.mkDerivation rec { folklore. ''; homepage = "https://taisei-project.org/"; - license = [ licenses.mit licenses.cc-by-40 ]; + license = [ + licenses.mit + licenses.cc-by-40 + ]; maintainers = [ maintainers.lambda-11235 ]; platforms = platforms.all; }; From 1ffa3b644df17a5ec4fa18bfeac36022c7e2e970 Mon Sep 17 00:00:00 2001 From: Gliczy <129636582+Gliczy@users.noreply.github.com> Date: Mon, 4 Nov 2024 18:40:26 +0100 Subject: [PATCH 07/35] taisei: refactor --- pkgs/by-name/ta/taisei/0001-lto-fix.patch | 13 ------------- pkgs/by-name/ta/taisei/package.nix | 14 +++++++------- 2 files changed, 7 insertions(+), 20 deletions(-) delete mode 100644 pkgs/by-name/ta/taisei/0001-lto-fix.patch diff --git a/pkgs/by-name/ta/taisei/0001-lto-fix.patch b/pkgs/by-name/ta/taisei/0001-lto-fix.patch deleted file mode 100644 index eed7b845f53c..000000000000 --- a/pkgs/by-name/ta/taisei/0001-lto-fix.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/meson.build b/meson.build -index 80aa58d..c7e9d0a 100644 ---- a/meson.build -+++ b/meson.build -@@ -17,7 +17,7 @@ project('taisei', 'c', - # You may want to change these for a debug build dir - 'buildtype=release', - 'strip=true', -- 'b_lto=true', -+ 'b_lto=false', - 'b_ndebug=if-release', - ] - ) diff --git a/pkgs/by-name/ta/taisei/package.nix b/pkgs/by-name/ta/taisei/package.nix index fc3b99db6e0a..0a48f6e4db8f 100644 --- a/pkgs/by-name/ta/taisei/package.nix +++ b/pkgs/by-name/ta/taisei/package.nix @@ -49,13 +49,13 @@ stdenv.mkDerivation rec { zlib ]; - patches = [ ./0001-lto-fix.patch ]; + mesonFlags = [ "-Db_lto=false" ]; preConfigure = '' patchShebangs . ''; - meta = with lib; { + meta = { broken = stdenv.hostPlatform.isDarwin; description = "Free and open-source Touhou Project clone and fangame"; mainProgram = "taisei"; @@ -65,11 +65,11 @@ stdenv.mkDerivation rec { folklore. ''; homepage = "https://taisei-project.org/"; - license = [ - licenses.mit - licenses.cc-by-40 + license = with lib.licenses; [ + mit + cc-by-40 ]; - maintainers = [ maintainers.lambda-11235 ]; - platforms = platforms.all; + maintainers = with lib.maintainers; [ lambda-11235 ]; + platforms = lib.platforms.all; }; } From fb3821722e9cb3311cdcff40e6d89595c7e9c90b Mon Sep 17 00:00:00 2001 From: Gliczy <129636582+Gliczy@users.noreply.github.com> Date: Mon, 4 Nov 2024 18:41:01 +0100 Subject: [PATCH 08/35] taisei: add Gliczy as maintainer --- pkgs/by-name/ta/taisei/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ta/taisei/package.nix b/pkgs/by-name/ta/taisei/package.nix index 0a48f6e4db8f..e49ddb851ed7 100644 --- a/pkgs/by-name/ta/taisei/package.nix +++ b/pkgs/by-name/ta/taisei/package.nix @@ -69,7 +69,10 @@ stdenv.mkDerivation rec { mit cc-by-40 ]; - maintainers = with lib.maintainers; [ lambda-11235 ]; + maintainers = with lib.maintainers; [ + lambda-11235 + Gliczy + ]; platforms = lib.platforms.all; }; } From 23fd859f452bc1e6050b88084b5203d5ab33c96f Mon Sep 17 00:00:00 2001 From: Gliczy <129636582+Gliczy@users.noreply.github.com> Date: Mon, 4 Nov 2024 20:30:13 +0100 Subject: [PATCH 09/35] taisei: 1.3.2 -> 1.4.2 --- pkgs/by-name/ta/taisei/package.nix | 50 +++++++++++++++++++++++------- 1 file changed, 38 insertions(+), 12 deletions(-) diff --git a/pkgs/by-name/ta/taisei/package.nix b/pkgs/by-name/ta/taisei/package.nix index e49ddb851ed7..452fbf04d0db 100644 --- a/pkgs/by-name/ta/taisei/package.nix +++ b/pkgs/by-name/ta/taisei/package.nix @@ -1,13 +1,18 @@ { lib, stdenv, - fetchurl, + fetchFromGitHub, # Build depends docutils, meson, ninja, pkg-config, - python3, + python3Packages, + opusfile, + openssl, + gamemode, + shaderc, + ensureNewerSourcesForZipFilesHook, # Runtime depends glfw, SDL2, @@ -18,15 +23,22 @@ libwebp, libzip, zlib, + zstd, + spirv-cross, + + gamemodeSupport ? stdenv.hostPlatform.isLinux, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "taisei"; - version = "1.3.2"; + version = "1.4.2"; - src = fetchurl { - url = "https://github.com/taisei-project/${pname}/releases/download/v${version}/${pname}-v${version}.tar.xz"; - sha256 = "1g53fcyrlzmvlsb40pw90gaglysv6n1w42hk263iv61ibhdmzh6v"; + src = fetchFromGitHub { + owner = "taisei-project"; + repo = "taisei"; + rev = "v${finalAttrs.version}"; + hash = "sha256-rThLz8o6IYhIBUc0b1sAQi2aF28btajcM1ScTv+qn6c="; + fetchSubmodules = true; }; nativeBuildInputs = [ @@ -34,7 +46,10 @@ stdenv.mkDerivation rec { meson ninja pkg-config - python3 + python3Packages.python + python3Packages.zstandard + ensureNewerSourcesForZipFilesHook + shaderc ]; buildInputs = [ @@ -47,16 +62,27 @@ stdenv.mkDerivation rec { libwebp libzip zlib - ]; + zstd + opusfile + openssl + spirv-cross + ] ++ lib.optional gamemodeSupport gamemode; - mesonFlags = [ "-Db_lto=false" ]; + mesonFlags = [ + (lib.mesonBool "b_lto" false) + (lib.mesonEnable "install_macos_bundle" false) + (lib.mesonEnable "install_relocatable" false) + (lib.mesonEnable "shader_transpiler" false) + (lib.mesonEnable "gamemode" gamemodeSupport) + ]; preConfigure = '' patchShebangs . ''; + strictDeps = true; + meta = { - broken = stdenv.hostPlatform.isDarwin; description = "Free and open-source Touhou Project clone and fangame"; mainProgram = "taisei"; longDescription = '' @@ -75,4 +101,4 @@ stdenv.mkDerivation rec { ]; platforms = lib.platforms.all; }; -} +}) From 00a0b29d983df98bed781ae4f531ea6fc41d4d86 Mon Sep 17 00:00:00 2001 From: zi3m5f <113244000+zi3m5f@users.noreply.github.com> Date: Tue, 5 Nov 2024 09:39:30 +0100 Subject: [PATCH 10/35] lunatask: nixfmt --- pkgs/applications/misc/lunatask/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/lunatask/default.nix b/pkgs/applications/misc/lunatask/default.nix index 82b30866f842..712105afc579 100644 --- a/pkgs/applications/misc/lunatask/default.nix +++ b/pkgs/applications/misc/lunatask/default.nix @@ -1,4 +1,8 @@ -{ lib, appimageTools, fetchurl }: +{ + lib, + appimageTools, + fetchurl, +}: let version = "2.0.11"; From 9de71c61f5e87e35c0017a0dcc90a47977ecf452 Mon Sep 17 00:00:00 2001 From: zi3m5f <113244000+zi3m5f@users.noreply.github.com> Date: Tue, 5 Nov 2024 09:41:09 +0100 Subject: [PATCH 11/35] lunatask: move to pkgs/by-name --- .../lunatask/default.nix => by-name/lu/lunatask/package.nix} | 0 pkgs/{applications/misc => by-name/lu}/lunatask/update.py | 0 pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 2 deletions(-) rename pkgs/{applications/misc/lunatask/default.nix => by-name/lu/lunatask/package.nix} (100%) rename pkgs/{applications/misc => by-name/lu}/lunatask/update.py (100%) diff --git a/pkgs/applications/misc/lunatask/default.nix b/pkgs/by-name/lu/lunatask/package.nix similarity index 100% rename from pkgs/applications/misc/lunatask/default.nix rename to pkgs/by-name/lu/lunatask/package.nix diff --git a/pkgs/applications/misc/lunatask/update.py b/pkgs/by-name/lu/lunatask/update.py similarity index 100% rename from pkgs/applications/misc/lunatask/update.py rename to pkgs/by-name/lu/lunatask/update.py diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 55968eed1355..237746d16f25 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9113,8 +9113,6 @@ with pkgs; ltwheelconf = callPackage ../applications/misc/ltwheelconf { }; - lunatask = callPackage ../applications/misc/lunatask { }; - lvmsync = callPackage ../tools/backup/lvmsync { }; kapp = callPackage ../tools/networking/kapp { }; From 95e929663d5121d52ca2a631e11e3b385117bca9 Mon Sep 17 00:00:00 2001 From: zi3m5f <113244000+zi3m5f@users.noreply.github.com> Date: Tue, 5 Nov 2024 09:46:15 +0100 Subject: [PATCH 12/35] lunatask: 2.0.11 -> 2.0.12 --- pkgs/by-name/lu/lunatask/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/lu/lunatask/package.nix b/pkgs/by-name/lu/lunatask/package.nix index 712105afc579..75640de9452b 100644 --- a/pkgs/by-name/lu/lunatask/package.nix +++ b/pkgs/by-name/lu/lunatask/package.nix @@ -5,12 +5,12 @@ }: let - version = "2.0.11"; + version = "2.0.12"; pname = "lunatask"; src = fetchurl { url = "https://lunatask.app/download/Lunatask-${version}.AppImage"; - sha256 = "sha256-aGU8WsC3jLg8xOF7HzW6oGxizBa3afiT+qS1oyi1r7o="; + sha256 = "sha256-z1c3ACIRF8+iIy4ihEWqRDzalHyN5AvOdBxQG9sCXVs="; }; appimageContents = appimageTools.extractType2 { From 674769e6790a3a8234e13454896baea27a82695b Mon Sep 17 00:00:00 2001 From: zi3m5f <113244000+zi3m5f@users.noreply.github.com> Date: Tue, 5 Nov 2024 11:10:29 +0100 Subject: [PATCH 13/35] lunatask: small improvements --- pkgs/by-name/lu/lunatask/package.nix | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/lu/lunatask/package.nix b/pkgs/by-name/lu/lunatask/package.nix index 75640de9452b..6955e3b33633 100644 --- a/pkgs/by-name/lu/lunatask/package.nix +++ b/pkgs/by-name/lu/lunatask/package.nix @@ -10,27 +10,27 @@ let src = fetchurl { url = "https://lunatask.app/download/Lunatask-${version}.AppImage"; - sha256 = "sha256-z1c3ACIRF8+iIy4ihEWqRDzalHyN5AvOdBxQG9sCXVs="; + hash = "sha256-z1c3ACIRF8+iIy4ihEWqRDzalHyN5AvOdBxQG9sCXVs="; }; - appimageContents = appimageTools.extractType2 { + appimageContents = appimageTools.extract { inherit pname version src; }; in -appimageTools.wrapType2 rec { +appimageTools.wrapType2 { inherit pname version src; extraInstallCommands = '' - install -m 444 -D ${appimageContents}/${pname}.desktop $out/share/applications/${pname}.desktop - install -m 444 -D ${appimageContents}/${pname}.png $out/share/icons/hicolor/512x512/apps/${pname}.png - substituteInPlace $out/share/applications/${pname}.desktop \ - --replace 'Exec=AppRun' 'Exec=${pname}' + install -m 444 -D -t $out/share/applications ${appimageContents}/lunatask.desktop + install -m 444 -D -t $out/share/icons/hicolor/512x512/apps ${appimageContents}/lunatask.png + substituteInPlace $out/share/applications/lunatask.desktop \ + --replace-fail 'Exec=AppRun' 'Exec=lunatask' ''; passthru.updateScript = ./update.py; - meta = with lib; { + meta = { description = "All-in-one encrypted todo list, notebook, habit and mood tracker, pomodoro timer, and journaling app"; longDescription = '' Lunatask is an all-in-one encrypted todo list, notebook, habit and mood tracker, pomodoro timer, and journaling app. It remembers stuff for you and keeps track of your mental health. @@ -38,9 +38,9 @@ appimageTools.wrapType2 rec { homepage = "https://lunatask.app"; downloadPage = "https://lunatask.app/download"; changelog = "https://lunatask.app/releases/${version}"; - license = licenses.unfree; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - maintainers = with maintainers; [ henkery ]; + license = lib.licenses.unfree; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + maintainers = with lib.maintainers; [ henkery ]; platforms = [ "x86_64-linux" ]; mainProgram = "lunatask"; }; From 82cfe011c4aff66538c60aac5648ff05ab7bdd31 Mon Sep 17 00:00:00 2001 From: zi3m5f <113244000+zi3m5f@users.noreply.github.com> Date: Tue, 5 Nov 2024 12:04:05 +0100 Subject: [PATCH 14/35] lunatask: adopt https://github.com/NixOS/nixpkgs/pull/353792#issuecomment-2456863125 --- pkgs/by-name/lu/lunatask/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/lu/lunatask/package.nix b/pkgs/by-name/lu/lunatask/package.nix index 6955e3b33633..92277537961a 100644 --- a/pkgs/by-name/lu/lunatask/package.nix +++ b/pkgs/by-name/lu/lunatask/package.nix @@ -40,7 +40,7 @@ appimageTools.wrapType2 { changelog = "https://lunatask.app/releases/${version}"; license = lib.licenses.unfree; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - maintainers = with lib.maintainers; [ henkery ]; + maintainers = with lib.maintainers; [ zi3m5f ]; platforms = [ "x86_64-linux" ]; mainProgram = "lunatask"; }; From 56878d144961c7b169703de1af35b132d95a2295 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Thu, 7 Nov 2024 00:16:13 +0100 Subject: [PATCH 15/35] bruno: remove phantomjs --- pkgs/by-name/br/bruno/package.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/by-name/br/bruno/package.nix b/pkgs/by-name/br/bruno/package.nix index 72d8c643b40c..19c05ce4b4ac 100644 --- a/pkgs/by-name/br/bruno/package.nix +++ b/pkgs/by-name/br/bruno/package.nix @@ -5,7 +5,6 @@ buildNpmPackage, nix-update-script, electron, - writeShellScriptBin, makeWrapper, copyDesktopItems, makeDesktopItem, @@ -37,7 +36,6 @@ buildNpmPackage rec { nativeBuildInputs = [ - (writeShellScriptBin "phantomjs" "echo 2.1.1") pkg-config ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ From f90a7c4dbd7e5769102a82cc85ba651553c5599d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Thu, 7 Nov 2024 00:20:32 +0100 Subject: [PATCH 16/35] bruno: 1.34.0 -> 1.34.2 --- pkgs/by-name/br/bruno/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/br/bruno/package.nix b/pkgs/by-name/br/bruno/package.nix index 19c05ce4b4ac..5f0e15fc5db4 100644 --- a/pkgs/by-name/br/bruno/package.nix +++ b/pkgs/by-name/br/bruno/package.nix @@ -18,20 +18,20 @@ buildNpmPackage rec { pname = "bruno"; - version = "1.34.0"; + version = "1.34.2"; src = fetchFromGitHub { owner = "usebruno"; repo = "bruno"; rev = "v${version}"; - hash = "sha256-6UcByIiKBAIicH3dNF+6byuj/WsEb4Xi+iPvfjPsQkA="; + hash = "sha256-ydb80+FP2IsobvCZiIKzbErAJNakVoSoYrhddmPmYkc="; postFetch = '' ${lib.getExe npm-lockfile-fix} $out/package-lock.json ''; }; - npmDepsHash = "sha256-z8d1paC5VQ/XsXJuQ6Z7PjSwC6abN6kRmG0sfI9aCqw="; + npmDepsHash = "sha256-ODE8GLIgdUEOiniki8jzkHfU5TKHWoIIbjGJjNzMZCI="; npmFlags = [ "--legacy-peer-deps" ]; nativeBuildInputs = From 582038c3978b46a38f1b7e0735b9a13e5a78098d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Thu, 7 Nov 2024 00:57:32 +0100 Subject: [PATCH 17/35] bruno: remove `with lib;`, order meta attrs --- pkgs/by-name/br/bruno/package.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/br/bruno/package.nix b/pkgs/by-name/br/bruno/package.nix index 5f0e15fc5db4..4ec73a84b490 100644 --- a/pkgs/by-name/br/bruno/package.nix +++ b/pkgs/by-name/br/bruno/package.nix @@ -158,19 +158,19 @@ buildNpmPackage rec { passthru.updateScript = nix-update-script { }; - meta = with lib; { + meta = { description = "Open-source IDE For exploring and testing APIs"; homepage = "https://www.usebruno.com"; - platforms = platforms.linux ++ platforms.darwin; - license = licenses.mit; - maintainers = with maintainers; [ + license = lib.licenses.mit; + mainProgram = "bruno"; + maintainers = with lib.maintainers; [ gepbird kashw2 lucasew mattpolzin - water-sucks redyf + water-sucks ]; - mainProgram = "bruno"; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } From cc0b65fb0495a005880312ddb901da8621b1aec4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Thu, 7 Nov 2024 01:37:53 +0100 Subject: [PATCH 18/35] bruno: add back giflib removal patch --- pkgs/by-name/br/bruno/package.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/by-name/br/bruno/package.nix b/pkgs/by-name/br/bruno/package.nix index 4ec73a84b490..623998e9fd61 100644 --- a/pkgs/by-name/br/bruno/package.nix +++ b/pkgs/by-name/br/bruno/package.nix @@ -78,6 +78,14 @@ buildNpmPackage rec { ELECTRON_SKIP_BINARY_DOWNLOAD = 1; + # remove giflib dependency + npmRebuildFlags = [ "--ignore-scripts" ]; + preBuild = '' + substituteInPlace node_modules/canvas/binding.gyp \ + --replace-fail "'with_gif%': ' Date: Thu, 7 Nov 2024 22:41:21 +0100 Subject: [PATCH 19/35] bruno: postBuild -> buildPhase --- pkgs/by-name/br/bruno/package.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/br/bruno/package.nix b/pkgs/by-name/br/bruno/package.nix index 623998e9fd61..07e8516e308d 100644 --- a/pkgs/by-name/br/bruno/package.nix +++ b/pkgs/by-name/br/bruno/package.nix @@ -86,8 +86,9 @@ buildNpmPackage rec { npm rebuild ''; - dontNpmBuild = true; - postBuild = '' + buildPhase = '' + runHook preBuild + npm run build --workspace=packages/bruno-common npm run build --workspace=packages/bruno-graphql-docs npm run build --workspace=packages/bruno-app @@ -127,6 +128,8 @@ buildNpmPackage rec { } popd + + runHook postBuild ''; npmPackFlags = [ "--ignore-scripts" ]; From a431e9d6b93f96139ddc3b2c617da33911237404 Mon Sep 17 00:00:00 2001 From: Malte Janz Date: Fri, 8 Nov 2024 14:38:57 +0100 Subject: [PATCH 20/35] ludtwig: 0.8.3 -> 0.9.0 --- pkgs/by-name/lu/ludtwig/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/lu/ludtwig/package.nix b/pkgs/by-name/lu/ludtwig/package.nix index 18145c63a676..f4ab5b57ee6e 100644 --- a/pkgs/by-name/lu/ludtwig/package.nix +++ b/pkgs/by-name/lu/ludtwig/package.nix @@ -2,18 +2,18 @@ rustPlatform.buildRustPackage rec { pname = "ludtwig"; - version = "0.8.3"; + version = "0.9.0"; src = fetchFromGitHub { owner = "MalteJanz"; repo = pname; rev = "v${version}"; - hash = "sha256-nkyi6X9W92yLaSPCg3zk0z/Pwue6dGK09iCDmWliFeg="; + hash = "sha256-J5UTVXUExVApA8VVTyhkO2JhpVCK45li9VBN+oM9TBI="; }; checkType = "debug"; - cargoHash = "sha256-CZOdxrQ/50xznc8cfvi+6QFmMpPOS1st+yVPtAkZ3/A="; + cargoHash = "sha256-czofgV5a9aQoLn4JaBUbytY/aHfgJv3Q8RU2j+fbXo8="; meta = with lib; { description = "Linter / Formatter for Twig template files which respects HTML and your time"; From 9479182a74ac9ad1b0fc494e44aa035016b10fd0 Mon Sep 17 00:00:00 2001 From: Moraxyc Date: Sat, 9 Nov 2024 00:42:01 +0800 Subject: [PATCH 21/35] python312Packages.stumpy: fix build --- .../python-modules/stumpy/default.nix | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/stumpy/default.nix b/pkgs/development/python-modules/stumpy/default.nix index 5b6b4c31c913..03d5e87e8e4c 100644 --- a/pkgs/development/python-modules/stumpy/default.nix +++ b/pkgs/development/python-modules/stumpy/default.nix @@ -2,6 +2,8 @@ lib, buildPythonPackage, fetchFromGitHub, + setuptools, + setuptools-scm, numpy, scipy, numba, @@ -15,7 +17,7 @@ buildPythonPackage rec { pname = "stumpy"; version = "1.13.0"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -26,7 +28,12 @@ buildPythonPackage rec { hash = "sha256-S+Rb6pHphXfbqz4VMnN1p7ZrlWB/g7XCdy/T5/Q8VD8="; }; - propagatedBuildInputs = [ + build-system = [ + setuptools + setuptools-scm + ]; + + dependencies = [ numpy scipy numba @@ -47,10 +54,11 @@ buildPythonPackage rec { "tests/test_core.py" ]; - meta = with lib; { + meta = { description = "Library that can be used for a variety of time series data mining tasks"; + changelog = "https://github.com/TDAmeritrade/stumpy/blob/${src.rev}/CHANGELOG.md"; homepage = "https://github.com/TDAmeritrade/stumpy"; - license = licenses.bsd3; + license = lib.licenses.bsd3; maintainers = [ ]; }; } From 2d78ec7c67dc535e061967de9b0f32f4d967fa0c Mon Sep 17 00:00:00 2001 From: Moraxyc Date: Sat, 9 Nov 2024 01:27:03 +0800 Subject: [PATCH 22/35] python312Packages.simplemma: fix build --- .../python-modules/simplemma/default.nix | 31 ++++++++++++++----- 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/simplemma/default.nix b/pkgs/development/python-modules/simplemma/default.nix index fc1502fa02a8..191fbb5df796 100644 --- a/pkgs/development/python-modules/simplemma/default.nix +++ b/pkgs/development/python-modules/simplemma/default.nix @@ -1,18 +1,19 @@ { lib, buildPythonPackage, - pythonOlder, fetchFromGitHub, - + setuptools, + marisa-trie, + platformdirs, + pytest, + pytest-cov-stub, pytestCheckHook, }: buildPythonPackage rec { pname = "simplemma"; version = "1.1.1"; - format = "setuptools"; - - disabled = pythonOlder "3.6"; + pyproject = true; src = fetchFromGitHub { owner = "adbar"; @@ -21,14 +22,28 @@ buildPythonPackage rec { hash = "sha256-X0mqFPdCo0/sTexv4bi4bND7LFHOJvlOPH6tB39ybZY="; }; - nativeCheckInputs = [ pytestCheckHook ]; + build-system = [ + setuptools + ]; + + optional-dependencies = { + marisa-trie = [ + marisa-trie + platformdirs + ]; + }; + + nativeCheckInputs = [ + pytest-cov-stub + pytestCheckHook + ]; pythonImportsCheck = [ "simplemma" ]; - meta = with lib; { + meta = { description = "Simple multilingual lemmatizer for Python, especially useful for speed and efficiency"; homepage = "https://github.com/adbar/simplemma"; - license = licenses.mit; + license = lib.licenses.mit; maintainers = [ ]; }; } From 73d24364fb3e5d90a687b22d0aa51597b48a7bc0 Mon Sep 17 00:00:00 2001 From: Patka Date: Fri, 8 Nov 2024 19:42:07 +0100 Subject: [PATCH 23/35] netbox2netshot: 0.1.12 -> 0.1.13; fix build release notes: https://github.com/scaleway/netbox2netshot/releases/tag/0.1.13 --- pkgs/tools/admin/netbox2netshot/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/netbox2netshot/default.nix b/pkgs/tools/admin/netbox2netshot/default.nix index 0b5e1ed73793..ada70c8f37ef 100644 --- a/pkgs/tools/admin/netbox2netshot/default.nix +++ b/pkgs/tools/admin/netbox2netshot/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "netbox2netshot"; - version = "0.1.12"; + version = "0.1.13"; src = fetchFromGitHub { owner = "scaleway"; repo = "netbox2netshot"; rev = version; - hash = "sha256-PT/eQBe0CX1l6tcC5QBiXKGWgIQ8s4h6IApeWyb8ysc="; + hash = "sha256-zi/on31uYSW3XhIZzKMkxIj0QZxUzoOcpRR8w5LFH90="; }; - cargoHash = "sha256-/T+6cjWG8u/Mr8gtBOXbEEZOO0pDykEpNIVTgooAmuw="; + cargoHash = "sha256-qMIGCE3YsV+ZihqBpayrxddsSkmFPldgYNHnAK5semA="; nativeBuildInputs = [ pkg-config From d051f421fb8f21dc591656a417a508afbf92bd5a Mon Sep 17 00:00:00 2001 From: Karolis Stasaitis Date: Sat, 19 Oct 2024 19:53:57 +0200 Subject: [PATCH 24/35] packetry: init at 0.4.0 Co-authored-by: zi3m5f <113244000+zi3m5f@users.noreply.github.com> --- pkgs/by-name/pa/packetry/package.nix | 63 ++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) create mode 100644 pkgs/by-name/pa/packetry/package.nix diff --git a/pkgs/by-name/pa/packetry/package.nix b/pkgs/by-name/pa/packetry/package.nix new file mode 100644 index 000000000000..f2766c3998d0 --- /dev/null +++ b/pkgs/by-name/pa/packetry/package.nix @@ -0,0 +1,63 @@ +{ + fetchFromGitHub, + lib, + stdenv, + rustPlatform, + gtk4, + pkg-config, + pango, + wrapGAppsHook4, + apple-sdk_11, + versionCheckHook, +}: + +rustPlatform.buildRustPackage rec { + pname = "packetry"; + version = "0.4.0"; + + src = fetchFromGitHub { + owner = "greatscottgadgets"; + repo = "packetry"; + rev = "refs/tags/v${version}"; + hash = "sha256-eDVom0kAL1QwO8BtrJS76VTvxtKs7CP6Ob5BWlE6wOM="; + }; + + cargoHash = "sha256-xz9PdVVB1u6s/anPBRonWS1kMN+4kfkK/gaOlF9Z3yk="; + + nativeBuildInputs = [ + pkg-config + wrapGAppsHook4 + ]; + + buildInputs = + [ + gtk4 + pango + ] + ++ lib.optionals stdenv.isDarwin [ + apple-sdk_11 + ]; + + # Disable test_replay tests as they need a gui + preCheck = '' + sed -i 's:#\[test\]:#[test] #[ignore]:' src/test_replay.rs + ''; + + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "--version"; + doInstallCheck = true; + + # packetry-cli is only necessary on windows https://github.com/greatscottgadgets/packetry/pull/154 + postInstall = '' + rm $out/bin/packetry-cli + ''; + + meta = { + description = "USB 2.0 protocol analysis application for use with Cynthion"; + homepage = "https://github.com/greatscottgadgets/packetry"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ carlossless ]; + mainProgram = "packetry"; + platforms = lib.platforms.linux ++ lib.platforms.darwin; + }; +} From 3e1a9ffb61ae001dcacdf7ba0e71b70bf06e7016 Mon Sep 17 00:00:00 2001 From: Ryan Hendrickson Date: Fri, 8 Nov 2024 14:55:58 -0500 Subject: [PATCH 25/35] sudo: fix cross-compilation linking error --- pkgs/tools/security/sudo/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/tools/security/sudo/default.nix b/pkgs/tools/security/sudo/default.nix index d238ef3166c6..1fecbceb98cb 100644 --- a/pkgs/tools/security/sudo/default.nix +++ b/pkgs/tools/security/sudo/default.nix @@ -1,5 +1,6 @@ { lib , stdenv +, fetchpatch , fetchurl , buildPackages , coreutils @@ -30,6 +31,14 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace src/Makefile.in --replace 04755 0755 ''; + patches = [ + # Fix for https://github.com/NixOS/nixpkgs/issues/354544 + (fetchpatch { + url = "https://www.sudo.ws/repos/sudo/raw-rev/71e3f5a288e1ac21151b1b9577f0fe3745671cf7"; + hash = "sha256-L4AF1ee+qW9QKLrUzL5+hC5EznNC9k7sNeVGNBAJ6S4="; + }) + ]; + configureFlags = [ "--with-env-editor" "--with-editor=/run/current-system/sw/bin/nano" From a2e51f8786959b5fa9dd598df781034e0cf4c618 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 8 Nov 2024 21:04:15 +0100 Subject: [PATCH 26/35] python312Packages.agent-py: 0.0.23 -> 0.0.24 https://github.com/ispysoftware/agent-py/compare/refs/tags/agent-py.0.0.23...0.0.24 --- .../python-modules/agent-py/default.nix | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/pkgs/development/python-modules/agent-py/default.nix b/pkgs/development/python-modules/agent-py/default.nix index eb1702d32709..8c9ef8be3c58 100644 --- a/pkgs/development/python-modules/agent-py/default.nix +++ b/pkgs/development/python-modules/agent-py/default.nix @@ -1,33 +1,33 @@ { aiohttp, buildPythonPackage, - fetchPypi, - isPy3k, + fetchFromGitHub, lib, - python, - requests, + setuptools, + pytestCheckHook, }: buildPythonPackage rec { pname = "agent-py"; - version = "0.0.23"; - format = "setuptools"; + version = "0.0.24"; + pyproject = true; - disabled = !isPy3k; - - src = fetchPypi { - inherit pname version; - sha256 = "1hx88m8b8kfb2gm6hii5ldjv7hlvqf99cz0w2vj0d0grrxcbn5cz"; + src = fetchFromGitHub { + owner = "ispysoftware"; + repo = "agent-py"; + rev = "refs/tags/agent-py.${version}"; + hash = "sha256-PP4gQ3AFYLJPUt9jhhiV9HkfBhIzd+JIsGpgK6FNmaE="; }; - propagatedBuildInputs = [ - requests - aiohttp - ]; + build-system = [ setuptools ]; - checkPhase = '' - ${python.interpreter} tests/test_agent.py - ''; + dependencies = [ aiohttp ]; + + doCheck = false; # only test is outdated + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "agent" ]; meta = with lib; { description = "Python wrapper around the Agent REST API"; From 621e3513817699cbed7957ba7f0a020c906723b9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 8 Nov 2024 21:05:09 +0100 Subject: [PATCH 27/35] python312Packages.google-nest-sdm: 6.1.3 -> 6.1.4 https://github.com/allenporter/python-google-nest-sdm/releases/tag/6.1.4 --- pkgs/development/python-modules/google-nest-sdm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-nest-sdm/default.nix b/pkgs/development/python-modules/google-nest-sdm/default.nix index 1f4e2ef3cdc4..6bdda8efbc1d 100644 --- a/pkgs/development/python-modules/google-nest-sdm/default.nix +++ b/pkgs/development/python-modules/google-nest-sdm/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "google-nest-sdm"; - version = "6.1.3"; + version = "6.1.4"; pyproject = true; disabled = pythonOlder "3.10"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "allenporter"; repo = "python-google-nest-sdm"; rev = "refs/tags/${version}"; - hash = "sha256-X/jiers05zNAEUau6SVKGyyIx9HCs7yI0HsuZ7/tXfo="; + hash = "sha256-F/vpyg3EYgKCsq/0yL3uP+1azu8bbHOMsf85Yabl0KQ="; }; build-system = [ setuptools ]; From e816e355239021519ac261aa82215c70633f8185 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 8 Nov 2024 21:05:22 +0100 Subject: [PATCH 28/35] python312Packages.ha-ffmpeg: 3.2.1 -> 3.2.2 https://github.com/home-assistant-libs/ha-ffmpeg/releases/tag/3.2.2 --- pkgs/development/python-modules/ha-ffmpeg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ha-ffmpeg/default.nix b/pkgs/development/python-modules/ha-ffmpeg/default.nix index e8d1537b58ba..c765c22428ff 100644 --- a/pkgs/development/python-modules/ha-ffmpeg/default.nix +++ b/pkgs/development/python-modules/ha-ffmpeg/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "ha-ffmpeg"; - version = "3.2.1"; + version = "3.2.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = "ha-ffmpeg"; rev = "refs/tags/${version}"; - hash = "sha256-Yu23kRChPbq/9sKvu9uY4qtKXX7CVNagZX9Z6ZzDqcw="; + hash = "sha256-TbSoKoOiLx3O7iykiTri5GBHGj7WoB8iSCpFIrV4ZgU="; }; build-system = [ setuptools ]; From 27c3ae3b08e0708a45a3e19ac0477ab6cb08752c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 8 Nov 2024 21:06:14 +0100 Subject: [PATCH 29/35] python312Packages.python-roborock: 2.6.1 -> 2.7.2 https://github.com/humbertogontijo/python-roborock/blob/v2.7.2/CHANGELOG.md --- pkgs/development/python-modules/python-roborock/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-roborock/default.nix b/pkgs/development/python-modules/python-roborock/default.nix index 1385f887bd12..9cfebbbbaa90 100644 --- a/pkgs/development/python-modules/python-roborock/default.nix +++ b/pkgs/development/python-modules/python-roborock/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "python-roborock"; - version = "2.6.1"; + version = "2.7.2"; pyproject = true; disabled = pythonOlder "3.10"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "humbertogontijo"; repo = "python-roborock"; rev = "refs/tags/v${version}"; - hash = "sha256-0gzbPa19UIt8Vs0Vnqs9j0tFJAkRTupU7DxT+7rwouI="; + hash = "sha256-sPG3AqVrv+BiB+copgaghWDT/Rb/WU0R+Y8Z2J6l+7E="; }; postPatch = '' From 37976f9cfdd9860e5f78abe269b59e4bb5d640ea Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 8 Nov 2024 21:06:37 +0100 Subject: [PATCH 30/35] python312Packages.sense-energy: 0.13.2 -> 0.13.3 https://github.com/scottbonline/sense/releases/tag/0.13.3 --- pkgs/development/python-modules/sense-energy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sense-energy/default.nix b/pkgs/development/python-modules/sense-energy/default.nix index 54e7d1c2b368..11991b9ef17d 100644 --- a/pkgs/development/python-modules/sense-energy/default.nix +++ b/pkgs/development/python-modules/sense-energy/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "sense-energy"; - version = "0.13.2"; + version = "0.13.3"; pyproject = true; disabled = pythonOlder "3.9"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "scottbonline"; repo = "sense"; rev = "refs/tags/${version}"; - hash = "sha256-HE0bMcxfzfaMLDepjwDwV8AXQ3Q/bQt6SqHt7m/UY9I="; + hash = "sha256-k1W84c0odpYv0vI2u2zqfWGJXSpYJRSwfFyXACMto7s="; }; postPatch = '' From 7dec9f228a03b2186b0710da8821e4ac870b0eb6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 8 Nov 2024 21:06:55 +0100 Subject: [PATCH 31/35] python312Packages.spotifyaio: 0.8.5 -> 0.8.7 https://github.com/joostlek/python-spotify/releases/tag/v0.8.7 --- pkgs/development/python-modules/spotifyaio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/spotifyaio/default.nix b/pkgs/development/python-modules/spotifyaio/default.nix index de088932713e..54308db1a8b0 100644 --- a/pkgs/development/python-modules/spotifyaio/default.nix +++ b/pkgs/development/python-modules/spotifyaio/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "spotifyaio"; - version = "0.8.5"; + version = "0.8.7"; pyproject = true; disabled = pythonOlder "3.11"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "joostlek"; repo = "python-spotify"; rev = "refs/tags/v${version}"; - hash = "sha256-6OX9awRmy2DT8SHvoVsLcsZ6LxTek/HgXNG9b2wSfGU="; + hash = "sha256-8CvXh3lU6CWOIFyfKQv4TX4R9O9BzwEu/Cua0MRdma4="; }; build-system = [ poetry-core ]; From c71079125f5b3fe382381756ddcb91c3b11621ed Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 8 Nov 2024 21:09:56 +0100 Subject: [PATCH 32/35] home-assistant.intents: 2024.11.4 -> 2024.11.6 https://github.com/home-assistant/intents/releases/tag/2024.11.6 --- pkgs/servers/home-assistant/intents.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/intents.nix b/pkgs/servers/home-assistant/intents.nix index 57598ad2b0f5..a88446e8acba 100644 --- a/pkgs/servers/home-assistant/intents.nix +++ b/pkgs/servers/home-assistant/intents.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "home-assistant-intents"; - version = "2024.11.4"; + version = "2024.11.6"; pyproject = true; disabled = pythonOlder "3.9"; @@ -31,7 +31,7 @@ buildPythonPackage rec { repo = "intents-package"; rev = "refs/tags/${version}"; fetchSubmodules = true; - hash = "sha256-6SgvRaiPOfXM5OxrBQ/w600k7E+AKZEB8vukic6M4lA="; + hash = "sha256-C2q0mUdA6VGKPHtG2g9Zi0nPvwWP1LAdepJCRkF4ky8="; }; build-system = [ From f5ddf1a751b3036b37b8d63fec11f4bf9bf9d484 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 8 Nov 2024 21:15:18 +0100 Subject: [PATCH 33/35] home-assistant: 2024.11.0 -> 2024.11.1 https://github.com/home-assistant/core/releases/tag/2024.11.1 --- pkgs/servers/home-assistant/component-packages.nix | 2 +- pkgs/servers/home-assistant/default.nix | 6 +++--- pkgs/servers/home-assistant/frontend.nix | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index f72064a46c0f..31c5656a170b 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2024.11.0"; + version = "2024.11.1"; components = { "3_day_blinds" = ps: with ps; [ ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index bb06d48683d0..34478297238b 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -439,7 +439,7 @@ let extraBuildInputs = extraPackages python.pkgs; # Don't forget to run update-component-packages.py after updating - hassVersion = "2024.11.0"; + hassVersion = "2024.11.1"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -457,13 +457,13 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = "refs/tags/${version}"; - hash = "sha256-9wFF0tDy3IAnmjjP1juQsU2G6qmQiBnBX1imNrbib7Y="; + hash = "sha256-t8f0em5EaWPLZlr+fi/Kn3AE0dFEAyy0FpwdjJOYBCI="; }; # Secondary source is pypi sdist for translations sdist = fetchPypi { inherit pname version; - hash = "sha256-9DtxrMhozse672aa1pHvk/wOpr7GdWUZtz0u7GNGBVw="; + hash = "sha256-e9RF1oer4FyDEYof7qLTFUkmSxDh71qi+ResNXO6G5o="; }; build-system = with python.pkgs; [ diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index 1ee12aaf46f3..53bc67e53179 100644 --- a/pkgs/servers/home-assistant/frontend.nix +++ b/pkgs/servers/home-assistant/frontend.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { # the frontend version corresponding to a specific home-assistant version can be found here # https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json pname = "home-assistant-frontend"; - version = "20241106.0"; + version = "20241106.2"; format = "wheel"; src = fetchPypi { @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "home_assistant_frontend"; dist = "py3"; python = "py3"; - hash = "sha256-EqF3fgT7pMjYTMVFcoXXnbeGjT7ZevmmTCqG8q3Qqt4="; + hash = "sha256-9Il9/lHKIaymw7H8fL1gpp80+VzSqVJ1IyHGEa3OoO8="; }; # there is nothing to strip in this package From 171e7de37e185876c9e6ba3b23f8c89a43c5fd02 Mon Sep 17 00:00:00 2001 From: Adam Stephens Date: Sat, 9 Nov 2024 01:51:17 +0000 Subject: [PATCH 34/35] kanidm: 1.4.1 -> 1.4.2 https://github.com/kanidm/kanidm/releases/tag/v1.4.2 --- pkgs/by-name/ka/kanidm/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ka/kanidm/package.nix b/pkgs/by-name/ka/kanidm/package.nix index 6e0de068a7f9..710400154f25 100644 --- a/pkgs/by-name/ka/kanidm/package.nix +++ b/pkgs/by-name/ka/kanidm/package.nix @@ -28,16 +28,16 @@ let in rustPlatform.buildRustPackage rec { pname = "kanidm"; - version = "1.4.1"; + version = "1.4.2"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-cL1XV9UeoRxl7RPZzeeLtgyNjXxeFwpzapnuS292yc4="; + hash = "sha256-vKllSbJ44cO3FFIaf8rkhvKAVa2NG1Ps06VTzpi9xj0="; }; - cargoHash = "sha256-c6HeE0971mBIN9NR7knu8SN0Z2W/u1rvIsE6ZCiHBEs="; + cargoHash = "sha256-1mZm39l11eUjAGe0Oi9Mz94cb7DurfvUjCH5+GnA2Z0="; KANIDM_BUILD_PROFILE = "release_nixos_${arch}"; From 7234221a0ea3a5437a0920e29dd32ec377a8f699 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 9 Nov 2024 03:27:30 +0100 Subject: [PATCH 35/35] python312Packages.homeassistant-stubs: 2024.11.0 -> 2024.11.1 https://github.com/KapJI/homeassistant-stubs/releases/tag/2024.11.1 --- pkgs/servers/home-assistant/stubs.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/stubs.nix b/pkgs/servers/home-assistant/stubs.nix index 44cff2d2d7ba..0e6ca0d74c1d 100644 --- a/pkgs/servers/home-assistant/stubs.nix +++ b/pkgs/servers/home-assistant/stubs.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "homeassistant-stubs"; - version = "2024.11.0"; + version = "2024.11.1"; pyproject = true; disabled = python.version != home-assistant.python.version; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "KapJI"; repo = "homeassistant-stubs"; rev = "refs/tags/${version}"; - hash = "sha256-ktKmYr5wzrmZoedK2FB1qFcqt3NGKzXcL7f1j2/K6vc="; + hash = "sha256-6Av1LSzmgjJonXlRFMrzdvGDm6latErBxCmgYlCDZ28="; }; build-system = [